diff --git a/README.md b/README.md index a50736d4ed..d675d73adf 100644 --- a/README.md +++ b/README.md @@ -70,8 +70,8 @@ Unit tests for the GUI code are in `src/qt/test/`. To compile and run them: Every pull request is built for both Windows and Linux on a dedicated server, and unit and sanity tests are automatically run. The binaries produced may be -used for manual QA testing -- a link to them will appear in a comment on the -pull request posted by 'BitcoinPullTester'. See `https://github.com/TheBlueMatt/test-scripts` +used for manual QA testing — a link to them will appear in a comment on the +pull request posted by [BitcoinPullTester](https://github.com/BitcoinPullTester). See https://github.com/TheBlueMatt/test-scripts for the build/test scripts. ### Manual Quality Assurance (QA) Testing @@ -79,4 +79,4 @@ for the build/test scripts. Large changes should have a test plan, and should be tested by somebody other than the developer who wrote the code. -See `https://github.com/bitcoin/QA/` for how to create a test plan. +See https://github.com/bitcoin/QA/ for how to create a test plan. diff --git a/bitcoin-qt.pro b/bitcoin-qt.pro index f5d9bee9ae..05fb5545af 100644 --- a/bitcoin-qt.pro +++ b/bitcoin-qt.pro @@ -1,9 +1,10 @@ TEMPLATE = app TARGET = bitcoin-qt macx:TARGET = "Bitcoin-Qt" -VERSION = 0.8.0 +VERSION = 0.8.2 INCLUDEPATH += src src/json src/qt -QT += network +QT += core gui network +greaterThan(QT_MAJOR_VERSION, 4): QT += widgets DEFINES += QT_GUI BOOST_THREAD_USE_LIB BOOST_SPIRIT_THREADSAFE CONFIG += no_include_pwd CONFIG += thread @@ -211,6 +212,7 @@ HEADERS += src/qt/bitcoingui.h \ src/leveldb.h \ src/threadsafety.h \ src/limitedmap.h \ + src/qt/macnotificationhandler.h \ src/qt/splashscreen.h SOURCES += src/qt/bitcoin.cpp \ @@ -312,6 +314,7 @@ DEFINES += BITCOIN_QT_TEST macx: CONFIG -= app_bundle } +# Todo: Remove this line when switching to Qt5, as that option was removed CODECFORTR = UTF-8 # for lrelease/lupdate @@ -335,7 +338,7 @@ QMAKE_EXTRA_COMPILERS += TSQM OTHER_FILES += README.md \ doc/*.rst \ doc/*.txt \ - doc/README \ + doc/*.md \ src/qt/res/bitcoin-qt.rc \ src/test/*.cpp \ src/test/*.h \ @@ -393,8 +396,8 @@ win32:!contains(MINGW_THREAD_BUGFIX, 0) { DEFINES += _FILE_OFFSET_BITS=64 } -macx:HEADERS += src/qt/macdockiconhandler.h -macx:OBJECTIVE_SOURCES += src/qt/macdockiconhandler.mm +macx:HEADERS += src/qt/macdockiconhandler.h src/qt/macnotificationhandler.h +macx:OBJECTIVE_SOURCES += src/qt/macdockiconhandler.mm src/qt/macnotificationhandler.mm macx:LIBS += -framework Foundation -framework ApplicationServices -framework AppKit -framework CoreServices macx:DEFINES += MAC_OSX MSG_NOSIGNAL=0 macx:ICON = src/qt/res/icons/bitcoin.icns @@ -411,6 +414,7 @@ LIBS += -lssl -lcrypto -ldb_cxx$$BDB_LIB_SUFFIX win32:LIBS += -lws2_32 -lshlwapi -lmswsock -lole32 -loleaut32 -luuid -lgdi32 LIBS += -lboost_system$$BOOST_LIB_SUFFIX -lboost_filesystem$$BOOST_LIB_SUFFIX -lboost_program_options$$BOOST_LIB_SUFFIX -lboost_thread$$BOOST_THREAD_LIB_SUFFIX win32:LIBS += -lboost_chrono$$BOOST_LIB_SUFFIX +macx:LIBS += -lboost_chrono$$BOOST_LIB_SUFFIX contains(RELEASE, 1) { !win32:!macx { diff --git a/contrib/debian/bitcoin-qt.desktop b/contrib/debian/bitcoin-qt.desktop index 7cb00a2c8b..5d6f781e4e 100644 --- a/contrib/debian/bitcoin-qt.desktop +++ b/contrib/debian/bitcoin-qt.desktop @@ -7,6 +7,6 @@ Comment[tr]=Bitcoin, eşten eşe kriptografik sanal para birimi Exec=/usr/bin/bitcoin-qt Terminal=false Type=Application -Icon=/usr/share/pixmaps/bitcoin80.xpm +Icon=/usr/share/pixmaps/bitcoin128.png MimeType=x-scheme-handler/bitcoin; Categories=Office; diff --git a/contrib/debian/bitcoin-qt.install b/contrib/debian/bitcoin-qt.install index ba407134e7..59cacb0e96 100644 --- a/contrib/debian/bitcoin-qt.install +++ b/contrib/debian/bitcoin-qt.install @@ -1,5 +1,6 @@ bitcoin-qt usr/bin share/pixmaps/bitcoin32.xpm usr/share/pixmaps -share/pixmaps/bitcoin80.xpm usr/share/pixmaps +share/pixmaps/bitcoin16.xpm usr/share/pixmaps +share/pixmaps/bitcoin128.png usr/share/pixmaps debian/bitcoin-qt.desktop usr/share/applications debian/bitcoin-qt.protocol usr/share/kde4/services/ diff --git a/contrib/debian/changelog b/contrib/debian/changelog index 4388e7175a..e600e46705 100644 --- a/contrib/debian/changelog +++ b/contrib/debian/changelog @@ -1,3 +1,9 @@ +bitcoin (0.8.1-natty3) natty; urgency=low + + * New pixmaps + + -- Jonas Schnelli Mon, 13 May 2013 16:14:00 +0100 + bitcoin (0.8.1-natty2) natty; urgency=low * Remove dumb broken launcher script diff --git a/contrib/gitian-descriptors/deps-win32.yml b/contrib/gitian-descriptors/deps-win32.yml index 106bd06a9b..90f4c6c4be 100644 --- a/contrib/gitian-descriptors/deps-win32.yml +++ b/contrib/gitian-descriptors/deps-win32.yml @@ -10,6 +10,7 @@ packages: - "zip" - "faketime" - "wine" +- "psmisc" reference_datetime: "2011-01-30 00:00:00" remotes: [] files: diff --git a/contrib/gitian-descriptors/gitian.yml b/contrib/gitian-descriptors/gitian.yml index 8243c5c301..195d0e36ff 100644 --- a/contrib/gitian-descriptors/gitian.yml +++ b/contrib/gitian-descriptors/gitian.yml @@ -43,7 +43,7 @@ script: | cd bitcoin mkdir -p $OUTDIR/src git archive HEAD | tar -x -C $OUTDIR/src - cp $OUTDIR/src/doc/README $OUTDIR + cp $OUTDIR/src/doc/README.md $OUTDIR cp $OUTDIR/src/COPYING $OUTDIR cd src make -f makefile.unix STATIC=1 OPENSSL_INCLUDE_PATH="$INSTDIR/include" OPENSSL_LIB_PATH="$INSTDIR/lib" $MAKEOPTS bitcoind USE_UPNP=0 DEBUGFLAGS= diff --git a/contrib/test-patches/bitcoind-comparison.patch b/contrib/test-patches/bitcoind-comparison.patch index 7464349b3c..f82b102e2a 100644 --- a/contrib/test-patches/bitcoind-comparison.patch +++ b/contrib/test-patches/bitcoind-comparison.patch @@ -3,9 +3,9 @@ index 04a8618..519429a 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -31,8 +31,8 @@ CTxMemPool mempool; - unsigned int nTransactionsUpdated = 0; map mapBlockIndex; + std::vector vBlockIndexByHeight; -uint256 hashGenesisBlock("0x000000000019d6689c085ae165831e934ff763ae46a2a6c172b3f1b60a8ce26f"); -static CBigNum bnProofOfWorkLimit(~uint256(0) >> 32); +uint256 hashGenesisBlock("0x0f9188f13cb7b2c71f2a335e3a4fc328bf5beb436012afca590b1a11466e2206"); diff --git a/contrib/test-patches/temp-revert-1.patch b/contrib/test-patches/temp-revert-1.patch deleted file mode 100644 index a5aec641ce..0000000000 --- a/contrib/test-patches/temp-revert-1.patch +++ /dev/null @@ -1,21 +0,0 @@ -commit 4dcc8701ac0eb09d8992d19fb411cee3c9aaf394 -Author: Matt Corallo -Date: Sun Mar 24 20:45:44 2013 -0400 - - Revert "Update unit test to match rule enforcement starts 21 March" - - This reverts commit d3e8c6a9d3fad68b0eee4434401ec7b3066399a2. - -diff --git a/src/test/checkblock_tests.cpp b/src/test/checkblock_tests.cpp -index 3cfb6db..e167def 100644 ---- a/src/test/checkblock_tests.cpp -+++ b/src/test/checkblock_tests.cpp -@@ -52,7 +52,7 @@ BOOST_AUTO_TEST_CASE(May15) - if (read_block("Mar12Fork.dat", forkingBlock)) - { - CValidationState state; -- forkingBlock.nTime = tMay15-1; // Invalidates PoW -+ BOOST_CHECK(!forkingBlock.CheckBlock(state, true, true)); - BOOST_CHECK(!forkingBlock.CheckBlock(state, false, false)); - - // After May 15'th, big blocks are OK: diff --git a/contrib/test-patches/temp-revert-3.patch b/contrib/test-patches/temp-revert-3.patch deleted file mode 100644 index 5c0775dfa5..0000000000 --- a/contrib/test-patches/temp-revert-3.patch +++ /dev/null @@ -1,34 +0,0 @@ -commit ba84709c65b911798ddae1285d807f4cd036990d -Author: Matt Corallo -Date: Sun Mar 24 20:45:56 2013 -0400 - - Revert "Before 15 May, limit created block size to 500K" - - This reverts commit 402f19b64530775a7e4ded025c80d8c16a55e454. - -diff --git a/src/main.cpp b/src/main.cpp -index 22baf0f..51ada0a 100644 ---- a/src/main.cpp -+++ b/src/main.cpp -@@ -2057,8 +2057,8 @@ bool CBlock::CheckBlock(CValidationState &state, bool fCheckPOW, bool fCheckMerk - return state.DoS(100, error("CheckBlock() : size limits failed")); - - // Special short-term limits to avoid 10,000 BDB lock limit: -- if (GetBlockTime() >= 1363867200 && // start enforcing 21 March 2013, noon GMT -- GetBlockTime() < 1368576000) // stop enforcing 15 May 2013 00:00:00 -+ if (GetBlockTime() > 1363039171 && // 11 March 2013, timestamp of block before the big fork -+ GetBlockTime() < 1368576000) // 15 May 2013 00:00:00 - { - // Rule is: #unique txids referenced <= 4,500 - // ... to prevent 10,000 BDB lock exhaustion on old clients -@@ -4155,10 +4155,6 @@ CBlockTemplate* CreateNewBlock(CReserveKey& reservekey) - // Limit to betweeen 1K and MAX_BLOCK_SIZE-1K for sanity: - nBlockMaxSize = std::max((unsigned int)1000, std::min((unsigned int)(MAX_BLOCK_SIZE-1000), nBlockMaxSize)); - -- // Special compatibility rule before 15 May: limit size to 500,000 bytes: -- if (GetAdjustedTime() < 1368576000) -- nBlockMaxSize = std::min(nBlockMaxSize, (unsigned int)(MAX_BLOCK_SIZE_GEN)); -- - // How much of the block should be dedicated to high-priority transactions, - // included regardless of the fees they pay - unsigned int nBlockPrioritySize = GetArg("-blockprioritysize", 27000); diff --git a/contrib/test-patches/temp-revert-4.patch b/contrib/test-patches/temp-revert-4.patch deleted file mode 100644 index f93d7549c0..0000000000 --- a/contrib/test-patches/temp-revert-4.patch +++ /dev/null @@ -1,110 +0,0 @@ -commit ca96b88b61f647d4f56d5d06321dda08a43bf92f -Author: Matt Corallo -Date: Sun Mar 24 20:46:01 2013 -0400 - - Revert "CheckBlock rule until 15-May for 10,000 BDB lock compatibility" - - This reverts commit 8c222dca4f961ad13ec64d690134a40d09b20813. - -diff --git a/src/main.cpp b/src/main.cpp -index 51ada0a..9a06dbf 100644 ---- a/src/main.cpp -+++ b/src/main.cpp -@@ -2056,25 +2056,6 @@ bool CBlock::CheckBlock(CValidationState &state, bool fCheckPOW, bool fCheckMerk - if (vtx.empty() || vtx.size() > MAX_BLOCK_SIZE || ::GetSerializeSize(*this, SER_NETWORK, PROTOCOL_VERSION) > MAX_BLOCK_SIZE) - return state.DoS(100, error("CheckBlock() : size limits failed")); - -- // Special short-term limits to avoid 10,000 BDB lock limit: -- if (GetBlockTime() > 1363039171 && // 11 March 2013, timestamp of block before the big fork -- GetBlockTime() < 1368576000) // 15 May 2013 00:00:00 -- { -- // Rule is: #unique txids referenced <= 4,500 -- // ... to prevent 10,000 BDB lock exhaustion on old clients -- set setTxIn; -- for (size_t i = 0; i < vtx.size(); i++) -- { -- setTxIn.insert(vtx[i].GetHash()); -- if (i == 0) continue; // skip coinbase txin -- BOOST_FOREACH(const CTxIn& txin, vtx[i].vin) -- setTxIn.insert(txin.prevout.hash); -- } -- size_t nTxids = setTxIn.size(); -- if (nTxids > 4500) -- return error("CheckBlock() : 15 May maxlocks violation"); -- } -- - // Check proof of work matches claimed amount - if (fCheckPOW && !CheckProofOfWork(GetHash(), nBits)) - return state.DoS(50, error("CheckBlock() : proof of work failed")); -diff --git a/src/test/checkblock_tests.cpp b/src/test/checkblock_tests.cpp -deleted file mode 100644 -index e167def..0000000 ---- a/src/test/checkblock_tests.cpp -+++ /dev/null -@@ -1,66 +0,0 @@ --// --// Unit tests for block.CheckBlock() --// --#include -- --#include // for 'map_list_of()' --#include --#include --#include -- --#include "main.h" --#include "wallet.h" --#include "net.h" --#include "util.h" -- --BOOST_AUTO_TEST_SUITE(CheckBlock_tests) -- --bool --read_block(const std::string& filename, CBlock& block) --{ -- namespace fs = boost::filesystem; -- fs::path testFile = fs::current_path() / "test" / "data" / filename; --#ifdef TEST_DATA_DIR -- if (!fs::exists(testFile)) -- { -- testFile = fs::path(BOOST_PP_STRINGIZE(TEST_DATA_DIR)) / filename; -- } --#endif -- FILE* fp = fopen(testFile.string().c_str(), "rb"); -- if (!fp) return false; -- -- fseek(fp, 8, SEEK_SET); // skip msgheader/size -- -- CAutoFile filein = CAutoFile(fp, SER_DISK, CLIENT_VERSION); -- if (!filein) return false; -- -- filein >> block; -- -- return true; --} -- --BOOST_AUTO_TEST_CASE(May15) --{ -- // Putting a 1MB binary file in the git repository is not a great -- // idea, so this test is only run if you manually download -- // test/data/Mar12Fork.dat from -- // http://sourceforge.net/projects/bitcoin/files/Bitcoin/blockchain/Mar12Fork.dat/download -- unsigned int tMay15 = 1368576000; -- SetMockTime(tMay15); // Test as if it was right at May 15 -- -- CBlock forkingBlock; -- if (read_block("Mar12Fork.dat", forkingBlock)) -- { -- CValidationState state; -- BOOST_CHECK(!forkingBlock.CheckBlock(state, true, true)); -- BOOST_CHECK(!forkingBlock.CheckBlock(state, false, false)); -- -- // After May 15'th, big blocks are OK: -- forkingBlock.nTime = tMay15; // Invalidates PoW -- BOOST_CHECK(forkingBlock.CheckBlock(state, false, false)); -- } -- -- SetMockTime(0); --} -- --BOOST_AUTO_TEST_SUITE_END() diff --git a/contrib/verifysfbinaries/verify.sh b/contrib/verifysfbinaries/verify.sh index b109cd3ed0..768be86bdc 100755 --- a/contrib/verifysfbinaries/verify.sh +++ b/contrib/verifysfbinaries/verify.sh @@ -18,7 +18,7 @@ WORKINGDIR="/tmp/bitcoin" TMPFILE="hashes.tmp" #this URL is used if a version number is not specified as an argument to the script -SIGNATUREFILE="http://downloads.sourceforge.net/project/bitcoin/Bitcoin/bitcoin-0.8.1/SHA256SUMS.asc" +SIGNATUREFILE="http://downloads.sourceforge.net/project/bitcoin/Bitcoin/bitcoin-0.8.2/SHA256SUMS.asc" SIGNATUREFILENAME="SHA256SUMS.asc" RCSUBDIR="test/" diff --git a/doc/README b/doc/README deleted file mode 100644 index dfcb259389..0000000000 --- a/doc/README +++ /dev/null @@ -1,33 +0,0 @@ -Bitcoin 0.8.0 BETA - -Copyright (c) 2009-2013 Bitcoin Developers -Distributed under the MIT/X11 software license, see the accompanying -file COPYING or http://www.opensource.org/licenses/mit-license.php. -This product includes software developed by the OpenSSL Project for use in -the OpenSSL Toolkit (http://www.openssl.org/). This product includes -cryptographic software written by Eric Young (eay@cryptsoft.com). - - -Intro ------ -Bitcoin is a free open source peer-to-peer electronic cash system that is -completely decentralized, without the need for a central server or trusted -parties. Users hold the crypto keys to their own money and transact directly -with each other, with the help of a P2P network to check for double-spending. - - -Setup ------ -You need the Qt4 run-time libraries to run Bitcoin-Qt. On Debian or Ubuntu: - sudo apt-get install libqtgui4 - -Unpack the files into a directory and run: - bin/32/bitcoin-qt (GUI, 32-bit) - bin/32/bitcoind (headless, 32-bit) - bin/64/bitcoin-qt (GUI, 64-bit) - bin/64/bitcoind (headless, 64-bit) - - -See the documentation at the bitcoin wiki: - https://en.bitcoin.it/wiki/Main_Page -for help and more information. diff --git a/doc/README.md b/doc/README.md new file mode 100644 index 0000000000..cdd31057ad --- /dev/null +++ b/doc/README.md @@ -0,0 +1,46 @@ +Bitcoin 0.8.2 BETA +==================== + +Copyright (c) 2009-2013 Bitcoin Developers + +Distributed under the MIT/X11 software license, see the accompanying +file COPYING or http://www.opensource.org/licenses/mit-license.php. +This product includes software developed by the OpenSSL Project for use in the [OpenSSL Toolkit](http://www.openssl.org/). This product includes +cryptographic software written by Eric Young ([eay@cryptsoft.com](mailto:eay@cryptsoft.com)), and UPnP software written by Thomas Bernard. + + +Intro +--------------------- +Bitcoin is a free open source peer-to-peer electronic cash system that is +completely decentralized, without the need for a central server or trusted +parties. Users hold the crypto keys to their own money and transact directly +with each other, with the help of a P2P network to check for double-spending. + + +Setup +--------------------- +You need the Qt4 run-time libraries to run Bitcoin-Qt. On Debian or Ubuntu: + `sudo apt-get install libqtgui4` + +Unpack the files into a directory and run: + +- bin/32/bitcoin-qt (GUI, 32-bit) +- bin/32/bitcoind (headless, 32-bit) +- bin/64/bitcoin-qt (GUI, 64-bit) +- bin/64/bitcoind (headless, 64-bit) + +See the documentation at the [Bitcoin Wiki](https://en.bitcoin.it/wiki/Main_Page) +for help and more information. + + +Other Pages +--------------------- +- [Unix Build Notes](build-unix.md) +- [OSX Build Notes](build-osx.md) +- [Windows Build Notes](build-msw.md) +- [Coding Guidelines](coding.md) +- [Release Process](release-process.md) +- [Release Notes](release-notes.md) +- [Multiwallet Qt Development](multiwallet-qt.md) +- [Unit Tests](unit-tests.md) +- [Translation Process](translation_process.md) \ No newline at end of file diff --git a/doc/README_windows.txt b/doc/README_windows.txt index 9e7c0836b1..b26fab3be8 100644 --- a/doc/README_windows.txt +++ b/doc/README_windows.txt @@ -1,4 +1,4 @@ -Bitcoin 0.8.0 BETA +Bitcoin 0.8.2 BETA Copyright (c) 2009-2013 Bitcoin Developers Distributed under the MIT/X11 software license, see the accompanying @@ -20,15 +20,10 @@ Setup ----- Unpack the files into a directory and run bitcoin-qt.exe. -If you have Microsoft Security Essentials, you need to add bitcoin.exe to its -"Excluded processes" list. Microsoft Security Essentials->Settings tab, -select Excluded processes, press Add, select bitcoin.exe, OK, Save changes. - -The software automatically finds other nodes to connect to. You can -enable Universal Plug and Play using a menu entry or set your firewall -to forward port 8333 (TCP) to your computer so you can receive -incoming connections. Bitcoin works without incoming connections, -but allowing incoming connections helps the Bitcoin network. +Bitcoin-Qt is the original Bitcoin client and it builds the backbone of the network. +However, it downloads and stores the entire history of Bitcoin transactions; +depending on the speed of your computer and network connection, the synchronization +process can take anywhere from a few hours to a day or more. See the bitcoin wiki at: https://en.bitcoin.it/wiki/Main_Page diff --git a/doc/build-msw.txt b/doc/build-msw.md similarity index 55% rename from doc/build-msw.txt rename to doc/build-msw.md index 3e64813b38..b7abe28877 100644 --- a/doc/build-msw.txt +++ b/doc/build-msw.md @@ -1,10 +1,9 @@ -Copyright (c) 2009-2012 Bitcoin Developers +Copyright (c) 2009-2013 Bitcoin Developers + Distributed under the MIT/X11 software license, see the accompanying file COPYING or http://www.opensource.org/licenses/mit-license.php. -This product includes software developed by the OpenSSL Project for use in -the OpenSSL Toolkit (http://www.openssl.org/). This product includes -cryptographic software written by Eric Young (eay@cryptsoft.com) and UPnP -software written by Thomas Bernard. +This product includes software developed by the OpenSSL Project for use in the [OpenSSL Toolkit](http://www.openssl.org/). This product includes +cryptographic software written by Eric Young ([eay@cryptsoft.com](mailto:eay@cryptsoft.com)), and UPnP software written by Thomas Bernard. See readme-qt.rst for instructions on building Bitcoin-Qt, the @@ -30,55 +29,62 @@ Boost \boost-1.50.0-mgw http://www.boost.org/users/download/ miniupnpc \miniupnpc-1.6-mgw http://miniupnp.tuxfamily.org/files/ Their licenses: -OpenSSL Old BSD license with the problematic advertising requirement -Berkeley DB New BSD license with additional requirement that linked software must be free open source -Boost MIT-like license -miniupnpc New (3-clause) BSD license + + OpenSSL Old BSD license with the problematic advertising requirement + Berkeley DB New BSD license with additional requirement that linked software must be free open source + Boost MIT-like license + miniupnpc New (3-clause) BSD license Versions used in this release: -OpenSSL 1.0.1c -Berkeley DB 4.8.30.NC -Boost 1.50.0 -miniupnpc 1.6 + + OpenSSL 1.0.1c + Berkeley DB 4.8.30.NC + Boost 1.50.0 + miniupnpc 1.6 OpenSSL ------- MSYS shell: + un-tar sources with MSYS 'tar xfz' to avoid issue with symlinks (OpenSSL ticket 2377) change 'MAKE' env. variable from 'C:\MinGW32\bin\mingw32-make.exe' to '/c/MinGW32/bin/mingw32-make.exe' -cd /c/openssl-1.0.1c-mgw -./config -make + cd /c/openssl-1.0.1c-mgw + ./config + make Berkeley DB ----------- MSYS shell: -cd /c/db-4.8.30.NC-mgw/build_unix -sh ../dist/configure --enable-mingw --enable-cxx -make + + cd /c/db-4.8.30.NC-mgw/build_unix + sh ../dist/configure --enable-mingw --enable-cxx + make Boost ----- DOS prompt: -downloaded boost jam 3.1.18 -cd \boost-1.50.0-mgw -bjam toolset=gcc --build-type=complete stage + + downloaded boost jam 3.1.18 + cd \boost-1.50.0-mgw + bjam toolset=gcc --build-type=complete stage MiniUPnPc --------- -UPnP support is optional, make with USE_UPNP= to disable it. +UPnP support is optional, make with `USE_UPNP=` to disable it. MSYS shell: -cd /c/miniupnpc-1.6-mgw -make -f Makefile.mingw -mkdir miniupnpc -cp *.h miniupnpc/ + + cd /c/miniupnpc-1.6-mgw + make -f Makefile.mingw + mkdir miniupnpc + cp *.h miniupnpc/ Bitcoin ------- DOS prompt: -cd \bitcoin\src -mingw32-make -f makefile.mingw -strip bitcoind.exe + + cd \bitcoin\src + mingw32-make -f makefile.mingw + strip bitcoind.exe diff --git a/doc/build-osx.md b/doc/build-osx.md index d9aa779f87..1fc33b15a3 100644 --- a/doc/build-osx.md +++ b/doc/build-osx.md @@ -47,13 +47,13 @@ be done in `Xcode > Preferences > Downloads > Components` and generally must be re-done or updated every time Xcode is updated. There's an assumption that you already have `git` installed, as well. If -not, it's the path of least resistance to install Github for Mac +not, it's the path of least resistance to install [Github for Mac](https://mac.github.com/) (OS X 10.7+) or [Git for OS X](https://code.google.com/p/git-osx-installer/). It is also available via Homebrew or MacPorts. -You will also need to install [Homebrew](http://mxcl.github.com/homebrew/) -or [MacPorts](http://www.macports.org/) in order to install library +You will also need to install [Homebrew](http://mxcl.github.io/homebrew/) +or [MacPorts](https://www.macports.org/) in order to install library dependencies. It's largely a religious decision which to choose, but, as of December 2012, MacPorts is a little easier because you can just install the dependencies immediately - no other work required. If you're unsure, read diff --git a/doc/build-unix.txt b/doc/build-unix.md similarity index 64% rename from doc/build-unix.txt rename to doc/build-unix.md index a1e24ff5d1..6181bb255d 100644 --- a/doc/build-unix.txt +++ b/doc/build-unix.md @@ -1,26 +1,23 @@ -Copyright (c) 2009-2012 Bitcoin Developers +Copyright (c) 2009-2013 Bitcoin Developers + Distributed under the MIT/X11 software license, see the accompanying file COPYING or http://www.opensource.org/licenses/mit-license.php. -This product includes software developed by the OpenSSL Project for use in -the OpenSSL Toolkit (http://www.openssl.org/). This product includes -cryptographic software written by Eric Young (eay@cryptsoft.com) and UPnP -software written by Thomas Bernard. - +This product includes software developed by the OpenSSL Project for use in the [OpenSSL Toolkit](http://www.openssl.org/). This product includes +cryptographic software written by Eric Young ([eay@cryptsoft.com](mailto:eay@cryptsoft.com)), and UPnP software written by Thomas Bernard. UNIX BUILD NOTES -================ +==================== To Build --------- +--------------------- -cd src/ -make -f makefile.unix # Headless bitcoin + cd src/ + make -f makefile.unix # Headless bitcoin -See readme-qt.rst for instructions on building Bitcoin-Qt, -the graphical user interface. +See readme-qt.rst for instructions on building Bitcoin-Qt, the graphical user interface. Dependencies ------------- +--------------------- Library Purpose Description ------- ------- ----------- @@ -29,15 +26,17 @@ Dependencies libboost Boost C++ Library miniupnpc UPnP Support Optional firewall-jumping support -miniupnpc may be used for UPnP port mapping. It can be downloaded from -http://miniupnp.tuxfamily.org/files/. UPnP support is compiled in and +[miniupnpc](http://miniupnp.free.fr/) may be used for UPnP port mapping. It can be downloaded from [here]( +http://miniupnp.tuxfamily.org/files/). UPnP support is compiled in and turned off by default. Set USE_UPNP to a different value to control this: - USE_UPNP=- No UPnP support - miniupnp not required - USE_UPNP=0 (the default) UPnP support turned off by default at runtime - USE_UPNP=1 UPnP support turned on by default at runtime + + USE_UPNP= No UPnP support miniupnp not required + USE_UPNP=0 (the default) UPnP support turned off by default at runtime + USE_UPNP=1 UPnP support turned on by default at runtime IPv6 support may be disabled by setting: - USE_IPV6=0 Disable IPv6 support + + USE_IPV6=0 Disable IPv6 support Licenses of statically linked libraries: Berkeley DB New BSD license with additional requirement that linked @@ -45,51 +44,54 @@ Licenses of statically linked libraries: Boost MIT-like license miniupnpc New (3-clause) BSD license -Versions used in this release: - GCC 4.3.3 - OpenSSL 1.0.1c - Berkeley DB 4.8.30.NC - Boost 1.37 - miniupnpc 1.6 +- Versions used in this release: +- GCC 4.3.3 +- OpenSSL 1.0.1c +- Berkeley DB 4.8.30.NC +- Boost 1.37 +- miniupnpc 1.6 Dependency Build Instructions: Ubuntu & Debian ---------------------------------------------- Build requirements: - sudo apt-get install build-essential - sudo apt-get install libssl-dev + + sudo apt-get install build-essential + sudo apt-get install libssl-dev for Ubuntu 12.04: - sudo apt-get install libboost-all-dev - db4.8 packages are available at: - https://launchpad.net/~bitcoin/+archive/bitcoin + sudo apt-get install libboost-all-dev + + db4.8 packages are available [here](https://launchpad.net/~bitcoin/+archive/bitcoin). Ubuntu precise has packages for libdb5.1-dev and libdb5.1++-dev, but using these will break binary wallet compatibility, and is not recommended. for other Ubuntu & Debian: - sudo apt-get install libdb4.8-dev - sudo apt-get install libdb4.8++-dev - sudo apt-get install libboost1.37-dev + + sudo apt-get install libdb4.8-dev + sudo apt-get install libdb4.8++-dev + sudo apt-get install libboost1.37-dev (If using Boost 1.37, append -mt to the boost libraries in the makefile) Optional: - sudo apt-get install libminiupnpc-dev (see USE_UPNP compile flag) + + sudo apt-get install libminiupnpc-dev (see USE_UPNP compile flag) Dependency Build Instructions: Gentoo ------------------------------------- -Note: If you just want to install bitcoind on Gentoo, you can add the Bitcoin - overlay and use your package manager: - layman -a bitcoin && emerge bitcoind +Note: If you just want to install bitcoind on Gentoo, you can add the Bitcoin overlay and use your package manager: -emerge -av1 --noreplace boost glib openssl sys-libs/db:4.8 + layman -a bitcoin && emerge bitcoind + emerge -av1 --noreplace boost glib openssl sys-libs/db:4.8 Take the following steps to build (no UPnP support): - cd ${BITCOIN_DIR}/src - make -f makefile.unix USE_UPNP= USE_IPV6=1 BDB_INCLUDE_PATH='/usr/include/db4.8' - strip bitcoind + + cd ${BITCOIN_DIR}/src + make -f makefile.unix USE_UPNP= USE_IPV6=1 BDB_INCLUDE_PATH='/usr/include/db4.8' + strip bitcoind Notes @@ -100,26 +102,28 @@ symbols, which reduces the executable size by about 90%. miniupnpc --------- -tar -xzvf miniupnpc-1.6.tar.gz -cd miniupnpc-1.6 -make -sudo su -make install + tar -xzvf miniupnpc-1.6.tar.gz + cd miniupnpc-1.6 + make + sudo su + make install Berkeley DB ----------- You need Berkeley DB 4.8. If you have to build Berkeley DB yourself: -../dist/configure --enable-cxx -make + + ../dist/configure --enable-cxx + make Boost ----- If you need to build Boost yourself: -sudo su -./bootstrap.sh -./bjam install + + sudo su + ./bootstrap.sh + ./bjam install Security @@ -138,10 +142,12 @@ exploit even if a vulnerability is found, you can take the following measures: such as: "relocation R_X86_64_32 against `......' can not be used when making a shared object;" To build with PIE, use: - make -f makefile.unix ... -e PIE=1 + + make -f makefile.unix ... -e PIE=1 To test that you have built PIE executable, install scanelf, part of paxutils, and use: - scanelf -e ./bitcoin + + scanelf -e ./bitcoin The output should contain: TYPE @@ -155,10 +161,10 @@ exploit even if a vulnerability is found, you can take the following measures: executable without the non-executable stack protection. To verify that the stack is non-executable after compiling use: - scanelf -e ./bitcoin + `scanelf -e ./bitcoin` the output should contain: - STK/REL/PTL - RW- R-- RW- + STK/REL/PTL + RW- R-- RW- The STK RW- means that the stack is readable and writeable but not executable. diff --git a/doc/coding.md b/doc/coding.md new file mode 100644 index 0000000000..3581d7deb2 --- /dev/null +++ b/doc/coding.md @@ -0,0 +1,94 @@ +Coding +==================== + +Please be consistent with the existing coding style. + +Block style: + + bool Function(char* psz, int n) + { + // Comment summarising what this section of code does + for (int i = 0; i < n; i++) + { + // When something fails, return early + if (!Something()) + return false; + ... + } + + // Success return is usually at the end + return true; + } + +- ANSI/Allman block style +- 4 space indenting, no tabs +- No extra spaces inside parenthesis; please don't do ( this ) +- No space after function names, one space after if, for and while + +Variable names begin with the type in lowercase, like nSomeVariable. +Please don't put the first word of the variable name in lowercase like +someVariable. + +Common types: + + n integer number: short, unsigned short, int, unsigned int, int64, uint64, sometimes char if used as a number + d double, float + f flag + hash uint256 + p pointer or array, one p for each level of indirection + psz pointer to null terminated string + str string object + v vector or similar list objects + map map or multimap + set set or multiset + bn CBigNum + +------------------------- +Locking/mutex usage notes + +The code is multi-threaded, and uses mutexes and the +LOCK/TRY_LOCK macros to protect data structures. + +Deadlocks due to inconsistent lock ordering (thread 1 locks cs_main +and then cs_wallet, while thread 2 locks them in the opposite order: +result, deadlock as each waits for the other to release its lock) are +a problem. Compile with -DDEBUG_LOCKORDER to get lock order +inconsistencies reported in the debug.log file. + +Re-architecting the core code so there are better-defined interfaces +between the various components is a goal, with any necessary locking +done by the components (e.g. see the self-contained CKeyStore class +and its cs_KeyStore lock for example). + +------- +Threads + +- StartNode : Starts other threads. + +- ThreadGetMyExternalIP : Determines outside-the-firewall IP address, sends addr message to connected peers when it determines it. + +- ThreadSocketHandler : Sends/Receives data from peers on port 8333. + +- ThreadMessageHandler : Higher-level message handling (sending and receiving). + +- ThreadOpenConnections : Initiates new connections to peers. + +- ThreadTopUpKeyPool : replenishes the keystore's keypool. + +- ThreadCleanWalletPassphrase : re-locks an encrypted wallet after user has unlocked it for a period of time. + +- SendingDialogStartTransfer : used by pay-via-ip-address code (obsolete) + +- ThreadDelayedRepaint : repaint the gui + +- ThreadFlushWalletDB : Close the wallet.dat file if it hasn't been used in 500ms. + +- ThreadRPCServer : Remote procedure call handler, listens on port 8332 for connections and services them. + +- ThreadBitcoinMiner : Generates bitcoins + +- ThreadMapPort : Universal plug-and-play startup/shutdown + +- Shutdown : Does an orderly shutdown of everything + +- ExitTimeout : Windows-only, sleeps 5 seconds then exits application diff --git a/doc/coding.txt b/doc/coding.txt deleted file mode 100644 index 427e388cfd..0000000000 --- a/doc/coding.txt +++ /dev/null @@ -1,96 +0,0 @@ -Please be consistent with the existing coding style. - -Block style: - -bool Function(char* psz, int n) -{ - // Comment summarising what this section of code does - for (int i = 0; i < n; i++) - { - // When something fails, return early - if (!Something()) - return false; - ... - } - - // Success return is usually at the end - return true; -} - -- ANSI/Allman block style -- 4 space indenting, no tabs -- No extra spaces inside parenthesis; please don't do ( this ) -- No space after function names, one space after if, for and while - -Variable names begin with the type in lowercase, like nSomeVariable. -Please don't put the first word of the variable name in lowercase like -someVariable. - -Common types: -n integer number: short, unsigned short, int, unsigned int, - int64, uint64, sometimes char if used as a number -d double, float -f flag -hash uint256 -p pointer or array, one p for each level of indirection -psz pointer to null terminated string -str string object -v vector or similar list objects -map map or multimap -set set or multiset -bn CBigNum - -------------------------- -Locking/mutex usage notes - -The code is multi-threaded, and uses mutexes and the -LOCK/TRY_LOCK macros to protect data structures. - -Deadlocks due to inconsistent lock ordering (thread 1 locks cs_main -and then cs_wallet, while thread 2 locks them in the opposite order: -result, deadlock as each waits for the other to release its lock) are -a problem. Compile with -DDEBUG_LOCKORDER to get lock order -inconsistencies reported in the debug.log file. - -Re-architecting the core code so there are better-defined interfaces -between the various components is a goal, with any necessary locking -done by the components (e.g. see the self-contained CKeyStore class -and its cs_KeyStore lock for example). - -------- -Threads - -StartNode : Starts other threads. - -ThreadGetMyExternalIP : Determines outside-the-firewall IP address, -sends addr message to connected peers when it determines it. - -ThreadSocketHandler : Sends/Receives data from peers on port 8333. - -ThreadMessageHandler : Higher-level message handling (sending and -receiving). - -ThreadOpenConnections : Initiates new connections to peers. - -ThreadTopUpKeyPool : replenishes the keystore's keypool. - -ThreadCleanWalletPassphrase : re-locks an encrypted wallet after user -has unlocked it for a period of time. - -SendingDialogStartTransfer : used by pay-via-ip-address code (obsolete) - -ThreadDelayedRepaint : repaint the gui - -ThreadFlushWalletDB : Close the wallet.dat file if it hasn't been used -in 500ms. - -ThreadRPCServer : Remote procedure call handler, listens on port 8332 -for connections and services them. - -ThreadBitcoinMiner : Generates bitcoins - -ThreadMapPort : Universal plug-and-play startup/shutdown - -Shutdown : Does an orderly shutdown of everything - -ExitTimeout : Windows-only, sleeps 5 seconds then exits application diff --git a/doc/multiwallet-qt.txt b/doc/multiwallet-qt.md similarity index 89% rename from doc/multiwallet-qt.txt rename to doc/multiwallet-qt.md index 8394080db0..8d695552b5 100644 --- a/doc/multiwallet-qt.txt +++ b/doc/multiwallet-qt.md @@ -39,15 +39,14 @@ Changes to bitcoin.cpp bitcoin.cpp is the entry point into bitcoin-qt, and as such, will require some minor modifications to provide hooks for multiple wallet support. Most importantly will be the way it instantiates WalletModels and passes them to the singleton BitcoinGUI instance called window. Formerly, BitcoinGUI kept a pointer to a single instance of a WalletModel. -The initial change required is very simple: rather than calling window.setWalletModel(&walletModel); we perform the +The initial change required is very simple: rather than calling `window.setWalletModel(&walletModel);` we perform the following two steps: -window.addWallet("~Default", &walletModel); -window.setCurrentWallet("~Default"); + window.addWallet("~Default", &walletModel); + window.setCurrentWallet("~Default"); -The string parameter is just an arbitrary name given to the default wallet. It's been prepended with a tilde to avoid name -collisions in the future with additional wallets. +The string parameter is just an arbitrary name given to the default wallet. It's been prepended with a tilde to avoid name collisions in the future with additional wallets. -The shutdown call window.setWalletModel(0) has also been removed. In its place is now: +The shutdown call `window.setWalletModel(0)` has also been removed. In its place is now: window.removeAllWallets(); diff --git a/doc/readme-qt.rst b/doc/readme-qt.rst index 1bc3d701ae..95cb33650f 100644 --- a/doc/readme-qt.rst +++ b/doc/readme-qt.rst @@ -28,6 +28,12 @@ for Ubuntu >= 12.04 (please read the 'Berkely DB version warning' below): libboost-filesystem-dev libboost-program-options-dev libboost-thread-dev \ libssl-dev libdb++-dev libminiupnpc-dev +For Qt 5 you need the following, otherwise you get an error with lrelease when running qmake: + +:: + + apt-get install qt5-qmake libqt5gui5 libqt5core5 libqt5dbus5 qttools5-dev-tools + then execute the following: :: diff --git a/doc/release-notes.md b/doc/release-notes.md new file mode 100644 index 0000000000..acaeef1d60 --- /dev/null +++ b/doc/release-notes.md @@ -0,0 +1,3 @@ +(note: this is a temporary file, to be added-to by anybody, and deleted at +release time) + diff --git a/doc/release-notes.txt b/doc/release-notes.txt deleted file mode 100644 index 414d5d68c9..0000000000 --- a/doc/release-notes.txt +++ /dev/null @@ -1,99 +0,0 @@ -(note: this is a temporary file, to be added-to by anybody, and deleted at -release time) - -Building this from - - $ git shortlog --no-merges v0.7.1.. - -Incompatible Changes --------------------- - -This release no longer maintains a full index of historical transaction ids -by default, so looking up an arbitrary transaction using the getrawtransaction -RPC call will not work. If you need that functionality, you must run once -with -txindex -reindex to rebuild block-chain indices (see below for more -details). - -Improvements ------------- - -Mac and Windows binaries are signed with certificates owned by the Bitcoin -Foundation, to be compatible with the new security features in OSX 10.8 and -Windows 8. - -LevelDB, a fast, open-source, non-relational database from Google, is -now used to store transaction and block indices. LevelDB works much better -on machines with slow I/O and is faster in general. Berkeley DB is now only -used for the wallet.dat file (public and private wallet keys and transactions -relevant to you). - -Pieter Wuille implemented many optimizations to the way transactions are -verified, so a running, synchronized node uses much less memory and does -much less I/O. He also implemented parallel signature checking, so if you -have a multi-CPU machine all CPUs will be used to verify transactions. - -New Features ------------- - -"Bloom filter" support in the network protocol for sending only relevant transactions to -lightweight clients. - -contrib/verifysfbinaries is a shell-script to verify that the binary downloads -at sourceforge have not been tampered with. If you are able, you can help make -everybody's downloads more secure by running this occasionally to check PGP -signatures against download file checksums. - -contrib/spendfrom is a python-language command-line utility that demonstrates -how to use the "raw transactions" JSON-RPC api to send coins received from particular -addresses (also known as "coin control"). - -New/changed settings (command-line or bitcoin.conf file) --------------------------------------------------------- - -dbcache : now controls LevelDB memory usage. Running with (for example) -dbcache=1000 -will use a gigabyte of memory and might make the initial blockchain download faster. - -par : controls how many threads to use to validate transactions. Defaults to the number -of CPUs on your machine, use -par=1 to limit to a single CPU. - -txindex : maintains an extra index of old, spent transaction ids so they will be found -by the getrawtransaction JSON-RPC method. Can only be set when the database is -initialized. - -reindex : rebuild block and transaction indices from the downloaded block data. - -New JSON-RPC API Features -------------------------- - -lockunspent / listlockunspent allow locking transaction outputs for a period of time so -they will not be spent by other processes that might be accessing the same wallet. - -addnode / getaddednodeinfo methods, to connect to specific peers without restarting. - -importprivkey now takes an optional boolean parameter (default true) to control whether -or not to rescan the blockchain for transactions after importing a new private key. - -gettxout retrieves a single transaction output from the current set of unspent outputs. -Optionally, the mempool transactions are taken into account. - -gettxoutsetinfo calculates statistics about the current set of unspent outputs. - -Important Bug Fixes -------------------- - -Privacy leak: the position of the "change" output in most transactions was not being -properly randomized, making network analysis of the transaction graph to identify -users' wallets easier. - -Zero-confirmation transaction vulnerability: accepting zero-confirmation transactions -(transactions that have not yet been included in a block) from somebody you do not -trust is still not recommended, because there will always be ways for attackers to -double-spend zero-confirmation transactions. However, this release includes a bug -fix that makes it a little bit more difficult for attackers to double-spend a -certain type ("lockTime in the future") of zero-confirmation transaction. - -Dependency Changes ------------------- - -Qt 4.8.3 (compiling against older versions of Qt 4 should continue to work) - diff --git a/doc/release-process.md b/doc/release-process.md new file mode 100644 index 0000000000..dc2101e1c1 --- /dev/null +++ b/doc/release-process.md @@ -0,0 +1,164 @@ +Release Process +==================== + +* update translations (ping wumpus, Diapolo or tcatm on IRC) +* see https://github.com/bitcoin/bitcoin/blob/master/doc/translation_process.md#syncing-with-transifex + +* * * + +###update (commit) version in sources + + + bitcoin-qt.pro + contrib/verifysfbinaries/verify.sh + doc/README* + share/setup.nsi + src/clientversion.h (change CLIENT_VERSION_IS_RELEASE to true) + +###tag version in git + + git tag -a v(new version, e.g. 0.8.0) + +###write release notes. git shortlog helps a lot, for example: + + git shortlog --no-merges v(current version, e.g. 0.7.2)..v(new version, e.g. 0.8.0) + +* * * + +##perform gitian builds + + From a directory containing the bitcoin source, gitian-builder and gitian.sigs + + export SIGNER=(your gitian key, ie bluematt, sipa, etc) + export VERSION=(new version, e.g. 0.8.0) + cd ./gitian-builder + + Fetch and build inputs: (first time, or when dependency versions change) + + mkdir -p inputs; cd inputs/ + wget 'http://miniupnp.free.fr/files/download.php?file=miniupnpc-1.6.tar.gz' -O miniupnpc-1.6.tar.gz + wget 'http://www.openssl.org/source/openssl-1.0.1c.tar.gz' + wget 'http://download.oracle.com/berkeley-db/db-4.8.30.NC.tar.gz' + wget 'http://zlib.net/zlib-1.2.6.tar.gz' + wget 'ftp://ftp.simplesystems.org/pub/libpng/png/src/libpng-1.5.9.tar.gz' + wget 'http://fukuchi.org/works/qrencode/qrencode-3.2.0.tar.bz2' + wget 'http://downloads.sourceforge.net/project/boost/boost/1.50.0/boost_1_50_0.tar.bz2' + wget 'http://releases.qt-project.org/qt4/source/qt-everywhere-opensource-src-4.8.3.tar.gz' + cd .. + ./bin/gbuild ../bitcoin/contrib/gitian-descriptors/boost-win32.yml + mv build/out/boost-win32-1.50.0-gitian2.zip inputs/ + ./bin/gbuild ../bitcoin/contrib/gitian-descriptors/qt-win32.yml + mv build/out/qt-win32-4.8.3-gitian-r1.zip inputs/ + ./bin/gbuild ../bitcoin/contrib/gitian-descriptors/deps-win32.yml + mv build/out/bitcoin-deps-0.0.5.zip inputs/ + + Build bitcoind and bitcoin-qt on Linux32, Linux64, and Win32: + + ./bin/gbuild --commit bitcoin=v${VERSION} ../bitcoin/contrib/gitian-descriptors/gitian.yml + ./bin/gsign --signer $SIGNER --release ${VERSION} --destination ../gitian.sigs/ ../bitcoin/contrib/gitian-descriptors/gitian.yml + pushd build/out + zip -r bitcoin-${VERSION}-linux-gitian.zip * + mv bitcoin-${VERSION}-linux-gitian.zip ../../ + popd + ./bin/gbuild --commit bitcoin=v${VERSION} ../bitcoin/contrib/gitian-descriptors/gitian-win32.yml + ./bin/gsign --signer $SIGNER --release ${VERSION}-win32 --destination ../gitian.sigs/ ../bitcoin/contrib/gitian-descriptors/gitian-win32.yml + pushd build/out + zip -r bitcoin-${VERSION}-win32-gitian.zip * + mv bitcoin-${VERSION}-win32-gitian.zip ../../ + popd + + Build output expected: + + 1. linux 32-bit and 64-bit binaries + source (bitcoin-${VERSION}-linux-gitian.zip) + 2. windows 32-bit binary, installer + source (bitcoin-${VERSION}-win32-gitian.zip) + 3. Gitian signatures (in gitian.sigs/${VERSION}[-win32]/(your gitian key)/ + +repackage gitian builds for release as stand-alone zip/tar/installer exe + +**Linux .tar.gz:** + + unzip bitcoin-${VERSION}-linux-gitian.zip -d bitcoin-${VERSION}-linux + tar czvf bitcoin-${VERSION}-linux.tar.gz bitcoin-${VERSION}-linux + rm -rf bitcoin-${VERSION}-linux + +**Windows .zip and setup.exe:** + + unzip bitcoin-${VERSION}-win32-gitian.zip -d bitcoin-${VERSION}-win32 + mv bitcoin-${VERSION}-win32/bitcoin-*-setup.exe . + zip -r bitcoin-${VERSION}-win32.zip bitcoin-${VERSION}-win32 + rm -rf bitcoin-${VERSION}-win32 + +**Perform Mac build:** + + OSX binaries are created by Gavin Andresen on a 32-bit, OSX 10.6 machine. + + qmake RELEASE=1 USE_UPNP=1 USE_QRCODE=1 bitcoin-qt.pro + make + export QTDIR=/opt/local/share/qt4 # needed to find translations/qt_*.qm files + T=$(contrib/qt_translations.py $QTDIR/translations src/qt/locale) + python2.7 share/qt/clean_mac_info_plist.py + python2.7 contrib/macdeploy/macdeployqtplus Bitcoin-Qt.app -add-qt-tr $T -dmg -fancy contrib/macdeploy/fancy.plist + + Build output expected: Bitcoin-Qt.dmg + +###Next steps: + +* Code-sign Windows -setup.exe (in a Windows virtual machine) and + OSX Bitcoin-Qt.app (Note: only Gavin has the code-signing keys currently) + +* upload builds to SourceForge + +* create SHA256SUMS for builds, and PGP-sign it + +* update bitcoin.org version + make sure all OS download links go to the right versions + +* update forum version + +* update wiki download links + +* update wiki changelog: [https://en.bitcoin.it/wiki/Changelog](https://en.bitcoin.it/wiki/Changelog) + +Commit your signature to gitian.sigs: + + pushd gitian.sigs + git add ${VERSION}/${SIGNER} + git add ${VERSION}-win32/${SIGNER} + git commit -a + git push # Assuming you can push to the gitian.sigs tree + popd + +------------------------------------------------------------------------- + +### After 3 or more people have gitian-built, repackage gitian-signed zips: + +From a directory containing bitcoin source, gitian.sigs and gitian zips + + export VERSION=(new version, e.g. 0.8.0) + mkdir bitcoin-${VERSION}-linux-gitian + pushd bitcoin-${VERSION}-linux-gitian + unzip ../bitcoin-${VERSION}-linux-gitian.zip + mkdir gitian + cp ../bitcoin/contrib/gitian-downloader/*.pgp ./gitian/ + for signer in $(ls ../gitian.sigs/${VERSION}/); do + cp ../gitian.sigs/${VERSION}/${signer}/bitcoin-build.assert ./gitian/${signer}-build.assert + cp ../gitian.sigs/${VERSION}/${signer}/bitcoin-build.assert.sig ./gitian/${signer}-build.assert.sig + done + zip -r bitcoin-${VERSION}-linux-gitian.zip * + cp bitcoin-${VERSION}-linux-gitian.zip ../ + popd + mkdir bitcoin-${VERSION}-win32-gitian + pushd bitcoin-${VERSION}-win32-gitian + unzip ../bitcoin-${VERSION}-win32-gitian.zip + mkdir gitian + cp ../bitcoin/contrib/gitian-downloader/*.pgp ./gitian/ + for signer in $(ls ../gitian.sigs/${VERSION}-win32/); do + cp ../gitian.sigs/${VERSION}-win32/${signer}/bitcoin-build.assert ./gitian/${signer}-build.assert + cp ../gitian.sigs/${VERSION}-win32/${signer}/bitcoin-build.assert.sig ./gitian/${signer}-build.assert.sig + done + zip -r bitcoin-${VERSION}-win32-gitian.zip * + cp bitcoin-${VERSION}-win32-gitian.zip ../ + popd + +- Upload gitian zips to SourceForge +- Celebrate diff --git a/doc/release-process.txt b/doc/release-process.txt deleted file mode 100644 index 29271ad224..0000000000 --- a/doc/release-process.txt +++ /dev/null @@ -1,143 +0,0 @@ -* update translations (ping wumpus, Diapolo or tcatm on IRC) - * see https://github.com/bitcoin/bitcoin/blob/master/doc/translation_process.md#syncing-with-transifex - -* update (commit) version in sources - bitcoin-qt.pro - contrib/verifysfbinaries/verify.sh - doc/README* - share/setup.nsi - src/clientversion.h (change CLIENT_VERSION_IS_RELEASE to true) - -* tag version in git - - git tag -a v0.8.0 - -* write release notes. git shortlog helps a lot, for example: - - git shortlog --no-merges v0.7.2..v0.8.0 - -* perform gitian builds - - * From a directory containing the bitcoin source, gitian-builder and gitian.sigs - export SIGNER=(your gitian key, ie bluematt, sipa, etc) - export VERSION=0.8.0 - cd ./gitian-builder - - * Fetch and build inputs: (first time, or when dependency versions change) - mkdir -p inputs; cd inputs/ - wget 'http://miniupnp.free.fr/files/download.php?file=miniupnpc-1.6.tar.gz' -O miniupnpc-1.6.tar.gz - wget 'http://www.openssl.org/source/openssl-1.0.1c.tar.gz' - wget 'http://download.oracle.com/berkeley-db/db-4.8.30.NC.tar.gz' - wget 'http://zlib.net/zlib-1.2.6.tar.gz' - wget 'ftp://ftp.simplesystems.org/pub/libpng/png/src/libpng-1.5.9.tar.gz' - wget 'http://fukuchi.org/works/qrencode/qrencode-3.2.0.tar.bz2' - wget 'http://downloads.sourceforge.net/project/boost/boost/1.50.0/boost_1_50_0.tar.bz2' - wget 'http://releases.qt-project.org/qt4/source/qt-everywhere-opensource-src-4.8.3.tar.gz' - cd .. - ./bin/gbuild ../bitcoin/contrib/gitian-descriptors/boost-win32.yml - mv build/out/boost-win32-1.50.0-gitian2.zip inputs/ - ./bin/gbuild ../bitcoin/contrib/gitian-descriptors/qt-win32.yml - mv build/out/qt-win32-4.8.3-gitian-r1.zip inputs/ - ./bin/gbuild ../bitcoin/contrib/gitian-descriptors/deps-win32.yml - mv build/out/bitcoin-deps-0.0.5.zip inputs/ - - * Build bitcoind and bitcoin-qt on Linux32, Linux64, and Win32: - ./bin/gbuild --commit bitcoin=v${VERSION} ../bitcoin/contrib/gitian-descriptors/gitian.yml - ./bin/gsign --signer $SIGNER --release ${VERSION} --destination ../gitian.sigs/ ../bitcoin/contrib/gitian-descriptors/gitian.yml - pushd build/out - zip -r bitcoin-${VERSION}-linux-gitian.zip * - mv bitcoin-${VERSION}-linux-gitian.zip ../../ - popd - ./bin/gbuild --commit bitcoin=v${VERSION} ../bitcoin/contrib/gitian-descriptors/gitian-win32.yml - ./bin/gsign --signer $SIGNER --release ${VERSION}-win32 --destination ../gitian.sigs/ ../bitcoin/contrib/gitian-descriptors/gitian-win32.yml - pushd build/out - zip -r bitcoin-${VERSION}-win32-gitian.zip * - mv bitcoin-${VERSION}-win32-gitian.zip ../../ - popd - - Build output expected: - 1. linux 32-bit and 64-bit binaries + source (bitcoin-${VERSION}-linux-gitian.zip) - 2. windows 32-bit binary, installer + source (bitcoin-${VERSION}-win32-gitian.zip) - 3. Gitian signatures (in gitian.sigs/${VERSION}[-win32]/(your gitian key)/ - -* repackage gitian builds for release as stand-alone zip/tar/installer exe - - * Linux .tar.gz: - unzip bitcoin-${VERSION}-linux-gitian.zip -d bitcoin-${VERSION}-linux - tar czvf bitcoin-${VERSION}-linux.tar.gz bitcoin-${VERSION}-linux - rm -rf bitcoin-${VERSION}-linux - - * Windows .zip and setup.exe: - unzip bitcoin-${VERSION}-win32-gitian.zip -d bitcoin-${VERSION}-win32 - mv bitcoin-${VERSION}-win32/bitcoin-*-setup.exe . - zip -r bitcoin-${VERSION}-win32.zip bitcoin-${VERSION}-win32 - rm -rf bitcoin-${VERSION}-win32 - -* perform Mac build - OSX binaries are created by Gavin Andresen on a 32-bit, OSX 10.6 machine. - - qmake RELEASE=1 USE_UPNP=1 USE_QRCODE=1 bitcoin-qt.pro - make - export QTDIR=/opt/local/share/qt4 # needed to find translations/qt_*.qm files - T=$(contrib/qt_translations.py $QTDIR/translations src/qt/locale) - python2.7 contrib/macdeploy/macdeployqtplus Bitcoin-Qt.app -add-qt-tr $T -dmg -fancy contrib/macdeploy/fancy.plist - - Build output expected: - Bitcoin-Qt.dmg - -* Code-sign Windows -setup.exe (in a Windows virtual machine) and - OSX Bitcoin-Qt.app (Note: only Gavin has the code-signing keys currently) - -* upload builds to SourceForge - -* create SHA256SUMS for builds, and PGP-sign it - -* update bitcoin.org version - make sure all OS download links go to the right versions - -* update forum version - -* update wiki download links - -* update wiki changelog: https://en.bitcoin.it/wiki/Changelog - -* Commit your signature to gitian.sigs: - pushd gitian.sigs - git add ${VERSION}/${SIGNER} - git add ${VERSION}-win32/${SIGNER} - git commit -a - git push # Assuming you can push to the gitian.sigs tree - popd - -------------------------------------------------------------------------- - -* After 3 or more people have gitian-built, repackage gitian-signed zips: - - * From a directory containing bitcoin source, gitian.sigs and gitian zips - export VERSION=0.5.1 - mkdir bitcoin-${VERSION}-linux-gitian - pushd bitcoin-${VERSION}-linux-gitian - unzip ../bitcoin-${VERSION}-linux-gitian.zip - mkdir gitian - cp ../bitcoin/contrib/gitian-downloader/*.pgp ./gitian/ - for signer in $(ls ../gitian.sigs/${VERSION}/); do - cp ../gitian.sigs/${VERSION}/${signer}/bitcoin-build.assert ./gitian/${signer}-build.assert - cp ../gitian.sigs/${VERSION}/${signer}/bitcoin-build.assert.sig ./gitian/${signer}-build.assert.sig - done - zip -r bitcoin-${VERSION}-linux-gitian.zip * - cp bitcoin-${VERSION}-linux-gitian.zip ../ - popd - mkdir bitcoin-${VERSION}-win32-gitian - pushd bitcoin-${VERSION}-win32-gitian - unzip ../bitcoin-${VERSION}-win32-gitian.zip - mkdir gitian - cp ../bitcoin/contrib/gitian-downloader/*.pgp ./gitian/ - for signer in $(ls ../gitian.sigs/${VERSION}-win32/); do - cp ../gitian.sigs/${VERSION}-win32/${signer}/bitcoin-build.assert ./gitian/${signer}-build.assert - cp ../gitian.sigs/${VERSION}-win32/${signer}/bitcoin-build.assert.sig ./gitian/${signer}-build.assert.sig - done - zip -r bitcoin-${VERSION}-win32-gitian.zip * - cp bitcoin-${VERSION}-win32-gitian.zip ../ - popd - - * Upload gitian zips to SourceForge diff --git a/doc/unit-tests.txt b/doc/unit-tests.md similarity index 55% rename from doc/unit-tests.txt rename to doc/unit-tests.md index a12786512d..d6fb2d8e2d 100644 --- a/doc/unit-tests.txt +++ b/doc/unit-tests.md @@ -1,18 +1,19 @@ Compiling/running bitcoind unit tests ------------------------------------ -bitcoind unit tests are in the src/test/ directory; they +bitcoind unit tests are in the `src/test/` directory; they use the Boost::Test unit-testing framework. To compile and run the tests: -cd src -make -f makefile.unix test_bitcoin # Replace makefile.unix if you're not on unix -./test_bitcoin # Runs the unit tests + + cd src + make -f makefile.unix test_bitcoin # Replace makefile.unix if you're not on unix + ./test_bitcoin # Runs the unit tests If all tests succeed the last line of output will be: -*** No errors detected +`*** No errors detected` -To add more tests, add BOOST_AUTO_TEST_CASE functions to the existing +To add more tests, add `BOOST_AUTO_TEST_CASE` functions to the existing .cpp files in the test/ directory or add new .cpp files that implement new BOOST_AUTO_TEST_SUITE sections (the makefiles are set up to add test/*.cpp to test_bitcoin automatically). @@ -25,9 +26,10 @@ Bitcoin-Qt unit tests are in the src/qt/test/ directory; they use the Qt unit-testing framework. To compile and run the tests: -qmake bitcoin-qt.pro BITCOIN_QT_TEST=1 -make -./bitcoin-qt_test -To add more tests, add them to the src/qt/test/ directory, -the src/qt/test/test_main.cpp file, and bitcoin-qt.pro. + qmake bitcoin-qt.pro BITCOIN_QT_TEST=1 + make + ./bitcoin-qt_test + +To add more tests, add them to the `src/qt/test/` directory, +the `src/qt/test/test_main.cpp` file, and bitcoin-qt.pro. diff --git a/share/pixmaps/bitcoin.ico b/share/pixmaps/bitcoin.ico index 61926807cc..f5480f4161 100644 Binary files a/share/pixmaps/bitcoin.ico and b/share/pixmaps/bitcoin.ico differ diff --git a/share/pixmaps/bitcoin128.png b/share/pixmaps/bitcoin128.png new file mode 100644 index 0000000000..04b56cf2a0 Binary files /dev/null and b/share/pixmaps/bitcoin128.png differ diff --git a/share/pixmaps/bitcoin128.xpm b/share/pixmaps/bitcoin128.xpm new file mode 100644 index 0000000000..d8e41e9ea4 --- /dev/null +++ b/share/pixmaps/bitcoin128.xpm @@ -0,0 +1,384 @@ +/* XPM */ +static char *bitcoin___[] = { +/* columns rows colors chars-per-pixel */ +"128 128 250 2", +" c #845415", +". c #895616", +"X c #84581E", +"o c #8D5C18", +"O c #925A15", +"+ c #925E1C", +"@ c #98621C", +"# c #9E711C", +"$ c #A36E1A", +"% c #A96F1B", +"& c #A6711C", +"* c #AC741C", +"= c #B2741E", +"- c #B37C1E", +"; c #BB7C1E", +": c #835B21", +"> c #8F6125", +", c #956727", +"< c #916B2E", +"1 c #996B2C", +"2 c #B47B23", +"3 c #BD7C20", +"4 c #A17330", +"5 c #AB7D3B", +"6 c #C17F20", +"7 c #B9831F", +"8 c #BB842B", +"9 c #BD8533", +"0 c #B68F3D", +"q c #BE8C3B", +"w c #C4801F", +"e c #FE8C03", +"r c #F38A0F", +"t c #FD8E0A", +"y c #FF910C", +"u c #F78F13", +"i c #F98F10", +"p c #F79016", +"a c #FE9314", +"s c #F6931E", +"d c #FD961B", +"f c #FE991E", +"g c #C58421", +"h c #CD8621", +"j c #C78B21", +"k c #CC8B23", +"l c #C2852B", +"z c #C08B2D", +"x c #D28722", +"c c #D38B25", +"v c #DB8E22", +"b c #D28E2C", +"n c #D49323", +"m c #DC9224", +"M c #DC9B25", +"N c #D4922D", +"B c #DF972A", +"V c #DF982E", +"C c #C18D33", +"Z c #C58E38", +"A c #CB9332", +"S c #C2933C", +"D c #CD9339", +"F c #CC9938", +"G c #D19733", +"H c #DA9230", +"J c #D59935", +"K c #DC9C33", +"L c #DC9E3B", +"P c #E49124", +"I c #EA9426", +"U c #E09D26", +"Y c #EC972B", +"T c #F79625", +"R c #F99524", +"E c #F69A26", +"W c #F89825", +"Q c #F2972B", +"! c #F59A2C", +"~ c #F89B2B", +"^ c #E79D33", +"/ c #EF9D31", +"( c #E19F3A", +") c #EF9D3A", +"_ c #F49C33", +"` c #F99E32", +"' c #F49F39", +"] c #D6A13E", +"[ c #DAA33B", +"{ c #E3A127", +"} c #E7A328", +"| c #EDA32C", +" . c #EDA829", +".. c #FFA325", +"X. c #FFAB25", +"o. c #F3A42B", +"O. c #FFA429", +"+. c #F4A929", +"@. c #FFAC2A", +"#. c #FFB227", +"$. c #FFB32C", +"%. c #FFBA2D", +"&. c #EEA830", +"*. c #F7A334", +"=. c #FAA036", +"-. c #FCAB34", +";. c #F4A13C", +":. c #F9A33B", +">. c #F4A83B", +",. c #FFA83F", +"<. c #FDB432", +"1. c #FFBB33", +"2. c #FFB73A", +"3. c #FDB93E", +"4. c #FFC12F", +"5. c #FFC432", +"6. c #FFC338", +"7. c #D2A043", +"8. c #D8A140", +"9. c #EEA144", +"0. c #E2A840", +"q. c #EDA34B", +"w. c #F4A444", +"e. c #F9A642", +"r. c #FBA945", +"t. c #F3A64B", +"y. c #F4A84E", +"u. c #FBAB4B", +"i. c #EEB041", +"p. c #FABA44", +"a. c #ECA653", +"s. c #EEAC5D", +"d. c #F3AA53", +"f. c #FAAE53", +"g. c #F2AD5A", +"h. c #FBB056", +"j. c #F6B15E", +"k. c #FBB25B", +"l. c #DDAF79", +"z. c #E3A962", +"x. c #EBAE63", +"c. c #E4AC68", +"v. c #EAAF69", +"b. c #EEB065", +"n. c #E7B06C", +"m. c #EEB36B", +"M. c #F5B263", +"N. c #FBB461", +"B. c #E6B274", +"V. c #ECB574", +"C. c #E7B57B", +"Z. c #EAB77C", +"A. c #ECB97C", +"S. c #F2B770", +"D. c #F0BB7A", +"F. c #DBB485", +"G. c #DFB888", +"H. c #E4B984", +"J. c #EDBD82", +"K. c #E5BC8B", +"L. c #EABE8A", +"P. c #F0BE82", +"I. c #E0BF96", +"U. c #EDC089", +"Y. c #F0C28B", +"T. c #E5C194", +"R. c #E9C191", +"E. c #E4C39C", +"W. c #EBC699", +"Q. c #EBC99F", +"!. c #DFC3A0", +"~. c #DDCAAF", +"^. c #CFC7BD", +"/. c #D2CBB6", +"(. c #DBC8B1", +"). c #DBCDBB", +"_. c #E2C6A4", +"`. c #E6C8A5", +"'. c #EACBA5", +"]. c #E1C7A8", +"[. c #E3CBAD", +"{. c #EACCAA", +"}. c #EED1AC", +"|. c #E1CDB3", +" X c #E3CFB8", +".X c #E6D1B6", +"XX c #EBD2B3", +"oX c #E3D1BB", +"OX c #EAD6BB", +"+X c #EBD8BF", +"@X c #D3CDC2", +"#X c #D8CDC2", +"$X c #D0CECA", +"%X c #DDD3C4", +"&X c #D3D2CC", +"*X c #DDD5CB", +"=X c #CCD3D5", +"-X c #C9D7DF", +";X c #D2D4D6", +":X c #DEDAD4", +">X c #DDDCDB", +",X c #E2D4C2", +".N b b b b N >.( C > HXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHX", +"HXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHX4 L _ *.@.<.$.X.X...X.X.X.X.X.X...X.@.$.<.@.*./ G , HXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHX", +"HXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHX< L -.@.$.X...R R R T T T T W W W W W W T T T T R R W ..X.$.@.*.J HXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHX", +"HXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXD -.%.X.W R T T W W W W W W W W W W W W W W W W W W W W W W T T R W X.%.+.A HXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHX", +"HXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXS -.$.X.R T T W W W W W W W W W W W W W W W W W W W W W W W W W W W W W W T T R X.$.-.C HXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHX", +"HXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXF <.@.f R T W W W W W W W W W W W W W W W W W W W W W W W W W W W W W W W W W W W W T R W #.<.A HXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHX", +"HXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHX[ <.X.f T W W W W W W W W W W W W W W W W W W W W W W W W W W W W W W W W W W W W W W W W W W T R X.$.K HXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHX", +"HXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHX0.$...R T W W W W W W W W W W W W W W W W W W W W W W W W W W W W W W W W W W W W W W E W W W W W W W T R ..%.G HXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHX", +"HXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXS 1...R T W W W W W W W W W W W W W W W W W W W W W W W W W W W W W W W W W W W W W E ~ ~ E W W W W W W W W W T R X.1.A HXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHX", +"HXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHX3.X.d T W W W W W W W W W W W W W W W W W W W W W W W W W W W W W W W W W W W W W W ~ ~ ~ ~ ~ E W W W W W W W W W W T R @.2.HXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHX", +"HXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHX7.5.f T W W W W W W W W W W W W W W W W W W W W W W W W W W W W W W W W W W W W W W ~ ~ ~ ~ ~ ~ ~ E W W W W W W W W W W W W T W %.z HXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHX", +"HXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHX3.X.s T W W W W W W W W W W W W W W W W W W W W W W W W W W W W W W W W W W W W W W ~ ~ ~ ~ ~ ~ ~ ~ ~ W W W W W W W W W W W W W T R $.<.HXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHX", +"HXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHX1...R W W W W W W W W W W W W W W W W W W W W W W W W W W W W W W W W W W W W W E ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ E E W W W W W W W W W W W W W R ..1.HXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHX", +"HXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHX0 5.f T W W W W W W W W W W W W W W W W W W W W W W W W W W W W W W W W W W W W W ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ E W W W W W W W W W W W W W W T W 5.8 HXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHX", +"HXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHX8.$.s W W W W W W W W W W W W W W W W W W W W W W W W W W W W W W W W W W W W E ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ` ~ ~ ~ ~ ~ W W W W W W W W W W W W W W W W T R %.N HXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHX", +"HXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXi.#.R W W W W W W W W W W W W W W W W W W W W W W W W W W W W W W W W W W W E ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ` ` ` ` ~ ~ ~ ~ ~ E W W W W W W W W W W W W W W W W R $.&.HXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHX", +"HXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXp.X.R W W W W W W W W W W W W W W W W W W W W W W W W W W W W W W W W W W E ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ` ` ` ` ` ~ ~ ~ ~ ~ ~ E W W W W W W W W W W W W W W W W R @.<.HXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHX", +"HXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXp.X.R W W W W W W W W W W W W W W W W W W W W W W W W W W W W W W W W W W E ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ` ` ` ` ` ` ` ~ ~ ~ ~ ~ ~ W W W W W W W W W W W W W W W W W R @.<.HXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHX", +"HXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXi.X.R W W W W W W W W W W W W W W W W W W W W W W W W W W W W W W W W E ~ E ~ W R ~ ~ ~ ~ ~ ~ ` ` ` ` ` ` ` ` ` ` ~ ~ ~ ~ ~ ~ E W W W W W W W W W W W W W W W W W R @.| HXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHX", +"HXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHX] #.R W W W W W W W W W W W W W W W W W W W W W W W W W W W W W W W W ~ ~ ~ ~ ~ ! s e t d ~ ` ` ` ` ` ` =.=.=.` ` ` ` ~ ~ ~ ~ ~ E W W W W W W W W W W W W W W W W W W R %.N HXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHX", +"HXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXq %.R W W W W W W W W W W W W W W W W W W W W W W W W W W W W W W E W E ~ ~ ~ ~ y l.=XI.x.) p a =.` ` =.=.=.=.=.=.` ` ` ~ ~ ~ ~ ~ ~ W W W W W W W W W W W W W W W W W W W R %.2 HXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHX", +"HXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHX5 5.d W W W W W W W W W W W W W W W W W W W W W W W W W W W W W E ~ ~ ~ ~ ~ ~ ~ ~ t (.jXVXNXuX@XF.W ` =.:.` W =.:.=.=.` ` ` ~ ~ ~ ~ ~ W W W W W W W W W W W W W W W W W W W T R 5.HXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHX", +"HXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHX1.f T W W W W W W W W W W W W W W W W W W W W W W W W W W W W E ~ ~ ~ ~ ~ ~ ~ ~ R Q eXDXSXSXDXgX#Xa ` =.=.;.q.W a a R ` ` ` ~ ~ ~ ~ ~ ~ W W W W W W W W W W W W W W W W W W W T W %.HXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHX", +"HXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHX3...T W W W W W W W W W W W W W W W W W W W W W W W W W W W E ~ ~ ~ ~ ~ ~ ~ ~ ~ ` a a.NXSXGXGXAXNXV.a :.:.f c.tX*XE.n.9.R ~ ` ` ~ ~ ~ ~ ~ E W W W W W W W W W W W W W W W W W W W T @.@.HXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHX", +"HXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXD #.R W W W W W W W W W W W W W W W W W W W W W W W W W W W E ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ` t H.VXSXGXGXDXmXy.f :.:.a I.hXBXCXNXiX^.' W ` ~ ~ ~ ~ ~ ~ E W W W W W W W W W W W W W W W W W W W R %.g HXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHX", +"HXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHX5.d W W W W W W W W W W W W W W W W W W W W W W W W W E ~ W ~ ~ ~ ~ ~ ~ ~ ~ ~ ` ` ` i |.CXGXGXGXCX3X~ ` :.:.R %XCXSXGXAXNX>XW ~ ` ` ~ ~ ~ ~ ~ ~ W W W W W W W W W W W W W W W W W W W W R 5.HXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHX", +"HXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHX2.W T W W W W W W W W W W W W W W W W W W W W W W W W ~ ~ ~ s t e a W ~ ` ` ` ` ` ` W ! eXFXGXGXSXVX[.d :.:.~ w.uXFXGXGXSXVXW.a ` ` ` ` ~ ~ ~ ~ ~ W W W W W W W W W W W W W W W W W W W W T ..@.HXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHX", +"HXHXHXHXHXHXHXHXHXHXHXHXHXHXHX9 $.R W W W W W W W W W W W W W W W W W W W W W W E W ~ ~ ~ y F./.B.9.T t t a ~ =.` =.a a.hXDXGXGXSXNXA.d :.e.R v.NXSXGXGXSXNXm.a =.` ` ` ~ ~ ~ ~ ~ ~ E W W W W W W W W W W W W W W W W W W W R %.= HXHXHXHXHXHXHXHXHXHXHXHXHXHXHX", +"HXHXHXHXHXHXHXHXHXHXHXHXHXHXHX6.d W W W W W W W W W W W W W W W W W W W W W W E ~ ~ ~ ~ W i &XjXNXfX:X].B.q.T t a d e K.VXSXGXGXDXaXd.W e.e.d E.VXSXGXGXDXvXw.W =.` ` ` ` ~ ~ ~ ~ ~ E W W W W W W W W W W W W W W W W W W W W W %.HXHXHXHXHXHXHXHXHXHXHXHXHXHXHX", +"HXHXHXHXHXHXHXHXHXHXHXHXHXHXK X.T W W W W W W W W W W W W W W W W W W W W ~ ~ ~ ~ ~ ~ ~ a ) uXDXSXFXFXCXNXfX:X_.B.q.r .XFXGXGXGXCX3X=.=.e.,.~ %XCXGXGXGXCX1XW ` =.` ` ` ` ~ ~ ~ ~ ~ ~ W W W W W W W W W W W W W W W W W W W W T $.m HXHXHXHXHXHXHXHXHXHXHXHXHXHX", +"HXHXHXHXHXHXHXHXHXHXHXHXHXHX5.R W W W W W W W W W W W W W W W W W W W E ~ ~ ~ ~ ~ ~ ~ ~ t x.NXSXGXGXGXSXSXDXFXCXNXmX8XcXSXGXGXGXCXW.e :.e.=.t.uXFXGXGXSXVXE.d :.=.=.` ` ` ~ ~ ~ ~ ~ ~ W W W W W W W W W W W W W W W W W W W W W R %.HXHXHXHXHXHXHXHXHXHXHXHXHXHX", +"HXHXHXHXHXHXHXHXHXHXHXHXHX^ X.T W W W W W W W W W W W W W W W W W W ~ ~ ~ ~ ~ ~ ~ ~ ~ ` t T.VXSXGXGXGXGXGXGXGXSXSXFXGXGXGXGXGXGXFX}.9.' W e v.VXSXGXGXSXNXm.d :.=.=.=.` ` ` ~ ~ ~ ~ ~ E W W W W W W W W W W W W W W W W W W W W T @.P HXHXHXHXHXHXHXHXHXHXHXHXHX", +"HXHXHXHXHXHXHXHXHXHXHXHXHX1.R W W W W W W W W W W W W W W W W E E ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ s ;XNXAXGXGXGXGXGXGXGXGXGXGXGXGXGXGXGXGXSXFXNX>X|.V.XXFXGXGXGXFXbXy.~ :.:.=.=.` ` ` ` ~ ~ ~ ~ ~ W W W W W W W W W W W W W W W W W W W W W R %.HXHXHXHXHXHXHXHXHXHXHXHXHX", +"HXHXHXHXHXHXHXHXHXHXHXHXH X.T W W W W W W W W W W W W W W E E ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ` ` R ' $XsXNXVXFXSXSXGXGXGXGXGXGXGXGXGXGXGXGXGXGXSXFXCXCXFXSXGXGXGXCXOXa :.:.:.=.=.=.` ` ` ~ ~ ~ ~ ~ ~ E W W W W W W W W W W W W W W W W W W W T $.c HXHXHXHXHXHXHXHXHXHXHXHX", +"HXHXHXHXHXHXHXHXHXHXHXHX1.R W W W W W W W W W W W W W W W ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ` ` ` ` ` ` ~ t.V.`.5XVXFXSXGXGXGXGXGXGXGXGXGXGXGXGXGXGXGXGXGXGXGXGXGXGXFXXFXGXGXGXGXGXGXGXSXCX{.e.P.'.2XvXNXBXDXSXGXGXGXGXGXGXGXGXGXSXDXjX~.y W =.` ` ~ ~ ~ ~ ~ W W W W W W W W W W W W W W W W W W W W W @.HXHXHXHXHXHXHXHXHXHX", +"HXHXHXHXHXHXHXHXHX: 1.R W W W W E ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ` ` ` ` ` ` =.=.=.=.=.:.:.:.:.:.:.:.:.e.e.e.~ s.fXDXGXGXGXGXGXGXGXSXNXD.f =.=.,.M.L.oXaXVXDXSXGXGXGXGXGXGXGXGXGXAXVX(.t ~ ` ` ~ ~ ~ ~ ~ ~ W W W W W W W W W W W W W W W W W W W R %. HXHXHXHXHXHXHXHXHX", +"HXHXHXHXHXHXHXHXHXl #.T W W W E ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ` ` ` ` ` ` =.=.=.=.:.:.:.:.:.:.:.:.:.e.e.e.e.r.W H.NXSXGXGXGXGXGXGXGXDXzXg.r.f.f.f.r.=.=.g.`.fXBXAXGXGXGXGXGXGXGXGXGXAXjXH.t =.` ` ~ ~ ~ ~ ~ W W W W W W W W W W W W W W W W W W W T $.6 HXHXHXHXHXHXHXHXHX", +"HXHXHXHXHXHXHXHXHX~ ..W W W W E ~ ~ ~ ~ ~ ~ ~ ~ ` ` ` ` ` ` =.=.=.=.=.:.:.:.:.:.:.:.e.e.e.e.e.e.e.r.W |.CXGXGXGXGXGXGXGXGXBX1X,.f.f.f.f.h.h.f.,.~ d.3XVXAXGXGXGXGXGXGXGXGXGXDXsX' f ` ` ~ ~ ~ ~ ~ ~ W W W W W W W W W W W W W W W W W W W ..~ HXHXHXHXHXHXHXHXHX", +"HXHXHXHXHXHXHXHXHX$.R W W W W W E ~ ~ ~ ~ ~ ` ` ` ` ` ` =.=.=.=.=.=.:.:.:.:.:.:.:.e.e.e.e.e.r.r.r.,.w.>XFXGXGXGXGXGXGXGXSXNX`.=.f.h.h.h.h.f.f.f.f.=.~ ,XVXSXGXGXGXGXGXGXGXGXSXVXT.y ` ` ` ~ ~ ~ ~ ~ E W W W W W W W W W W W W W W W W W W R $.HXHXHXHXHXHXHXHXHX", +"HXHXHXHXHXHXHXHXX %.T W W W W W E ~ ~ ~ ~ ~ ` ` ` ` =.=.=.=.=.:.:.:.:.:.:.:.:.e.e.e.e.e.e.r.r.r.u.=.x.fXDXGXGXGXGXGXGXGXSXmXA.,.h.h.h.k.k.h.f.f.f.f.:.~ 5XFXGXGXGXGXGXGXGXGXGXCX:XW ~ ` ` ~ ~ ~ ~ ~ E W W W W W W W W W W W W W W W W W W T $.. HXHXHXHXHXHXHXHX", +"HXHXHXHXHXHXHXHX8 $.T W W W W W W E ~ ~ ~ ~ ~ ` ` ` =.=.=.:.:.:.:.:.:.:.:.e.e.e.e.e.r.r.r.r.r.u.u.~ K.NXSXGXGXGXGXGXGXGXDXzXj.r.k.k.k.k.k.h.f.f.f.f.f.W V.VXSXGXGXGXGXGXGXGXGXDXuXw.f ` ` ` ~ ~ ~ ~ ~ E W W W W W W W W W W W W W W W W W T $.3 HXHXHXHXHXHXHXHX", +"HXHXHXHXHXHXHXHXY ..W W W W W W W E ~ ~ ~ ~ ~ ~ ` ` ` =.=.=.:.:.:.:.:.e.e.e.e.e.e.r.r.r.r.u.u.u.u.~ |.CXGXGXGXGXGXGXGXGXBX2Xr.f.k.k.k.k.k.k.h.f.f.f.f.,.d.bXFXGXGXGXGXGXGXGXGXDXfXd.d =.` ` ~ ~ ~ ~ ~ ~ W W W W W W W W W W W W W W W W W W O.P HXHXHXHXHXHXHXHX", +"HXHXHXHXHXHXHXHXO.W W W W W W W W W ~ ~ ~ ~ ~ ~ ` ` ` ` =.=.:.:.:.:.e.e.e.e.r.r.r.r.r.r.u.u.u.u.r.w.>XFXGXGXGXGXGXGXGXSXNX'.,.k.k.k.k.k.k.k.h.h.f.f.f.e.y.kXFXGXGXGXGXGXGXGXGXDXfXg.d =.` ` ` ~ ~ ~ ~ ~ W W W W W W W W W W W W W W W W W W W O.HXHXHXHXHXHXHXHX", +"HXHXHXHXHXHXHXHX$.R W W W W W W W W E ~ ~ ~ ~ ~ ` ` ` ` =.=.=.:.:.:.:.e.e.r.r.r.r.u.u.u.u.u.u.f.=.b.fXDXGXGXGXGXGXGXGXSXmXJ.r.k.k.k.k.k.k.k.h.h.f.f.f.:.s.mXFXGXGXGXGXGXGXGXGXDXpXy.R =.` ` ` ~ ~ ~ ~ ~ E E W W W W W W W W W W W W W W W W W $.HXHXHXHXHXHXHXHX", +"HXHXHXHXHXHXHXHX1.R W W W W W W W W W ~ ~ ~ ~ ~ ~ ` ` ` =.=.=.:.:.:.:.e.e.e.r.r.u.u.u.u.u.u.u.f.=.K.NXSXGXGXGXGXGXGXGXFXxXM.u.k.k.k.k.k.k.k.k.h.f.f.k.~ K.VXSXGXGXGXGXGXGXGXGXCX5X=.~ =.=.` ` ` ~ ~ ~ ~ ~ E W W W W W W W W W W W W W W W W W $.HXHXHXHXHXHXHXHX", +"HXHXHXHXHXHXHX+ $.T W W W W W W W W W W ~ ~ ~ ~ ~ ~ ` ` ` =.=.=.:.:.:.:.e.e.e.r.r.u.u.u.u.f.f.f.=.|.CXGXGXGXGXGXGXGXGXFXXFXGXGXGXGXGXGXGXGXFX9XA.b.u.r.r.u.u.h.h.h.u.r.O.w.:XCXSXGXGXGXGXGXGXGXGXSXhXL.a :.=.=.=.` ` ` ~ ~ ~ ~ ~ ~ W W W W W W W W W W W W W W W T $.* HXHXHXHXHXHXHX", +"HXHXHXHXHXHXHXV X.T W W W W W W W W W W E ~ ~ ~ ~ ~ ~ ` ` ` =.=.=.:.:.:.:.e.e.e.r.r.u.u.u.u.f.,.b.fXFXGXGXGXGXGXGXGXGXSXFXVXpX*X[.R.V.M.g.d.d.g.b.T.pXCXSXGXGXGXGXGXGXGXGXGXDXpXe.~ :.:.=.=.` ` ` ~ ~ ~ ~ ~ ~ W W W W W W W W W W W W W W W T $.; HXHXHXHXHXHXHX", +"HXHXHXHXHXHXHX| O.T W W W W W W W W W W W ~ ~ ~ ~ ~ ~ ` ` ` ` =.=.:.:.:.:.:.e.e.r.r.u.u.u.u.f.=.K.NXSXGXGXGXGXGXGXGXGXGXGXSXFXFXBXNXmXuX>X3X3XyXmXVXFXSXGXGXGXGXGXGXGXGXGXAXhXE.d :.:.:.=.=.` ` ` ` ~ ~ ~ ~ ~ E W W W W W W W W W W W W W W T @.h HXHXHXHXHXHXHX", +"HXHXHXHXHXHXHXc @.T W W W W W W W W W W W E ~ ~ ~ ~ ~ ~ ` ` ` ` =.:.:.:.:.:.e.e.e.r.r.u.u.u.u.=.|.BXGXGXGXGXGXGXGXGXGXGXGXGXGXGXSXSXSXFXFXFXFXFXSXSXGXGXGXGXGXGXGXGXGXGXAXNX>X~ =.e.:.:.:.=.` ` ` ` ~ ~ ~ ~ ~ ~ E W W W W W W W W W W W W W W @.h HXHXHXHXHXHXHX", +"HXHXHXHXHXHXHXk @.T W W W W W W W W W W W W W ~ ~ ~ ~ ~ ~ ` ` ` =.=.:.:.:.:.e.e.e.r.r.r.u.u.r.w.>XFXGXGXGXGXGXGXGXGXGXGXGXGXGXGXGXGXGXGXGXGXGXGXGXGXGXGXGXGXGXGXGXGXSXZXNXeXe.~ e.:.:.:.:.=.=.=.` ` ` ~ ~ ~ ~ ~ ~ W W W W W W W W W W W W W W @.h HXHXHXHXHXHXHX", +"HXHXHXHXHXHXHXc @.T W W W W W W W W W W W W W ~ ~ ~ ~ ~ ~ ` ` ` =.=.=.:.:.:.:.e.e.e.r.r.u.u.=.x.fXFXGXGXGXGXGXGXGXGXGXFXFXSXSXGXGXGXGXGXGXGXGXGXGXGXGXGXGXGXGXGXGXFXCXfXoX:.~ r.e.:.:.:.:.:.=.` ` ` ` ~ ~ ~ ~ ~ ~ W W W W W W W W W W W W W W @.h HXHXHXHXHXHXHX", +"HXHXHXHXHXHXHXc @.T W W W W W W W W W W W W W E ~ ~ ~ ~ ~ ` ` ` ` =.=.:.:.:.:.:.e.e.r.r.r.u.~ K.NXSXGXGXGXGXGXGXGXSXZX6XkXmXNXBXDXAXSXGXGXGXGXGXGXGXGXGXGXGXGXGXGX0X'.S.~ =.u.e.e.e.:.:.:.:.=.=.` ` ` ` ~ ~ ~ ~ ~ ~ W W W W W W W W W W W W W @.h HXHXHXHXHXHXHX", +"HXHXHXHXHXHXHXk @.T W W W W W W W W W W W W W W ~ ~ ~ ~ ~ ~ ` ` ` ` =.=.:.:.:.:.e.e.e.r.r.u.~ |.CXGXGXGXGXGXGXGXGXFX4X,.k.D.Q.,XkXmXNXDXSXSXGXGXGXGXGXGXGXGXGXGXGXXFXGXGXGXGXGXGXGXSXVX{.,.f.u.r.u.N.J.{.5XNXBXAXSXGXGXGXGXGXGXGXGXGXFXMXH.W r.u.r.e.e.e.:.:.:.:.=.=.` ` ` ` ~ ~ ~ ~ ~ ~ W W W W W W W W W W W T @.h HXHXHXHXHXHXHX", +"HXHXHXHXHXHXHXo.O.T W W W W W W W W W W W W W W E ~ ~ ~ ~ ~ ~ ` ` ` =.=.=.:.:.:.:.e.e.e.r.O.s.fXFXGXGXGXGXGXGXGXSXmXJ.r.N.N.N.N.h.r.r.f.J.1XhXBXAXGXGXGXGXGXGXGXGXSXDXjX!.W e.u.r.e.e.e.:.:.:.:.=.=.` ` ` ` ~ ~ ~ ~ ~ E W W W W W W W W W W T @.g HXHXHXHXHXHXHX", +"HXHXHXHXHXHXHXB X.T W W W W W W W W W W W W W W W W ~ ~ ~ ~ ~ ~ ` ` ` =.=.:.:.:.:.:.e.e.r.W H.NXSXGXGXGXGXGXGXGXDXuXM.u.k.k.N.N.N.N.N.h.,.e.D.>XNXSXGXGXGXGXGXGXGXGXSXZXjXE.W r.r.e.e.e.:.:.:.:.=.=.=.` ` ` ~ ~ ~ ~ ~ ~ W W W W W W W W W W T $.- HXHXHXHXHXHXHX", +"HXHXHXHXHXHXHXl @.T W W W W W W W W W W W W W W W W E ~ ~ ~ ~ ~ ` ` ` =.=.=.:.:.:.:.e.e.r.W |.CXGXGXGXGXGXGXGXGXBX2Xr.h.k.k.k.k.k.k.k.k.k.h.,.,.|.NXZXGXGXGXGXGXGXGXGXGXZXgXV.~ u.e.e.e.:.:.:.:.:.=.=.` ` ` ` ~ ~ ~ ~ ~ ~ W W W W W W W W W T $.% HXHXHXHXHXHXHX", +"HXHXHXHXHXHXHX@ $.T W W W W W W W W W W W W W W W W E ~ ~ ~ ~ ~ ~ ` ` ` ` =.=.:.:.:.:.e.:.' >XFXGXGXGXGXGXGXGXSXNX{.,.k.k.k.k.k.k.k.k.k.k.k.k.u.~ `.NXSXGXGXGXGXGXGXGXGXSXCX>X=.e.r.r.e.e.:.:.:.:.:.=.=.` ` ` ~ ~ ~ ~ ~ ~ W W W W W W W W W T $.. HXHXHXHXHXHXHX", +"HXHXHXHXHXHXHXHX%.R W W W W W W W W W W W W W W W W W E ~ ~ ~ ~ ~ ` ` ` ` =.=.:.:.:.:.e.~ s.fXFXGXGXGXGXGXGXGXSXNXJ.,.k.k.k.k.k.k.k.k.k.k.h.h.k.u.O.2XCXGXGXGXGXGXGXGXGXGXAXhXV.~ u.r.e.e.e.:.:.:.:.=.=.=.` ` ` ~ ~ ~ ~ ~ W W W W W W W W W W $.HXHXHXHXHXHXHXHX", +"HXHXHXHXHXHXHXHX$.R W W W W W W W W W W W W W W W W W E ~ ~ ~ ~ ~ ~ ` ` ` ` ~ :.:.:.:.e.f Z.VXSXGXGXGXGXGXGXGXDXzXM.r.k.k.k.k.k.k.k.h.h.h.h.f.f.k.=.V.NXSXGXGXGXGXGXGXGXGXSXVX`.W r.e.e.e.e.:.:.:.:.=.=.=.` ` ` ~ ~ ~ ~ ~ ~ E W W W W W W W W $.HXHXHXHXHXHXHXHX", +"HXHXHXHXHXHXHXHXO.W W W W W W W W W W W W W W W W W W W ~ ~ ~ ~ ~ ~ ` ` =.~ Q a a W =.=.t XCXGXGXGXGXGXGXGXGXBX2Xr.f.k.k.k.k.k.k.h.h.h.h.f.f.f.f.r.y.kXFXGXGXGXGXGXGXGXGXGXBX,X~ :.e.e.e.:.:.:.:.:.:.=.=.` ` ` ` ~ ~ ~ ~ ~ E W W W W W W W ~ ..HXHXHXHXHXHXHXHX", +"HXHXHXHXHXHXHXHXI O.W W W W W W W W W W W W W W W W W W W ~ ~ ~ ~ ~ ~ ` a z.-X_.B.q.! u C.NXSXGXGXGXGXGXGXGXSXNX'.=.h.h.k.k.k.h.h.f.f.f.f.f.f.f.f.r.w.5XFXGXGXGXGXGXGXGXGXGXCX2X=.:.e.:.:.:.:.:.:.:.:.=.=.=.` ` ` ` ~ ~ ~ ~ ~ E W W W W W W O.P HXHXHXHXHXHXHXHX", +"HXHXHXHXHXHXHXHXk @.T W W W W W W W W W W W W W W W W W W ~ ~ ~ ~ ~ ~ ~ t ).jXVXNXaX2X1XBXDXSXGXGXGXGXGXGXGXSXmXA.:.h.h.h.h.h.f.f.f.f.f.f.f.f.f.f.,.d.vXFXGXGXGXGXGXGXGXGXGXCX1X` =.:.:.:.:.:.:.=.=.=.=.=.=.` ` ` ` ~ ~ ~ ~ ~ ~ W W W W W T $.; HXHXHXHXHXHXHXHX", +"HXHXHXHXHXHXHXHXo %.T W W W W W W W W W W W W W W W W W W W W ~ ~ ~ ` y q.fXZXSXSXFXFXFXSXSXGXGXGXGXGXGXGXGXFXxXj.r.f.h.h.h.f.f.f.f.f.f.f.f.u.u.f.W B.NXSXGXGXGXGXGXGXGXGXSXBXoXW :.:.:.:.:.:.=.=.=.=.=.` ` ` ` ` ` ~ ~ ~ ~ ~ ~ W W W W W W %. HXHXHXHXHXHXHXHX", +"HXHXHXHXHXHXHXHXHX$.R W W W W W W W W W W W W W W W W W W W E ~ ~ ~ ` e !.CXSXGXGXGXGXGXGXGXGXGXGXGXGXGXGXGXFX+Xd ,.f.h.h.h.f.f.f.f.f.f.u.u.u.f.,.T :XFXGXGXGXGXGXGXGXGXGXSXNXE.f :.:.:.:.:.=.=.=.=.` ` ` ` ` ` ~ ~ ~ ~ ~ ~ ~ ~ ~ W W W W R $.HXHXHXHXHXHXHXHXHX", +"HXHXHXHXHXHXHXHXHX~ ..W W W W W W W W W W W W W W W W W W W W E ~ ~ a _ aXFXGXGXGXGXGXGXGXGXGXGXGXGXGXGXGXGXFX7XV.s.:.=.:.,.u.f.f.f.f.u.u.u.r.~ s ~.VXSXGXGXGXGXGXGXGXGXGXAXhXV.d :.:.=.=.=.=.=.` ` ` ` ` ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ W W W W O.E HXHXHXHXHXHXHXHXHX", +"HXHXHXHXHXHXHXHXHXg $.T W W W W W W W W W W W W W W W W W W W E ~ ~ e G.hXAXGXGXGXGXGXGXGXGXGXGXGXGXGXGXGXGXSXFXVXpX*X_.Z.x.t.:.` ~ ~ ~ ~ ~ ' x.*XVXSXGXGXGXGXGXGXGXGXGXGXDXuXw.W :.=.=.=.=.` ` ` ` ` ` ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ W W W W W W T $.; HXHXHXHXHXHXHXHXHX", +"HXHXHXHXHXHXHXHXHX %.R W W W W W W W W W W W W W W W W W W W W ~ d T qXgXBXFXSXSXGXGXGXGXGXGXGXGXGXGXGXGXGXGXGXSXFXFXBXNXaX>X,X[._.T.T.E.|.:XNXCXSXGXGXGXGXGXGXGXGXGXGXSXVX Xd =.=.=.=.` ` ` ` ` ` ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ E W W W W W W R %.HXHXHXHXHXHXHXHXHXHX", +"HXHXHXHXHXHXHXHXHXHX@.W W W W W W W W W W W W W W W W W W W W W ~ R ` s.H.oXkXNXNXCXFXSXSXGXGXGXGXGXGXGXGXGXGXGXGXGXGXSXSXDXFXCXCXBXVXVXBXCXFXSXSXGXGXGXGXGXGXGXGXGXGXGXAXhXm.a :.` =.` ` ` ` ` ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ W W W W W W W W W W @.HXHXHXHXHXHXHXHXHXHX", +"HXHXHXHXHXHXHXHXHXHXx @.T W W W W W W W W W W W W W W W W W W W W ~ ~ y t a _ g.L.oXkXhXVXCXFXSXGXGXGXGXGXGXGXGXGXGXGXGXGXGXGXGXSXGXSXSXGXGXGXGXGXGXGXGXGXGXGXGXGXGXGXSXBX:Xf ~ ` ` ` ` ` ` ` ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ E W W W W W W W W W T $.h HXHXHXHXHXHXHXHXHXHX", +"HXHXHXHXHXHXHXHXHXHXHX%.R W W W W W W W W W W W W W W W W W W W W W ~ ~ ~ ~ d a t a ' s.R.oXnXDXSXGXGXGXGXGXGXGXGXGXGXGXGXGXGXGXGXGXGXGXGXGXGXGXGXGXGXGXGXGXGXGXGXGXGXZXhXg.y =.` ` ` ` ` ~ ~ ~ ~ ~ ~ ~ ~ ~ E ~ E W W W W W W W W W W R %.HXHXHXHXHXHXHXHXHXHXHX", +"HXHXHXHXHXHXHXHXHXHXHXO.~ W W W W W W W W W W W W W W W W W W W W W ~ ~ ~ ~ ~ ` ` ~ W a a d ! c #DF943B", +", c #D8913C", +"< c #D8923E", +"1 c #DF953E", +"2 c #E28B23", +"3 c #E38B23", +"4 c #EA9023", +"5 c #EB9023", +"6 c #ED9122", +"7 c #ED9123", +"8 c #EE9123", +"9 c #EE9223", +"0 c #F39421", +"q c #F19423", +"w c #F39523", +"e c #F79521", +"r c #F59422", +"t c #F49623", +"y c #F69622", +"u c #F79623", +"i c #F09324", +"p c #F19424", +"a c #F19525", +"s c #F49624", +"d c #F59625", +"f c #F49725", +"g c #F79624", +"h c #F79724", +"j c #F69725", +"k c #F79725", +"l c #F69726", +"z c #F79726", +"x c #F89621", +"c c #F89722", +"v c #F89723", +"b c #F89724", +"n c #F89824", +"m c #F89825", +"M c #F99825", +"N c #F89925", +"B c #F89926", +"V c #F89927", +"C c #F99927", +"Z c #F0972E", +"A c #F7992A", +"S c #F79A2B", +"D c #F79B2C", +"F c #F69A2D", +"G c #F79D2F", +"H c #F89929", +"J c #F89A28", +"K c #F89A29", +"L c #F99A29", +"P c #F99B29", +"I c #F89A2A", +"U c #F89A2B", +"Y c #F99B2B", +"T c #F89B2C", +"R c #F89C2C", +"E c #F99C2D", +"W c #F99C2E", +"Q c #F89D2E", +"! c #F99D2F", +"~ c #E29335", +"^ c #E49639", +"/ c #E2983F", +"( c #F79F35", +") c #F99E31", +"_ c #F89E32", +"` c #F99E32", +"' c #F9A033", +"] c #F9A035", +"[ c #F9A135", +"{ c #F9A036", +"} c #F9A136", +"| c #F9A137", +" . c #F3A03F", +".. c #F7A43F", +"X. c #F8A139", +"o. c #F9A23A", +"O. c #FAA33B", +"+. c #FAA43E", +"@. c #FAA43F", +"#. c #EF9F41", +"$. c #EEA244", +"%. c #ECA34B", +"&. c #F8A440", +"*. c #F9A541", +"=. c #F9A644", +"-. c #F9A947", +";. c #F0A349", +":. c #F5A648", +">. c #F1A74E", +",. c #F7AA4F", +"<. c #E4A458", +"1. c #E4A55B", +"2. c #E8A95E", +"3. c #F2A950", +"4. c #F4AA52", +"5. c #FBAF55", +"6. c #E4A860", +"7. c #EAAC63", +"8. c #EBAF68", +"9. c #F2AF61", +"0. c #EBB16C", +"q. c #F6B568", +"w. c #E3AF71", +"e. c #EBBE89", +"r. c #E0BC93", +"t. c #E3C199", +"y. c #E6C59D", +"u. c #EAC89E", +"i. c #E7C8A2", +"p. c #EACBA6", +"a. c #EBCFAF", +"s. c #F1CCA0", +"d. c #E7CEB1", +"f. c #ECD1B0", +"g. c #E5D2BB", +"h. c #E8D2B8", +"j. c #DFDFDF", +"k. c #E7D5C1", +"l. c #E7D7C4", +"z. c #E5D7C7", +"x. c #E7DACB", +"c. c #EADAC8", +"v. c #E9DCCC", +"b. c #EDDFCE", +"n. c #E5DDD3", +"m. c #E4DFD9", +"M. c #ECE0D1", +"N. c #E4E1DD", +"B. c #EDE3D8", +"V. c #EAE4DD", +"C. c #ECE5DC", +"Z. c #E2E2E2", +"A. c #E5E2E0", +"S. c #E4E4E4", +"D. c #E7E7E7", +"F. c #EAEAE9", +"G. c gray92", +"H. c #EEEEEE", +"J. c None", +/* pixels */ +"J.J.J.J.J.J.J.1 > J.J.J.J.J.J.J.", +"J.J.J.J.J./ ..| ' ( ~ J.J.J.J.J.", +"J.J.J.< *.{ V $ r U W _ - J.J.J.", +"J.J., o.J 0 # <.w.$.F N H % J.J.", +"J.J.o.T e 1.r.k.x.t.S z B u J.J.", +"J.^ [ Y ! #.z.H.M.n.0.d n m 2 J.", +"J.X.) | =. .h.B.5.f.j.;.v B d J.", +": Q M ` &.>.A.V.p.c.l.4.E n d = ", +"; I b A Z 2.D.s.u.F.a.-.} C w & ", +"J.l g y 6.m.G.q.3.b.Z.,.] D 8 J.", +"J.3 k c %.d.C.v.N.S.y.@.L a * J.", +"J.J.j z x 8.i.g.e.9.+.W t 6 J.J.", +"J.J.+ s h G :.7.O.R B s 7 . J.J.", +"J.J.J.O i f P L K d p 5 J.J.J.", +"J.J.J.J.J.@ 9 q i 4 + J.J.J.J.J.", +"J.J.J.J.J.J.J.X o J.J.J.J.J.J.J." +}; diff --git a/share/pixmaps/bitcoin256.png b/share/pixmaps/bitcoin256.png new file mode 100644 index 0000000000..0ba94fb46d Binary files /dev/null and b/share/pixmaps/bitcoin256.png differ diff --git a/share/pixmaps/bitcoin256.xpm b/share/pixmaps/bitcoin256.xpm new file mode 100644 index 0000000000..87bb35cdad --- /dev/null +++ b/share/pixmaps/bitcoin256.xpm @@ -0,0 +1,465 @@ +/* XPM */ +static char *bitcoin___[] = { +/* columns rows colors chars-per-pixel */ +"256 256 203 2", +" c #BE741B", +". c #C1761B", +"X c #C6791C", +"o c #CC7C1D", +"O c #D07F1D", +"+ c #C67B21", +"@ c #CC7E21", +"# c #D4821E", +"$ c #D9841F", +"% c #ED8E1D", +"& c #EF911F", +"* c #CF8022", +"= c #D48323", +"- c #DB8621", +"; c #DD8922", +": c #D58729", +"> c #D6882B", +", c #DE8C2A", +"< c #CE8C3C", +"1 c #D28934", +"2 c #D98E32", +"3 c #D28E3C", +"4 c #DF9132", +"5 c #D6903E", +"6 c #DD933B", +"7 c #E58C22", +"8 c #E98F23", +"9 c #E38F2B", +"0 c #E88F28", +"q c #ED9124", +"w c #E6922D", +"e c #EB942B", +"r c #EF982F", +"t c #F59624", +"y c #F89723", +"u c #F79826", +"i c #F89825", +"p c #F1972A", +"a c #F59A2C", +"s c #F89B2B", +"d c #E59534", +"f c #EA9632", +"g c #EE9933", +"h c #E3963B", +"j c #E6993D", +"k c #EC9C3B", +"l c #F49C33", +"z c #F99E32", +"x c #F29E3A", +"c c #F7A037", +"v c #F9A036", +"b c #F5A13C", +"n c #F9A33B", +"m c #CE9147", +"M c #D29245", +"N c #DC9641", +"B c #DD9846", +"V c #D2954B", +"C c #DC9A4B", +"Z c #E59C44", +"A c #EA9E43", +"S c #E39E4B", +"D c #E89F49", +"F c #F09F40", +"G c #EDA145", +"H c #E6A14D", +"J c #EBA34B", +"K c #F4A443", +"L c #F9A642", +"P c #F7A847", +"I c #FAA846", +"U c #F3A64A", +"Y c #F8A748", +"T c #F5A94D", +"R c #FAAA4B", +"E c #E6A454", +"W c #EBA552", +"Q c #EDA856", +"! c #E4A55B", +"~ c #E8A75B", +"^ c #E7A95E", +"/ c #EBA95B", +"( c #F0A751", +") c #F4AB53", +"_ c #FAAE53", +"` c #F4AE5A", +"' c #F8AF59", +"] c #FAB057", +"[ c #F6B15E", +"{ c #FAB25B", +"} c #DFAD6F", +"| c #DCAE77", +" . c #DFB27D", +".. c #E5AA64", +"X. c #E8AB61", +"o. c #E5AE6C", +"O. c #E6B06F", +"+. c #ECB16C", +"@. c #F5B365", +"#. c #FBB562", +"$. c #FBB867", +"%. c #F5B66B", +"&. c #FAB768", +"*. c #F4B86F", +"=. c #FBB96A", +"-. c #E1AE71", +";. c #E5B174", +":. c #EBB573", +">. c #EFB977", +",. c #E5B47A", +"<. c #EEBA7B", +"1. c #F3B770", +"2. c #F3B974", +"3. c #FBBC72", +"4. c #F3BC7B", +"5. c #F8BF7A", +"6. c #FAC079", +"7. c #DCB382", +"8. c #DFBB8F", +"9. c #DABB96", +"0. c #DBBD99", +"q. c #E2B682", +"w. c #E4B985", +"e. c #ECBD84", +"r. c #E3BB8B", +"t. c #EABF8C", +"y. c #F1BE83", +"u. c #E2BE92", +"i. c #D3BDA2", +"p. c #DEC09C", +"a. c #EEC28D", +"s. c #F4C286", +"d. c #F8C282", +"f. c #F3C48B", +"g. c #E7C297", +"h. c #ECC393", +"j. c #E2C29D", +"k. c #EAC69B", +"l. c #ECC89F", +"z. c #F1C694", +"x. c #F2C897", +"c. c #F1CA9B", +"v. c #DBC2A3", +"b. c #D6C2AB", +"n. c #DDC7AD", +"m. c #DEC9AF", +"M. c #D3C4B3", +"N. c #DDCAB3", +"B. c #D2C7B9", +"V. c #D6C9BA", +"C. c #DDCEBB", +"Z. c #DFD0BE", +"A. c #E2C5A2", +"S. c #E8C7A0", +"D. c #E6C9A5", +"F. c #EBCBA4", +"G. c #E2C7A8", +"H. c #E3CAAC", +"J. c #EBCDA9", +"K. c #EFD2AF", +"L. c #F3D1A7", +"P. c #F1D1A9", +"I. c #E4CEB3", +"U. c #E8CFB1", +"Y. c #E1CFBA", +"T. c #E6D0B6", +"R. c #E9D1B4", +"E. c #E4D2BC", +"W. c #EAD4BA", +"Q. c #F4D5B0", +"!. c #F4D9B9", +"~. c #CDCDCD", +"^. c #D5CCC3", +"/. c #D4CFCA", +"(. c #DED2C3", +"). c #D3D1CE", +"_. c #DED6CC", +"`. c #D5D5D5", +"'. c #DBD7D1", +"]. c #DEDAD4", +"[. c #DDDDDC", +"{. c #E3D5C3", +"}. c #E9D7C1", +"|. c #EBD9C4", +" X c #E1D6CA", +".X c #E3D9CD", +"XX c #EADDCD", +"oX c #E1DBD4", +"OX c #E8DFD4", +"+X c #E1DEDB", +"@X c #EDE3D7", +"#X c #E3E1DE", +"$X c #E8E3DC", +"%X c #F6E5D2", +"&X c #F4EBDF", +"*X c #E4E4E4", +"=X c #ECE7E2", +"-X c #EDE9E4", +";X c #ECECEC", +":X c #F0EBE7", +">X c #F4F4F4", +",X c #FEFEFE", +"X>X>X>X;X;X*X[.`.r.n n z v v v v c x l p l x x c c v v v v z z z z z z s s s s s s s s s s s s u u u u i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i u i u X>X>X>X>X>X;X*X[.`.@.n n v v v v v c g E | S k f r l l l z z z z z z z z z s s s s s s s s s s s u u u u u i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i u i e X>X,X,X,X,X>X>X;X*X_.R n v v v v v v x e 0.`.`.V.p.;.H f e e p l l z z z z z s s s s s s s s s s s u u u u i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i u y , X>X,X,X,X,X>X>X;X*XI.L n v v v v n n x g V.`.[.[.[.[.[.(.p.;.S f r l z z z z z s s s s s s s s s s s u u u u i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i u u y X,X,X,X,X,X>X>X;X*Xa.n n v v v n n n l A `.[.*X*X-X-X*X*X*X[.`.V.9.K z z z z z s s s s s s s s s s s s u u u u i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i u i u X,X,X,X,X,X>X>X-X[.%.n n n n n n n b p o.[.*X;X;X;X>X;X;X*X*X[.`.~.T z z z z z z s s s s s s s s s s s u u u u i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i u y 0 X>X,X,X,X,X,X>X;X*XoXR L n n n n n n b g u.*X-X;X>X>X>X>X>X;X*X*X[.N.L n z z z z z z s s s s s s s s s s s u u u u i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i u y X>X,X,X,X,X>X>X;X*XI.L L n n n n n n b g C.*X;X>X>X,X,X,X>X>X;X*X[.g.L n z z z z z z s s s s s s s s s s s u u u u u i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i u i u X,X,X,X,X,X>X>X;X*Xh.L L n n n n n n l G [.*X;X>X,X,X,X,X>X>X;X*X[.2.n n z z z z z z s s s s s s s s s s s s u u u u i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i u y w X,X,X,X,X,X>X>X-X[.%.L n n n n n n b l o.*X;X>X>X,X,X,X,X,X>X;X*X]._ n v z z z z z z z s s s s s s s s s s s u u u u i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i y X>X,X,X,X,X,X>X;X*XoXR L n n n n n n b g j.*X;X>X>X,X,X,X,X,X>X;X*XE.I n v z z z z z z z z s s s s s s s s s s s u u u u i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i u y t X>X,X,X,X,X>X>X;X*XT.I L n n n n n n b k Z.*X;X>X,X,X,X,X,X>X>X;X*Xl.L n v v z z z z z z z s s s s s s s s s s s u u u u u i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i u y ; X,X,X,X,X,X>X>X;X*Xh.L L n n n n L L x G [.*X;X>X,X,X,X,X,X>X>X;X*X4.n n v v v z z z z z z s s s s s s s s s s s s u u u u i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i u i u X>X,X,X,X,X,X>X>X-X[.%.L L n n n L L L l ;.*X;X>X>X,X,X,X,X,X>X;X*X[._ L n v v v z z z z z z z s s s s s s s s s s s u u u u u i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i u y q X>X>X>X;X;X;X;X*X*X*X*X].N.q.! d e e r p q ,.-X;X>X>X,X,X,X,X,X>X;X*XoX_ I L n L L L L K g j.*X;X>X>X,X,X,X,X,X>X;X*XE.Y L n v v v z z z z z z z z s s s s s s s s s s s u u u u i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i t X>X>X>X>X>X>X>X>X;X;X;X;X*X*X*X*X_.I.r.o.Z w D.;X>X>X,X,X,X,X,X,X>X;X*XW.R I L L L L L L K k Y.*X;X>X,X,X,X,X,X>X>X;X*Xl.L L n v v v v v z z z z z z s s s s s s s s s s s s u u u u i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i u y q X>X,X,X,X,X,X,X>X>X>X>X>X>X;X;X;X;X*X*X*X*X$X}.=X>X>X>X,X,X,X,X,X,X>X;X*Xx.I I L L L L L L x J [.*X;X>X,X,X,X,X,X>X>X;X*X4.L n n v v v v v z z z z z z s s s s s s s s s s s s s u u u u i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i t X,X,X,X,X,X,X,X,X,X,X,X>X>X>X>X>X>X;X;X;X;X;X>X>X>X>X,X,X,X,X,X,X,X>X>X;X&.L L L L L L L L x ;.*X;X>X>X,X,X,X,X,X>X;X*X[.' L n n n v v v v z z z z z z z s s s s s s s s s s s s u u u u i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i u y t X,X,X,X,X,X,X,X,X,X,X,X,X,X,X>X>X>X>X>X>X>X>X>X>X,X,X,X,X,X,X,X,X,X>X>X@Xb l x x K L L L L k j.*X;X>X>X,X,X,X,X,X>X;X*XE.R L n n n n v v v v z z z z z z z s s s s s s s s s s s u u u u i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i t X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X>X>X:XW.g.;.H k k k b F k {.;X>X>X,X,X,X,X,X>X>X;X*XS.I L n n n n v v v v v z z z z z z s s s s s s s s s s s u u u u u i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i y t X>X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X>X>X;X;X*X+XE.j.,.~ j A =X;X>X>X,X,X,X,X,X>X>X;X*X4.I L n n n n v v v v v z z z z z z z s s s s s s s s s s s u u u u i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i t X>X>X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X>X>X;X;X;X*X*X*X*XXX}.;X>X>X,X,X,X,X,X,X>X>X;X#X{ I n n n n n n v v v v z z z z z z z s s s s s s s s s s s s u u u u i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i y t X>X>X>X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X>X>X>X>X;X;X;X;X;X>X>X>X,X,X,X,X,X,X,X>X>X;X|.R I n n n n n n v v v v v z z z z z z z s s s s s s s s s s s u u u u u i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i t X>X>X>X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X>X>X>X>X>X>X>X>X>X,X,X,X,X,X,X,X,X>X>X;XF.L L n n n n n n n v v v v z z z z z z z z s s s s s s s s s s s u u u u i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i y q X>X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X>X>X,X,X,X,X,X,X,X,X,X,X,X>X>X;X@.a x b b n n n n n v v v v z z z z z z z z s s s s s s s s s s s u u u u i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i t X>X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X>X>X;X|.e.G g l c b n n n n v v v v z z z z z z z z s s s s s s s s s s s u u u u i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i t 0 X>X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X>X>X;X-X+XG...k g l b n n n v v v v z z z z z z z s s s s s s s s s s s s u u u u i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i y t X>X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X>X>X;X;X*X*X(.w.A g l c c v v v v v z z z z z z z s s s s s s s s s s s u u u u i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i t = X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X>X>X>X;X-X*X*X'.u.A r l x c v v v z z z z z z z s s s s s s s s s s s u u u u u i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i t q X>X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X>X>X>X>X;X;X*X*X].u.k r l c v v v z z z z z z z s s s s s s s s s s s u u u u i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i t X>X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X>X>X>X>X;X;X*X*X_.q.g p l z v z z z z z z z s s s s s s s s s s s s u u u u i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i t 7 X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X>X>X>X>X>X>X>X>X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X>X>X>X>X;X;X*X[.C.W p l c v z z z z z z z s s s s s s s s s s s u u u u u i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i y t X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X>X>X>X>X;X;X;X;X>X>X>X>X>X>X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X>X>X>X>X;X*X*X[.w.r a l z z z z z z z s s s s s s s s s s s u u u u u i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i t X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X>X>X>X-X-X-X*X*X-X;X;X;X;X>X>X>X>X>X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X>X>X>X;X;X*X[.H.g a z z z z z z z z s s s s s s s s s s s u u u u i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i t 0 X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X>X>X;Xf.3.x.R..X+X*X*X*X*X;X;X;X>X>X>X>X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X>X>X>X;X*X*X(.k p z z z z z z z z s s s s s s s s s s s u u u u i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i y t X>X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X>X>X;X*X$.{ { { $.3.f.F.{.[.*X*X*X;X;X;X>X>X>X>X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X>X>X;X-X*X_.W p z z z z z z z s s s s s s s s s s s u u u u u i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i t @ X>X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X>X;X-X|.{ ] _ ] { { { { $.3.h.R..X*X*X*X;X;X>X>X>X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X>X>X;X-X*X'.k p z z z z z z s s s s s s s s s s s s u u u u i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i t 0 X>X,X,X,X,X,X,X,X,X,X,X,X,X,X,X>X>X;X*XJ._ ] _ _ _ _ ] { { { #.$.$.f.T.oX*X*X;X;X>X>X>X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X>X>X;X-X*X_.l a z z z z z z s s s s s s s s s s s u u u u u i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i t t X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X>X>X;X*Xs._ _ _ _ _ _ _ _ _ ] { { { { { =.l..X*X*X;X;X>X>X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X>X>X;X*X*XH.t z z z z z z z s s s s s s s s s s s u u u u i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i t X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X>X;X*X+X&.] _ _ _ _ _ _ _ _ _ _ _ _ ] { { { #.k.oX*X-X;X>X>X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X>X>X;X*X[.:.t z z z z z z s s s s s s s s s s s u u u u u i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i t ; X>X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X>X;X*X{.{ { _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ ] _ { J.*X*X;X>X>X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X>X>X;X*X'.l s z z z z z z s s s s s s s s s s s u u u u u i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i t q X>X,X,X,X,X,X,X,X,X,X,X,X,X,X,X>X>X;X*XF.{ { _ _ _ _ _ _ _ _ ] _ _ _ _ _ _ _ _ _ _ _ y.oX*X;X>X>X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X>X;X*X[.t.u z z z z z z s s s s s s s s s s s s u u u u i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i t t X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X>X>X;X*Xs.{ ] _ _ _ _ _ ] ] ] ] ] _ _ _ _ _ _ _ _ _ _ _ ' .X*X;X>X>X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X>X>X;X*X'.z z z z z z z z s s s s s s s s s s s u u u u u i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i t X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X>X;X*X].&.{ ] _ _ _ ] ] ] ] ] ] ] _ _ _ _ _ _ _ _ _ _ _ R R oX*X;X>X>X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X>X;X*X[.:.u z z z z z z s s s s s s s s s s s u u u u u i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i t ; X>X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X>X;X*X{.#.{ _ _ _ _ ] ] ] ] ] ] ] ] _ _ _ _ _ _ _ _ _ _ _ I @.*X;X>X>X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X>X>X;X*XD.s z z z z z z z s s s s s s s s s s s u u u u i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i t q X>X,X,X,X,X,X,X,X,X,X,X,X,X,X,X>X>X;X*XF.{ { _ ' ] ] ] ] ] { { { ] ] ] _ _ _ _ _ _ _ _ R R _ n k.*X;X>X>X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X>X>X;X*X_.n z z z z z z z s s s s s s s s s s s u u u u u i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i t t X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X>X>X;X*Xs.{ { ] ] ] ] { { { { { { ] ] ] _ _ _ _ _ _ _ _ R R R I T +X;X>X>X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X>X;X*X[.T z z z z z z z z s s s s s s s s s s s u u u u i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i t X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X>X;X*X[.=.{ { ] ] ] { { { { { { { ] ] ] _ _ _ _ _ _ _ _ _ R R R K D.*X;X>X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X>X;X*X[.%.z z z z z z z z s s s s s s s s s s s u u u u u i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i t = X>X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X>X;X*X{.#.{ ] ] { { { { { { { { { { ] ] ] _ _ _ _ _ _ _ _ R R R K e.*X;X>X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X>X>X-X[.<.v v z z z z z z z s s s s s s s s s s s s u u u i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i t 7 X>X,X,X,X,X,X,X,X,X,X,X,X,X,X,X>X>X;X*XJ.{ { { { { { { { { { { { { { { ] ] ] _ _ _ _ _ _ _ _ R R K +.*X;X>X>X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X>X>X;X*X<.n v v z z z z z z s s s s s s s s s s s s u u u i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i t q X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X>X>X;X*Xs.#.{ { { { { { { { { { { { { { ] ] ] ] _ _ _ _ _ _ _ _ R U / *X;X>X>X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X>X>X;X*Xe.n n v v z z z z z z s s s s s s s s s s s u u u u u i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i t t X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X>X;X*X[.=.#.{ { { { { { { { { { { { { { ] ] ] ' _ _ _ _ _ _ _ _ R K +.*X;X>X>X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X>X>X;X*X<.n n v v z z z z z z z s s s s s s s s s s s u u u u i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i u t X>X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X>X;X*X{.$.#.{ { { { { { { { { { { { { { { ] ] ] ] _ _ _ _ _ _ _ T K ,.*X;X>X>X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X>X>X-X[.>.n n v z z z z z z z z s s s s s s s s s s s u u u u i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i t @ X>X,X,X,X,X,X,X,X,X,X,X,X,X,X,X>X>X;X*XJ.#.#.{ { { { { { { { { { { { { { { ] ] ] ] _ _ _ _ _ _ _ T G j.*X;X>X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X>X;X*X[.%.n n v v z z z z z z z z s s s s s s s s s s s u u u u i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i t = X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X>X>X;X*Xf.#.{ { { { { { { { { { { { { { { { { ] ] ] _ _ _ _ _ _ _ T J X-X>X>X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X>X;X*X]._ L n v v v z z z z z z z s s s s s s s s s s s u u u u u i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i t ; X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X>X>X;X#X3.#.{ { { { { { { { { { { { { { { { { { ] ] ] _ _ _ _ _ ) G ..*X;X>X>X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X>X>X;X*X{.R L n v v v v z z z z z z z s s s s s s s s s s s u u u u i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i t 7 X>X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X>X>X;X|.=.#.{ { { { { { { { { { { { { { { { { { { ] ] ' _ _ _ _ T k E.*X;X>X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X>X>X;X*XH.L L n v v v v z z z z z z z s s s s s s s s s s s u u u u u i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i t q X>X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X>X>X;Xc.] { { { { { { { { #.{ { { { { { { { { { { ] ] ] _ _ _ ( A w.*X;X>X>X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X>X>X-X[.a.L n n v v v v v z z z z z z z s s s s s s s s s s s u u u u i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i t q X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X>X>X;Xx.( Q ( ) ` [ [ { #.#.#.{ { { { { { { { { { { ] ] _ ) T D o.*X;X;X>X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X>X;X*X[.[ L n n n v v v v z z z z z z z s s s s s s s s s s s s u u u u i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i u q X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X>X>X;XOXI.u.O./ Q Q ` ` [ [ [ { { { { { { { { { ] ' ) ( J H r.*X-X;X>X>X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X>X>X;X*XE.R I n n n v v v v v z z z z z z z s s s s s s s s s s s u u u u i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i u q X>X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X>X>X>X;X;X*X*X_.H.r.;.X./ Q Q ) ) ` ` ` ` ` ) ) ( J H W ,.{.*X;X;X>X>X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X>X;X*X[.y.I L n n n n v v v v z z z z z z z s s s s s s s s s s s s u u u u i i i i i i i i i i i i i i i i i i i i i i i i i i i i i u t X>X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X>X>X>X;X;X;X*X*X*X*X].(.H.u.q.;.^ ^ ~ ~ E E ~ o.r.G. X*X*X;X>X>X>X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X>X>X;X*X_._ Y L n n n n n v v v z z z z z z z s s s s s s s s s s s s u u u u u i i i i i i i i i i i i i i i i i i i i i i i i i i i i u t @ X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X>X>X>X>X;X;X;X;X*X*X*X*X*X*X[.]..X X XoX+X*X*X*X-X;X;X>X>X>X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X>X>X;X*X[.f.R I n n n n n n v v v v z z z z z z z s s s s s s s s s s s u u u u u i i i i i i i i i i i i i i i i i i i i i i i i i i i i i t = X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X>X>X>X>X>X>X;X;X;X;X;X;X-X-X*X*X*X-X;X;X;X;X>X>X>X>X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X>X;X;X*X X_ R L n n n n n n v v v v z z z z z z z z s s s s s s s s s s s u u u u i i i i i i i i i i i i i i i i i i i i i i i i i i i i i t = X>X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X>X>X>X>X>X>X>X>X>X>X>X;X;X;X>X>X>X>X>X>X>X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X>X>X;X*X[.%.R I L n n n n n n n v v v v z z z z z z z s s s s s s s s s s s s u u u u i i i i i i i i i i i i i i i i i i i i i i i i i i i i t - X>X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X>X>X>X>X>X>X>X>X>X>X>X>X>X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X>X>X>X;X*X[.k.R R L n n n n n n n n v v v v v z z z z z z z s s s s s s s s s s s u u u u i i i i i i i i i i i i i i i i i i i i i i i i i i i i t ; X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X>X>X>X;X;X*X[.l.] _ I L L n n n n n n n n v v v v v z z z z z z z s s s s s s s s s s s u u u u i i i i i i i i i i i i i i i i i i i i i i i i i i i t ; X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X>X>X>X;X-X*X[.l.{ _ Y L L L n n n n n n n n v v v v v v z z z z z z s s s s s s s s s s s u u u u i i i i i i i i i i i i i i i i i i i i i i i i i i i t ; X>X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X>X>X>X>X>X>X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X>X>X>X;X*X*X].h.{ _ R L L L L L n n n n n n n n v v v v v z z z z z z z s s s s s s s s s s s u u u u i i i i i i i i i i i i i i i i i i i i i i i i i i t ; X>X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X>X>X>X>X>X>X>X>X>X>X>X>X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X>X>X;X;X*X[.T.3.{ ] R I L L L L L n n n n n n n n n v v v z z z z z z z z s s s s s s s s s s s u u u u i i i i i i i i i i i i i i i i i i i i i i i i i i t ; X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X>X>X>X;X;X;X;X;X;X;X;X>X>X>X>X>X>X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X>X>X>X;X*XW.s.#.{ _ R I I L L L L L L n n n n n n n n v v v v z z z z z z z z s s s s s s s s s s s u u u u u i i i i i i i i i i i i i i i i i i i i i i i i t ; X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X>X>X>X-XQ.|.OX*X*X*X*X*X;X;X;X>X>X>X>X>X>X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X>X&X!.L.d.#.{ ] R R I I I L L L L L L n n n n n n n n n v v v v z z z z z z z s s s s s s s s s s s u u u u i i i i i i i i i i i i i i i i i i i i i i i i i t ; X>X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X>X>X;XXX3.3.3.s.c.R..X[.*X*X*X-X;X;X;X>X>X>X>X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X>X%X{ L R _ _ R R R I I I I L L L L L L n n n n n n n n v v v v v z z z z z z z s s s s s s s s s s s u u u u i i i i i i i i i i i i i i i i i i i i i i i i t ; X>X,X,X,X,X,X,X,X,X,X,X,X,X,X,X>X>X;X-XK.&.=.=.&.=.3.3.d.c.R..X[.*X*X*X;X;X;X>X>X>X>X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X>X>X;XJ.J K Y R R Y I I I I L L L L L L n n n n n n n n n v v v v z z z z z z z s s s s s s s s s s s s u u u i i i i i i i i i i i i i i i i i i i i i i i i t ; X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X>X>X;X*Xf.$.#.#.#.#.&.&.=.=.3.3.f.F.}.+X*X*X*X;X;X>X>X>X>X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X>X>X>X;XOX:.K U R R I I I I I L L L L L L n n n n n n n n v v v v z z z z z z z s s s s s s s s s s s s u u u u i i i i i i i i i i i i i i i i i i i i i i i t ; X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X>X;X-X+X3.$.#.{ { #.#.#.#.$.$.&.=.=.3.6.c.W.+X*X*X;X;X>X>X>X>X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X>X>X;X*X*Xj.K K R R I I I I I L L L L L n n n n n n n n v v v v v v z z z z z z s s s s s s s s s s s s u u u i i i i i i i i i i i i i i i i i i i i i i u t = X>X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X>X;X*X{.&.#.{ { { { #.#.#.#.#.#.#.#.$.$.=.=.5.J..X*X*X;X;X>X>X>X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X>X>X;X*X*XH.K K R R I I I I L L L L L L n n n n n n n n v v v v v z z z z z z z s s s s s s s s s s s u u u u u i i i i i i i i i i i i i i i i i i i i u t = X>X,X,X,X,X,X,X,X,X,X,X,X,X,X,X>X>X;X*XJ.#.#.{ { { { #.#.#.#.#.#.#.#.{ #.#.$.$.$.=.z.{.*X*X;X;X>X>X>X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X>X>X>X;X*X*XC.U K R I I I I I L L L L L L n n n n n n n n v v v v v z z z z z z s s s s s s s s s s s s u u u u i i i i i i i i i i i i i i i i i i i i u q * s u i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i u u u u s s s s s s s s s s s z z z z z z z v v v v v n n n n n n n n L L L L L L I I K A Z.*X;X>X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X>X>X;X*Xf.#.#.{ { { { { #.#.#.#.{ { { { { { { #.#.#.#.$.z.{.*X*X;X>X>X>X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X>X>X;X*X*XC.b K Y I I I I L L L L L L n n n n n n n n n v v v v z z z z z z z s s s s s s s s s s s s u u u u i i i i i i i i i i i i i i i i i i i u q + X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X>X;X*X[.3.#.{ { { { { { #.#.#.{ { { { { { { { { { { #.#.#.$.F.+X*X;X;X>X>X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X>X>X;X*X[.H.b P I I I I I L L L L L n n n n n n n n n v v v v v z z z z z z s s s s s s s s s s s s u u u u i i i i i i i i i i i i i i i i i i i t q X>X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X>X;X*X{.$.#.{ { { { { { { { { { { { { { { { { { { { { { { #.{ 2.{.*X;X;X>X>X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X>X>X;X*X[.e.b Y I I I I L L L L L L n n n n n n n n v v v v z z z z z z z z s s s s s s s s s s s u u u u i i i i i i i i i i i i i i i i i i i t q X>X,X,X,X,X,X,X,X,X,X,X,X,X,X,X>X>X;X*XJ.#.#.{ { { { { { { { { { { { { { { { { { { { { { { { { { { U.*X;X;X>X>X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X>X>X;X*X].T L Y I I I I L L L L L L n n n n n n n n v v v v v z z z z z z s s s s s s s s s s s s u u u u i i i i i i i i i i i i i i i i i i t q X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X>X>X;X*Xf.#.{ { { { { { { { { { { { { { { { { { { { { { { { { ] { { _ R.*X;X>X>X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X>X;X-X*XD.L R I I I I L L L L L L n n n n n n n n v v v v v z z z z z z z s s s s s s s s s s s s u u u u i i i i i i i i i i i i i i i i i t q X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X>X;X*X[.=.#.{ { { { { { { { { { { { { { { { { { { { { { ] ] ] ] ] { ' R T.*X;X>X>X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X>X>X;X*X[.` L I I I I I L L L L L L n n n n n n n n v v v v v z z z z z z z s s s s s s s s s s s u u u u i i i i i i i i i i i i i i i i i t 8 X>X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X>X;X*X{.$.#.{ { { { { { { { { { { { { { { { { { { { ] ] ] ] ] ] ] _ ] _ R oX*X;X>X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X>X>X-X[.g.n I Y I I I I L L L L L n n n n n n n n n v v v v z z z z z z z s s s s s s s s s s s u u u u i i i i i i i i i i i i i i i i i t 7 X>X,X,X,X,X,X,X,X,X,X,X,X,X,X,X>X>X;X*XJ.{ { { { { { { { { { { { { { { { { { { { { ] ] ] ] ] _ _ _ _ _ ] Y <.*X;X>X>X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X>X>X;X*X(.I I I I I I L L L L L L L n n n n n n n n v v v v v z z z z z z z s s s s s s s s s s s u u u u u i i i i i i i i i i i i i i u t ; X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X>X>X;X*Xf.{ { { { { { { { { { { { { { { { { { { ] ] ] ] ] ] _ _ _ _ _ _ _ _ T .X-X>X>X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X>X;X*X[.[ L I I I L L L L L L L L n n n n n n n n n v v v v z z z z z z z s s s s s s s s s s s u u u u u i i i i i i i i i i i i i i u q = X>X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X>X;X*X[.=.{ { ] { { { { { { { { { { { { { { ] ] ] ] ] ] _ _ _ _ _ _ _ _ _ _ P g.*X;X>X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X>X>X-X[.e.n I L L L L L L L L L L n n n n n n n n n v v v v v z z z z z z z s s s s s s s s s s s u u u u i i i i i i i i i i i i i i t q X>X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X>X;X*X{.#.{ ] ] { { { { { { { { { { { ] ] ] ] ] ] ] ] _ _ _ _ _ _ _ _ _ _ _ Y +.*X;X>X>X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X>X>X;X*Xg.L I L L L L L L L L L n n n n n n n n n n n v v v v z z z z z z z s s s s s s s s s s s s u u u u i i i i i i i i i i i i i t q X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X>X>X;X*XJ.{ { ] ] ] { { { { { { { { { ] ] ] ] ] ' _ _ _ _ _ _ _ _ _ _ _ _ _ _ T Q #X;X>X>X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X>X>X;X*XD.I I L L L L L L L n n n n n n n n n n n n n v v v v v z z z z z z z s s s s s s s s s s s u u u u i i i i i i i i i i i i i t q X>X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X>X>X;X*Xf.{ { ] ] ] ] { { { { { { { ] ] ] ] ] _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ Y W +X;X>X>X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X>X>X;X*XI.I I L L L L L n n n n n n n n n n n n n n n v v v v v v z z z z z z z s s s s s s s s s s u u u u u i i i i i i i i i i i i t 7 X>X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X>X;X*X[.=.{ ] ] ] ] ] { { { { { ] ] ] ] ] ' _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ R R T W +X;X>X>X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X>X>X;X*XE.I L L L L n n n n n n n n n n n n n n v v v v v v v v v z z z z z z z s s s s s s s s s s s u u u u i i i i i i i i i i i u q ; X>X>X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X>X;X*X{.#.{ _ _ ] ] ] ] { ] ] ] ] ] ] _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ R R R R K X.*X;X>X>X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X>X>X;X*XE.I L n n n n n n n n n n n n n n n n v v v v v v v v v z z z z z z z z s s s s s s s s s s s s u u u i i i i i i i i i i i t q @ X>X>X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X>X>X;X*XJ.{ { _ _ _ ] ] ] ] ] ] ] ] ' _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ R R R R R x q.*X;X>X>X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X>X>X;X*XD.R L n n n n n n n n n n n n n n n v v v v v v v v v z z z z z z z z z z s s s s s s s s s s s s u u u u i i i i i i i i i t q X>X>X>X>X>X>X>X>X>X>X>X>X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X>X>X;X*Xs.{ ] _ _ _ ] ] ] ] ] ] _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ R R R R R R R T k G.*X;X>X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X>X>X;X*XS.I L n n n n n n n n n n n n n v v v v v v v v v z z z z z z z z z z z z s s s s s s s s s s s s u u u u i i i i i i i i i t q X>X>X,X,X>X>X>X>X>X>X>X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X>X>X;X#X&.{ _ _ _ _ _ ] ] ] ] _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ R R R R R R R R K A oX;X>X>X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X>X>X;X*Xh.L L n n n n n n n n n n v v v v v v v v v z z z z z z z z z z z z z s s s s s s s s s s s s s s s u u u i i i i i i i i i t 7 X>X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X>X>X;X|.{ ] _ _ _ _ _ ] ] _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ R R R R R R R R R U k u.*X;X>X>X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X>X>X-X[.2.L L n n n n n n n n n v v v v v v v v z z z z z z z z z z z z z s s s s s s s s s s s s s s s s s u u u u i i i i i i i u q = X>X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X>X>X;Xc.R _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ R R R R R R R R R R T k D +X;X>X>X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X>X;X*X[.' L n n n n n n n n v v v v v v v z v v z z z z z z z z z z z s s s s s s s s s s s s s s s s s s s u u u u i i i i i i i t q X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X>X>X;Xf.K G G U ) ) _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ R R R R R R R R R R R U A j {.*X;X>X>X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X>X>X;X*X{.R L n n n n n n v v v v v v v v v z z z z z z z z z z z z s s s s s s s s s s s s s s s s s s s s s s u u u u i i i i i i t q X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X>X>X-XXXH.w.X.J J J T ) ) ) _ _ _ _ _ _ _ _ R R R R R R R R R R R Y K k D Y.*X;X>X>X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X>X>X;X*XJ.L L n n n n v v v v v v v v z z z z z z z z z z z z z s z s s s s s s s s s s s s s s s s s s s s u u u u u u u i i i i u t 7 X>X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X>X>X>X;X-X*X#X(.A.q...H J J U U T T T T R R R R R R R R R Y Y U K k A ;..X*X;X>X>X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X>X;X-X[.4.L n n n v v v v v v v v z z z z z z z z z z z z z z s s s s s s s s s s s s s s s s s s s s u u u u u u u u u i i i i i t q * X>X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X>X>X>X;X;X;X*X*X*X[.(.H.u.,.^ J D G A J K K U U U U K k k k A E w.Y.*X*X;X>X>X>X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X>X;X*X]._ L n v v v v v v v v v v z z z z z z z z z z z s s s s s s s s s s s s s s s s s s s s s s u u u u u u u u u i i i i i i t q X>X>X>X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X>X>X>X>X>X;X;X;X-X*X*X*X*X[._.N.A.u.;.;...E E E E ..;.q.j.I.+X*X*X;X;X>X>X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X>X>X;X*XH.I L n v v v v v v v v z z z z z z z z z z z z s s s s s s s s s s s s s s s s s s s s s u u u u u u u u i i i i i i i i i t 8 X>X>X>X>X>X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X>X>X>X>X>X>X;X;X;X;X-X*X*X*X*X*X*X*X+X+X+X+X*X*X*X*X*X;X;X;X>X>X>X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X>X;X*X[.1.L n v v v v v v z z z z z z z z z z z z s s s s s s s s s s s s s s s s s s s s s s u u u u u u u u u i i i i i i i i i u q ; X>X>X>X>X>X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X>X>X>X>X>X>X>X>X;X;X;X;X;X;X;X;X;X;X;X;X;X;X;X;X>X>X>X>X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X>X>X;X*X XR L n v v v v v z z z z z z z z z z z z s s s s s s s s s s s s s s s s s s s s s u u u u u u u u i i i i i i i i i i i i t q X>X>X>X>X>X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X>X>X>X>X>X>X>X>X>X>X>X>X>X>X>X>X>X>X>X>X>X>X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X>X;X-X[.a.L n v v v z z z z z z z z z z z z z z s s s s s s s s s s s s s s s s s s s s u u u u u u u u u i i i i i i i i i i i i i t 8 X>X>X>X>X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X>X>X>X>X>X>X>X>X>X>X>X>X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X>X>X;X*X]._ L n v z z z z z z z z z z z z z z s s s s s s s s s s s s s s s s s s s s s u u u u u u u i i i i i i i i i i i i i i i u q ; X>X>X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X>X;X*X[.a.L n v z z z z z z z z z z z z s s s s s s s s s s s s s s s s s s s s s s s u u u u u u u i i i i i i i i i i i i i i i i t q X>X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X>X>X;X*X_.R L n z z z z z z z z z z z z s s s s s s s s s s s s s s s s s s s s s s u u u u u u u i i i i i i i i i i i i i i i i i i t 8 X>X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X>X>X;X*X[.2.L n z z z z z z z z z z z s s s s s s s s s s s s s s s s s s s s u s u u u u u u u u i i i i i i i i i i i i i i i i i i t q = X>X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X>X>X;X*X[.D.L L v z z z z z z z z z z s s s s s s s s s s s s s s s s s s s s u u u u u u u u u i i i i i i i i i i i i i i i i i i i i t q X>X,X,X,X,X,X,X,X,X>X>X>X>X>X>X>X>X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X>X>X;X-X*X XR L n z z z z z z z z s s s s s s s s s s s s s s s s s s s s s s u u u u u u u i i i i i i i i i i i i i i i i i i i i i i u q 7 X>X,X,X,X,X,X,X,X>X>X>X>X;X;X>X>X>X>X>X>X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X>X>X;X-X*X'._ I n z z z z z z z s s s s s s s s s s s s s s s s s s s s s s u u u u u u i u u i i i i i i i i i i i i i i i i i i i i i i t q o X>X,X,X,X,X,X,X>X>X>X=X;X-X-X-X;X;X;X>X>X>X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X>X>X>X;X-X*X].%.L L z z z z z z s s s s s s s s s s s s s s s s s s s s s s u u u u u u u u i i i i i i i i i i i i i i i i i i i i i i i i i t 8 X>X,X,X,X,X,X>X>X;X=X=.5.c.W.oX*X*X-X;X>X>X>X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X>X>X>X>X;X*X*X_.%.I L z z z z z z s s s s s s s s s s s s s s s s s s s s u u u u u u u u u i i i i i i i i i i i i i i i i i i i i i i i i i i t q - X>X,X,X,X,X,X>X>X;X|._ _ _ { #.4.l.}.$X;X>X>X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X>X>X>X>X;X;X*X[.E.{ I L v z z z z s s s s s s s s s s s s s s s s s s s s u u u u u u u u i u i i i i i i i i i i i i i i i i i i i i i i i i i i i t 8 X,X,X,X,X,X>X>X;X*XF.R R R R _ _ { { { 4.-X>X>X,X,X,X,X,X,X,X,X,X>X>X>X>X>X>X>X>X>X>X>X,X,X,X,X,X,X,X,X,X,X,X>X>X>X>X>X>X>X;X;X*X*X[.k._ I n z z z s s s s s s s s s s s s s s s s s s s s s s s u u u u u u u i i i i i i i i i i i i i i i i i i i i i i i i i i i i i t q 7 X,X,X,X,X,X>X>X;X*X4.R I I I I R R R b U -X>X>X,X,X,X,X,X,X,X,X>X>X>X>X>X;X>X>X>X>X>X>X>X>X>X>X>X>X>X>X>X>X>X>X>X>X;X;X;X-X*X*X[.T.*.R L n z z z s s s s s s s s s s s s s s s s s s s s s u u u u u u u u i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i t q X>X,X,X,X,X,X>X;X*X+X] R I L I I I I P x t.;X>X>X,X,X,X,X,X,X,X>X>X;X;X;X;X-X-X-X;X;X;X;X;X;X;X;X;X;X;X;X;X;X;X;X;X;X*X*X*X[.].U.4.R I L v z z z s s s s s s s s s s s s s s s s s s s s u u u u u u u u i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i u q 7 X>X,X,X,X,X>X>X;X*XE.R Y L L I I I I K k I.-X;X>X,X,X,X,X,X,X>X>X;X|.f.J.W..X[.[.*X*X*X*X*X*X*X*X*X*X*X*X*X*X*X*X*X*X[._.I.h.#.R L L n z z z s s s s s s s s s s s s s s s s s s s s u u u u u u u u i u i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i t q . X,X,X,X,X,X>X>X;X*Xl.I I L L L I I P K A oX-X>X>X,X,X,X,X,X>X>X;X;Xs.R _ _ { #.4.y.S.l.T.{.{. XoXoXoXoX].oX{.{.E.k.a.2.{ _ I L n v z z s s s s s s s s s s s s s s s s s s s s s s u u u u u u u i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i u q 7 X,X,X,X,X,X>X>X;X[.2.I I L L L L I L x ^ *X;X>X>X,X,X,X,X,X>X>X;X*X#.I I I I Y I R I _ R _ ] { { [ { { { { ] _ R R I I L n n v z z z s s s s s s s s s s s s s s s s s s s s u u u u u u u u i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i t q . X>X,X,X,X,X,X>X;X*X]._ Y L L L L L I L k r.*X;X>X>X,X,X,X,X,X>X;X-X.XR L n n n n n n L L L L L L L n L n n n L n n n c v z z z z s s s s s s s s s s s s s s s s s s s s s u u u u u u u u u i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i u q 7 X>X,X,X,X,X>X>X;X*XT.R I L L L L L L K k H.*X;X>X>X,X,X,X,X>X>X;X*XJ.L L n n n n n v v v v v v v v v z z z z z z z z z z z z z s s s s s s s s s s s s s s s s s s s s u u u u u u u u u i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i t 8 X,X,X,X,X,X>X>X;X*Xk.I I n L L L L L b k ].*X;X>X,X,X,X,X,X>X>X;X*Xy.L n n n n v v v v v v v v v z z z z z z z z z z z z z s s s s s s s s s s s s s s s s s s s s u u u u u u u u u i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i t q 7 X,X,X,X,X,X>X>X-X[.2.L L n L L L L L l ^ [.-X>X>X,X,X,X,X,X>X;X*X[.[ L n n n v v v v v v v z z v z z z z z z z z z z z z s s s s s s s s s s s s s s s s s s s u u u u u u u u u i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i t 8 X,X,X,X,X,X>X;X*X]._ L L n L L L L K g r.*X;X>X>X,X,X,X,X,X>X;X*X{.R L n v v v v v v v z z z z z z z z z z z z z z z s s s s s s s s s s s s s s s s s s s s u u u u u u u u u i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i t q - X,X,X,X,X>X>X;X*XE.I L n n n L L L b g H.*X;X>X>X,X,X,X,X>X>X;X*XF.L L v v v v v v v z z z z z z z z z z z z z s s s s s s s s s s s s s s s s s s s s s u u u u u u u i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i u q 8 X>X>X,X>X>X>X;X*Xk.L L n n n n L L x k _.*X;X>X,X,X,X,X,X>X>X;X*Xy.n n v v v v v v z z z z z z z z z z z z z s s s s s s s s s s s s s s s s s s s s s u u u u u u u i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i t q # X>X>X>X>X;X*X[.2.L L n n n n n b l ~ [.-X>X>X,X,X,X,X,X>X;X*X[.' L n v v v z z z z z z z z z z z z z s s s s s s s s s s s s s s s s s s s s s s s u u u u u u i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i t q 7 X>X,X,X,X,X,X>X;X*X{.I n c v v z z z z z z z z z z z z z s s s s s s s s s s s s s s s s s s s s s u u u u u u u u u i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i t 8 X>X,X,X,X,X>X>X;X*XF.L n v z z z z z z z z z z z z z z s s s s s s s s s s s s s s s s s s s s u u u u u u u u i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i t q - X>X,X,X,X,X>X>X;X*X4.n n z z z z z z z z z z z z s s s s s s s s s s s s s s s s s s s s s s u u u u u u u u i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i t q 7 .L n n n n n n b l E [.*X;X>X>X,X,X,X>X>X;X*X[.' n v z z z z z z z z z z z s s s s s s s s s s s s s s s s s s s s s u u u u u u u i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i t 8 X>X>X>X>X>X;X*X{.I n z z z z z z z z z z s s s s s s s s s s s s s s s s s s s s s u u u u u u u u i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i t q - X>X>X;X;X*X[.S.n n z z z z z z z z s s s s s s s s s s s s s s s s s s s s s u u u u u u u u i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i t q 7 c #8F6A16", -", c #816218", -"< c #88691C", -"1 c #926D12", -"2 c #936F1C", -"3 c #997417", -"4 c #94721E", -"5 c #9B761C", -"6 c #9F781C", -"7 c #A17B1E", -"8 c #826622", -"9 c #916E20", -"0 c #967425", -"q c #9D7420", -"w c #9C7923", -"e c #997728", -"r c #99792C", -"t c #A37D23", -"y c #A37F2C", -"u c #A68125", -"i c #AB8225", -"p c #A5832B", -"a c #AA852C", -"s c #B28A2C", -"d c #A58233", -"f c #AC8734", -"g c #AE8C33", -"h c #AC8C3C", -"j c #B28C33", -"k c #B98E34", -"l c #B28D3D", -"z c #B59136", -"x c #BC9335", -"c c #B3913E", -"v c #BC933A", -"b c #BF9A3D", -"n c #C19235", -"m c #C2953C", -"M c #C39B3C", -"N c #CA9C3D", -"B c #B59343", -"V c #BE9642", -"C c #B69A44", -"Z c #BD9A45", -"A c #B49649", -"S c #BB9A49", -"D c #BB9F52", -"F c #BFA256", -"G c #C49C43", -"H c #CA9D41", -"J c #C59D4A", -"K c #C99E4D", -"L c #C3A144", -"P c #CDA244", -"I c #CFAA47", -"U c #C3A14D", -"Y c #CDA24A", -"T c #CCAB49", -"R c #D2A644", -"E c #D2A54B", -"W c #D6AA4C", -"Q c #DAAE4E", -"! c #DAB04F", -"~ c #C7A656", -"^ c #CDA452", -"/ c #CFAC52", -"( c #C0A65E", -") c #CEA75A", -"_ c #CCAC59", -"` c #D2AB53", -"' c #DCAF52", -"] c #D6AD5A", -"[ c #D9AE5B", -"{ c #DCB556", -"} c #DFB855", -"| c #D6B25F", -" . c #DCB35C", -".. c #DEBE5E", -"X. c #E2B656", -"o. c #E1B55A", -"O. c #E6BC5D", -"+. c #E9BD5E", -"@. c #C3AA63", -"#. c #CCAD62", -"$. c #D4AF62", -"%. c #CDB565", -"&. c #CEB46D", -"*. c #D7B164", -"=. c #DBB362", -"-. c #D6BD64", -";. c #DDBA64", -":. c #D3B66C", -">. c #DFB86B", -",. c #CEB772", -"<. c #D0B771", -"1. c #D4BA73", -"2. c #D9BE77", -"3. c #D6BE79", -"4. c #D8BF7A", -"5. c #E4BB62", -"6. c #E9BF64", -"7. c #E4BC69", -"8. c #E9BF69", -"9. c #E0BB71", -"0. c #E9C05E", -"q. c #D2C279", -"w. c #DBC27C", -"e. c #E2C667", -"r. c #EDC364", -"t. c #E3C16E", -"y. c #ECC46C", -"u. c #EDCC6C", -"i. c #F1C764", -"p. c #F5CA66", -"a. c #F9CD67", -"s. c #F5CC6A", -"d. c #F9CD6B", -"f. c #FBD36F", -"g. c #EDC572", -"h. c #E5CF77", -"j. c #ECCA74", -"k. c #E0C67E", -"l. c #EFCE78", -"z. c #F6CE72", -"x. c #FBCF71", -"c. c #F4CE79", -"v. c #F4D273", -"b. c #FCD473", -"n. c #F4DC75", -"m. c #FEDA74", -"M. c #F6D77C", -"N. c #FBD47A", -"B. c #F1DA7B", -"V. c #FDDA7C", -"C. c #FEE27D", -"Z. c #DDC683", -"A. c #DFC884", -"S. c #E4CA84", -"D. c #E3CC89", -"F. c #E7D183", -"G. c #EFD280", -"H. c #EFDC82", -"J. c #ECD48D", -"K. c #EFDA8C", -"L. c #F9D783", -"P. c #F2DF83", -"I. c #FCDB83", -"U. c #F5DC8F", -"Y. c #FADD8B", -"T. c #EBD593", -"R. c #EFDA99", -"E. c #F3DD93", -"W. c #F3DF9F", -"Q. c #FFE385", -"!. c #FEE986", -"~. c #FDE48C", -"^. c #FEEC8E", -"/. c #ECE199", -"(. c #F6E591", -"). c #FEE494", -"_. c #FEEB93", -"`. c #FEE69A", -"'. c #FFEB9B", -"]. c #FFF197", -"[. c #FFF39B", -"{. c #FEF99B", -"}. c #F6E2A2", -"|. c #F9E5A5", -" X c #F7E9A5", -".X c #FEECA4", -"XX c #FBE7A8", -"oX c #FDEAAB", -"OX c #F7F2AA", -"+X c #FEF2AC", -"@X c #FDF4B4", -"#X c #FFFABA", -"$X c #FFFEC2", -"%X c None", +"32 32 102 2", +" c #CC7D1D", +". c #D5831F", +"X c #D48221", +"o c #D98621", +"O c #DC8820", +"+ c #DC8D2C", +"@ c #D98F36", +"# c #D68F39", +"$ c #DD943E", +"% c #E28B23", +"& c #E98F24", +"* c #E18F2D", +"= c #ED9124", +"- c #EC942A", +"; c #F59624", +": c #F89724", +"> c #F79827", +", c #F89825", +"< c #F0962B", +"1 c #F59A2D", +"2 c #F99B2B", +"3 c #EC9732", +"4 c #EC9A37", +"5 c #E2963B", +"6 c #E6983A", +"7 c #EC9C3B", +"8 c #F69D33", +"9 c #F99E32", +"0 c #F49E3A", +"q c #F9A036", +"w c #F6A13C", +"e c #F9A33B", +"r c #D79341", +"t c #DC9641", +"y c #E39A43", +"u c #EA9D42", +"i c #EFA041", +"p c #EDA34B", +"a c #F5A443", +"s c #F9A643", +"d c #FAA846", +"f c #F2A64C", +"g c #F9AA4B", +"h c #E5A251", +"j c #ECA756", +"k c #EBA758", +"l c #FAAF57", +"z c #FBB057", +"x c #FBB25B", +"c c #DFB179", +"v c #E4AA65", +"b c #EBAE64", +"n c #E9AF69", +"m c #FBB665", +"M c #F1B46A", +"N c #F8B96D", +"B c #E5B071", +"V c #EBB777", +"C c #EEB877", +"Z c #E7B478", +"A c #EBB97D", +"S c #F0B671", +"D c #F2B871", +"F c #EFBC80", +"G c #E6BD8D", +"H c #EDBF88", +"J c #E6BF90", +"K c #F1C187", +"L c #F1C288", +"P c #E5C093", +"I c #EEC493", +"U c #E1C19B", +"Y c #E9C69C", +"T c #ECC89D", +"R c #F1C897", +"E c #DFC5A4", +"W c #DBCBB8", +"Q c #E2C7A7", +"! c #EBCBA6", +"~ c #E6CBAB", +"^ c #E9D2B7", +"/ c #E5D1B9", +"( c #EBD6BD", +") c #EFD9BE", +"_ c #DDD0C2", +"` c #DCD7D2", +"' c #DEDEDE", +"] c #ECDAC5", +"[ c #EDDECB", +"{ c #E9E0D5", +"} c #E7E0D9", +"| c #E9E2DB", +" . c #EFE8DF", +".. c #E5E5E5", +"X. c #EBE7E2", +"o. c #EFEAE6", +"O. c #ECECEC", +"+. c #F2ECE6", +"@. c #F1F0EE", +"#. c #F4F4F4", +"$. c #FBFBFB", +"%. c None", /* pixels */ -"%X%X%X%X%X%X%X%X%X%X%X%Xp t 6 5 w t w %X%X%X%X%X%X%X%X%X%X%X%X%X", -"%X%X%X%X%X%X%X%X%Xu u x I X.0.s.u.0.W x 7 4 %X%X%X%X%X%X%X%X%X%X", -"%X%X%X%X%X%X%Xy i I i.a.f.m.m.b.f.s.a.s.i.W 7 > %X%X%X%X%X%X%X%X", -"%X%X%X%X%X%Xt M 0.a.m.m.m.m.f.d.p.p.p.f.d.f.i.b 1 < %X%X%X%X%X%X", -"%X%X%X%X%X7 ! d.f.f.m.f.+.W P R I Q 5.v.V.V.z.f.{ 5 + %X%X%X%X%X", -"%X%X%X%Xu X.f.m.m.f.' H s ~ V y _ Z J o.g.L.L.Q.!.e.5 X %X%X%X%X", -"%X%X%Xu X.b.C.m.+.N m n t }.3.> }.w.V 5.y.y.Y.[.^.^.-.1 + %X%X%X", -"%X%Xt P m.N.m.X.v v v k 6 }.1.: /.4.c 7.N.N.v.!.{.{.^.L & %X%X%X", -"%X%Xg Y.Y.V.+.m k a t t : }.1.% }.1.r | l.B.M.b.!.{.^.n.7 X %X%X", -"%Xp -._.'.Y.' Y n D.}.}.|.oXXX|.oX XT.w.F _ j.v.v._.^.C.T & @ %X", -"%Xa (.'.'.9.[ [ K S.}.oXoXoXoXXXoXoXoXoX XD / s.d.v.!.C.v.3 o %X", -"%XU '.'.Y.[ [ [ [ J f <.oXoX( 2 f S J.oXoXT.j r.s.i.C.C.C.z X %X", -"p e.'.'.F. .=.=.=.=.) 1.oXoX@.f . .F oXoX}.a +.i.i.b.C.m.I X O ", -"u w.'.[.j.5.8.7.7.7.] 2.oXoX@.y W c &.oXoXZ.k r.s.i.s.V.m.} = o ", -"u H.[.{.y.8.y.g.8.g.7.2.oXoXA.@.&.D.oXoXT.e G +.O.O.5.V.m.0.- o ", -"u !.].[.r.8.y.g.g.g.7.4.oXoXoXoXoXoXoXoXoX<.y W X.o.o.m.m.0.- o ", -"u B._._.5.5.8.y.g.c.g.w.oXoX,.h A F <..XoXoX1.k ' ' ' V.N.r.- ", -"u u.Q.~.r.6.z.N.V.I.v.k.oXoX@.B | _ c 1.oXoX}.a ' ' O.I.b.O.= o ", -"u ..Q.Q.v.i.s.c.N.L.l.Z.oXoX@.B t.=.S &.oXoXXXy Y R +.N.b.Q % o ", -"t T C.I.I.6.u.z.z.5.S 1.oXoX@.e B h D |.oXoXS.f Y Y 6.d.d.n X O ", -"%Xs m.V.Q.r.r.z.5.<.}.oXoXoXXXW.}.oXoXoXoXW.h G H R a.p.s.7 %X", -"%X7 O.V.V.v.+.r.` 4.oXoXoXoXoXoXoXoXXXR.<.h v N N o.a.p.Q = %X", -"%Xw x v.v.v.r.+. .Z l d e }.Z.r }.3.d l V G n n R a.s.a.s X O %X", -"%X%X6 { v.l.v.+.O.5.=.^ d }.4.9 }.1.f J G m m G d.d.x.Q = %X%X", -"%X%X%Xs u.v.v.v.r.6.o. .l }.4.9 W.4.l ^ ^ J ) c.N.N.y.7 X O %X%X", -"%X%X%X5 z v.v.M.I.g.;. .J 1.#.B 1.#.) 7.$.S..X'.W.Y.j $ %X%X%X", -"%X%X%X%X5 b N.Y.~.).Y.j.5.$.=.=.$.*.2.J.@X$X#X#XoXC $ %X%X%X%X", -"%X%X%X%X%X3 z U.@X+X`.`.`.(.E.E.E.|.@X@X#X#X#X/.j % %X%X%X%X%X", -"%X%X%X%X%X%Xw a q.OX|.).`._.'.'.XX.X.X+X+X X%.w X o %X%X%X%X%X%X", -"%X%X%X%X%X%X%X%Xw a _ j.~.~.).).`.`.`.F._ t & . # %X%X%X%X%X%X%X", -"%X%X%X%X%X%X%X%X%X%X4 3 t z L U Z z t 1 $ . 8 %X%X%X%X%X%X%X%X%X", -"%X%X%X%X%X%X%X%X%X%X%X%X%X< ; & + + , 8 %X%X%X%X%X%X%X%X%X%X%X%X" +"%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.", +"%.%.%.%.%.%.%.%.%.%.%.%.%.%.t 5 5 $ %.%.%.%.%.%.%.%.%.%.%.%.%.%.", +"%.%.%.%.%.%.%.%.%.%.%.r u w q 9 9 9 8 4 # %.%.%.%.%.%.%.%.%.%.%.", +"%.%.%.%.%.%.%.%.%.y s e 9 2 , , , : > 2 9 q 5 %.%.%.%.%.%.%.%.%.", +"%.%.%.%.%.%.%.%.s q 2 , , , , : , > 2 2 > > 2 9 %.%.%.%.%.%.%.%.", +"%.%.%.%.%.%.t e 1 , , , , : : ; > 2 9 9 2 , , > 2 + %.%.%.%.%.%.", +"%.%.%.%.%.$ e 2 , , , , , , ; u u 8 1 1 2 > , , > > + %.%.%.%.%.", +"%.%.%.%.%.e 2 , , : > ; ; > < ` ` 0 c n 1 2 , , , > , %.%.%.%.%.", +"%.%.%.%.e 1 , , , , ; h v - 3 ..! w ' _ 9 2 > , , , > : %.%.%.%.", +"%.%.%.6 q , : , > 2 > W ..| [ #.H V ..D 9 9 2 , , , , , % %.%.%.", +"%.%.%.e 2 , > 2 2 2 9 b ! #.$.$.#.#.#.Y i 1 2 > , , , > ; %.%.%.", +"%.%.@ q > 2 2 2 9 q e q 0 o.$.+.) { #.#.| b 2 2 , , , , : X %.%.", +"%.%.4 9 2 2 9 q e e s w b O.#.( m x I @.$...f > > , , , : & %.%.", +"%.%.8 > 2 2 9 e s d g a P #.#.L x l a [ $.#.A 2 2 , : , , ; %.%.", +"%.+ 1 , , 2 2 q e d g f / $.#.T n k Z o.$.O.M 9 2 > , , , ; X %.", +"%.* 2 , , , 2 9 q e s f X.$.#.O.O.O.#.$.+.Y g e 9 2 , , , ; o %.", +"%.* 2 , , , 2 2 q e w n O.$.[ R ( O.$.$.[ d s e 9 2 2 , , ; o %.", +"%.+ 2 , , , > 2 8 8 1 G #.#.T m m N ] #.#.~ s e e 9 2 > : ; X %.", +"%.%.> , , , , 2 < v B [ $.O.m z z s b #.$...g e e q 9 2 ; = %.%.", +"%.%.= : , , , : 7 ' O.#.$.@.C j p u ~ #.$.} g q 9 9 2 2 ; % %.%.", +"%.%.o , , , , : 0 G ^ .$.#.O.X.{ X.#.$.#.Y e 9 2 2 > , ; %.%.", +"%.%.%., : , , , 2 2 2 M O.) ] #.#.#.#.O./ d 9 2 > , , ; = %.%.%.", +"%.%.%.& ; , , , , 2 ; Q ..g F O.K A H S s 9 2 > , : , ; o %.%.%.", +"%.%.%.%.; ; , , , , 2 E _ d ' ..d q q 9 2 > , : , , ; = %.%.%.%.", +"%.%.%.%.%.; : , , , 2 q d g U J e 2 2 > , , , , , ; = %.%.%.%.%.", +"%.%.%.%.%.o ; : , , , 2 9 q 9 q 9 > , : , , , , ; = . %.%.%.%.%.", +"%.%.%.%.%.%.. ; ; , , > 2 2 2 > , , , , , , , ; = %.%.%.%.%.%.", +"%.%.%.%.%.%.%.%.= ; : > 2 2 , , : , , , , ; ; & %.%.%.%.%.%.%.%.", +"%.%.%.%.%.%.%.%.%.. = ; > : , , , , ; ; = = X %.%.%.%.%.%.%.%.%.", +"%.%.%.%.%.%.%.%.%.%.%. % = ; ; ; ; & O %.%.%.%.%.%.%.%.%.%.%.", +"%.%.%.%.%.%.%.%.%.%.%.%.%.%. X X %.%.%.%.%.%.%.%.%.%.%.%.%.%.", +"%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%." }; diff --git a/share/pixmaps/bitcoin64.png b/share/pixmaps/bitcoin64.png new file mode 100644 index 0000000000..8aedee811f Binary files /dev/null and b/share/pixmaps/bitcoin64.png differ diff --git a/share/pixmaps/bitcoin64.xpm b/share/pixmaps/bitcoin64.xpm new file mode 100644 index 0000000000..851829d41c --- /dev/null +++ b/share/pixmaps/bitcoin64.xpm @@ -0,0 +1,242 @@ +/* XPM */ +static char *bitcoin__[] = { +/* columns rows colors chars-per-pixel */ +"64 64 172 2", +" c #8F6319", +". c #8F6A1A", +"X c #90651A", +"o c #916C1A", +"O c #AF7C1E", +"+ c #B1781E", +"@ c #9A7026", +"# c #AC801F", +"$ c #B1811F", +"% c #A9812B", +"& c #B08320", +"* c #BB8621", +"= c #BD8E22", +"- c #A58132", +"; c #FC8400", +": c #FD8A03", +"> c #FD8E0C", +", c #FF910E", +"< c #F98F14", +"1 c #F79117", +"2 c #FD9314", +"3 c #FC951B", +"4 c #FE9A1D", +"5 c #CA8E22", +"6 c #CC8E2A", +"7 c #D48D23", +"8 c #C39223", +"9 c #CE9925", +"0 c #D19C25", +"q c #D19329", +"w c #D5992B", +"e c #DD9D33", +"r c #D69F3C", +"t c #E29425", +"y c #E79925", +"u c #EA9926", +"i c #E69A2C", +"p c #F79625", +"a c #F99524", +"s c #F79825", +"d c #F89825", +"f c #F3962A", +"g c #F69B2C", +"h c #F89B2B", +"j c #E19F30", +"k c #EE9B34", +"l c #F49D33", +"z c #F99E32", +"x c #F39F3B", +"c c #DFA731", +"v c #D7A43D", +"b c #DCA63C", +"n c #EEA328", +"m c #FFA225", +"M c #FFAB26", +"N c #F3A529", +"B c #FEA429", +"V c #F4AB2A", +"C c #FFAC2A", +"Z c #FFB325", +"A c #FFB42C", +"S c #FFBB2D", +"D c #E3A335", +"F c #E5A438", +"G c #EDA03D", +"H c #F7A037", +"J c #FAA135", +"K c #F3AB31", +"L c #FEAB31", +"P c #F4A13C", +"I c #F9A33B", +"U c #FDB432", +"Y c #FFBF37", +"T c #FFC12F", +"R c #FFC230", +"E c #FFC03E", +"W c #DFAF41", +"Q c #ECA34D", +"! c #EDA84E", +"~ c #F2A343", +"^ c #FAA642", +"/ c #FAA846", +"( c #F1A74C", +") c #F6A94F", +"_ c #FAAA4A", +"` c #E7A451", +"' c #ECA754", +"] c #EFAA56", +"[ c #ECAC5B", +"{ c #F3AA52", +"} c #FCAE52", +"| c #FBB056", +" . c #FBB25C", +".. c #E7AB61", +"X. c #ECB067", +"o. c #E7B36D", +"O. c #EBB36C", +"+. c #F2B163", +"@. c #FCB460", +"#. c #F0B56B", +"$. c #E3B274", +"%. c #EDB672", +"&. c #EDB877", +"*. c #E2B57C", +"=. c #ECB97B", +"-. c #E4BA83", +";. c #EBBD83", +":. c #E7BF8D", +">. c #EBBD88", +",. c #E9C08C", +"<. c #E7C496", +"1. c #EBC393", +"2. c #EBC997", +"3. c #E7C49A", +"4. c #E9C69A", +"5. c #E3CA9D", +"6. c #E9C89E", +"7. c #DCC9AE", +"8. c #DDCBB2", +"9. c #E3C7A2", +"0. c #E5CAA3", +"q. c #E9CBA3", +"w. c #E5CEAB", +"e. c #E8CEAA", +"r. c #E4D4AC", +"t. c #EBD2AF", +"y. c #E7CFB2", +"u. c #E1D4B4", +"i. c #E8D5B6", +"p. c #E5D7BB", +"a. c #E9D6BB", +"s. c #E5D8B9", +"d. c #EAD8BE", +"f. c #F0D6B4", +"g. c #DFDFC6", +"h. c #E3D6C1", +"j. c #E9D7C0", +"k. c #E6DAC5", +"l. c #EBDCC7", +"z. c #E5DCCA", +"x. c #EADEC9", +"c. c #E8DFD0", +"v. c #D7E2D9", +"b. c #E3E0C9", +"n. c #EEE2CB", +"m. c #E6E1D4", +"M. c #E9E2D3", +"N. c #E4E4DC", +"B. c #E9E5DE", +"V. c #F4EDDE", +"C. c #DFE8E6", +"Z. c #DEEEE8", +"A. c #DFF2F3", +"S. c #DDFFFF", +"D. c #E1E6E0", +"F. c #E8E6E2", +"G. c #E8E9E5", +"H. c #E5EFEC", +"J. c #E8E9EA", +"K. c #EAF3EE", +"L. c #F3F3EB", +"P. c #E7EDF2", +"I. c #E8EEF3", +"U. c #E7F4F7", +"Y. c #E9F0F7", +"T. c #EBF5FD", +"R. c #E4FEFF", +"E. c #ECFCFF", +"W. c #F4F5F4", +"Q. c #F4FFFF", +"!. c #FEFFFF", +"~. c None", +/* pixels */ +"~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.", +"~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.", +"~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.", +"~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.", +"~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.F L h C C A A A A C C h L e ~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.", +"~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.D N C m d d a a p a a p a a d m m C N j ~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.", +"~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.- K M m a p s d d d d d d d d d d d d s p d m M V % ~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.", +"~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.Y M d a d d d d d d d d d d d d d d d d h h d s a d M U ~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.", +"~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.E m 4 a d d d d d d d d d d d d d d d d d d h h h d d d a d M U ~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.", +"~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.C 4 a d d d d d d d d d d d d d d d d d h h h h h h d d d d d a m C ~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.", +"~.~.~.~.~.~.~.~.~.~.~.~.~.W S a p d d d d d d d d d d d d d d d d h h h h g g h h h d d d d d p a S c ~.~.~.~.~.~.~.~.~.~.~.~.~.", +"~.~.~.~.~.~.~.~.~.~.~.~.v M a s d d d d d d d d d d d d d d d h h h h h g z z g h h d d d d d d s a C w ~.~.~.~.~.~.~.~.~.~.~.~.", +"~.~.~.~.~.~.~.~.~.~.~.r Z a d d d d d d d d d d d d d d d g 4 : 2 h z z z z z h h h h d d d d d d d a S q ~.~.~.~.~.~.~.~.~.~.~.", +"~.~.~.~.~.~.~.~.~.~.b Z a d d d d d d d d d d d d d d h h 4 x $.l a z H h h H z h h h d d d d d d d d a A w ~.~.~.~.~.~.~.~.~.~.", +"~.~.~.~.~.~.~.~.~.~.T a s d d d d d d d d d d d d h h h g : $.R.T.7.a B x f > a H h h d d d d d d d d s a R ~.~.~.~.~.~.~.~.~.~.", +"~.~.~.~.~.~.~.~.~.U a s d d d d d d d d d d d d h h h h z : e.!.!.p.2 3 8.D.5.' a h h h d d d d d d d d p d A ~.~.~.~.~.~.~.~.~.", +"~.~.~.~.~.~.~.~.U M p d d d d d d d d d d h h 1 : : 2 h h p B.!.Q.%., l J.!.R.-.> z h h h d d d d d d d d p C N ~.~.~.~.~.~.~.~.", +"~.~.~.~.~.~.~.~.S a d d d d d d d d d d h d 3 7.r.O.G p ; k E.!.T.( , [ E.!.T.~ 4 z h h h d d d d d d d d d a S ~.~.~.~.~.~.~.~.", +"~.~.~.~.~.~.~.V d s d d d d d d d d h h h 2 l E.!.Q.T.m.:.q.!.!.l.: : -.Q.!.c.a z z z g h h d d d d d d d d s m A ~.~.~.~.~.~.~.", +"~.~.~.~.~.~.@ S a d d d d d d d h h h h z : *.R.!.!.!.!.Q.!.!.!.V.,.Q d.!.Q.1.2 I z z h h h d d d d d d d d d a S X ~.~.~.~.~.~.", +"~.~.~.~.~.~.U d s d d d d d h h h h h g z a [ 5.M.Q.!.!.!.!.!.!.!.Q.E.!.!.Q.&.; 3 J H z h h h d d d d d d d d s h C ~.~.~.~.~.~.", +"~.~.~.~.~.~.S a d d d d h h h h h h z z z I d > < %.W.!.!.!.!.!.!.!.!.!.!.!.W.s.[ > 4 H g h h d d d d d d d d d a S ~.~.~.~.~.~.", +"~.~.~.~.~.i M p d d d h h h h g z z z z J H I I J > x.!.!.!.!.Q.T.E.Q.!.!.!.!.!.E.u.f 2 H h h h d d d d d d d d p C 7 ~.~.~.~.~.", +"~.~.~.~.~.C a d h h h h h g g z z z J J I I I I J P J.!.!.!.!.d.P =.e.G.E.!.!.!.!.Q.Z.f 2 z h h d d d d d d d d d d A ~.~.~.~.~.", +"~.~.~.~.~.A a h h h h h g z z z J H I I I I ^ / d X.E.!.!.!.Q.1.4 I J I ;.U.!.!.!.!.!.N.1 h g h h d d d d d d d d a S ~.~.~.~.~.", +"~.~.~.~.6 C p d h h h z z J J J I I I I ^ ^ ^ _ a 3.Q.!.!.!.E.#.I . ._ 3 ] K.!.!.!.!.E.O., z h h h d d d d d d d p A + ~.~.~.~.", +"~.~.~.~.i B d d h h h g z J I I I I ^ ^ ^ / / _ h k.!.!.!.!.J.) } . .| .3 6.Q.!.!.!.Q.q.> z g h h d d d d d d d d B t ~.~.~.~.", +"~.~.~.~.B d d d d h h h z z J I I ^ / / / _ _ ^ ( I.!.!.!.Q.d.I . . .| .d 1.Q.!.!.!.Q.q.2 z h h h d d d d d d d d d B ~.~.~.~.", +"~.~.~.~.C a d d d d h h g z J H I ^ ^ / _ _ } J %.E.!.!.!.Q.;.4 _ } | } J f m.!.!.!.!.Q.;.2 J z g h h d d d d d d d a A ~.~.~.~.", +"~.~.~.~.C a d d d d h h h z z J I I ^ ^ / _ } z 6.Q.!.!.!.!.n.<.&.+.{ ) ] h.Q.!.!.!.!.R.~ d H z z h h h d d d d d d a A ~.~.~.~.", +"~.~.~.~.A a d d d d d h h g z z H I I ^ / _ _ z k.!.!.!.!.!.!.Q.E.I.F.F.T.Q.!.!.!.!.E.9.2 I J z z h h h d d d d d d d A ~.~.~.~.", +"~.~.~.~.S a d d d d d h h h z z J I I ^ ^ / I ( P.!.!.!.!.Q.Q.!.!.!.!.!.!.!.!.!.!.E.w.d J I I J z h h h d d d d d d d A ~.~.~.~.", +"~.~.~.~.A a d d d d d d h h h z J J I I ^ / h O.E.!.!.!.Q.f.1.z.Y.E.!.!.!.!.!.!.L.! , ^ / I I H z z h h h d d d d d d A ~.~.~.~.", +"~.~.~.~.S p d d d d d d h h h z z J I I ^ / d <.Q.!.!.!.E.+.d _ +.>.k.E.!.!.!.!.Q.s.P J _ ^ I I J z z h h h d d d d d A ~.~.~.~.", +"~.~.~.~.C a d d d d d d d h h g z z H I I ^ d k.!.!.!.!.J.{ | @.} I I O.H.!.!.!.!.Q.C.l I ^ I I H J z g h h d d d d a A ~.~.~.~.", +"~.~.~.~.B a d d d d d d d h h h h z z J I J x P.!.!.!.Q.j.I . . . . .B { K.!.!.!.!.Q.0.a / ^ I I J z z h h h d d d a A ~.~.~.~.", +"~.~.~.~.B d d d d d d d d d h h h J h f 2 ; [ E.!.!.!.Q.1.I . . .| | .d 4.Q.!.!.!.!.m.z I ^ I I I J z h h h h d d d B ~.~.~.~.", +"~.~.~.~.u B d d d d d d d d h h z , ' v.q.X.M.!.!.!.!.E.#.^ . .| } } } d >.Q.!.!.!.!.F.x J I I I J J z z h h h d d C t ~.~.~.~.", +"~.~.~.~.7 C p d d d d d d d d h h : y.Q.Q.Q.!.!.!.!.!.B.d B / _ } } } J 1 k.!.!.!.!.!.c.s J I H J J z z z h h h h s A + ~.~.~.~.", +"~.~.~.~.~.A a d d d d d d d d h > ` R.!.!.!.!.!.!.!.!.L.q.=.[ ~ z h h l 0.Q.!.!.!.!.Q.q.2 I J J z z h h h h h h h a S ~.~.~.~.~.", +"~.~.~.~.~.C d d d d d d d d d d > ..g.Y.E.Q.!.!.!.!.!.!.Q.E.T.B.k.a.d.P.Q.!.!.!.!.!.E.[ 2 J z z z g h h h h d d d d C ~.~.~.~.~.", +"~.~.~.~.~.y C p d d d d d d d d g 3 > l [ <.x.W.!.!.!.!.!.!.!.!.!.!.!.!.!.!.!.!.!.Q.z.> z z z h h h h h d d d d p C 7 ~.~.~.~.~.", +"~.~.~.~.~.~.S a d d d d d d d d d h h 3 , > ; =.Q.!.W.T.Q.!.!.!.!.!.!.!.!.!.!.!.Q.A.g 2 z h h h h h h d d d d d a S ~.~.~.~.~.~.", +"~.~.~.~.~.~.C h s d d d d d d d d d h g z H : <.!.!.t.l &.V.!.!.Q.Q.Q.Q.!.Q.Q.E.b.l > H h h h h h d d d d d d s m C ~.~.~.~.~.~.", +"~.~.~.~.~.~.X S a d d d d d d d d d h h h h p N.!.Q.=.: < c.!.Q.2.&.e.a.d.i.6.[ < 2 z h h h h d d d d d d d d a S ~.~.~.~.~.~.", +"~.~.~.~.~.~.~.A h s d d d d d d d d d h g 2 ~ E.!.E.{ 2 [ E.!.T.l : 2 1 3 2 > > h z h h h h d d d d d d d d s m A ~.~.~.~.~.~.~.", +"~.~.~.~.~.~.~.~.S a d d d d d d d d d h h : -.R.!.B.h 2 =.Q.!.M.p z z z h h z g h h h d d d d d d d d d d d a S ~.~.~.~.~.~.~.~.", +"~.~.~.~.~.~.~.~.N C p d d d d d d d d d h 3 ' 2.N.9.2 3 z.!.!.q.> J z h h h h h h d d d d d d d d d d d d p C n ~.~.~.~.~.~.~.~.", +"~.~.~.~.~.~.~.~.~.S h p d d d d d d d d d z 3 : p l J g 8.T.S.O.> z h h h h h d d d d d d d d d d d d d p h S ~.~.~.~.~.~.~.~.~.", +"~.~.~.~.~.~.~.~.~.~.S a s d d d d d d d d h h z d h I J a P o.P d g h h h d d d d d d d d d d d d d d s a S ~.~.~.~.~.~.~.~.~.~.", +"~.~.~.~.~.~.~.~.~.~.* S a s d d d d d d d d h h g z J J h 3 > d z h h h d d d d d d d d d d d d d d s a S * ~.~.~.~.~.~.~.~.~.~.", +"~.~.~.~.~.~.~.~.~.~.~.$ T a s d d d d d d d h h h z z z h g g h h d d d d d d d d d d d d d d d d s a T O ~.~.~.~.~.~.~.~.~.~.~.", +"~.~.~.~.~.~.~.~.~.~.~.~.& S a p d d d d d d h h h z g h h h h h d d d d d d d d d d d d d d d d p a S # ~.~.~.~.~.~.~.~.~.~.~.~.", +"~.~.~.~.~.~.~.~.~.~.~.~.~.8 S d p d d d d d d h h g h h h h d d d d d d d d d d d d d d d d d p h S = ~.~.~.~.~.~.~.~.~.~.~.~.~.", +"~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.S A a s d d d d h h h h h d d d d d d d d d d d d d d d d d s a A S ~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.", +"~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.0 T m p d d d d h h h d d d d d d d d d d d d d d d d d p B S 9 ~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.", +"~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.V S m a p d h d d d d d d d d d d d d d d d d p a m S V ~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.", +"~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.o V S C d p p d d d d d d d d d d d d p p d C S N . ~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.", +"~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.5 C S A B d d a a d d a a a d B A S C 5 ~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.", +"~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.O t B A A A A A A A A B t O ~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.", +"~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.", +"~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.", +"~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.", +"~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~." +}; diff --git a/share/pixmaps/bitcoin80.xpm b/share/pixmaps/bitcoin80.xpm deleted file mode 100644 index c3c816e92d..0000000000 --- a/share/pixmaps/bitcoin80.xpm +++ /dev/null @@ -1,292 +0,0 @@ -/* XPM */ -static const char * bitcoin80_xpm[] = { -/* columns rows colors chars-per-pixel */ -"80 80 206 2", -" c #725203", -". c #785706", -"X c #7B5907", -"o c #7C5A09", -"O c #7F5F10", -"+ c #815E0B", -"@ c #85620C", -"# c #89650F", -"$ c #856313", -"% c #896614", -"& c #8D6913", -"* c #886718", -"= c #8D6B1B", -"- c #926D14", -"; c #926E1B", -": c #967116", -"> c #997317", -", c #95711E", -"< c #9B7419", -"1 c #9F781B", -"2 c #A27B1D", -"3 c #8F6F22", -"4 c #926F21", -"5 c #947323", -"6 c #9A7623", -"7 c #9D7925", -"8 c #957628", -"9 c #9A7729", -"0 c #9D7B2B", -"q c #9D7F33", -"w c #A47D23", -"e c #A97F27", -"r c #A37E2B", -"t c #9F8030", -"y c #A78021", -"u c #AC8425", -"i c #A5802D", -"p c #AC842B", -"a c #AF8829", -"s c #B2872C", -"d c #B28B2D", -"f c #A68333", -"g c #AA8633", -"h c #AD8A36", -"j c #A4863A", -"k c #A88638", -"l c #A7893B", -"z c #AC8B3B", -"x c #B28732", -"c c #B48C32", -"v c #B98E34", -"b c #B28D3B", -"n c #B88F3C", -"m c #B69033", -"M c #BD9235", -"N c #B4913D", -"B c #BC943A", -"V c #BE993C", -"C c #C19336", -"Z c #C1953B", -"A c #C49A3C", -"S c #C99C3D", -"D c #CDA13F", -"F c #D0A33F", -"G c #A88B40", -"H c #B08F40", -"J c #AE9142", -"K c #AE944C", -"L c #B49443", -"P c #BB9542", -"I c #B49946", -"U c #BD9846", -"Y c #B3964C", -"T c #BB974A", -"R c #B6994A", -"E c #BF9C4A", -"W c #B69B53", -"Q c #B99D53", -"! c #BCA055", -"~ c #BDA25A", -"^ c #C49742", -"/ c #C49C43", -"( c #CB9E42", -") c #C49D4B", -"_ c #C99E4C", -"` c #C29F52", -"' c #C5A244", -"] c #CDA245", -"[ c #C5A34C", -"{ c #CCA34B", -"} c #CCA94D", -"| c #D2A445", -" . c #D1A54B", -".. c #D5AA4E", -"X. c #DBAF4F", -"o. c #C6A352", -"O. c #CBA554", -"+. c #C5AA57", -"@. c #CEAC54", -"#. c #C4A65A", -"$. c #CDA458", -"%. c #C2A85F", -"&. c #CEAA5B", -"*. c #D0A550", -"=. c #D4AB53", -"-. c #DBAE53", -";. c #D0A75B", -":. c #D4AC5A", -">. c #D9AE5C", -",. c #CEB25E", -"<. c #D4B156", -"1. c #DDB156", -"2. c #D4B25C", -"3. c #DCB35D", -"4. c #D7B85C", -"5. c #DCBA5E", -"6. c #E2B355", -"7. c #E2B65B", -"8. c #E4BA5D", -"9. c #EABD5E", -"0. c #C5AA62", -"q. c #CCAE63", -"w. c #C6AE69", -"e. c #D5AF62", -"r. c #CEB167", -"t. c #CCB36C", -"y. c #D5B162", -"u. c #DCB462", -"i. c #D7B964", -"p. c #DCBC64", -"a. c #D2B66B", -"s. c #DCB669", -"d. c #D7BE69", -"f. c #DFB86A", -"g. c #D0B771", -"h. c #D2BA74", -"j. c #D5BE78", -"k. c #E1B766", -"l. c #E4BB63", -"z. c #E9BE63", -"x. c #E3BB6A", -"c. c #E9BF6A", -"v. c #E1BE72", -"b. c #DDC16B", -"n. c #DAC27E", -"m. c #E4C164", -"M. c #ECC264", -"N. c #E4C36B", -"B. c #EBC36C", -"V. c #E7C96F", -"C. c #EECA6E", -"Z. c #F1C564", -"A. c #F1C76A", -"S. c #F5CB6C", -"D. c #FACE6D", -"F. c #F4D06F", -"G. c #FCD06E", -"H. c #E5C371", -"J. c #EDC573", -"K. c #E4CA73", -"L. c #ECCC74", -"P. c #E7CF7A", -"I. c #EBCD7A", -"U. c #F3CD73", -"Y. c #F8CE71", -"T. c #F3CD7A", -"R. c #EDD076", -"E. c #EDD17B", -"W. c #F4D274", -"Q. c #FBD274", -"!. c #FED977", -"~. c #F3D47B", -"^. c #FDD47A", -"/. c #F5DA7C", -"(. c #FDDA7C", -"). c #FFE07F", -"_. c #DBC481", -"`. c #DFC885", -"'. c #E1CA86", -"]. c #EACC80", -"[. c #E4CD8A", -"{. c #EED383", -"}. c #E7D18F", -"|. c #EAD38C", -" X c #F4D680", -".X c #FDD780", -"XX c #F5DA83", -"oX c #FCDC84", -"OX c #F5DB8A", -"+X c #FADE89", -"@X c #EAD492", -"#X c #EED896", -"$X c #EFDA9A", -"%X c #F1DD9D", -"&X c #FDE283", -"*X c #F6E18D", -"=X c #FEE48D", -"-X c #FFE692", -";X c #FFE894", -":X c #FBE799", -">X c #FFEA98", -",X c #F6E2A3", -".J..X.X.X.X(.W.Z.C.&X;X;X;X;X-X-X-X<.u u < 3X3X3X3X3X3X3X3X3X3X3X", -"3X3X3X3X3X3X3X3Xu u c oX=X=X=X=X=X=X=Xl.Z C M M C C v v v s w = '.2X2X2X5 $ = 2X2X2X}.5 g ) u./.+X+X=X=X=X&XW.Z.F.=X;X;X;X;X-X-X*XV u y @ X 3X3X3X3X3X3X3X3X3X3X", -"3X3X3X3X3X3X3Xu u u N.-X-X-X-X=X=X=XB.Z M C v v s e e e e w > % `.2X2X2X= + % 2X2X2X}.= r L 4.E.OX+X-X=X=X&X).W.M.R.;X;X;X-X-X-X;XR.u u y 3X3X3X3X3X3X3X3X3X3X", -"3X3X3X3X3X3X3Xu u U -X-X-X-X-X-X=XW.^ C C C x e e r 6 5 4 ; = $ `.2X2X2X= O = 2X2X2X}.O = t Q ,.b.P./.*X=X&X&X).F.M.W.;X;X;X;X&X-X&X} u u O 3X3X3X3X3X3X3X3X3X", -"3X3X3X3X3X3Xu u u R.-X-X-X-X-X-X=X=.{ ^ Z C x n 2X2X.>.>.=.=._ n b 2X2X2X2X2X2X2X2X2X2X2X2X2X2X2X2X2X2X2X2X2X2X2X2X2X:XI N +.V./.).).F.F.9.W.;X=X;X-X-X-XR.u u > 3X3X3X3X3X3X3X3X", -"3X3X3X3X3Xu u d =X;X-X-X-X-X-Xx.>.>.>.>.>...^ P 2X2X2X2X2X2X2X2X2X2X2X2X2X2X2X2X2X2X2X2X2X2X2X2X2X2X,Xl N 4.R.!.!.!.G.Z.M.&X;X=X=X-X-X-XB a u 3X3X3X3X3X3X3X", -"3X3X3X3X3Xu u @.;X;X-X;X;X;XXX>.:.>.>.>.>.>._ P ` Y Y W _.2X2X2X2X2X2X@XW W ~ 0.t.'..>.>.>.>.>.>.=._ P z r 4 8 2X2X2X2X2X2X_.. $ , 6 1 3 t ~ 1X2X2X2X2X2X2X2Xt B 5.G.!.!.G.G.M.9.&X;X=X-X-X=X/.u u > 3X3X3X3X3X3X3X", -"3X3X3X3Xu u d =X;X;X=X;X;X=X3.>.>.>.e.>.3.3.>.:.*._ P r 9 2X2X2X2X2X1Xn.@ , c B N m h 8 ~ 2X2X2X2X2X2X2XI h <.F.!.G.G.F.M.9.W.;X=X-X-X=X=Xm u y . 3X3X3X3X3X3X", -"3X3X3X3Xu u ' -X-X>X-X-X-X X>.>.>.>.>.>.>.u.u.u.u.3.$.P f 2X2X2X2X2X2X_.$ i / -.<.8.} h 8 1X2X2X2X2X2X2X! i <.S.G.G.G.G.Z.9.Z.=X-X=X-X&X-X} u u X 3X3X3X3X3X3X", -"3X3X3X3Xu u 4.-X-X-X-X-X-XJ.3.>.>.k.k.k.k.k.u.k.u.u.:.U k 2X2X2X2X2X1X_.% f } 8.Z.F.8.U 8 ,X2X2X2X2X2X2XI g } Z.D.G.D.G.D.Z.9.&X-X=X=X=X-Xm.u u @ 3X3X3X3X3X3X", -"3X3X3X3Xu u K.;X-X;X-X>X-Xk.3.k.k.k.k.k.k.k.k.k.k.u.e.U k 2X2X2X2X2X2X_.% f [ 8.F.M.<.b i 2X2X2X2X2X2X2Xt a X.Z.D.D.D.G.G.Z.9./.=X-X=X=X=XR.u u & 3X3X3X3X3X3X", -"3X3X3X3Xu u E.;X-X;X-X-X=Xl.l.x.c.k.x.k.k.x.x.v.x.x.u.) z 2X2X2X2X2X2X_.$ 7 L <.<.} N 6 h.2X2X2X2X2X2X_.: V 1.S.D.D.G.D.S.M.6.W.-X=X-X=X=X&Xu u > X 3X3X3X3X3X", -"3X3X3Xu a u =X;X;X;X;X;XoX7.z.c.c.c.c.c.c.c.c.c.x.k.u.) z 2X2X2X2X2X2Xn.o = i N h i l n.2X2X2X2X2X2X.o.L r [.2X2X2X9 = 8 2X2X2X}.4 r ^ _ *.*._ ) ) ^ ^ ^ O.oX=X-X-X-X-X-X-X<.u u : . 3X3X3X3X3X3X3X3X3X", -"3X3X3X3X3X3X3X3X3Xy u u i.=X=X=X=X=X-X*X=XW.9.M.A.B.3.5.5.;.U f [.2X2X2Xq 4 8 2X2X2X}.r q _ _ ;.;.*._ _ ` _ e.+X-X-X-X-X-X-X-XR.a u 2 3X3X3X3X3X3X3X3X3X3X", -"3X3X3X3X3X3X3X3X3X3Xu u u K.=X=X=X-X=X=X=X=XXXz.M.8.5.8.u.:.) h }.2X2X2Xj r f 2X2X2X@Xq T _ e.e.u.e.;.$.$.b.-X-X-X=X;X=X;X-X&Xa a u + 3X3X3X3X3X3X3X3X3X3X3X", -"3X3X3X3X3X3X3X3X3X3X3Xu u d ~.=X=X=X=X=X-X=X-X+XC.3.5.7.7.2.@.) q.r.q.q.H H L g.r.w.q.T ` e.k.v.k.k.s.s.{.-X-X;X-X;X;X;X;X*XV u u & . 3X3X3X3X3X3X3X3X3X3X3X", -"3X3X3X3X3X3X3X3X3X3X3X2 u u c XX-X=X=X=X=X-X=X-X-X Xl.7.7.u.2.$.o.[ [ o.O.$.&.&.` ` ` q.s.k.v.k.k.x.{.%X>X>X>X;X>X;X>X>X*XV u u > 3X3X3X3X3X3X3X3X3X3X3X3X", -"3X3X3X3X3X3X3X3X3X3X3X3X2 u u m ~.=X-X-X-X=X-X-X-X-X-X Xc.7.5.u.3.e.y.u.s.f.k.s.e.e.s.s.k.k.k.v. X:X>X>X>X>X>X>X;X>X>X*XV u u < 3X3X3X3X3X3X3X3X3X3X3X3X3X", -"3X3X3X3X3X3X3X3X3X3X3X3X3X2 u u d R.-X=X-X=X-X-X-X-X-X-X-X+XI.v.u.s.l.k.k.x.x.x.s.s.s.s.j.].+X>X>X>X>X>X:X>X>X>X>X>XOXV u u 1 3X3X3X3X3X3X3X3X3X3X3X3X3X3X", -"3X3X3X3X3X3X3X3X3X3X3X3X3X3X2 u u a p.-X-X-X;X;X;X-X-X-X:X-X-X-X-XOX XL.J.J.J.L.I.].OX:X>X-X>X>X-X>X>X>X>X>X>X>X>XK.a a u < 3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X", -"3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X2 u u u @.=X;X;X>X;X-X-X>X-X-X-X-X;X-X-X-X-X-X>X>X-X>X-X>X>X>X>X;X>X>X>X-X>X-X-X:X<.u u u > 3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X", -"3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X1 u u u m n.>X;X>X>X-X-X-X-X>X-X-X-X;X;X;X-X-X-X-X-X>X-X-X>X-X>X>X-X>X>X>X>XK.B u u u & 3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X", -"3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3Xw u u u / {.>X>X-X-X-X-X-X-X-X-X-X-X;X-X-X;X:X-X-X>X-X:X>X;X;X>X;X;X{.[ u u u w + 3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X", -"3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X2 u u u u ) K.-X-X-X-X:X-X-X-X-X-X-X-X-X-X-X-X-X>X-X-X-X-X-X-XE.[ u u u u - . 3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X", -"3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X1 u u u u m 2.E.-X+X:X-X-X-X-X-X-X-X-X-X:X-X-X-X;X-XOXi.B u u u u 1 o 3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X", -"3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X> u u u u u v [ l.I.OX-X-X-X-X-X-X-X-X+XI.f.@.m u u u u u 1 + o 3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X", -"3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X& 2 u u u u u u u d B V V V V B d u u u u u u u y - . o 3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X", -"3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X+ - 1 u u u u u u u a u u u u u u u u 2 - o o 3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X", -"3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3Xo . X # - > 1 2 2 2 1 2 > - # o . o 3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X", -"3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3Xo o . o 3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X", -"3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X", -"3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X", -"3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X", -"3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X" -}; diff --git a/share/pixmaps/favicon.ico b/share/pixmaps/favicon.ico index d249e41feb..754eebc488 100644 Binary files a/share/pixmaps/favicon.ico and b/share/pixmaps/favicon.ico differ diff --git a/share/qt/Info.plist b/share/qt/Info.plist index 58b2152e9f..6f64c3164b 100644 --- a/share/qt/Info.plist +++ b/share/qt/Info.plist @@ -7,7 +7,11 @@ CFBundlePackageType APPL CFBundleGetInfoString - Bitcoin-Qt + $VERSION, Copyright © 2009-$YEAR The Bitcoin developers + CFBundleShortVersionString + $VERSION + CFBundleVersion + $VERSION CFBundleSignature ???? CFBundleExecutable @@ -27,5 +31,7 @@ + NSHighResolutionCapable + diff --git a/share/qt/clean_mac_info_plist.py b/share/qt/clean_mac_info_plist.py new file mode 100755 index 0000000000..df677f50b7 --- /dev/null +++ b/share/qt/clean_mac_info_plist.py @@ -0,0 +1,29 @@ +#!/usr/bin/env python +# Jonas Schnelli, 2013 +# make sure the Bitcoin-Qt.app contains the right plist (including the right version) +# fix made because of serval bugs in Qt mac deployment (https://bugreports.qt-project.org/browse/QTBUG-21267) + +from string import Template +from datetime import date + +bitcoinDir = "./"; + +inFile = bitcoinDir+"/share/qt/Info.plist" +outFile = "Bitcoin-Qt.app/Contents/Info.plist" +version = "unknown"; + +fileForGrabbingVersion = bitcoinDir+"bitcoin-qt.pro" +for line in open(fileForGrabbingVersion): + lineArr = line.replace(" ", "").split("="); + if lineArr[0].startswith("VERSION"): + version = lineArr[1].replace("\n", ""); + +fIn = open(inFile, "r") +fileContent = fIn.read() +s = Template(fileContent) +newFileContent = s.substitute(VERSION=version,YEAR=date.today().year) + +fOut = open(outFile, "w"); +fOut.write(newFileContent); + +print "Info.plist fresh created" \ No newline at end of file diff --git a/share/setup.nsi b/share/setup.nsi index 307db6f623..d5f2ffc3f8 100644 --- a/share/setup.nsi +++ b/share/setup.nsi @@ -5,7 +5,7 @@ SetCompressor /SOLID lzma # General Symbol Definitions !define REGKEY "SOFTWARE\$(^Name)" -!define VERSION 0.8.0 +!define VERSION 0.8.2 !define COMPANY "Bitcoin project" !define URL http://www.bitcoin.org/ @@ -45,13 +45,13 @@ Var StartMenuGroup !insertmacro MUI_LANGUAGE English # Installer attributes -OutFile bitcoin-0.8.0-win32-setup.exe +OutFile bitcoin-0.8.2-win32-setup.exe InstallDir $PROGRAMFILES\Bitcoin CRCCheck on XPStyle on BrandingText " " ShowInstDetails show -VIProductVersion 0.8.0.0 +VIProductVersion 0.8.2.2 VIAddVersionKey ProductName Bitcoin VIAddVersionKey ProductVersion "${VERSION}" VIAddVersionKey CompanyName "${COMPANY}" diff --git a/src/alert.cpp b/src/alert.cpp index 4b029840dd..44f4d5eec6 100644 --- a/src/alert.cpp +++ b/src/alert.cpp @@ -144,9 +144,7 @@ bool CAlert::RelayTo(CNode* pnode) const bool CAlert::CheckSignature() const { - CKey key; - if (!key.SetPubKey(ParseHex(fTestNet ? pszTestKey : pszMainKey))) - return error("CAlert::CheckSignature() : SetPubKey failed"); + CPubKey key(ParseHex(fTestNet ? pszTestKey : pszMainKey)); if (!key.Verify(Hash(vchMsg.begin(), vchMsg.end()), vchSig)) return error("CAlert::CheckSignature() : verify signature failed"); diff --git a/src/allocators.h b/src/allocators.h index eb2aed6721..85af8fe376 100644 --- a/src/allocators.h +++ b/src/allocators.h @@ -176,6 +176,19 @@ private: {} }; +// +// Functions for directly locking/unlocking memory objects. +// Intended for non-dynamically allocated structures. +// +template void LockObject(const T &t) { + LockedPageManager::instance.LockRange((void*)(&t), sizeof(T)); +} + +template void UnlockObject(const T &t) { + OPENSSL_cleanse((void*)(&t), sizeof(T)); + LockedPageManager::instance.UnlockRange((void*)(&t), sizeof(T)); +} + // // Allocator that locks its contents from being paged // out of memory and clears its contents before deletion. diff --git a/src/base58.h b/src/base58.h index be8a541f67..efe3a95ebd 100644 --- a/src/base58.h +++ b/src/base58.h @@ -398,21 +398,19 @@ bool inline CBitcoinAddressVisitor::operator()(const CNoDestination &id) const { class CBitcoinSecret : public CBase58Data { public: - void SetSecret(const CSecret& vchSecret, bool fCompressed) + void SetKey(const CKey& vchSecret) { - assert(vchSecret.size() == 32); - SetData(fTestNet ? 239 : 128, &vchSecret[0], vchSecret.size()); - if (fCompressed) + assert(vchSecret.IsValid()); + SetData(fTestNet ? 239 : 128, vchSecret.begin(), vchSecret.size()); + if (vchSecret.IsCompressed()) vchData.push_back(1); } - CSecret GetSecret(bool &fCompressedOut) + CKey GetKey() { - CSecret vchSecret; - vchSecret.resize(32); - memcpy(&vchSecret[0], &vchData[0], 32); - fCompressedOut = vchData.size() == 33; - return vchSecret; + CKey ret; + ret.Set(&vchData[0], &vchData[32], vchData.size() > 32 && vchData[32] == 1); + return ret; } bool IsValid() const @@ -443,9 +441,9 @@ public: return SetString(strSecret.c_str()); } - CBitcoinSecret(const CSecret& vchSecret, bool fCompressed) + CBitcoinSecret(const CKey& vchSecret) { - SetSecret(vchSecret, fCompressed); + SetKey(vchSecret); } CBitcoinSecret() diff --git a/src/bitcoinrpc.cpp b/src/bitcoinrpc.cpp index 9c126fc3da..c99b74f183 100644 --- a/src/bitcoinrpc.cpp +++ b/src/bitcoinrpc.cpp @@ -11,17 +11,17 @@ #include "bitcoinrpc.h" #include "db.h" +#include #include #include +#include #include #include +#include #include #include #include -#include #include -#include -#include #include #include @@ -34,6 +34,7 @@ static std::string strRPCUserColonPass; // These are created by StartRPCThreads, destroyed in StopRPCThreads static asio::io_service* rpc_io_service = NULL; +static map > deadlineTimers; static ssl::context* rpc_ssl_context = NULL; static boost::thread_group* rpc_worker_group = NULL; @@ -756,7 +757,7 @@ void StartRPCThreads() rpc_io_service = new asio::io_service(); rpc_ssl_context = new ssl::context(*rpc_io_service, ssl::context::sslv23); - const bool fUseSSL = GetBoolArg("-rpcssl"); + const bool fUseSSL = GetBoolArg("-rpcssl", false); if (fUseSSL) { @@ -843,6 +844,7 @@ void StopRPCThreads() { if (rpc_io_service == NULL) return; + deadlineTimers.clear(); rpc_io_service->stop(); rpc_worker_group->join_all(); delete rpc_worker_group; rpc_worker_group = NULL; @@ -850,6 +852,26 @@ void StopRPCThreads() delete rpc_io_service; rpc_io_service = NULL; } +void RPCRunHandler(const boost::system::error_code& err, boost::function func) +{ + if (!err) + func(); +} + +void RPCRunLater(const std::string& name, boost::function func, int64 nSeconds) +{ + assert(rpc_io_service != NULL); + + if (deadlineTimers.count(name) == 0) + { + deadlineTimers.insert(make_pair(name, + boost::shared_ptr(new deadline_timer(*rpc_io_service)))); + } + deadlineTimers[name]->expires_from_now(posix_time::seconds(nSeconds)); + deadlineTimers[name]->async_wait(boost::bind(RPCRunHandler, _1, func)); +} + + class JSONRequest { public: @@ -940,6 +962,11 @@ void ServiceConnection(AcceptedConnection *conn) // Read HTTP message headers and body ReadHTTPMessage(conn->stream(), mapHeaders, strRequest, nProto); + if (strURI != "/") { + conn->stream() << HTTPReply(HTTP_NOT_FOUND, "", false) << std::flush; + break; + } + // Check authorization if (mapHeaders.count("authorization") == 0) { @@ -1010,7 +1037,7 @@ json_spirit::Value CRPCTable::execute(const std::string &strMethod, const json_s // Observe safe mode string strWarning = GetWarnings("rpc"); - if (strWarning != "" && !GetBoolArg("-disablesafemode") && + if (strWarning != "" && !GetBoolArg("-disablesafemode", false) && !pcmd->okSafeMode) throw JSONRPCError(RPC_FORBIDDEN_BY_SAFE_MODE, string("Safe mode: ") + strWarning); @@ -1044,7 +1071,7 @@ Object CallRPC(const string& strMethod, const Array& params) GetConfigFile().string().c_str())); // Connect to localhost - bool fUseSSL = GetBoolArg("-rpcssl"); + bool fUseSSL = GetBoolArg("-rpcssl", false); asio::io_service io_service; ssl::context context(io_service, ssl::context::sslv23); context.set_options(ssl::context::no_sslv2); diff --git a/src/bitcoinrpc.h b/src/bitcoinrpc.h index 315fd92383..44c657f8dc 100644 --- a/src/bitcoinrpc.h +++ b/src/bitcoinrpc.h @@ -11,6 +11,7 @@ #include class CBlockIndex; +class CReserveKey; #include "json/json_spirit_reader_template.h" #include "json/json_spirit_writer_template.h" @@ -88,6 +89,12 @@ void RPCTypeCheck(const json_spirit::Array& params, void RPCTypeCheck(const json_spirit::Object& o, const std::map& typesExpected, bool fAllowNull=false); +/* + Run func nSeconds from now. Uses boost deadline timers. + Overrides previous timer (if any). + */ +void RPCRunLater(const std::string& name, boost::function func, int64 nSeconds); + typedef json_spirit::Value(*rpcfn_type)(const json_spirit::Array& params, bool fHelp); class CRPCCommand @@ -123,6 +130,9 @@ public: extern const CRPCTable tableRPC; +extern void InitRPCMining(); +extern void ShutdownRPCMining(); + extern int64 nWalletUnlockTime; extern int64 AmountFromValue(const json_spirit::Value& value); extern json_spirit::Value ValueFromAmount(int64 amount); diff --git a/src/checkpoints.cpp b/src/checkpoints.cpp index 9e8e0f7024..7643ec5df8 100644 --- a/src/checkpoints.cpp +++ b/src/checkpoints.cpp @@ -28,6 +28,8 @@ namespace Checkpoints double fTransactionsPerDay; }; + bool fEnabled = true; + // What makes a good checkpoint block? // + Is surrounded by blocks with reasonable timestamps // (no blocks before with a timestamp after, none after with @@ -74,7 +76,7 @@ namespace Checkpoints bool CheckBlock(int nHeight, const uint256& hash) { - if (!GetBoolArg("-checkpoints", true)) + if (!fEnabled) return true; const MapCheckpoints& checkpoints = *Checkpoints().mapCheckpoints; @@ -117,7 +119,7 @@ namespace Checkpoints int GetTotalBlocksEstimate() { - if (!GetBoolArg("-checkpoints", true)) + if (!fEnabled) return 0; const MapCheckpoints& checkpoints = *Checkpoints().mapCheckpoints; @@ -127,7 +129,7 @@ namespace Checkpoints CBlockIndex* GetLastCheckpoint(const std::map& mapBlockIndex) { - if (!GetBoolArg("-checkpoints", true)) + if (!fEnabled) return NULL; const MapCheckpoints& checkpoints = *Checkpoints().mapCheckpoints; diff --git a/src/checkpoints.h b/src/checkpoints.h index 3d56885556..a49a908a38 100644 --- a/src/checkpoints.h +++ b/src/checkpoints.h @@ -24,6 +24,8 @@ namespace Checkpoints CBlockIndex* GetLastCheckpoint(const std::map& mapBlockIndex); double GuessVerificationProgress(CBlockIndex *pindex); + + extern bool fEnabled; } #endif diff --git a/src/clientversion.h b/src/clientversion.h index 635641bd29..30c0c4072b 100644 --- a/src/clientversion.h +++ b/src/clientversion.h @@ -8,8 +8,8 @@ // These need to be macros, as version.cpp's and bitcoin-qt.rc's voodoo requires it #define CLIENT_VERSION_MAJOR 0 #define CLIENT_VERSION_MINOR 8 -#define CLIENT_VERSION_REVISION 1 -#define CLIENT_VERSION_BUILD 99 +#define CLIENT_VERSION_REVISION 99 +#define CLIENT_VERSION_BUILD 0 // Set to true for release, false for prerelease or test build #define CLIENT_VERSION_IS_RELEASE false diff --git a/src/crypter.cpp b/src/crypter.cpp index a2b62a87c8..32baabd674 100644 --- a/src/crypter.cpp +++ b/src/crypter.cpp @@ -100,17 +100,17 @@ bool CCrypter::Decrypt(const std::vector& vchCiphertext, CKeyingM } -bool EncryptSecret(CKeyingMaterial& vMasterKey, const CSecret &vchPlaintext, const uint256& nIV, std::vector &vchCiphertext) +bool EncryptSecret(const CKeyingMaterial& vMasterKey, const CKeyingMaterial &vchPlaintext, const uint256& nIV, std::vector &vchCiphertext) { CCrypter cKeyCrypter; std::vector chIV(WALLET_CRYPTO_KEY_SIZE); memcpy(&chIV[0], &nIV, WALLET_CRYPTO_KEY_SIZE); if(!cKeyCrypter.SetKey(vMasterKey, chIV)) return false; - return cKeyCrypter.Encrypt((CKeyingMaterial)vchPlaintext, vchCiphertext); + return cKeyCrypter.Encrypt(*((const CKeyingMaterial*)&vchPlaintext), vchCiphertext); } -bool DecryptSecret(const CKeyingMaterial& vMasterKey, const std::vector& vchCiphertext, const uint256& nIV, CSecret& vchPlaintext) +bool DecryptSecret(const CKeyingMaterial& vMasterKey, const std::vector& vchCiphertext, const uint256& nIV, CKeyingMaterial& vchPlaintext) { CCrypter cKeyCrypter; std::vector chIV(WALLET_CRYPTO_KEY_SIZE); diff --git a/src/crypter.h b/src/crypter.h index 6f75170bac..4134c1b49b 100644 --- a/src/crypter.h +++ b/src/crypter.h @@ -101,7 +101,7 @@ public: } }; -bool EncryptSecret(CKeyingMaterial& vMasterKey, const CSecret &vchPlaintext, const uint256& nIV, std::vector &vchCiphertext); -bool DecryptSecret(const CKeyingMaterial& vMasterKey, const std::vector &vchCiphertext, const uint256& nIV, CSecret &vchPlaintext); +bool EncryptSecret(const CKeyingMaterial& vMasterKey, const CKeyingMaterial &vchPlaintext, const uint256& nIV, std::vector &vchCiphertext); +bool DecryptSecret(const CKeyingMaterial& vMasterKey, const std::vector& vchCiphertext, const uint256& nIV, CKeyingMaterial& vchPlaintext); #endif diff --git a/src/db.cpp b/src/db.cpp index 35d6cca890..fd4c67d552 100644 --- a/src/db.cpp +++ b/src/db.cpp @@ -38,7 +38,7 @@ void CDBEnv::EnvShutdown() if (ret != 0) printf("EnvShutdown exception: %s (%d)\n", DbEnv::strerror(ret), ret); if (!fMockDb) - DbEnv(0).remove(strPath.c_str(), 0); + DbEnv(0).remove(path.string().c_str(), 0); } CDBEnv::CDBEnv() : dbenv(DB_CXX_NO_EXCEPTIONS) @@ -57,14 +57,14 @@ void CDBEnv::Close() EnvShutdown(); } -bool CDBEnv::Open(const boost::filesystem::path& path) +bool CDBEnv::Open(const boost::filesystem::path& pathIn) { if (fDbEnvInit) return true; boost::this_thread::interruption_point(); - strPath = path.string(); + path = pathIn; filesystem::path pathLogDir = path / "database"; filesystem::create_directory(pathLogDir); filesystem::path pathErrorFile = path / "db.log"; @@ -84,7 +84,7 @@ bool CDBEnv::Open(const boost::filesystem::path& path) dbenv.set_flags(DB_AUTO_COMMIT, 1); dbenv.set_flags(DB_TXN_WRITE_NOSYNC, 1); dbenv.log_set_config(DB_LOG_AUTO_REMOVE, 1); - int ret = dbenv.open(strPath.c_str(), + int ret = dbenv.open(path.string().c_str(), DB_CREATE | DB_INIT_LOCK | DB_INIT_LOG | @@ -164,9 +164,18 @@ bool CDBEnv::Salvage(std::string strFile, bool fAggressive, Db db(&dbenv, 0); int result = db.verify(strFile.c_str(), NULL, &strDump, flags); - if (result != 0) + if (result == DB_VERIFY_BAD) { - printf("ERROR: db salvage failed\n"); + printf("Error: Salvage found errors, all data may not be recoverable.\n"); + if (!fAggressive) + { + printf("Error: Rerun with aggressive mode to ignore errors and continue.\n"); + return false; + } + } + if (result != 0 && result != DB_VERIFY_BAD) + { + printf("ERROR: db salvage failed: %d\n",result); return false; } @@ -456,6 +465,8 @@ void CDBEnv::Flush(bool fShutdown) { dbenv.log_archive(&listp, DB_ARCH_REMOVE); Close(); + if (!fMockDb) + boost::filesystem::remove_all(path / "database"); } } } @@ -530,6 +541,8 @@ bool CAddrDB::Read(CAddrMan& addr) // use file size to size memory buffer int fileSize = GetFilesize(filein); int dataSize = fileSize - sizeof(uint256); + //Don't try to resize to a negative number if file is small + if ( dataSize < 0 ) dataSize = 0; vector vchData; vchData.resize(dataSize); uint256 hashIn; diff --git a/src/db.h b/src/db.h index 206da91e9e..ea440c4960 100644 --- a/src/db.h +++ b/src/db.h @@ -33,7 +33,7 @@ class CDBEnv private: bool fDbEnvInit; bool fMockDb; - std::string strPath; + boost::filesystem::path path; void EnvShutdown(); diff --git a/src/hash.h b/src/hash.h index eaa1780c04..536ab71165 100644 --- a/src/hash.h +++ b/src/hash.h @@ -105,15 +105,22 @@ uint256 SerializeHash(const T& obj, int nType=SER_GETHASH, int nVersion=PROTOCOL return ss.GetHash(); } -inline uint160 Hash160(const std::vector& vch) +template +inline uint160 Hash160(const T1 pbegin, const T1 pend) { + static unsigned char pblank[1]; uint256 hash1; - SHA256(&vch[0], vch.size(), (unsigned char*)&hash1); + SHA256((pbegin == pend ? pblank : (unsigned char*)&pbegin[0]), (pend - pbegin) * sizeof(pbegin[0]), (unsigned char*)&hash1); uint160 hash2; RIPEMD160((unsigned char*)&hash1, sizeof(hash1), (unsigned char*)&hash2); return hash2; } +inline uint160 Hash160(const std::vector& vch) +{ + return Hash160(vch.begin(), vch.end()); +} + unsigned int MurmurHash3(unsigned int nHashSeed, const std::vector& vDataToHash); #endif diff --git a/src/init.cpp b/src/init.cpp index 3845cfad81..78f838f7cb 100644 --- a/src/init.cpp +++ b/src/init.cpp @@ -10,6 +10,7 @@ #include "init.h" #include "util.h" #include "ui_interface.h" +#include "checkpoints.h" #include #include @@ -96,10 +97,13 @@ void Shutdown() RenameThread("bitcoin-shutoff"); nTransactionsUpdated++; StopRPCThreads(); + ShutdownRPCMining(); bitdb.Flush(false); StopNode(); { LOCK(cs_main); + if (pwalletMain) + pwalletMain->SetBestChain(CBlockLocator(pindexBest)); if (pblocktree) pblocktree->Flush(); if (pcoinsTip) @@ -194,7 +198,7 @@ bool AppInit(int argc, char* argv[]) exit(ret); } #if !defined(WIN32) - fDaemon = GetBoolArg("-daemon"); + fDaemon = GetBoolArg("-daemon", false); if (fDaemon) { // Daemonize @@ -290,8 +294,7 @@ std::string HelpMessage() " -? " + _("This help message") + "\n" + " -conf= " + _("Specify configuration file (default: bitcoin.conf)") + "\n" + " -pid= " + _("Specify pid file (default: bitcoind.pid)") + "\n" + - " -gen " + _("Generate coins") + "\n" + - " -gen=0 " + _("Don't generate coins") + "\n" + + " -gen " + _("Generate coins (default: 0)") + "\n" + " -datadir= " + _("Specify data directory") + "\n" + " -dbcache= " + _("Set database cache size in megabytes (default: 25)") + "\n" + " -timeout= " + _("Specify connection timeout in milliseconds (default: 5000)") + "\n" + @@ -358,7 +361,7 @@ std::string HelpMessage() " -txindex " + _("Maintain a full transaction index (default: 0)") + "\n" + " -loadblock= " + _("Imports blocks from external blk000??.dat file") + "\n" + " -reindex " + _("Rebuild block chain index from current blk000??.dat files") + "\n" + - " -par=N " + _("Set the number of script verification threads (up to 16, 0=auto, negative=leave N CPUs free, default: 0)") + "\n" + + " -par= " + _("Set the number of script verification threads (up to 16, 0 = auto, <0 = leave that many cores free, default: 0)") + "\n" + "\n" + _("Block creation options:") + "\n" + " -blockminsize= " + _("Set minimum block size in bytes (default: 0)") + "\n" + @@ -466,9 +469,9 @@ bool AppInit2(boost::thread_group& threadGroup) // Initialize Windows Sockets WSADATA wsadata; int ret = WSAStartup(MAKEWORD(2,2), &wsadata); - if (ret != NO_ERROR) + if (ret != NO_ERROR || LOBYTE(wsadata.wVersion ) != 2 || HIBYTE(wsadata.wVersion) != 2) { - return InitError(strprintf("Error: TCP/IP socket library failed to start (WSAStartup returned error %d)", ret)); + return InitError(strprintf("Error: Winsock library failed to start (WSAStartup returned error %d)", ret)); } #endif #ifndef WIN32 @@ -492,7 +495,8 @@ bool AppInit2(boost::thread_group& threadGroup) // ********************************************************* Step 2: parameter interactions - fTestNet = GetBoolArg("-testnet"); + fTestNet = GetBoolArg("-testnet", false); + Checkpoints::fEnabled = GetBoolArg("-checkpoints", true); if (mapArgs.count("-bind")) { // when specifying an explicit binding address, you want to listen on it @@ -522,7 +526,7 @@ bool AppInit2(boost::thread_group& threadGroup) SoftSetBoolArg("-discover", false); } - if (GetBoolArg("-salvagewallet")) { + if (GetBoolArg("-salvagewallet", false)) { // Rewrite just private keys: rescan to find transactions SoftSetBoolArg("-rescan", true); } @@ -530,7 +534,7 @@ bool AppInit2(boost::thread_group& threadGroup) // Make sure enough file descriptors are available int nBind = std::max((int)mapArgs.count("-bind"), 1); nMaxConnections = GetArg("-maxconnections", 125); - nMaxConnections = std::max(std::min(nMaxConnections, FD_SETSIZE - nBind - MIN_CORE_FILEDESCRIPTORS), 0); + nMaxConnections = std::max(std::min(nMaxConnections, (int)(FD_SETSIZE - nBind - MIN_CORE_FILEDESCRIPTORS)), 0); int nFD = RaiseFileDescriptorLimit(nMaxConnections + MIN_CORE_FILEDESCRIPTORS); if (nFD < MIN_CORE_FILEDESCRIPTORS) return InitError(_("Not enough file descriptors available.")); @@ -539,8 +543,8 @@ bool AppInit2(boost::thread_group& threadGroup) // ********************************************************* Step 3: parameter-to-internal-flags - fDebug = GetBoolArg("-debug"); - fBenchmark = GetBoolArg("-benchmark"); + fDebug = GetBoolArg("-debug", false); + fBenchmark = GetBoolArg("-benchmark", false); // -par=0 means autodetect, but nScriptCheckThreads==0 means no concurrency nScriptCheckThreads = GetArg("-par", 0); @@ -555,20 +559,20 @@ bool AppInit2(boost::thread_group& threadGroup) if (fDebug) fDebugNet = true; else - fDebugNet = GetBoolArg("-debugnet"); + fDebugNet = GetBoolArg("-debugnet", false); if (fDaemon) fServer = true; else - fServer = GetBoolArg("-server"); + fServer = GetBoolArg("-server", false); /* force fServer when running without GUI */ #if !defined(QT_GUI) fServer = true; #endif - fPrintToConsole = GetBoolArg("-printtoconsole"); - fPrintToDebugger = GetBoolArg("-printtodebugger"); - fLogTimestamps = GetBoolArg("-logtimestamps"); + fPrintToConsole = GetBoolArg("-printtoconsole", false); + fPrintToDebugger = GetBoolArg("-printtodebugger", false); + fLogTimestamps = GetBoolArg("-logtimestamps", false); if (mapArgs.count("-timeout")) { @@ -583,6 +587,28 @@ bool AppInit2(boost::thread_group& threadGroup) const char* pszP2SH = "/P2SH/"; COINBASE_FLAGS << std::vector(pszP2SH, pszP2SH+strlen(pszP2SH)); + // Fee-per-kilobyte amount considered the same as "free" + // If you are mining, be careful setting this: + // if you set it to zero then + // a transaction spammer can cheaply fill blocks using + // 1-satoshi-fee transactions. It should be set above the real + // cost to you of processing a transaction. + if (mapArgs.count("-mintxfee")) + { + int64 n = 0; + if (ParseMoney(mapArgs["-mintxfee"], n) && n > 0) + CTransaction::nMinTxFee = n; + else + return InitError(strprintf(_("Invalid amount for -mintxfee=: '%s'"), mapArgs["-mintxfee"].c_str())); + } + if (mapArgs.count("-minrelaytxfee")) + { + int64 n = 0; + if (ParseMoney(mapArgs["-minrelaytxfee"], n) && n > 0) + CTransaction::nMinRelayTxFee = n; + else + return InitError(strprintf(_("Invalid amount for -minrelaytxfee=: '%s'"), mapArgs["-minrelaytxfee"].c_str())); + } if (mapArgs.count("-paytxfee")) { @@ -612,7 +638,7 @@ bool AppInit2(boost::thread_group& threadGroup) if (!fLogTimestamps) printf("Startup time: %s\n", DateTimeStrFormat("%Y-%m-%d %H:%M:%S", GetTime()).c_str()); printf("Default data directory %s\n", GetDefaultDataDir().string().c_str()); - printf("Used data directory %s\n", strDataDir.c_str()); + printf("Using data directory %s\n", strDataDir.c_str()); printf("Using at most %i connections (%i file descriptors available)\n", nMaxConnections, nFD); std::ostringstream strErrors; @@ -633,11 +659,25 @@ bool AppInit2(boost::thread_group& threadGroup) if (!bitdb.Open(GetDataDir())) { - string msg = strprintf(_("Error initializing wallet database environment %s!"), strDataDir.c_str()); - return InitError(msg); + // try moving the database env out of the way + boost::filesystem::path pathDatabase = GetDataDir() / "database"; + boost::filesystem::path pathDatabaseBak = GetDataDir() / strprintf("database.%"PRI64d".bak", GetTime()); + try { + boost::filesystem::rename(pathDatabase, pathDatabaseBak); + printf("Moved old %s to %s. Retrying.\n", pathDatabase.string().c_str(), pathDatabaseBak.string().c_str()); + } catch(boost::filesystem::filesystem_error &error) { + // failure is ok (well, not really, but it's not worse than what we started with) + } + + // try again + if (!bitdb.Open(GetDataDir())) { + // if it still fails, it probably means we can't even create the database env + string msg = strprintf(_("Error initializing wallet database environment %s!"), strDataDir.c_str()); + return InitError(msg); + } } - if (GetBoolArg("-salvagewallet")) + if (GetBoolArg("-salvagewallet", false)) { // Recover readable keypairs: if (!CWalletDB::Recover(bitdb, "wallet.dat", true)) @@ -759,16 +799,7 @@ bool AppInit2(boost::thread_group& threadGroup) // ********************************************************* Step 7: load block chain - fReindex = GetBoolArg("-reindex"); - - // Todo: Check if needed, because in step 5 we do the same - if (!bitdb.Open(GetDataDir())) - { - string msg = strprintf(_("Error initializing database environment %s!" - " To recover, BACKUP THAT DIRECTORY, then remove" - " everything from it except for wallet.dat."), strDataDir.c_str()); - return InitError(msg); - } + fReindex = GetBoolArg("-reindex", false); // Upgrading to 0.8; hard-link the old blknnnn.dat files into /blocks/ filesystem::path blocksDir = GetDataDir() / "blocks"; @@ -836,6 +867,11 @@ bool AppInit2(boost::thread_group& threadGroup) break; } + // If the loaded chain has a wrong genesis, bail out immediately + // (we're likely using a testnet datadir, or the other way around). + if (!mapBlockIndex.empty() && pindexGenesisBlock == NULL) + return InitError(_("Incorrect or no genesis block found. Wrong datadir for network?")); + // Initialize the block index (no-op if non-empty database was already loaded) if (!InitBlockIndex()) { strLoadError = _("Error initializing block database"); @@ -886,7 +922,7 @@ bool AppInit2(boost::thread_group& threadGroup) } printf(" block index %15"PRI64d"ms\n", GetTimeMillis() - nStart); - if (GetBoolArg("-printblockindex") || GetBoolArg("-printblocktree")) + if (GetBoolArg("-printblockindex", false) || GetBoolArg("-printblocktree", false)) { PrintBlockTree(); return false; @@ -967,11 +1003,13 @@ bool AppInit2(boost::thread_group& threadGroup) RandAddSeedPerfmon(); CPubKey newDefaultKey; - if (!pwalletMain->GetKeyFromPool(newDefaultKey, false)) - strErrors << _("Cannot initialize keypool") << "\n"; - pwalletMain->SetDefaultKey(newDefaultKey); - if (!pwalletMain->SetAddressBookName(pwalletMain->vchDefaultKey.GetID(), "")) - strErrors << _("Cannot write default address") << "\n"; + if (pwalletMain->GetKeyFromPool(newDefaultKey, false)) { + pwalletMain->SetDefaultKey(newDefaultKey); + if (!pwalletMain->SetAddressBookName(pwalletMain->vchDefaultKey.GetID(), "")) + strErrors << _("Cannot write default address") << "\n"; + } + + pwalletMain->SetBestChain(CBlockLocator(pindexBest)); } printf("%s", strErrors.str().c_str()); @@ -980,7 +1018,7 @@ bool AppInit2(boost::thread_group& threadGroup) RegisterWallet(pwalletMain); CBlockIndex *pindexRescan = pindexBest; - if (GetBoolArg("-rescan")) + if (GetBoolArg("-rescan", false)) pindexRescan = pindexGenesisBlock; else { @@ -988,6 +1026,8 @@ bool AppInit2(boost::thread_group& threadGroup) CBlockLocator locator; if (walletdb.ReadBestBlock(locator)) pindexRescan = locator.GetBlockIndex(); + else + pindexRescan = pindexGenesisBlock; } if (pindexBest && pindexBest != pindexRescan) { @@ -996,6 +1036,8 @@ bool AppInit2(boost::thread_group& threadGroup) nStart = GetTimeMillis(); pwalletMain->ScanForWalletTransactions(pindexRescan, true); printf(" rescan %15"PRI64d"ms\n", GetTimeMillis() - nStart); + pwalletMain->SetBestChain(CBlockLocator(pindexBest)); + nWalletDBUpdated++; } // ********************************************************* Step 9: import blocks @@ -1033,6 +1075,9 @@ bool AppInit2(boost::thread_group& threadGroup) if (!CheckDiskSpace()) return false; + if (!strErrors.str().empty()) + return InitError(strErrors.str()); + RandAddSeedPerfmon(); //// debug print @@ -1044,6 +1089,8 @@ bool AppInit2(boost::thread_group& threadGroup) StartNode(threadGroup); + // InitRPCMining is needed here so getwork/getblocktemplate in the GUI debug console works properly. + InitRPCMining(); if (fServer) StartRPCThreads(); @@ -1054,9 +1101,6 @@ bool AppInit2(boost::thread_group& threadGroup) uiInterface.InitMessage(_("Done loading")); - if (!strErrors.str().empty()) - return InitError(strErrors.str()); - // Add wallet transactions that aren't already in a block to mapTransactions pwalletMain->ReacceptWalletTransactions(); diff --git a/src/key.cpp b/src/key.cpp index 20114e6bb2..f73708199a 100644 --- a/src/key.cpp +++ b/src/key.cpp @@ -2,13 +2,16 @@ // Distributed under the MIT/X11 software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. -#include - #include +#include #include #include "key.h" + +// anonymous namespace with local implementation code (OpenSSL interaction) +namespace { + // Generate a private key from just the secret parameter int EC_KEY_regenerate_key(EC_KEY *eckey, BIGNUM *priv_key) { @@ -120,287 +123,273 @@ err: return ret; } -void CKey::SetCompressedPubKey(bool fCompressed) -{ - EC_KEY_set_conv_form(pkey, fCompressed ? POINT_CONVERSION_COMPRESSED : POINT_CONVERSION_UNCOMPRESSED); - fCompressedPubKey = true; -} +// RAII Wrapper around OpenSSL's EC_KEY +class CECKey { +private: + EC_KEY *pkey; -void CKey::Reset() -{ - fCompressedPubKey = false; - if (pkey != NULL) +public: + CECKey() { + pkey = EC_KEY_new_by_curve_name(NID_secp256k1); + assert(pkey != NULL); + } + + ~CECKey() { EC_KEY_free(pkey); - pkey = EC_KEY_new_by_curve_name(NID_secp256k1); - if (pkey == NULL) - throw key_error("CKey::CKey() : EC_KEY_new_by_curve_name failed"); - fSet = false; -} + } -CKey::CKey() -{ - pkey = NULL; - Reset(); -} + void GetSecretBytes(unsigned char vch[32]) const { + const BIGNUM *bn = EC_KEY_get0_private_key(pkey); + assert(bn); + int nBytes = BN_num_bytes(bn); + int n=BN_bn2bin(bn,&vch[32 - nBytes]); + assert(n == nBytes); + memset(vch, 0, 32 - nBytes); + } -CKey::CKey(const CKey& b) -{ - pkey = EC_KEY_dup(b.pkey); - if (pkey == NULL) - throw key_error("CKey::CKey(const CKey&) : EC_KEY_dup failed"); - fSet = b.fSet; -} + void SetSecretBytes(const unsigned char vch[32]) { + BIGNUM bn; + BN_init(&bn); + assert(BN_bin2bn(vch, 32, &bn)); + assert(EC_KEY_regenerate_key(pkey, &bn)); + BN_clear_free(&bn); + } -CKey& CKey::operator=(const CKey& b) -{ - if (!EC_KEY_copy(pkey, b.pkey)) - throw key_error("CKey::operator=(const CKey&) : EC_KEY_copy failed"); - fSet = b.fSet; - return (*this); -} + void GetPrivKey(CPrivKey &privkey) { + int nSize = i2d_ECPrivateKey(pkey, NULL); + assert(nSize); + privkey.resize(nSize); + unsigned char* pbegin = &privkey[0]; + int nSize2 = i2d_ECPrivateKey(pkey, &pbegin); + assert(nSize == nSize2); + } -CKey::~CKey() -{ - EC_KEY_free(pkey); -} - -bool CKey::IsNull() const -{ - return !fSet; -} - -bool CKey::IsCompressed() const -{ - return fCompressedPubKey; -} - -void CKey::MakeNewKey(bool fCompressed) -{ - if (!EC_KEY_generate_key(pkey)) - throw key_error("CKey::MakeNewKey() : EC_KEY_generate_key failed"); - if (fCompressed) - SetCompressedPubKey(); - fSet = true; -} - -bool CKey::SetPrivKey(const CPrivKey& vchPrivKey) -{ - const unsigned char* pbegin = &vchPrivKey[0]; - if (d2i_ECPrivateKey(&pkey, &pbegin, vchPrivKey.size())) - { - // In testing, d2i_ECPrivateKey can return true - // but fill in pkey with a key that fails - // EC_KEY_check_key, so: - if (EC_KEY_check_key(pkey)) - { - fSet = true; - return true; + bool SetPrivKey(const CPrivKey &privkey) { + const unsigned char* pbegin = &privkey[0]; + if (d2i_ECPrivateKey(&pkey, &pbegin, privkey.size())) { + // d2i_ECPrivateKey returns true if parsing succeeds. + // This doesn't necessarily mean the key is valid. + if (EC_KEY_check_key(pkey)) + return true; } + return false; } - // If vchPrivKey data is bad d2i_ECPrivateKey() can - // leave pkey in a state where calling EC_KEY_free() - // crashes. To avoid that, set pkey to NULL and - // leak the memory (a leak is better than a crash) - pkey = NULL; - Reset(); - return false; -} -bool CKey::SetSecret(const CSecret& vchSecret, bool fCompressed) -{ - EC_KEY_free(pkey); - pkey = EC_KEY_new_by_curve_name(NID_secp256k1); - if (pkey == NULL) - throw key_error("CKey::SetSecret() : EC_KEY_new_by_curve_name failed"); - if (vchSecret.size() != 32) - throw key_error("CKey::SetSecret() : secret must be 32 bytes"); - BIGNUM *bn = BN_bin2bn(&vchSecret[0],32,BN_new()); - if (bn == NULL) - throw key_error("CKey::SetSecret() : BN_bin2bn failed"); - if (!EC_KEY_regenerate_key(pkey,bn)) - { - BN_clear_free(bn); - throw key_error("CKey::SetSecret() : EC_KEY_regenerate_key failed"); + void GetPubKey(CPubKey &pubkey, bool fCompressed) { + EC_KEY_set_conv_form(pkey, fCompressed ? POINT_CONVERSION_COMPRESSED : POINT_CONVERSION_UNCOMPRESSED); + int nSize = i2o_ECPublicKey(pkey, NULL); + assert(nSize); + assert(nSize <= 65); + unsigned char c[65]; + unsigned char *pbegin = c; + int nSize2 = i2o_ECPublicKey(pkey, &pbegin); + assert(nSize == nSize2); + pubkey.Set(&c[0], &c[nSize]); } - BN_clear_free(bn); - fSet = true; - if (fCompressed || fCompressedPubKey) - SetCompressedPubKey(); - return true; -} -CSecret CKey::GetSecret(bool &fCompressed) const -{ - CSecret vchRet; - vchRet.resize(32); - const BIGNUM *bn = EC_KEY_get0_private_key(pkey); - int nBytes = BN_num_bytes(bn); - if (bn == NULL) - throw key_error("CKey::GetSecret() : EC_KEY_get0_private_key failed"); - int n=BN_bn2bin(bn,&vchRet[32 - nBytes]); - if (n != nBytes) - throw key_error("CKey::GetSecret(): BN_bn2bin failed"); - fCompressed = fCompressedPubKey; - return vchRet; -} + bool SetPubKey(const CPubKey &pubkey) { + const unsigned char* pbegin = pubkey.begin(); + return o2i_ECPublicKey(&pkey, &pbegin, pubkey.size()); + } -CPrivKey CKey::GetPrivKey() const -{ - int nSize = i2d_ECPrivateKey(pkey, NULL); - if (!nSize) - throw key_error("CKey::GetPrivKey() : i2d_ECPrivateKey failed"); - CPrivKey vchPrivKey(nSize, 0); - unsigned char* pbegin = &vchPrivKey[0]; - if (i2d_ECPrivateKey(pkey, &pbegin) != nSize) - throw key_error("CKey::GetPrivKey() : i2d_ECPrivateKey returned unexpected size"); - return vchPrivKey; -} - -bool CKey::SetPubKey(const CPubKey& vchPubKey) -{ - const unsigned char* pbegin = &vchPubKey.vchPubKey[0]; - if (o2i_ECPublicKey(&pkey, &pbegin, vchPubKey.vchPubKey.size())) - { - fSet = true; - if (vchPubKey.vchPubKey.size() == 33) - SetCompressedPubKey(); + bool Sign(const uint256 &hash, std::vector& vchSig) { + unsigned int nSize = ECDSA_size(pkey); + vchSig.resize(nSize); // Make sure it is big enough + assert(ECDSA_sign(0, (unsigned char*)&hash, sizeof(hash), &vchSig[0], &nSize, pkey)); + vchSig.resize(nSize); // Shrink to fit actual size return true; } - pkey = NULL; - Reset(); - return false; -} -CPubKey CKey::GetPubKey() const -{ - int nSize = i2o_ECPublicKey(pkey, NULL); - if (!nSize) - throw key_error("CKey::GetPubKey() : i2o_ECPublicKey failed"); - std::vector vchPubKey(nSize, 0); - unsigned char* pbegin = &vchPubKey[0]; - if (i2o_ECPublicKey(pkey, &pbegin) != nSize) - throw key_error("CKey::GetPubKey() : i2o_ECPublicKey returned unexpected size"); - return CPubKey(vchPubKey); -} - -bool CKey::Sign(uint256 hash, std::vector& vchSig) -{ - unsigned int nSize = ECDSA_size(pkey); - vchSig.resize(nSize); // Make sure it is big enough - if (!ECDSA_sign(0, (unsigned char*)&hash, sizeof(hash), &vchSig[0], &nSize, pkey)) - { - vchSig.clear(); - return false; + bool Verify(const uint256 &hash, const std::vector& vchSig) { + // -1 = error, 0 = bad sig, 1 = good + if (ECDSA_verify(0, (unsigned char*)&hash, sizeof(hash), &vchSig[0], vchSig.size(), pkey) != 1) + return false; + return true; + } + + bool SignCompact(const uint256 &hash, unsigned char *p64, int &rec) { + bool fOk = false; + ECDSA_SIG *sig = ECDSA_do_sign((unsigned char*)&hash, sizeof(hash), pkey); + if (sig==NULL) + return false; + memset(p64, 0, 64); + int nBitsR = BN_num_bits(sig->r); + int nBitsS = BN_num_bits(sig->s); + if (nBitsR <= 256 && nBitsS <= 256) { + CPubKey pubkey; + GetPubKey(pubkey, true); + for (int i=0; i<4; i++) { + CECKey keyRec; + if (ECDSA_SIG_recover_key_GFp(keyRec.pkey, sig, (unsigned char*)&hash, sizeof(hash), i, 1) == 1) { + CPubKey pubkeyRec; + keyRec.GetPubKey(pubkeyRec, true); + if (pubkeyRec == pubkey) { + rec = i; + fOk = true; + break; + } + } + } + assert(fOk); + BN_bn2bin(sig->r,&p64[32-(nBitsR+7)/8]); + BN_bn2bin(sig->s,&p64[64-(nBitsS+7)/8]); + } + ECDSA_SIG_free(sig); + return fOk; + } + + // reconstruct public key from a compact signature + // This is only slightly more CPU intensive than just verifying it. + // If this function succeeds, the recovered public key is guaranteed to be valid + // (the signature is a valid signature of the given data for that key) + bool Recover(const uint256 &hash, const unsigned char *p64, int rec) + { + if (rec<0 || rec>=3) + return false; + ECDSA_SIG *sig = ECDSA_SIG_new(); + BN_bin2bn(&p64[0], 32, sig->r); + BN_bin2bn(&p64[32], 32, sig->s); + bool ret = ECDSA_SIG_recover_key_GFp(pkey, sig, (unsigned char*)&hash, sizeof(hash), rec, 0) == 1; + ECDSA_SIG_free(sig); + return ret; + } +}; + +}; // end of anonymous namespace + +bool CKey::Check(const unsigned char *vch) { + // Do not convert to OpenSSL's data structures for range-checking keys, + // it's easy enough to do directly. + static const unsigned char vchMax[32] = { + 0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF, + 0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFE, + 0xBA,0xAE,0xDC,0xE6,0xAF,0x48,0xA0,0x3B, + 0xBF,0xD2,0x5E,0x8C,0xD0,0x36,0x41,0x40 + }; + bool fIsZero = true; + for (int i=0; i<32 && fIsZero; i++) + if (vch[i] != 0) + fIsZero = false; + if (fIsZero) + return false; + for (int i=0; i<32; i++) { + if (vch[i] < vchMax[i]) + return true; + if (vch[i] > vchMax[i]) + return false; } - vchSig.resize(nSize); // Shrink to fit actual size return true; } -// create a compact signature (65 bytes), which allows reconstructing the used public key -// The format is one header byte, followed by two times 32 bytes for the serialized r and s values. -// The header byte: 0x1B = first key with even y, 0x1C = first key with odd y, -// 0x1D = second key with even y, 0x1E = second key with odd y -bool CKey::SignCompact(uint256 hash, std::vector& vchSig) -{ - bool fOk = false; - ECDSA_SIG *sig = ECDSA_do_sign((unsigned char*)&hash, sizeof(hash), pkey); - if (sig==NULL) - return false; - vchSig.clear(); - vchSig.resize(65,0); - int nBitsR = BN_num_bits(sig->r); - int nBitsS = BN_num_bits(sig->s); - if (nBitsR <= 256 && nBitsS <= 256) - { - int nRecId = -1; - for (int i=0; i<4; i++) - { - CKey keyRec; - keyRec.fSet = true; - if (fCompressedPubKey) - keyRec.SetCompressedPubKey(); - if (ECDSA_SIG_recover_key_GFp(keyRec.pkey, sig, (unsigned char*)&hash, sizeof(hash), i, 1) == 1) - if (keyRec.GetPubKey() == this->GetPubKey()) - { - nRecId = i; - break; - } - } - - if (nRecId == -1) - throw key_error("CKey::SignCompact() : unable to construct recoverable key"); - - vchSig[0] = nRecId+27+(fCompressedPubKey ? 4 : 0); - BN_bn2bin(sig->r,&vchSig[33-(nBitsR+7)/8]); - BN_bn2bin(sig->s,&vchSig[65-(nBitsS+7)/8]); - fOk = true; - } - ECDSA_SIG_free(sig); - return fOk; +void CKey::MakeNewKey(bool fCompressedIn) { + do { + RAND_bytes(vch, sizeof(vch)); + } while (!Check(vch)); + fValid = true; + fCompressed = fCompressedIn; } -// reconstruct public key from a compact signature -// This is only slightly more CPU intensive than just verifying it. -// If this function succeeds, the recovered public key is guaranteed to be valid -// (the signature is a valid signature of the given data for that key) -bool CKey::SetCompactSignature(uint256 hash, const std::vector& vchSig) -{ +bool CKey::SetPrivKey(const CPrivKey &privkey, bool fCompressedIn) { + CECKey key; + if (!key.SetPrivKey(privkey)) + return false; + key.GetSecretBytes(vch); + fCompressed = fCompressedIn; + fValid = true; + return true; +} + +CPrivKey CKey::GetPrivKey() const { + assert(fValid); + CECKey key; + key.SetSecretBytes(vch); + CPrivKey privkey; + key.GetPrivKey(privkey); + return privkey; +} + +CPubKey CKey::GetPubKey() const { + assert(fValid); + CECKey key; + key.SetSecretBytes(vch); + CPubKey pubkey; + key.GetPubKey(pubkey, fCompressed); + return pubkey; +} + +bool CKey::Sign(const uint256 &hash, std::vector& vchSig) const { + if (!fValid) + return false; + CECKey key; + key.SetSecretBytes(vch); + return key.Sign(hash, vchSig); +} + +bool CKey::SignCompact(const uint256 &hash, std::vector& vchSig) const { + if (!fValid) + return false; + CECKey key; + key.SetSecretBytes(vch); + vchSig.resize(65); + int rec = -1; + if (!key.SignCompact(hash, &vchSig[1], rec)) + return false; + assert(rec != -1); + vchSig[0] = 27 + rec + (fCompressed ? 4 : 0); + return true; +} + +bool CPubKey::Verify(const uint256 &hash, const std::vector& vchSig) const { + if (!IsValid()) + return false; + CECKey key; + if (!key.SetPubKey(*this)) + return false; + if (!key.Verify(hash, vchSig)) + return false; + return true; +} + +bool CPubKey::RecoverCompact(const uint256 &hash, const std::vector& vchSig) { if (vchSig.size() != 65) return false; - int nV = vchSig[0]; - if (nV<27 || nV>=35) + CECKey key; + if (!key.Recover(hash, &vchSig[1], (vchSig[0] - 27) & ~4)) return false; - ECDSA_SIG *sig = ECDSA_SIG_new(); - BN_bin2bn(&vchSig[1],32,sig->r); - BN_bin2bn(&vchSig[33],32,sig->s); - - EC_KEY_free(pkey); - pkey = EC_KEY_new_by_curve_name(NID_secp256k1); - if (nV >= 31) - { - SetCompressedPubKey(); - nV -= 4; - } - if (ECDSA_SIG_recover_key_GFp(pkey, sig, (unsigned char*)&hash, sizeof(hash), nV - 27, 0) == 1) - { - fSet = true; - ECDSA_SIG_free(sig); - return true; - } - return false; -} - -bool CKey::Verify(uint256 hash, const std::vector& vchSig) -{ - // -1 = error, 0 = bad sig, 1 = good - if (ECDSA_verify(0, (unsigned char*)&hash, sizeof(hash), &vchSig[0], vchSig.size(), pkey) != 1) - return false; - + key.GetPubKey(*this, (vchSig[0] - 27) & 4); return true; } -bool CKey::VerifyCompact(uint256 hash, const std::vector& vchSig) -{ - CKey key; - if (!key.SetCompactSignature(hash, vchSig)) +bool CPubKey::VerifyCompact(const uint256 &hash, const std::vector& vchSig) const { + if (!IsValid()) return false; - if (GetPubKey() != key.GetPubKey()) + if (vchSig.size() != 65) + return false; + CECKey key; + if (!key.Recover(hash, &vchSig[1], (vchSig[0] - 27) & ~4)) + return false; + CPubKey pubkeyRec; + key.GetPubKey(pubkeyRec, IsCompressed()); + if (*this != pubkeyRec) return false; - return true; } -bool CKey::IsValid() -{ - if (!fSet) +bool CPubKey::IsFullyValid() const { + if (!IsValid()) return false; - - if (!EC_KEY_check_key(pkey)) + CECKey key; + if (!key.SetPubKey(*this)) return false; - - bool fCompr; - CSecret secret = GetSecret(fCompr); - CKey key2; - key2.SetSecret(secret, fCompr); - return GetPubKey() == key2.GetPubKey(); + return true; +} + +bool CPubKey::Decompress() { + if (!IsValid()) + return false; + CECKey key; + if (!key.SetPubKey(*this)) + return false; + key.GetPubKey(*this, false); + return true; } diff --git a/src/key.h b/src/key.h index 4da16b9cdb..ce469ad298 100644 --- a/src/key.h +++ b/src/key.h @@ -1,11 +1,10 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto -// Copyright (c) 2009-2012 The Bitcoin developers +// Copyright (c) 2009-2013 The Bitcoin developers // Distributed under the MIT/X11 software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. #ifndef BITCOIN_KEY_H #define BITCOIN_KEY_H -#include #include #include "allocators.h" @@ -13,23 +12,6 @@ #include "uint256.h" #include "hash.h" -#include // for EC_KEY definition - -// secp160k1 -// const unsigned int PRIVATE_KEY_SIZE = 192; -// const unsigned int PUBLIC_KEY_SIZE = 41; -// const unsigned int SIGNATURE_SIZE = 48; -// -// secp192k1 -// const unsigned int PRIVATE_KEY_SIZE = 222; -// const unsigned int PUBLIC_KEY_SIZE = 49; -// const unsigned int SIGNATURE_SIZE = 57; -// -// secp224k1 -// const unsigned int PRIVATE_KEY_SIZE = 250; -// const unsigned int PUBLIC_KEY_SIZE = 57; -// const unsigned int SIGNATURE_SIZE = 66; -// // secp256k1: // const unsigned int PRIVATE_KEY_SIZE = 279; // const unsigned int PUBLIC_KEY_SIZE = 65; @@ -38,12 +20,6 @@ // see www.keylength.com // script supports up to 75 for single byte push -class key_error : public std::runtime_error -{ -public: - explicit key_error(const std::string& str) : std::runtime_error(str) {} -}; - /** A reference to a CKey: the Hash160 of its serialized public key */ class CKeyID : public uint160 { @@ -63,99 +39,218 @@ public: /** An encapsulated public key. */ class CPubKey { private: - std::vector vchPubKey; - friend class CKey; + // Just store the serialized data. + // Its length can very cheaply be computed from the first byte. + unsigned char vch[65]; + + // Compute the length of a pubkey with a given first byte. + unsigned int static GetLen(unsigned char chHeader) { + if (chHeader == 2 || chHeader == 3) + return 33; + if (chHeader == 4 || chHeader == 6 || chHeader == 7) + return 65; + return 0; + } + + // Set this key data to be invalid + void Invalidate() { + vch[0] = 0xFF; + } public: - CPubKey() { } - CPubKey(const std::vector &vchPubKeyIn) : vchPubKey(vchPubKeyIn) { } - friend bool operator==(const CPubKey &a, const CPubKey &b) { return a.vchPubKey == b.vchPubKey; } - friend bool operator!=(const CPubKey &a, const CPubKey &b) { return a.vchPubKey != b.vchPubKey; } - friend bool operator<(const CPubKey &a, const CPubKey &b) { return a.vchPubKey < b.vchPubKey; } + // Construct an invalid public key. + CPubKey() { + Invalidate(); + } - IMPLEMENT_SERIALIZE( - READWRITE(vchPubKey); - ) + // Initialize a public key using begin/end iterators to byte data. + template + void Set(const T pbegin, const T pend) { + int len = pend == pbegin ? 0 : GetLen(pbegin[0]); + if (len && len == (pend-pbegin)) + memcpy(vch, (unsigned char*)&pbegin[0], len); + else + Invalidate(); + } + // Construct a public key using begin/end iterators to byte data. + template + CPubKey(const T pbegin, const T pend) { + Set(pbegin, pend); + } + + // Construct a public key from a byte vector. + CPubKey(const std::vector &vch) { + Set(vch.begin(), vch.end()); + } + + // Simple read-only vector-like interface to the pubkey data. + unsigned int size() const { return GetLen(vch[0]); } + const unsigned char *begin() const { return vch; } + const unsigned char *end() const { return vch+size(); } + const unsigned char &operator[](unsigned int pos) const { return vch[pos]; } + + // Comparator implementation. + friend bool operator==(const CPubKey &a, const CPubKey &b) { + return a.vch[0] == b.vch[0] && + memcmp(a.vch, b.vch, a.size()) == 0; + } + friend bool operator!=(const CPubKey &a, const CPubKey &b) { + return !(a == b); + } + friend bool operator<(const CPubKey &a, const CPubKey &b) { + return a.vch[0] < b.vch[0] || + (a.vch[0] == b.vch[0] && memcmp(a.vch, b.vch, a.size()) < 0); + } + + // Implement serialization, as if this was a byte vector. + unsigned int GetSerializeSize(int nType, int nVersion) const { + return size() + 1; + } + template void Serialize(Stream &s, int nType, int nVersion) const { + unsigned int len = size(); + ::WriteCompactSize(s, len); + s.write((char*)vch, len); + } + template void Unserialize(Stream &s, int nType, int nVersion) { + unsigned int len = ::ReadCompactSize(s); + if (len <= 65) { + s.read((char*)vch, len); + } else { + // invalid pubkey, skip available data + char dummy; + while (len--) + s.read(&dummy, 1); + Invalidate(); + } + } + + // Get the KeyID of this public key (hash of its serialization) CKeyID GetID() const { - return CKeyID(Hash160(vchPubKey)); + return CKeyID(Hash160(vch, vch+size())); } + // Get the 256-bit hash of this public key. uint256 GetHash() const { - return Hash(vchPubKey.begin(), vchPubKey.end()); + return Hash(vch, vch+size()); } + // just check syntactic correctness. bool IsValid() const { - return vchPubKey.size() == 33 || vchPubKey.size() == 65; + return size() > 0; } + // fully validate whether this is a valid public key (more expensive than IsValid()) + bool IsFullyValid() const; + + // Check whether this is a compressed public key. bool IsCompressed() const { - return vchPubKey.size() == 33; + return size() == 33; } - std::vector Raw() const { - return vchPubKey; - } + // Verify a DER signature (~72 bytes). + // If this public key is not fully valid, the return value will be false. + bool Verify(const uint256 &hash, const std::vector& vchSig) const; + + // Verify a compact signature (~65 bytes). + // See CKey::SignCompact. + bool VerifyCompact(const uint256 &hash, const std::vector& vchSig) const; + + // Recover a public key from a compact signature. + bool RecoverCompact(const uint256 &hash, const std::vector& vchSig); + + // Turn this public key into an uncompressed public key. + bool Decompress(); }; // secure_allocator is defined in allocators.h // CPrivKey is a serialized private key, with all parameters included (279 bytes) typedef std::vector > CPrivKey; -// CSecret is a serialization of just the secret parameter (32 bytes) -typedef std::vector > CSecret; -/** An encapsulated OpenSSL Elliptic Curve key (public and/or private) */ -class CKey -{ -protected: - EC_KEY* pkey; - bool fSet; - bool fCompressedPubKey; +/** An encapsulated private key. */ +class CKey { +private: + // Whether this private key is valid. We check for correctness when modifying the key + // data, so fValid should always correspond to the actual state. + bool fValid; + // Whether the public key corresponding to this private key is (to be) compressed. + bool fCompressed; + + // The actual byte data + unsigned char vch[32]; + + // Check whether the 32-byte array pointed to be vch is valid keydata. + bool static Check(const unsigned char *vch); public: - void SetCompressedPubKey(bool fCompressed = true); - void Reset(); + // Construct an invalid private key. + CKey() : fValid(false) { + LockObject(vch); + } - CKey(); - CKey(const CKey& b); + // Copy constructor. This is necessary because of memlocking. + CKey(const CKey &secret) : fValid(secret.fValid), fCompressed(secret.fCompressed) { + LockObject(vch); + memcpy(vch, secret.vch, sizeof(vch)); + } - CKey& operator=(const CKey& b); + // Destructor (again necessary because of memlocking). + ~CKey() { + UnlockObject(vch); + } - ~CKey(); + // Initialize using begin and end iterators to byte data. + template + void Set(const T pbegin, const T pend, bool fCompressedIn) { + if (pend - pbegin != 32) { + fValid = false; + return; + } + if (Check(&pbegin[0])) { + memcpy(vch, (unsigned char*)&pbegin[0], 32); + fValid = true; + fCompressed = fCompressedIn; + } else { + fValid = false; + } + } - bool IsNull() const; - bool IsCompressed() const; + // Simple read-only vector-like interface. + unsigned int size() const { return (fValid ? 32 : 0); } + const unsigned char *begin() const { return vch; } + const unsigned char *end() const { return vch + size(); } + // Check whether this private key is valid. + bool IsValid() const { return fValid; } + + // Check whether the public key corresponding to this private key is (to be) compressed. + bool IsCompressed() const { return fCompressed; } + + // Initialize from a CPrivKey (serialized OpenSSL private key data). + bool SetPrivKey(const CPrivKey &vchPrivKey, bool fCompressed); + + // Generate a new private key using a cryptographic PRNG. void MakeNewKey(bool fCompressed); - bool SetPrivKey(const CPrivKey& vchPrivKey); - bool SetSecret(const CSecret& vchSecret, bool fCompressed = false); - CSecret GetSecret(bool &fCompressed) const; + + // Convert the private key to a CPrivKey (serialized OpenSSL private key data). + // This is expensive. CPrivKey GetPrivKey() const; - bool SetPubKey(const CPubKey& vchPubKey); + + // Compute the public key from a private key. + // This is expensive. CPubKey GetPubKey() const; - bool Sign(uint256 hash, std::vector& vchSig); + // Create a DER-serialized signature. + bool Sign(const uint256 &hash, std::vector& vchSig) const; - // create a compact signature (65 bytes), which allows reconstructing the used public key + // Create a compact signature (65 bytes), which allows reconstructing the used public key. // The format is one header byte, followed by two times 32 bytes for the serialized r and s values. // The header byte: 0x1B = first key with even y, 0x1C = first key with odd y, - // 0x1D = second key with even y, 0x1E = second key with odd y - bool SignCompact(uint256 hash, std::vector& vchSig); - - // reconstruct public key from a compact signature - // This is only slightly more CPU intensive than just verifying it. - // If this function succeeds, the recovered public key is guaranteed to be valid - // (the signature is a valid signature of the given data for that key) - bool SetCompactSignature(uint256 hash, const std::vector& vchSig); - - bool Verify(uint256 hash, const std::vector& vchSig); - - // Verify a compact signature - bool VerifyCompact(uint256 hash, const std::vector& vchSig); - - bool IsValid(); + // 0x1D = second key with even y, 0x1E = second key with odd y, + // add 0x04 for compressed keys. + bool SignCompact(const uint256 &hash, std::vector& vchSig) const; }; #endif diff --git a/src/keystore.cpp b/src/keystore.cpp index e0cf805a19..808f8c24ef 100644 --- a/src/keystore.cpp +++ b/src/keystore.cpp @@ -15,61 +15,50 @@ bool CKeyStore::GetPubKey(const CKeyID &address, CPubKey &vchPubKeyOut) const return true; } -bool CBasicKeyStore::AddKey(const CKey& key) +bool CKeyStore::AddKey(const CKey &key) { + return AddKeyPubKey(key, key.GetPubKey()); +} + +bool CBasicKeyStore::AddKeyPubKey(const CKey& key, const CPubKey &pubkey) { - bool fCompressed = false; - CSecret secret = key.GetSecret(fCompressed); - { - LOCK(cs_KeyStore); - mapKeys[key.GetPubKey().GetID()] = make_pair(secret, fCompressed); - } + LOCK(cs_KeyStore); + mapKeys[pubkey.GetID()] = key; return true; } bool CBasicKeyStore::AddCScript(const CScript& redeemScript) { - { - LOCK(cs_KeyStore); - mapScripts[redeemScript.GetID()] = redeemScript; - } + LOCK(cs_KeyStore); + mapScripts[redeemScript.GetID()] = redeemScript; return true; } bool CBasicKeyStore::HaveCScript(const CScriptID& hash) const { - bool result; - { - LOCK(cs_KeyStore); - result = (mapScripts.count(hash) > 0); - } - return result; + LOCK(cs_KeyStore); + return mapScripts.count(hash) > 0; } - bool CBasicKeyStore::GetCScript(const CScriptID &hash, CScript& redeemScriptOut) const { + LOCK(cs_KeyStore); + ScriptMap::const_iterator mi = mapScripts.find(hash); + if (mi != mapScripts.end()) { - LOCK(cs_KeyStore); - ScriptMap::const_iterator mi = mapScripts.find(hash); - if (mi != mapScripts.end()) - { - redeemScriptOut = (*mi).second; - return true; - } + redeemScriptOut = (*mi).second; + return true; } return false; } bool CCryptoKeyStore::SetCrypted() { - { - LOCK(cs_KeyStore); - if (fUseCrypto) - return true; - if (!mapKeys.empty()) - return false; - fUseCrypto = true; - } + LOCK(cs_KeyStore); + if (fUseCrypto) + return true; + if (!mapKeys.empty()) + return false; + fUseCrypto = true; return true; } @@ -99,14 +88,13 @@ bool CCryptoKeyStore::Unlock(const CKeyingMaterial& vMasterKeyIn) { const CPubKey &vchPubKey = (*mi).second.first; const std::vector &vchCryptedSecret = (*mi).second.second; - CSecret vchSecret; + CKeyingMaterial vchSecret; if(!DecryptSecret(vMasterKeyIn, vchCryptedSecret, vchPubKey.GetHash(), vchSecret)) return false; if (vchSecret.size() != 32) return false; CKey key; - key.SetPubKey(vchPubKey); - key.SetSecret(vchSecret); + key.Set(vchSecret.begin(), vchSecret.end(), vchPubKey.IsCompressed()); if (key.GetPubKey() == vchPubKey) break; return false; @@ -117,23 +105,22 @@ bool CCryptoKeyStore::Unlock(const CKeyingMaterial& vMasterKeyIn) return true; } -bool CCryptoKeyStore::AddKey(const CKey& key) +bool CCryptoKeyStore::AddKeyPubKey(const CKey& key, const CPubKey &pubkey) { { LOCK(cs_KeyStore); if (!IsCrypted()) - return CBasicKeyStore::AddKey(key); + return CBasicKeyStore::AddKeyPubKey(key, pubkey); if (IsLocked()) return false; std::vector vchCryptedSecret; - CPubKey vchPubKey = key.GetPubKey(); - bool fCompressed; - if (!EncryptSecret(vMasterKey, key.GetSecret(fCompressed), vchPubKey.GetHash(), vchCryptedSecret)) + CKeyingMaterial vchSecret(key.begin(), key.end()); + if (!EncryptSecret(vMasterKey, vchSecret, pubkey.GetHash(), vchCryptedSecret)) return false; - if (!AddCryptedKey(key.GetPubKey(), vchCryptedSecret)) + if (!AddCryptedKey(pubkey, vchCryptedSecret)) return false; } return true; @@ -164,13 +151,12 @@ bool CCryptoKeyStore::GetKey(const CKeyID &address, CKey& keyOut) const { const CPubKey &vchPubKey = (*mi).second.first; const std::vector &vchCryptedSecret = (*mi).second.second; - CSecret vchSecret; + CKeyingMaterial vchSecret; if (!DecryptSecret(vMasterKey, vchCryptedSecret, vchPubKey.GetHash(), vchSecret)) return false; if (vchSecret.size() != 32) return false; - keyOut.SetPubKey(vchPubKey); - keyOut.SetSecret(vchSecret); + keyOut.Set(vchSecret.begin(), vchSecret.end(), vchPubKey.IsCompressed()); return true; } } @@ -204,13 +190,11 @@ bool CCryptoKeyStore::EncryptKeys(CKeyingMaterial& vMasterKeyIn) fUseCrypto = true; BOOST_FOREACH(KeyMap::value_type& mKey, mapKeys) { - CKey key; - if (!key.SetSecret(mKey.second.first, mKey.second.second)) - return false; - const CPubKey vchPubKey = key.GetPubKey(); + const CKey &key = mKey.second; + CPubKey vchPubKey = key.GetPubKey(); + CKeyingMaterial vchSecret(key.begin(), key.end()); std::vector vchCryptedSecret; - bool fCompressed; - if (!EncryptSecret(vMasterKeyIn, key.GetSecret(fCompressed), vchPubKey.GetHash(), vchCryptedSecret)) + if (!EncryptSecret(vMasterKeyIn, vchSecret, vchPubKey.GetHash(), vchCryptedSecret)) return false; if (!AddCryptedKey(vchPubKey, vchCryptedSecret)) return false; diff --git a/src/keystore.h b/src/keystore.h index ab369bbf47..49a7bf569d 100644 --- a/src/keystore.h +++ b/src/keystore.h @@ -21,7 +21,8 @@ public: virtual ~CKeyStore() {} // Add a key to the store. - virtual bool AddKey(const CKey& key) =0; + virtual bool AddKeyPubKey(const CKey &key, const CPubKey &pubkey) =0; + virtual bool AddKey(const CKey &key); // Check whether a key corresponding to a given address is present in the store. virtual bool HaveKey(const CKeyID &address) const =0; @@ -33,18 +34,9 @@ public: virtual bool AddCScript(const CScript& redeemScript) =0; virtual bool HaveCScript(const CScriptID &hash) const =0; virtual bool GetCScript(const CScriptID &hash, CScript& redeemScriptOut) const =0; - - virtual bool GetSecret(const CKeyID &address, CSecret& vchSecret, bool &fCompressed) const - { - CKey key; - if (!GetKey(address, key)) - return false; - vchSecret = key.GetSecret(fCompressed); - return true; - } }; -typedef std::map > KeyMap; +typedef std::map KeyMap; typedef std::map ScriptMap; /** Basic key store, that keeps keys in an address->secret map */ @@ -55,7 +47,7 @@ protected: ScriptMap mapScripts; public: - bool AddKey(const CKey& key); + bool AddKeyPubKey(const CKey& key, const CPubKey &pubkey); bool HaveKey(const CKeyID &address) const { bool result; @@ -85,8 +77,7 @@ public: KeyMap::const_iterator mi = mapKeys.find(address); if (mi != mapKeys.end()) { - keyOut.Reset(); - keyOut.SetSecret((*mi).second.first, (*mi).second.second); + keyOut = mi->second; return true; } } @@ -146,7 +137,7 @@ public: bool Lock(); virtual bool AddCryptedKey(const CPubKey &vchPubKey, const std::vector &vchCryptedSecret); - bool AddKey(const CKey& key); + bool AddKeyPubKey(const CKey& key, const CPubKey &pubkey); bool HaveKey(const CKeyID &address) const { { diff --git a/src/main.cpp b/src/main.cpp index aace382d8b..a98b83b6af 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -31,6 +31,7 @@ CTxMemPool mempool; unsigned int nTransactionsUpdated = 0; map mapBlockIndex; +std::vector vBlockIndexByHeight; uint256 hashGenesisBlock("0x000000000019d6689c085ae165831e934ff763ae46a2a6c172b3f1b60a8ce26f"); static CBigNum bnProofOfWorkLimit(~uint256(0) >> 32); CBlockIndex* pindexGenesisBlock = NULL; @@ -48,6 +49,11 @@ bool fBenchmark = false; bool fTxIndex = false; unsigned int nCoinCacheSize = 5000; +/** Fees smaller than this (in satoshi) are considered zero fee (for transaction creation) */ +int64 CTransaction::nMinTxFee = 10000; // Override with -mintxfee +/** Fees smaller than this (in satoshi) are considered zero fee (for relaying) */ +int64 CTransaction::nMinRelayTxFee = 10000; + CMedianFilter cPeerBlockCounts(8, 0); // Amount of blocks that other nodes claim to have map mapOrphanBlocks; @@ -352,9 +358,22 @@ unsigned int LimitOrphanTxSize(unsigned int nMaxOrphans) ////////////////////////////////////////////////////////////////////////////// // -// CTransaction +// CTransaction / CTxOut // +bool CTxOut::IsDust() const +{ + // "Dust" is defined in terms of CTransaction::nMinRelayTxFee, + // which has units satoshis-per-kilobyte. + // If you'd pay more than 1/3 in fees + // to spend something, then we consider it dust. + // A typical txout is 33 bytes big, and will + // need a CTxIn of at least 148 bytes to spend, + // so dust is a txout less than 54 uBTC + // (5430 satoshis) with default nMinRelayTxFee + return ((nValue*1000)/(3*((int)GetSerializeSize(SER_DISK,0)+148)) < CTransaction::nMinRelayTxFee); +} + bool CTransaction::IsStandard() const { if (nVersion > CTransaction::CURRENT_VERSION) @@ -384,7 +403,7 @@ bool CTransaction::IsStandard() const BOOST_FOREACH(const CTxOut& txout, vout) { if (!::IsStandard(txout.scriptPubKey)) return false; - if (txout.nValue == 0) + if (txout.IsDust()) return false; } return true; @@ -574,8 +593,8 @@ bool CTransaction::CheckTransaction(CValidationState &state) const int64 CTransaction::GetMinFee(unsigned int nBlockSize, bool fAllowFree, enum GetMinFee_mode mode) const { - // Base fee is either MIN_TX_FEE or MIN_RELAY_TX_FEE - int64 nBaseFee = (mode == GMF_RELAY) ? MIN_RELAY_TX_FEE : MIN_TX_FEE; + // Base fee is either nMinTxFee or nMinRelayTxFee + int64 nBaseFee = (mode == GMF_RELAY) ? nMinRelayTxFee : nMinTxFee; unsigned int nBytes = ::GetSerializeSize(*this, SER_NETWORK, PROTOCOL_VERSION); unsigned int nNewBlockSize = nBlockSize + nBytes; @@ -598,7 +617,7 @@ int64 CTransaction::GetMinFee(unsigned int nBlockSize, bool fAllowFree, } } - // To limit dust spam, require MIN_TX_FEE/MIN_RELAY_TX_FEE if any output is less than 0.01 + // To limit dust spam, require base fee if any output is less than 0.01 if (nMinFee < nBaseFee) { BOOST_FOREACH(const CTxOut& txout, vout) @@ -746,7 +765,7 @@ bool CTxMemPool::accept(CValidationState &state, CTransaction &tx, bool fCheckIn // Continuously rate-limit free transactions // This mitigates 'penny-flooding' -- sending thousands of free transactions just to // be annoying or make others' transactions take longer to confirm. - if (fLimitFree && nFees < MIN_RELAY_TX_FEE) + if (fLimitFree && nFees < CTransaction::nMinRelayTxFee) { static double dFreeCount; static int64 nLastTime; @@ -1018,19 +1037,9 @@ bool GetTransaction(const uint256 &hash, CTransaction &txOut, uint256 &hashBlock static CBlockIndex* pblockindexFBBHLast; CBlockIndex* FindBlockByHeight(int nHeight) { - CBlockIndex *pblockindex; - if (nHeight < nBestHeight / 2) - pblockindex = pindexGenesisBlock; - else - pblockindex = pindexBest; - if (pblockindexFBBHLast && abs(nHeight - pblockindex->nHeight) > abs(nHeight - pblockindexFBBHLast->nHeight)) - pblockindex = pblockindexFBBHLast; - while (pblockindex->nHeight > nHeight) - pblockindex = pblockindex->pprev; - while (pblockindex->nHeight < nHeight) - pblockindex = pblockindex->pnext; - pblockindexFBBHLast = pblockindex; - return pblockindex; + if (nHeight >= (int)vBlockIndexByHeight.size()) + return NULL; + return vBlockIndexByHeight[nHeight]; } bool CBlock::ReadFromDisk(const CBlockIndex* pindex) @@ -1213,7 +1222,7 @@ void static InvalidBlockFound(CBlockIndex *pindex) { pblocktree->WriteBlockIndex(CDiskBlockIndex(pindex)); setBlockIndexValid.erase(pindex); InvalidChainFound(pindex); - if (pindex->pnext) { + if (pindex->GetNextInMainChain()) { CValidationState stateDummy; ConnectBestBlock(stateDummy); // reorganise away from the failed block } @@ -1253,7 +1262,7 @@ bool ConnectBestBlock(CValidationState &state) { if (pindexBest == NULL || pindexTest->nChainWork > pindexBest->nChainWork) vAttach.push_back(pindexTest); - if (pindexTest->pprev == NULL || pindexTest->pnext != NULL) { + if (pindexTest->pprev == NULL || pindexTest->GetNextInMainChain()) { reverse(vAttach.begin(), vAttach.end()); BOOST_FOREACH(CBlockIndex *pindexSwitch, vAttach) { boost::this_thread::interruption_point(); @@ -1324,7 +1333,7 @@ unsigned int CTransaction::GetP2SHSigOpCount(CCoinsViewCache& inputs) const return nSigOps; } -bool CTransaction::UpdateCoins(CValidationState &state, CCoinsViewCache &inputs, CTxUndo &txundo, int nHeight, const uint256 &txhash) const +void CTransaction::UpdateCoins(CValidationState &state, CCoinsViewCache &inputs, CTxUndo &txundo, int nHeight, const uint256 &txhash) const { // mark inputs spent if (!IsCoinBase()) { @@ -1338,8 +1347,6 @@ bool CTransaction::UpdateCoins(CValidationState &state, CCoinsViewCache &inputs, // add outputs assert(inputs.SetCoins(txhash, CCoins(*this, nHeight))); - - return true; } bool CTransaction::HaveInputs(CCoinsViewCache &inputs) const @@ -1665,8 +1672,7 @@ bool CBlock::ConnectBlock(CValidationState &state, CBlockIndex* pindex, CCoinsVi } CTxUndo txundo; - if (!tx.UpdateCoins(state, view, txundo, pindex->nHeight, GetTxHash(i))) - return error("ConnectBlock() : UpdateInputs failed"); + tx.UpdateCoins(state, view, txundo, pindex->nHeight, GetTxHash(i)); if (!tx.IsCoinBase()) blockundo.vtxundo.push_back(txundo); @@ -1831,15 +1837,10 @@ bool SetBestChain(CValidationState &state, CBlockIndex* pindexNew) // At this point, all changes have been done to the database. // Proceed by updating the memory structures. - // Disconnect shorter branch - BOOST_FOREACH(CBlockIndex* pindex, vDisconnect) - if (pindex->pprev) - pindex->pprev->pnext = NULL; - - // Connect longer branch + // Register new best chain + vBlockIndexByHeight.resize(pindexNew->nHeight + 1); BOOST_FOREACH(CBlockIndex* pindex, vConnect) - if (pindex->pprev) - pindex->pprev->pnext = pindex; + vBlockIndexByHeight[pindex->nHeight] = pindex; // Resurrect memory transactions that were in the disconnected branch BOOST_FOREACH(CTransaction& tx, vResurrect) { @@ -1855,7 +1856,7 @@ bool SetBestChain(CValidationState &state, CBlockIndex* pindexNew) } // Update best block in wallet (so we can detect restored wallets) - if (!fIsInitialDownload) + if ((pindexNew->nHeight % 20160) == 0 || (!fIsInitialDownload && (pindexNew->nHeight % 144) == 0)) { const CBlockLocator locator(pindexNew); ::SetBestChain(locator); @@ -2058,25 +2059,6 @@ bool CBlock::CheckBlock(CValidationState &state, bool fCheckPOW, bool fCheckMerk if (vtx.empty() || vtx.size() > MAX_BLOCK_SIZE || ::GetSerializeSize(*this, SER_NETWORK, PROTOCOL_VERSION) > MAX_BLOCK_SIZE) return state.DoS(100, error("CheckBlock() : size limits failed")); - // Special short-term limits to avoid 10,000 BDB lock limit: - if (GetBlockTime() >= 1363867200 && // start enforcing 21 March 2013, noon GMT - GetBlockTime() < 1368576000) // stop enforcing 15 May 2013 00:00:00 - { - // Rule is: #unique txids referenced <= 4,500 - // ... to prevent 10,000 BDB lock exhaustion on old clients - set setTxIn; - for (size_t i = 0; i < vtx.size(); i++) - { - setTxIn.insert(vtx[i].GetHash()); - if (i == 0) continue; // skip coinbase txin - BOOST_FOREACH(const CTxIn& txin, vtx[i].vin) - setTxIn.insert(txin.prevout.hash); - } - size_t nTxids = setTxIn.size(); - if (nTxids > 4500) - return error("CheckBlock() : 15 May maxlocks violation"); - } - // Check proof of work matches claimed amount if (fCheckPOW && !CheckProofOfWork(GetHash(), nBits)) return state.DoS(50, error("CheckBlock() : proof of work failed")); @@ -2591,12 +2573,12 @@ bool static LoadBlockIndexDB() nBestHeight = pindexBest->nHeight; nBestChainWork = pindexBest->nChainWork; - // set 'next' pointers in best chain + // register best chain CBlockIndex *pindex = pindexBest; - while(pindex != NULL && pindex->pprev != NULL) { - CBlockIndex *pindexPrev = pindex->pprev; - pindexPrev->pnext = pindex; - pindex = pindexPrev; + vBlockIndexByHeight.resize(pindexBest->nHeight + 1); + while(pindex != NULL) { + vBlockIndexByHeight[pindex->nHeight] = pindex; + pindex = pindex->pprev; } printf("LoadBlockIndexDB(): hashBestChain=%s height=%d date=%s\n", hashBestChain.ToString().c_str(), nBestHeight, @@ -2665,7 +2647,7 @@ bool VerifyDB() { CBlockIndex *pindex = pindexState; while (pindex != pindexBest) { boost::this_thread::interruption_point(); - pindex = pindex->pnext; + pindex = pindex->GetNextInMainChain(); CBlock block; if (!block.ReadFromDisk(pindex)) return error("VerifyDB() : *** block.ReadFromDisk failed at %d, hash=%s", pindex->nHeight, pindex->GetBlockHash().ToString().c_str()); @@ -2841,7 +2823,7 @@ void PrintBlockTree() vector& vNext = mapNext[pindex]; for (unsigned int i = 0; i < vNext.size(); i++) { - if (vNext[i]->pnext) + if (vNext[i]->GetNextInMainChain()) { swap(vNext[0], vNext[i]); break; @@ -2949,7 +2931,7 @@ string GetWarnings(string strFor) string strStatusBar; string strRPC; - if (GetBoolArg("-testsafemode")) + if (GetBoolArg("-testsafemode", false)) strRPC = "test"; if (!CLIENT_VERSION_IS_RELEASE) @@ -3422,10 +3404,10 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv) // Send the rest of the chain if (pindex) - pindex = pindex->pnext; + pindex = pindex->GetNextInMainChain(); int nLimit = 500; printf("getblocks %d to %s limit %d\n", (pindex ? pindex->nHeight : -1), hashStop.ToString().c_str(), nLimit); - for (; pindex; pindex = pindex->pnext) + for (; pindex; pindex = pindex->GetNextInMainChain()) { if (pindex->GetBlockHash() == hashStop) { @@ -3465,14 +3447,14 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv) // Find the last block the caller has in the main chain pindex = locator.GetBlockIndex(); if (pindex) - pindex = pindex->pnext; + pindex = pindex->GetNextInMainChain(); } // we must use CBlocks, as CBlockHeaders won't include the 0x00 nTx count at the end vector vHeaders; int nLimit = 2000; printf("getheaders %d to %s\n", (pindex ? pindex->nHeight : -1), hashStop.ToString().c_str()); - for (; pindex; pindex = pindex->pnext) + for (; pindex; pindex = pindex->GetNextInMainChain()) { vHeaders.push_back(pindex->GetBlockHeader()); if (--nLimit <= 0 || pindex->GetBlockHash() == hashStop) @@ -4158,7 +4140,10 @@ CBlockTemplate* CreateNewBlock(CReserveKey& reservekey) txNew.vin.resize(1); txNew.vin[0].prevout.SetNull(); txNew.vout.resize(1); - txNew.vout[0].scriptPubKey << reservekey.GetReservedKey() << OP_CHECKSIG; + CPubKey pubkey; + if (!reservekey.GetReservedKey(pubkey)) + return NULL; + txNew.vout[0].scriptPubKey << pubkey << OP_CHECKSIG; // Add our coinbase tx as first transaction pblock->vtx.push_back(txNew); @@ -4170,10 +4155,6 @@ CBlockTemplate* CreateNewBlock(CReserveKey& reservekey) // Limit to betweeen 1K and MAX_BLOCK_SIZE-1K for sanity: nBlockMaxSize = std::max((unsigned int)1000, std::min((unsigned int)(MAX_BLOCK_SIZE-1000), nBlockMaxSize)); - // Special compatibility rule before 15 May: limit size to 500,000 bytes: - if (GetAdjustedTime() < 1368576000) - nBlockMaxSize = std::min(nBlockMaxSize, (unsigned int)(MAX_BLOCK_SIZE_GEN)); - // How much of the block should be dedicated to high-priority transactions, // included regardless of the fees they pay unsigned int nBlockPrioritySize = GetArg("-blockprioritysize", 27000); @@ -4184,15 +4165,6 @@ CBlockTemplate* CreateNewBlock(CReserveKey& reservekey) unsigned int nBlockMinSize = GetArg("-blockminsize", 0); nBlockMinSize = std::min(nBlockMaxSize, nBlockMinSize); - // Fee-per-kilobyte amount considered the same as "free" - // Be careful setting this: if you set it to zero then - // a transaction spammer can cheaply fill blocks using - // 1-satoshi-fee transactions. It should be set above the real - // cost to you of processing a transaction. - int64 nMinTxFee = MIN_TX_FEE; - if (mapArgs.count("-mintxfee")) - ParseMoney(mapArgs["-mintxfee"], nMinTxFee); - // Collect memory pool transactions into the block int64 nFees = 0; { @@ -4203,7 +4175,7 @@ CBlockTemplate* CreateNewBlock(CReserveKey& reservekey) // Priority order to process transactions list vOrphan; // list memory doesn't move map > mapDependers; - bool fPrintPriority = GetBoolArg("-printpriority"); + bool fPrintPriority = GetBoolArg("-printpriority", false); // This vector will be sorted into a priority queue: vector vecPriority; @@ -4221,8 +4193,7 @@ CBlockTemplate* CreateNewBlock(CReserveKey& reservekey) BOOST_FOREACH(const CTxIn& txin, tx.vin) { // Read prev transaction - CCoins coins; - if (!view.GetCoins(txin.prevout.hash, coins)) + if (!view.HaveCoins(txin.prevout.hash)) { // This should never happen; all transactions in the memory // pool should connect to either transactions in the chain @@ -4249,6 +4220,7 @@ CBlockTemplate* CreateNewBlock(CReserveKey& reservekey) nTotalIn += mempool.mapTx[txin.prevout.hash].vout[txin.prevout.n].nValue; continue; } + const CCoins &coins = view.GetCoins(txin.prevout.hash); int64 nValueIn = coins.vout[txin.prevout.n].nValue; nTotalIn += nValueIn; @@ -4296,9 +4268,6 @@ CBlockTemplate* CreateNewBlock(CReserveKey& reservekey) std::pop_heap(vecPriority.begin(), vecPriority.end(), comparer); vecPriority.pop_back(); - // second layer cached modifications just for this transaction - CCoinsViewCache viewTemp(view, true); - // Size limits unsigned int nTxSize = ::GetSerializeSize(tx, SER_NETWORK, PROTOCOL_VERSION); if (nBlockSize + nTxSize >= nBlockMaxSize) @@ -4310,7 +4279,7 @@ CBlockTemplate* CreateNewBlock(CReserveKey& reservekey) continue; // Skip free transactions if we're past the minimum block size: - if (fSortedByFee && (dFeePerKb < nMinTxFee) && (nBlockSize + nTxSize >= nBlockMinSize)) + if (fSortedByFee && (dFeePerKb < CTransaction::nMinTxFee) && (nBlockSize + nTxSize >= nBlockMinSize)) continue; // Prioritize by fee once past the priority size or we run out of high-priority @@ -4323,26 +4292,22 @@ CBlockTemplate* CreateNewBlock(CReserveKey& reservekey) std::make_heap(vecPriority.begin(), vecPriority.end(), comparer); } - if (!tx.HaveInputs(viewTemp)) + if (!tx.HaveInputs(view)) continue; - int64 nTxFees = tx.GetValueIn(viewTemp)-tx.GetValueOut(); + int64 nTxFees = tx.GetValueIn(view)-tx.GetValueOut(); - nTxSigOps += tx.GetP2SHSigOpCount(viewTemp); + nTxSigOps += tx.GetP2SHSigOpCount(view); if (nBlockSigOps + nTxSigOps >= MAX_BLOCK_SIGOPS) continue; CValidationState state; - if (!tx.CheckInputs(state, viewTemp, true, SCRIPT_VERIFY_P2SH)) + if (!tx.CheckInputs(state, view, true, SCRIPT_VERIFY_P2SH)) continue; CTxUndo txundo; uint256 hash = tx.GetHash(); - if (!tx.UpdateCoins(state, viewTemp, txundo, pindexPrev->nHeight+1, hash)) - continue; - - // push changes from the second layer cache to the first one - viewTemp.Flush(); + tx.UpdateCoins(state, view, txundo, pindexPrev->nHeight+1, hash); // Added pblock->vtx.push_back(tx); diff --git a/src/main.h b/src/main.h index 24b2cb2aa6..679ae75a47 100644 --- a/src/main.h +++ b/src/main.h @@ -44,10 +44,6 @@ static const unsigned int BLOCKFILE_CHUNK_SIZE = 0x1000000; // 16 MiB static const unsigned int UNDOFILE_CHUNK_SIZE = 0x100000; // 1 MiB /** Fake height value used in CCoins to signify they are only in the memory pool (since 0.8) */ static const unsigned int MEMPOOL_HEIGHT = 0x7FFFFFFF; -/** Fees smaller than this (in satoshi) are considered zero fee (for transaction creation) */ -static const int64 MIN_TX_FEE = 10000; -/** Fees smaller than this (in satoshi) are considered zero fee (for relaying) */ -static const int64 MIN_RELAY_TX_FEE = 10000; /** No amount larger than this (in satoshi) is valid */ static const int64 MAX_MONEY = 21000000 * COIN; inline bool MoneyRange(int64 nValue) { return (nValue >= 0 && nValue <= MAX_MONEY); } @@ -73,6 +69,7 @@ extern CScript COINBASE_FLAGS; extern CCriticalSection cs_main; extern std::map mapBlockIndex; +extern std::vector vBlockIndexByHeight; extern std::set setBlockIndexValid; extern uint256 hashGenesisBlock; extern CBlockIndex* pindexGenesisBlock; @@ -439,6 +436,8 @@ public: return !(a == b); } + bool IsDust() const; + std::string ToString() const { if (scriptPubKey.size() < 6) @@ -467,6 +466,8 @@ enum GetMinFee_mode class CTransaction { public: + static int64 nMinTxFee; + static int64 nMinRelayTxFee; static const int CURRENT_VERSION=1; int nVersion; std::vector vin; @@ -659,7 +660,7 @@ public: std::vector *pvChecks = NULL) const; // Apply the effects of this transaction on the UTXO set represented by view - bool UpdateCoins(CValidationState &state, CCoinsViewCache &view, CTxUndo &txundo, int nHeight, const uint256 &txhash) const; + void UpdateCoins(CValidationState &state, CCoinsViewCache &view, CTxUndo &txundo, int nHeight, const uint256 &txhash) const; // Context-independent validity checks bool CheckTransaction(CValidationState &state) const; @@ -1589,10 +1590,8 @@ enum BlockStatus { /** The block chain is a tree shaped structure starting with the * genesis block at the root, with each block potentially having multiple - * candidates to be the next block. pprev and pnext link a path through the - * main/longest chain. A blockindex may have multiple pprev pointing back - * to it, but pnext will only point forward to the longest branch, or will - * be null if the block is not part of the longest chain. + * candidates to be the next block. A blockindex may have multiple pprev pointing + * to it, but at most one of them can be part of the currently active branch. */ class CBlockIndex { @@ -1603,9 +1602,6 @@ public: // pointer to the index of the predecessor of this block CBlockIndex* pprev; - // (memory only) pointer to the index of the *active* successor of this block - CBlockIndex* pnext; - // height of the entry in the chain. The genesis block has height 0 int nHeight; @@ -1643,7 +1639,6 @@ public: { phashBlock = NULL; pprev = NULL; - pnext = NULL; nHeight = 0; nFile = 0; nDataPos = 0; @@ -1664,7 +1659,6 @@ public: { phashBlock = NULL; pprev = NULL; - pnext = NULL; nHeight = 0; nFile = 0; nDataPos = 0; @@ -1733,7 +1727,11 @@ public: bool IsInMainChain() const { - return (pnext || this == pindexBest); + return nHeight < (int)vBlockIndexByHeight.size() && vBlockIndexByHeight[nHeight] == this; + } + + CBlockIndex *GetNextInMainChain() const { + return nHeight+1 >= (int)vBlockIndexByHeight.size() ? NULL : vBlockIndexByHeight[nHeight+1]; } bool CheckIndex() const @@ -1762,9 +1760,9 @@ public: const CBlockIndex* pindex = this; for (int i = 0; i < nMedianTimeSpan/2; i++) { - if (!pindex->pnext) + if (!pindex->GetNextInMainChain()) return GetBlockTime(); - pindex = pindex->pnext; + pindex = pindex->GetNextInMainChain(); } return pindex->GetMedianTimePast(); } @@ -1779,7 +1777,7 @@ public: std::string ToString() const { return strprintf("CBlockIndex(pprev=%p, pnext=%p, nHeight=%d, merkle=%s, hashBlock=%s)", - pprev, pnext, nHeight, + pprev, GetNextInMainChain(), nHeight, hashMerkleRoot.ToString().c_str(), GetBlockHash().ToString().c_str()); } @@ -2096,11 +2094,14 @@ extern CTxMemPool mempool; struct CCoinsStats { int nHeight; + uint256 hashBlock; uint64 nTransactions; uint64 nTransactionOutputs; uint64 nSerializedSize; + uint256 hashSerialized; + int64 nTotalAmount; - CCoinsStats() : nHeight(0), nTransactions(0), nTransactionOutputs(0), nSerializedSize(0) {} + CCoinsStats() : nHeight(0), hashBlock(0), nTransactions(0), nTransactionOutputs(0), nSerializedSize(0), hashSerialized(0), nTotalAmount(0) {} }; /** Abstract view on the open txout dataset. */ diff --git a/src/makefile.osx b/src/makefile.osx index af12731fa4..50279fdb05 100644 --- a/src/makefile.osx +++ b/src/makefile.osx @@ -36,6 +36,7 @@ LIBS += \ $(DEPSDIR)/lib/libboost_filesystem-mt.a \ $(DEPSDIR)/lib/libboost_program_options-mt.a \ $(DEPSDIR)/lib/libboost_thread-mt.a \ + $(DEPSDIR)/lib/libboost_chrono-mt.a \ $(DEPSDIR)/lib/libssl.a \ $(DEPSDIR)/lib/libcrypto.a \ -lz @@ -48,6 +49,7 @@ LIBS += \ -lboost_filesystem-mt \ -lboost_program_options-mt \ -lboost_thread-mt \ + -lboost_chrono-mt \ -lssl \ -lcrypto \ -lz diff --git a/src/net.cpp b/src/net.cpp index 3fa48ae484..54ed1d9b51 100644 --- a/src/net.cpp +++ b/src/net.cpp @@ -841,19 +841,39 @@ void ThreadSocketHandler() { if (pnode->hSocket == INVALID_SOCKET) continue; + FD_SET(pnode->hSocket, &fdsetError); + hSocketMax = max(hSocketMax, pnode->hSocket); + have_fds = true; + + // Implement the following logic: + // * If there is data to send, select() for sending data. As this only + // happens when optimistic write failed, we choose to first drain the + // write buffer in this case before receiving more. This avoids + // needlessly queueing received data, if the remote peer is not themselves + // receiving data. This means properly utilizing TCP flow control signalling. + // * Otherwise, if there is no (complete) message in the receive buffer, + // or there is space left in the buffer, select() for receiving data. + // * (if neither of the above applies, there is certainly one message + // in the receiver buffer ready to be processed). + // Together, that means that at least one of the following is always possible, + // so we don't deadlock: + // * We send some data. + // * We wait for data to be received (and disconnect after timeout). + // * We process a message in the buffer (message handler thread). { TRY_LOCK(pnode->cs_vSend, lockSend); - if (lockSend) { - // do not read, if draining write queue - if (!pnode->vSendMsg.empty()) - FD_SET(pnode->hSocket, &fdsetSend); - else - FD_SET(pnode->hSocket, &fdsetRecv); - FD_SET(pnode->hSocket, &fdsetError); - hSocketMax = max(hSocketMax, pnode->hSocket); - have_fds = true; + if (lockSend && !pnode->vSendMsg.empty()) { + FD_SET(pnode->hSocket, &fdsetSend); + continue; } } + { + TRY_LOCK(pnode->cs_vRecvMsg, lockRecv); + if (lockRecv && ( + pnode->vRecvMsg.empty() || !pnode->vRecvMsg.front().complete() || + pnode->GetTotalRecvSize() <= ReceiveFloodSize())) + FD_SET(pnode->hSocket, &fdsetRecv); + } } } @@ -959,12 +979,7 @@ void ThreadSocketHandler() TRY_LOCK(pnode->cs_vRecvMsg, lockRecv); if (lockRecv) { - if (pnode->GetTotalRecvSize() > ReceiveFloodSize()) { - if (!pnode->fDisconnect) - printf("socket recv flood control disconnect (%u bytes)\n", pnode->GetTotalRecvSize()); - pnode->CloseSocketDisconnect(); - } - else { + { // typical socket buffer is 8K-64K char pchBuf[0x10000]; int nBytes = recv(pnode->hSocket, pchBuf, sizeof(pchBuf), MSG_DONTWAIT); diff --git a/src/qt/addressbookpage.cpp b/src/qt/addressbookpage.cpp index 8529c88b39..8906174d7d 100644 --- a/src/qt/addressbookpage.cpp +++ b/src/qt/addressbookpage.cpp @@ -143,8 +143,13 @@ void AddressBookPage::setModel(AddressTableModel *model) ui->tableView->sortByColumn(0, Qt::AscendingOrder); // Set column widths +#if QT_VERSION < 0x050000 ui->tableView->horizontalHeader()->setResizeMode(AddressTableModel::Label, QHeaderView::Stretch); ui->tableView->horizontalHeader()->setResizeMode(AddressTableModel::Address, QHeaderView::ResizeToContents); +#else + ui->tableView->horizontalHeader()->setSectionResizeMode(AddressTableModel::Label, QHeaderView::Stretch); + ui->tableView->horizontalHeader()->setSectionResizeMode(AddressTableModel::Address, QHeaderView::ResizeToContents); +#endif connect(ui->tableView->selectionModel(), SIGNAL(selectionChanged(QItemSelection,QItemSelection)), this, SLOT(selectionChanged())); diff --git a/src/qt/bitcoin.cpp b/src/qt/bitcoin.cpp index f869c58620..73a5a12efa 100644 --- a/src/qt/bitcoin.cpp +++ b/src/qt/bitcoin.cpp @@ -17,7 +17,9 @@ #include "splashscreen.h" #include +#if QT_VERSION < 0x050000 #include +#endif #include #include #include @@ -69,7 +71,7 @@ static bool ThreadSafeAskFee(int64 nFeeRequired) { if(!guiref) return false; - if(nFeeRequired < MIN_TX_FEE || nFeeRequired <= nTransactionFee || fDaemon) + if(nFeeRequired < CTransaction::nMinTxFee || nFeeRequired <= nTransactionFee || fDaemon) return true; bool payFee = false; @@ -114,9 +116,11 @@ int main(int argc, char *argv[]) // Command-line options take precedence: ParseParameters(argc, argv); +#if QT_VERSION < 0x050000 // Internal string conversion is all UTF-8 QTextCodec::setCodecForTr(QTextCodec::codecForName("UTF-8")); QTextCodec::setCodecForCStrings(QTextCodec::codecForTr()); +#endif Q_INIT_RESOURCE(bitcoin); QApplication app(argc, argv); @@ -148,7 +152,7 @@ int main(int argc, char *argv[]) // as it is used to locate QSettings) QApplication::setOrganizationName("Bitcoin"); QApplication::setOrganizationDomain("bitcoin.org"); - if(GetBoolArg("-testnet")) // Separate UI settings for testnet + if (GetBoolArg("-testnet", false)) // Separate UI settings for testnet QApplication::setApplicationName("Bitcoin-Qt-testnet"); else QApplication::setApplicationName("Bitcoin-Qt"); @@ -199,7 +203,7 @@ int main(int argc, char *argv[]) } SplashScreen splash(QPixmap(), 0); - if (GetBoolArg("-splash", true) && !GetBoolArg("-min")) + if (GetBoolArg("-splash", true) && !GetBoolArg("-min", false)) { splash.show(); splash.setAutoFillBackground(true); @@ -220,7 +224,7 @@ int main(int argc, char *argv[]) boost::thread_group threadGroup; - BitcoinGUI window; + BitcoinGUI window(GetBoolArg("-testnet", false), 0); guiref = &window; QTimer* pollShutdownTimer = new QTimer(guiref); @@ -246,7 +250,7 @@ int main(int argc, char *argv[]) window.setCurrentWallet("~Default"); // If -min option passed, start window minimized. - if(GetBoolArg("-min")) + if(GetBoolArg("-min", false)) { window.showMinimized(); } @@ -274,6 +278,9 @@ int main(int argc, char *argv[]) } else { + threadGroup.interrupt_all(); + threadGroup.join_all(); + Shutdown(); return 1; } } catch (std::exception& e) { diff --git a/src/qt/bitcoin.qrc b/src/qt/bitcoin.qrc index a8379597b4..c2f8308527 100644 --- a/src/qt/bitcoin.qrc +++ b/src/qt/bitcoin.qrc @@ -50,6 +50,8 @@ res/movies/update_spinner.mng + locale/bitcoin_af_ZA.qm + locale/bitcoin_ar.qm locale/bitcoin_bg.qm locale/bitcoin_bs.ts locale/bitcoin_ca.ts @@ -87,7 +89,6 @@ locale/bitcoin_pt_PT.qm locale/bitcoin_ro_RO.qm locale/bitcoin_ru.qm - locale/bitcoin_se.qm locale/bitcoin_sk.qm locale/bitcoin_sr.qm locale/bitcoin_sv.qm diff --git a/src/qt/bitcoingui.cpp b/src/qt/bitcoingui.cpp index 78a69af8b0..190da6caf8 100644 --- a/src/qt/bitcoingui.cpp +++ b/src/qt/bitcoingui.cpp @@ -44,7 +44,9 @@ #include #include #include +#if QT_VERSION < 0x050000 #include +#endif #include #include #include @@ -55,7 +57,7 @@ const QString BitcoinGUI::DEFAULT_WALLET = "~Default"; -BitcoinGUI::BitcoinGUI(QWidget *parent) : +BitcoinGUI::BitcoinGUI(bool fIsTestnet, QWidget *parent) : QMainWindow(parent), clientModel(0), encryptWalletAction(0), @@ -67,14 +69,30 @@ BitcoinGUI::BitcoinGUI(QWidget *parent) : prevBlocks(0) { restoreWindowGeometry(); - setWindowTitle(tr("Bitcoin") + " - " + tr("Wallet")); + #ifndef Q_OS_MAC - QApplication::setWindowIcon(QIcon(":icons/bitcoin")); - setWindowIcon(QIcon(":icons/bitcoin")); + if (!fIsTestnet) + { + setWindowTitle(tr("Bitcoin") + " - " + tr("Wallet")); + QApplication::setWindowIcon(QIcon(":icons/bitcoin")); + setWindowIcon(QIcon(":icons/bitcoin")); + } + else + { + setWindowTitle(tr("Bitcoin") + " - " + tr("Wallet") + " " + tr("[testnet]")); + QApplication::setWindowIcon(QIcon(":icons/bitcoin_testnet")); + setWindowIcon(QIcon(":icons/bitcoin_testnet")); + } #else setUnifiedTitleAndToolBarOnMac(true); QApplication::setAttribute(Qt::AA_DontShowIconsInMenus); + + if (!fIsTestnet) + MacDockIconHandler::instance()->setIcon(QIcon(":icons/bitcoin")); + else + MacDockIconHandler::instance()->setIcon(QIcon(":icons/bitcoin_testnet")); #endif + // Create wallet frame and make it the central widget walletFrame = new WalletFrame(this); setCentralWidget(walletFrame); @@ -84,7 +102,7 @@ BitcoinGUI::BitcoinGUI(QWidget *parent) : // Create actions for the toolbar, menu bar and tray/dock icon // Needs walletFrame to be initialized - createActions(); + createActions(fIsTestnet); // Create application menu bar createMenuBar(); @@ -93,7 +111,7 @@ BitcoinGUI::BitcoinGUI(QWidget *parent) : createToolBars(); // Create system tray icon and notification - createTrayIcon(); + createTrayIcon(fIsTestnet); // Create status bar statusBar(); @@ -157,7 +175,7 @@ BitcoinGUI::~BitcoinGUI() #endif } -void BitcoinGUI::createActions() +void BitcoinGUI::createActions(bool fIsTestnet) { QActionGroup *tabGroup = new QActionGroup(this); @@ -211,7 +229,10 @@ void BitcoinGUI::createActions() quitAction->setStatusTip(tr("Quit application")); quitAction->setShortcut(QKeySequence(Qt::CTRL + Qt::Key_Q)); quitAction->setMenuRole(QAction::QuitRole); - aboutAction = new QAction(QIcon(":/icons/bitcoin"), tr("&About Bitcoin"), this); + if (!fIsTestnet) + aboutAction = new QAction(QIcon(":/icons/bitcoin"), tr("&About Bitcoin"), this); + else + aboutAction = new QAction(QIcon(":/icons/bitcoin_testnet"), tr("&About Bitcoin"), this); aboutAction->setStatusTip(tr("Show information about Bitcoin")); aboutAction->setMenuRole(QAction::AboutRole); aboutQtAction = new QAction(QIcon(":/trolltech/qmessagebox/images/qtlogo-64.png"), tr("About &Qt"), this); @@ -220,7 +241,10 @@ void BitcoinGUI::createActions() optionsAction = new QAction(QIcon(":/icons/options"), tr("&Options..."), this); optionsAction->setStatusTip(tr("Modify configuration options for Bitcoin")); optionsAction->setMenuRole(QAction::PreferencesRole); - toggleHideAction = new QAction(QIcon(":/icons/bitcoin"), tr("&Show / Hide"), this); + if (!fIsTestnet) + toggleHideAction = new QAction(QIcon(":/icons/bitcoin"), tr("&Show / Hide"), this); + else + toggleHideAction = new QAction(QIcon(":/icons/bitcoin_testnet"), tr("&Show / Hide"), this); toggleHideAction->setStatusTip(tr("Show or hide the main Window")); encryptWalletAction = new QAction(QIcon(":/icons/lock_closed"), tr("&Encrypt Wallet..."), this); @@ -297,27 +321,6 @@ void BitcoinGUI::setClientModel(ClientModel *clientModel) this->clientModel = clientModel; if(clientModel) { - // Replace some strings and icons, when using the testnet - if(clientModel->isTestNet()) - { - setWindowTitle(windowTitle() + QString(" ") + tr("[testnet]")); -#ifndef Q_OS_MAC - QApplication::setWindowIcon(QIcon(":icons/bitcoin_testnet")); - setWindowIcon(QIcon(":icons/bitcoin_testnet")); -#else - MacDockIconHandler::instance()->setIcon(QIcon(":icons/bitcoin_testnet")); -#endif - if(trayIcon) - { - // Just attach " [testnet]" to the existing tooltip - trayIcon->setToolTip(trayIcon->toolTip() + QString(" ") + tr("[testnet]")); - trayIcon->setIcon(QIcon(":/icons/toolbar_testnet")); - } - - toggleHideAction->setIcon(QIcon(":/icons/toolbar_testnet")); - aboutAction->setIcon(QIcon(":/icons/toolbar_testnet")); - } - // Create system tray menu (or setup the dock menu) that late to prevent users from calling actions, // while the client has not yet fully loaded createTrayIconMenu(); @@ -352,13 +355,22 @@ void BitcoinGUI::removeAllWallets() walletFrame->removeAllWallets(); } -void BitcoinGUI::createTrayIcon() +void BitcoinGUI::createTrayIcon(bool fIsTestnet) { #ifndef Q_OS_MAC trayIcon = new QSystemTrayIcon(this); - trayIcon->setToolTip(tr("Bitcoin client")); - trayIcon->setIcon(QIcon(":/icons/toolbar")); + if (!fIsTestnet) + { + trayIcon->setToolTip(tr("Bitcoin client")); + trayIcon->setIcon(QIcon(":/icons/toolbar")); + } + else + { + trayIcon->setToolTip(tr("Bitcoin client") + " " + tr("[testnet]")); + trayIcon->setIcon(QIcon(":/icons/toolbar_testnet")); + } + trayIcon->show(); #endif diff --git a/src/qt/bitcoingui.h b/src/qt/bitcoingui.h index f361a62a41..685ce8b430 100644 --- a/src/qt/bitcoingui.h +++ b/src/qt/bitcoingui.h @@ -43,7 +43,7 @@ class BitcoinGUI : public QMainWindow public: static const QString DEFAULT_WALLET; - explicit BitcoinGUI(QWidget *parent = 0); + explicit BitcoinGUI(bool fIsTestnet = false, QWidget *parent = 0); ~BitcoinGUI(); /** Set the client model. @@ -113,13 +113,13 @@ private: int prevBlocks; /** Create the main UI actions. */ - void createActions(); + void createActions(bool fIsTestnet); /** Create the menu bar and sub-menus. */ void createMenuBar(); /** Create the toolbars */ void createToolBars(); /** Create system tray icon and notification */ - void createTrayIcon(); + void createTrayIcon(bool fIsTestnet); /** Create system tray menu (or setup the dock menu) */ void createTrayIconMenu(); /** Save window size and position */ diff --git a/src/qt/bitcoinstrings.cpp b/src/qt/bitcoinstrings.cpp index 4f3bb10642..4dae8999c3 100644 --- a/src/qt/bitcoinstrings.cpp +++ b/src/qt/bitcoinstrings.cpp @@ -33,9 +33,6 @@ QT_TRANSLATE_NOOP("bitcoin-core", "" "Cannot obtain a lock on data directory %s. Bitcoin is probably already " "running."), QT_TRANSLATE_NOOP("bitcoin-core", "" -"Error initializing database environment %s! To recover, BACKUP THAT " -"DIRECTORY, then remove everything from it except for wallet.dat."), -QT_TRANSLATE_NOOP("bitcoin-core", "" "Error: The transaction was rejected! This might happen if some of the coins " "in your wallet were already spent, such as if you used a copy of wallet.dat " "and coins were spent in the copy but not marked as spent here."), @@ -60,7 +57,8 @@ QT_TRANSLATE_NOOP("bitcoin-core", "" "Set maximum size of high-priority/low-fee transactions in bytes (default: " "27000)"), QT_TRANSLATE_NOOP("bitcoin-core", "" -"Set the number of script verification threads (1-16, 0=auto, default: 0)"), +"Set the number of script verification threads (up to 16, 0 = auto, <0 = " +"leave that many cores free, default: 0)"), QT_TRANSLATE_NOOP("bitcoin-core", "" "This is a pre-release test build - use at your own risk - do not use for " "mining or merchant applications"), @@ -96,7 +94,6 @@ QT_TRANSLATE_NOOP("bitcoin-core", "Attempt to recover private keys from a corrup QT_TRANSLATE_NOOP("bitcoin-core", "Bitcoin version"), QT_TRANSLATE_NOOP("bitcoin-core", "Block creation options:"), QT_TRANSLATE_NOOP("bitcoin-core", "Cannot downgrade wallet"), -QT_TRANSLATE_NOOP("bitcoin-core", "Cannot initialize keypool"), QT_TRANSLATE_NOOP("bitcoin-core", "Cannot resolve -bind address: '%s'"), QT_TRANSLATE_NOOP("bitcoin-core", "Cannot resolve -externalip address: '%s'"), QT_TRANSLATE_NOOP("bitcoin-core", "Cannot write default address"), @@ -106,7 +103,6 @@ QT_TRANSLATE_NOOP("bitcoin-core", "Connect to a node to retrieve peer addresses, QT_TRANSLATE_NOOP("bitcoin-core", "Corrupted block database detected"), QT_TRANSLATE_NOOP("bitcoin-core", "Discover own IP address (default: 1 when listening and no -externalip)"), QT_TRANSLATE_NOOP("bitcoin-core", "Do you want to rebuild the block database now?"), -QT_TRANSLATE_NOOP("bitcoin-core", "Don't generate coins"), QT_TRANSLATE_NOOP("bitcoin-core", "Done loading"), QT_TRANSLATE_NOOP("bitcoin-core", "Error initializing block database"), QT_TRANSLATE_NOOP("bitcoin-core", "Error initializing wallet database environment %s!"), @@ -117,7 +113,6 @@ QT_TRANSLATE_NOOP("bitcoin-core", "Error loading wallet.dat: Wallet requires new QT_TRANSLATE_NOOP("bitcoin-core", "Error opening block database"), QT_TRANSLATE_NOOP("bitcoin-core", "Error"), QT_TRANSLATE_NOOP("bitcoin-core", "Error: Disk space is low!"), -QT_TRANSLATE_NOOP("bitcoin-core", "Error: Transaction creation failed!"), QT_TRANSLATE_NOOP("bitcoin-core", "Error: Wallet locked, unable to create transaction!"), QT_TRANSLATE_NOOP("bitcoin-core", "Error: system error: "), QT_TRANSLATE_NOOP("bitcoin-core", "Failed to listen on any port. Use -listen=0 if you want this."), @@ -133,7 +128,7 @@ QT_TRANSLATE_NOOP("bitcoin-core", "Failed to write transaction index"), QT_TRANSLATE_NOOP("bitcoin-core", "Failed to write undo data"), QT_TRANSLATE_NOOP("bitcoin-core", "Fee per KB to add to transactions you send"), QT_TRANSLATE_NOOP("bitcoin-core", "Find peers using DNS lookup (default: 1 unless -connect)"), -QT_TRANSLATE_NOOP("bitcoin-core", "Generate coins"), +QT_TRANSLATE_NOOP("bitcoin-core", "Generate coins (default: 0)"), QT_TRANSLATE_NOOP("bitcoin-core", "Get help for a command"), QT_TRANSLATE_NOOP("bitcoin-core", "How many blocks to check at startup (default: 288, 0 = all)"), QT_TRANSLATE_NOOP("bitcoin-core", "How thorough the block verification is (0-4, default: 3)"), @@ -142,6 +137,8 @@ QT_TRANSLATE_NOOP("bitcoin-core", "Information"), QT_TRANSLATE_NOOP("bitcoin-core", "Insufficient funds"), QT_TRANSLATE_NOOP("bitcoin-core", "Invalid -proxy address: '%s'"), QT_TRANSLATE_NOOP("bitcoin-core", "Invalid -tor address: '%s'"), +QT_TRANSLATE_NOOP("bitcoin-core", "Invalid amount for -minrelaytxfee=: '%s'"), +QT_TRANSLATE_NOOP("bitcoin-core", "Invalid amount for -mintxfee=: '%s'"), QT_TRANSLATE_NOOP("bitcoin-core", "Invalid amount for -paytxfee=: '%s'"), QT_TRANSLATE_NOOP("bitcoin-core", "Invalid amount"), QT_TRANSLATE_NOOP("bitcoin-core", "List commands"), @@ -153,6 +150,7 @@ QT_TRANSLATE_NOOP("bitcoin-core", "Maintain a full transaction index (default: 0 QT_TRANSLATE_NOOP("bitcoin-core", "Maintain at most connections to peers (default: 125)"), QT_TRANSLATE_NOOP("bitcoin-core", "Maximum per-connection receive buffer, *1000 bytes (default: 5000)"), QT_TRANSLATE_NOOP("bitcoin-core", "Maximum per-connection send buffer, *1000 bytes (default: 1000)"), +QT_TRANSLATE_NOOP("bitcoin-core", "Not enough file descriptors available."), QT_TRANSLATE_NOOP("bitcoin-core", "Only accept block chain matching built-in checkpoints (default: 1)"), QT_TRANSLATE_NOOP("bitcoin-core", "Only connect to nodes in network (IPv4, IPv6 or Tor)"), QT_TRANSLATE_NOOP("bitcoin-core", "Options:"), @@ -178,6 +176,7 @@ QT_TRANSLATE_NOOP("bitcoin-core", "Set maximum block size in bytes (default: 250 QT_TRANSLATE_NOOP("bitcoin-core", "Set minimum block size in bytes (default: 0)"), QT_TRANSLATE_NOOP("bitcoin-core", "Set the number of threads to service RPC calls (default: 4)"), QT_TRANSLATE_NOOP("bitcoin-core", "Shrink debug.log file on client startup (default: 1 when no -debug)"), +QT_TRANSLATE_NOOP("bitcoin-core", "Signing transaction failed"), QT_TRANSLATE_NOOP("bitcoin-core", "Specify configuration file (default: bitcoin.conf)"), QT_TRANSLATE_NOOP("bitcoin-core", "Specify connection timeout in milliseconds (default: 5000)"), QT_TRANSLATE_NOOP("bitcoin-core", "Specify data directory"), @@ -187,6 +186,9 @@ QT_TRANSLATE_NOOP("bitcoin-core", "System error: "), QT_TRANSLATE_NOOP("bitcoin-core", "This help message"), QT_TRANSLATE_NOOP("bitcoin-core", "Threshold for disconnecting misbehaving peers (default: 100)"), QT_TRANSLATE_NOOP("bitcoin-core", "To use the %s option"), +QT_TRANSLATE_NOOP("bitcoin-core", "Transaction amount too small"), +QT_TRANSLATE_NOOP("bitcoin-core", "Transaction amounts must be positive"), +QT_TRANSLATE_NOOP("bitcoin-core", "Transaction too large"), QT_TRANSLATE_NOOP("bitcoin-core", "Unable to bind to %s on this computer (bind returned error %d, %s)"), QT_TRANSLATE_NOOP("bitcoin-core", "Unknown -socks proxy version requested: %i"), QT_TRANSLATE_NOOP("bitcoin-core", "Unknown network specified in -onlynet: '%s'"), diff --git a/src/qt/guiutil.cpp b/src/qt/guiutil.cpp index d7d59fc880..88a6e7226e 100644 --- a/src/qt/guiutil.cpp +++ b/src/qt/guiutil.cpp @@ -13,8 +13,12 @@ #include #include #include +#if QT_VERSION >= 0x050000 +#include +#else #include -#include // For Qt::escape +#endif +#include // for Qt::mightBeRichText #include #include #include @@ -86,7 +90,13 @@ bool parseBitcoinURI(const QUrl &uri, SendCoinsRecipient *out) SendCoinsRecipient rv; rv.address = uri.path(); rv.amount = 0; + +#if QT_VERSION < 0x050000 QList > items = uri.queryItems(); +#else + QUrlQuery uriQuery(uri); + QList > items = uriQuery.queryItems(); +#endif for (QList >::iterator i = items.begin(); i != items.end(); i++) { bool fShouldReturnFalse = false; @@ -139,7 +149,11 @@ bool parseBitcoinURI(QString uri, SendCoinsRecipient *out) QString HtmlEscape(const QString& str, bool fMultiLine) { +#if QT_VERSION < 0x050000 QString escaped = Qt::escape(str); +#else + QString escaped = str.toHtmlEscaped(); +#endif if(fMultiLine) { escaped = escaped.replace("\n", "
\n"); @@ -176,7 +190,11 @@ QString getSaveFileName(QWidget *parent, const QString &caption, QString myDir; if(dir.isEmpty()) // Default to user documents location { +#if QT_VERSION < 0x050000 myDir = QDesktopServices::storageLocation(QDesktopServices::DocumentsLocation); +#else + myDir = QStandardPaths::writableLocation(QStandardPaths::DocumentsLocation); +#endif } else { diff --git a/src/qt/locale/bitcoin_af_ZA.ts b/src/qt/locale/bitcoin_af_ZA.ts new file mode 100644 index 0000000000..029b91a7a0 --- /dev/null +++ b/src/qt/locale/bitcoin_af_ZA.ts @@ -0,0 +1,2917 @@ + +UTF-8 + + AboutDialog + + + About Bitcoin + + + + + <b>Bitcoin</b> version + <b>Bitcoin</b> weergawe + + + + +This is experimental software. + +Distributed under the MIT/X11 software license, see the accompanying file COPYING or http://www.opensource.org/licenses/mit-license.php. + +This product includes software developed by the OpenSSL Project for use in the OpenSSL Toolkit (http://www.openssl.org/) and cryptographic software written by Eric Young (eay@cryptsoft.com) and UPnP software written by Thomas Bernard. + + + + + Copyright + + + + + The Bitcoin developers + + + + + AddressBookPage + + + Address Book + Adres Boek + + + + Double-click to edit address or label + Dubbel-klik om die adres of etiket te wysig + + + + Create a new address + Skep 'n nuwe adres + + + + Copy the currently selected address to the system clipboard + Maak 'n kopie van die huidige adres na die stelsel klipbord + + + + &New Address + + + + + These are your Bitcoin addresses for receiving payments. You may want to give a different one to each sender so you can keep track of who is paying you. + + + + + &Copy Address + + + + + Show &QR Code + + + + + Sign a message to prove you own a Bitcoin address + + + + + Sign &Message + Teken &Boodskap + + + + Delete the currently selected address from the list + + + + + Export the data in the current tab to a file + + + + + &Export + + + + + Verify a message to ensure it was signed with a specified Bitcoin address + + + + + &Verify Message + + + + + &Delete + &Verwyder + + + + These are your Bitcoin addresses for sending payments. Always check the amount and the receiving address before sending coins. + + + + + Copy &Label + + + + + &Edit + + + + + Send &Coins + Stuur &Muntstukke + + + + Export Address Book Data + Voer die Adresboek Data Uit + + + + Comma separated file (*.csv) + + + + + Error exporting + Fout uitvoering + + + + Could not write to file %1. + Kon nie na die %1 lêer skryf nie + + + + AddressTableModel + + + Label + Etiket + + + + Address + Adres + + + + (no label) + (geen etiket) + + + + AskPassphraseDialog + + + Passphrase Dialog + + + + + Enter passphrase + Tik Wagwoord in + + + + New passphrase + Nuwe wagwoord + + + + Repeat new passphrase + Herhaal nuwe wagwoord + + + + Enter the new passphrase to the wallet.<br/>Please use a passphrase of <b>10 or more random characters</b>, or <b>eight or more words</b>. + 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> + + + + Encrypt wallet + Enkripteer beursie + + + + This operation needs your wallet passphrase to unlock the wallet. + Hierdie operasie benodig 'n wagwoord om die beursie oop te sluit. + + + + Unlock wallet + Sluit beursie oop + + + + This operation needs your wallet passphrase to decrypt the wallet. + Hierdie operasie benodig 'n wagwoord om die beursie oop te sluit. + + + + Decrypt wallet + Sluit beursie oop + + + + Change passphrase + Verander wagwoord + + + + Enter the old and new passphrase to the wallet. + Tik asseblief die ou en nuwe wagwoord vir die beursie in. + + + + Confirm wallet encryption + Bevestig beursie enkripsie. + + + + Warning: If you encrypt your wallet and lose your passphrase, you will <b>LOSE ALL OF YOUR BITCOINS</b>! + + + + + Are you sure you wish to encrypt your wallet? + + + + + 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. + + + + + + Warning: The Caps Lock key is on! + + + + + + Wallet encrypted + Die beursie is nou bewaak + + + + Bitcoin will close now to finish the encryption process. Remember that encrypting your wallet cannot fully protect your bitcoins from being stolen by malware infecting your computer. + + + + + + + + Wallet encryption failed + Die beursie kon nie bewaak word nie + + + + Wallet encryption failed due to an internal error. Your wallet was not encrypted. + Beursie bewaaking het misluk as gevolg van 'n interne fout. Die beursie is nie bewaak nie! + + + + + The supplied passphrases do not match. + Die wagwoord stem nie ooreen nie + + + + Wallet unlock failed + Beursie oopsluiting het misluk + + + + + + The passphrase entered for the wallet decryption was incorrect. + Die wagwoord wat ingetik was om die beursie oop te sluit, was verkeerd. + + + + Wallet decryption failed + Beursie dekripsie het misluk + + + + Wallet passphrase was successfully changed. + + + + + BitcoinGUI + + + Sign &message... + + + + + Synchronizing with network... + Sinchroniseer met die netwerk ... + + + + &Overview + &Oorsig + + + + Show general overview of wallet + Wys algemene oorsig van die beursie + + + + &Transactions + &Transaksies + + + + Browse transaction history + Besoek transaksie geskiedenis + + + + Edit the list of stored addresses and labels + Wysig die lys van gestoorde adresse en etikette + + + + Show the list of addresses for receiving payments + Wys die lys van adresse vir die ontvangs van betalings + + + + E&xit + S&luit af + + + + Quit application + Sluit af + + + + Show information about Bitcoin + Wys inligting oor Bitcoin + + + + About &Qt + + + + + Show information about Qt + + + + + &Options... + &Opsies + + + + &Encrypt Wallet... + + + + + &Backup Wallet... + + + + + &Change Passphrase... + + + + + Importing blocks from disk... + + + + + Reindexing blocks on disk... + + + + + Send coins to a Bitcoin address + + + + + Modify configuration options for Bitcoin + + + + + Backup wallet to another location + + + + + Change the passphrase used for wallet encryption + + + + + &Debug window + + + + + Open debugging and diagnostic console + + + + + &Verify message... + + + + + + Bitcoin + Bitcoin + + + + Wallet + Beursie + + + + &Send + + + + + &Receive + + + + + &Addresses + + + + + &About Bitcoin + + + + + &Show / Hide + + + + + Show or hide the main Window + + + + + Encrypt the private keys that belong to your wallet + + + + + Sign messages with your Bitcoin addresses to prove you own them + + + + + Verify messages to ensure they were signed with specified Bitcoin addresses + + + + + &File + &Lêer + + + + &Settings + &Instellings + + + + &Help + &Hulp + + + + Tabs toolbar + Blad nutsbalk + + + + + [testnet] + + + + + Bitcoin client + + + + + %n active connection(s) to Bitcoin network + + + + + No block source available... + + + + + Processed %1 of %2 (estimated) blocks of transaction history. + + + + + Processed %1 blocks of transaction history. + + + + + %n hour(s) + + + + + %n day(s) + + + + + %n week(s) + + + + + %1 behind + %1 agter + + + + Last received block was generated %1 ago. + Ontvangs van laaste blok is %1 terug. + + + + Transactions after this will not yet be visible. + + + + + Error + Fout + + + + Warning + + + + + Information + Informasie + + + + This transaction is over the size limit. You can still send it for a fee of %1, which goes to the nodes that process your transaction and helps to support the network. Do you want to pay the fee? + + + + + Up to date + + + + + Catching up... + + + + + Confirm transaction fee + + + + + Sent transaction + + + + + Incoming transaction + + + + + Date: %1 +Amount: %2 +Type: %3 +Address: %4 + + + + + + + URI handling + + + + + + URI can not be parsed! This can be caused by an invalid Bitcoin address or malformed URI parameters. + + + + + Wallet is <b>encrypted</b> and currently <b>unlocked</b> + + + + + Wallet is <b>encrypted</b> and currently <b>locked</b> + + + + + A fatal error occurred. Bitcoin can no longer continue safely and will quit. + + + + + ClientModel + + + Network Alert + + + + + EditAddressDialog + + + Edit Address + + + + + &Label + + + + + The label associated with this address book entry + + + + + &Address + + + + + The address associated with this address book entry. This can only be modified for sending addresses. + + + + + New receiving address + + + + + New sending address + + + + + Edit receiving address + + + + + Edit sending address + + + + + The entered address "%1" is already in the address book. + + + + + The entered address "%1" is not a valid Bitcoin address. + + + + + Could not unlock wallet. + + + + + New key generation failed. + + + + + GUIUtil::HelpMessageBox + + + + Bitcoin-Qt + + + + + version + + + + + Usage: + Gebruik: + + + + command-line options + + + + + UI options + + + + + Set language, for example "de_DE" (default: system locale) + + + + + Start minimized + + + + + Show splash screen on startup (default: 1) + + + + + OptionsDialog + + + Options + + + + + &Main + + + + + Optional transaction fee per kB that helps make sure your transactions are processed quickly. Most transactions are 1 kB. + + + + + Pay transaction &fee + + + + + Automatically start Bitcoin after logging in to the system. + + + + + &Start Bitcoin on system login + + + + + Reset all client options to default. + + + + + &Reset Options + + + + + &Network + + + + + Automatically open the Bitcoin client port on the router. This only works when your router supports UPnP and it is enabled. + + + + + Map port using &UPnP + + + + + Connect to the Bitcoin network through a SOCKS proxy (e.g. when connecting through Tor). + + + + + &Connect through SOCKS proxy: + + + + + Proxy &IP: + + + + + IP address of the proxy (e.g. 127.0.0.1) + + + + + &Port: + + + + + Port of the proxy (e.g. 9050) + + + + + SOCKS &Version: + + + + + SOCKS version of the proxy (e.g. 5) + + + + + &Window + + + + + Show only a tray icon after minimizing the window. + + + + + &Minimize to the tray instead of the taskbar + + + + + Minimize instead of exit the application when the window is closed. When this option is enabled, the application will be closed only after selecting Quit in the menu. + + + + + M&inimize on close + + + + + &Display + + + + + User Interface &language: + + + + + The user interface language can be set here. This setting will take effect after restarting Bitcoin. + + + + + &Unit to show amounts in: + + + + + Choose the default subdivision unit to show in the interface and when sending coins. + + + + + Whether to show Bitcoin addresses in the transaction list or not. + + + + + &Display addresses in transaction list + + + + + &OK + + + + + &Cancel + + + + + &Apply + + + + + default + + + + + Confirm options reset + + + + + Some settings may require a client restart to take effect. + + + + + Do you want to proceed? + + + + + + Warning + + + + + + This setting will take effect after restarting Bitcoin. + + + + + The supplied proxy address is invalid. + + + + + OverviewPage + + + Form + + + + + + 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. + + + + + Balance: + + + + + Unconfirmed: + + + + + Wallet + Beursie + + + + Immature: + + + + + Mined balance that has not yet matured + + + + + <b>Recent transactions</b> + + + + + Your current balance + + + + + Total of transactions that have yet to be confirmed, and do not yet count toward the current balance + + + + + + out of sync + + + + + PaymentServer + + + Cannot start bitcoin: click-to-pay handler + + + + + QRCodeDialog + + + QR Code Dialog + + + + + Request Payment + + + + + Amount: + + + + + Label: + + + + + Message: + + + + + &Save As... + + + + + Error encoding URI into QR Code. + + + + + The entered amount is invalid, please check. + + + + + Resulting URI too long, try to reduce the text for label / message. + + + + + Save QR Code + + + + + PNG Images (*.png) + + + + + RPCConsole + + + Client name + + + + + + + + + + + + + + N/A + + + + + Client version + + + + + &Information + + + + + Using OpenSSL version + + + + + Startup time + + + + + Network + + + + + Number of connections + + + + + On testnet + + + + + Block chain + + + + + Current number of blocks + + + + + Estimated total blocks + + + + + Last block time + + + + + &Open + + + + + Command-line options + + + + + Show the Bitcoin-Qt help message to get a list with possible Bitcoin command-line options. + + + + + &Show + + + + + &Console + + + + + Build date + + + + + Bitcoin - Debug window + + + + + Bitcoin Core + + + + + Debug log file + + + + + Open the Bitcoin debug log file from the current data directory. This can take a few seconds for large log files. + + + + + Clear console + + + + + Welcome to the Bitcoin RPC console. + + + + + Use up and down arrows to navigate history, and <b>Ctrl-L</b> to clear screen. + + + + + Type <b>help</b> for an overview of available commands. + + + + + SendCoinsDialog + + + + + + + + + + Send Coins + + + + + Send to multiple recipients at once + + + + + Add &Recipient + + + + + Remove all transaction fields + + + + + Clear &All + + + + + Balance: + + + + + 123.456 BTC + + + + + Confirm the send action + + + + + S&end + S&tuur + + + + <b>%1</b> to %2 (%3) + + + + + Confirm send coins + + + + + Are you sure you want to send %1? + + + + + and + + + + + The recipient address is not valid, please recheck. + + + + + The amount to pay must be larger than 0. + + + + + The amount exceeds your balance. + + + + + The total exceeds your balance when the %1 transaction fee is included. + + + + + Duplicate address found, can only send to each address once per send operation. + + + + + Error: Transaction creation failed! + + + + + Error: The transaction was rejected. This might happen if some of the coins in your wallet were already spent, such as if you used a copy of wallet.dat and coins were spent in the copy but not marked as spent here. + + + + + SendCoinsEntry + + + Form + + + + + A&mount: + + + + + Pay &To: + + + + + The address to send the payment to (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L) + Die adres waarheen die betaling gestuur moet word (b.v. 1H7wyVL5HCNoVFyyBJSDojwyxcCChU7TPA) + + + + + Enter a label for this address to add it to your address book + + + + + &Label: + + + + + Choose address from address book + + + + + Alt+A + + + + + Paste address from clipboard + + + + + Alt+P + + + + + Remove this recipient + + + + + Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L) + + + + + SignVerifyMessageDialog + + + Signatures - Sign / Verify a Message + + + + + &Sign Message + &Teken boodskap + + + + You can sign messages with your addresses to prove you own them. Be careful not to sign anything vague, as phishing attacks may try to trick you into signing your identity over to them. Only sign fully-detailed statements you agree to. + + + + + The address to sign the message with (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L) + + + + + + Choose an address from the address book + + + + + + Alt+A + + + + + Paste address from clipboard + + + + + Alt+P + + + + + Enter the message you want to sign here + + + + + Signature + Handtekening + + + + Copy the current signature to the system clipboard + + + + + Sign the message to prove you own this Bitcoin address + + + + + Sign &Message + Teken &Boodskap + + + + Reset all sign message fields + + + + + + Clear &All + + + + + &Verify Message + + + + + Enter the signing address, message (ensure you copy line breaks, spaces, tabs, etc. exactly) and signature below to verify the message. Be careful not to read more into the signature than what is in the signed message itself, to avoid being tricked by a man-in-the-middle attack. + + + + + The address the message was signed with (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L) + + + + + Verify the message to ensure it was signed with the specified Bitcoin address + + + + + Verify &Message + + + + + Reset all verify message fields + + + + + + Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L) + + + + + Click "Sign Message" to generate signature + + + + + Enter Bitcoin signature + + + + + + The entered address is invalid. + + + + + + + + Please check the address and try again. + + + + + + The entered address does not refer to a key. + + + + + Wallet unlock was cancelled. + + + + + Private key for the entered address is not available. + + + + + Message signing failed. + + + + + Message signed. + + + + + The signature could not be decoded. + + + + + + Please check the signature and try again. + + + + + The signature did not match the message digest. + + + + + Message verification failed. + + + + + Message verified. + + + + + SplashScreen + + + The Bitcoin developers + + + + + [testnet] + + + + + TransactionDesc + + + Open until %1 + + + + + %1/offline + + + + + %1/unconfirmed + + + + + %1 confirmations + + + + + Status + + + + + , broadcast through %n node(s) + + + + + Date + Datum + + + + Source + + + + + Generated + + + + + + From + Van + + + + + + To + Na + + + + + own address + eie adres + + + + label + etiket + + + + + + + + Credit + Krediet + + + + matures in %n more block(s) + + + + + not accepted + nie aanvaar nie + + + + + + + Debit + Debiet + + + + Transaction fee + Transaksie fooi + + + + Net amount + Netto bedrag + + + + Message + Boodskap + + + + Comment + + + + + Transaction ID + Transaksie ID + + + + Generated coins must mature 120 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. + + + + + Debug information + + + + + Transaction + + + + + Inputs + + + + + Amount + Bedrag + + + + true + waar + + + + false + onwaar + + + + , has not been successfully broadcast yet + + + + + Open for %n more block(s) + + + + + unknown + + + + + TransactionDescDialog + + + Transaction details + + + + + This pane shows a detailed description of the transaction + + + + + TransactionTableModel + + + Date + Datum + + + + Type + Tipe + + + + Address + Adres + + + + Amount + Bedrag + + + + Open for %n more block(s) + + + + + Open until %1 + + + + + Offline (%1 confirmations) + + + + + Unconfirmed (%1 of %2 confirmations) + + + + + Confirmed (%1 confirmations) + + + + + Mined balance will be available when it matures in %n more block(s) + + + + + This block was not received by any other nodes and will probably not be accepted! + + + + + Generated but not accepted + + + + + Received with + Ontvang met + + + + Received from + + + + + Sent to + Gestuur na + + + + Payment to yourself + + + + + Mined + Gemyn + + + + (n/a) + (n.v.t) + + + + Transaction status. Hover over this field to show number of confirmations. + + + + + Date and time that the transaction was received. + Datum en tyd wat die transaksie ontvang was. + + + + Type of transaction. + Tipe transaksie. + + + + Destination address of transaction. + + + + + Amount removed from or added to balance. + + + + + TransactionView + + + + All + Alles + + + + Today + Vandag + + + + This week + Hierdie week + + + + This month + Hierdie maand + + + + Last month + Verlede maand + + + + This year + Hierdie jaar + + + + Range... + + + + + Received with + Ontvang met + + + + Sent to + Gestuur na + + + + To yourself + Aan/na jouself + + + + Mined + Gemyn + + + + Other + Ander + + + + Enter address or label to search + + + + + Min amount + Min bedrag + + + + Copy address + Maak kopie van adres + + + + Copy label + + + + + Copy amount + + + + + Copy transaction ID + + + + + Edit label + + + + + Show transaction details + + + + + Export Transaction Data + + + + + Comma separated file (*.csv) + + + + + Confirmed + + + + + Date + Datum + + + + Type + Tipe + + + + Label + Etiket + + + + Address + Adres + + + + Amount + Bedrag + + + + ID + ID + + + + Error exporting + Fout uitvoering + + + + Could not write to file %1. + Kon nie na die %1 lêer skryf nie + + + + Range: + + + + + to + + + + + WalletModel + + + Send Coins + + + + + WalletView + + + &Export + + + + + Export the data in the current tab to a file + + + + + Backup Wallet + + + + + Wallet Data (*.dat) + + + + + Backup Failed + + + + + There was an error trying to save the wallet data to the new location. + + + + + Backup Successful + + + + + The wallet data was successfully saved to the new location. + + + + + bitcoin-core + + + Bitcoin version + Bitcoin weergawe + + + + Usage: + Gebruik: + + + + Send command to -server or bitcoind + + + + + List commands + + + + + Get help for a command + + + + + Options: + + + + + Specify configuration file (default: bitcoin.conf) + + + + + Specify pid file (default: bitcoind.pid) + + + + + Specify data directory + + + + + Set database cache size in megabytes (default: 25) + + + + + Listen for connections on <port> (default: 8333 or testnet: 18333) + + + + + Maintain at most <n> connections to peers (default: 125) + + + + + Connect to a node to retrieve peer addresses, and disconnect + + + + + Specify your own public address + + + + + Threshold for disconnecting misbehaving peers (default: 100) + + + + + Number of seconds to keep misbehaving peers from reconnecting (default: 86400) + + + + + An error occurred while setting up the RPC port %u for listening on IPv4: %s + + + + + Listen for JSON-RPC connections on <port> (default: 8332 or testnet: 18332) + + + + + Accept command line and JSON-RPC commands + + + + + Run in the background as a daemon and accept commands + + + + + Use the test network + + + + + Accept connections from outside (default: 1 if no -proxy or -connect) + + + + + %s, you must set a rpcpassword in the configuration file: +%s +It is recommended you use the following random password: +rpcuser=bitcoinrpc +rpcpassword=%s +(you do not need to remember this password) +The username and password MUST NOT be the same. +If the file does not exist, create it with owner-readable-only file permissions. +It is also recommended to set alertnotify so you are notified of problems; +for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com + + + + + + An error occurred while setting up the RPC port %u for listening on IPv6, falling back to IPv4: %s + + + + + Bind to given address and always listen on it. Use [host]:port notation for IPv6 + + + + + Cannot obtain a lock on data directory %s. Bitcoin is probably already running. + + + + + Error: The transaction was rejected! This might happen if some of the coins in your wallet were already spent, such as if you used a copy of wallet.dat and coins were spent in the copy but not marked as spent here. + + + + + Error: This transaction requires a transaction fee of at least %s because of its amount, complexity, or use of recently received funds! + + + + + Execute command when a relevant alert is received (%s in cmd is replaced by message) + + + + + Execute command when a wallet transaction changes (%s in cmd is replaced by TxID) + + + + + Set maximum size of high-priority/low-fee transactions in bytes (default: 27000) + + + + + This is a pre-release test build - use at your own risk - do not use for mining or merchant applications + + + + + Warning: -paytxfee is set very high! This is the transaction fee you will pay if you send a transaction. + + + + + Warning: Displayed transactions may not be correct! You may need to upgrade, or other nodes may need to upgrade. + + + + + Warning: Please check that your computer's date and time are correct! If your clock is wrong Bitcoin will not work properly. + + + + + Warning: error reading wallet.dat! All keys read correctly, but transaction data or address book entries might be missing or incorrect. + + + + + Warning: wallet.dat corrupt, data salvaged! Original wallet.dat saved as wallet.{timestamp}.bak in %s; if your balance or transactions are incorrect you should restore from a backup. + + + + + Attempt to recover private keys from a corrupt wallet.dat + + + + + Block creation options: + + + + + Connect only to the specified node(s) + + + + + Corrupted block database detected + + + + + Discover own IP address (default: 1 when listening and no -externalip) + + + + + Do you want to rebuild the block database now? + + + + + Error initializing block database + + + + + Error initializing wallet database environment %s! + + + + + Error loading block database + + + + + Error opening block database + + + + + Error: Disk space is low! + Fout: Hardeskyf spasie is baie laag! + + + + Error: Wallet locked, unable to create transaction! + + + + + Error: system error: + + + + + Failed to listen on any port. Use -listen=0 if you want this. + + + + + Failed to read block info + + + + + Failed to read block + + + + + Failed to sync block index + + + + + Failed to write block index + + + + + Failed to write block info + + + + + Failed to write block + + + + + Failed to write file info + + + + + Failed to write to coin database + + + + + Failed to write transaction index + + + + + Failed to write undo data + + + + + Find peers using DNS lookup (default: 1 unless -connect) + + + + + Generate coins (default: 0) + + + + + How many blocks to check at startup (default: 288, 0 = all) + + + + + How thorough the block verification is (0-4, default: 3) + + + + + Not enough file descriptors available. + + + + + Rebuild block chain index from current blk000??.dat files + + + + + Set the number of threads to service RPC calls (default: 4) + + + + + Verifying blocks... + + + + + Verifying wallet... + + + + + Imports blocks from external blk000??.dat file + + + + + Set the number of script verification threads (up to 16, 0 = auto, <0 = leave that many cores free, default: 0) + + + + + Information + Informasie + + + + Invalid -tor address: '%s' + + + + + Invalid amount for -minrelaytxfee=<amount>: '%s' + + + + + Invalid amount for -mintxfee=<amount>: '%s' + + + + + Maintain a full transaction index (default: 0) + + + + + Maximum per-connection receive buffer, <n>*1000 bytes (default: 5000) + + + + + Maximum per-connection send buffer, <n>*1000 bytes (default: 1000) + + + + + Only accept block chain matching built-in checkpoints (default: 1) + + + + + Only connect to nodes in network <net> (IPv4, IPv6 or Tor) + + + + + Output extra debugging information. Implies all other -debug* options + + + + + Output extra network debugging information + + + + + Prepend debug output with timestamp + + + + + SSL options: (see the Bitcoin Wiki for SSL setup instructions) + + + + + Select the version of socks proxy to use (4-5, default: 5) + + + + + Send trace/debug info to console instead of debug.log file + + + + + Send trace/debug info to debugger + + + + + Set maximum block size in bytes (default: 250000) + + + + + Set minimum block size in bytes (default: 0) + + + + + Shrink debug.log file on client startup (default: 1 when no -debug) + + + + + Signing transaction failed + + + + + Specify connection timeout in milliseconds (default: 5000) + + + + + System error: + Sisteem fout: + + + + Transaction amount too small + + + + + Transaction amounts must be positive + + + + + Transaction too large + + + + + Use UPnP to map the listening port (default: 0) + + + + + Use UPnP to map the listening port (default: 1 when listening) + + + + + Use proxy to reach tor hidden services (default: same as -proxy) + + + + + Username for JSON-RPC connections + + + + + Warning + + + + + Warning: This version is obsolete, upgrade required! + + + + + You need to rebuild the databases using -reindex to change -txindex + + + + + wallet.dat corrupt, salvage failed + + + + + Password for JSON-RPC connections + + + + + Allow JSON-RPC connections from specified IP address + + + + + Send commands to node running on <ip> (default: 127.0.0.1) + + + + + Execute command when the best block changes (%s in cmd is replaced by block hash) + + + + + Upgrade wallet to latest format + + + + + Set key pool size to <n> (default: 100) + + + + + Rescan the block chain for missing wallet transactions + + + + + Use OpenSSL (https) for JSON-RPC connections + + + + + Server certificate file (default: server.cert) + + + + + Server private key (default: server.pem) + + + + + Acceptable ciphers (default: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH) + + + + + This help message + + + + + Unable to bind to %s on this computer (bind returned error %d, %s) + + + + + Connect through socks proxy + + + + + Allow DNS lookups for -addnode, -seednode and -connect + + + + + Loading addresses... + Laai adresse... + + + + Error loading wallet.dat: Wallet corrupted + + + + + Error loading wallet.dat: Wallet requires newer version of Bitcoin + + + + + Wallet needed to be rewritten: restart Bitcoin to complete + + + + + Error loading wallet.dat + + + + + Invalid -proxy address: '%s' + + + + + Unknown network specified in -onlynet: '%s' + + + + + Unknown -socks proxy version requested: %i + + + + + Cannot resolve -bind address: '%s' + + + + + Cannot resolve -externalip address: '%s' + + + + + Invalid amount for -paytxfee=<amount>: '%s' + + + + + Invalid amount + + + + + Insufficient funds + + + + + Loading block index... + Laai blok indeks... + + + + Add a node to connect to and attempt to keep the connection open + + + + + Unable to bind to %s on this computer. Bitcoin is probably already running. + + + + + Fee per KB to add to transactions you send + + + + + Loading wallet... + Laai beursie... + + + + Cannot downgrade wallet + + + + + Cannot write default address + + + + + Rescanning... + + + + + Done loading + Klaar gelaai + + + + To use the %s option + + + + + Error + Fout + + + + You must set rpcpassword=<password> in the configuration file: +%s +If the file does not exist, create it with owner-readable-only file permissions. + + + + \ No newline at end of file diff --git a/src/qt/locale/bitcoin_se.ts b/src/qt/locale/bitcoin_ar.ts similarity index 93% rename from src/qt/locale/bitcoin_se.ts rename to src/qt/locale/bitcoin_ar.ts index ef468f74b4..741a25a4da 100644 --- a/src/qt/locale/bitcoin_se.ts +++ b/src/qt/locale/bitcoin_ar.ts @@ -1,16 +1,16 @@ - + UTF-8 AboutDialog About Bitcoin - + عن Bitcoin <b>Bitcoin</b> version - + نسخة <b>Bitcoin</b> @@ -23,13 +23,13 @@ This product includes software developed by the OpenSSL Project for use in the O - + Copyright - 2009-%1 The Bitcoin developers + The Bitcoin developers @@ -38,22 +38,22 @@ This product includes software developed by the OpenSSL Project for use in the O Address Book - + دفتر العناوين Double-click to edit address or label - + أنقر على الماوس مرتين لتعديل عنوان Create a new address - + قم بعمل عنوان جديد Copy the currently selected address to the system clipboard - + قم بنسخ القوانين المختارة لحافظة النظام @@ -61,7 +61,7 @@ This product includes software developed by the OpenSSL Project for use in the O - + These are your Bitcoin addresses for receiving payments. You may want to give a different one to each sender so you can keep track of who is paying you. @@ -91,7 +91,17 @@ This product includes software developed by the OpenSSL Project for use in the O - + + Export the data in the current tab to a file + + + + + &Export + + + + Verify a message to ensure it was signed with a specified Bitcoin address @@ -103,7 +113,7 @@ This product includes software developed by the OpenSSL Project for use in the O &Delete - + &أمسح @@ -313,12 +323,12 @@ This product includes software developed by the OpenSSL Project for use in the O - + Synchronizing with network... - + &Overview @@ -393,7 +403,7 @@ This product includes software developed by the OpenSSL Project for use in the O - + Importing blocks from disk... @@ -403,12 +413,7 @@ This product includes software developed by the OpenSSL Project for use in the O - - &Export... - - - - + Send coins to a Bitcoin address @@ -418,12 +423,7 @@ This product includes software developed by the OpenSSL Project for use in the O - - Export the data in the current tab to a file - - - - + Backup wallet to another location @@ -433,7 +433,7 @@ This product includes software developed by the OpenSSL Project for use in the O - + &Debug window @@ -443,23 +443,23 @@ This product includes software developed by the OpenSSL Project for use in the O - + &Verify message... - - + + Bitcoin - + Wallet - + &Send @@ -504,12 +504,12 @@ This product includes software developed by the OpenSSL Project for use in the O - + &File - + &Settings @@ -524,12 +524,7 @@ This product includes software developed by the OpenSSL Project for use in the O - - Actions toolbar - - - - + [testnet] @@ -540,12 +535,17 @@ This product includes software developed by the OpenSSL Project for use in the O - + %n active connection(s) to Bitcoin network - + - + + No block source available... + + + + Processed %1 of %2 (estimated) blocks of transaction history. @@ -557,20 +557,20 @@ This product includes software developed by the OpenSSL Project for use in the O %n hour(s) - + %n day(s) - + %n week(s) - + - + %1 behind @@ -585,7 +585,7 @@ This product includes software developed by the OpenSSL Project for use in the O - + Error @@ -600,22 +600,22 @@ This product includes software developed by the OpenSSL Project for use in the O - + This transaction is over the size limit. You can still send it for a fee of %1, which goes to the nodes that process your transaction and helps to support the network. Do you want to pay the fee? - + Up to date - + Catching up... - + Confirm transaction fee @@ -661,7 +661,7 @@ Address: %4 - + A fatal error occurred. Bitcoin can no longer continue safely and will quit. @@ -669,7 +669,7 @@ Address: %4 ClientModel - + Network Alert @@ -800,7 +800,7 @@ Address: %4 - Optional transaction fee per kB that helps make sure your transactions are processed quickly. Most transactions are 1 kB. Fee 0.01 recommended. + Optional transaction fee per kB that helps make sure your transactions are processed quickly. Most transactions are 1 kB. @@ -1050,7 +1050,7 @@ Address: %4 - + out of sync @@ -1636,6 +1636,19 @@ Address: %4 + + SplashScreen + + + The Bitcoin developers + + + + + [testnet] + + + TransactionDesc @@ -1666,7 +1679,7 @@ Address: %4 , broadcast through %n node(s) - + @@ -1719,7 +1732,7 @@ Address: %4 matures in %n more block(s) - + @@ -1802,7 +1815,7 @@ Address: %4 Open for %n more block(s) - + @@ -1848,7 +1861,7 @@ Address: %4 Open for %n more block(s) - + @@ -1873,7 +1886,7 @@ Address: %4 Mined balance will be available when it matures in %n more block(s) - + @@ -2110,10 +2123,28 @@ Address: %4 + + WalletModel + + + Send Coins + + + WalletView - + + &Export + + + + + Export the data in the current tab to a file + + + + Backup Wallet @@ -2146,37 +2177,37 @@ Address: %4 bitcoin-core - + Bitcoin version - + Usage: - + Send command to -server or bitcoind - + List commands - + Get help for a command - + Options: - + Specify configuration file (default: bitcoin.conf) @@ -2186,27 +2217,17 @@ Address: %4 - - Generate coins - - - - - Don't generate coins - - - - + Specify data directory - + Set database cache size in megabytes (default: 25) - + Listen for connections on <port> (default: 8333 or testnet: 18333) @@ -2221,7 +2242,7 @@ Address: %4 - + Specify your own public address @@ -2231,22 +2252,22 @@ Address: %4 - + Number of seconds to keep misbehaving peers from reconnecting (default: 86400) - + An error occurred while setting up the RPC port %u for listening on IPv4: %s - + Listen for JSON-RPC connections on <port> (default: 8332 or testnet: 18332) - + Accept command line and JSON-RPC commands @@ -2256,17 +2277,17 @@ Address: %4 - + Use the test network - + Accept connections from outside (default: 1 if no -proxy or -connect) - + %s, you must set a rpcpassword in the configuration file: %s It is recommended you use the following random password: @@ -2295,11 +2316,6 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. Cannot obtain a lock on data directory %s. Bitcoin is probably already running. - - - Error initializing database environment %s! To recover, BACKUP THAT DIRECTORY, then remove everything from it except for wallet.dat. - - Error: The transaction was rejected! This might happen if some of the coins in your wallet were already spent, such as if you used a copy of wallet.dat and coins were spent in the copy but not marked as spent here. @@ -2326,12 +2342,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. - - Set the number of script verification threads (1-16, 0=auto, default: 0) - - - - + This is a pre-release test build - use at your own risk - do not use for mining or merchant applications @@ -2371,7 +2382,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. - + Connect only to the specified node(s) @@ -2391,7 +2402,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. - + Error initializing block database @@ -2415,11 +2426,6 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. Error: Disk space is low! - - - Error: Transaction creation failed! - - Error: Wallet locked, unable to create transaction! @@ -2491,7 +2497,12 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. - + + Generate coins (default: 0) + + + + How many blocks to check at startup (default: 288, 0 = all) @@ -2501,7 +2512,12 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. - + + Not enough file descriptors available. + + + + Rebuild block chain index from current blk000??.dat files @@ -2511,7 +2527,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. - + Verifying blocks... @@ -2521,12 +2537,17 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. - + Imports blocks from external blk000??.dat file - + + Set the number of script verification threads (up to 16, 0 = auto, <0 = leave that many cores free, default: 0) + + + + Information @@ -2535,6 +2556,16 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. Invalid -tor address: '%s' + + + Invalid amount for -minrelaytxfee=<amount>: '%s' + + + + + Invalid amount for -mintxfee=<amount>: '%s' + + Maintain a full transaction index (default: 0) @@ -2551,7 +2582,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. - + Only accept block chain matching built-in checkpoints (default: 1) @@ -2610,6 +2641,11 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. Shrink debug.log file on client startup (default: 1 when no -debug) + + + Signing transaction failed + + Specify connection timeout in milliseconds (default: 5000) @@ -2621,7 +2657,22 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. - + + Transaction amount too small + + + + + Transaction amounts must be positive + + + + + Transaction too large + + + + Use UPnP to map the listening port (default: 0) @@ -2661,7 +2712,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. - + Password for JSON-RPC connections @@ -2676,17 +2727,17 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. - + Execute command when the best block changes (%s in cmd is replaced by block hash) - + Upgrade wallet to latest format - + Set key pool size to <n> (default: 100) @@ -2696,12 +2747,12 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. - + Use OpenSSL (https) for JSON-RPC connections - + Server certificate file (default: server.cert) @@ -2711,37 +2762,37 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. - + Acceptable ciphers (default: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH) - + This help message - + Unable to bind to %s on this computer (bind returned error %d, %s) - + Connect through socks proxy - + Allow DNS lookups for -addnode, -seednode and -connect - + Loading addresses... - + Error loading wallet.dat: Wallet corrupted @@ -2751,22 +2802,22 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. - + Wallet needed to be rewritten: restart Bitcoin to complete - + Error loading wallet.dat - + Invalid -proxy address: '%s' - + Unknown network specified in -onlynet: '%s' @@ -2776,7 +2827,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. - + Cannot resolve -bind address: '%s' @@ -2796,17 +2847,17 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. - + Insufficient funds - + Loading block index... - + Add a node to connect to and attempt to keep the connection open @@ -2816,52 +2867,47 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. - + Fee per KB to add to transactions you send - + Loading wallet... - + Cannot downgrade wallet - - - Cannot initialize keypool - - Cannot write default address - + Rescanning... - + Done loading - + To use the %s option - + Error - + You must set rpcpassword=<password> in the configuration file: %s If the file does not exist, create it with owner-readable-only file permissions. diff --git a/src/qt/locale/bitcoin_bg.ts b/src/qt/locale/bitcoin_bg.ts index 40c75a6795..a55030565d 100644 --- a/src/qt/locale/bitcoin_bg.ts +++ b/src/qt/locale/bitcoin_bg.ts @@ -28,13 +28,13 @@ This product includes software developed by the OpenSSL Project for use in the O Използван е софтуер, разработен от OpenSSL Project за употреба в OpenSSL Toolkit (http://www.openssl.org/), криптографски софтуер разработен от Eric Young (eay@cryptsoft.com) и UPnP софтуер разработен от Thomas Bernard. - + Copyright - 2009-%1 The Bitcoin developers + The Bitcoin developers @@ -66,7 +66,7 @@ This product includes software developed by the OpenSSL Project for use in the O &Нов адрес - + These are your Bitcoin addresses for receiving payments. You may want to give a different one to each sender so you can keep track of who is paying you. Това са вашите Биткоин адреси за получаване на плащания. За по-лесно проследяване на плащанията и повишена анонимност можете да използвате нов адрес за всяко плащане. @@ -96,7 +96,17 @@ This product includes software developed by the OpenSSL Project for use in the O Изтрий избрания адрес от списъка - + + Export the data in the current tab to a file + Запишете данните от текущия раздел във файл + + + + &Export + + + + Verify a message to ensure it was signed with a specified Bitcoin address Проверете съобщение, за да сте сигурни че е подписано с определен Биткоин адрес @@ -318,12 +328,12 @@ This product includes software developed by the OpenSSL Project for use in the O Подписване на &съобщение... - + Synchronizing with network... Синхронизиране с мрежата... - + &Overview &Баланс @@ -398,7 +408,7 @@ This product includes software developed by the OpenSSL Project for use in the O &Смяна на паролата... - + Importing blocks from disk... @@ -408,12 +418,7 @@ This product includes software developed by the OpenSSL Project for use in the O - - &Export... - &Експорт... - - - + Send coins to a Bitcoin address Изпращане към Биткоин адрес @@ -423,12 +428,7 @@ This product includes software developed by the OpenSSL Project for use in the O - - Export the data in the current tab to a file - Запишете данните от текущия раздел във файл - - - + Backup wallet to another location @@ -438,7 +438,7 @@ This product includes software developed by the OpenSSL Project for use in the O Променя паролата за портфейла - + &Debug window @@ -448,23 +448,23 @@ This product includes software developed by the OpenSSL Project for use in the O - + &Verify message... &Проверка на съобщение... - - + + Bitcoin Биткоин - + Wallet Портфейл - + &Send @@ -509,12 +509,12 @@ This product includes software developed by the OpenSSL Project for use in the O - + &File &Файл - + &Settings &Настройки @@ -529,12 +529,7 @@ This product includes software developed by the OpenSSL Project for use in the O Раздели - - Actions toolbar - Функции - - - + [testnet] [testnet] @@ -545,12 +540,17 @@ This product includes software developed by the OpenSSL Project for use in the O - + %n active connection(s) to Bitcoin network %n връзка към Биткоин мрежата%n връзки към Биткоин мрежата - + + No block source available... + + + + Processed %1 of %2 (estimated) blocks of transaction history. @@ -575,7 +575,7 @@ This product includes software developed by the OpenSSL Project for use in the O - + %1 behind @@ -590,7 +590,7 @@ This product includes software developed by the OpenSSL Project for use in the O - + Error @@ -605,22 +605,22 @@ This product includes software developed by the OpenSSL Project for use in the O - + This transaction is over the size limit. You can still send it for a fee of %1, which goes to the nodes that process your transaction and helps to support the network. Do you want to pay the fee? - + Up to date Синхронизиран - + Catching up... Зарежда блокове... - + Confirm transaction fee Потвърждение за такса @@ -666,7 +666,7 @@ Address: %4 Портфейлът е <b>криптиран</b> и <b>заключен</b> - + A fatal error occurred. Bitcoin can no longer continue safely and will quit. @@ -674,7 +674,7 @@ Address: %4 ClientModel - + Network Alert @@ -805,8 +805,8 @@ Address: %4 - Optional transaction fee per kB that helps make sure your transactions are processed quickly. Most transactions are 1 kB. Fee 0.01 recommended. - Такса за транзакция на kB. Подпомага участниците в мрежата, които верифицират транзакции (miners). По-висока стойност би трябвало да ускори обработката на транзакции. Повечето транзакции са около 1 kB. Препоръчителна стойност - 0.0005 BTC. + Optional transaction fee per kB that helps make sure your transactions are processed quickly. Most transactions are 1 kB. + @@ -1055,7 +1055,7 @@ Address: %4 Сборът на все още непотвърдените транзакции, които не са част от текущия баланс - + out of sync несинхронизиран @@ -1641,6 +1641,19 @@ Address: %4 Съобщението е потвърдено. + + SplashScreen + + + The Bitcoin developers + + + + + [testnet] + [testnet] + + TransactionDesc @@ -2115,10 +2128,28 @@ Address: %4 до + + WalletModel + + + Send Coins + Изпращане + + WalletView - + + &Export + + + + + Export the data in the current tab to a file + Запишете данните от текущия раздел във файл + + + Backup Wallet @@ -2151,37 +2182,37 @@ Address: %4 bitcoin-core - + Bitcoin version Биткоин версия - + Usage: - + Send command to -server or bitcoind - + List commands - + Get help for a command - + Options: Опции: - + Specify configuration file (default: bitcoin.conf) @@ -2191,27 +2222,17 @@ Address: %4 - - Generate coins - - - - - Don't generate coins - - - - + Specify data directory - + Set database cache size in megabytes (default: 25) - + Listen for connections on <port> (default: 8333 or testnet: 18333) @@ -2226,7 +2247,7 @@ Address: %4 - + Specify your own public address @@ -2236,22 +2257,22 @@ Address: %4 - + Number of seconds to keep misbehaving peers from reconnecting (default: 86400) - + An error occurred while setting up the RPC port %u for listening on IPv4: %s - + Listen for JSON-RPC connections on <port> (default: 8332 or testnet: 18332) - + Accept command line and JSON-RPC commands @@ -2261,17 +2282,17 @@ Address: %4 - + Use the test network - + Accept connections from outside (default: 1 if no -proxy or -connect) - + %s, you must set a rpcpassword in the configuration file: %s It is recommended you use the following random password: @@ -2300,11 +2321,6 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. Cannot obtain a lock on data directory %s. Bitcoin is probably already running. - - - Error initializing database environment %s! To recover, BACKUP THAT DIRECTORY, then remove everything from it except for wallet.dat. - - Error: The transaction was rejected! This might happen if some of the coins in your wallet were already spent, such as if you used a copy of wallet.dat and coins were spent in the copy but not marked as spent here. @@ -2331,12 +2347,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. - - Set the number of script verification threads (1-16, 0=auto, default: 0) - - - - + This is a pre-release test build - use at your own risk - do not use for mining or merchant applications @@ -2376,7 +2387,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. - + Connect only to the specified node(s) @@ -2396,7 +2407,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. - + Error initializing block database @@ -2420,11 +2431,6 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. Error: Disk space is low! - - - Error: Transaction creation failed! - - Error: Wallet locked, unable to create transaction! @@ -2496,7 +2502,12 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. - + + Generate coins (default: 0) + + + + How many blocks to check at startup (default: 288, 0 = all) @@ -2506,7 +2517,12 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. - + + Not enough file descriptors available. + + + + Rebuild block chain index from current blk000??.dat files @@ -2516,7 +2532,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. - + Verifying blocks... @@ -2526,12 +2542,17 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. - + Imports blocks from external blk000??.dat file - + + Set the number of script verification threads (up to 16, 0 = auto, <0 = leave that many cores free, default: 0) + + + + Information @@ -2540,6 +2561,16 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. Invalid -tor address: '%s' Невалиден -tor адрес: '%s' + + + Invalid amount for -minrelaytxfee=<amount>: '%s' + + + + + Invalid amount for -mintxfee=<amount>: '%s' + + Maintain a full transaction index (default: 0) @@ -2556,7 +2587,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. - + Only accept block chain matching built-in checkpoints (default: 1) @@ -2615,6 +2646,11 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. Shrink debug.log file on client startup (default: 1 when no -debug) + + + Signing transaction failed + + Specify connection timeout in milliseconds (default: 5000) @@ -2626,7 +2662,22 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. - + + Transaction amount too small + + + + + Transaction amounts must be positive + + + + + Transaction too large + + + + Use UPnP to map the listening port (default: 0) @@ -2666,7 +2717,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. - + Password for JSON-RPC connections @@ -2681,17 +2732,17 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. - + Execute command when the best block changes (%s in cmd is replaced by block hash) - + Upgrade wallet to latest format - + Set key pool size to <n> (default: 100) @@ -2701,12 +2752,12 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. - + Use OpenSSL (https) for JSON-RPC connections - + Server certificate file (default: server.cert) @@ -2716,37 +2767,37 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. - + Acceptable ciphers (default: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH) - + This help message - + Unable to bind to %s on this computer (bind returned error %d, %s) - + Connect through socks proxy - + Allow DNS lookups for -addnode, -seednode and -connect - + Loading addresses... Зареждане на адресите... - + Error loading wallet.dat: Wallet corrupted @@ -2756,22 +2807,22 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. - + Wallet needed to be rewritten: restart Bitcoin to complete - + Error loading wallet.dat - + Invalid -proxy address: '%s' Невалиден -proxy address: '%s' - + Unknown network specified in -onlynet: '%s' @@ -2781,7 +2832,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. - + Cannot resolve -bind address: '%s' @@ -2801,17 +2852,17 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. - + Insufficient funds - + Loading block index... Зареждане на блок индекса... - + Add a node to connect to and attempt to keep the connection open @@ -2821,52 +2872,47 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. - + Fee per KB to add to transactions you send - + Loading wallet... Зареждане на портфейла... - + Cannot downgrade wallet - - - Cannot initialize keypool - - Cannot write default address - + Rescanning... Преразглеждане на последовтелността от блокове... - + Done loading Зареждането е завършено - + To use the %s option - + Error Грешка - + You must set rpcpassword=<password> in the configuration file: %s If the file does not exist, create it with owner-readable-only file permissions. diff --git a/src/qt/locale/bitcoin_bs.ts b/src/qt/locale/bitcoin_bs.ts index 32b3e63a03..e1d54d1b79 100644 --- a/src/qt/locale/bitcoin_bs.ts +++ b/src/qt/locale/bitcoin_bs.ts @@ -23,13 +23,13 @@ This product includes software developed by the OpenSSL Project for use in the O - + Copyright - 2009-%1 The Bitcoin developers + The Bitcoin developers @@ -61,7 +61,7 @@ This product includes software developed by the OpenSSL Project for use in the O - + These are your Bitcoin addresses for receiving payments. You may want to give a different one to each sender so you can keep track of who is paying you. @@ -91,7 +91,17 @@ This product includes software developed by the OpenSSL Project for use in the O - + + Export the data in the current tab to a file + + + + + &Export + + + + Verify a message to ensure it was signed with a specified Bitcoin address @@ -313,12 +323,12 @@ This product includes software developed by the OpenSSL Project for use in the O - + Synchronizing with network... - + &Overview @@ -393,7 +403,7 @@ This product includes software developed by the OpenSSL Project for use in the O - + Importing blocks from disk... @@ -403,12 +413,7 @@ This product includes software developed by the OpenSSL Project for use in the O - - &Export... - - - - + Send coins to a Bitcoin address @@ -418,12 +423,7 @@ This product includes software developed by the OpenSSL Project for use in the O - - Export the data in the current tab to a file - - - - + Backup wallet to another location @@ -433,7 +433,7 @@ This product includes software developed by the OpenSSL Project for use in the O - + &Debug window @@ -443,23 +443,23 @@ This product includes software developed by the OpenSSL Project for use in the O - + &Verify message... - - + + Bitcoin - + Wallet - + &Send @@ -504,12 +504,12 @@ This product includes software developed by the OpenSSL Project for use in the O - + &File - + &Settings @@ -524,12 +524,7 @@ This product includes software developed by the OpenSSL Project for use in the O - - Actions toolbar - - - - + [testnet] @@ -540,12 +535,17 @@ This product includes software developed by the OpenSSL Project for use in the O - + %n active connection(s) to Bitcoin network - + + No block source available... + + + + Processed %1 of %2 (estimated) blocks of transaction history. @@ -570,7 +570,7 @@ This product includes software developed by the OpenSSL Project for use in the O - + %1 behind @@ -585,7 +585,7 @@ This product includes software developed by the OpenSSL Project for use in the O - + Error @@ -600,22 +600,22 @@ This product includes software developed by the OpenSSL Project for use in the O - + This transaction is over the size limit. You can still send it for a fee of %1, which goes to the nodes that process your transaction and helps to support the network. Do you want to pay the fee? - + Up to date - + Catching up... - + Confirm transaction fee @@ -661,7 +661,7 @@ Address: %4 - + A fatal error occurred. Bitcoin can no longer continue safely and will quit. @@ -669,7 +669,7 @@ Address: %4 ClientModel - + Network Alert @@ -800,7 +800,7 @@ Address: %4 - Optional transaction fee per kB that helps make sure your transactions are processed quickly. Most transactions are 1 kB. Fee 0.01 recommended. + Optional transaction fee per kB that helps make sure your transactions are processed quickly. Most transactions are 1 kB. @@ -1050,7 +1050,7 @@ Address: %4 - + out of sync @@ -1636,6 +1636,19 @@ Address: %4 + + SplashScreen + + + The Bitcoin developers + + + + + [testnet] + + + TransactionDesc @@ -2110,10 +2123,28 @@ Address: %4 + + WalletModel + + + Send Coins + + + WalletView - + + &Export + + + + + Export the data in the current tab to a file + + + + Backup Wallet @@ -2146,37 +2177,37 @@ Address: %4 bitcoin-core - + Bitcoin version - + Usage: - + Send command to -server or bitcoind - + List commands - + Get help for a command - + Options: - + Specify configuration file (default: bitcoin.conf) @@ -2186,27 +2217,17 @@ Address: %4 - - Generate coins - - - - - Don't generate coins - - - - + Specify data directory - + Set database cache size in megabytes (default: 25) - + Listen for connections on <port> (default: 8333 or testnet: 18333) @@ -2221,7 +2242,7 @@ Address: %4 - + Specify your own public address @@ -2231,22 +2252,22 @@ Address: %4 - + Number of seconds to keep misbehaving peers from reconnecting (default: 86400) - + An error occurred while setting up the RPC port %u for listening on IPv4: %s - + Listen for JSON-RPC connections on <port> (default: 8332 or testnet: 18332) - + Accept command line and JSON-RPC commands @@ -2256,17 +2277,17 @@ Address: %4 - + Use the test network - + Accept connections from outside (default: 1 if no -proxy or -connect) - + %s, you must set a rpcpassword in the configuration file: %s It is recommended you use the following random password: @@ -2295,11 +2316,6 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. Cannot obtain a lock on data directory %s. Bitcoin is probably already running. - - - Error initializing database environment %s! To recover, BACKUP THAT DIRECTORY, then remove everything from it except for wallet.dat. - - Error: The transaction was rejected! This might happen if some of the coins in your wallet were already spent, such as if you used a copy of wallet.dat and coins were spent in the copy but not marked as spent here. @@ -2326,12 +2342,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. - - Set the number of script verification threads (1-16, 0=auto, default: 0) - - - - + This is a pre-release test build - use at your own risk - do not use for mining or merchant applications @@ -2371,7 +2382,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. - + Connect only to the specified node(s) @@ -2391,7 +2402,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. - + Error initializing block database @@ -2415,11 +2426,6 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. Error: Disk space is low! - - - Error: Transaction creation failed! - - Error: Wallet locked, unable to create transaction! @@ -2491,7 +2497,12 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. - + + Generate coins (default: 0) + + + + How many blocks to check at startup (default: 288, 0 = all) @@ -2501,7 +2512,12 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. - + + Not enough file descriptors available. + + + + Rebuild block chain index from current blk000??.dat files @@ -2511,7 +2527,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. - + Verifying blocks... @@ -2521,12 +2537,17 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. - + Imports blocks from external blk000??.dat file - + + Set the number of script verification threads (up to 16, 0 = auto, <0 = leave that many cores free, default: 0) + + + + Information @@ -2535,6 +2556,16 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. Invalid -tor address: '%s' + + + Invalid amount for -minrelaytxfee=<amount>: '%s' + + + + + Invalid amount for -mintxfee=<amount>: '%s' + + Maintain a full transaction index (default: 0) @@ -2551,7 +2582,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. - + Only accept block chain matching built-in checkpoints (default: 1) @@ -2610,6 +2641,11 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. Shrink debug.log file on client startup (default: 1 when no -debug) + + + Signing transaction failed + + Specify connection timeout in milliseconds (default: 5000) @@ -2621,7 +2657,22 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. - + + Transaction amount too small + + + + + Transaction amounts must be positive + + + + + Transaction too large + + + + Use UPnP to map the listening port (default: 0) @@ -2661,7 +2712,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. - + Password for JSON-RPC connections @@ -2676,17 +2727,17 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. - + Execute command when the best block changes (%s in cmd is replaced by block hash) - + Upgrade wallet to latest format - + Set key pool size to <n> (default: 100) @@ -2696,12 +2747,12 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. - + Use OpenSSL (https) for JSON-RPC connections - + Server certificate file (default: server.cert) @@ -2711,37 +2762,37 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. - + Acceptable ciphers (default: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH) - + This help message - + Unable to bind to %s on this computer (bind returned error %d, %s) - + Connect through socks proxy - + Allow DNS lookups for -addnode, -seednode and -connect - + Loading addresses... - + Error loading wallet.dat: Wallet corrupted @@ -2751,22 +2802,22 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. - + Wallet needed to be rewritten: restart Bitcoin to complete - + Error loading wallet.dat - + Invalid -proxy address: '%s' - + Unknown network specified in -onlynet: '%s' @@ -2776,7 +2827,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. - + Cannot resolve -bind address: '%s' @@ -2796,17 +2847,17 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. - + Insufficient funds - + Loading block index... - + Add a node to connect to and attempt to keep the connection open @@ -2816,52 +2867,47 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. - + Fee per KB to add to transactions you send - + Loading wallet... - + Cannot downgrade wallet - - - Cannot initialize keypool - - Cannot write default address - + Rescanning... - + Done loading - + To use the %s option - + Error - + You must set rpcpassword=<password> in the configuration file: %s If the file does not exist, create it with owner-readable-only file permissions. diff --git a/src/qt/locale/bitcoin_ca.ts b/src/qt/locale/bitcoin_ca.ts index 94372bbf05..8272324a81 100644 --- a/src/qt/locale/bitcoin_ca.ts +++ b/src/qt/locale/bitcoin_ca.ts @@ -23,13 +23,13 @@ This product includes software developed by the OpenSSL Project for use in the O - + Copyright - 2009-%1 The Bitcoin developers + The Bitcoin developers @@ -61,7 +61,7 @@ This product includes software developed by the OpenSSL Project for use in the O - + These are your Bitcoin addresses for receiving payments. You may want to give a different one to each sender so you can keep track of who is paying you. @@ -91,7 +91,17 @@ This product includes software developed by the OpenSSL Project for use in the O - + + Export the data in the current tab to a file + + + + + &Export + + + + Verify a message to ensure it was signed with a specified Bitcoin address @@ -313,12 +323,12 @@ This product includes software developed by the OpenSSL Project for use in the O - + Synchronizing with network... - + &Overview @@ -393,7 +403,7 @@ This product includes software developed by the OpenSSL Project for use in the O - + Importing blocks from disk... @@ -403,12 +413,7 @@ This product includes software developed by the OpenSSL Project for use in the O - - &Export... - - - - + Send coins to a Bitcoin address @@ -418,12 +423,7 @@ This product includes software developed by the OpenSSL Project for use in the O - - Export the data in the current tab to a file - - - - + Backup wallet to another location @@ -433,7 +433,7 @@ This product includes software developed by the OpenSSL Project for use in the O - + &Debug window @@ -443,23 +443,23 @@ This product includes software developed by the OpenSSL Project for use in the O - + &Verify message... - - + + Bitcoin - + Wallet - + &Send @@ -504,12 +504,12 @@ This product includes software developed by the OpenSSL Project for use in the O - + &File - + &Settings @@ -524,12 +524,7 @@ This product includes software developed by the OpenSSL Project for use in the O - - Actions toolbar - - - - + [testnet] @@ -540,12 +535,17 @@ This product includes software developed by the OpenSSL Project for use in the O - + %n active connection(s) to Bitcoin network - + + No block source available... + + + + Processed %1 of %2 (estimated) blocks of transaction history. @@ -570,7 +570,7 @@ This product includes software developed by the OpenSSL Project for use in the O - + %1 behind @@ -585,7 +585,7 @@ This product includes software developed by the OpenSSL Project for use in the O - + Error @@ -600,22 +600,22 @@ This product includes software developed by the OpenSSL Project for use in the O - + This transaction is over the size limit. You can still send it for a fee of %1, which goes to the nodes that process your transaction and helps to support the network. Do you want to pay the fee? - + Up to date - + Catching up... - + Confirm transaction fee @@ -661,7 +661,7 @@ Address: %4 - + A fatal error occurred. Bitcoin can no longer continue safely and will quit. @@ -669,7 +669,7 @@ Address: %4 ClientModel - + Network Alert @@ -800,7 +800,7 @@ Address: %4 - Optional transaction fee per kB that helps make sure your transactions are processed quickly. Most transactions are 1 kB. Fee 0.01 recommended. + Optional transaction fee per kB that helps make sure your transactions are processed quickly. Most transactions are 1 kB. @@ -1050,7 +1050,7 @@ Address: %4 - + out of sync @@ -1636,6 +1636,19 @@ Address: %4 + + SplashScreen + + + The Bitcoin developers + + + + + [testnet] + + + TransactionDesc @@ -2110,10 +2123,28 @@ Address: %4 + + WalletModel + + + Send Coins + + + WalletView - + + &Export + + + + + Export the data in the current tab to a file + + + + Backup Wallet @@ -2146,37 +2177,37 @@ Address: %4 bitcoin-core - + Bitcoin version - + Usage: - + Send command to -server or bitcoind - + List commands - + Get help for a command - + Options: - + Specify configuration file (default: bitcoin.conf) @@ -2186,27 +2217,17 @@ Address: %4 - - Generate coins - - - - - Don't generate coins - - - - + Specify data directory - + Set database cache size in megabytes (default: 25) - + Listen for connections on <port> (default: 8333 or testnet: 18333) @@ -2221,7 +2242,7 @@ Address: %4 - + Specify your own public address @@ -2231,22 +2252,22 @@ Address: %4 - + Number of seconds to keep misbehaving peers from reconnecting (default: 86400) - + An error occurred while setting up the RPC port %u for listening on IPv4: %s - + Listen for JSON-RPC connections on <port> (default: 8332 or testnet: 18332) - + Accept command line and JSON-RPC commands @@ -2256,17 +2277,17 @@ Address: %4 - + Use the test network - + Accept connections from outside (default: 1 if no -proxy or -connect) - + %s, you must set a rpcpassword in the configuration file: %s It is recommended you use the following random password: @@ -2295,11 +2316,6 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. Cannot obtain a lock on data directory %s. Bitcoin is probably already running. - - - Error initializing database environment %s! To recover, BACKUP THAT DIRECTORY, then remove everything from it except for wallet.dat. - - Error: The transaction was rejected! This might happen if some of the coins in your wallet were already spent, such as if you used a copy of wallet.dat and coins were spent in the copy but not marked as spent here. @@ -2326,12 +2342,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. - - Set the number of script verification threads (1-16, 0=auto, default: 0) - - - - + This is a pre-release test build - use at your own risk - do not use for mining or merchant applications @@ -2371,7 +2382,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. - + Connect only to the specified node(s) @@ -2391,7 +2402,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. - + Error initializing block database @@ -2415,11 +2426,6 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. Error: Disk space is low! - - - Error: Transaction creation failed! - - Error: Wallet locked, unable to create transaction! @@ -2491,7 +2497,12 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. - + + Generate coins (default: 0) + + + + How many blocks to check at startup (default: 288, 0 = all) @@ -2501,7 +2512,12 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. - + + Not enough file descriptors available. + + + + Rebuild block chain index from current blk000??.dat files @@ -2511,7 +2527,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. - + Verifying blocks... @@ -2521,12 +2537,17 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. - + Imports blocks from external blk000??.dat file - + + Set the number of script verification threads (up to 16, 0 = auto, <0 = leave that many cores free, default: 0) + + + + Information @@ -2535,6 +2556,16 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. Invalid -tor address: '%s' + + + Invalid amount for -minrelaytxfee=<amount>: '%s' + + + + + Invalid amount for -mintxfee=<amount>: '%s' + + Maintain a full transaction index (default: 0) @@ -2551,7 +2582,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. - + Only accept block chain matching built-in checkpoints (default: 1) @@ -2610,6 +2641,11 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. Shrink debug.log file on client startup (default: 1 when no -debug) + + + Signing transaction failed + + Specify connection timeout in milliseconds (default: 5000) @@ -2621,7 +2657,22 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. - + + Transaction amount too small + + + + + Transaction amounts must be positive + + + + + Transaction too large + + + + Use UPnP to map the listening port (default: 0) @@ -2661,7 +2712,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. - + Password for JSON-RPC connections @@ -2676,17 +2727,17 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. - + Execute command when the best block changes (%s in cmd is replaced by block hash) - + Upgrade wallet to latest format - + Set key pool size to <n> (default: 100) @@ -2696,12 +2747,12 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. - + Use OpenSSL (https) for JSON-RPC connections - + Server certificate file (default: server.cert) @@ -2711,37 +2762,37 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. - + Acceptable ciphers (default: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH) - + This help message - + Unable to bind to %s on this computer (bind returned error %d, %s) - + Connect through socks proxy - + Allow DNS lookups for -addnode, -seednode and -connect - + Loading addresses... - + Error loading wallet.dat: Wallet corrupted @@ -2751,22 +2802,22 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. - + Wallet needed to be rewritten: restart Bitcoin to complete - + Error loading wallet.dat - + Invalid -proxy address: '%s' - + Unknown network specified in -onlynet: '%s' @@ -2776,7 +2827,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. - + Cannot resolve -bind address: '%s' @@ -2796,17 +2847,17 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. - + Insufficient funds - + Loading block index... - + Add a node to connect to and attempt to keep the connection open @@ -2816,52 +2867,47 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. - + Fee per KB to add to transactions you send - + Loading wallet... - + Cannot downgrade wallet - - - Cannot initialize keypool - - Cannot write default address - + Rescanning... - + Done loading - + To use the %s option - + Error - + You must set rpcpassword=<password> in the configuration file: %s If the file does not exist, create it with owner-readable-only file permissions. diff --git a/src/qt/locale/bitcoin_ca_ES.ts b/src/qt/locale/bitcoin_ca_ES.ts index 6c66589108..90dfc28e8c 100644 --- a/src/qt/locale/bitcoin_ca_ES.ts +++ b/src/qt/locale/bitcoin_ca_ES.ts @@ -23,14 +23,14 @@ This product includes software developed by the OpenSSL Project for use in the O \n Aquest és software experimental.\n\n Distribuït sota llicència de software MIT/11, veure l'arxiu COPYING o http://www.opensource.org/licenses/mit-license.php.\n\nAquest producte inclou software desarrollat pel projecte OpenSSL per a l'ús de OppenSSL Toolkit (http://www.openssl.org/) i de softwqre criptogràfic escrit per l'Eric Young (eay@cryptsoft.com) i software UPnP escrit per en Thomas Bernard. - + Copyright Copyright - 2009-%1 The Bitcoin developers - 2009-%1 Els creadors de Bitcoin + The Bitcoin developers + @@ -61,7 +61,7 @@ This product includes software developed by the OpenSSL Project for use in the O &Nova adreça - + These are your Bitcoin addresses for receiving payments. You may want to give a different one to each sender so you can keep track of who is paying you. Aquestes són les teves adreces Bitcoin per a rebre pagaments. Pot interesar-te proveïr diferents adreces a cadascun dels enviadors així pots identificar qui et va pagant. @@ -91,7 +91,17 @@ This product includes software developed by the OpenSSL Project for use in the O Esborrar l'adreça sel·leccionada - + + Export the data in the current tab to a file + + + + + &Export + + + + Verify a message to ensure it was signed with a specified Bitcoin address Verificar un missatge per asegurar-se que ha estat signat amb una adreça Bitcoin específica @@ -313,12 +323,12 @@ This product includes software developed by the OpenSSL Project for use in the O Signar &missatge... - + Synchronizing with network... Sincronitzant amb la xarxa ... - + &Overview &Panorama general @@ -393,7 +403,7 @@ This product includes software developed by the OpenSSL Project for use in the O &Canviar contrasenya... - + Importing blocks from disk... Important blocs del disc.. @@ -403,12 +413,7 @@ This product includes software developed by the OpenSSL Project for use in the O Re-indexant blocs al disc... - - &Export... - &Exporta... - - - + Send coins to a Bitcoin address Enviar monedes a una adreça Bitcoin @@ -418,12 +423,7 @@ This product includes software developed by the OpenSSL Project for use in the O Modificar les opcions de configuració per bitcoin - - Export the data in the current tab to a file - Exportar dades de la pestanya actual a un fitxer - - - + Backup wallet to another location Realitzar còpia de seguretat del moneder a un altre directori @@ -433,7 +433,7 @@ This product includes software developed by the OpenSSL Project for use in the O Canviar la constrasenya d'encriptació del moneder - + &Debug window &Finestra de debug @@ -443,23 +443,23 @@ This product includes software developed by the OpenSSL Project for use in the O Obrir la consola de diagnòstic i debugging - + &Verify message... &Verifica el missatge.. - - + + Bitcoin Bitcoin - + Wallet Moneder - + &Send &Enviar @@ -504,12 +504,12 @@ This product includes software developed by the OpenSSL Project for use in the O Verificar els missatges per assegurar-te que han estat signades amb una adreça Bitcoin específica. - + &File &Arxiu - + &Settings &Configuració @@ -524,12 +524,7 @@ This product includes software developed by the OpenSSL Project for use in the O Barra d'eines de seccions - - Actions toolbar - Barra d'eines d'accions - - - + [testnet] [testnet] @@ -540,12 +535,17 @@ This product includes software developed by the OpenSSL Project for use in the O Client Bitcoin - + %n active connection(s) to Bitcoin network %n connexió activa a la xarxa Bitcoin%n connexions actives a la xarxa Bitcoin - + + No block source available... + + + + Processed %1 of %2 (estimated) blocks of transaction history. Processat el %1 de %2 (estimat) dels blocs del històric de transaccions. @@ -570,7 +570,7 @@ This product includes software developed by the OpenSSL Project for use in the O %n setmana%n setmanes - + %1 behind %1 radera @@ -585,7 +585,7 @@ This product includes software developed by the OpenSSL Project for use in the O Les transaccions a partir d'això no seràn visibles. - + Error Error @@ -600,22 +600,22 @@ This product includes software developed by the OpenSSL Project for use in the O Informació - + This transaction is over the size limit. You can still send it for a fee of %1, which goes to the nodes that process your transaction and helps to support the network. Do you want to pay the fee? Aquesta transacció supera el límit de tamany. Tot i així pots enviar-la amb una comissió de %1, que es destinen als nodes que processen la seva transacció i ajuda a donar suport a la xarxa. Vols pagar la comissió? - + Up to date Al dia - + Catching up... Posar-se al dia ... - + Confirm transaction fee Confirmar comisió de transacció @@ -661,7 +661,7 @@ Address: %4 El moneder està <b>encriptat</b> i actualment <b>bloquejat</b> - + A fatal error occurred. Bitcoin can no longer continue safely and will quit. Ha tingut lloc un error fatal. Bitcoin no pot continuar executant-se de manera segura i es tancará. @@ -669,7 +669,7 @@ Address: %4 ClientModel - + Network Alert Alerta de xarxa @@ -800,8 +800,8 @@ Address: %4 - Optional transaction fee per kB that helps make sure your transactions are processed quickly. Most transactions are 1 kB. Fee 0.01 recommended. - Commisió de transacció opcional per kB que ajuda a garantir que les teves transaccions son processades ràpidament. La majoría de transaccions són de 1kB. Commisió recomanada de 0,01. + Optional transaction fee per kB that helps make sure your transactions are processed quickly. Most transactions are 1 kB. + @@ -1050,7 +1050,7 @@ Address: %4 Total de transaccions encara sense confirmar, que encara no es content en el balanç actual - + out of sync Fora de sincronia @@ -1636,6 +1636,19 @@ Address: %4 Missatge verificat. + + SplashScreen + + + The Bitcoin developers + + + + + [testnet] + + + TransactionDesc @@ -2110,10 +2123,28 @@ Address: %4 a + + WalletModel + + + Send Coins + Enviar monedes + + WalletView - + + &Export + + + + + Export the data in the current tab to a file + + + + Backup Wallet Realitzar còpia de seguretat del moneder @@ -2146,37 +2177,37 @@ Address: %4 bitcoin-core - + Bitcoin version Versió de Bitcoin - + Usage: Ús: - + Send command to -server or bitcoind Enviar comanda a -servidor o bitcoind - + List commands Llista d'ordres - + Get help for a command Obtenir ajuda per a un ordre. - + Options: Opcions: - + Specify configuration file (default: bitcoin.conf) Especificat arxiu de configuració (per defecte: bitcoin.conf) @@ -2186,27 +2217,17 @@ Address: %4 Especificar arxiu pid (per defecte: bitcoind.pid) - - Generate coins - Generar monedes - - - - Don't generate coins - No generar monedes - - - + Specify data directory Especificar directori de dades - + Set database cache size in megabytes (default: 25) Establir tamany de la memoria cau en megabytes (per defecte: 25) - + Listen for connections on <port> (default: 8333 or testnet: 18333) Escoltar connexions a <port> (per defecte: 8333 o testnet: 18333) @@ -2221,7 +2242,7 @@ Address: %4 Connectar al node per obtenir les adreces de les connexions, i desconectar - + Specify your own public address Especificar la teva adreça pública @@ -2231,22 +2252,22 @@ Address: %4 Límit per a desconectar connexions errònies (per defecte: 100) - + Number of seconds to keep misbehaving peers from reconnecting (default: 86400) Nombre de segons abans de reconectar amb connexions errònies (per defecte: 86400) - + An error occurred while setting up the RPC port %u for listening on IPv4: %s Ha sorgit un error al configurar el port RPC %u escoltant a IPv4: %s - + Listen for JSON-RPC connections on <port> (default: 8332 or testnet: 18332) Escoltar connexions JSON-RPC al port <port> (per defecte: 8332 o testnet:18332) - + Accept command line and JSON-RPC commands Acceptar línia d'ordres i ordres JSON-RPC @@ -2256,17 +2277,17 @@ Address: %4 Executar en segon pla com a programa dimoni i acceptar ordres - + Use the test network Usar la xarxa de prova - + Accept connections from outside (default: 1 if no -proxy or -connect) Aceptar connexions d'afora (per defecte: 1 si no -proxy o -connect) - + %s, you must set a rpcpassword in the configuration file: %s It is recommended you use the following random password: @@ -2295,11 +2316,6 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. Cannot obtain a lock on data directory %s. Bitcoin is probably already running. No es pot bloquejar el directori de dades %s. Probablement Bitcoin ja estigui en execució. - - - Error initializing database environment %s! To recover, BACKUP THAT DIRECTORY, then remove everything from it except for wallet.dat. - Error inicialitzant l'entorn de la base de dades %s! Per recuperar, FES UNA COPIA DE SEGURETAT D'AQUEST DIRECTORI, aleshores elimina tot el contingut TRET DEL wallet.dat. - Error: The transaction was rejected! This might happen if some of the coins in your wallet were already spent, such as if you used a copy of wallet.dat and coins were spent in the copy but not marked as spent here. @@ -2326,12 +2342,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. Establir una mida màxima de transaccions d'alta prioritat/baixa comisió en bytes (per defecte: 27000) - - Set the number of script verification threads (1-16, 0=auto, default: 0) - Establir el nombre d'execucions en paralel del script de verificació (1-16, 0=auto, per defecte: 0) - - - + This is a pre-release test build - use at your own risk - do not use for mining or merchant applications 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 @@ -2371,7 +2382,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. Opcions de la creació de blocs: - + Connect only to the specified node(s) Connectar només al(s) node(s) especificats @@ -2391,7 +2402,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. Vols reconstruir la base de dades de blocs ara? - + Error initializing block database Error carregant la base de dades de blocs @@ -2415,11 +2426,6 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. Error: Disk space is low! Error: Espai al disc baix! - - - Error: Transaction creation failed! - Error: La ceació de la transacció ha fallat! - Error: Wallet locked, unable to create transaction! @@ -2491,7 +2497,12 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. Cerca punts de connexió usant rastreig de DNS (per defecte: 1 tret d'usar -connect) - + + Generate coins (default: 0) + + + + How many blocks to check at startup (default: 288, 0 = all) Quants blocs s'han de confirmar a l'inici (per defecte: 288, 0 = tots) @@ -2501,7 +2512,12 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. Com verificar el bloc (0-4, per defecte 3) - + + Not enough file descriptors available. + + + + Rebuild block chain index from current blk000??.dat files Reconstruir l'índex de la cadena de blocs dels arxius actuals blk000??.dat @@ -2511,7 +2527,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. Estableix el nombre de fils per atendre trucades RPC (per defecte: 4) - + Verifying blocks... Verificant blocs... @@ -2521,12 +2537,17 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. Verificant moneder... - + Imports blocks from external blk000??.dat file Importa blocs de un fitxer blk000??.dat extern - + + Set the number of script verification threads (up to 16, 0 = auto, <0 = leave that many cores free, default: 0) + + + + Information &Informació @@ -2535,6 +2556,16 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. Invalid -tor address: '%s' Adreça -tor invàlida: '%s' + + + Invalid amount for -minrelaytxfee=<amount>: '%s' + + + + + Invalid amount for -mintxfee=<amount>: '%s' + + Maintain a full transaction index (default: 0) @@ -2551,7 +2582,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. Mida màxima del buffer d'enviament per a cada connexió, <n>*1000 bytes (default: 5000) - + Only accept block chain matching built-in checkpoints (default: 1) Tan sols acceptar cadenes de blocs que coincideixin amb els punts de prova (per defecte: 1) @@ -2610,6 +2641,11 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. Shrink debug.log file on client startup (default: 1 when no -debug) Reduir l'arxiu debug.log al iniciar el client (per defecte 1 quan no -debug) + + + Signing transaction failed + + Specify connection timeout in milliseconds (default: 5000) @@ -2621,7 +2657,22 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. Error de sistema: - + + Transaction amount too small + + + + + Transaction amounts must be positive + + + + + Transaction too large + + + + Use UPnP to map the listening port (default: 0) Utilitza UPnP per a mapejar els ports d'escolta (per defecte: 0) @@ -2661,7 +2712,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. L'arxiu wallet.data és corrupte, el rescat de les dades ha fallat - + Password for JSON-RPC connections Contrasenya per a connexions JSON-RPC @@ -2676,17 +2727,17 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. Enviar ordre al node en execució a <ip> (per defecte: 127.0.0.1) - + Execute command when the best block changes (%s in cmd is replaced by block hash) Executar orde quan el millor bloc canviï (%s al cmd es reemplaça per un bloc de hash) - + Upgrade wallet to latest format Actualitzar moneder a l'últim format - + Set key pool size to <n> (default: 100) Establir límit de nombre de claus a <n> (per defecte: 100) @@ -2696,12 +2747,12 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. Re-escanejar cadena de blocs en cerca de transaccions de moneder perdudes - + Use OpenSSL (https) for JSON-RPC connections Utilitzar OpenSSL (https) per a connexions JSON-RPC - + Server certificate file (default: server.cert) Arxiu del certificat de servidor (per defecte: server.cert) @@ -2711,37 +2762,37 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. Clau privada del servidor (per defecte: server.pem) - + Acceptable ciphers (default: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH) Xifrats acceptats (per defecte: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH) - + This help message Aquest misatge d'ajuda - + Unable to bind to %s on this computer (bind returned error %d, %s) Impossible d'unir %s a aquest ordinador (s'ha retornat l'error %d, %s) - + Connect through socks proxy Connectar a través de socks proxy - + Allow DNS lookups for -addnode, -seednode and -connect Permetre consultes DNS per a -addnode, -seednode i -connect - + Loading addresses... Carregant adreces... - + Error loading wallet.dat: Wallet corrupted Error carregant wallet.dat: Moneder corrupte @@ -2751,22 +2802,22 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. Error carregant wallet.dat: El moneder requereix una versió de Bitcoin més moderna - + Wallet needed to be rewritten: restart Bitcoin to complete El moneder necesita ser re-escrit: re-inicia Bitcoin per a completar la tasca - + Error loading wallet.dat Error carregant wallet.dat - + Invalid -proxy address: '%s' Adreça -proxy invalida: '%s' - + Unknown network specified in -onlynet: '%s' Xarxa desconeguda especificada a -onlynet: '%s' @@ -2776,7 +2827,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. S'ha demanat una versió desconeguda de -socks proxy: %i - + Cannot resolve -bind address: '%s' No es pot resoldre l'adreça -bind: '%s' @@ -2796,17 +2847,17 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. Quanitat invalida - + Insufficient funds Balanç insuficient - + Loading block index... Carregant índex de blocs... - + Add a node to connect to and attempt to keep the connection open Afegir un node per a connectar's-hi i intentar mantenir la connexió oberta @@ -2816,52 +2867,47 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. Impossible d'unir %s en aquest ordinador. Probablement Bitcoin ja estigui en execució. - + Fee per KB to add to transactions you send Comisió a afegir per cada KB de transaccions que enviïs - + Loading wallet... Carregant moneder... - + Cannot downgrade wallet No es pot reduir la versió del moneder - - - Cannot initialize keypool - No es pot inicialitzar el conjunt de claus - Cannot write default address No es pot escriure l'adreça per defecte - + Rescanning... Re-escanejant... - + Done loading Càrrega acabada - + To use the %s option Utilitza la opció %s - + Error Error - + You must set rpcpassword=<password> in the configuration file: %s If the file does not exist, create it with owner-readable-only file permissions. diff --git a/src/qt/locale/bitcoin_cs.ts b/src/qt/locale/bitcoin_cs.ts index f3ef200cae..8380ec6377 100644 --- a/src/qt/locale/bitcoin_cs.ts +++ b/src/qt/locale/bitcoin_cs.ts @@ -28,14 +28,14 @@ Tohle je experimentální program. Tento produkt zahrnuje programy vyvinuté OpenSSL Projektem pro použití v OpenSSL Toolkitu (http://www.openssl.org/) a kryptografický program od Erika Younga (eay@cryptsoft.com) a program UPnP od Thomase Bernarda. - + Copyright Copyright - 2009-%1 The Bitcoin developers - 2009-%1 Vývojáři Bitcoinu + The Bitcoin developers + Vývojáři Bitcoinu @@ -66,7 +66,7 @@ Tento produkt zahrnuje programy vyvinuté OpenSSL Projektem pro použití v Open Nová &adresa - + These are your Bitcoin addresses for receiving payments. You may want to give a different one to each sender so you can keep track of who is paying you. Tohle jsou tvé Bitcoinové adresy pro příjem plateb. Můžeš dát pokaždé každému plátci novou adresu, abys věděl, kdo ti kdy kolik platil. @@ -96,7 +96,17 @@ Tento produkt zahrnuje programy vyvinuté OpenSSL Projektem pro použití v Open Smaž zvolenou adresu ze seznamu - + + Export the data in the current tab to a file + Exportuj data z tohoto panelu do souboru + + + + &Export + &Export + + + Verify a message to ensure it was signed with a specified Bitcoin address Ověř zprávu, aby ses ujistil, že byla podepsána danou Bitcoinovou adresou @@ -318,12 +328,12 @@ Tento produkt zahrnuje programy vyvinuté OpenSSL Projektem pro použití v Open Po&depiš zprávu... - + Synchronizing with network... Synchronizuji se se sítí... - + &Overview &Přehled @@ -398,7 +408,7 @@ Tento produkt zahrnuje programy vyvinuté OpenSSL Projektem pro použití v Open Změň &heslo... - + Importing blocks from disk... Importuji bloky z disku... @@ -408,12 +418,7 @@ Tento produkt zahrnuje programy vyvinuté OpenSSL Projektem pro použití v Open Vytvářím nový index bloků na disku... - - &Export... - &Export... - - - + Send coins to a Bitcoin address Pošli mince na Bitcoinovou adresu @@ -423,12 +428,7 @@ Tento produkt zahrnuje programy vyvinuté OpenSSL Projektem pro použití v Open Uprav nastavení Bitcoinu - - Export the data in the current tab to a file - Exportuj data z tohoto panelu do souboru - - - + Backup wallet to another location Zazálohuj peněženku na jiné místo @@ -438,7 +438,7 @@ Tento produkt zahrnuje programy vyvinuté OpenSSL Projektem pro použití v Open Změň heslo k šifrování peněženky - + &Debug window &Ladicí okno @@ -448,23 +448,23 @@ Tento produkt zahrnuje programy vyvinuté OpenSSL Projektem pro použití v Open Otevři ladicí a diagnostickou konzoli - + &Verify message... &Ověř zprávu... - - + + Bitcoin Bitcoin - + Wallet Peněženka - + &Send &Pošli @@ -509,12 +509,12 @@ Tento produkt zahrnuje programy vyvinuté OpenSSL Projektem pro použití v Open Ověř zprávy, aby ses ujistil, že byly podepsány danými Bitcoinovými adresami - + &File &Soubor - + &Settings &Nastavení @@ -529,12 +529,7 @@ Tento produkt zahrnuje programy vyvinuté OpenSSL Projektem pro použití v Open Panel s listy - - Actions toolbar - Panel akcí - - - + [testnet] [testnet] @@ -545,12 +540,17 @@ Tento produkt zahrnuje programy vyvinuté OpenSSL Projektem pro použití v Open Bitcoin klient - + %n active connection(s) to Bitcoin network %n aktivní spojení do Bitcoinové sítě%n aktivní spojení do Bitcoinové sítě%n aktivních spojení do Bitcoinové sítě - + + No block source available... + Není dostupný žádný zdroj bloků... + + + Processed %1 of %2 (estimated) blocks of transaction history. Zpracováno %1 z přibližně %2 bloků transakční historie. @@ -575,7 +575,7 @@ Tento produkt zahrnuje programy vyvinuté OpenSSL Projektem pro použití v Open týden%n týdny%n týdnů - + %1 behind Stahuji ještě bloky transakcí za poslední %1 @@ -590,7 +590,7 @@ Tento produkt zahrnuje programy vyvinuté OpenSSL Projektem pro použití v Open Následné transakce ještě nebudou vidět. - + Error Chyba @@ -605,22 +605,22 @@ Tento produkt zahrnuje programy vyvinuté OpenSSL Projektem pro použití v Open Informace - + This transaction is over the size limit. You can still send it for a fee of %1, which goes to the nodes that process your transaction and helps to support the network. Do you want to pay the fee? Tahle transakce přesahuje velikostní limit. I tak ji ale můžeš poslat, pokud za ni zaplatíš poplatek %1, který půjde uzlům, které tvou transakci zpracují, a navíc tak podpoříš síť. Chceš zaplatit poplatek? - + Up to date Aktuální - + Catching up... Stahuji... - + Confirm transaction fee Potvrď transakční poplatek @@ -670,7 +670,7 @@ Adresa: %4 Peněženka je <b>zašifrovaná</b> a momentálně <b>zamčená</b> - + A fatal error occurred. Bitcoin can no longer continue safely and will quit. Stala se fatální chyba. Bitcoin nemůže bezpečně pokračovat v činnosti, a proto skončí. @@ -678,7 +678,7 @@ Adresa: %4 ClientModel - + Network Alert Upozornění sítě @@ -809,8 +809,8 @@ Adresa: %4 - Optional transaction fee per kB that helps make sure your transactions are processed quickly. Most transactions are 1 kB. Fee 0.01 recommended. - Dobrovolný transakční poplatek za každý započatý kB dopomáhá k rychlému zpracování tvých transakcí. Většina transakcí má do 1 kB. Doporučená výše poplatku je 0.01. + Optional transaction fee per kB that helps make sure your transactions are processed quickly. Most transactions are 1 kB. + Dobrovolný transakční poplatek za každý započatý kB dopomáhá k rychlému zpracování tvých transakcí. Většina transakcí má do 1 kB. @@ -1059,7 +1059,7 @@ Adresa: %4 Celkem z transakcí, které ještě nejsou potvrzené a které se ještě nezapočítávají do celkového stavu účtu - + out of sync nesynchronizováno @@ -1645,6 +1645,19 @@ Adresa: %4 Zpráva ověřena. + + SplashScreen + + + The Bitcoin developers + Vývojáři Bitcoinu + + + + [testnet] + [testnet] + + TransactionDesc @@ -2119,10 +2132,28 @@ Adresa: %4 až + + WalletModel + + + Send Coins + Pošli mince + + WalletView - + + &Export + &Export + + + + Export the data in the current tab to a file + Exportuj data z tohoto panelu do souboru + + + Backup Wallet Záloha peněženky @@ -2155,37 +2186,37 @@ Adresa: %4 bitcoin-core - + Bitcoin version Verze Bitcoinu - + Usage: Užití: - + Send command to -server or bitcoind Poslat příkaz pro -server nebo bitcoind - + List commands Výpis příkazů - + Get help for a command Získat nápovědu pro příkaz - + Options: Možnosti: - + Specify configuration file (default: bitcoin.conf) Konfigurační soubor (výchozí: bitcoin.conf) @@ -2195,27 +2226,17 @@ Adresa: %4 PID soubor (výchozí: bitcoind.pid) - - Generate coins - Generovat mince - - - - Don't generate coins - Negenerovat mince - - - + Specify data directory Adresář pro data - + Set database cache size in megabytes (default: 25) Nastavit velikost databázové vyrovnávací paměti v megabajtech (výchozí: 25) - + Listen for connections on <port> (default: 8333 or testnet: 18333) Čekat na spojení na <portu> (výchozí: 8333 nebo testnet: 18333) @@ -2230,7 +2251,7 @@ Adresa: %4 Připojit se k uzlu, získat adresy jeho protějšků a odpojit se - + Specify your own public address Specifikuj svou veřejnou adresu @@ -2240,22 +2261,22 @@ Adresa: %4 Práh pro odpojování zlobivých uzlů (výchozí: 100) - + Number of seconds to keep misbehaving peers from reconnecting (default: 86400) Doba ve vteřinách, po kterou se nebudou moci zlobivé uzly znovu připojit (výchozí: 86400) - + An error occurred while setting up the RPC port %u for listening on IPv4: %s Při nastavování naslouchacího RPC portu %i pro IPv4 nastala chyba: %s - + Listen for JSON-RPC connections on <port> (default: 8332 or testnet: 18332) Čekat na JSON RPC spojení na <portu> (výchozí: 8332 nebo testnet: 18332) - + Accept command line and JSON-RPC commands Akceptovat příkazy z příkazové řádky a přes JSON-RPC @@ -2265,17 +2286,17 @@ Adresa: %4 Běžet na pozadí jako démon a akceptovat příkazy - + Use the test network Použít testovací síť (testnet) - + Accept connections from outside (default: 1 if no -proxy or -connect) Přijímat spojení zvenčí (výchozí: 1, pokud není zadáno -proxy nebo -connect) - + %s, you must set a rpcpassword in the configuration file: %s It is recommended you use the following random password: @@ -2314,11 +2335,6 @@ například: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. Cannot obtain a lock on data directory %s. Bitcoin is probably already running. Nedaří se mi získat zámek na datový adresář %s. Bitcoin pravděpodobně už jednou běží. - - - Error initializing database environment %s! To recover, BACKUP THAT DIRECTORY, then remove everything from it except for wallet.dat. - Nastala chyba při inicializaci databázového prostředí %s! Řešení: ZAZÁLOHUJ TENTO ADRESÁŘ, a pak v něm smaž vše kromě wallet.dat. - Error: The transaction was rejected! This might happen if some of the coins in your wallet were already spent, such as if you used a copy of wallet.dat and coins were spent in the copy but not marked as spent here. @@ -2345,12 +2361,7 @@ například: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. Nastavit maximální velikost prioritních/nízkopoplatkových transakcí v bajtech (výchozí: 27000) - - Set the number of script verification threads (1-16, 0=auto, default: 0) - Nastavení počtu vláken pro verifikaci skriptů (1-16, 0=automaticky, výchozí: 0) - - - + This is a pre-release test build - use at your own risk - do not use for mining or merchant applications Tohle je testovací verze – používej ji jen na vlastní riziko, ale rozhodně ji nepoužívej k těžbě nebo pro obchodní aplikace @@ -2390,7 +2401,7 @@ například: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. Možnosti vytvoření bloku: - + Connect only to the specified node(s) Připojit se pouze k zadanému uzlu (příp. zadaným uzlům) @@ -2410,7 +2421,7 @@ například: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. Chceš přestavět databázi bloků hned teď? - + Error initializing block database Chyba při zakládání databáze bloků @@ -2434,11 +2445,6 @@ například: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. Error: Disk space is low! Problém: Na disku je málo místa! - - - Error: Transaction creation failed! - Chyba: Vytvoření transakce selhalo! - Error: Wallet locked, unable to create transaction! @@ -2510,7 +2516,12 @@ například: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. Hledat uzly přes DNS (výchozí: 1, pokud není zadáno -connect) - + + Generate coins (default: 0) + Generovat mince (výchozí: 0) + + + How many blocks to check at startup (default: 288, 0 = all) Kolik bloků při startu zkontrolovat (výchozí: 288, 0 = všechny) @@ -2520,7 +2531,12 @@ například: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. Jak moc důkladná má být verifikace bloků (0-4, výchozí: 3) - + + Not enough file descriptors available. + Je nedostatek deskriptorů souborů. + + + Rebuild block chain index from current blk000??.dat files Znovu vytvořit index řetězce bloků z aktuálních blk000??.dat souborů @@ -2530,7 +2546,7 @@ například: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. Nastavení počtu vláken pro servisní RPC volání (výchozí: 4) - + Verifying blocks... Ověřuji bloky... @@ -2540,12 +2556,17 @@ například: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. Kontroluji peněženku... - + Imports blocks from external blk000??.dat file Importovat bloky z externího souboru blk000??.dat - + + Set the number of script verification threads (up to 16, 0 = auto, <0 = leave that many cores free, default: 0) + Nastavení počtu vláken pro verifikaci skriptů (max. 16, 0 = automaticky, <0 = nechat daný počet jader volný, výchozí: 0) + + + Information Informace @@ -2554,6 +2575,16 @@ například: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. Invalid -tor address: '%s' Neplatná -tor adresa: '%s' + + + Invalid amount for -minrelaytxfee=<amount>: '%s' + Neplatná částka pro -minrelaytxfee=<částka>: '%s' + + + + Invalid amount for -mintxfee=<amount>: '%s' + Neplatná částka pro -mintxfee=<částka>: '%s' + Maintain a full transaction index (default: 0) @@ -2570,7 +2601,7 @@ například: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. Maximální velikost odesílacího bufferu pro každé spojení, <n>*1000 bajtů (výchozí: 1000) - + Only accept block chain matching built-in checkpoints (default: 1) Uznávat pouze řetěz bloků, který odpovídá vnitřním kontrolním bodům (výchozí: 1) @@ -2629,6 +2660,11 @@ například: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. Shrink debug.log file on client startup (default: 1 when no -debug) Při spuštění klienta zmenšit soubor debug.log (výchozí: 1, pokud není zadáno -debug) + + + Signing transaction failed + Podepisování transakce selhalo + Specify connection timeout in milliseconds (default: 5000) @@ -2640,7 +2676,22 @@ například: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. Systémová chyba: - + + Transaction amount too small + Částka v transakci je příliš malá + + + + Transaction amounts must be positive + Částky v transakci musí být kladné + + + + Transaction too large + Transace je příliš velká + + + Use UPnP to map the listening port (default: 0) Použít UPnP k namapování naslouchacího portu (výchozí: 0) @@ -2680,7 +2731,7 @@ například: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. Soubor wallet.dat je poškozen, jeho záchrana se nezdařila - + Password for JSON-RPC connections Heslo pro JSON-RPC spojení @@ -2695,17 +2746,17 @@ například: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. Posílat příkazy uzlu běžícím na <ip> (výchozí: 127.0.0.1) - + Execute command when the best block changes (%s in cmd is replaced by block hash) Spustit příkaz, když se změní nejlepší blok (%s se v příkazu nahradí hashem bloku) - + Upgrade wallet to latest format Převést peněženku na nejnovější formát - + Set key pool size to <n> (default: 100) Nastavit zásobník klíčů na velikost <n> (výchozí: 100) @@ -2715,12 +2766,12 @@ například: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. Přeskenovat řetězec bloků na chybějící transakce tvé pěněženky - + Use OpenSSL (https) for JSON-RPC connections Použít OpenSSL (https) pro JSON-RPC spojení - + Server certificate file (default: server.cert) Soubor se serverovým certifikátem (výchozí: server.cert) @@ -2730,37 +2781,37 @@ například: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. Soubor se serverovým soukromým klíčem (výchozí: server.pem) - + Acceptable ciphers (default: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH) Akceptovatelné šifry (výchozí: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH) - + This help message Tato nápověda - + Unable to bind to %s on this computer (bind returned error %d, %s) Nedaří se mi připojit na %s na tomhle počítači (operace bind vrátila chybu %d, %s) - + Connect through socks proxy Připojit se přes socks proxy - + Allow DNS lookups for -addnode, -seednode and -connect Povolit DNS dotazy pro -addnode (přidání uzlu), -seednode a -connect (připojení) - + Loading addresses... Načítám adresy... - + Error loading wallet.dat: Wallet corrupted Chyba při načítání wallet.dat: peněženka je poškozená @@ -2770,22 +2821,22 @@ například: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. Chyba při načítání wallet.dat: peněženka vyžaduje novější verzi Bitcoinu - + Wallet needed to be rewritten: restart Bitcoin to complete Soubor s peněženkou potřeboval přepsat: restartuj Bitcoin, aby se operace dokončila - + Error loading wallet.dat Chyba při načítání wallet.dat - + Invalid -proxy address: '%s' Neplatná -proxy adresa: '%s' - + Unknown network specified in -onlynet: '%s' V -onlynet byla uvedena neznámá síť: '%s' @@ -2795,7 +2846,7 @@ například: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. V -socks byla požadována neznámá verze proxy: %i - + Cannot resolve -bind address: '%s' Nemohu přeložit -bind adresu: '%s' @@ -2815,17 +2866,17 @@ například: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. Neplatná částka - + Insufficient funds Nedostatek prostředků - + Loading block index... Načítám index bloků... - + Add a node to connect to and attempt to keep the connection open Přidat uzel, ke kterému se připojit a snažit se spojení udržet @@ -2835,52 +2886,47 @@ například: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. Nedaří se mi připojit na %s na tomhle počítači. Bitcoin už pravděpodobně jednou běží. - + Fee per KB to add to transactions you send Poplatek za kB, který se přidá ke každé odeslané transakci - + Loading wallet... Načítám peněženku... - + Cannot downgrade wallet Nemohu převést peněženku do staršího formátu - - - Cannot initialize keypool - Nemohu inicializovat zásobník klíčů - Cannot write default address Nemohu napsat výchozí adresu - + Rescanning... Přeskenovávám... - + Done loading Načítání dokončeno - + To use the %s option K použití volby %s - + Error Chyba - + You must set rpcpassword=<password> in the configuration file: %s If the file does not exist, create it with owner-readable-only file permissions. diff --git a/src/qt/locale/bitcoin_cy.ts b/src/qt/locale/bitcoin_cy.ts index 453def7174..067e5ceb4d 100644 --- a/src/qt/locale/bitcoin_cy.ts +++ b/src/qt/locale/bitcoin_cy.ts @@ -23,13 +23,13 @@ This product includes software developed by the OpenSSL Project for use in the O - + Copyright - 2009-%1 The Bitcoin developers + The Bitcoin developers @@ -61,7 +61,7 @@ This product includes software developed by the OpenSSL Project for use in the O - + These are your Bitcoin addresses for receiving payments. You may want to give a different one to each sender so you can keep track of who is paying you. @@ -91,7 +91,17 @@ This product includes software developed by the OpenSSL Project for use in the O - + + Export the data in the current tab to a file + + + + + &Export + + + + Verify a message to ensure it was signed with a specified Bitcoin address @@ -313,12 +323,12 @@ This product includes software developed by the OpenSSL Project for use in the O - + Synchronizing with network... Cysoni â'r rhwydwaith... - + &Overview &Trosolwg @@ -393,7 +403,7 @@ This product includes software developed by the OpenSSL Project for use in the O - + Importing blocks from disk... @@ -403,12 +413,7 @@ This product includes software developed by the OpenSSL Project for use in the O - - &Export... - &Allforio... - - - + Send coins to a Bitcoin address @@ -418,12 +423,7 @@ This product includes software developed by the OpenSSL Project for use in the O - - Export the data in the current tab to a file - - - - + Backup wallet to another location @@ -433,7 +433,7 @@ This product includes software developed by the OpenSSL Project for use in the O Newid y cyfrinymadrodd a ddefnyddiwyd ar gyfer amgryptio'r waled - + &Debug window @@ -443,23 +443,23 @@ This product includes software developed by the OpenSSL Project for use in the O - + &Verify message... - - + + Bitcoin - + Wallet - + &Send @@ -504,12 +504,12 @@ This product includes software developed by the OpenSSL Project for use in the O - + &File &Ffeil - + &Settings &Gosodiadau @@ -524,12 +524,7 @@ This product includes software developed by the OpenSSL Project for use in the O Bar offer tabiau - - Actions toolbar - Bar offer camau gweithredu - - - + [testnet] [testnet] @@ -540,12 +535,17 @@ This product includes software developed by the OpenSSL Project for use in the O - + %n active connection(s) to Bitcoin network - + + No block source available... + + + + Processed %1 of %2 (estimated) blocks of transaction history. @@ -570,7 +570,7 @@ This product includes software developed by the OpenSSL Project for use in the O - + %1 behind @@ -585,7 +585,7 @@ This product includes software developed by the OpenSSL Project for use in the O - + Error @@ -600,22 +600,22 @@ This product includes software developed by the OpenSSL Project for use in the O - + This transaction is over the size limit. You can still send it for a fee of %1, which goes to the nodes that process your transaction and helps to support the network. Do you want to pay the fee? - + Up to date Cyfamserol - + Catching up... Dal i fyny - + Confirm transaction fee @@ -661,7 +661,7 @@ Address: %4 Mae'r waled <b>wedi'i amgryptio</b> ac <b>ar glo</b> ar hyn o bryd - + A fatal error occurred. Bitcoin can no longer continue safely and will quit. @@ -669,7 +669,7 @@ Address: %4 ClientModel - + Network Alert @@ -800,7 +800,7 @@ Address: %4 - Optional transaction fee per kB that helps make sure your transactions are processed quickly. Most transactions are 1 kB. Fee 0.01 recommended. + Optional transaction fee per kB that helps make sure your transactions are processed quickly. Most transactions are 1 kB. @@ -1050,7 +1050,7 @@ Address: %4 Cyfanswm o drafodion sydd heb eu cadarnhau a heb eu cyfri tuag at y gweddill presennol - + out of sync @@ -1636,6 +1636,19 @@ Address: %4 + + SplashScreen + + + The Bitcoin developers + + + + + [testnet] + + + TransactionDesc @@ -2110,10 +2123,28 @@ Address: %4 + + WalletModel + + + Send Coins + + + WalletView - + + &Export + + + + + Export the data in the current tab to a file + + + + Backup Wallet @@ -2146,37 +2177,37 @@ Address: %4 bitcoin-core - + Bitcoin version - + Usage: - + Send command to -server or bitcoind - + List commands - + Get help for a command - + Options: - + Specify configuration file (default: bitcoin.conf) @@ -2186,27 +2217,17 @@ Address: %4 - - Generate coins - - - - - Don't generate coins - - - - + Specify data directory - + Set database cache size in megabytes (default: 25) - + Listen for connections on <port> (default: 8333 or testnet: 18333) @@ -2221,7 +2242,7 @@ Address: %4 - + Specify your own public address @@ -2231,22 +2252,22 @@ Address: %4 - + Number of seconds to keep misbehaving peers from reconnecting (default: 86400) - + An error occurred while setting up the RPC port %u for listening on IPv4: %s - + Listen for JSON-RPC connections on <port> (default: 8332 or testnet: 18332) - + Accept command line and JSON-RPC commands @@ -2256,17 +2277,17 @@ Address: %4 - + Use the test network - + Accept connections from outside (default: 1 if no -proxy or -connect) - + %s, you must set a rpcpassword in the configuration file: %s It is recommended you use the following random password: @@ -2295,11 +2316,6 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. Cannot obtain a lock on data directory %s. Bitcoin is probably already running. - - - Error initializing database environment %s! To recover, BACKUP THAT DIRECTORY, then remove everything from it except for wallet.dat. - - Error: The transaction was rejected! This might happen if some of the coins in your wallet were already spent, such as if you used a copy of wallet.dat and coins were spent in the copy but not marked as spent here. @@ -2326,12 +2342,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. - - Set the number of script verification threads (1-16, 0=auto, default: 0) - - - - + This is a pre-release test build - use at your own risk - do not use for mining or merchant applications @@ -2371,7 +2382,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. - + Connect only to the specified node(s) @@ -2391,7 +2402,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. - + Error initializing block database @@ -2415,11 +2426,6 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. Error: Disk space is low! - - - Error: Transaction creation failed! - - Error: Wallet locked, unable to create transaction! @@ -2491,7 +2497,12 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. - + + Generate coins (default: 0) + + + + How many blocks to check at startup (default: 288, 0 = all) @@ -2501,7 +2512,12 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. - + + Not enough file descriptors available. + + + + Rebuild block chain index from current blk000??.dat files @@ -2511,7 +2527,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. - + Verifying blocks... @@ -2521,12 +2537,17 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. - + Imports blocks from external blk000??.dat file - + + Set the number of script verification threads (up to 16, 0 = auto, <0 = leave that many cores free, default: 0) + + + + Information @@ -2535,6 +2556,16 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. Invalid -tor address: '%s' + + + Invalid amount for -minrelaytxfee=<amount>: '%s' + + + + + Invalid amount for -mintxfee=<amount>: '%s' + + Maintain a full transaction index (default: 0) @@ -2551,7 +2582,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. - + Only accept block chain matching built-in checkpoints (default: 1) @@ -2610,6 +2641,11 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. Shrink debug.log file on client startup (default: 1 when no -debug) + + + Signing transaction failed + + Specify connection timeout in milliseconds (default: 5000) @@ -2621,7 +2657,22 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. - + + Transaction amount too small + + + + + Transaction amounts must be positive + + + + + Transaction too large + + + + Use UPnP to map the listening port (default: 0) @@ -2661,7 +2712,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. - + Password for JSON-RPC connections @@ -2676,17 +2727,17 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. - + Execute command when the best block changes (%s in cmd is replaced by block hash) - + Upgrade wallet to latest format - + Set key pool size to <n> (default: 100) @@ -2696,12 +2747,12 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. - + Use OpenSSL (https) for JSON-RPC connections - + Server certificate file (default: server.cert) @@ -2711,37 +2762,37 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. - + Acceptable ciphers (default: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH) - + This help message - + Unable to bind to %s on this computer (bind returned error %d, %s) - + Connect through socks proxy - + Allow DNS lookups for -addnode, -seednode and -connect - + Loading addresses... - + Error loading wallet.dat: Wallet corrupted @@ -2751,22 +2802,22 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. - + Wallet needed to be rewritten: restart Bitcoin to complete - + Error loading wallet.dat - + Invalid -proxy address: '%s' - + Unknown network specified in -onlynet: '%s' @@ -2776,7 +2827,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. - + Cannot resolve -bind address: '%s' @@ -2796,17 +2847,17 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. - + Insufficient funds - + Loading block index... - + Add a node to connect to and attempt to keep the connection open @@ -2816,52 +2867,47 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. - + Fee per KB to add to transactions you send - + Loading wallet... - + Cannot downgrade wallet - - - Cannot initialize keypool - - Cannot write default address - + Rescanning... - + Done loading - + To use the %s option - + Error - + You must set rpcpassword=<password> in the configuration file: %s If the file does not exist, create it with owner-readable-only file permissions. diff --git a/src/qt/locale/bitcoin_da.ts b/src/qt/locale/bitcoin_da.ts index 700680ec6b..a90073e645 100644 --- a/src/qt/locale/bitcoin_da.ts +++ b/src/qt/locale/bitcoin_da.ts @@ -28,14 +28,14 @@ Det er gjort tilgængeligt under MIT/X11-softwarelicensen. Se den tilhørende fi Produktet indeholder software som er udviklet af OpenSSL Project til brug i OpenSSL Toolkit (http://www.openssl.org/), kryptografisk software skrevet af Eric Young (eay@cryptsoft.com) og UPnP-software skrevet af Thomas Bernard. - + Copyright Copyright - 2009-%1 The Bitcoin developers - 2009-%1 Bitcoin-udviklerne + The Bitcoin developers + Bitcoin-udviklerne @@ -66,7 +66,7 @@ Produktet indeholder software som er udviklet af OpenSSL Project til brug i Open Ny adresse - + These are your Bitcoin addresses for receiving payments. You may want to give a different one to each sender so you can keep track of who is paying you. Dette er dine Bitcoin-adresser til at modtage betalinger med. Du kan give en forskellig adresse til hver afsender, så du kan holde styr på, hvem der betaler dig. @@ -96,7 +96,17 @@ Produktet indeholder software som er udviklet af OpenSSL Project til brug i Open Slet den markerede adresse fra listen - + + Export the data in the current tab to a file + Eksportér den aktuelle visning til en fil + + + + &Export + Eksporter + + + Verify a message to ensure it was signed with a specified Bitcoin address Efterprøv en besked for at sikre, at den er underskrevet med den angivne Bitcoin-adresse @@ -318,12 +328,12 @@ Produktet indeholder software som er udviklet af OpenSSL Project til brug i Open Underskriv besked... - + Synchronizing with network... Synkroniserer med netværk... - + &Overview Oversigt @@ -398,7 +408,7 @@ Produktet indeholder software som er udviklet af OpenSSL Project til brug i Open Skift adgangskode... - + Importing blocks from disk... Importerer blokke fra disken... @@ -408,12 +418,7 @@ Produktet indeholder software som er udviklet af OpenSSL Project til brug i Open Genindekserer blokke på disken... - - &Export... - Eksporter... - - - + Send coins to a Bitcoin address Send bitcoins til en Bitcoin-adresse @@ -423,12 +428,7 @@ Produktet indeholder software som er udviklet af OpenSSL Project til brug i Open Rediger konfigurationsindstillinger af Bitcoin - - Export the data in the current tab to a file - Eksporter den aktuelle visning til en fil - - - + Backup wallet to another location Lav sikkerhedskopi af tegnebogen til et andet sted @@ -438,7 +438,7 @@ Produktet indeholder software som er udviklet af OpenSSL Project til brug i Open Skift adgangskode anvendt til tegnebogskryptering - + &Debug window Fejlsøgningsvindue @@ -448,23 +448,23 @@ Produktet indeholder software som er udviklet af OpenSSL Project til brug i Open Åbn fejlsøgnings- og diagnosticeringskonsollen - + &Verify message... Efterprøv besked... - - + + Bitcoin Bitcoin - + Wallet Tegnebog - + &Send Send @@ -509,12 +509,12 @@ Produktet indeholder software som er udviklet af OpenSSL Project til brug i Open Efterprøv beskeder for at sikre, at de er underskrevet med de(n) angivne Bitcoin-adresse(r) - + &File Fil - + &Settings Indstillinger @@ -529,12 +529,7 @@ Produktet indeholder software som er udviklet af OpenSSL Project til brug i Open Faneværktøjslinje - - Actions toolbar - Handlingsværktøjslinje - - - + [testnet] [testnetværk] @@ -545,12 +540,17 @@ Produktet indeholder software som er udviklet af OpenSSL Project til brug i Open Bitcoin-klient - + %n active connection(s) to Bitcoin network %n aktiv(e) forbindelse(r) til Bitcoin-netværket%n aktiv(e) forbindelse(r) til Bitcoin-netværket - + + No block source available... + Ingen blokkilde tilgængelig... + + + Processed %1 of %2 (estimated) blocks of transaction history. %1 ud af %2 (estimeret) blokke af transaktionshistorikken er blevet behandlet. @@ -575,7 +575,7 @@ Produktet indeholder software som er udviklet af OpenSSL Project til brug i Open %n uge(r)%n uge(r) - + %1 behind %1 bagefter @@ -590,7 +590,7 @@ Produktet indeholder software som er udviklet af OpenSSL Project til brug i Open Transaktioner herefter vil endnu ikke være synlige. - + Error Fejl @@ -605,22 +605,22 @@ Produktet indeholder software som er udviklet af OpenSSL Project til brug i Open Information - + This transaction is over the size limit. You can still send it for a fee of %1, which goes to the nodes that process your transaction and helps to support the network. Do you want to pay the fee? Transaktionen overskrider størrelsesgrænsen. Du kan stadig sende den for et gebyr på %1, hvilket går til de knuder, der behandler din transaktion og hjælper med at understøtte netværket. Vil du betale gebyret? - + Up to date Opdateret - + Catching up... Indhenter... - + Confirm transaction fee Bekræft transaktionsgebyr @@ -670,7 +670,7 @@ Adresse: %4 Tegnebog er <b>krypteret</b> og i øjeblikket <b>låst</b> - + A fatal error occurred. Bitcoin can no longer continue safely and will quit. Der opstod en fatal fejl. Bitcoin kan ikke længere fortsætte sikkert og vil afslutte. @@ -678,7 +678,7 @@ Adresse: %4 ClientModel - + Network Alert Netværksadvarsel @@ -809,8 +809,8 @@ Adresse: %4 - Optional transaction fee per kB that helps make sure your transactions are processed quickly. Most transactions are 1 kB. Fee 0.01 recommended. - Valgfrit transaktionsgebyr pr. kB, der hjælper dine transaktioner med at blive behandlet hurtigt. De fleste transaktioner er på 1 kB. Gebyr på 0,01 anbefales. + Optional transaction fee per kB that helps make sure your transactions are processed quickly. Most transactions are 1 kB. + Valgfrit transaktionsgebyr pr. kB, der hjælper dine transaktioner med at blive behandlet hurtigt. De fleste transaktioner er på 1 kB. @@ -1059,7 +1059,7 @@ Adresse: %4 Summen af transaktioner, der endnu ikke er bekræftet og endnu ikke er inkluderet i den nuværende saldo - + out of sync ikke synkroniseret @@ -1645,6 +1645,19 @@ Adresse: %4 Besked efterprøvet. + + SplashScreen + + + The Bitcoin developers + Bitcoin-udviklerne + + + + [testnet] + [testnet] + + TransactionDesc @@ -2119,10 +2132,28 @@ Adresse: %4 til + + WalletModel + + + Send Coins + Send bitcoins + + WalletView - + + &Export + Eksporter + + + + Export the data in the current tab to a file + Eksportér den aktuelle visning til en fil + + + Backup Wallet Sikkerhedskopier tegnebog @@ -2155,37 +2186,37 @@ Adresse: %4 bitcoin-core - + Bitcoin version Bitcoin-version - + Usage: Anvendelse: - + Send command to -server or bitcoind Send kommando til -server eller bitcoind - + List commands Liste over kommandoer - + Get help for a command Få hjælp til en kommando - + Options: Indstillinger: - + Specify configuration file (default: bitcoin.conf) Angiv konfigurationsfil (standard: bitcoin.conf) @@ -2195,27 +2226,17 @@ Adresse: %4 Angiv pid-fil (default: bitcoind.pid) - - Generate coins - Generer bitcoins - - - - Don't generate coins - Generer ikke bitcoins - - - + Specify data directory Angiv datakatalog - + Set database cache size in megabytes (default: 25) Angiv databasecachestørrelse i megabytes (standard: 25) - + Listen for connections on <port> (default: 8333 or testnet: 18333) Lyt til forbindelser på <port> (standard: 8333 eller testnetværk: 18333) @@ -2230,7 +2251,7 @@ Adresse: %4 Forbind til en knude for at modtage adresse, og afbryd - + Specify your own public address Angiv din egen offentlige adresse @@ -2240,22 +2261,22 @@ Adresse: %4 Grænse for afbrydelse til dårlige forbindelser (standard: 100) - + Number of seconds to keep misbehaving peers from reconnecting (default: 86400) Antal sekunder dårlige forbindelser skal vente før reetablering (standard: 86400) - + An error occurred while setting up the RPC port %u for listening on IPv4: %s Der opstod en fejl ved angivelse af RPC-porten %u til at lytte på IPv4: %s - + Listen for JSON-RPC connections on <port> (default: 8332 or testnet: 18332) Lyt til JSON-RPC-forbindelser på <port> (standard: 8332 eller testnetværk: 18332) - + Accept command line and JSON-RPC commands Accepter kommandolinje- og JSON-RPC-kommandoer @@ -2265,17 +2286,17 @@ Adresse: %4 Kør i baggrunden som en service, og accepter kommandoer - + Use the test network Brug testnetværket - + Accept connections from outside (default: 1 if no -proxy or -connect) Accepter forbindelser udefra (standard: 1 hvis hverken -proxy eller -connect) - + %s, you must set a rpcpassword in the configuration file: %s It is recommended you use the following random password: @@ -2314,11 +2335,6 @@ f.eks.: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com Cannot obtain a lock on data directory %s. Bitcoin is probably already running. Kan ikke opnå lås på datakatalog %s. Bitcoin er sandsynligvis allerede startet. - - - Error initializing database environment %s! To recover, BACKUP THAT DIRECTORY, then remove everything from it except for wallet.dat. - Klargøring af databasemiljø %s mislykkedes! For at genskabe, SIKKERHEDSKOPIER KATALOGET, fjern dernæst alt med undtagelse af wallet.dat. - Error: The transaction was rejected! This might happen if some of the coins in your wallet were already spent, such as if you used a copy of wallet.dat and coins were spent in the copy but not marked as spent here. @@ -2345,12 +2361,7 @@ f.eks.: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com Angiv maksimumstørrelse for høj prioritet/lavt gebyr-transaktioner i bytes (standard: 27000) - - Set the number of script verification threads (1-16, 0=auto, default: 0) - Angiv nummeret af skriptefterprøvningstråde (1-16, 0=automatisk, standard: 0) - - - + This is a pre-release test build - use at your own risk - do not use for mining or merchant applications Dette er en foreløbig testudgivelse - brug på eget ansvar - brug ikke til udvinding eller handelsprogrammer @@ -2390,7 +2401,7 @@ f.eks.: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com Blokoprettelsestilvalg: - + Connect only to the specified node(s) Tilslut kun til de(n) angivne knude(r) @@ -2410,7 +2421,7 @@ f.eks.: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com Ønsker du at genbygge blokdatabasen nu? - + Error initializing block database Klargøring af blokdatabase mislykkedes @@ -2434,11 +2445,6 @@ f.eks.: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com Error: Disk space is low! Fejl: Mangel på ledig diskplads! - - - Error: Transaction creation failed! - Fejl: Transaktionsoprettelse mislykkedes! - Error: Wallet locked, unable to create transaction! @@ -2510,7 +2516,12 @@ f.eks.: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com Find ligeværdige ved DNS-opslag (standard: 1 hvis ikke -connect) - + + Generate coins (default: 0) + Generer bitcoins (standard: 0) + + + How many blocks to check at startup (default: 288, 0 = all) Antal blokke som tjekkes ved opstart (0=alle, standard: 288) @@ -2520,7 +2531,12 @@ f.eks.: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com Grundighed af efterprøvning af blokke (0-4, standard: 3) - + + Not enough file descriptors available. + For få tilgængelige fildeskriptorer. + + + Rebuild block chain index from current blk000??.dat files Genbyg blokkædeindeks fra nuværende blk000??.dat filer @@ -2530,7 +2546,7 @@ f.eks.: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com Angiv antallet af tråde til at håndtere RPC-kald (standard: 4) - + Verifying blocks... Efterprøver blokke... @@ -2540,12 +2556,17 @@ f.eks.: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com Efterprøver tegnebog... - + Imports blocks from external blk000??.dat file Importerer blokke fra ekstern blk000??.dat fil - + + Set the number of script verification threads (up to 16, 0 = auto, <0 = leave that many cores free, default: 0) + Angiv nummeret af skriptefterprøvningstråde (op til 16, 0 = automatisk, <0 = efterlad det antal kerner tilgængelige, standard: 0) + + + Information Information @@ -2554,6 +2575,16 @@ f.eks.: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com Invalid -tor address: '%s' Ugyldig -tor adresse: '%s' + + + Invalid amount for -minrelaytxfee=<amount>: '%s' + Ugyldigt beløb til -minrelaytxfee=<beløb>:'%s' + + + + Invalid amount for -mintxfee=<amount>: '%s' + Ugyldigt beløb til -mintxfee=<beløb>:'%s' + Maintain a full transaction index (default: 0) @@ -2570,7 +2601,7 @@ f.eks.: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com Maksimum for afsendelsesbuffer pr. forbindelse, <n>*1000 bytes (standard: 1000) - + Only accept block chain matching built-in checkpoints (default: 1) Accepter kun blokkæde, som matcher indbyggede kontrolposter (standard: 1) @@ -2629,6 +2660,11 @@ f.eks.: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com Shrink debug.log file on client startup (default: 1 when no -debug) Formindsk debug.log filen ved klientopstart (standard: 1 hvis ikke -debug) + + + Signing transaction failed + Underskrift af transaktion mislykkedes + Specify connection timeout in milliseconds (default: 5000) @@ -2640,7 +2676,22 @@ f.eks.: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com Systemfejl: - + + Transaction amount too small + Transaktionsbeløb er for lavt + + + + Transaction amounts must be positive + Transaktionsbeløb skal være positive + + + + Transaction too large + Transaktionen er for stor + + + Use UPnP to map the listening port (default: 0) Forsøg at bruge UPnP til at konfigurere den lyttende port (standard: 0) @@ -2680,7 +2731,7 @@ f.eks.: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com wallet.dat ødelagt, redning af data mislykkedes - + Password for JSON-RPC connections Adgangskode til JSON-RPC-forbindelser @@ -2695,17 +2746,17 @@ f.eks.: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com Send kommandoer til knude, der kører på <ip> (standard: 127.0.0.1) - + Execute command when the best block changes (%s in cmd is replaced by block hash) Udfør kommando, når den bedste blok ændres (%s i kommandoen erstattes med blokhash) - + Upgrade wallet to latest format Opgrader tegnebog til seneste format - + Set key pool size to <n> (default: 100) Angiv nøglepoolstørrelse til <n> (standard: 100) @@ -2715,12 +2766,12 @@ f.eks.: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com Gennemsøg blokkæden for manglende tegnebogstransaktioner - + Use OpenSSL (https) for JSON-RPC connections Brug OpenSSL (https) for JSON-RPC-forbindelser - + Server certificate file (default: server.cert) Servercertifikat-fil (standard: server.cert) @@ -2730,37 +2781,37 @@ f.eks.: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com Serverens private nøgle (standard: server.pem) - + Acceptable ciphers (default: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH) Acceptable ciphers (standard: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH) - + This help message Denne hjælpebesked - + Unable to bind to %s on this computer (bind returned error %d, %s) Kunne ikke tildele %s på denne computer (bind returnerede fejl %d, %s) - + Connect through socks proxy Tilslut via SOCKS-proxy - + Allow DNS lookups for -addnode, -seednode and -connect Tillad DNS-opslag for -addnode, -seednode og -connect - + Loading addresses... Indlæser adresser... - + Error loading wallet.dat: Wallet corrupted Fejl ved indlæsning af wallet.dat: Tegnebog ødelagt @@ -2770,22 +2821,22 @@ f.eks.: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com Fejl ved indlæsning af wallet.dat: Tegnebog kræver en nyere version af Bitcoin - + Wallet needed to be rewritten: restart Bitcoin to complete Det var nødvendigt at genskrive tegnebogen: genstart Bitcoin for at gennemføre - + Error loading wallet.dat Fejl ved indlæsning af wallet.dat - + Invalid -proxy address: '%s' Ugyldig -proxy adresse: '%s' - + Unknown network specified in -onlynet: '%s' Ukendt netværk anført i -onlynet: '%s' @@ -2795,7 +2846,7 @@ f.eks.: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com Ukendt -socks proxy-version: %i - + Cannot resolve -bind address: '%s' Kan ikke finde -bind adressen: '%s' @@ -2815,17 +2866,17 @@ f.eks.: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com Ugyldigt beløb - + Insufficient funds Manglende dækning - + Loading block index... Indlæser blokindeks... - + Add a node to connect to and attempt to keep the connection open Tilføj en knude til at forbinde til og forsøg at holde forbindelsen åben @@ -2835,52 +2886,47 @@ f.eks.: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com Kunne ikke tildele %s på denne computer. Bitcoin kører sikkert allerede. - + Fee per KB to add to transactions you send Gebyr pr. kB, som skal tilføjes til transaktioner, du sender - + Loading wallet... Indlæser tegnebog... - + Cannot downgrade wallet Kan ikke nedgradere tegnebog - - - Cannot initialize keypool - Kan ikke påbegynde nøglepulje - Cannot write default address Kan ikke skrive standardadresse - + Rescanning... Genindlæser... - + Done loading Indlæsning gennemført - + To use the %s option For at bruge %s mulighed - + Error Fejl - + You must set rpcpassword=<password> in the configuration file: %s If the file does not exist, create it with owner-readable-only file permissions. diff --git a/src/qt/locale/bitcoin_de.ts b/src/qt/locale/bitcoin_de.ts index 7076d8e2a1..ac9db97fe7 100644 --- a/src/qt/locale/bitcoin_de.ts +++ b/src/qt/locale/bitcoin_de.ts @@ -28,14 +28,14 @@ Veröffentlicht unter der MIT/X11-Softwarelizenz, siehe beiligende Datei COPYING Dieses Produkt enthält Software, die vom OpenSSL-Projekt zur Verwendung im OpenSSL-Toolkit (http://www.openssl.org/) entwickelt wurde, sowie kryptographische Software geschrieben von Eric Young (eay@cryptsoft.com) und UPnP-Software geschrieben von Thomas Bernard. - + Copyright Copyright - 2009-%1 The Bitcoin developers - 2009-%1 Die Bitcoinentwickler + The Bitcoin developers + Die Bitcoinentwickler @@ -66,7 +66,7 @@ Dieses Produkt enthält Software, die vom OpenSSL-Projekt zur Verwendung im Open &Neue Adresse - + These are your Bitcoin addresses for receiving payments. You may want to give a different one to each sender so you can keep track of who is paying you. Dies sind Ihre Bitcoin-Adressen zum Empfangen von Zahlungen. Es steht Ihnen frei, jedem Absender eine Andere mitzuteilen, um einen besseren Überblick über eingehende Zahlungen zu erhalten. @@ -96,7 +96,17 @@ Dieses Produkt enthält Software, die vom OpenSSL-Projekt zur Verwendung im Open Die ausgewählte Adresse aus der Liste entfernen. - + + Export the data in the current tab to a file + Daten der aktuellen Ansicht in eine Datei exportieren + + + + &Export + E&xportieren + + + Verify a message to ensure it was signed with a specified Bitcoin address Eine Nachricht verifizieren, um sicherzustellen, dass diese mit einer angegebenen Bitcoin-Adresse signiert wurde @@ -318,12 +328,12 @@ Dieses Produkt enthält Software, die vom OpenSSL-Projekt zur Verwendung im Open Nachricht s&ignieren... - + Synchronizing with network... Synchronisiere mit Netzwerk... - + &Overview &Übersicht @@ -398,7 +408,7 @@ Dieses Produkt enthält Software, die vom OpenSSL-Projekt zur Verwendung im Open Passphrase &ändern... - + Importing blocks from disk... Importiere Blöcke von Laufwerk... @@ -408,12 +418,7 @@ Dieses Produkt enthält Software, die vom OpenSSL-Projekt zur Verwendung im Open Reindiziere Blöcke auf Laufwerk... - - &Export... - &Exportieren... - - - + Send coins to a Bitcoin address Bitcoins an eine Bitcoin-Adresse überweisen @@ -423,12 +428,7 @@ Dieses Produkt enthält Software, die vom OpenSSL-Projekt zur Verwendung im Open Die Konfiguration des Clients bearbeiten - - Export the data in the current tab to a file - Daten der aktuellen Ansicht in eine Datei exportieren - - - + Backup wallet to another location Eine Sicherungskopie der Brieftasche erstellen und abspeichern @@ -438,7 +438,7 @@ Dieses Produkt enthält Software, die vom OpenSSL-Projekt zur Verwendung im Open Ändert die Passphrase, die für die Verschlüsselung der Brieftasche benutzt wird - + &Debug window &Debugfenster @@ -448,23 +448,23 @@ Dieses Produkt enthält Software, die vom OpenSSL-Projekt zur Verwendung im Open Debugging- und Diagnosekonsole öffnen - + &Verify message... Nachricht &verifizieren... - - + + Bitcoin Bitcoin - + Wallet Brieftasche - + &Send Überweisen @@ -509,12 +509,12 @@ Dieses Produkt enthält Software, die vom OpenSSL-Projekt zur Verwendung im Open Nachrichten verifizieren, um sicherzustellen, dass diese mit den angegebenen Bitcoin-Adressen signiert wurden - + &File &Datei - + &Settings &Einstellungen @@ -529,12 +529,7 @@ Dieses Produkt enthält Software, die vom OpenSSL-Projekt zur Verwendung im Open Registerkartenleiste - - Actions toolbar - Aktionssymbolleiste - - - + [testnet] [Testnetz] @@ -545,12 +540,17 @@ Dieses Produkt enthält Software, die vom OpenSSL-Projekt zur Verwendung im Open Bitcoin-Client - + %n active connection(s) to Bitcoin network %n aktive Verbindung zum Bitcoin-Netzwerk%n aktive Verbindungen zum Bitcoin-Netzwerk - + + No block source available... + Keine Blockquelle verfügbar... + + + Processed %1 of %2 (estimated) blocks of transaction history. %1 von (geschätzten) %2 Blöcken des Transaktionsverlaufs verarbeitet. @@ -575,7 +575,7 @@ Dieses Produkt enthält Software, die vom OpenSSL-Projekt zur Verwendung im Open %n Woche%n Wochen - + %1 behind %1 im Rückstand @@ -590,7 +590,7 @@ Dieses Produkt enthält Software, die vom OpenSSL-Projekt zur Verwendung im Open Transaktionen hiernach werden noch nicht angezeigt. - + Error Fehler @@ -605,22 +605,22 @@ Dieses Produkt enthält Software, die vom OpenSSL-Projekt zur Verwendung im Open Hinweis - + This transaction is over the size limit. You can still send it for a fee of %1, which goes to the nodes that process your transaction and helps to support the network. Do you want to pay the fee? Die Transaktion übersteigt das Größenlimit. Sie können sie trotzdem senden, wenn Sie eine zusätzliche Transaktionsgebühr in Höhe von %1 zahlen. Diese wird an die Knoten verteilt, die Ihre Transaktion bearbeiten und unterstützt damit das Bitcoin-Netzwerk. Möchten Sie die Gebühr bezahlen? - + Up to date Auf aktuellem Stand - + Catching up... Hole auf... - + Confirm transaction fee Transaktionsgebühr bestätigen @@ -669,7 +669,7 @@ Adresse: %4 Brieftasche ist <b>verschlüsselt</b> und aktuell <b>gesperrt</b> - + A fatal error occurred. Bitcoin can no longer continue safely and will quit. Ein schwerer Fehler ist aufgetreten. Bitcoin kann nicht stabil weiter ausgeführt werden und wird beendet. @@ -677,7 +677,7 @@ Adresse: %4 ClientModel - + Network Alert Netzwerkalarm @@ -808,8 +808,8 @@ Adresse: %4 - Optional transaction fee per kB that helps make sure your transactions are processed quickly. Most transactions are 1 kB. Fee 0.01 recommended. - Optionale Transaktionsgebühr pro kB, die sicherstellt, dass Ihre Transaktionen schnell bearbeitet werden. Die meisten Transaktionen sind 1 kB groß. Eine Gebühr von 0.01 BTC wird empfohlen. + Optional transaction fee per kB that helps make sure your transactions are processed quickly. Most transactions are 1 kB. + Optionale Transaktionsgebühr pro KB, die sicherstellt, dass Ihre Transaktionen schnell bearbeitet werden. Die meisten Transaktionen sind 1 kB groß. @@ -1058,7 +1058,7 @@ Adresse: %4 Betrag aus unbestätigten Transaktionen, der noch nicht im aktuellen Kontostand enthalten ist - + out of sync nicht synchron @@ -1135,7 +1135,7 @@ Adresse: %4 Client name - Client Name + Clientname @@ -1154,7 +1154,7 @@ Adresse: %4 Client version - Client Version + Clientversion @@ -1644,6 +1644,19 @@ Adresse: %4 Nachricht verifiziert. + + SplashScreen + + + The Bitcoin developers + Die Bitcoinentwickler + + + + [testnet] + [Testnetz] + + TransactionDesc @@ -2118,10 +2131,28 @@ Adresse: %4 bis + + WalletModel + + + Send Coins + Bitcoins überweisen + + WalletView - + + &Export + E&xportieren + + + + Export the data in the current tab to a file + Daten der aktuellen Ansicht in eine Datei exportieren + + + Backup Wallet Brieftasche sichern @@ -2154,37 +2185,37 @@ Adresse: %4 bitcoin-core - + Bitcoin version Bitcoin-Version - + Usage: Benutzung: - + Send command to -server or bitcoind Befehl an -server oder bitcoind senden - + List commands Befehle auflisten - + Get help for a command Hilfe zu einem Befehl erhalten - + Options: Optionen: - + Specify configuration file (default: bitcoin.conf) Konfigurationsdatei festlegen (Standard: bitcoin.conf) @@ -2194,27 +2225,17 @@ Adresse: %4 PID-Datei festlegen (Standard: bitcoind.pid) - - Generate coins - Bitcoins generieren - - - - Don't generate coins - Keine Bitcoins generieren - - - + Specify data directory Datenverzeichnis festlegen - + Set database cache size in megabytes (default: 25) Größe des Datenbankcaches in MB festlegen (Standard: 25) - + Listen for connections on <port> (default: 8333 or testnet: 18333) <port> nach Verbindungen abhören (Standard: 8333 oder Testnetz: 18333) @@ -2229,7 +2250,7 @@ Adresse: %4 Mit dem Knoten verbinden um Adressen von Gegenstellen abzufragen, danach trennen - + Specify your own public address Die eigene öffentliche Adresse angeben @@ -2239,22 +2260,22 @@ Adresse: %4 Schwellenwert, um Verbindungen zu sich nicht konform verhaltenden Gegenstellen zu beenden (Standard: 100) - + Number of seconds to keep misbehaving peers from reconnecting (default: 86400) Anzahl Sekunden, während denen sich nicht konform verhaltenden Gegenstellen die Wiederverbindung verweigert wird (Standard: 86400) - + An error occurred while setting up the RPC port %u for listening on IPv4: %s Beim Einrichten des abzuhörenden RPC-Ports %u für IPv4 ist ein Fehler aufgetreten: %s - + Listen for JSON-RPC connections on <port> (default: 8332 or testnet: 18332) <port> nach JSON-RPC-Verbindungen abhören (Standard: 8332 oder Testnetz: 18332) - + Accept command line and JSON-RPC commands Kommandozeilenbefehle und JSON-RPC-Befehle annehmen @@ -2264,17 +2285,17 @@ Adresse: %4 Als Hintergrunddienst starten und Befehle annehmen - + Use the test network Das Testnetz verwenden - + Accept connections from outside (default: 1 if no -proxy or -connect) Eingehende Verbindungen annehmen (Standard: 1, wenn nicht -proxy oder -connect) - + %s, you must set a rpcpassword in the configuration file: %s It is recommended you use the following random password: @@ -2313,11 +2334,6 @@ zum Beispiel: alertnotify=echo %%s | mail -s \"Bitcoin Alert\" admin@f Cannot obtain a lock on data directory %s. Bitcoin is probably already running. Datenverzeichnis %s kann nicht gesperrt werden. Evtl. wurde Bitcoin bereits gestartet. - - - Error initializing database environment %s! To recover, BACKUP THAT DIRECTORY, then remove everything from it except for wallet.dat. - Fehler beim Initialisieren der Datenbankumgebung %s! Zur Wiederherstellung, sichern Sie dieses Verzeichnis und löschen darin dann alles, außer wallet.dat. - Error: The transaction was rejected! This might happen if some of the coins in your wallet were already spent, such as if you used a copy of wallet.dat and coins were spent in the copy but not marked as spent here. @@ -2344,12 +2360,7 @@ zum Beispiel: alertnotify=echo %%s | mail -s \"Bitcoin Alert\" admin@f Maximale Größe von "high-priority/low-fee"-Transaktionen in Byte festlegen (Standard: 27000) - - Set the number of script verification threads (1-16, 0=auto, default: 0) - Maximale Anzahl an Skript-Verifizierungs-Threads festlegen (1-16, 0 = automatisch, Standard: 0) - - - + This is a pre-release test build - use at your own risk - do not use for mining or merchant applications Dies ist eine Vorab-Testversion - Verwendung auf eigene Gefahr - nicht für Mining- oder Handelsanwendungen nutzen! @@ -2389,7 +2400,7 @@ zum Beispiel: alertnotify=echo %%s | mail -s \"Bitcoin Alert\" admin@f Blockerzeugungsoptionen: - + Connect only to the specified node(s) Nur mit dem/den angegebenen Knoten verbinden @@ -2409,7 +2420,7 @@ zum Beispiel: alertnotify=echo %%s | mail -s \"Bitcoin Alert\" admin@f Möchten Sie die Blockdatenbank nun neu aufbauen? - + Error initializing block database Fehler beim Initialisieren der Blockdatenbank @@ -2433,11 +2444,6 @@ zum Beispiel: alertnotify=echo %%s | mail -s \"Bitcoin Alert\" admin@f Error: Disk space is low! Fehler: Zu wenig freier Laufwerksspeicherplatz! - - - Error: Transaction creation failed! - Fehler: Transaktionserstellung fehlgeschlagen! - Error: Wallet locked, unable to create transaction! @@ -2509,7 +2515,12 @@ zum Beispiel: alertnotify=echo %%s | mail -s \"Bitcoin Alert\" admin@f Gegenstellen via DNS-Namensauflösung finden (Standard: 1, außer bei -connect) - + + Generate coins (default: 0) + Bitcoins generieren (Standard: 0) + + + How many blocks to check at startup (default: 288, 0 = all) Wieviele Blöcke sollen beim Starten geprüft werden (Standard: 288, 0 = alle) @@ -2519,7 +2530,12 @@ zum Beispiel: alertnotify=echo %%s | mail -s \"Bitcoin Alert\" admin@f Wie gründlich soll die Blockprüfung sein (0-4, Standard: 3) - + + Not enough file descriptors available. + Nicht genügend File-Deskriptoren verfügbar. + + + Rebuild block chain index from current blk000??.dat files Blockkettenindex aus aktuellen Dateien blk000??.dat wiederaufbauen @@ -2529,7 +2545,7 @@ zum Beispiel: alertnotify=echo %%s | mail -s \"Bitcoin Alert\" admin@f Maximale Anzahl an Threads zur Verarbeitung von RPC-Anfragen festlegen (Standard: 4) - + Verifying blocks... Verifiziere Blöcke... @@ -2539,12 +2555,17 @@ zum Beispiel: alertnotify=echo %%s | mail -s \"Bitcoin Alert\" admin@f Verifiziere Brieftasche... - + Imports blocks from external blk000??.dat file Blöcke aus externer Datei blk000??.dat importieren - + + Set the number of script verification threads (up to 16, 0 = auto, <0 = leave that many cores free, default: 0) + Maximale Anzahl an Skript-Verifizierungs-Threads festlegen (bis zu 16, 0 = automatisch, <0 = soviele Kerne frei lassen, Standard: 0) + + + Information Hinweis @@ -2553,6 +2574,16 @@ zum Beispiel: alertnotify=echo %%s | mail -s \"Bitcoin Alert\" admin@f Invalid -tor address: '%s' Ungültige Adresse in -tor: '%s' + + + Invalid amount for -minrelaytxfee=<amount>: '%s' + Ungültiger Betrag für -minrelaytxfee=<amount>: '%s' + + + + Invalid amount for -mintxfee=<amount>: '%s' + Ungültiger Betrag für -mintxfee=<amount>: '%s' + Maintain a full transaction index (default: 0) @@ -2569,7 +2600,7 @@ zum Beispiel: alertnotify=echo %%s | mail -s \"Bitcoin Alert\" admin@f Maximale Größe, <n> * 1000 Byte, des Sendepuffers pro Verbindung (Standard: 1000) - + Only accept block chain matching built-in checkpoints (default: 1) Blockkette nur akzeptieren, wenn sie mit den integrierten Prüfpunkten übereinstimmt (Standard: 1) @@ -2628,6 +2659,11 @@ zum Beispiel: alertnotify=echo %%s | mail -s \"Bitcoin Alert\" admin@f Shrink debug.log file on client startup (default: 1 when no -debug) Verkleinere Datei debug.log beim Start des Clients (Standard: 1, wenn kein -debug) + + + Signing transaction failed + Signierung der Transaktion fehlgeschlagen + Specify connection timeout in milliseconds (default: 5000) @@ -2639,7 +2675,22 @@ zum Beispiel: alertnotify=echo %%s | mail -s \"Bitcoin Alert\" admin@f Systemfehler: - + + Transaction amount too small + Transaktionsbetrag zu gering + + + + Transaction amounts must be positive + Transaktionsbeträge müssen positiv sein + + + + Transaction too large + Transaktion zu groß + + + Use UPnP to map the listening port (default: 0) UPnP verwenden, um die Portweiterleitung einzurichten (Standard: 0) @@ -2671,7 +2722,7 @@ zum Beispiel: alertnotify=echo %%s | mail -s \"Bitcoin Alert\" admin@f You need to rebuild the databases using -reindex to change -txindex - Sie müssen die Datenbanken mit Hilfe von -reindex neu aufbauen, um -txindex verändern zu können. + Sie müssen die Datenbank mit Hilfe von -reindex neu aufbauen, um -txindex zu verändern. @@ -2679,7 +2730,7 @@ zum Beispiel: alertnotify=echo %%s | mail -s \"Bitcoin Alert\" admin@f wallet.dat beschädigt, Rettung fehlgeschlagen - + Password for JSON-RPC connections Passwort für JSON-RPC-Verbindungen @@ -2694,17 +2745,17 @@ zum Beispiel: alertnotify=echo %%s | mail -s \"Bitcoin Alert\" admin@f Sende Befehle an Knoten <ip> (Standard: 127.0.0.1) - + Execute command when the best block changes (%s in cmd is replaced by block hash) Kommando ausführen wenn der beste Block wechselt (%s im Kommando wird durch den Hash des Blocks ersetzt) - + Upgrade wallet to latest format Brieftasche auf das neueste Format aktualisieren - + Set key pool size to <n> (default: 100) Größe des Schlüsselpools festlegen auf <n> (Standard: 100) @@ -2714,12 +2765,12 @@ zum Beispiel: alertnotify=echo %%s | mail -s \"Bitcoin Alert\" admin@f Blockkette erneut nach fehlenden Transaktionen der Brieftasche durchsuchen - + Use OpenSSL (https) for JSON-RPC connections OpenSSL (https) für JSON-RPC-Verbindungen verwenden - + Server certificate file (default: server.cert) Serverzertifikat (Standard: server.cert) @@ -2729,37 +2780,37 @@ zum Beispiel: alertnotify=echo %%s | mail -s \"Bitcoin Alert\" admin@f Privater Serverschlüssel (Standard: server.pem) - + Acceptable ciphers (default: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH) Akzeptierte Chiffren (Standard: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH) - + This help message Dieser Hilfetext - + Unable to bind to %s on this computer (bind returned error %d, %s) Kann auf diesem Computer nicht an %s binden (von bind zurückgegebener Fehler %d, %s) - + Connect through socks proxy Verbindung über SOCKS-Proxy herstellen - + Allow DNS lookups for -addnode, -seednode and -connect Erlaube DNS-Namensauflösung für -addnode, -seednode und -connect - + Loading addresses... Lade Adressen... - + Error loading wallet.dat: Wallet corrupted Fehler beim Laden von wallet.dat: Brieftasche beschädigt @@ -2769,22 +2820,22 @@ zum Beispiel: alertnotify=echo %%s | mail -s \"Bitcoin Alert\" admin@f Fehler beim Laden von wallet.dat: Brieftasche benötigt neuere Version von Bitcoin - + Wallet needed to be rewritten: restart Bitcoin to complete Brieftasche musste neu geschrieben werden: Starten Sie Bitcoin zur Fertigstellung neu - + Error loading wallet.dat Fehler beim Laden von wallet.dat (Brieftasche) - + Invalid -proxy address: '%s' Ungültige Adresse in -proxy: '%s' - + Unknown network specified in -onlynet: '%s' Unbekannter Netztyp in -onlynet angegeben: '%s' @@ -2794,7 +2845,7 @@ zum Beispiel: alertnotify=echo %%s | mail -s \"Bitcoin Alert\" admin@f Unbekannte Proxyversion in -socks angefordert: %i - + Cannot resolve -bind address: '%s' Kann Adresse in -bind nicht auflösen: '%s' @@ -2806,25 +2857,25 @@ zum Beispiel: alertnotify=echo %%s | mail -s \"Bitcoin Alert\" admin@f Invalid amount for -paytxfee=<amount>: '%s' - Falscher Betrag für -paytxfee=<Betrag>: '%s' + Ungültiger Betrag für -paytxfee=<amount>: '%s' Invalid amount - Ungültige Angabe + Ungültiger Betrag - + Insufficient funds Unzureichender Kontostand - + Loading block index... Lade Blockindex... - + Add a node to connect to and attempt to keep the connection open Mit dem Knoten verbinden und versuchen die Verbindung aufrecht zu halten @@ -2834,52 +2885,47 @@ zum Beispiel: alertnotify=echo %%s | mail -s \"Bitcoin Alert\" admin@f Kann auf diesem Computer nicht an %s binden. Evtl. wurde Bitcoin bereits gestartet. - + Fee per KB to add to transactions you send Gebühr pro KB, die gesendeten Transaktionen hinzugefügt wird - + Loading wallet... Lade Brieftasche... - + Cannot downgrade wallet Brieftasche kann nicht auf eine ältere Version herabgestuft werden - - - Cannot initialize keypool - Schlüsselpool kann nicht initialisiert werden - Cannot write default address Standardadresse kann nicht geschrieben werden - + Rescanning... Durchsuche erneut... - + Done loading Laden abgeschlossen - + To use the %s option Zur Nutzung der %s Option - + Error Fehler - + You must set rpcpassword=<password> in the configuration file: %s If the file does not exist, create it with owner-readable-only file permissions. diff --git a/src/qt/locale/bitcoin_el_GR.ts b/src/qt/locale/bitcoin_el_GR.ts index 640d9ee7cf..22125e2bb7 100644 --- a/src/qt/locale/bitcoin_el_GR.ts +++ b/src/qt/locale/bitcoin_el_GR.ts @@ -20,17 +20,22 @@ This is experimental software. Distributed under the MIT/X11 software license, see the accompanying file COPYING or http://www.opensource.org/licenses/mit-license.php. This product includes software developed by the OpenSSL Project for use in the OpenSSL Toolkit (http://www.openssl.org/) and cryptographic software written by Eric Young (eay@cryptsoft.com) and UPnP software written by Thomas Bernard. - + +This is experimental software. + +Distributed under the MIT/X11 software license, see the accompanying file COPYING or http://www.opensource.org/licenses/mit-license.php. + +This product includes software developed by the OpenSSL Project for use in the OpenSSL Toolkit (http://www.openssl.org/) and cryptographic software written by Eric Young (eay@cryptsoft.com) and UPnP software written by Thomas Bernard. - + Copyright - + Πνευματική ιδιοκτησία - 2009-%1 The Bitcoin developers - + The Bitcoin developers + Οι Bitcoin προγραμματιστές @@ -61,7 +66,7 @@ This product includes software developed by the OpenSSL Project for use in the O &Νέα διεύθυνση - + These are your Bitcoin addresses for receiving payments. You may want to give a different one to each sender so you can keep track of who is paying you. Αυτές είναι οι Bitcoin διευθύνσεις σας για να λαμβάνετε πληρωμές. Δίνοντας μία ξεχωριστή διεύθυνση σε κάθε αποστολέα, θα μπορείτε να ελέγχετε ποιος σας πληρώνει. @@ -88,17 +93,27 @@ This product includes software developed by the OpenSSL Project for use in the O Delete the currently selected address from the list - + Αντιγραφη της επιλεγμενης διεύθυνσης στο πρόχειρο του συστηματος - + + Export the data in the current tab to a file + Εξαγωγή δεδομένων καρτέλας σε αρχείο + + + + &Export + &Εξαγωγή + + + Verify a message to ensure it was signed with a specified Bitcoin address - + Υπογράψτε ένα μήνυμα για ν' αποδείξετε πως ανήκει μια συγκεκριμένη διεύθυνση Bitcoin &Verify Message - + &Επιβεβαίωση μηνύματος @@ -108,7 +123,7 @@ This product includes software developed by the OpenSSL Project for use in the O These are your Bitcoin addresses for sending payments. Always check the amount and the receiving address before sending coins. - + Αυτές είναι οι Bitcoin διευθύνσεις σας για να λαμβάνετε πληρωμές. Δίνοντας μία ξεχωριστή διεύθυνση σε κάθε αποστολέα, θα μπορείτε να ελέγχετε ποιος σας πληρώνει. @@ -123,7 +138,7 @@ This product includes software developed by the OpenSSL Project for use in the O Send &Coins - + Αποστολή νομισμάτων @@ -169,7 +184,7 @@ This product includes software developed by the OpenSSL Project for use in the O Passphrase Dialog - + Φράση πρόσβασης @@ -234,23 +249,24 @@ This product includes software developed by the OpenSSL Project for use in the O Warning: If you encrypt your wallet and lose your passphrase, you will <b>LOSE ALL OF YOUR BITCOINS</b>! - + Προσοχη: Εαν κρυπτογραφησεις το πορτοφολι σου και χάσεις τον κωδικο σου θα χάσεις <b> ΟΛΑ ΣΟΥ ΤΑ BITCOINS</b>! +Είσαι σίγουρος ότι θέλεις να κρυπτογραφησεις το πορτοφολι; Are you sure you wish to encrypt your wallet? - + Είστε σίγουροι ότι θέλετε να κρυπτογραφήσετε το πορτοφόλι σας; 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. - + ΣΗΜΑΝΤΙΚΟ: Τα προηγούμενα αντίγραφα ασφαλείας που έχετε κάνει από το αρχείο του πορτοφόλιου σας θα πρέπει να αντικατασταθουν με το νέο που δημιουργείται, κρυπτογραφημένο αρχείο πορτοφόλιου. Για λόγους ασφαλείας, τα προηγούμενα αντίγραφα ασφαλείας του μη κρυπτογραφημένου αρχείου πορτοφόλιου θα καταστουν άχρηστα μόλις αρχίσετε να χρησιμοποιείτε το νέο κρυπτογραφημένο πορτοφόλι. Warning: The Caps Lock key is on! - + Προσοχη: το πλήκτρο Caps Lock είναι ενεργο. @@ -302,7 +318,7 @@ This product includes software developed by the OpenSSL Project for use in the O Wallet passphrase was successfully changed. - + Ο κωδικος του πορτοφολιού άλλαξε με επιτυχία. @@ -313,12 +329,12 @@ This product includes software developed by the OpenSSL Project for use in the O Υπογραφή &Μηνύματος... - + Synchronizing with network... Συγχρονισμός με το δίκτυο... - + &Overview &Επισκόπηση @@ -393,37 +409,27 @@ This product includes software developed by the OpenSSL Project for use in the O &Άλλαξε κωδικο πρόσβασης - + Importing blocks from disk... - + Εισαγωγή μπλοκ από τον σκληρο δίσκο ... Reindexing blocks on disk... - + Φόρτωση ευρετηρίου μπλοκ στον σκληρο δισκο... - - &Export... - &Εξαγωγή - - - + Send coins to a Bitcoin address - + Στείλε νομισματα σε μια διεύθυνση bitcoin Modify configuration options for Bitcoin - + Επεργασία ρυθμισεων επιλογών για το Bitcoin - - Export the data in the current tab to a file - Εξαγωγή δεδομένων καρτέλας σε αρχείο - - - + Backup wallet to another location Δημιουργία αντιγράφου ασφαλείας πορτοφολιού σε άλλη τοποθεσία @@ -433,7 +439,7 @@ This product includes software developed by the OpenSSL Project for use in the O Αλλαγή του κωδικού κρυπτογράφησης του πορτοφολιού - + &Debug window &Παράθυρο αποσφαλμάτωσης @@ -443,35 +449,35 @@ This product includes software developed by the OpenSSL Project for use in the O Άνοιγμα κονσόλας αποσφαλμάτωσης και διαγνωστικών - + &Verify message... - + &Επιβεβαίωση μηνύματος - - + + Bitcoin Bitcoin - + Wallet Πορτοφόλι - + &Send - + &Αποστολή &Receive - + &Παραλαβή &Addresses - + &Διεύθυνσεις @@ -486,30 +492,30 @@ This product includes software developed by the OpenSSL Project for use in the O Show or hide the main Window - + Εμφάνιση ή αποκρύψη του κεντρικου παράθυρου Encrypt the private keys that belong to your wallet - + Κρυπτογραφήστε τα ιδιωτικά κλειδιά που ανήκουν στο πορτοφόλι σας Sign messages with your Bitcoin addresses to prove you own them - + Υπογράψτε ένα μήνυμα για να βεβαιώσετε πως είστε ο κάτοχος αυτής της διεύθυνσης Verify messages to ensure they were signed with specified Bitcoin addresses - + Υπογράψτε ένα μήνυμα για ν' αποδείξετε πως ανήκει μια συγκεκριμένη διεύθυνση Bitcoin - + &File &Αρχείο - + &Settings &Ρυθμίσεις @@ -524,12 +530,7 @@ This product includes software developed by the OpenSSL Project for use in the O Εργαλειοθήκη καρτελών - - Actions toolbar - Εργαλειοθήκη ενεργειών - - - + [testnet] [testnet] @@ -540,82 +541,89 @@ This product includes software developed by the OpenSSL Project for use in the O Πελάτης Bitcoin - + %n active connection(s) to Bitcoin network %n ενεργή σύνδεση στο δίκτυο Bitcoin%n ενεργές συνδέσεις στο δίκτυο Βitcoin - + + No block source available... + Η πηγή του μπλοκ δεν ειναι διαθέσιμη... + + + Processed %1 of %2 (estimated) blocks of transaction history. - + Μεταποιημένα %1 απο % 2 (κατ 'εκτίμηση) μπλοκ της ιστορίας της συναλλαγής. Processed %1 blocks of transaction history. - + Έγινε λήψη %1 μπλοκ ιστορικού συναλλαγών %n hour(s) - + %n ώρες %n ώρες %n day(s) - + %n ημέρες %n ημέρες %n week(s) - + %n εβδομαδες%n εβδομαδες - + %1 behind - + %1 πίσω Last received block was generated %1 ago. - + Το τελευταίο μπλοκ που ελήφθη δημιουργήθηκε %1 πριν. Transactions after this will not yet be visible. - + Οι συναλλαγές μετά από αυτό δεν θα είναι ακόμη ορατες. - + Error Σφάλμα Warning - + Προειδοποίηση Information - + Πληροφορία - + This transaction is over the size limit. You can still send it for a fee of %1, which goes to the nodes that process your transaction and helps to support the network. Do you want to pay the fee? - + Η συναλλαγή ξεπερνάει το όριο. +Μπορεί να ολοκληρωθεί με μια αμοιβή των %1, η οποία αποδίδεται στους κόμβους που επεξεργάζονται τις συναλλαγές και βοηθούν στην υποστήριξη του δικτύου. +Θέλετε να συνεχίσετε; - + Up to date Ενημερωμένο - + Catching up... Ενημέρωση... - + Confirm transaction fee Επιβεβαίωση αμοιβής συναλλαγής @@ -646,13 +654,13 @@ Address: %4 URI handling - + Χειρισμός URI URI can not be parsed! This can be caused by an invalid Bitcoin address or malformed URI parameters. - + Το URI δεν μπορεί να αναλυθεί! Αυτό μπορεί να προκληθεί από μια μη έγκυρη διεύθυνση Bitcoin ή ακατάλληλη παραμέτρο URI. @@ -665,17 +673,17 @@ Address: %4 Το πορτοφόλι είναι <b>κρυπτογραφημένο</b> και <b>κλειδωμένο</b> - + A fatal error occurred. Bitcoin can no longer continue safely and will quit. - + Παρουσιάστηκε ανεπανόρθωτο σφάλμα. Το Bitcoin δεν μπορεί πλέον να συνεχίσει με ασφάλεια και θα τερματισθει. ClientModel - + Network Alert - + Ειδοποίηση Δικτύου @@ -733,7 +741,7 @@ Address: %4 The entered address "%1" is not a valid Bitcoin address. - + Η διεύθυνση "%1" δεν είναι έγκυρη Bitcoin διεύθυνση. @@ -752,7 +760,7 @@ Address: %4 Bitcoin-Qt - + bitcoin-qt @@ -804,8 +812,8 @@ Address: %4 - Optional transaction fee per kB that helps make sure your transactions are processed quickly. Most transactions are 1 kB. Fee 0.01 recommended. - Η προαιρετική αμοιβή για κάθε kB επισπεύδει την επεξεργασία των συναλλαγών σας. Οι περισσότερες συναλλαγές είναι 1 kB. Προτείνεται αμοιβή 0.01. + Optional transaction fee per kB that helps make sure your transactions are processed quickly. Most transactions are 1 kB. + Η προαιρετική αμοιβή για κάθε kB επισπεύδει την επεξεργασία των συναλλαγών σας. Οι περισσότερες συναλλαγές είναι 1 kB. @@ -820,17 +828,17 @@ Address: %4 &Start Bitcoin on system login - + &Έναρξη του Βιtcoin κατά την εκκίνηση του συστήματος Reset all client options to default. - + Επαναφορα όλων των επιλογων του πελάτη σε default. &Reset Options - + Επαναφορα ρυθμίσεων @@ -850,7 +858,7 @@ Address: %4 Connect to the Bitcoin network through a SOCKS proxy (e.g. when connecting through Tor). - + Σύνδεση στο Bitcoin δίκτυο μέσω διαμεσολαβητή SOCKS4 (π.χ. για σύνδεση μέσω Tor) @@ -860,7 +868,7 @@ Address: %4 Proxy &IP: - + &IP διαμεσολαβητή: @@ -870,7 +878,7 @@ Address: %4 &Port: - + &Θύρα: @@ -885,7 +893,7 @@ Address: %4 SOCKS version of the proxy (e.g. 5) - + SOCKS εκδοση του διαμεσολαβητη (e.g. 5) @@ -895,7 +903,7 @@ Address: %4 Show only a tray icon after minimizing the window. - + Εμφάνιση μόνο εικονιδίου στην περιοχή ειδοποιήσεων κατά την ελαχιστοποίηση @@ -910,17 +918,17 @@ Address: %4 M&inimize on close - + Ε&λαχιστοποίηση κατά το κλείσιμο &Display - + %Απεικόνιση User Interface &language: - + Γλώσσα περιβάλλοντος εργασίας: @@ -930,7 +938,7 @@ Address: %4 &Unit to show amounts in: - + &Μονάδα μέτρησης: @@ -945,37 +953,37 @@ Address: %4 &Display addresses in transaction list - + Εμφάνιση διευθύνσεων στη λίστα συναλλαγών &OK - + &ΟΚ &Cancel - + &Ακύρωση &Apply - + &Εφαρμογή default - + προεπιλογή Confirm options reset - + Επιβεβαιώση των επιλογων επαναφοράς Some settings may require a client restart to take effect. - + Για ορισμένες ρυθμίσεις πρεπει η επανεκκίνηση να τεθεί σε ισχύ. @@ -1011,7 +1019,7 @@ Address: %4 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. - + Οι πληροφορίες που εμφανίζονται μπορεί να είναι ξεπερασμένες. Το πορτοφόλι σας συγχρονίζεται αυτόματα με το δίκτυο Bitcoin μετά από μια σύνδεση, αλλά αυτή η διαδικασία δεν έχει ακόμη ολοκληρωθεί. @@ -1031,12 +1039,12 @@ Address: %4 Immature: - + Ανώριμος Mined balance that has not yet matured - + Εξορυγμενο υπόλοιπο που δεν έχει ακόμα ωριμάσει @@ -1054,7 +1062,7 @@ Address: %4 Το άθροισμα των συναλλαγών που δεν έχουν ακόμα επιβεβαιωθεί και δεν προσμετρώνται στο τρέχον υπόλοιπό σας - + out of sync εκτός συγχρονισμού @@ -1065,7 +1073,7 @@ Address: %4 Cannot start bitcoin: click-to-pay handler - + Δεν είναι δυνατή η εκκίνηση του Bitcoin: click-to-pay handler @@ -1073,7 +1081,7 @@ Address: %4 QR Code Dialog - + Κώδικας QR @@ -1108,7 +1116,7 @@ Address: %4 The entered amount is invalid, please check. - + Το αναγραφόμενο ποσό δεν είναι έγκυρο, παρακαλούμε να το ελέγξετε. @@ -1145,7 +1153,7 @@ Address: %4 N/A - + Μη διαθέσιμο @@ -1160,12 +1168,12 @@ Address: %4 Using OpenSSL version - + Χρησιμοποιηση της OpenSSL εκδοσης Startup time - + Χρόνος εκκίνησης @@ -1180,12 +1188,12 @@ Address: %4 On testnet - + Στο testnet Block chain - + αλυσίδα εμποδισμού @@ -1215,12 +1223,12 @@ Address: %4 Show the Bitcoin-Qt help message to get a list with possible Bitcoin command-line options. - + Εμφανιση του Bitcoin-Qt μήνυματος βοήθειας για να πάρετε μια λίστα με τις πιθανές επιλογές Bitcoin γραμμής εντολών. &Show - + &Εμφάνιση @@ -1235,22 +1243,22 @@ Address: %4 Bitcoin - Debug window - + Bitcoin - Παράθυρο αποσφαλμάτωσης Bitcoin Core - + Bitcoin Core Debug log file - + Αρχείο καταγραφής εντοπισμού σφαλμάτων Open the Bitcoin debug log file from the current data directory. This can take a few seconds for large log files. - + Ανοίξτε το αρχείο καταγραφής εντοπισμού σφαλμάτων από τον τρέχοντα κατάλογο δεδομένων. Αυτό μπορεί να πάρει μερικά δευτερόλεπτα για τα μεγάλα αρχεία καταγραφής. @@ -1260,17 +1268,17 @@ Address: %4 Welcome to the Bitcoin RPC console. - + Καλώς ήρθατε στην Bitcoin RPC κονσόλα. Use up and down arrows to navigate history, and <b>Ctrl-L</b> to clear screen. - + Χρησιμοποιήστε το πάνω και κάτω βέλος για να περιηγηθείτε στο ιστορικο, και <b>Ctrl-L</b> για εκκαθαριση οθονης. Type <b>help</b> for an overview of available commands. - + Γράψτε <b>βοήθεια</b> για μια επισκόπηση των διαθέσιμων εντολών @@ -1295,7 +1303,7 @@ Address: %4 Add &Recipient - + &Προσθήκη αποδέκτη @@ -1305,7 +1313,7 @@ Address: %4 Clear &All - + Καθαρισμός &Όλων @@ -1325,7 +1333,7 @@ Address: %4 S&end - + Αποστολη @@ -1350,7 +1358,7 @@ Address: %4 The recipient address is not valid, please recheck. - + Η διεύθυνση του αποδέκτη δεν είναι σωστή. Παρακαλώ ελέγξτε ξανά. @@ -1365,17 +1373,17 @@ Address: %4 The total exceeds your balance when the %1 transaction fee is included. - + Το σύνολο υπερβαίνει το υπόλοιπό σας όταν συμπεριληφθεί και η αμοιβή %1 Duplicate address found, can only send to each address once per send operation. - + Βρέθηκε η ίδια διεύθυνση δύο φορές. Επιτρέπεται μία μόνο εγγραφή για κάθε διεύθυνση, σε κάθε διαδικασία αποστολής. Error: Transaction creation failed! - + Σφάλμα: Η δημιουργία της συναλλαγής απέτυχε @@ -1403,7 +1411,7 @@ Address: %4 The address to send the payment to (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L) - + Διεύθυνση αποστολής της πληρωμής (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L) @@ -1452,7 +1460,7 @@ Address: %4 Signatures - Sign / Verify a Message - + Υπογραφές - Είσοδος / Επαλήθευση μήνυματος @@ -1504,7 +1512,7 @@ Address: %4 Copy the current signature to the system clipboard - + Αντέγραφη της επιλεγμενης διεύθυνσης στο πρόχειρο του συστηματος @@ -1514,28 +1522,28 @@ Address: %4 Sign &Message - + Υπογραφη μήνυματος Reset all sign message fields - + Επαναφορά όλων των πεδίων μήνυματος Clear &All - + Καθαρισμός &Όλων &Verify Message - + &Επιβεβαίωση μηνύματος Enter the signing address, message (ensure you copy line breaks, spaces, tabs, etc. exactly) and signature below to verify the message. Be careful not to read more into the signature than what is in the signed message itself, to avoid being tricked by a man-in-the-middle attack. - + Πληκτρολογήστε την υπογραφή διεύθυνσης, μήνυμα (βεβαιωθείτε ότι έχετε αντιγράψει τις αλλαγές γραμμής, κενά, tabs, κ.λπ. ακριβώς) και την υπογραφή παρακάτω, για να ελέγξει το μήνυμα. Να είστε προσεκτικοί για να μην διαβάσετε περισσότερα στην υπογραφή ό, τι είναι στην υπογραφή ίδιο το μήνυμα , για να μην εξαπατηθούν από έναν άνθρωπο -in - the-middle επίθεση. @@ -1545,17 +1553,17 @@ Address: %4 Verify the message to ensure it was signed with the specified Bitcoin address - + Υπογράψτε ένα μήνυμα για ν' αποδείξετε πως υπογραφθηκε απο μια συγκεκριμένη διεύθυνση Bitcoin Verify &Message - + Επιβεβαίωση μηνύματος Reset all verify message fields - + Επαναφορά όλων επαλήθευμενων πεδίων μήνυματος @@ -1566,18 +1574,18 @@ Address: %4 Click "Sign Message" to generate signature - + Κάντε κλικ στο "Υπογραφή Μηνύματος" για να λάβετε την υπογραφή Enter Bitcoin signature - + Εισαγωγή υπογραφής Bitcoin The entered address is invalid. - + Η διεύθυνση που εισήχθη είναι λάθος. @@ -1585,59 +1593,72 @@ Address: %4 Please check the address and try again. - + Παρακαλούμε ελέγξτε την διεύθυνση και δοκιμάστε ξανά. The entered address does not refer to a key. - + Η διεύθυνση που έχει εισαχθεί δεν αναφέρεται σε ένα πλήκτρο. Wallet unlock was cancelled. - + το ξεκλείδωμα του πορτοφολιού απέτυχε Private key for the entered address is not available. - + Το προσωπικό κλειδί εισαγμενης διευθυνσης δεν είναι διαθέσιμο. Message signing failed. - + Η υπογραφή του μηνύματος απέτυχε. Message signed. - + Μήνυμα υπεγράφη. The signature could not be decoded. - + Η υπογραφή δεν μπόρεσε να αποκρυπτογραφηθεί. Please check the signature and try again. - + Παρακαλούμε ελέγξτε την υπογραφή και δοκιμάστε ξανά. The signature did not match the message digest. - + Η υπογραφή δεν ταιριάζει με το μήνυμα. Message verification failed. - + Η επιβεβαίωση του μηνύματος απέτυχε Message verified. - + Μήνυμα επιβεβαιώθηκε. + + + + SplashScreen + + + The Bitcoin developers + Οι Bitcoin προγραμματιστές + + + + [testnet] + [testnet] @@ -1650,7 +1671,7 @@ Address: %4 %1/offline - + %1/χωρίς σύνδεση; @@ -1670,7 +1691,7 @@ Address: %4 , broadcast through %n node(s) - + , έχει μεταδοθεί μέσω %n κόμβων, έχει μεταδοθεί μέσω %n κόμβων @@ -1680,12 +1701,12 @@ Address: %4 Source - + Πηγή Generated - + Δημιουργία @@ -1704,7 +1725,7 @@ Address: %4 own address - + δική σας διεύθυνση @@ -1718,17 +1739,17 @@ Address: %4 Credit - + Πίστωση matures in %n more block(s) - + ωρίμανση σε %n επιπλέον μπλοκωρίμανση σε %n επιπλέον μπλοκ not accepted - + μη αποδεκτό @@ -1736,17 +1757,17 @@ Address: %4 Debit - + Debit Transaction fee - + Τέλος συναλλαγής Net amount - + Καθαρό ποσό @@ -1756,32 +1777,32 @@ Address: %4 Comment - + Σχόλιο: Transaction ID - + ID Συναλλαγής: Generated coins must mature 120 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. - + Πρέπει να περιμένετε 120 μπλοκ πριν μπορέσετε να χρησιμοποιήσετε τα νομίσματα που έχετε δημιουργήσει. Το μπλοκ που δημιουργήσατε μεταδόθηκε στο δίκτυο για να συμπεριληφθεί στην αλυσίδα των μπλοκ. Αν δεν μπει σε αυτή θα μετατραπεί σε "μη αποδεκτό" και δε θα μπορεί να καταναλωθεί. Αυτό συμβαίνει σπάνια όταν κάποιος άλλος κόμβος δημιουργήσει ένα μπλοκ λίγα δευτερόλεπτα πριν από εσάς. Debug information - + Πληροφορίες αποσφαλμάτωσης Transaction - + Συναλλαγή Inputs - + εισροές @@ -1791,12 +1812,12 @@ Address: %4 true - + αληθής false - + αναληθής @@ -1806,7 +1827,7 @@ Address: %4 Open for %n more block(s) - + Ανοιχτό για %n μπλοκΑνοιχτό για %n μπλοκ @@ -1852,7 +1873,7 @@ Address: %4 Open for %n more block(s) - + Ανοιχτό για %n μπλοκΑνοιχτό για %n μπλοκ @@ -1877,7 +1898,7 @@ Address: %4 Mined balance will be available when it matures in %n more block(s) - + Το υπόλοιπο από την εξόρυξη θα είναι διαθέσιμο μετά από %n μπλοκΤο υπόλοιπο από την εξόρυξη θα είναι διαθέσιμο μετά από %n μπλοκ @@ -2036,7 +2057,7 @@ Address: %4 Copy transaction ID - + Αντιγραφη του ID Συναλλαγής @@ -2114,73 +2135,91 @@ Address: %4 έως + + WalletModel + + + Send Coins + Αποστολή νομισμάτων + + WalletView - + + &Export + &Εξαγωγή + + + + Export the data in the current tab to a file + Εξαγωγή δεδομένων καρτέλας σε αρχείο + + + Backup Wallet - + Αντίγραφο ασφαλείας του πορτοφολιού Wallet Data (*.dat) - + Αρχεία δεδομένων πορτοφολιού (*.dat) Backup Failed - + Αποτυχία κατά τη δημιουργία αντιγράφου There was an error trying to save the wallet data to the new location. - + Παρουσιάστηκε σφάλμα κατά την αποθήκευση των δεδομένων πορτοφολιού στη νέα τοποθεσία. Backup Successful - + Η δημιουργια αντιγραφου ασφαλειας πετυχε The wallet data was successfully saved to the new location. - + Τα δεδομένα πορτοφόλιου αποθηκεύτηκαν με επιτυχία στη νέα θέση. bitcoin-core - + Bitcoin version Έκδοση Bitcoin - + Usage: Χρήση: - + Send command to -server or bitcoind Αποστολή εντολής στον εξυπηρετητή ή στο bitcoind - + List commands Λίστα εντολών - + Get help for a command Επεξήγηση εντολής - + Options: Επιλογές: - + Specify configuration file (default: bitcoin.conf) Ορίστε αρχείο ρυθμίσεων (προεπιλογή: bitcoin.conf) @@ -2190,27 +2229,17 @@ Address: %4 Ορίστε αρχείο pid (προεπιλογή: bitcoind.pid) - - Generate coins - Δημιουργία νομισμάτων - - - - Don't generate coins - Άρνηση δημιουργίας νομισμάτων - - - + Specify data directory Ορισμός φακέλου δεδομένων - + Set database cache size in megabytes (default: 25) Όρισε το μέγεθος της βάσης προσωρινής αποθήκευσης σε megabytes(προεπιλογή:25) - + Listen for connections on <port> (default: 8333 or testnet: 18333) Εισερχόμενες συνδέσεις στη θύρα <port> (προεπιλογή: 8333 ή στο testnet: 18333) @@ -2222,12 +2251,12 @@ Address: %4 Connect to a node to retrieve peer addresses, and disconnect - + Σύνδεση σε έναν κόμβο για την ανάκτηση διευθύνσεων από ομοτίμους, και αποσυνδέσh - + Specify your own public address - + Διευκρινίστε τη δικιά σας δημόσια διεύθυνση. @@ -2235,22 +2264,22 @@ Address: %4 Όριο αποσύνδεσης προβληματικών peers (προεπιλογή: 100) - + Number of seconds to keep misbehaving peers from reconnecting (default: 86400) Δευτερόλεπτα πριν επιτραπεί ξανά η σύνδεση των προβληματικών peers (προεπιλογή: 86400) - + An error occurred while setting up the RPC port %u for listening on IPv4: %s - + Ένα σφάλμα συνέβη καθώς προετοιμαζόταν η πόρτα RPC %u για αναμονή IPv4: %s - + Listen for JSON-RPC connections on <port> (default: 8332 or testnet: 18332) Εισερχόμενες συνδέσεις JSON-RPC στη θύρα <port> (προεπιλογή: 8332 or testnet: 18332) - + Accept command line and JSON-RPC commands Αποδοχή εντολών κονσόλας και JSON-RPC @@ -2260,17 +2289,17 @@ Address: %4 Εκτέλεση στο παρασκήνιο κι αποδοχή εντολών - + Use the test network Χρήση του δοκιμαστικού δικτύου - + Accept connections from outside (default: 1 if no -proxy or -connect) - + Να δέχεσαι συνδέσεις από έξω(προεπιλογή:1) - + %s, you must set a rpcpassword in the configuration file: %s It is recommended you use the following random password: @@ -2282,152 +2311,148 @@ If the file does not exist, create it with owner-readable-only file permissions. It is also recommended to set alertnotify so you are notified of problems; for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com - + %s, you must set a rpcpassword in the configuration file: +%s +It is recommended you use the following random password: +rpcuser=bitcoinrpc +rpcpassword=%s +(you do not need to remember this password) +The username and password MUST NOT be the same. +If the file does not exist, create it with owner-readable-only file permissions. +It is also recommended to set alertnotify so you are notified of problems; +for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com + An error occurred while setting up the RPC port %u for listening on IPv6, falling back to IPv4: %s - + Ένα σφάλμα συνέβη καθώς προετοιμαζόταν η υποδοχη RPC %u για αναμονη του IPv6, επεσε πισω στο IPv4:%s Bind to given address and always listen on it. Use [host]:port notation for IPv6 - + Αποθηκευση σε συγκεκριμένη διεύθυνση. Χρησιμοποιήστε τα πλήκτρα [Host] : συμβολισμός θύρα για IPv6 Cannot obtain a lock on data directory %s. Bitcoin is probably already running. - - - - - Error initializing database environment %s! To recover, BACKUP THAT DIRECTORY, then remove everything from it except for wallet.dat. - + Αδυναμία κλειδώματος του φακέλου δεδομένων %s. Πιθανώς το Bitcoin να είναι ήδη ενεργό. Error: The transaction was rejected! This might happen if some of the coins in your wallet were already spent, such as if you used a copy of wallet.dat and coins were spent in the copy but not marked as spent here. - + Σφάλμα: Η συναλλαγή απορρίφθηκε. +Αυτό ίσως οφείλεται στο ότι τα νομίσματά σας έχουν ήδη ξοδευτεί, π.χ. με την αντιγραφή του wallet.dat σε άλλο σύστημα και την χρήση τους εκεί, χωρίς η συναλλαγή να έχει καταγραφεί στο παρόν σύστημα. Error: This transaction requires a transaction fee of at least %s because of its amount, complexity, or use of recently received funds! - + Σφάλμα: Αυτή η συναλλαγή απαιτεί αμοιβή συναλλαγής τουλάχιστον %s λόγω του μεγέθους, πολυπλοκότητας ή της χρήσης πρόσφατης παραλαβής κεφαλαίου Execute command when a relevant alert is received (%s in cmd is replaced by message) - + Εκτέλεση της εντολής όταν το καλύτερο μπλοκ αλλάξει(%s στην εντολή αντικαθίσταται από το hash του μπλοκ) Execute command when a wallet transaction changes (%s in cmd is replaced by TxID) - + Εκτέλεσε την εντολή όταν το καλύτερο μπλοκ αλλάξει(%s στην εντολή αντικαθίσταται από το hash του μπλοκ) Set maximum size of high-priority/low-fee transactions in bytes (default: 27000) - + Ορίστε το μέγιστο μέγεθος των high-priority/low-fee συναλλαγων σε bytes (προεπιλογή: 27000) - - Set the number of script verification threads (1-16, 0=auto, default: 0) - - - - + This is a pre-release test build - use at your own risk - do not use for mining or merchant applications - + Αυτό είναι ένα προ-τεστ κυκλοφορίας - χρησιμοποιήστε το με δική σας ευθύνη - δεν χρησιμοποιείτε για εξόρυξη ή για αλλες εφαρμογές Warning: -paytxfee is set very high! This is the transaction fee you will pay if you send a transaction. - + Προειδοποίηση: Η παράμετρος -paytxfee είναι πολύ υψηλή. Πρόκειται για την αμοιβή που θα πληρώνετε για κάθε συναλλαγή που θα στέλνετε. Warning: Displayed transactions may not be correct! You may need to upgrade, or other nodes may need to upgrade. - + Προειδοποίηση: Εμφανίσεις συναλλαγων δεν μπορεί να είναι σωστες! Μπορεί να χρειαστεί να αναβαθμίσετε, ή άλλοι κόμβοι μπορεί να χρειαστεί να αναβαθμίστουν. Warning: Please check that your computer's date and time are correct! If your clock is wrong Bitcoin will not work properly. - + Προειδοποίηση: Παρακαλώ βεβαιωθείτε πως η ημερομηνία κι ώρα του συστήματός σας είναι σωστές. Αν το ρολόι του υπολογιστή σας πάει λάθος, ενδέχεται να μη λειτουργεί σωστά το Bitcoin. Warning: error reading wallet.dat! All keys read correctly, but transaction data or address book entries might be missing or incorrect. - + Προειδοποίηση : Σφάλμα wallet.dat κατα την ανάγνωση ! Όλα τα κλειδιά αναγνωρισθηκαν σωστά, αλλά τα δεδομένα των συναλλαγών ή καταχωρήσεις στο βιβλίο διευθύνσεων μπορεί να είναι ελλιπείς ή λανθασμένα. Warning: wallet.dat corrupt, data salvaged! Original wallet.dat saved as wallet.{timestamp}.bak in %s; if your balance or transactions are incorrect you should restore from a backup. - + Προειδοποίηση : το αρχειο wallet.dat ειναι διεφθαρμένο, τα δεδομένα σώζονται ! Original wallet.dat αποθηκεύονται ως πορτοφόλι { timestamp } bak στο % s ? . . Αν το υπόλοιπο του ή τις συναλλαγές σας, είναι λάθος θα πρέπει να επαναφέρετε από ένα αντίγραφο ασφαλείας Attempt to recover private keys from a corrupt wallet.dat - + Προσπάθεια για ανακτησει ιδιωτικων κλειδιων από ενα διεφθαρμένο αρχειο wallet.dat Block creation options: - + Αποκλεισμός επιλογων δημιουργίας: - + Connect only to the specified node(s) Σύνδεση μόνο με ορισμένους κόμβους Corrupted block database detected - + Εντοπισθηκε διεφθαρμενη βαση δεδομενων των μπλοκ Discover own IP address (default: 1 when listening and no -externalip) - + Ανακαλύψτε την δικη σας IP διεύθυνση (προεπιλογή: 1 όταν ακούει και δεν - externalip) Do you want to rebuild the block database now? - + Θελετε να δημιουργηθει τωρα η βαση δεδομενων του μπλοκ? - + Error initializing block database - + Σφάλμα κατά την ενεργοποίηση της βάσης δεδομένων μπλοκ Error initializing wallet database environment %s! - + Σφάλμα κατά την ενεργοποίηση της βάσης δεδομένων πορτοφόλιου %s! Error loading block database - + Σφάλμα φορτωσης της βασης δεδομενων των μπλοκ Error opening block database - + Σφάλμα φορτωσης της βασης δεδομενων των μπλοκ Error: Disk space is low! - - - - - Error: Transaction creation failed! - + Προειδοποίηση: Χαμηλός χώρος στο δίσκο Error: Wallet locked, unable to create transaction! - + Σφάλμα: το πορτοφόλι είναι κλειδωμένο, δεν μπορεί να δημιουργηθεί συναλλαγή @@ -2437,142 +2462,167 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. Failed to listen on any port. Use -listen=0 if you want this. - + ταλαιπωρηθειτε για να ακούσετε σε οποιαδήποτε θύρα. Χρήση - ακούστε = 0 , αν θέλετε αυτό. Failed to read block info - + Αποτυχία αναγνωσης των block πληροφοριων Failed to read block - + Η αναγνωση του μπλοκ απετυχε Failed to sync block index - + Ο συγχρονισμος του μπλοκ ευρετηριου απετυχε Failed to write block index - + Η δημιουργια του μπλοκ ευρετηριου απετυχε Failed to write block info - + Η δημιουργια των μπλοκ πληροφοριων απετυχε Failed to write block - + Η δημιουργια του μπλοκ απετυχε Failed to write file info - + Αδυναμία εγγραφής πληροφοριων αρχειου Failed to write to coin database - + Αποτυχία εγγραφής στη βάση δεδομένων νομίσματος Failed to write transaction index - + Αποτυχία εγγραφής δείκτη συναλλαγών Failed to write undo data - + Αποτυχία εγγραφής αναίρεσης δεδομένων Find peers using DNS lookup (default: 1 unless -connect) - + Βρες ομότιμους υπολογιστές χρησιμοποιώντας αναζήτηση DNS(προεπιλογή:1) - + + Generate coins (default: 0) + Δημιουργία νομισμάτων (προκαθορισμος: 0) + + + How many blocks to check at startup (default: 288, 0 = all) - + Πόσα μπλοκ να ελέγχθουν κατά την εκκίνηση (προεπιλογή:288,0=όλα) How thorough the block verification is (0-4, default: 3) - + Πόσο εξονυχιστική να είναι η επιβεβαίωση του μπλοκ(0-4, προεπιλογή:3) - + + Not enough file descriptors available. + Δεν ειναι αρκετες περιγραφες αρχείων διαθέσιμες. + + + Rebuild block chain index from current blk000??.dat files - + Εισαγωγή μπλοκ από εξωτερικό αρχείο blk000?.dat Set the number of threads to service RPC calls (default: 4) - + Ορίσμος του αριθμόυ θεματων στην υπηρεσία κλήσεων RPC (προεπιλογή: 4) - + Verifying blocks... - + Επαλήθευση των μπλοκ... Verifying wallet... - + Επαλήθευση πορτοφολιου... - + Imports blocks from external blk000??.dat file - + Εισαγωγή μπλοκ από εξωτερικό αρχείο blk000?.dat - + + Set the number of script verification threads (up to 16, 0 = auto, <0 = leave that many cores free, default: 0) + Ορίσμος του αριθμό των νημάτων ελέγχου σεναρίου (μέχρι 16, 0 = auto, <0 = αφήνουν τους πολλους πυρήνες δωρεάν, default: 0) + + + Information - + Πληροφορία Invalid -tor address: '%s' - + Δεν είναι έγκυρη η διεύθυνση διαμεσολαβητή: '%s' + + + + Invalid amount for -minrelaytxfee=<amount>: '%s' + Μη έγκυρο ποσό για την παράμετρο -paytxfee=<amount>: '%s' + + + + Invalid amount for -mintxfee=<amount>: '%s' + Μη έγκυρο ποσό για την παράμετρο -paytxfee=<amount>: '%s' Maintain a full transaction index (default: 0) - + Διατηρήση ένος πλήρες ευρετήριου συναλλαγών (προεπιλογή: 0) Maximum per-connection receive buffer, <n>*1000 bytes (default: 5000) - + Μέγιστος buffer λήψης ανά σύνδεση, <n>*1000 bytes (προεπιλογή: 5000) Maximum per-connection send buffer, <n>*1000 bytes (default: 1000) - + Μέγιστος buffer αποστολής ανά σύνδεση, <n>*1000 bytes (προεπιλογή: 1000) - + Only accept block chain matching built-in checkpoints (default: 1) - + Μονο αποδοχη αλυσίδας μπλοκ που ταιριάζει με τα ενσωματωμένα σημεία ελέγχου (προεπιλογή: 1) Only connect to nodes in network <net> (IPv4, IPv6 or Tor) - + Συνδέση μόνο σε κόμβους του δικτύου <net> (IPv4, IPv6 ή Tor) Output extra debugging information. Implies all other -debug* options - + Έξοδος επιπλέον πληροφοριών εντοπισμού σφαλμάτων Output extra network debugging information - + Έξοδος επιπλέον πληροφοριών εντοπισμού σφαλμάτων @@ -2582,12 +2632,12 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. SSL options: (see the Bitcoin Wiki for SSL setup instructions) - + Ρυθμίσεις SSL: (ανατρέξτε στο Bitcoin Wiki για οδηγίες ρυθμίσεων SSL) Select the version of socks proxy to use (4-5, default: 5) - + Επιλέξτε την έκδοση του διαμεσολαβητη για να χρησιμοποιήσετε (4-5 , προεπιλογή: 5) @@ -2602,17 +2652,22 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. Set maximum block size in bytes (default: 250000) - + Ορίσμος του μέγιστου μέγεθος block σε bytes (προεπιλογή: 250000) Set minimum block size in bytes (default: 0) - + Ορίστε το μέγιστο μέγεθος block σε bytes (προεπιλογή: 0) Shrink debug.log file on client startup (default: 1 when no -debug) - + Συρρίκνωση του αρχείο debug.log κατα την εκκίνηση του πελάτη (προεπιλογή: 1 όταν δεν-debug) + + + + Signing transaction failed + Η υπογραφή συναλλαγής απέτυχε @@ -2625,19 +2680,34 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. Λάθος Συστήματος: - + + Transaction amount too small + Το ποσό της συναλλαγής είναι πολύ μικρο + + + + Transaction amounts must be positive + Τα ποσά των συναλλαγών πρέπει να είναι θετικα + + + + Transaction too large + Η συναλλαγή ειναι πολύ μεγάλη + + + Use UPnP to map the listening port (default: 0) - + Χρησιμοποίηση του UPnP για την χρήση της πόρτας αναμονής (προεπιλογή:0) Use UPnP to map the listening port (default: 1 when listening) - + Χρησιμοποίηση του UPnP για την χρήση της πόρτας αναμονής (προεπιλογή:1) Use proxy to reach tor hidden services (default: same as -proxy) - + Χρήση διακομιστή μεσολάβησης για την επίτευξη των Tor κρυμμένων υπηρεσιων (προεπιλογή: ίδιο με το-proxy) @@ -2647,25 +2717,25 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. Warning - + Προειδοποίηση Warning: This version is obsolete, upgrade required! - + Προειδοποίηση: Αυτή η έκδοση είναι ξεπερασμένη, απαιτείται αναβάθμιση You need to rebuild the databases using -reindex to change -txindex - + Θα πρέπει να ξαναχτίστουν οι βάσεις δεδομένων που χρησιμοποιούντε-Αναδημιουργία αλλάγων-txindex wallet.dat corrupt, salvage failed - + Το αρχειο wallet.dat ειναι διεφθαρμένο, η διάσωση απέτυχε - + Password for JSON-RPC connections Κωδικός για τις συνδέσεις JSON-RPC @@ -2680,17 +2750,17 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. Αποστολή εντολών στον κόμβο <ip> (προεπιλογή: 127.0.0.1) - + Execute command when the best block changes (%s in cmd is replaced by block hash) Εκτέλεσε την εντολή όταν το καλύτερο μπλοκ αλλάξει(%s στην εντολή αντικαθίσταται από το hash του μπλοκ) - + Upgrade wallet to latest format Αναβάθμισε το πορτοφόλι στην τελευταία έκδοση - + Set key pool size to <n> (default: 100) Όριο πλήθους κλειδιών pool <n> (προεπιλογή: 100) @@ -2700,12 +2770,12 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. Επανέλεγχος της αλυσίδας μπλοκ για απούσες συναλλαγές - + Use OpenSSL (https) for JSON-RPC connections Χρήση του OpenSSL (https) για συνδέσεις JSON-RPC - + Server certificate file (default: server.cert) Αρχείο πιστοποιητικού του διακομιστή (προεπιλογή: server.cert) @@ -2715,37 +2785,37 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. Προσωπικό κλειδί του διακομιστή (προεπιλογή: server.pem) - + Acceptable ciphers (default: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH) Αποδεκτά κρυπτογραφήματα (προεπιλογή: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH) - + This help message Αυτό το κείμενο βοήθειας - + Unable to bind to %s on this computer (bind returned error %d, %s) - + Αδύνατη η σύνδεση με τη θύρα %s αυτού του υπολογιστή (bind returned error %d, %s) - + Connect through socks proxy Σύνδεση μέσω διαμεσολαβητή socks - + Allow DNS lookups for -addnode, -seednode and -connect - + Να επιτρέπονται οι έλεγχοι DNS για προσθήκη και σύνδεση κόμβων - + Loading addresses... Φόρτωση διευθύνσεων... - + Error loading wallet.dat: Wallet corrupted Σφάλμα φόρτωσης wallet.dat: Κατεστραμμένο Πορτοφόλι @@ -2755,44 +2825,44 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. Σφάλμα φόρτωσης wallet.dat: Το Πορτοφόλι απαιτεί μια νεότερη έκδοση του Bitcoin - + Wallet needed to be rewritten: restart Bitcoin to complete Απαιτείται η επανεγγραφή του Πορτοφολιού, η οποία θα ολοκληρωθεί στην επανεκκίνηση του Bitcoin - + Error loading wallet.dat Σφάλμα φόρτωσης αρχείου wallet.dat - + Invalid -proxy address: '%s' Δεν είναι έγκυρη η διεύθυνση διαμεσολαβητή: '%s' - + Unknown network specified in -onlynet: '%s' - + Άγνωστo δίκτυο ορίζεται σε onlynet: '%s' Unknown -socks proxy version requested: %i - + Άγνωστo δίκτυο ορίζεται: %i - + Cannot resolve -bind address: '%s' - + Δεν μπορώ να γράψω την προεπιλεγμένη διεύθυνση: '%s' Cannot resolve -externalip address: '%s' - + Δεν μπορώ να γράψω την προεπιλεγμένη διεύθυνση: '%s' Invalid amount for -paytxfee=<amount>: '%s' - + Μη έγκυρο ποσό για την παράμετρο -paytxfee=<amount>: '%s' @@ -2800,72 +2870,67 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. Λάθος ποσότητα - + Insufficient funds Ανεπαρκές κεφάλαιο - + Loading block index... Φόρτωση ευρετηρίου μπλοκ... - + Add a node to connect to and attempt to keep the connection open Προσέθεσε ένα κόμβο για σύνδεση και προσπάθησε να κρατήσεις την σύνδεση ανοιχτή Unable to bind to %s on this computer. Bitcoin is probably already running. - + Αδύνατη η σύνδεση με τη θύρα %s αυτού του υπολογιστή. Το Bitcoin είναι πιθανώς ήδη ενεργό. - + Fee per KB to add to transactions you send Αμοιβή ανά KB που θα προστίθεται στις συναλλαγές που στέλνεις - + Loading wallet... Φόρτωση πορτοφολιού... - + Cannot downgrade wallet Δεν μπορώ να υποβαθμίσω το πορτοφόλι - - - Cannot initialize keypool - Δεν μπορώ αν αρχικοποιήσω την λίστα κλειδιών - Cannot write default address Δεν μπορώ να γράψω την προεπιλεγμένη διεύθυνση - + Rescanning... Ανίχνευση... - + Done loading Η φόρτωση ολοκληρώθηκε - + To use the %s option Χρήση της %s επιλογής - + Error Σφάλμα - + You must set rpcpassword=<password> in the configuration file: %s If the file does not exist, create it with owner-readable-only file permissions. diff --git a/src/qt/locale/bitcoin_en.ts b/src/qt/locale/bitcoin_en.ts index 557d0d0275..2006a5296b 100644 --- a/src/qt/locale/bitcoin_en.ts +++ b/src/qt/locale/bitcoin_en.ts @@ -325,17 +325,17 @@ This product includes software developed by the OpenSSL Project for use in the O BitcoinGUI - + Sign &message... Sign &message... - + Synchronizing with network... Synchronizing with network... - + &Overview &Overview @@ -410,7 +410,7 @@ This product includes software developed by the OpenSSL Project for use in the O &Change Passphrase... - + Importing blocks from disk... Importing blocks from disk... @@ -420,7 +420,7 @@ This product includes software developed by the OpenSSL Project for use in the O Reindexing blocks on disk... - + Send coins to a Bitcoin address Send coins to a Bitcoin address @@ -455,18 +455,18 @@ This product includes software developed by the OpenSSL Project for use in the O &Verify message... - - + + Bitcoin Bitcoin - + Wallet Wallet - + &Send &Send @@ -542,7 +542,7 @@ This product includes software developed by the OpenSSL Project for use in the O Bitcoin client - + %n active connection(s) to Bitcoin network %n active connection to Bitcoin network @@ -684,7 +684,7 @@ Address: %4 Wallet is <b>encrypted</b> and currently <b>locked</b> - + A fatal error occurred. Bitcoin can no longer continue safely and will quit. A fatal error occurred. Bitcoin can no longer continue safely and will quit. @@ -823,8 +823,8 @@ Address: %4 - Optional transaction fee per kB that helps make sure your transactions are processed quickly. Most transactions are 1 kB. Fee 0.01 recommended. - Optional transaction fee per kB that helps make sure your transactions are processed quickly. Most transactions are 1 kB. Fee 0.01 recommended. + Optional transaction fee per kB that helps make sure your transactions are processed quickly. Most transactions are 1 kB. + Optional transaction fee per kB that helps make sure your transactions are processed quickly. Most transactions are 1 kB. @@ -2161,15 +2161,28 @@ Address: %4 to + + WalletModel + + + Send Coins + Send Coins + + WalletView - + + &Export + &Export + + + Export the data in the current tab to a file Export the data in the current tab to a file - + Backup Wallet Backup Wallet @@ -2202,37 +2215,37 @@ Address: %4 bitcoin-core - + Bitcoin version Bitcoin version - + Usage: Usage: - + Send command to -server or bitcoind Send command to -server or bitcoind - + List commands List commands - + Get help for a command Get help for a command - + Options: Options: - + Specify configuration file (default: bitcoin.conf) Specify configuration file (default: bitcoin.conf) @@ -2242,27 +2255,17 @@ Address: %4 Specify pid file (default: bitcoind.pid) - - Generate coins - Generate coins - - - - Don't generate coins - Don't generate coins - - - + Specify data directory Specify data directory - + Set database cache size in megabytes (default: 25) Set database cache size in megabytes (default: 25) - + Listen for connections on <port> (default: 8333 or testnet: 18333) Listen for connections on <port> (default: 8333 or testnet: 18333) @@ -2277,7 +2280,7 @@ Address: %4 Connect to a node to retrieve peer addresses, and disconnect - + Specify your own public address Specify your own public address @@ -2287,22 +2290,22 @@ Address: %4 Threshold for disconnecting misbehaving peers (default: 100) - + Number of seconds to keep misbehaving peers from reconnecting (default: 86400) Number of seconds to keep misbehaving peers from reconnecting (default: 86400) - + An error occurred while setting up the RPC port %u for listening on IPv4: %s An error occurred while setting up the RPC port %u for listening on IPv4: %s - + Listen for JSON-RPC connections on <port> (default: 8332 or testnet: 18332) Listen for JSON-RPC connections on <port> (default: 8332 or testnet: 18332) - + Accept command line and JSON-RPC commands Accept command line and JSON-RPC commands @@ -2312,17 +2315,17 @@ Address: %4 Run in the background as a daemon and accept commands - + Use the test network Use the test network - + Accept connections from outside (default: 1 if no -proxy or -connect) Accept connections from outside (default: 1 if no -proxy or -connect) - + %s, you must set a rpcpassword in the configuration file: %s It is recommended you use the following random password: @@ -2361,11 +2364,6 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. Cannot obtain a lock on data directory %s. Bitcoin is probably already running. Cannot obtain a lock on data directory %s. Bitcoin is probably already running. - - - Error initializing database environment %s! To recover, BACKUP THAT DIRECTORY, then remove everything from it except for wallet.dat. - Error initializing database environment %s! To recover, BACKUP THAT DIRECTORY, then remove everything from it except for wallet.dat. - Error: The transaction was rejected! This might happen if some of the coins in your wallet were already spent, such as if you used a copy of wallet.dat and coins were spent in the copy but not marked as spent here. @@ -2392,12 +2390,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. Set maximum size of high-priority/low-fee transactions in bytes (default: 27000) - - Set the number of script verification threads (1-16, 0=auto, default: 0) - Set the number of script verification threads (1-16, 0=auto, default: 0) - - - + This is a pre-release test build - use at your own risk - do not use for mining or merchant applications This is a pre-release test build - use at your own risk - do not use for mining or merchant applications @@ -2437,7 +2430,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. Block creation options: - + Connect only to the specified node(s) Connect only to the specified node(s) @@ -2457,7 +2450,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. Do you want to rebuild the block database now? - + Error initializing block database Error initializing block database @@ -2481,11 +2474,6 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. Error: Disk space is low! Error: Disk space is low! - - - Error: Transaction creation failed! - Error: Transaction creation failed! - Error: Wallet locked, unable to create transaction! @@ -2557,7 +2545,12 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. Find peers using DNS lookup (default: 1 unless -connect) - + + Generate coins (default: 0) + Generate coins (default: 0) + + + How many blocks to check at startup (default: 288, 0 = all) How many blocks to check at startup (default: 288, 0 = all) @@ -2567,7 +2560,12 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. How thorough the block verification is (0-4, default: 3) - + + Not enough file descriptors available. + Not enough file descriptors available. + + + Rebuild block chain index from current blk000??.dat files Rebuild block chain index from current blk000??.dat files @@ -2577,7 +2575,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. Set the number of threads to service RPC calls (default: 4) - + Verifying blocks... Verifying blocks... @@ -2587,12 +2585,17 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. Verifying wallet... - + Imports blocks from external blk000??.dat file Imports blocks from external blk000??.dat file - + + Set the number of script verification threads (up to 16, 0 = auto, <0 = leave that many cores free, default: 0) + Set the number of script verification threads (up to 16, 0 = auto, <0 = leave that many cores free, default: 0) + + + Information Information @@ -2601,6 +2604,16 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. Invalid -tor address: '%s' Invalid -tor address: '%s' + + + Invalid amount for -minrelaytxfee=<amount>: '%s' + Invalid amount for -minrelaytxfee=<amount>: '%s' + + + + Invalid amount for -mintxfee=<amount>: '%s' + Invalid amount for -mintxfee=<amount>: '%s' + Maintain a full transaction index (default: 0) @@ -2617,7 +2630,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. Maximum per-connection send buffer, <n>*1000 bytes (default: 1000) - + Only accept block chain matching built-in checkpoints (default: 1) Only accept block chain matching built-in checkpoints (default: 1) @@ -2676,6 +2689,11 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. Shrink debug.log file on client startup (default: 1 when no -debug) Shrink debug.log file on client startup (default: 1 when no -debug) + + + Signing transaction failed + Signing transaction failed + Specify connection timeout in milliseconds (default: 5000) @@ -2687,7 +2705,22 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. System error: - + + Transaction amount too small + Transaction amount too small + + + + Transaction amounts must be positive + Transaction amounts must be positive + + + + Transaction too large + Transaction too large + + + Use UPnP to map the listening port (default: 0) Use UPnP to map the listening port (default: 0) @@ -2727,7 +2760,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. wallet.dat corrupt, salvage failed - + Password for JSON-RPC connections Password for JSON-RPC connections @@ -2742,17 +2775,17 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. Send commands to node running on <ip> (default: 127.0.0.1) - + Execute command when the best block changes (%s in cmd is replaced by block hash) Execute command when the best block changes (%s in cmd is replaced by block hash) - + Upgrade wallet to latest format Upgrade wallet to latest format - + Set key pool size to <n> (default: 100) Set key pool size to <n> (default: 100) @@ -2762,12 +2795,12 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. Rescan the block chain for missing wallet transactions - + Use OpenSSL (https) for JSON-RPC connections Use OpenSSL (https) for JSON-RPC connections - + Server certificate file (default: server.cert) Server certificate file (default: server.cert) @@ -2777,37 +2810,37 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. Server private key (default: server.pem) - + Acceptable ciphers (default: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH) Acceptable ciphers (default: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH) - + This help message This help message - + Unable to bind to %s on this computer (bind returned error %d, %s) Unable to bind to %s on this computer (bind returned error %d, %s) - + Connect through socks proxy Connect through socks proxy - + Allow DNS lookups for -addnode, -seednode and -connect Allow DNS lookups for -addnode, -seednode and -connect - + Loading addresses... Loading addresses... - + Error loading wallet.dat: Wallet corrupted Error loading wallet.dat: Wallet corrupted @@ -2817,22 +2850,22 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. Error loading wallet.dat: Wallet requires newer version of Bitcoin - + Wallet needed to be rewritten: restart Bitcoin to complete Wallet needed to be rewritten: restart Bitcoin to complete - + Error loading wallet.dat Error loading wallet.dat - + Invalid -proxy address: '%s' Invalid -proxy address: '%s' - + Unknown network specified in -onlynet: '%s' Unknown network specified in -onlynet: '%s' @@ -2842,7 +2875,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. Unknown -socks proxy version requested: %i - + Cannot resolve -bind address: '%s' Cannot resolve -bind address: '%s' @@ -2862,17 +2895,17 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. Invalid amount - + Insufficient funds Insufficient funds - + Loading block index... Loading block index... - + Add a node to connect to and attempt to keep the connection open Add a node to connect to and attempt to keep the connection open @@ -2882,52 +2915,47 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. Unable to bind to %s on this computer. Bitcoin is probably already running. - + Fee per KB to add to transactions you send Fee per KB to add to transactions you send - + Loading wallet... Loading wallet... - + Cannot downgrade wallet Cannot downgrade wallet - - - Cannot initialize keypool - Cannot initialize keypool - Cannot write default address Cannot write default address - + Rescanning... Rescanning... - + Done loading Done loading - + To use the %s option To use the %s option - + Error Error - + You must set rpcpassword=<password> in the configuration file: %s If the file does not exist, create it with owner-readable-only file permissions. diff --git a/src/qt/locale/bitcoin_eo.ts b/src/qt/locale/bitcoin_eo.ts index 2903e70ba4..04a65147f7 100644 --- a/src/qt/locale/bitcoin_eo.ts +++ b/src/qt/locale/bitcoin_eo.ts @@ -23,13 +23,13 @@ This product includes software developed by the OpenSSL Project for use in the O - + Copyright - 2009-%1 The Bitcoin developers + The Bitcoin developers @@ -61,7 +61,7 @@ This product includes software developed by the OpenSSL Project for use in the O &Nova Adreso - + These are your Bitcoin addresses for receiving payments. You may want to give a different one to each sender so you can keep track of who is paying you. @@ -91,7 +91,17 @@ This product includes software developed by the OpenSSL Project for use in the O - + + Export the data in the current tab to a file + + + + + &Export + + + + Verify a message to ensure it was signed with a specified Bitcoin address @@ -313,12 +323,12 @@ This product includes software developed by the OpenSSL Project for use in the O Subskribu &mesaĝon... - + Synchronizing with network... Sinkronigante kun reto... - + &Overview &Superrigardo @@ -393,7 +403,7 @@ This product includes software developed by the OpenSSL Project for use in the O &Anstataŭigu pasfrazon... - + Importing blocks from disk... @@ -403,12 +413,7 @@ This product includes software developed by the OpenSSL Project for use in the O - - &Export... - &Eksportu... - - - + Send coins to a Bitcoin address @@ -418,12 +423,7 @@ This product includes software developed by the OpenSSL Project for use in the O - - Export the data in the current tab to a file - - - - + Backup wallet to another location @@ -433,7 +433,7 @@ This product includes software developed by the OpenSSL Project for use in the O - + &Debug window @@ -443,23 +443,23 @@ This product includes software developed by the OpenSSL Project for use in the O - + &Verify message... &Kontrolu mesaĝon... - - + + Bitcoin - + Wallet Monujo - + &Send @@ -504,12 +504,12 @@ This product includes software developed by the OpenSSL Project for use in the O - + &File &Dosiero - + &Settings &Agordoj @@ -524,12 +524,7 @@ This product includes software developed by the OpenSSL Project for use in the O - - Actions toolbar - - - - + [testnet] @@ -540,12 +535,17 @@ This product includes software developed by the OpenSSL Project for use in the O - + %n active connection(s) to Bitcoin network - + + No block source available... + + + + Processed %1 of %2 (estimated) blocks of transaction history. @@ -570,7 +570,7 @@ This product includes software developed by the OpenSSL Project for use in the O %n semajno%n semajnoj - + %1 behind @@ -585,7 +585,7 @@ This product includes software developed by the OpenSSL Project for use in the O - + Error Eraro @@ -600,22 +600,22 @@ This product includes software developed by the OpenSSL Project for use in the O - + This transaction is over the size limit. You can still send it for a fee of %1, which goes to the nodes that process your transaction and helps to support the network. Do you want to pay the fee? - + Up to date Ĝisdata - + Catching up... Ĝisdatigante... - + Confirm transaction fee @@ -661,7 +661,7 @@ Address: %4 Monujo estas <b>ĉifrita</b> kaj nun <b>ŝlosita</b> - + A fatal error occurred. Bitcoin can no longer continue safely and will quit. @@ -669,7 +669,7 @@ Address: %4 ClientModel - + Network Alert Reta Averto @@ -800,7 +800,7 @@ Address: %4 - Optional transaction fee per kB that helps make sure your transactions are processed quickly. Most transactions are 1 kB. Fee 0.01 recommended. + Optional transaction fee per kB that helps make sure your transactions are processed quickly. Most transactions are 1 kB. @@ -1050,7 +1050,7 @@ Address: %4 - + out of sync @@ -1636,6 +1636,19 @@ Address: %4 + + SplashScreen + + + The Bitcoin developers + + + + + [testnet] + + + TransactionDesc @@ -2110,10 +2123,28 @@ Address: %4 + + WalletModel + + + Send Coins + + + WalletView - + + &Export + + + + + Export the data in the current tab to a file + + + + Backup Wallet @@ -2146,37 +2177,37 @@ Address: %4 bitcoin-core - + Bitcoin version Bitcoin-a versio - + Usage: - + Send command to -server or bitcoind - + List commands Listigu instrukciojn - + Get help for a command - + Options: Opcioj: - + Specify configuration file (default: bitcoin.conf) @@ -2186,27 +2217,17 @@ Address: %4 - - Generate coins - Generu monerojn - - - - Don't generate coins - Ne generu monerojn - - - + Specify data directory - + Set database cache size in megabytes (default: 25) - + Listen for connections on <port> (default: 8333 or testnet: 18333) @@ -2221,7 +2242,7 @@ Address: %4 - + Specify your own public address @@ -2231,22 +2252,22 @@ Address: %4 - + Number of seconds to keep misbehaving peers from reconnecting (default: 86400) - + An error occurred while setting up the RPC port %u for listening on IPv4: %s - + Listen for JSON-RPC connections on <port> (default: 8332 or testnet: 18332) - + Accept command line and JSON-RPC commands @@ -2256,17 +2277,17 @@ Address: %4 - + Use the test network - + Accept connections from outside (default: 1 if no -proxy or -connect) - + %s, you must set a rpcpassword in the configuration file: %s It is recommended you use the following random password: @@ -2295,11 +2316,6 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. Cannot obtain a lock on data directory %s. Bitcoin is probably already running. - - - Error initializing database environment %s! To recover, BACKUP THAT DIRECTORY, then remove everything from it except for wallet.dat. - - Error: The transaction was rejected! This might happen if some of the coins in your wallet were already spent, such as if you used a copy of wallet.dat and coins were spent in the copy but not marked as spent here. @@ -2326,12 +2342,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. - - Set the number of script verification threads (1-16, 0=auto, default: 0) - - - - + This is a pre-release test build - use at your own risk - do not use for mining or merchant applications @@ -2371,7 +2382,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. - + Connect only to the specified node(s) @@ -2391,7 +2402,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. - + Error initializing block database @@ -2415,11 +2426,6 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. Error: Disk space is low! - - - Error: Transaction creation failed! - - Error: Wallet locked, unable to create transaction! @@ -2491,7 +2497,12 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. - + + Generate coins (default: 0) + + + + How many blocks to check at startup (default: 288, 0 = all) @@ -2501,7 +2512,12 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. - + + Not enough file descriptors available. + + + + Rebuild block chain index from current blk000??.dat files @@ -2511,7 +2527,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. - + Verifying blocks... @@ -2521,12 +2537,17 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. - + Imports blocks from external blk000??.dat file - + + Set the number of script verification threads (up to 16, 0 = auto, <0 = leave that many cores free, default: 0) + + + + Information @@ -2535,6 +2556,16 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. Invalid -tor address: '%s' + + + Invalid amount for -minrelaytxfee=<amount>: '%s' + + + + + Invalid amount for -mintxfee=<amount>: '%s' + + Maintain a full transaction index (default: 0) @@ -2551,7 +2582,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. - + Only accept block chain matching built-in checkpoints (default: 1) @@ -2610,6 +2641,11 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. Shrink debug.log file on client startup (default: 1 when no -debug) + + + Signing transaction failed + + Specify connection timeout in milliseconds (default: 5000) @@ -2621,7 +2657,22 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. - + + Transaction amount too small + + + + + Transaction amounts must be positive + + + + + Transaction too large + + + + Use UPnP to map the listening port (default: 0) @@ -2661,7 +2712,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. - + Password for JSON-RPC connections @@ -2676,17 +2727,17 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. - + Execute command when the best block changes (%s in cmd is replaced by block hash) - + Upgrade wallet to latest format - + Set key pool size to <n> (default: 100) @@ -2696,12 +2747,12 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. - + Use OpenSSL (https) for JSON-RPC connections - + Server certificate file (default: server.cert) @@ -2711,37 +2762,37 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. - + Acceptable ciphers (default: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH) - + This help message - + Unable to bind to %s on this computer (bind returned error %d, %s) - + Connect through socks proxy - + Allow DNS lookups for -addnode, -seednode and -connect - + Loading addresses... Ŝarĝante adresojn... - + Error loading wallet.dat: Wallet corrupted @@ -2751,22 +2802,22 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. - + Wallet needed to be rewritten: restart Bitcoin to complete - + Error loading wallet.dat - + Invalid -proxy address: '%s' - + Unknown network specified in -onlynet: '%s' @@ -2776,7 +2827,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. - + Cannot resolve -bind address: '%s' @@ -2796,17 +2847,17 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. - + Insufficient funds - + Loading block index... Ŝarĝante blok-indekson... - + Add a node to connect to and attempt to keep the connection open @@ -2816,52 +2867,47 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. - + Fee per KB to add to transactions you send - + Loading wallet... Ŝarĝante monujon... - + Cannot downgrade wallet - - - Cannot initialize keypool - - Cannot write default address - + Rescanning... - + Done loading Ŝarĝado finitas - + To use the %s option Por uzi la opcion %s - + Error Eraro - + You must set rpcpassword=<password> in the configuration file: %s If the file does not exist, create it with owner-readable-only file permissions. diff --git a/src/qt/locale/bitcoin_es.ts b/src/qt/locale/bitcoin_es.ts index adba3420b2..7c584e954a 100644 --- a/src/qt/locale/bitcoin_es.ts +++ b/src/qt/locale/bitcoin_es.ts @@ -31,14 +31,14 @@ el OpenSSL Toolkit (http://www.openssl.org/) y software criptográfico escrito p Eric Young (eay@cryptsoft.com) y el software UPnP escrito por Thomas Bernard. - + Copyright Copyright - 2009-%1 The Bitcoin developers - 2009-%1 Los desarrolladores de Bitcoin + The Bitcoin developers + Los programadores Bitcoin @@ -69,9 +69,9 @@ Eric Young (eay@cryptsoft.com) y el software UPnP escrito por Thomas Bernard.&Añadir dirección - + These are your Bitcoin addresses for receiving payments. You may want to give a different one to each sender so you can keep track of who is paying you. - Estas son tus direcciones Bitcoin para recibir pagos. Puedes utilizar una diferente por cada persona emisora para saber quién te está pagando. + Estas son sus direcciones Bitcoin para recibir pagos. Puede utilizar una diferente por cada persona emisora para saber quién le está pagando. @@ -99,7 +99,17 @@ Eric Young (eay@cryptsoft.com) y el software UPnP escrito por Thomas Bernard.Borrar de la lista la dirección seleccionada - + + Export the data in the current tab to a file + Exportar a un archivo los datos de esta pestaña + + + + &Export + &Exportar + + + Verify a message to ensure it was signed with a specified Bitcoin address Verificar un mensaje para comprobar que fue firmado con la dirección Bitcoin indicada @@ -182,7 +192,7 @@ Eric Young (eay@cryptsoft.com) y el software UPnP escrito por Thomas Bernard. Enter passphrase - Introducir contraseña + Introducir contraseña @@ -252,7 +262,7 @@ Eric Young (eay@cryptsoft.com) y el software UPnP escrito por Thomas Bernard. 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. - IMPORTANTE: Cualquier copia de seguridad que haya realizado previamente de su fichero de billetera debe reemplazarse con el fichero de billetera encriptado recientemente creado. Por razones de seguridad, las copias de seguridad previas del fichero de billetera que no estaban encriptadas pasarán a estar inservibles en cuanto comience a usar la nueva billetera encriptada. + IMPORTANTE: Cualquier copia de seguridad que haya realizado previamente de su archivo de monedero debe reemplazarse con el nuevo archivo de monedero cifrado. Por razones de seguridad, las copias de seguridad previas del archivo de monedero no cifradas serán inservibles en cuanto comience a usar el nuevo monedero cifrado. @@ -321,12 +331,12 @@ Eric Young (eay@cryptsoft.com) y el software UPnP escrito por Thomas Bernard.Firmar &mensaje... - + Synchronizing with network... Sincronizando con la red… - + &Overview &Vista general @@ -401,7 +411,7 @@ Eric Young (eay@cryptsoft.com) y el software UPnP escrito por Thomas Bernard.&Cambiar la contraseña… - + Importing blocks from disk... Importando bloques de disco... @@ -411,12 +421,7 @@ Eric Young (eay@cryptsoft.com) y el software UPnP escrito por Thomas Bernard.Reindexando bloques en disco... - - &Export... - &Exportar… - - - + Send coins to a Bitcoin address Enviar monedas a una dirección Bitcoin @@ -426,12 +431,7 @@ Eric Young (eay@cryptsoft.com) y el software UPnP escrito por Thomas Bernard.Modificar las opciones de configuración de Bitcoin - - Export the data in the current tab to a file - Exportar a un archivo los datos de esta pestaña - - - + Backup wallet to another location Copia de seguridad del monedero en otra ubicación @@ -441,7 +441,7 @@ Eric Young (eay@cryptsoft.com) y el software UPnP escrito por Thomas Bernard.Cambiar la contraseña utilizada para el cifrado del monedero - + &Debug window Ventana de &depuración @@ -451,23 +451,23 @@ Eric Young (eay@cryptsoft.com) y el software UPnP escrito por Thomas Bernard.Abrir la consola de depuración y diagnóstico - + &Verify message... &Verificar mensaje... - - + + Bitcoin Bitcoin - + Wallet Monedero - + &Send &Enviar @@ -504,7 +504,7 @@ Eric Young (eay@cryptsoft.com) y el software UPnP escrito por Thomas Bernard. Sign messages with your Bitcoin addresses to prove you own them - Firmar mensajes con sus direcciones Bitcoin para probar la propiedad + Firmar mensajes con sus direcciones Bitcoin para demostrar la propiedad @@ -512,12 +512,12 @@ Eric Young (eay@cryptsoft.com) y el software UPnP escrito por Thomas Bernard.Verificar mensajes comprobando que están firmados con direcciones Bitcoin concretas - + &File &Archivo - + &Settings &Configuración @@ -532,12 +532,7 @@ Eric Young (eay@cryptsoft.com) y el software UPnP escrito por Thomas Bernard.Barra de pestañas - - Actions toolbar - Barra de acciones - - - + [testnet] [testnet] @@ -548,14 +543,19 @@ Eric Young (eay@cryptsoft.com) y el software UPnP escrito por Thomas Bernard.Cliente Bitcoin - + %n active connection(s) to Bitcoin network %n conexión activa hacia la red Bitcoin%n conexiones activas hacia la red Bitcoin - + + No block source available... + Ninguna fuente de bloques disponible ... + + + Processed %1 of %2 (estimated) blocks of transaction history. - Se han procesado %1 de %2 (estimación) bloques de historia de transacción. + Se han procesado %1 de %2 bloques (estimados) del historial de transacciones. @@ -578,9 +578,9 @@ Eric Young (eay@cryptsoft.com) y el software UPnP escrito por Thomas Bernard.%n semana%n semanas - + %1 behind - %1 detrás + %1 atrás @@ -590,10 +590,10 @@ Eric Young (eay@cryptsoft.com) y el software UPnP escrito por Thomas Bernard. Transactions after this will not yet be visible. - Las transacciones que vengan después de esta todavía no serán visibles. + Las transacciones posteriores a esta aún no están visibles. - + Error Error @@ -608,22 +608,22 @@ Eric Young (eay@cryptsoft.com) y el software UPnP escrito por Thomas Bernard.Información - + This transaction is over the size limit. You can still send it for a fee of %1, which goes to the nodes that process your transaction and helps to support the network. Do you want to pay the fee? Esta transacción supera el límite de tamaño. Puede enviarla con una comisión de %1, destinada a los nodos que procesen su transacción para contribuir al mantenimiento de la red. ¿Desea pagar esta comisión? - + Up to date Actualizado - + Catching up... - Recuperando... + Actualizando... - + Confirm transaction fee Confirme la tarifa de la transacción @@ -673,7 +673,7 @@ Dirección: %4 El monedero está <b>cifrado</b> y actualmente <b>bloqueado</b> - + A fatal error occurred. Bitcoin can no longer continue safely and will quit. Ha ocurrido un error crítico. Bitcoin ya no puede continuar con seguridad y se cerrará. @@ -681,7 +681,7 @@ Dirección: %4 ClientModel - + Network Alert Alerta de red @@ -812,8 +812,8 @@ Dirección: %4 - Optional transaction fee per kB that helps make sure your transactions are processed quickly. Most transactions are 1 kB. Fee 0.01 recommended. - Tarifa de transacción por KB opcional que ayuda a asegurarse de que sus transacciones se procesan rápidamente. La mayoría de las transacciones son de 1 KB. Tarifa de 0,01 recomendada. + Optional transaction fee per kB that helps make sure your transactions are processed quickly. Most transactions are 1 kB. + Tarifa de transacción opcional por kB que ayuda a asegurar que sus transacciones sean procesadas rápidamente. La mayoría de transacciones son de 1kB. @@ -1054,7 +1054,7 @@ Dirección: %4 Your current balance - Saldo actual + Su saldo actual @@ -1062,7 +1062,7 @@ Dirección: %4 Total de las transacciones que faltan por confirmar y que no contribuyen al saldo actual - + out of sync desincronizado @@ -1648,6 +1648,19 @@ Dirección: %4 Mensaje verificado. + + SplashScreen + + + The Bitcoin developers + Los programadores Bitcoin + + + + [testnet] + [testnet] + + TransactionDesc @@ -2122,10 +2135,28 @@ Dirección: %4 para + + WalletModel + + + Send Coins + Enviar monedas + + WalletView - + + &Export + &Exportar + + + + Export the data in the current tab to a file + Exportar a un archivo los datos de esta pestaña + + + Backup Wallet Respaldo de monedero @@ -2158,40 +2189,40 @@ Dirección: %4 bitcoin-core - + Bitcoin version Versión de Bitcoin - + Usage: Uso: - + Send command to -server or bitcoind Envíar comando a -server o bitcoind - + List commands Muestra comandos - + Get help for a command Recibir ayuda para un comando - + Options: Opciones: - + Specify configuration file (default: bitcoin.conf) Especificar archivo de configuración (predeterminado: bitcoin.conf) @@ -2203,27 +2234,17 @@ Dirección: %4 - - Generate coins - Generar monedas - - - - Don't generate coins - No generar monedas - - - + Specify data directory Especificar directorio para los datos - + Set database cache size in megabytes (default: 25) Establecer el tamaño de caché de la base de datos en megabytes (predeterminado: 25) - + Listen for connections on <port> (default: 8333 or testnet: 18333) Escuchar conexiones en <puerto> (predeterminado: 8333 o testnet: 18333) @@ -2238,7 +2259,7 @@ Dirección: %4 Conectar a un nodo para obtener direcciones de pares y desconectar - + Specify your own public address Especifique su propia dirección pública @@ -2248,22 +2269,22 @@ Dirección: %4 Umbral para la desconexión de pares con mal comportamiento (predeterminado: 100) - + Number of seconds to keep misbehaving peers from reconnecting (default: 86400) Número de segundos en que se evita la reconexión de pares con mal comportamiento (predeterminado: 86400) - + An error occurred while setting up the RPC port %u for listening on IPv4: %s Ha ocurrido un error al configurar el puerto RPC %u para escucha en IPv4: %s - + Listen for JSON-RPC connections on <port> (default: 8332 or testnet: 18332) Escuchar conexiones JSON-RPC en <puerto> (predeterminado: 8332 o testnet:18332) - + Accept command line and JSON-RPC commands Aceptar comandos consola y JSON-RPC @@ -2275,18 +2296,18 @@ Dirección: %4 - + Use the test network Usar la red de pruebas - + Accept connections from outside (default: 1 if no -proxy or -connect) Aceptar conexiones desde el exterior (predeterminado: 1 si no -proxy o -connect) - + %s, you must set a rpcpassword in the configuration file: %s It is recommended you use the following random password: @@ -2325,11 +2346,6 @@ Por ejemplo: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. Cannot obtain a lock on data directory %s. Bitcoin is probably already running. No se puede bloquear el directorio de datos %s. Probablemente Bitcoin ya se está ejecutando. - - - Error initializing database environment %s! To recover, BACKUP THAT DIRECTORY, then remove everything from it except for wallet.dat. - ¡Error al inicializar el entorno de base de datos %s! Para restaurarlo, HAGA UNA COPIA DE SEGURIDAD DEL DIRECTORIO y borre todos sus contenidos excepto wallet.dat. - Error: The transaction was rejected! This might happen if some of the coins in your wallet were already spent, such as if you used a copy of wallet.dat and coins were spent in the copy but not marked as spent here. @@ -2356,12 +2372,7 @@ Por ejemplo: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. Establecer el tamaño máximo de las transacciones de alta prioridad/comisión baja en bytes (predeterminado:27000) - - Set the number of script verification threads (1-16, 0=auto, default: 0) - Establecer el número de hilos para la verificación de scripts (1-16, 0=automático, predeterminado: 0) - - - + This is a pre-release test build - use at your own risk - do not use for mining or merchant applications Esta es una versión de pre-prueba - utilícela bajo su propio riesgo. No la utilice para usos comerciales o de minería. @@ -2388,7 +2399,7 @@ Por ejemplo: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. Warning: wallet.dat corrupt, data salvaged! Original wallet.dat saved as wallet.{timestamp}.bak in %s; if your balance or transactions are incorrect you should restore from a backup. - Aviso: ¿Recuperados datos de wallet.dat corrupto! El wallet.dat original se ha guardado como wallet.{timestamp}.bak en %s; si hubiera errores en su saldo o transacciones, deberá restaurar una copia de respaldo. + Aviso: ¡Recuperados datos de wallet.dat corrupto! El wallet.dat original se ha guardado como wallet.{timestamp}.bak en %s; si hubiera errores en su saldo o transacciones, deberá restaurar una copia de seguridad. @@ -2401,7 +2412,7 @@ Por ejemplo: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. Opciones de creación de bloques: - + Connect only to the specified node(s) Conectar sólo a los nodos (o nodo) especificados @@ -2421,7 +2432,7 @@ Por ejemplo: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. ¿Quieres reconstruir la base de datos de bloques ahora? - + Error initializing block database Error al inicializar la base de datos de bloques @@ -2445,11 +2456,6 @@ Por ejemplo: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. Error: Disk space is low! Error: ¡Espacio en disco bajo! - - - Error: Transaction creation failed! - Error: ¡Ha fallado la creación de la transacción! - Error: Wallet locked, unable to create transaction! @@ -2521,7 +2527,12 @@ Por ejemplo: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. Encontrar pares mediante búsqueda de DNS (predeterminado: 1 salvo con -connect) - + + Generate coins (default: 0) + Generar monedas (por defecto: 0) + + + How many blocks to check at startup (default: 288, 0 = all) Cuántos bloques comprobar al iniciar (predeterminado: 288, 0 = todos) @@ -2531,7 +2542,12 @@ Por ejemplo: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. Como es de exhaustiva la verificación de bloques (0-4, por defecto 3) - + + Not enough file descriptors available. + No hay suficientes descriptores de archivo disponibles. + + + Rebuild block chain index from current blk000??.dat files Reconstruir el índice de la cadena de bloques a partir de los archivos blk000??.dat actuales @@ -2541,7 +2557,7 @@ Por ejemplo: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. Establecer el número de hilos para atender las llamadas RPC (predeterminado: 4) - + Verifying blocks... Verificando bloques... @@ -2551,12 +2567,17 @@ Por ejemplo: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. Verificando monedero... - + Imports blocks from external blk000??.dat file Importa los bloques desde un archivo blk000??.dat externo - + + Set the number of script verification threads (up to 16, 0 = auto, <0 = leave that many cores free, default: 0) + Configura el número de hilos para el script de verificación (hasta 16, 0 = auto, <0 = leave that many cores free, por fecto: 0) + + + Information Información @@ -2565,6 +2586,16 @@ Por ejemplo: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. Invalid -tor address: '%s' Dirección -tor inválida: '%s' + + + Invalid amount for -minrelaytxfee=<amount>: '%s' + Inválido por el monto -minrelaytxfee=<amount>: '%s' + + + + Invalid amount for -mintxfee=<amount>: '%s' + Inválido por el monto -mintxfee=<amount>: '%s' + Maintain a full transaction index (default: 0) @@ -2581,7 +2612,7 @@ Por ejemplo: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. Búfer de recepción máximo por conexión, , <n>*1000 bytes (predeterminado: 1000) - + Only accept block chain matching built-in checkpoints (default: 1) Aceptar solamente cadena de bloques que concuerde con los puntos de control internos (predeterminado: 1) @@ -2640,6 +2671,11 @@ Por ejemplo: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. Shrink debug.log file on client startup (default: 1 when no -debug) Reducir el archivo debug.log al iniciar el cliente (predeterminado: 1 sin -debug) + + + Signing transaction failed + Transacción falló + Specify connection timeout in milliseconds (default: 5000) @@ -2651,7 +2687,22 @@ Por ejemplo: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. Error de sistema: - + + Transaction amount too small + Monto de la transacción muy pequeño + + + + Transaction amounts must be positive + Montos de transacciones deben ser positivos + + + + Transaction too large + Transacción demasiado grande + + + Use UPnP to map the listening port (default: 0) Usar UPnP para asignar el puerto de escucha (predeterminado: 0) @@ -2692,7 +2743,7 @@ Por ejemplo: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. wallet.dat corrupto. Ha fallado la recuperación. - + Password for JSON-RPC connections Contraseña para las conexiones JSON-RPC @@ -2710,17 +2761,17 @@ Por ejemplo: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. - + Execute command when the best block changes (%s in cmd is replaced by block hash) Ejecutar un comando cuando cambia el mejor bloque (%s en cmd se sustituye por el hash de bloque) - + Upgrade wallet to latest format Actualizar el monedero al último formato - + Set key pool size to <n> (default: 100) Ajustar el número de claves en reserva <n> (predeterminado: 100) @@ -2731,13 +2782,13 @@ Por ejemplo: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. Volver a examinar la cadena de bloques en busca de transacciones del monedero perdidas - + Use OpenSSL (https) for JSON-RPC connections Usar OpenSSL (https) para las conexiones JSON-RPC - + Server certificate file (default: server.cert) Certificado del servidor (predeterminado: server.cert) @@ -2749,39 +2800,39 @@ Por ejemplo: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. - + Acceptable ciphers (default: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH) Cifrados aceptados (predeterminado: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH) - + This help message Este mensaje de ayuda - + Unable to bind to %s on this computer (bind returned error %d, %s) No es posible conectar con %s en este sistema (bind ha dado el error %d, %s) - + Connect through socks proxy Conectar mediante proxy socks - + Allow DNS lookups for -addnode, -seednode and -connect Permitir búsquedas DNS para -addnode, -seednode y -connect - + Loading addresses... Cargando direcciones... - + Error loading wallet.dat: Wallet corrupted Error al cargar wallet.dat: el monedero está dañado @@ -2791,22 +2842,22 @@ Por ejemplo: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. Error al cargar wallet.dat: El monedero requiere una versión más reciente de Bitcoin - + Wallet needed to be rewritten: restart Bitcoin to complete El monedero ha necesitado ser reescrito. Reinicie Bitcoin para completar el proceso - + Error loading wallet.dat Error al cargar wallet.dat - + Invalid -proxy address: '%s' Dirección -proxy inválida: '%s' - + Unknown network specified in -onlynet: '%s' La red especificada en -onlynet '%s' es desconocida @@ -2816,7 +2867,7 @@ Por ejemplo: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. Solicitada versión de proxy -socks desconocida: %i - + Cannot resolve -bind address: '%s' No se puede resolver la dirección de -bind: '%s' @@ -2836,17 +2887,17 @@ Por ejemplo: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. Cuantía no válida - + Insufficient funds Fondos insuficientes - + Loading block index... Cargando el índice de bloques... - + Add a node to connect to and attempt to keep the connection open Añadir un nodo al que conectarse y tratar de mantener la conexión abierta @@ -2856,52 +2907,47 @@ Por ejemplo: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. No es posible conectar con %s en este sistema. Probablemente Bitcoin ya está ejecutándose. - + Fee per KB to add to transactions you send Tarifa por KB que añadir a las transacciones que envíe - + Loading wallet... Cargando monedero... - + Cannot downgrade wallet No se puede rebajar el monedero - - - Cannot initialize keypool - No se puede inicializar la reserva de claves - Cannot write default address No se puede escribir la dirección predeterminada - + Rescanning... - Rescaneando... + Reexplorando... - + Done loading Generado pero no aceptado - + To use the %s option Para utilizar la opción %s - + Error Error - + You must set rpcpassword=<password> in the configuration file: %s If the file does not exist, create it with owner-readable-only file permissions. diff --git a/src/qt/locale/bitcoin_es_CL.ts b/src/qt/locale/bitcoin_es_CL.ts index 66ab01dd95..29ac9ea2e8 100644 --- a/src/qt/locale/bitcoin_es_CL.ts +++ b/src/qt/locale/bitcoin_es_CL.ts @@ -31,13 +31,13 @@ el OpenSSL Toolkit (http://www.openssl.org/), software criptográfico escrito po Eric Young (eay@cryptsoft.com) y UPnP software escrito por Thomas Bernard. - + Copyright - 2009-%1 The Bitcoin developers + The Bitcoin developers @@ -69,7 +69,7 @@ Eric Young (eay@cryptsoft.com) y UPnP software escrito por Thomas Bernard.&Nueva dirección - + These are your Bitcoin addresses for receiving payments. You may want to give a different one to each sender so you can keep track of who is paying you. Estas son tus direcciones Bitcoin para recibir pagos. Puedes utilizar una diferente por cada persona emisora para saber quien te está pagando. @@ -99,7 +99,17 @@ Eric Young (eay@cryptsoft.com) y UPnP software escrito por Thomas Bernard. - + + Export the data in the current tab to a file + Exportar los datos de la pestaña actual a un archivo + + + + &Export + + + + Verify a message to ensure it was signed with a specified Bitcoin address @@ -321,12 +331,12 @@ Eric Young (eay@cryptsoft.com) y UPnP software escrito por Thomas Bernard.Firmar &Mensaje... - + Synchronizing with network... Sincronizando con la red... - + &Overview &Vista general @@ -401,7 +411,7 @@ Eric Young (eay@cryptsoft.com) y UPnP software escrito por Thomas Bernard.&Cambiar la contraseña... - + Importing blocks from disk... @@ -411,12 +421,7 @@ Eric Young (eay@cryptsoft.com) y UPnP software escrito por Thomas Bernard. - - &Export... - &Exportar... - - - + Send coins to a Bitcoin address Enviar monedas a una dirección bitcoin @@ -426,12 +431,7 @@ Eric Young (eay@cryptsoft.com) y UPnP software escrito por Thomas Bernard.Modifica las opciones de configuración de bitcoin - - Export the data in the current tab to a file - Exportar los datos de la pestaña actual a un archivo - - - + Backup wallet to another location Respaldar billetera en otra ubicación @@ -441,7 +441,7 @@ Eric Young (eay@cryptsoft.com) y UPnP software escrito por Thomas Bernard.Cambiar la contraseña utilizada para la codificación de la billetera - + &Debug window @@ -451,23 +451,23 @@ Eric Young (eay@cryptsoft.com) y UPnP software escrito por Thomas Bernard. - + &Verify message... - - + + Bitcoin Bitcoin - + Wallet Cartera - + &Send @@ -512,12 +512,12 @@ Eric Young (eay@cryptsoft.com) y UPnP software escrito por Thomas Bernard. - + &File &Archivo - + &Settings &Configuración @@ -532,12 +532,7 @@ Eric Young (eay@cryptsoft.com) y UPnP software escrito por Thomas Bernard.Barra de pestañas - - Actions toolbar - Barra de acciónes - - - + [testnet] [red-de-pruebas] @@ -548,12 +543,17 @@ Eric Young (eay@cryptsoft.com) y UPnP software escrito por Thomas Bernard.Cliente Bitcoin - + %n active connection(s) to Bitcoin network %n conexión activa hacia la red Bitcoin%n conexiones activas hacia la red Bitcoin - + + No block source available... + + + + Processed %1 of %2 (estimated) blocks of transaction history. @@ -578,7 +578,7 @@ Eric Young (eay@cryptsoft.com) y UPnP software escrito por Thomas Bernard. - + %1 behind @@ -593,7 +593,7 @@ Eric Young (eay@cryptsoft.com) y UPnP software escrito por Thomas Bernard. - + Error @@ -608,22 +608,22 @@ Eric Young (eay@cryptsoft.com) y UPnP software escrito por Thomas Bernard. - + This transaction is over the size limit. You can still send it for a fee of %1, which goes to the nodes that process your transaction and helps to support the network. Do you want to pay the fee? - + Up to date Actualizado - + Catching up... Recuperando... - + Confirm transaction fee @@ -672,7 +672,7 @@ Dirección: %4 La billetera esta <b>codificada</b> y actualmente <b>bloqueda</b> - + A fatal error occurred. Bitcoin can no longer continue safely and will quit. @@ -680,7 +680,7 @@ Dirección: %4 ClientModel - + Network Alert @@ -812,8 +812,8 @@ Dirección: %4 - Optional transaction fee per kB that helps make sure your transactions are processed quickly. Most transactions are 1 kB. Fee 0.01 recommended. - Comisión opcional por kB que ayuda a asegurar que sus transacciones son procesadas rápidamente. La mayoria de transacciones son de 1 KB. Se recomienda comisión de 0.01 + Optional transaction fee per kB that helps make sure your transactions are processed quickly. Most transactions are 1 kB. + @@ -1062,7 +1062,7 @@ Dirección: %4 Total de transacciones que no han sido confirmadas aun, y que no cuentan para el saldo actual. - + out of sync @@ -1648,6 +1648,19 @@ Dirección: %4 + + SplashScreen + + + The Bitcoin developers + + + + + [testnet] + [red-de-pruebas] + + TransactionDesc @@ -2122,10 +2135,28 @@ Dirección: %4 para + + WalletModel + + + Send Coins + Enviar monedas + + WalletView - + + &Export + + + + + Export the data in the current tab to a file + Exportar los datos de la pestaña actual a un archivo + + + Backup Wallet @@ -2158,41 +2189,41 @@ Dirección: %4 bitcoin-core - + Bitcoin version Versión Bitcoin - + Usage: Uso: - + Send command to -server or bitcoind Envia comando a bitcoin lanzado con -server u bitcoind - + List commands Muestra comandos - + Get help for a command Recibir ayuda para un comando - + Options: Opciones: - + Specify configuration file (default: bitcoin.conf) Especifica archivo de configuración (predeterminado: bitcoin.conf) @@ -2204,30 +2235,18 @@ Dirección: %4 - - Generate coins - Genera monedas - - - - - Don't generate coins - No generar monedas - - - - + Specify data directory Especifica directorio para los datos - + Set database cache size in megabytes (default: 25) - + Listen for connections on <port> (default: 8333 or testnet: 18333) Escuchar por conecciones en <puerto> (Por defecto: 8333 o red de prueba: 18333) @@ -2242,7 +2261,7 @@ Dirección: %4 - + Specify your own public address @@ -2252,22 +2271,22 @@ Dirección: %4 Umbral de desconección de clientes con mal comportamiento (por defecto: 100) - + Number of seconds to keep misbehaving peers from reconnecting (default: 86400) - + An error occurred while setting up the RPC port %u for listening on IPv4: %s - + Listen for JSON-RPC connections on <port> (default: 8332 or testnet: 18332) Escucha conexiones JSON-RPC en el puerto <port> (predeterminado: 8332 or testnet: 18332) - + Accept command line and JSON-RPC commands Aceptar comandos consola y JSON-RPC @@ -2279,18 +2298,18 @@ Dirección: %4 - + Use the test network Usa la red de pruebas - + Accept connections from outside (default: 1 if no -proxy or -connect) - + %s, you must set a rpcpassword in the configuration file: %s It is recommended you use the following random password: @@ -2319,11 +2338,6 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. Cannot obtain a lock on data directory %s. Bitcoin is probably already running. - - - Error initializing database environment %s! To recover, BACKUP THAT DIRECTORY, then remove everything from it except for wallet.dat. - - Error: The transaction was rejected! This might happen if some of the coins in your wallet were already spent, such as if you used a copy of wallet.dat and coins were spent in the copy but not marked as spent here. @@ -2350,12 +2364,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. - - Set the number of script verification threads (1-16, 0=auto, default: 0) - - - - + This is a pre-release test build - use at your own risk - do not use for mining or merchant applications @@ -2395,7 +2404,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. - + Connect only to the specified node(s) Conecta solo al nodo especificado @@ -2416,7 +2425,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. - + Error initializing block database @@ -2440,11 +2449,6 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. Error: Disk space is low! - - - Error: Transaction creation failed! - - Error: Wallet locked, unable to create transaction! @@ -2516,7 +2520,12 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. - + + Generate coins (default: 0) + + + + How many blocks to check at startup (default: 288, 0 = all) @@ -2526,7 +2535,12 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. - + + Not enough file descriptors available. + + + + Rebuild block chain index from current blk000??.dat files @@ -2536,7 +2550,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. - + Verifying blocks... @@ -2546,12 +2560,17 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. - + Imports blocks from external blk000??.dat file - + + Set the number of script verification threads (up to 16, 0 = auto, <0 = leave that many cores free, default: 0) + + + + Information @@ -2560,6 +2579,16 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. Invalid -tor address: '%s' Dirección -tor invalida: '%s' + + + Invalid amount for -minrelaytxfee=<amount>: '%s' + + + + + Invalid amount for -mintxfee=<amount>: '%s' + + Maintain a full transaction index (default: 0) @@ -2576,7 +2605,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. - + Only accept block chain matching built-in checkpoints (default: 1) @@ -2635,6 +2664,11 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. Shrink debug.log file on client startup (default: 1 when no -debug) + + + Signing transaction failed + + Specify connection timeout in milliseconds (default: 5000) @@ -2646,7 +2680,22 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. - + + Transaction amount too small + + + + + Transaction amounts must be positive + + + + + Transaction too large + + + + Use UPnP to map the listening port (default: 0) Intenta usar UPnP para mapear el puerto de escucha (default: 0) @@ -2687,7 +2736,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. - + Password for JSON-RPC connections Contraseña para las conexiones JSON-RPC @@ -2705,17 +2754,17 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. - + Execute command when the best block changes (%s in cmd is replaced by block hash) - + Upgrade wallet to latest format Actualizar billetera al formato actual - + Set key pool size to <n> (default: 100) Ajusta el numero de claves en reserva <n> (predeterminado: 100) @@ -2727,13 +2776,13 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. - + Use OpenSSL (https) for JSON-RPC connections Usa OpenSSL (https) para las conexiones JSON-RPC - + Server certificate file (default: server.cert) Certificado del servidor (Predeterminado: server.cert) @@ -2745,40 +2794,40 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. - + Acceptable ciphers (default: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH) Cifrados aceptados (Predeterminado: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH) - + This help message Este mensaje de ayuda - + Unable to bind to %s on this computer (bind returned error %d, %s) No es posible escuchar en el %s en este ordenador (bind returned error %d, %s) - + Connect through socks proxy Conecta mediante proxy socks - + Allow DNS lookups for -addnode, -seednode and -connect Permite búsqueda DNS para addnode y connect - + Loading addresses... Cargando direcciónes... - + Error loading wallet.dat: Wallet corrupted Error cargando wallet.dat: Billetera corrupta @@ -2788,22 +2837,22 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. Error cargando wallet.dat: Billetera necesita una vercion reciente de Bitcoin - + Wallet needed to be rewritten: restart Bitcoin to complete La billetera necesita ser reescrita: reinicie Bitcoin para completar - + Error loading wallet.dat Error cargando wallet.dat - + Invalid -proxy address: '%s' Dirección -proxy invalida: '%s' - + Unknown network specified in -onlynet: '%s' @@ -2813,7 +2862,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. - + Cannot resolve -bind address: '%s' @@ -2833,17 +2882,17 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. Cantidad inválida - + Insufficient funds Fondos insuficientes - + Loading block index... Cargando el index de bloques... - + Add a node to connect to and attempt to keep the connection open Agrega un nodo para conectarse and attempt to keep the connection open @@ -2853,52 +2902,47 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. No es posible escuchar en el %s en este ordenador. Probablemente Bitcoin ya se está ejecutando. - + Fee per KB to add to transactions you send Comisión por kB para adicionarla a las transacciones enviadas - + Loading wallet... Cargando cartera... - + Cannot downgrade wallet - - - Cannot initialize keypool - - Cannot write default address - + Rescanning... Rescaneando... - + Done loading Carga completa - + To use the %s option - + Error Error - + You must set rpcpassword=<password> in the configuration file: %s If the file does not exist, create it with owner-readable-only file permissions. diff --git a/src/qt/locale/bitcoin_et.ts b/src/qt/locale/bitcoin_et.ts index 6512fca3ec..79e6ae8ec9 100644 --- a/src/qt/locale/bitcoin_et.ts +++ b/src/qt/locale/bitcoin_et.ts @@ -28,14 +28,14 @@ Levitatud MIT/X11 tarkvara litsentsi all, vaata kaasasolevat faili COPYING või Toode sisaldab OpenSSL Projekti all toodetud tarkvara, mis on kasutamiseks OpenSSL Toolkitis (http://www.openssl.org/) ja Eric Young'i poolt loodud krüptograafilist tarkvara (eay@cryptsoft.com) ning Thomas Bernard'i loodud UPnP tarkvara. - + Copyright Autoriõigus - 2009-%1 The Bitcoin developers - 2009-%1 Bitcoini arendajad + The Bitcoin developers + @@ -66,7 +66,7 @@ Toode sisaldab OpenSSL Projekti all toodetud tarkvara, mis on kasutamiseks OpenS &Uus aadress - + These are your Bitcoin addresses for receiving payments. You may want to give a different one to each sender so you can keep track of who is paying you. Maksete saamiseks kasutatavad Bitcoini aadressid. Maksjate paremaks jälgimiseks võib igaühele anda erineva. @@ -96,7 +96,17 @@ Toode sisaldab OpenSSL Projekti all toodetud tarkvara, mis on kasutamiseks OpenS Kustuta märgistatud aadress loetelust - + + Export the data in the current tab to a file + + + + + &Export + + + + Verify a message to ensure it was signed with a specified Bitcoin address Kinnita sõnum tõestamaks selle allkirjastatust määratud Bitcoini aadressiga. @@ -318,12 +328,12 @@ Toode sisaldab OpenSSL Projekti all toodetud tarkvara, mis on kasutamiseks OpenS Signeeri &sõnum - + Synchronizing with network... Võrgusünkimine... - + &Overview &Ülevaade @@ -398,7 +408,7 @@ Toode sisaldab OpenSSL Projekti all toodetud tarkvara, mis on kasutamiseks OpenS &Salafraasi muutmine - + Importing blocks from disk... Impordi blokid kettalt... @@ -408,12 +418,7 @@ Toode sisaldab OpenSSL Projekti all toodetud tarkvara, mis on kasutamiseks OpenS Kettal olevate blokkide re-indekseerimine... - - &Export... - &Ekspordi... - - - + Send coins to a Bitcoin address Saada münte Bitcoini aadressile @@ -423,12 +428,7 @@ Toode sisaldab OpenSSL Projekti all toodetud tarkvara, mis on kasutamiseks OpenS Muuda Bitcoini seadeid - - Export the data in the current tab to a file - Ekspordi kuvatava vahelehe sisu faili - - - + Backup wallet to another location Varunda rahakott teise asukohta @@ -438,7 +438,7 @@ Toode sisaldab OpenSSL Projekti all toodetud tarkvara, mis on kasutamiseks OpenS Rahakoti krüpteerimise salafraasi muutmine - + &Debug window &Debugimise aken @@ -448,23 +448,23 @@ Toode sisaldab OpenSSL Projekti all toodetud tarkvara, mis on kasutamiseks OpenS Ava debugimise ja diagnostika konsool - + &Verify message... &Kontrolli sõnumit... - - + + Bitcoin Bitcoin - + Wallet Rahakott - + &Send &Saada @@ -509,12 +509,12 @@ Toode sisaldab OpenSSL Projekti all toodetud tarkvara, mis on kasutamiseks OpenS Kinnita sõnumid kindlustamaks et need allkirjastati määratud Bitcoini aadressiga - + &File &Fail - + &Settings &Seaded @@ -529,12 +529,7 @@ Toode sisaldab OpenSSL Projekti all toodetud tarkvara, mis on kasutamiseks OpenS Vahelehe tööriistariba - - Actions toolbar - Tegevuste tööriistariba - - - + [testnet] [testnet] @@ -545,12 +540,17 @@ Toode sisaldab OpenSSL Projekti all toodetud tarkvara, mis on kasutamiseks OpenS Bitcoini klient - + %n active connection(s) to Bitcoin network %n aktiivne ühendus Bitcoini võrku%n aktiivset ühendust Bitcoini võrku - + + No block source available... + + + + Processed %1 of %2 (estimated) blocks of transaction history. Protsessitud %1 (arvutuslikult) tehingu ajaloo blokki %2-st. @@ -575,7 +575,7 @@ Toode sisaldab OpenSSL Projekti all toodetud tarkvara, mis on kasutamiseks OpenS %n nädal%n nädalat - + %1 behind %1 maas @@ -590,7 +590,7 @@ Toode sisaldab OpenSSL Projekti all toodetud tarkvara, mis on kasutamiseks OpenS Peale seda ei ole tehingud veel nähtavad. - + Error Tõrge @@ -605,22 +605,22 @@ Toode sisaldab OpenSSL Projekti all toodetud tarkvara, mis on kasutamiseks OpenS Informatsioon - + This transaction is over the size limit. You can still send it for a fee of %1, which goes to the nodes that process your transaction and helps to support the network. Do you want to pay the fee? See tehing ületab mahupiirangu. Saatmine on võimalik %1, node'idele ning võrgustiku toetuseks, makstava lisatasu eest. Kas nõustud lisatasuga? - + Up to date Ajakohane - + Catching up... Jõuan... - + Confirm transaction fee Kinnita tehingu tasu @@ -669,7 +669,7 @@ Aadress: %4⏎ Rahakott on <b>krüpteeritud</b> ning hetkel <b>suletud</b> - + A fatal error occurred. Bitcoin can no longer continue safely and will quit. Ilmnes kriitiline tõrge. Bitcoin suletakse turvakaalutluste tõttu. @@ -677,7 +677,7 @@ Aadress: %4⏎ ClientModel - + Network Alert Võrgu Häire @@ -808,8 +808,8 @@ Aadress: %4⏎ - Optional transaction fee per kB that helps make sure your transactions are processed quickly. Most transactions are 1 kB. Fee 0.01 recommended. - Valikuline tehingu lisatasu kB kohta aitab protsessi kiirendada. Enamik tehinguid on 1 kB suured. Soovitatav lisatasu: 0,01 + Optional transaction fee per kB that helps make sure your transactions are processed quickly. Most transactions are 1 kB. + @@ -1058,7 +1058,7 @@ Aadress: %4⏎ Kinnitamata tehingud kokku. Ei kajastu hetke jäägis - + out of sync sünkimata @@ -1644,6 +1644,19 @@ Aadress: %4⏎ Sõnum kontrollitud. + + SplashScreen + + + The Bitcoin developers + + + + + [testnet] + + + TransactionDesc @@ -2118,10 +2131,28 @@ Aadress: %4⏎ saaja + + WalletModel + + + Send Coins + + + WalletView - + + &Export + + + + + Export the data in the current tab to a file + + + + Backup Wallet Varundatud Rahakott @@ -2154,37 +2185,37 @@ Aadress: %4⏎ bitcoin-core - + Bitcoin version Bitcoini versioon - + Usage: Kasutus: - + Send command to -server or bitcoind Saada käsklus -serverile või bitcoindile - + List commands Käskluste loetelu - + Get help for a command Käskluste abiinfo - + Options: Valikud: - + Specify configuration file (default: bitcoin.conf) Täpsusta sätete fail (vaikimisi: bitcoin.conf) @@ -2194,27 +2225,17 @@ Aadress: %4⏎ Täpsusta PID fail (vaikimisi: bitcoin.pid) - - Generate coins - Müntide genereerimine - - - - Don't generate coins - Ära genereeri münte - - - + Specify data directory Täpsusta andmekataloog - + Set database cache size in megabytes (default: 25) Sea andmebaasi vahemälu suurus MB (vaikeväärtus: 25) - + Listen for connections on <port> (default: 8333 or testnet: 18333) Kuula ühendusi pordil <port> (vaikeväärtus: 8333 või testnet: 18333) @@ -2229,7 +2250,7 @@ Aadress: %4⏎ Peeri aadressi saamiseks ühendu korraks node'iga - + Specify your own public address Täpsusta enda avalik aadress @@ -2239,22 +2260,22 @@ Aadress: %4⏎ Ulakate peeride valulävi (vaikeväärtus: 100) - + Number of seconds to keep misbehaving peers from reconnecting (default: 86400) Mitme sekundi pärast ulakad peerid tagasi võivad tulla (vaikeväärtus: 86400) - + An error occurred while setting up the RPC port %u for listening on IPv4: %s RPC pordi %u kuulamiseks seadistamisel ilmnes viga IPv4'l: %s - + Listen for JSON-RPC connections on <port> (default: 8332 or testnet: 18332) Kuula JSON-RPC ühendusel seda porti <port> (vaikeväärtus: 8332 või testnet: 18332) - + Accept command line and JSON-RPC commands Luba käsurea ning JSON-RPC käsklusi @@ -2264,17 +2285,17 @@ Aadress: %4⏎ Tööta taustal ning aktsepteeri käsklusi - + Use the test network Testvõrgu kasutamine - + Accept connections from outside (default: 1 if no -proxy or -connect) Luba välisühendusi (vaikeväärtus: 1 kui puudub -proxy või -connect) - + %s, you must set a rpcpassword in the configuration file: %s It is recommended you use the following random password: @@ -2313,11 +2334,6 @@ nt: alertnotify=echo %%s | email -s "Bitcoin Alert" admin@foo.com Cannot obtain a lock on data directory %s. Bitcoin is probably already running. Ei suuda määrata ainuõigust andmekaustale %s. Tõenäolisel on Bitcoin juba avatud. - - - Error initializing database environment %s! To recover, BACKUP THAT DIRECTORY, then remove everything from it except for wallet.dat. - Tõrge andmebaasi keskkonna käivitamisel %s! Taastumiseks VARUNDA SEE KAUST, seejärel kustuta kogu sisu peale wallet.dat faili. - Error: The transaction was rejected! This might happen if some of the coins in your wallet were already spent, such as if you used a copy of wallet.dat and coins were spent in the copy but not marked as spent here. @@ -2344,12 +2360,7 @@ nt: alertnotify=echo %%s | email -s "Bitcoin Alert" admin@foo.com Sea "kõrge tähtsusega"/"madala tehingu lisatasuga" tehingute maksimumsuurus baitides (vaikeväärtus: 27000) - - Set the number of script verification threads (1-16, 0=auto, default: 0) - Määra skripti kontrolli tegumite arv (1-16, 0=auto, vaikeväärtus: 0) - - - + This is a pre-release test build - use at your own risk - do not use for mining or merchant applications See on test-versioon - kasutamine omal riisikol - ära kasuta mining'uks ega kaupmeeste programmides @@ -2389,7 +2400,7 @@ nt: alertnotify=echo %%s | email -s "Bitcoin Alert" admin@foo.com Blokeeri loomise valikud: - + Connect only to the specified node(s) Ühendu ainult määratud node'i(de)ga @@ -2409,7 +2420,7 @@ nt: alertnotify=echo %%s | email -s "Bitcoin Alert" admin@foo.com Kas soovid bloki andmebaasi taastada? - + Error initializing block database Tõrge bloki andmebaasi käivitamisel @@ -2433,11 +2444,6 @@ nt: alertnotify=echo %%s | email -s "Bitcoin Alert" admin@foo.com Error: Disk space is low! Tõrge: liiga vähe kettaruumi! - - - Error: Transaction creation failed! - Tõrge: Tehingu loomine ebaõnnestus! - Error: Wallet locked, unable to create transaction! @@ -2509,7 +2515,12 @@ nt: alertnotify=echo %%s | email -s "Bitcoin Alert" admin@foo.com Otsi DNS'i lookup'i kastavaid peere (vaikeväärtus: 1, kui mitte -connect) - + + Generate coins (default: 0) + + + + How many blocks to check at startup (default: 288, 0 = all) Käivitamisel kontrollitavate blokkide arv (vaikeväärtus: 288, 0=kõik) @@ -2519,7 +2530,12 @@ nt: alertnotify=echo %%s | email -s "Bitcoin Alert" admin@foo.com Blokkide kontrollimise põhjalikkus (0-4, vaikeväärtus: 3) - + + Not enough file descriptors available. + + + + Rebuild block chain index from current blk000??.dat files Taasta bloki jada indeks blk000??.dat failist @@ -2529,7 +2545,7 @@ nt: alertnotify=echo %%s | email -s "Bitcoin Alert" admin@foo.com Määra RPC kõnede haldurite arv (vaikeväärtus: 4) - + Verifying blocks... Kontrollin blokke... @@ -2539,12 +2555,17 @@ nt: alertnotify=echo %%s | email -s "Bitcoin Alert" admin@foo.com Kontrollin rahakotti... - + Imports blocks from external blk000??.dat file Impordi blokid välisest blk000??.dat failist - + + Set the number of script verification threads (up to 16, 0 = auto, <0 = leave that many cores free, default: 0) + + + + Information Informatsioon @@ -2553,6 +2574,16 @@ nt: alertnotify=echo %%s | email -s "Bitcoin Alert" admin@foo.com Invalid -tor address: '%s' Vigane -tor aadress: '%s' + + + Invalid amount for -minrelaytxfee=<amount>: '%s' + + + + + Invalid amount for -mintxfee=<amount>: '%s' + + Maintain a full transaction index (default: 0) @@ -2569,7 +2600,7 @@ nt: alertnotify=echo %%s | email -s "Bitcoin Alert" admin@foo.com Maksimaalne saatmise puhver -connection kohta , <n>*1000 baiti (vaikeväärtus: 1000) - + Only accept block chain matching built-in checkpoints (default: 1) Tunnusta ainult sisseehitatud turvapunktidele vastavaid bloki jadu (vaikeväärtus: 1) @@ -2628,6 +2659,11 @@ nt: alertnotify=echo %%s | email -s "Bitcoin Alert" admin@foo.com Shrink debug.log file on client startup (default: 1 when no -debug) Kahanda programmi käivitamisel debug.log faili (vaikeväärtus: 1, kui ei ole -debug) + + + Signing transaction failed + + Specify connection timeout in milliseconds (default: 5000) @@ -2639,7 +2675,22 @@ nt: alertnotify=echo %%s | email -s "Bitcoin Alert" admin@foo.com Süsteemi tõrge: - + + Transaction amount too small + + + + + Transaction amounts must be positive + + + + + Transaction too large + + + + Use UPnP to map the listening port (default: 0) Kasuta kuulatava pordi määramiseks UPnP ühendust (vaikeväärtus: 0) @@ -2679,7 +2730,7 @@ nt: alertnotify=echo %%s | email -s "Bitcoin Alert" admin@foo.com wallet.dat fail on katki, päästmine ebaõnnestus - + Password for JSON-RPC connections JSON-RPC ühenduste salasõna @@ -2694,17 +2745,17 @@ nt: alertnotify=echo %%s | email -s "Bitcoin Alert" admin@foo.com Saada käsklusi node'ile IP'ga <ip> (vaikeväärtus: 127.0.0.1) - + Execute command when the best block changes (%s in cmd is replaced by block hash) Käivita käsklus, kui parim plokk muutub (käskluse %s asendatakse ploki hash'iga) - + Upgrade wallet to latest format Uuenda rahakott uusimasse vormingusse - + Set key pool size to <n> (default: 100) Sea võtmete hulgaks <n> (vaikeväärtus: 100) @@ -2714,12 +2765,12 @@ nt: alertnotify=echo %%s | email -s "Bitcoin Alert" admin@foo.com Otsi ploki jadast rahakoti kadunud tehinguid - + Use OpenSSL (https) for JSON-RPC connections Kasuta JSON-RPC ühenduste jaoks OpenSSL'i (https) - + Server certificate file (default: server.cert) Serveri sertifikaadifail (vaikeväärtus: server.cert) @@ -2729,37 +2780,37 @@ nt: alertnotify=echo %%s | email -s "Bitcoin Alert" admin@foo.com Serveri privaatvõti (vaikeväärtus: server.pem) - + Acceptable ciphers (default: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH) Lubatud šiffrid (vaikeväärtus: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH) - + This help message Käesolev abitekst - + Unable to bind to %s on this computer (bind returned error %d, %s) Selle arvutiga ei ole võimalik siduda %s külge (katse nurjus %d, %s tõttu) - + Connect through socks proxy Ühendu läbi turva proxi - + Allow DNS lookups for -addnode, -seednode and -connect -addnode, -seednode ja -connect tohivad kasutada DNS lookup'i - + Loading addresses... Aadresside laadimine... - + Error loading wallet.dat: Wallet corrupted Viga wallet.dat käivitamisel. Vigane rahakkott @@ -2769,22 +2820,22 @@ nt: alertnotify=echo %%s | email -s "Bitcoin Alert" admin@foo.com Viga wallet.dat käivitamisel: Rahakott nõuab Bitcoini uusimat versiooni - + Wallet needed to be rewritten: restart Bitcoin to complete Rahakott tuli ümberkirjutada: toimingu lõpetamiseks taaskäivita Bitcoin - + Error loading wallet.dat Viga wallet.dat käivitamisel - + Invalid -proxy address: '%s' Vigane -proxi aadress: '%s' - + Unknown network specified in -onlynet: '%s' Kirjeldatud tundmatu võrgustik -onlynet'is: '%s' @@ -2794,7 +2845,7 @@ nt: alertnotify=echo %%s | email -s "Bitcoin Alert" admin@foo.com Küsitud tundmatu -socks proxi versioon: %i - + Cannot resolve -bind address: '%s' Tundmatu -bind aadress: '%s' @@ -2814,17 +2865,17 @@ nt: alertnotify=echo %%s | email -s "Bitcoin Alert" admin@foo.com Kehtetu summa - + Insufficient funds Liiga suur summa - + Loading block index... Klotside indeksi laadimine... - + Add a node to connect to and attempt to keep the connection open Lisa node ning hoia ühendus avatud @@ -2834,52 +2885,47 @@ nt: alertnotify=echo %%s | email -s "Bitcoin Alert" admin@foo.com %s'ga ei ole võimalik sellest arvutist siduda. Bitcoin juba töötab. - + Fee per KB to add to transactions you send Minu saadetavate tehingute lisatasu KB kohta - + Loading wallet... Rahakoti laadimine... - + Cannot downgrade wallet Rahakoti vanandamine ebaõnnestus - - - Cannot initialize keypool - Tõrge võtmehulga algatamisel - Cannot write default address Tõrge vaikimisi aadressi kirjutamisel - + Rescanning... Üleskaneerimine... - + Done loading Laetud - + To use the %s option %s valiku kasutamine - + Error Tõrge - + You must set rpcpassword=<password> in the configuration file: %s If the file does not exist, create it with owner-readable-only file permissions. diff --git a/src/qt/locale/bitcoin_eu_ES.ts b/src/qt/locale/bitcoin_eu_ES.ts index a13d006237..4928eedb32 100644 --- a/src/qt/locale/bitcoin_eu_ES.ts +++ b/src/qt/locale/bitcoin_eu_ES.ts @@ -23,13 +23,13 @@ This product includes software developed by the OpenSSL Project for use in the O - + Copyright - 2009-%1 The Bitcoin developers + The Bitcoin developers @@ -61,7 +61,7 @@ This product includes software developed by the OpenSSL Project for use in the O - + These are your Bitcoin addresses for receiving payments. You may want to give a different one to each sender so you can keep track of who is paying you. @@ -73,7 +73,7 @@ This product includes software developed by the OpenSSL Project for use in the O Show &QR Code - + Erakutsi &QR kodea @@ -91,7 +91,17 @@ This product includes software developed by the OpenSSL Project for use in the O - + + Export the data in the current tab to a file + + + + + &Export + + + + Verify a message to ensure it was signed with a specified Bitcoin address @@ -313,12 +323,12 @@ This product includes software developed by the OpenSSL Project for use in the O - + Synchronizing with network... Sarearekin sinkronizatzen... - + &Overview &Gainbegiratu @@ -350,7 +360,7 @@ This product includes software developed by the OpenSSL Project for use in the O E&xit - + Irten @@ -365,12 +375,12 @@ This product includes software developed by the OpenSSL Project for use in the O About &Qt - + &Qt-ari buruz Show information about Qt - + Erakutsi Bitcoin-i buruzko informazioa @@ -393,7 +403,7 @@ This product includes software developed by the OpenSSL Project for use in the O - + Importing blocks from disk... @@ -403,12 +413,7 @@ This product includes software developed by the OpenSSL Project for use in the O - - &Export... - &Esportatu... - - - + Send coins to a Bitcoin address @@ -418,12 +423,7 @@ This product includes software developed by the OpenSSL Project for use in the O - - Export the data in the current tab to a file - - - - + Backup wallet to another location @@ -433,7 +433,7 @@ This product includes software developed by the OpenSSL Project for use in the O Aldatu zorroa enkriptatzeko erabilitako pasahitza - + &Debug window @@ -443,23 +443,23 @@ This product includes software developed by the OpenSSL Project for use in the O - + &Verify message... - - + + Bitcoin - + Wallet - + &Send @@ -504,12 +504,12 @@ This product includes software developed by the OpenSSL Project for use in the O - + &File &Artxiboa - + &Settings &Ezarpenak @@ -524,12 +524,7 @@ This product includes software developed by the OpenSSL Project for use in the O Fitxen tresna-barra - - Actions toolbar - Ekintzak tresna-barra - - - + [testnet] [testnet] @@ -540,12 +535,17 @@ This product includes software developed by the OpenSSL Project for use in the O - + %n active connection(s) to Bitcoin network - + Konexio aktibo %n Bitcoin-en sarera%n konexio aktibo Bitcoin-en sarera - + + No block source available... + + + + Processed %1 of %2 (estimated) blocks of transaction history. @@ -570,7 +570,7 @@ This product includes software developed by the OpenSSL Project for use in the O - + %1 behind @@ -585,7 +585,7 @@ This product includes software developed by the OpenSSL Project for use in the O - + Error @@ -600,22 +600,22 @@ This product includes software developed by the OpenSSL Project for use in the O - + This transaction is over the size limit. You can still send it for a fee of %1, which goes to the nodes that process your transaction and helps to support the network. Do you want to pay the fee? - + Up to date Egunean - + Catching up... Eguneratzen... - + Confirm transaction fee @@ -661,7 +661,7 @@ Address: %4 Zorroa <b>enkriptatuta</b> eta <b>blokeatuta</b> dago une honetan - + A fatal error occurred. Bitcoin can no longer continue safely and will quit. @@ -669,7 +669,7 @@ Address: %4 ClientModel - + Network Alert @@ -800,7 +800,7 @@ Address: %4 - Optional transaction fee per kB that helps make sure your transactions are processed quickly. Most transactions are 1 kB. Fee 0.01 recommended. + Optional transaction fee per kB that helps make sure your transactions are processed quickly. Most transactions are 1 kB. @@ -1050,7 +1050,7 @@ Address: %4 Oraindik konfirmatu gabe daudenez, uneko saldoab kontatu gabe dagoen transakzio kopurua - + out of sync @@ -1079,22 +1079,22 @@ Address: %4 Amount: - + Kopurua Label: - + &Etiketa: Message: - + Mezua &Save As... - + Gorde honela... @@ -1636,6 +1636,19 @@ Address: %4 + + SplashScreen + + + The Bitcoin developers + + + + + [testnet] + + + TransactionDesc @@ -2047,7 +2060,7 @@ Address: %4 Export Transaction Data - + Transakzioaren xehetasunak @@ -2110,10 +2123,28 @@ Address: %4 + + WalletModel + + + Send Coins + + + WalletView - + + &Export + + + + + Export the data in the current tab to a file + + + + Backup Wallet @@ -2146,67 +2177,57 @@ Address: %4 bitcoin-core - + Bitcoin version - + Botcoin bertsioa - + Usage: - + Send command to -server or bitcoind - + List commands - + Komandoen lista - + Get help for a command - + Laguntza komando batean - + Options: - + Aukerak - + Specify configuration file (default: bitcoin.conf) - + Ezarpen fitxategia aukeratu (berezkoa: bitcoin.conf) Specify pid file (default: bitcoind.pid) - + pid fitxategia aukeratu (berezkoa: bitcoind.pid) - - Generate coins - - - - - Don't generate coins - - - - + Specify data directory - + Set database cache size in megabytes (default: 25) - + Listen for connections on <port> (default: 8333 or testnet: 18333) @@ -2221,7 +2242,7 @@ Address: %4 - + Specify your own public address @@ -2231,22 +2252,22 @@ Address: %4 - + Number of seconds to keep misbehaving peers from reconnecting (default: 86400) - + An error occurred while setting up the RPC port %u for listening on IPv4: %s - + Listen for JSON-RPC connections on <port> (default: 8332 or testnet: 18332) - + Accept command line and JSON-RPC commands @@ -2256,17 +2277,17 @@ Address: %4 - + Use the test network - + Accept connections from outside (default: 1 if no -proxy or -connect) - + %s, you must set a rpcpassword in the configuration file: %s It is recommended you use the following random password: @@ -2295,11 +2316,6 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. Cannot obtain a lock on data directory %s. Bitcoin is probably already running. - - - Error initializing database environment %s! To recover, BACKUP THAT DIRECTORY, then remove everything from it except for wallet.dat. - - Error: The transaction was rejected! This might happen if some of the coins in your wallet were already spent, such as if you used a copy of wallet.dat and coins were spent in the copy but not marked as spent here. @@ -2326,12 +2342,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. - - Set the number of script verification threads (1-16, 0=auto, default: 0) - - - - + This is a pre-release test build - use at your own risk - do not use for mining or merchant applications @@ -2371,7 +2382,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. - + Connect only to the specified node(s) @@ -2391,7 +2402,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. - + Error initializing block database @@ -2415,11 +2426,6 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. Error: Disk space is low! - - - Error: Transaction creation failed! - - Error: Wallet locked, unable to create transaction! @@ -2491,7 +2497,12 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. - + + Generate coins (default: 0) + + + + How many blocks to check at startup (default: 288, 0 = all) @@ -2501,7 +2512,12 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. - + + Not enough file descriptors available. + + + + Rebuild block chain index from current blk000??.dat files @@ -2511,7 +2527,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. - + Verifying blocks... @@ -2521,12 +2537,17 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. - + Imports blocks from external blk000??.dat file - + + Set the number of script verification threads (up to 16, 0 = auto, <0 = leave that many cores free, default: 0) + + + + Information @@ -2535,6 +2556,16 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. Invalid -tor address: '%s' + + + Invalid amount for -minrelaytxfee=<amount>: '%s' + + + + + Invalid amount for -mintxfee=<amount>: '%s' + + Maintain a full transaction index (default: 0) @@ -2551,7 +2582,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. - + Only accept block chain matching built-in checkpoints (default: 1) @@ -2610,6 +2641,11 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. Shrink debug.log file on client startup (default: 1 when no -debug) + + + Signing transaction failed + + Specify connection timeout in milliseconds (default: 5000) @@ -2621,7 +2657,22 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. - + + Transaction amount too small + + + + + Transaction amounts must be positive + + + + + Transaction too large + + + + Use UPnP to map the listening port (default: 0) @@ -2661,7 +2712,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. - + Password for JSON-RPC connections @@ -2676,17 +2727,17 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. - + Execute command when the best block changes (%s in cmd is replaced by block hash) - + Upgrade wallet to latest format - + Set key pool size to <n> (default: 100) @@ -2696,12 +2747,12 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. - + Use OpenSSL (https) for JSON-RPC connections - + Server certificate file (default: server.cert) @@ -2711,37 +2762,37 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. - + Acceptable ciphers (default: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH) - + This help message - + Laguntza mezu hau - + Unable to bind to %s on this computer (bind returned error %d, %s) - + Connect through socks proxy - + Allow DNS lookups for -addnode, -seednode and -connect - + Loading addresses... - + Error loading wallet.dat: Wallet corrupted @@ -2751,22 +2802,22 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. - + Wallet needed to be rewritten: restart Bitcoin to complete - + Error loading wallet.dat - + Invalid -proxy address: '%s' - + Unknown network specified in -onlynet: '%s' @@ -2776,7 +2827,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. - + Cannot resolve -bind address: '%s' @@ -2796,17 +2847,17 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. - + Insufficient funds - + Loading block index... - + Add a node to connect to and attempt to keep the connection open @@ -2816,52 +2867,47 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. - + Fee per KB to add to transactions you send - + Loading wallet... - + Cannot downgrade wallet - - - Cannot initialize keypool - - Cannot write default address - + Rescanning... - + Birbilatzen... - + Done loading - + Zamaketa amaitua - + To use the %s option - + Error - + You must set rpcpassword=<password> in the configuration file: %s If the file does not exist, create it with owner-readable-only file permissions. diff --git a/src/qt/locale/bitcoin_fa.ts b/src/qt/locale/bitcoin_fa.ts index e2ee3681c3..ad1a69b685 100644 --- a/src/qt/locale/bitcoin_fa.ts +++ b/src/qt/locale/bitcoin_fa.ts @@ -23,13 +23,13 @@ This product includes software developed by the OpenSSL Project for use in the O ⏎ ⏎ این نسخه نرم افزار آزمایشی است⏎ ⏎ نرم افزار تحت لیسانس MIT/X11 منتشر شده است. به فایل coping یا آدرس http://www.opensource.org/licenses/mit-license.php. مراجعه شود⏎ ⏎ این محصول شامل نرم افزاری است که با OpenSSL برای استفاده از OpenSSL Toolkit (http://www.openssl.org/) و نرم افزار نوشته شده توسط اریک یانگ (eay@cryptsoft.com ) و UPnP توسط توماس برنارد طراحی شده است. - + Copyright - 2009-%1 The Bitcoin developers + The Bitcoin developers @@ -61,7 +61,7 @@ This product includes software developed by the OpenSSL Project for use in the O آدرس جدید - + These are your Bitcoin addresses for receiving payments. You may want to give a different one to each sender so you can keep track of who is paying you. این آدرسها، آدرسهای bitcoin شما برای دریافت وجوه هستند. شما ممکن است آدرسهای متفاوت را به هر گیرنده اختصاص دهید که بتوانید مواردی که پرداخت می کنید را پیگیری نمایید @@ -91,7 +91,17 @@ This product includes software developed by the OpenSSL Project for use in the O آدرس انتخاب شده در سیستم تخته رسم گیره دا حذف - + + Export the data in the current tab to a file + داده ها نوارِ جاری را به فایل انتقال دهید + + + + &Export + + + + Verify a message to ensure it was signed with a specified Bitcoin address یک پیام را برای حصول اطمینان از ورود به سیستم با آدرس bitcoin مشخص، شناسایی کنید @@ -314,12 +324,12 @@ This product includes software developed by the OpenSSL Project for use in the O امضا و پیام - + Synchronizing with network... همگام سازی با شبکه ... - + &Overview بررسی اجمالی @@ -394,7 +404,7 @@ This product includes software developed by the OpenSSL Project for use in the O تغییر Passphrase - + Importing blocks from disk... @@ -404,12 +414,7 @@ This product includes software developed by the OpenSSL Project for use in the O - - &Export... - &;صادرات - - - + Send coins to a Bitcoin address سکه ها را به آدرس bitocin ارسال کن @@ -419,12 +424,7 @@ This product includes software developed by the OpenSSL Project for use in the O انتخابهای پیکربندی را برای bitcoin اصلاح کن - - Export the data in the current tab to a file - داده ها نوارِ جاری را به فایل انتقال دهید - - - + Backup wallet to another location نسخه پیشتیبان wallet را به محل دیگر انتقال دهید @@ -434,7 +434,7 @@ This product includes software developed by the OpenSSL Project for use in the O عبارت عبور رمز گشایی پنجره تغییر کنید - + &Debug window اشکال زدایی از صفحه @@ -444,23 +444,23 @@ This product includes software developed by the OpenSSL Project for use in the O کنسول اشکال زدایی و تشخیص را باز کنید - + &Verify message... بازبینی پیام - - + + Bitcoin یت کویین - + Wallet wallet - + &Send @@ -505,12 +505,12 @@ This product includes software developed by the OpenSSL Project for use in the O - + &File فایل - + &Settings تنظیمات @@ -525,12 +525,7 @@ This product includes software developed by the OpenSSL Project for use in the O نوار ابزار زبانه ها - - Actions toolbar - نوار ابزار عملیت - - - + [testnet] آزمایش شبکه @@ -541,12 +536,17 @@ This product includes software developed by the OpenSSL Project for use in the O مشتری Bitcoin - + %n active connection(s) to Bitcoin network در صد ارتباطات فعال بیتکویین با شبکه %n - + + No block source available... + + + + Processed %1 of %2 (estimated) blocks of transaction history. @@ -571,7 +571,7 @@ This product includes software developed by the OpenSSL Project for use in the O - + %1 behind @@ -586,7 +586,7 @@ This product includes software developed by the OpenSSL Project for use in the O - + Error @@ -601,22 +601,22 @@ This product includes software developed by the OpenSSL Project for use in the O - + This transaction is over the size limit. You can still send it for a fee of %1, which goes to the nodes that process your transaction and helps to support the network. Do you want to pay the fee? - + Up to date تا تاریخ - + Catching up... ابتلا به بالا - + Confirm transaction fee هزینه تراکنش را تایید کنید @@ -665,7 +665,7 @@ Address: %4 زمایش شبکه - + A fatal error occurred. Bitcoin can no longer continue safely and will quit. خطا روی داده است. Bitcoin نمی تواند بدون مشکل ادامه دهد و باید بسته شود @@ -673,7 +673,7 @@ Address: %4 ClientModel - + Network Alert پیام شبکه @@ -804,8 +804,8 @@ Address: %4 - Optional transaction fee per kB that helps make sure your transactions are processed quickly. Most transactions are 1 kB. Fee 0.01 recommended. - نرخ اختیاری تراکنش هر کیلوبایت که به شما کمک می‌کند اطمینان پیدا کنید که تراکنش‌ها به سرعت پردازش می‌شوند. بیشتر تراکنش‌ها ۱ کیلوبایت هستند. نرخ 0.01 پیشنهاد می‌شود. + Optional transaction fee per kB that helps make sure your transactions are processed quickly. Most transactions are 1 kB. + @@ -1054,7 +1054,7 @@ Address: %4 تعداد معاملات که تایید شده ولی هنوز در تزار جاری شما بر شمار نرفته است - + out of sync روزآمد نشده @@ -1640,6 +1640,19 @@ Address: %4 پیام شناسایی شد + + SplashScreen + + + The Bitcoin developers + + + + + [testnet] + آزمایش شبکه + + TransactionDesc @@ -2117,10 +2130,28 @@ Address: %4 به + + WalletModel + + + Send Coins + ارسال سکه ها + + WalletView - + + &Export + + + + + Export the data in the current tab to a file + داده ها نوارِ جاری را به فایل انتقال دهید + + + Backup Wallet @@ -2153,37 +2184,37 @@ Address: %4 bitcoin-core - + Bitcoin version سخه بیتکویین - + Usage: ستفاده : - + Send command to -server or bitcoind ارسال فرمان به سرور یا باتکویین - + List commands لیست فومان ها - + Get help for a command کمک برای فرمان - + Options: تنظیمات - + Specify configuration file (default: bitcoin.conf) (: bitcoin.confپیش فرض: )فایل تنظیمی خاص @@ -2193,27 +2224,17 @@ Address: %4 (bitcoind.pidپیش فرض : ) فایل پید خاص - - Generate coins - سکه های تولید شده - - - - Don't generate coins - تولید سکه ها - - - + Specify data directory دایرکتور اطلاعاتی خاص - + Set database cache size in megabytes (default: 25) سایز کَش بانک داده را بر حسب مگابایت تنظیم کنید (پیش فرض:25) - + Listen for connections on <port> (default: 8333 or testnet: 18333) برای اتصالات به <port> (پیش‌فرض: 8333 یا تست‌نت: 18333) گوش کنید @@ -2228,7 +2249,7 @@ Address: %4 اتصال به گره برای دریافت آدرسهای قرینه و قطع اتصال - + Specify your own public address آدرس عمومی خود را ذکر کنید @@ -2238,22 +2259,22 @@ Address: %4 آستانه برای قطع ارتباط با همکاران بدرفتار (پیش‌فرض: 100) - + Number of seconds to keep misbehaving peers from reconnecting (default: 86400) مدت زمان به ثانیه برای جلوگیری از همکاران بدرفتار برای اتصال دوباره (پیش‌فرض: 86400) - + An error occurred while setting up the RPC port %u for listening on IPv4: %s در زمان تنظیم درگاه RPX %u در فهرست کردن %s اشکالی رخ داده است - + Listen for JSON-RPC connections on <port> (default: 8332 or testnet: 18332) ( 8332پیش فرض :) &lt;poort&gt; JSON-RPC شنوایی برای ارتباطات - + Accept command line and JSON-RPC commands JSON-RPC قابل فرمانها و @@ -2263,17 +2284,17 @@ Address: %4 اجرای در پس زمینه به عنوان شبح و قبول فرمان ها - + Use the test network استفاده شبکه آزمایش - + Accept connections from outside (default: 1 if no -proxy or -connect) پذیرش اتصالات از بیرون (پیش فرض:1 بدون پراکسی یا اتصال) - + %s, you must set a rpcpassword in the configuration file: %s It is recommended you use the following random password: @@ -2302,11 +2323,6 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. Cannot obtain a lock on data directory %s. Bitcoin is probably already running. - - - Error initializing database environment %s! To recover, BACKUP THAT DIRECTORY, then remove everything from it except for wallet.dat. - - Error: The transaction was rejected! This might happen if some of the coins in your wallet were already spent, such as if you used a copy of wallet.dat and coins were spent in the copy but not marked as spent here. @@ -2333,12 +2349,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. حجم حداکثر تراکنشهای با/کم اهمیت را به بایت تنظیم کنید (پیش فرض:27000) - - Set the number of script verification threads (1-16, 0=auto, default: 0) - - - - + This is a pre-release test build - use at your own risk - do not use for mining or merchant applications @@ -2378,7 +2389,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. بستن گزینه ایجاد - + Connect only to the specified node(s) تنها در گره (های) مشخص شده متصل شوید @@ -2398,7 +2409,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. - + Error initializing block database @@ -2422,11 +2433,6 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. Error: Disk space is low! - - - Error: Transaction creation failed! - - Error: Wallet locked, unable to create transaction! @@ -2498,7 +2504,12 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. قرینه ها را برای جستجوی DNS بیاب (پیش فرض: 1 مگر در زمان اتصال) - + + Generate coins (default: 0) + + + + How many blocks to check at startup (default: 288, 0 = all) @@ -2508,7 +2519,12 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. - + + Not enough file descriptors available. + + + + Rebuild block chain index from current blk000??.dat files @@ -2518,7 +2534,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. - + Verifying blocks... @@ -2528,12 +2544,17 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. - + Imports blocks from external blk000??.dat file - + + Set the number of script verification threads (up to 16, 0 = auto, <0 = leave that many cores free, default: 0) + + + + Information @@ -2542,6 +2563,16 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. Invalid -tor address: '%s' آدرس نرم افزار تور غلط است %s + + + Invalid amount for -minrelaytxfee=<amount>: '%s' + + + + + Invalid amount for -mintxfee=<amount>: '%s' + + Maintain a full transaction index (default: 0) @@ -2558,7 +2589,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. حداکثر بافر دریافت شده بر اساس اتصال <n>* 1000 بایت (پیش فرض:1000) - + Only accept block chain matching built-in checkpoints (default: 1) @@ -2617,6 +2648,11 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. Shrink debug.log file on client startup (default: 1 when no -debug) فایل debug.log را در startup مشتری کوچک کن (پیش فرض:1 اگر اشکال زدایی روی نداد) + + + Signing transaction failed + + Specify connection timeout in milliseconds (default: 5000) @@ -2628,7 +2664,22 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. - + + Transaction amount too small + + + + + Transaction amounts must be positive + + + + + Transaction too large + + + + Use UPnP to map the listening port (default: 0) از UPnP برای شناسایی درگاه شنیداری استفاده کنید (پیش فرض:0) @@ -2668,7 +2719,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. - + Password for JSON-RPC connections JSON-RPC عبارت عبور برای ارتباطات @@ -2683,17 +2734,17 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. (127.0.0.1پیش فرض: ) &lt;ip&gt; دادن فرمانها برای استفاده گره ها روی - + Execute command when the best block changes (%s in cmd is replaced by block hash) زمانی که بهترین بلاک تغییر کرد، دستور را اجرا کن (%s در cmd با block hash جایگزین شده است) - + Upgrade wallet to latest format wallet را به جدیدترین فرمت روزآمد کنید - + Set key pool size to <n> (default: 100) (100پیش فرض:)&lt;n&gt; گذاشتن اندازه کلید روی @@ -2703,12 +2754,12 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. اسکان مجدد زنجیر بلوکها برای گم والت معامله - + Use OpenSSL (https) for JSON-RPC connections JSON-RPCبرای ارتباطات استفاده کنید OpenSSL (https) - + Server certificate file (default: server.cert) (server.certپیش فرض: )گواهی نامه سرور @@ -2718,37 +2769,37 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. (server.pemپیش فرض: ) کلید خصوصی سرور - + Acceptable ciphers (default: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH) رمز های قابل قبول( TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH) - + This help message پیام کمکی - + Unable to bind to %s on this computer (bind returned error %d, %s) امکان اتصال به %s از این رایانه وجود ندارد ( bind returned error %d, %s) - + Connect through socks proxy اتصال از طریق پراکسی ساکس - + Allow DNS lookups for -addnode, -seednode and -connect به DNS اجازه بده تا برای addnode ، seednode و اتصال جستجو کند - + Loading addresses... بار گیری آدرس ها - + Error loading wallet.dat: Wallet corrupted خطا در بارگیری wallet.dat: کیف پول خراب شده است @@ -2758,22 +2809,22 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. خطا در بارگیری wallet.dat: کیف پول به ویرایش جدیدتری از Biticon نیاز دارد - + Wallet needed to be rewritten: restart Bitcoin to complete سلام - + Error loading wallet.dat خطا در بارگیری wallet.dat - + Invalid -proxy address: '%s' آدرس پراکسی اشتباه %s - + Unknown network specified in -onlynet: '%s' شبکه مشخص شده غیرقابل شناسایی در onlynet: '%s' @@ -2783,7 +2834,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. نسخه پراکسی ساکس غیرقابل شناسایی درخواست شده است: %i - + Cannot resolve -bind address: '%s' آدرس قابل اتصال- شناسایی نیست %s @@ -2803,17 +2854,17 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. میزان وجه اشتباه - + Insufficient funds بود جه نا کافی - + Loading block index... بار گیری شاخص بلوک - + Add a node to connect to and attempt to keep the connection open به اتصال یک گره اضافه کنید و اتصال را باز نگاه دارید @@ -2823,52 +2874,47 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. اتصال به %s از این رایانه امکان پذیر نیست. Bitcoin احتمالا در حال اجراست. - + Fee per KB to add to transactions you send پر داجت برای هر کیلو بیت برای اضافه به معامله ارسال - + Loading wallet... بار گیری والت - + Cannot downgrade wallet امکان تنزل نسخه در wallet وجود ندارد - - - Cannot initialize keypool - امکان مقداردهی اولیه برای key pool وجود ندارد - Cannot write default address آدرس پیش فرض قابل ذخیره نیست - + Rescanning... اسکان مجدد - + Done loading بار گیری انجام شده است - + To use the %s option برای استفاده از %s از انتخابات - + Error خطا - + You must set rpcpassword=<password> in the configuration file: %s If the file does not exist, create it with owner-readable-only file permissions. diff --git a/src/qt/locale/bitcoin_fa_IR.ts b/src/qt/locale/bitcoin_fa_IR.ts index f7a6ff53f9..db8dd56e96 100644 --- a/src/qt/locale/bitcoin_fa_IR.ts +++ b/src/qt/locale/bitcoin_fa_IR.ts @@ -23,13 +23,13 @@ This product includes software developed by the OpenSSL Project for use in the O - + Copyright - 2009-%1 The Bitcoin developers + The Bitcoin developers @@ -61,7 +61,7 @@ This product includes software developed by the OpenSSL Project for use in the O و آدرس جدید - + These are your Bitcoin addresses for receiving payments. You may want to give a different one to each sender so you can keep track of who is paying you. @@ -91,7 +91,17 @@ This product includes software developed by the OpenSSL Project for use in the O - + + Export the data in the current tab to a file + صدور داده نوار جاری به یک فایل + + + + &Export + + + + Verify a message to ensure it was signed with a specified Bitcoin address @@ -313,12 +323,12 @@ This product includes software developed by the OpenSSL Project for use in the O امضا و پیام - + Synchronizing with network... به روز رسانی با شبکه... - + &Overview و بازبینی @@ -393,7 +403,7 @@ This product includes software developed by the OpenSSL Project for use in the O تغییر رمز/پَس فرِیز - + Importing blocks from disk... @@ -403,12 +413,7 @@ This product includes software developed by the OpenSSL Project for use in the O - - &Export... - و صدور - - - + Send coins to a Bitcoin address @@ -418,12 +423,7 @@ This product includes software developed by the OpenSSL Project for use in the O اصلاح انتخابها برای پیکربندی Bitcoin - - Export the data in the current tab to a file - صدور داده نوار جاری به یک فایل - - - + Backup wallet to another location گرفتن نسخه پیشتیبان در آدرسی دیگر @@ -433,7 +433,7 @@ This product includes software developed by the OpenSSL Project for use in the O رمز مربوط به رمزگذاریِ wallet را تغییر دهید - + &Debug window @@ -443,23 +443,23 @@ This product includes software developed by the OpenSSL Project for use in the O - + &Verify message... - - + + Bitcoin bitcoin - + Wallet کیف پول - + &Send @@ -504,12 +504,12 @@ This product includes software developed by the OpenSSL Project for use in the O - + &File و فایل - + &Settings و تنظیمات @@ -524,12 +524,7 @@ This product includes software developed by the OpenSSL Project for use in the O نوار ابزار - - Actions toolbar - نوار عملیات - - - + [testnet] [testnet] @@ -540,13 +535,18 @@ This product includes software developed by the OpenSSL Project for use in the O مشتری bitcoin - + %n active connection(s) to Bitcoin network %n ارتباط فعال به شبکه Bitcoin %n ارتباط فعال به شبکه Bitcoin - + + No block source available... + + + + Processed %1 of %2 (estimated) blocks of transaction history. @@ -571,7 +571,7 @@ This product includes software developed by the OpenSSL Project for use in the O - + %1 behind @@ -586,7 +586,7 @@ This product includes software developed by the OpenSSL Project for use in the O - + Error @@ -601,22 +601,22 @@ This product includes software developed by the OpenSSL Project for use in the O - + This transaction is over the size limit. You can still send it for a fee of %1, which goes to the nodes that process your transaction and helps to support the network. Do you want to pay the fee? - + Up to date روزآمد - + Catching up... در حال روزآمد سازی.. - + Confirm transaction fee @@ -663,7 +663,7 @@ Address: %4 wallet رمزگذاری شد و در حال حاضر قفل است - + A fatal error occurred. Bitcoin can no longer continue safely and will quit. @@ -671,7 +671,7 @@ Address: %4 ClientModel - + Network Alert هشدار شبکه @@ -802,7 +802,7 @@ Address: %4 - Optional transaction fee per kB that helps make sure your transactions are processed quickly. Most transactions are 1 kB. Fee 0.01 recommended. + Optional transaction fee per kB that helps make sure your transactions are processed quickly. Most transactions are 1 kB. @@ -1052,7 +1052,7 @@ Address: %4 تعداد تراکنشهایی که نیاز به تایید دارند و هنوز در مانده حساب جاری شما به حساب نیامده اند - + out of sync خارج از روزآمد سازی @@ -1639,6 +1639,19 @@ Address: %4 + + SplashScreen + + + The Bitcoin developers + + + + + [testnet] + [testnet] + + TransactionDesc @@ -2113,10 +2126,28 @@ Address: %4 به + + WalletModel + + + Send Coins + سکه های ارسالی + + WalletView - + + &Export + + + + + Export the data in the current tab to a file + صدور داده نوار جاری به یک فایل + + + Backup Wallet @@ -2149,37 +2180,37 @@ Address: %4 bitcoin-core - + Bitcoin version نسخه bitcoin - + Usage: میزان استفاده: - + Send command to -server or bitcoind ارسال دستور به سرور یا bitcoined - + List commands فهرست دستورها - + Get help for a command درخواست کمک برای یک دستور - + Options: انتخابها: - + Specify configuration file (default: bitcoin.conf) فایل پیکربندیِ را مشخص کنید (پیش فرض: bitcoin.conf) @@ -2189,27 +2220,17 @@ Address: %4 فایل pid را مشخص کنید (پیش فرض: bitcoind.pid) - - Generate coins - سکه ها را تولید کن - - - - Don't generate coins - سکه ها را تولید نکن - - - + Specify data directory دایرکتوری داده را مشخص کن - + Set database cache size in megabytes (default: 25) حافظه بانک داده را به مگابایت تنظیم کنید (پیش فرض: 25) - + Listen for connections on <port> (default: 8333 or testnet: 18333) ارتباطات را در <PORT> بشنوید (پیش فرض: 8333 or testnet: 18333) @@ -2224,7 +2245,7 @@ Address: %4 - + Specify your own public address @@ -2234,22 +2255,22 @@ Address: %4 آستانه قطع برای قرینه سازی اشتباه (پیش فرض:100) - + Number of seconds to keep misbehaving peers from reconnecting (default: 86400) تعداد ثانیه ها برای اتصال دوباره قرینه های اشتباه (پیش فرض:86400) - + An error occurred while setting up the RPC port %u for listening on IPv4: %s - + Listen for JSON-RPC connections on <port> (default: 8332 or testnet: 18332) ارتباطاتِ JSON-RPC را در <port> گوش کنید (پیش فرض:8332) - + Accept command line and JSON-RPC commands command line و JSON-RPC commands را قبول کنید @@ -2259,17 +2280,17 @@ Address: %4 به عنوان daemon بک گراند را اجرا کنید و دستورات را قبول نمایید - + Use the test network از تستِ شبکه استفاده نمایید - + Accept connections from outside (default: 1 if no -proxy or -connect) - + %s, you must set a rpcpassword in the configuration file: %s It is recommended you use the following random password: @@ -2298,11 +2319,6 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. Cannot obtain a lock on data directory %s. Bitcoin is probably already running. - - - Error initializing database environment %s! To recover, BACKUP THAT DIRECTORY, then remove everything from it except for wallet.dat. - - Error: The transaction was rejected! This might happen if some of the coins in your wallet were already spent, such as if you used a copy of wallet.dat and coins were spent in the copy but not marked as spent here. @@ -2329,12 +2345,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. - - Set the number of script verification threads (1-16, 0=auto, default: 0) - - - - + This is a pre-release test build - use at your own risk - do not use for mining or merchant applications @@ -2374,7 +2385,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. - + Connect only to the specified node(s) @@ -2394,7 +2405,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. - + Error initializing block database @@ -2418,11 +2429,6 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. Error: Disk space is low! - - - Error: Transaction creation failed! - - Error: Wallet locked, unable to create transaction! @@ -2494,7 +2500,12 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. - + + Generate coins (default: 0) + + + + How many blocks to check at startup (default: 288, 0 = all) @@ -2504,7 +2515,12 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. - + + Not enough file descriptors available. + + + + Rebuild block chain index from current blk000??.dat files @@ -2514,7 +2530,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. - + Verifying blocks... @@ -2524,12 +2540,17 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. - + Imports blocks from external blk000??.dat file - + + Set the number of script verification threads (up to 16, 0 = auto, <0 = leave that many cores free, default: 0) + + + + Information @@ -2538,6 +2559,16 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. Invalid -tor address: '%s' + + + Invalid amount for -minrelaytxfee=<amount>: '%s' + + + + + Invalid amount for -mintxfee=<amount>: '%s' + + Maintain a full transaction index (default: 0) @@ -2554,7 +2585,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. - + Only accept block chain matching built-in checkpoints (default: 1) @@ -2613,6 +2644,11 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. Shrink debug.log file on client startup (default: 1 when no -debug) + + + Signing transaction failed + + Specify connection timeout in milliseconds (default: 5000) @@ -2624,7 +2660,22 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. - + + Transaction amount too small + + + + + Transaction amounts must be positive + + + + + Transaction too large + + + + Use UPnP to map the listening port (default: 0) @@ -2664,7 +2715,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. - + Password for JSON-RPC connections رمز برای ارتباطاتِ JSON-RPC @@ -2679,17 +2730,17 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. دستورات را به گره اجرا شده در<ip> ارسال کنید (پیش فرض:127.0.0.1) - + Execute command when the best block changes (%s in cmd is replaced by block hash) دستور را وقتی بهترین بلاک تغییر کرد اجرا کن (%s در دستور توسط block hash جایگزین شده است) - + Upgrade wallet to latest format wallet را به جدیدترین نسخه روزآمد کنید - + Set key pool size to <n> (default: 100) حجم key pool را به اندازه <n> تنظیم کنید (پیش فرض:100) @@ -2699,12 +2750,12 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. زنجیره بلاک را برای تراکنش جا افتاده در WALLET دوباره اسکن کنید - + Use OpenSSL (https) for JSON-RPC connections برای ارتباطاتِ JSON-RPC از OpenSSL (https) استفاده کنید - + Server certificate file (default: server.cert) فایل certificate سرور (پیش فرض server.cert) @@ -2714,37 +2765,37 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. رمز اختصاصی سرور (پیش فرض: server.pem) - + Acceptable ciphers (default: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH) ciphers قابل قبول (پیش فرض: default: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH) - + This help message این پیام راهنما - + Unable to bind to %s on this computer (bind returned error %d, %s) - + Connect through socks proxy - + Allow DNS lookups for -addnode, -seednode and -connect - + Loading addresses... لود شدن آدرسها.. - + Error loading wallet.dat: Wallet corrupted خطا در هنگام لود شدن wallet.dat: Wallet corrupted @@ -2754,22 +2805,22 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. خطا در هنگام لود شدن wallet.dat. به نسخه جدید Bitocin برای wallet نیاز است. - + Wallet needed to be rewritten: restart Bitcoin to complete wallet نیاز به بازنویسی دارد. Bitcoin را برای تکمیل عملیات دوباره اجرا کنید. - + Error loading wallet.dat خطا در هنگام لود شدن wallet.dat - + Invalid -proxy address: '%s' - + Unknown network specified in -onlynet: '%s' @@ -2779,7 +2830,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. - + Cannot resolve -bind address: '%s' @@ -2799,17 +2850,17 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. میزان اشتباه است - + Insufficient funds وجوه ناکافی - + Loading block index... لود شدن نمایه بلاکها.. - + Add a node to connect to and attempt to keep the connection open یک گره برای اتصال اضافه کنید و تلاش کنید تا اتصال را باز نگاه دارید @@ -2819,52 +2870,47 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. - + Fee per KB to add to transactions you send هزینه بر اساس کیلو بایت برای اضافه شدن به تراکنشی که ارسال کرده اید - + Loading wallet... wallet در حال لود شدن است... - + Cannot downgrade wallet قابلیت برگشت به نسخه قبلی برای wallet امکان پذیر نیست - - - Cannot initialize keypool - initialize keypool امکان پذیر نیست - Cannot write default address آدرس پیش فرض قابل ذخیره نیست - + Rescanning... اسکنِ دوباره... - + Done loading اتمام لود شدن - + To use the %s option برای استفاده از %s از اختیارات - + Error خطا - + You must set rpcpassword=<password> in the configuration file: %s If the file does not exist, create it with owner-readable-only file permissions. diff --git a/src/qt/locale/bitcoin_fi.ts b/src/qt/locale/bitcoin_fi.ts index 491e02bb1f..b357e90979 100644 --- a/src/qt/locale/bitcoin_fi.ts +++ b/src/qt/locale/bitcoin_fi.ts @@ -29,14 +29,14 @@ Tämä ohjelma sisältää OpenSSL projektin OpenSSL työkalupakin (http://www.o - + Copyright Tekijänoikeus - 2009-%1 The Bitcoin developers - 2009-%1 Bittirahan kehittäjät + The Bitcoin developers + @@ -67,7 +67,7 @@ Tämä ohjelma sisältää OpenSSL projektin OpenSSL työkalupakin (http://www.o &Uusi Osoite - + These are your Bitcoin addresses for receiving payments. You may want to give a different one to each sender so you can keep track of who is paying you. Nämä ovat Bitcoin-osoitteesi joihin voit vastaanottaa maksuja. Voit haluta antaa jokaiselle maksajalle omansa, että pystyt seuraamaan keneltä maksut tulevat. @@ -97,7 +97,17 @@ Tämä ohjelma sisältää OpenSSL projektin OpenSSL työkalupakin (http://www.o Poista valittu osoite listalta - + + Export the data in the current tab to a file + Vie auki olevan välilehden tiedot tiedostoon + + + + &Export + + + + Verify a message to ensure it was signed with a specified Bitcoin address Tarkista viestin allekirjoitus varmistaaksesi, että se allekirjoitettiin tietyllä Bitcoin-osoitteella @@ -319,12 +329,12 @@ Tämä ohjelma sisältää OpenSSL projektin OpenSSL työkalupakin (http://www.o &Allekirjoita viesti... - + Synchronizing with network... Synkronoidaan verkon kanssa... - + &Overview &Yleisnäkymä @@ -399,7 +409,7 @@ Tämä ohjelma sisältää OpenSSL projektin OpenSSL työkalupakin (http://www.o &Vaihda Tunnuslause... - + Importing blocks from disk... Tuodaan lohkoja levyltä @@ -409,12 +419,7 @@ Tämä ohjelma sisältää OpenSSL projektin OpenSSL työkalupakin (http://www.o Ladataan lohkoindeksiä... - - &Export... - &Vie... - - - + Send coins to a Bitcoin address Lähetä kolikoita Bitcoin-osoitteeseen @@ -424,12 +429,7 @@ Tämä ohjelma sisältää OpenSSL projektin OpenSSL työkalupakin (http://www.o Muuta Bitcoinin konfiguraatioasetuksia - - Export the data in the current tab to a file - Vie auki olevan välilehden tiedot tiedostoon - - - + Backup wallet to another location Varmuuskopioi lompakko toiseen sijaintiin @@ -439,7 +439,7 @@ Tämä ohjelma sisältää OpenSSL projektin OpenSSL työkalupakin (http://www.o Vaihda lompakon salaukseen käytettävä tunnuslause - + &Debug window &Testausikkuna @@ -449,23 +449,23 @@ Tämä ohjelma sisältää OpenSSL projektin OpenSSL työkalupakin (http://www.o Avaa debuggaus- ja diagnostiikkakonsoli - + &Verify message... Varmista &viesti... - - + + Bitcoin Bitcoin - + Wallet Lompakko - + &Send &Lähetä @@ -510,12 +510,12 @@ Tämä ohjelma sisältää OpenSSL projektin OpenSSL työkalupakin (http://www.o Varmista, että viestisi on allekirjoitettu määritetyllä Bitcoin -osoitteella - + &File &Tiedosto - + &Settings &Asetukset @@ -530,12 +530,7 @@ Tämä ohjelma sisältää OpenSSL projektin OpenSSL työkalupakin (http://www.o Välilehtipalkki - - Actions toolbar - Toimintopalkki - - - + [testnet] [testnet] @@ -546,12 +541,17 @@ Tämä ohjelma sisältää OpenSSL projektin OpenSSL työkalupakin (http://www.o Bitcoin-asiakas - + %n active connection(s) to Bitcoin network %n aktiivinen yhteys Bitcoin-verkkoon%n aktiivista yhteyttä Bitcoin-verkkoon - + + No block source available... + + + + Processed %1 of %2 (estimated) blocks of transaction history. @@ -576,7 +576,7 @@ Tämä ohjelma sisältää OpenSSL projektin OpenSSL työkalupakin (http://www.o %n viikko%n viikkoa - + %1 behind @@ -591,7 +591,7 @@ Tämä ohjelma sisältää OpenSSL projektin OpenSSL työkalupakin (http://www.o - + Error Virhe @@ -606,22 +606,22 @@ Tämä ohjelma sisältää OpenSSL projektin OpenSSL työkalupakin (http://www.o Tietoa - + This transaction is over the size limit. You can still send it for a fee of %1, which goes to the nodes that process your transaction and helps to support the network. Do you want to pay the fee? - + Up to date Rahansiirtohistoria on ajan tasalla - + Catching up... Saavutetaan verkkoa... - + Confirm transaction fee Vahvista maksukulu @@ -670,7 +670,7 @@ Osoite: %4 Lompakko on <b>salattu</b> ja tällä hetkellä <b>lukittuna</b> - + A fatal error occurred. Bitcoin can no longer continue safely and will quit. Peruuttamaton virhe on tapahtunut. Bitcoin ei voi enää jatkaa turvallisesti ja sammutetaan. @@ -678,7 +678,7 @@ Osoite: %4 ClientModel - + Network Alert Verkkohälytys @@ -809,8 +809,8 @@ Osoite: %4 - Optional transaction fee per kB that helps make sure your transactions are processed quickly. Most transactions are 1 kB. Fee 0.01 recommended. - Vapaaehtoinen rahansiirtopalkkio per kB auttaa nopeuttamaan siirtoja. Useimmat rahansiirrot ovat 1 kB. 0.01 palkkio on suositeltava. + Optional transaction fee per kB that helps make sure your transactions are processed quickly. Most transactions are 1 kB. + @@ -1059,7 +1059,7 @@ Osoite: %4 Niiden saapuvien rahansiirtojen määrä, joita Bitcoin-verkko ei vielä ole ehtinyt vahvistaa ja siten eivät vielä näy saldossa. - + out of sync Ei ajan tasalla @@ -1645,6 +1645,19 @@ Osoite: %4 Viesti varmistettu. + + SplashScreen + + + The Bitcoin developers + + + + + [testnet] + [testnet] + + TransactionDesc @@ -2119,10 +2132,28 @@ Osoite: %4 kenelle + + WalletModel + + + Send Coins + Lähetä Bitcoineja + + WalletView - + + &Export + + + + + Export the data in the current tab to a file + Vie auki olevan välilehden tiedot tiedostoon + + + Backup Wallet @@ -2155,37 +2186,37 @@ Osoite: %4 bitcoin-core - + Bitcoin version Bitcoinin versio - + Usage: Käyttö: - + Send command to -server or bitcoind Lähetä käsky palvelimelle tai bitcoind:lle - + List commands Lista komennoista - + Get help for a command Hanki apua käskyyn - + Options: Asetukset: - + Specify configuration file (default: bitcoin.conf) Määritä asetustiedosto (oletus: bitcoin.conf) @@ -2195,27 +2226,17 @@ Osoite: %4 Määritä pid-tiedosto (oletus: bitcoin.pid) - - Generate coins - Generoi kolikoita - - - - Don't generate coins - Älä generoi kolikoita - - - + Specify data directory Määritä data-hakemisto - + Set database cache size in megabytes (default: 25) Aseta tietokannan välimuistin koko megatavuina (oletus: 25) - + Listen for connections on <port> (default: 8333 or testnet: 18333) Kuuntele yhteyksiä portista <port> (oletus: 8333 tai testnet: 18333) @@ -2230,7 +2251,7 @@ Osoite: %4 Yhdistä noodiin hakeaksesi naapurien osoitteet ja katkaise yhteys - + Specify your own public address Määritä julkinen osoitteesi @@ -2240,22 +2261,22 @@ Osoite: %4 Kynnysarvo aikakatkaisulle heikosti toimiville verkoille (oletus: 100) - + Number of seconds to keep misbehaving peers from reconnecting (default: 86400) Sekuntien määrä, kuinka kauan uudelleenkytkeydytään verkkoihin (oletus: 86400) - + An error occurred while setting up the RPC port %u for listening on IPv4: %s Virhe valmisteltaessa RPC-portin %u avaamista kuunneltavaksi: %s - + Listen for JSON-RPC connections on <port> (default: 8332 or testnet: 18332) Kuuntele JSON-RPC -yhteyksiä portista <port> (oletus: 8332 or testnet: 18332) - + Accept command line and JSON-RPC commands Hyväksy merkkipohjaiset- ja JSON-RPC-käskyt @@ -2265,17 +2286,17 @@ Osoite: %4 Aja taustalla daemonina ja hyväksy komennot - + Use the test network Käytä test -verkkoa - + Accept connections from outside (default: 1 if no -proxy or -connect) Hyväksy yhteyksiä ulkopuolelta (vakioasetus: 1 jos -proxy tai -connect ei määritelty) - + %s, you must set a rpcpassword in the configuration file: %s It is recommended you use the following random password: @@ -2304,11 +2325,6 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. Cannot obtain a lock on data directory %s. Bitcoin is probably already running. - - - Error initializing database environment %s! To recover, BACKUP THAT DIRECTORY, then remove everything from it except for wallet.dat. - - Error: The transaction was rejected! This might happen if some of the coins in your wallet were already spent, such as if you used a copy of wallet.dat and coins were spent in the copy but not marked as spent here. @@ -2335,12 +2351,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. Aseta suurin korkean prioriteetin / matalan palkkion siirron koko tavuissa (vakioasetus: 27000) - - Set the number of script verification threads (1-16, 0=auto, default: 0) - - - - + This is a pre-release test build - use at your own risk - do not use for mining or merchant applications @@ -2380,7 +2391,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. Lohkon luonnin asetukset: - + Connect only to the specified node(s) Yhidstä ainoastaan määrättyihin noodeihin @@ -2400,7 +2411,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. - + Error initializing block database @@ -2424,11 +2435,6 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. Error: Disk space is low! Varoitus: Levytila on vähissä! - - - Error: Transaction creation failed! - - Error: Wallet locked, unable to create transaction! @@ -2500,7 +2506,12 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. Hae naapureita DNS hauilla (vakioasetus: 1 paitsi jos -connect) - + + Generate coins (default: 0) + + + + How many blocks to check at startup (default: 288, 0 = all) @@ -2510,7 +2521,12 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. - + + Not enough file descriptors available. + + + + Rebuild block chain index from current blk000??.dat files @@ -2520,7 +2536,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. - + Verifying blocks... @@ -2530,12 +2546,17 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. - + Imports blocks from external blk000??.dat file Tuodaan lohkoja ulkoisesta blk000??.dat tiedostosta - + + Set the number of script verification threads (up to 16, 0 = auto, <0 = leave that many cores free, default: 0) + + + + Information Tietoa @@ -2544,6 +2565,16 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. Invalid -tor address: '%s' Virheellinen -tor osoite '%s' + + + Invalid amount for -minrelaytxfee=<amount>: '%s' + + + + + Invalid amount for -mintxfee=<amount>: '%s' + + Maintain a full transaction index (default: 0) @@ -2560,7 +2591,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. Suurin lähetyspuskuri yksittäiselle yhteydelle, <n>*1000 tavua (vakioasetus: 1000) - + Only accept block chain matching built-in checkpoints (default: 1) @@ -2619,6 +2650,11 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. Shrink debug.log file on client startup (default: 1 when no -debug) Pienennä debug.log tiedosto käynnistyksen yhteydessä (vakioasetus: 1 kun ei -debug) + + + Signing transaction failed + + Specify connection timeout in milliseconds (default: 5000) @@ -2630,7 +2666,22 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. Järjestelmävirhe: - + + Transaction amount too small + + + + + Transaction amounts must be positive + + + + + Transaction too large + + + + Use UPnP to map the listening port (default: 0) Käytä UPnP:tä kuunneltavan portin avaamiseen (vakioasetus: 0) @@ -2670,7 +2721,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. - + Password for JSON-RPC connections Salasana JSON-RPC-yhteyksille @@ -2685,17 +2736,17 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. Lähetä käskyjä solmuun osoitteessa <ip> (oletus: 127.0.0.1) - + Execute command when the best block changes (%s in cmd is replaced by block hash) Suorita käsky kun paras lohko muuttuu (%s cmd on vaihdettu block hashin kanssa) - + Upgrade wallet to latest format Päivitä lompakko uusimpaan formaattiin - + Set key pool size to <n> (default: 100) Aseta avainpoolin koko arvoon <n> (oletus: 100) @@ -2705,12 +2756,12 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. Skannaa uudelleen lohkoketju lompakon puuttuvien rahasiirtojen vuoksi - + Use OpenSSL (https) for JSON-RPC connections Käytä OpenSSL:ää (https) JSON-RPC-yhteyksille - + Server certificate file (default: server.cert) Palvelimen sertifikaatti-tiedosto (oletus: server.cert) @@ -2720,38 +2771,38 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. Palvelimen yksityisavain (oletus: server.pem) - + Acceptable ciphers (default: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH) Hyväksyttävä salaus (oletus: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH) - + This help message Tämä ohjeviesti - + Unable to bind to %s on this computer (bind returned error %d, %s) Kytkeytyminen %s tällä tietokonella ei onnistu (kytkeytyminen palautti virheen %d, %s) - + Connect through socks proxy Yhdistä socks proxyn läpi - + Allow DNS lookups for -addnode, -seednode and -connect Salli DNS kyselyt -addnode, -seednode ja -connect yhteydessä - + Loading addresses... Ladataan osoitteita... - + Error loading wallet.dat: Wallet corrupted Virhe ladattaessa wallet.dat-tiedostoa: Lompakko vioittunut @@ -2761,22 +2812,22 @@ TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH) Virhe ladattaessa wallet.dat-tiedostoa: Tarvitset uudemman version Bitcoinista - + Wallet needed to be rewritten: restart Bitcoin to complete Lompakko tarvitsee uudelleenkirjoittaa: käynnistä Bitcoin uudelleen - + Error loading wallet.dat Virhe ladattaessa wallet.dat-tiedostoa - + Invalid -proxy address: '%s' Virheellinen proxy-osoite '%s' - + Unknown network specified in -onlynet: '%s' Tuntematon verkko -onlynet parametrina: '%s' @@ -2786,7 +2837,7 @@ TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH) Tuntematon -socks proxy versio pyydetty: %i - + Cannot resolve -bind address: '%s' -bind osoitteen '%s' selvittäminen epäonnistui @@ -2806,17 +2857,17 @@ TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH) Virheellinen määrä - + Insufficient funds Lompakon saldo ei riitä - + Loading block index... Ladataan lohkoindeksiä... - + Add a node to connect to and attempt to keep the connection open Linää solmu mihin liittyä pitääksesi yhteyden auki @@ -2826,52 +2877,47 @@ TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH) Kytkeytyminen %s ei onnistu tällä tietokoneella. Bitcoin on todennäköisesti jo ajamassa. - + Fee per KB to add to transactions you send Rahansiirtopalkkio per KB lisätään lähettämääsi rahansiirtoon - + Loading wallet... Ladataan lompakkoa... - + Cannot downgrade wallet Et voi päivittää lompakkoasi vanhempaan versioon - - - Cannot initialize keypool - Avainvarastoa ei voi alustaa - Cannot write default address Oletusosoitetta ei voi kirjoittaa - + Rescanning... Skannataan uudelleen... - + Done loading Lataus on valmis - + To use the %s option Käytä %s optiota - + Error Virhe - + You must set rpcpassword=<password> in the configuration file: %s If the file does not exist, create it with owner-readable-only file permissions. diff --git a/src/qt/locale/bitcoin_fr.ts b/src/qt/locale/bitcoin_fr.ts index a7d4ee5b67..94de09d7f6 100644 --- a/src/qt/locale/bitcoin_fr.ts +++ b/src/qt/locale/bitcoin_fr.ts @@ -28,14 +28,14 @@ This product includes software developed by the OpenSSL Project for use in the O Ce produit comprend des fonctionnalités développées par le projet OpenSSL pour être utilisés dans la boîte à outils OpenSSL (http://www.openssl.org/), un logiciel cryptographique écrit par Eric Young (eay@cryptsoft.com), et des fonctionnalités développées pour le logiciel UPnP écrit par Thomas Bernard. - + Copyright Droit d'auteur - 2009-%1 The Bitcoin developers - 2009-%1 Développeurs de Bitcoin + The Bitcoin developers + Les développeurs Bitcoin @@ -43,7 +43,7 @@ This product includes software developed by the OpenSSL Project for use in the O Address Book - Options interface utilisateur + Carnet d'adresses @@ -66,7 +66,7 @@ This product includes software developed by the OpenSSL Project for use in the O &Nouvelle adresse - + These are your Bitcoin addresses for receiving payments. You may want to give a different one to each sender so you can keep track of who is paying you. Voici vos adresses Bitcoin qui vous permettent de recevoir des paiements. Vous pouvez donner une adresse différente à chaque expéditeur afin de savoir qui vous paye. @@ -96,7 +96,17 @@ This product includes software developed by the OpenSSL Project for use in the O Effacer l'adresse actuellement sélectionnée de la liste - + + Export the data in the current tab to a file + Exporter les données de l'onglet courant vers un fichier + + + + &Export + &Exporter + + + Verify a message to ensure it was signed with a specified Bitcoin address Vérifier un message pour vous assurer qu'il a bien été signé avec l'adresse Bitcoin spécifiée @@ -318,12 +328,12 @@ This product includes software developed by the OpenSSL Project for use in the O Signer un &message... - + Synchronizing with network... Synchronisation avec le réseau… - + &Overview &Vue d'ensemble @@ -398,7 +408,7 @@ This product includes software developed by the OpenSSL Project for use in the O &Modifier la phrase de passe... - + Importing blocks from disk... Importation des blocs depuis le disque... @@ -408,12 +418,7 @@ This product includes software developed by the OpenSSL Project for use in the O Réindexation des blocs sur le disque... - - &Export... - &Exporter… - - - + Send coins to a Bitcoin address Envoyer des pièces à une adresse Bitcoin @@ -423,12 +428,7 @@ This product includes software developed by the OpenSSL Project for use in the O Modifier les options de configuration de Bitcoin - - Export the data in the current tab to a file - Exporter les données de l'onglet courant vers un fichier - - - + Backup wallet to another location Sauvegarder le porte-monnaie à un autre emplacement @@ -438,7 +438,7 @@ This product includes software developed by the OpenSSL Project for use in the O Modifier la phrase de passe utilisée pour le chiffrement du porte-monnaie - + &Debug window Fenêtre de &débogage @@ -448,23 +448,23 @@ This product includes software developed by the OpenSSL Project for use in the O Ouvrir une console de débogage et de diagnostic - + &Verify message... &Vérifier un message... - - + + Bitcoin Bitcoin - + Wallet Porte-monnaie - + &Send &Envoyer @@ -509,12 +509,12 @@ This product includes software developed by the OpenSSL Project for use in the O Vérifier les messages pour vous assurer qu'ils ont bien été signés avec les adresses Bitcoin spécifiées - + &File &Fichier - + &Settings &Réglages @@ -529,12 +529,7 @@ This product includes software developed by the OpenSSL Project for use in the O Barre d'outils des onglets - - Actions toolbar - Barre d'outils des actions - - - + [testnet] [testnet] @@ -545,12 +540,17 @@ This product includes software developed by the OpenSSL Project for use in the O Client Bitcoin - + %n active connection(s) to Bitcoin network %n connexion active avec le réseau Bitcoin%n connexions actives avec le réseau Bitcoin - + + No block source available... + Aucune source de bloc disponible... + + + Processed %1 of %2 (estimated) blocks of transaction history. %1 blocs sur %2 (estimés) de l'historique des transactions traités. @@ -575,7 +575,7 @@ This product includes software developed by the OpenSSL Project for use in the O %n semaine%n semaines - + %1 behind %1 en arrière @@ -590,7 +590,7 @@ This product includes software developed by the OpenSSL Project for use in the O Les transactions après cela ne seront pas encore visibles. - + Error Erreur @@ -605,22 +605,22 @@ This product includes software developed by the OpenSSL Project for use in the O Information - + This transaction is over the size limit. You can still send it for a fee of %1, which goes to the nodes that process your transaction and helps to support the network. Do you want to pay the fee? Cette transaction dépasse la limite de taille. Vous pouvez quand même l'envoyer en vous acquittant de frais d'un montant de %1 qui iront aux nœuds qui traiteront la transaction et aideront à soutenir le réseau. Voulez-vous payer les frais ? - + Up to date À jour - + Catching up... Rattrapage… - + Confirm transaction fee Confirmer les frais de transaction @@ -670,7 +670,7 @@ Adresse : %4 Le porte-monnaie est <b>chiffré</b> et est actuellement <b>verrouillé</b> - + A fatal error occurred. Bitcoin can no longer continue safely and will quit. Une erreur fatale est survenue. Bitcoin ne peut plus continuer à fonctionner de façon sûre et va s'arrêter. @@ -678,7 +678,7 @@ Adresse : %4 ClientModel - + Network Alert Alerte réseau @@ -809,8 +809,8 @@ Adresse : %4 - Optional transaction fee per kB that helps make sure your transactions are processed quickly. Most transactions are 1 kB. Fee 0.01 recommended. - Frais de transaction optionnels par ko qui aident à garantir un traitement rapide des transactions. La plupart des transactions occupent 1 ko. Des frais de 0.01 sont recommandés. + Optional transaction fee per kB that helps make sure your transactions are processed quickly. Most transactions are 1 kB. + Frais de transaction optionnel par ko qui aident à garantir un traitement rapide des transactions. La plupart des transactions utilisent 1 ko. @@ -1059,7 +1059,7 @@ Adresse : %4 Total des transactions qui doivent encore être confirmées et qui ne sont pas prises en compte dans le solde actuel - + out of sync désynchronisé @@ -1645,6 +1645,19 @@ Adresse : %4 Message vérifié. + + SplashScreen + + + The Bitcoin developers + Les développeurs Bitcoin + + + + [testnet] + [testnet] + + TransactionDesc @@ -2119,10 +2132,28 @@ Adresse : %4 à + + WalletModel + + + Send Coins + Envoyer des pièces + + WalletView - + + &Export + &Exporter + + + + Export the data in the current tab to a file + Exporter les données de l'onglet courant vers un fichier + + + Backup Wallet Sauvegarder le porte-monnaie @@ -2155,37 +2186,37 @@ Adresse : %4 bitcoin-core - + Bitcoin version Version de Bitcoin - + Usage: Utilisation : - + Send command to -server or bitcoind Envoyer une commande à -server ou à bitcoind - + List commands Lister les commandes - + Get help for a command Obtenir de l’aide pour une commande - + Options: Options : - + Specify configuration file (default: bitcoin.conf) Spécifier le fichier de configuration (par défaut : bitcoin.conf) @@ -2195,27 +2226,17 @@ Adresse : %4 Spécifier le fichier PID (par défaut : bitcoind.pid) - - Generate coins - Générer des pièces - - - - Don't generate coins - Ne pas générer de pièces - - - + Specify data directory Spécifier le répertoire de données - + Set database cache size in megabytes (default: 25) Définir la taille du tampon en mégaoctets (par défaut : 25) - + Listen for connections on <port> (default: 8333 or testnet: 18333) Écouter les connexions sur le <port> (par défaut : 8333 ou testnet : 18333) @@ -2230,7 +2251,7 @@ Adresse : %4 Se connecter à un nœud pour obtenir des adresses de pairs puis se déconnecter - + Specify your own public address Spécifier votre propre adresse publique @@ -2240,22 +2261,22 @@ Adresse : %4 Seuil de déconnexion des pairs de mauvaise qualité (par défaut : 100) - + Number of seconds to keep misbehaving peers from reconnecting (default: 86400) Délai en secondes de refus de reconnexion aux pairs de mauvaise qualité (par défaut : 86400) - + An error occurred while setting up the RPC port %u for listening on IPv4: %s Une erreur est survenue lors de la mise en place du port RPC %u pour écouter sur IPv4 : %s - + Listen for JSON-RPC connections on <port> (default: 8332 or testnet: 18332) Écouter les connexions JSON-RPC sur le <port> (par défaut : 8332 ou tesnet : 18332) - + Accept command line and JSON-RPC commands Accepter les commandes de JSON-RPC et de la ligne de commande @@ -2265,17 +2286,17 @@ Adresse : %4 Fonctionner en arrière-plan en tant que démon et accepter les commandes - + Use the test network Utiliser le réseau de test - + Accept connections from outside (default: 1 if no -proxy or -connect) Accepter les connexions entrantes (par défaut : 1 si -proxy ou -connect ne sont pas présents) - + %s, you must set a rpcpassword in the configuration file: %s It is recommended you use the following random password: @@ -2314,11 +2335,6 @@ par exemple : alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo Cannot obtain a lock on data directory %s. Bitcoin is probably already running. Impossible d’obtenir un verrou sur le répertoire de données %s. Bitcoin fonctionne probablement déjà. - - - Error initializing database environment %s! To recover, BACKUP THAT DIRECTORY, then remove everything from it except for wallet.dat. - Une erreur est survenue lors de l'initialisation de l'environnement de base de données %s ! Pour récupérer, SAUVEGARDEZ CE RÉPERTOIRE, puis effacez-y tous les fichiers à l'exception de wallet.dat. - Error: The transaction was rejected! This might happen if some of the coins in your wallet were already spent, such as if you used a copy of wallet.dat and coins were spent in the copy but not marked as spent here. @@ -2345,12 +2361,7 @@ par exemple : alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo Définir la taille maximale en octets des transactions prioritaires/à frais modiques (par défaut : 27000) - - Set the number of script verification threads (1-16, 0=auto, default: 0) - Définir le nombre de fils de vérification de script (1-16, 0=auto, par défaut : 0) - - - + This is a pre-release test build - use at your own risk - do not use for mining or merchant applications Ceci est une pré-version de test - utilisez à vos risques et périls - ne l'utilisez pas pour miner ou pour des applications marchandes @@ -2390,7 +2401,7 @@ par exemple : alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo Options de création des blocs : - + Connect only to the specified node(s) Ne se connecter qu'au(x) nœud(s) spécifié(s) @@ -2410,7 +2421,7 @@ par exemple : alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo Voulez-vous reconstruire la base de données des blocs maintenant ? - + Error initializing block database Erreur lors de l'initialisation de la base de données des blocs @@ -2434,11 +2445,6 @@ par exemple : alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo Error: Disk space is low! Erreur : l'espace disque est faible ! - - - Error: Transaction creation failed! - Erreur : Échec de la création de la transaction ! - Error: Wallet locked, unable to create transaction! @@ -2510,7 +2516,12 @@ par exemple : alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo Trouver des pairs en utilisant la recherche DNS (par défaut : 1 sauf si -connect est utilisé) - + + Generate coins (default: 0) + Générer des pièces (défaut: 0) + + + How many blocks to check at startup (default: 288, 0 = all) Nombre de blocs à vérifier au démarrage (par défaut : 288, 0 = tout) @@ -2520,7 +2531,12 @@ par exemple : alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo Niveau d'approfondissement de la vérification des blocs (0-4, par défaut : 3) - + + Not enough file descriptors available. + Pas assez de descripteurs de fichiers disponibles. + + + Rebuild block chain index from current blk000??.dat files Reconstruire l'index de la chaîne des blocs à partir des fichiers blk000??.dat actuels @@ -2530,7 +2546,7 @@ par exemple : alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo Définir le nombre d'exétrons pour desservir les appels RPC (par défaut : 4) - + Verifying blocks... Vérification des blocs... @@ -2540,12 +2556,17 @@ par exemple : alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo Vérification du porte-monnaie... - + Imports blocks from external blk000??.dat file Importe des blocs depuis un fichier blk000??.dat externe - + + Set the number of script verification threads (up to 16, 0 = auto, <0 = leave that many cores free, default: 0) + Définir le nombre de fils d’exécution pour la vérification des scripts (maximum 16, 0 = auto, < 0 = laisser ce nombre de cœurs libres, par défaut : 0) + + + Information Informations @@ -2554,6 +2575,16 @@ par exemple : alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo Invalid -tor address: '%s' Adresse -tor invalide : « %s » + + + Invalid amount for -minrelaytxfee=<amount>: '%s' + Montant invalide pour -minrelayfee=<montant> : « %s » + + + + Invalid amount for -mintxfee=<amount>: '%s' + Montant invalide pour -mintxfee=<montant> : « %s » + Maintain a full transaction index (default: 0) @@ -2570,7 +2601,7 @@ par exemple : alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo Tampon maximal d'envoi par connexion, <n>*1000 octets (par défaut : 1000) - + Only accept block chain matching built-in checkpoints (default: 1) N'accepter que la chaîne de blocs correspondant aux points de vérification internes (par défaut : 1) @@ -2629,6 +2660,11 @@ par exemple : alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo Shrink debug.log file on client startup (default: 1 when no -debug) Réduire le fichier debug.log lors du démarrage du client (par défaut : 1 lorsque -debug n'est pas présent) + + + Signing transaction failed + La signature de la transaction a échoué + Specify connection timeout in milliseconds (default: 5000) @@ -2640,7 +2676,22 @@ par exemple : alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo Erreur système : - + + Transaction amount too small + Montant de la transaction trop bas + + + + Transaction amounts must be positive + Les montants de la transaction doivent être positifs + + + + Transaction too large + Transaction trop volumineuse + + + Use UPnP to map the listening port (default: 0) Utiliser l'UPnP pour rediriger le port d'écoute (par défaut : 0) @@ -2680,7 +2731,7 @@ par exemple : alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo wallet.dat corrompu, la récupération a échoué - + Password for JSON-RPC connections Mot de passe pour les connexions JSON-RPC @@ -2695,17 +2746,17 @@ par exemple : alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo Envoyer des commandes au nœud fonctionnant à <ip> (par défaut : 127.0.0.1) - + Execute command when the best block changes (%s in cmd is replaced by block hash) Exécuter la commande lorsque le meilleur bloc change (%s est remplacé par le hachage du bloc dans cmd) - + Upgrade wallet to latest format Mettre à jour le format du porte-monnaie - + Set key pool size to <n> (default: 100) Régler la taille de la plage de clefs sur <n> (par défaut : 100) @@ -2715,12 +2766,12 @@ par exemple : alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo Réanalyser la chaîne de blocs pour les transactions de porte-monnaie manquantes - + Use OpenSSL (https) for JSON-RPC connections Utiliser OpenSSL (https) pour les connexions JSON-RPC - + Server certificate file (default: server.cert) Fichier de certificat serveur (par défaut : server.cert) @@ -2730,37 +2781,37 @@ par exemple : alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo Clef privée du serveur (par défaut : server.pem) - + Acceptable ciphers (default: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH) Clefs de chiffrement acceptables (par défaut : TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH) - + This help message Ce message d'aide - + Unable to bind to %s on this computer (bind returned error %d, %s) Impossible de se lier à %s sur cet ordinateur (bind a retourné l'erreur %d, %s) - + Connect through socks proxy Connexion via un proxy socks - + Allow DNS lookups for -addnode, -seednode and -connect Autoriser les recherches DNS pour -addnode, -seednode et -connect - + Loading addresses... Chargement des adresses… - + Error loading wallet.dat: Wallet corrupted Erreur lors du chargement de wallet.dat : porte-monnaie corrompu @@ -2770,22 +2821,22 @@ par exemple : alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo Erreur lors du chargement de wallet.dat : le porte-monnaie nécessite une version plus récente de Bitcoin - + Wallet needed to be rewritten: restart Bitcoin to complete Le porte-monnaie nécessitait une réécriture : veuillez redémarrer Bitcoin pour terminer l'opération - + Error loading wallet.dat Erreur lors du chargement de wallet.dat - + Invalid -proxy address: '%s' Adresse -proxy invalide : « %s » - + Unknown network specified in -onlynet: '%s' Réseau inconnu spécifié sur -onlynet : « %s » @@ -2795,7 +2846,7 @@ par exemple : alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo Version inconnue de proxy -socks demandée : %i - + Cannot resolve -bind address: '%s' Impossible de résoudre l'adresse -bind : « %s » @@ -2815,17 +2866,17 @@ par exemple : alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo Montant invalide - + Insufficient funds Fonds insuffisants - + Loading block index... Chargement de l’index des blocs… - + Add a node to connect to and attempt to keep the connection open Ajouter un nœud auquel se connecter et tenter de garder la connexion ouverte @@ -2835,52 +2886,47 @@ par exemple : alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo Impossible de se lier à %s sur cet ordinateur. Bitcoin fonctionne probablement déjà. - + Fee per KB to add to transactions you send Frais par Ko à ajouter aux transactions que vous enverrez - + Loading wallet... Chargement du porte-monnaie… - + Cannot downgrade wallet Impossible de revenir à une version antérieure du porte-monnaie - - - Cannot initialize keypool - Impossible d'initialiser la plage des clefs - Cannot write default address Impossible d'écrire l'adresse par défaut - + Rescanning... Nouvelle analyse… - + Done loading Chargement terminé - + To use the %s option Pour utiliser l'option %s - + Error Erreur - + You must set rpcpassword=<password> in the configuration file: %s If the file does not exist, create it with owner-readable-only file permissions. diff --git a/src/qt/locale/bitcoin_fr_CA.ts b/src/qt/locale/bitcoin_fr_CA.ts index e239b92645..12909b42f2 100644 --- a/src/qt/locale/bitcoin_fr_CA.ts +++ b/src/qt/locale/bitcoin_fr_CA.ts @@ -28,13 +28,13 @@ Distribué sous licence MIT/X11, voir le fichier COPYING ou http://www.opensourc Ce produit comprend des logiciels développés par le projet OpenSSL pour être utilisés dans la boîte à outils OpenSSL (http://www.openssl.org/), un logiciel cryptographique écrit par Eric Young (eay@cryptsoft.com) et un logiciel UPnP écrit par Thomas Bernard. - + Copyright - 2009-%1 The Bitcoin developers + The Bitcoin developers @@ -66,7 +66,7 @@ Ce produit comprend des logiciels développés par le projet OpenSSL pour être - + These are your Bitcoin addresses for receiving payments. You may want to give a different one to each sender so you can keep track of who is paying you. Ceux-ci sont vos adresses Bitcoin qui vous permettent de recevoir des paiements. Vous pouvez en donner une différente à chaque expédieur afin de savoir qui vous payent. @@ -96,7 +96,17 @@ Ce produit comprend des logiciels développés par le projet OpenSSL pour être - + + Export the data in the current tab to a file + + + + + &Export + + + + Verify a message to ensure it was signed with a specified Bitcoin address @@ -318,12 +328,12 @@ Ce produit comprend des logiciels développés par le projet OpenSSL pour être - + Synchronizing with network... - + &Overview @@ -398,7 +408,7 @@ Ce produit comprend des logiciels développés par le projet OpenSSL pour être - + Importing blocks from disk... @@ -408,12 +418,7 @@ Ce produit comprend des logiciels développés par le projet OpenSSL pour être - - &Export... - - - - + Send coins to a Bitcoin address @@ -423,12 +428,7 @@ Ce produit comprend des logiciels développés par le projet OpenSSL pour être - - Export the data in the current tab to a file - - - - + Backup wallet to another location @@ -438,7 +438,7 @@ Ce produit comprend des logiciels développés par le projet OpenSSL pour être - + &Debug window @@ -448,23 +448,23 @@ Ce produit comprend des logiciels développés par le projet OpenSSL pour être - + &Verify message... - - + + Bitcoin - + Wallet - + &Send @@ -509,12 +509,12 @@ Ce produit comprend des logiciels développés par le projet OpenSSL pour être - + &File - + &Settings @@ -529,12 +529,7 @@ Ce produit comprend des logiciels développés par le projet OpenSSL pour être - - Actions toolbar - - - - + [testnet] @@ -545,12 +540,17 @@ Ce produit comprend des logiciels développés par le projet OpenSSL pour être - + %n active connection(s) to Bitcoin network - + + No block source available... + + + + Processed %1 of %2 (estimated) blocks of transaction history. @@ -575,7 +575,7 @@ Ce produit comprend des logiciels développés par le projet OpenSSL pour être - + %1 behind @@ -590,7 +590,7 @@ Ce produit comprend des logiciels développés par le projet OpenSSL pour être - + Error @@ -605,22 +605,22 @@ Ce produit comprend des logiciels développés par le projet OpenSSL pour être - + This transaction is over the size limit. You can still send it for a fee of %1, which goes to the nodes that process your transaction and helps to support the network. Do you want to pay the fee? - + Up to date - + Catching up... - + Confirm transaction fee @@ -666,7 +666,7 @@ Address: %4 - + A fatal error occurred. Bitcoin can no longer continue safely and will quit. @@ -674,7 +674,7 @@ Address: %4 ClientModel - + Network Alert @@ -805,7 +805,7 @@ Address: %4 - Optional transaction fee per kB that helps make sure your transactions are processed quickly. Most transactions are 1 kB. Fee 0.01 recommended. + Optional transaction fee per kB that helps make sure your transactions are processed quickly. Most transactions are 1 kB. @@ -1055,7 +1055,7 @@ Address: %4 - + out of sync @@ -1641,6 +1641,19 @@ Address: %4 + + SplashScreen + + + The Bitcoin developers + + + + + [testnet] + + + TransactionDesc @@ -2115,10 +2128,28 @@ Address: %4 + + WalletModel + + + Send Coins + + + WalletView - + + &Export + + + + + Export the data in the current tab to a file + + + + Backup Wallet @@ -2151,37 +2182,37 @@ Address: %4 bitcoin-core - + Bitcoin version - + Usage: - + Send command to -server or bitcoind - + List commands - + Get help for a command - + Options: - + Specify configuration file (default: bitcoin.conf) @@ -2191,27 +2222,17 @@ Address: %4 - - Generate coins - - - - - Don't generate coins - - - - + Specify data directory - + Set database cache size in megabytes (default: 25) - + Listen for connections on <port> (default: 8333 or testnet: 18333) @@ -2226,7 +2247,7 @@ Address: %4 - + Specify your own public address @@ -2236,22 +2257,22 @@ Address: %4 - + Number of seconds to keep misbehaving peers from reconnecting (default: 86400) - + An error occurred while setting up the RPC port %u for listening on IPv4: %s - + Listen for JSON-RPC connections on <port> (default: 8332 or testnet: 18332) - + Accept command line and JSON-RPC commands @@ -2261,17 +2282,17 @@ Address: %4 - + Use the test network - + Accept connections from outside (default: 1 if no -proxy or -connect) - + %s, you must set a rpcpassword in the configuration file: %s It is recommended you use the following random password: @@ -2300,11 +2321,6 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. Cannot obtain a lock on data directory %s. Bitcoin is probably already running. - - - Error initializing database environment %s! To recover, BACKUP THAT DIRECTORY, then remove everything from it except for wallet.dat. - - Error: The transaction was rejected! This might happen if some of the coins in your wallet were already spent, such as if you used a copy of wallet.dat and coins were spent in the copy but not marked as spent here. @@ -2331,12 +2347,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. - - Set the number of script verification threads (1-16, 0=auto, default: 0) - - - - + This is a pre-release test build - use at your own risk - do not use for mining or merchant applications @@ -2376,7 +2387,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. - + Connect only to the specified node(s) @@ -2396,7 +2407,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. - + Error initializing block database @@ -2420,11 +2431,6 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. Error: Disk space is low! - - - Error: Transaction creation failed! - - Error: Wallet locked, unable to create transaction! @@ -2496,7 +2502,12 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. - + + Generate coins (default: 0) + + + + How many blocks to check at startup (default: 288, 0 = all) @@ -2506,7 +2517,12 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. - + + Not enough file descriptors available. + + + + Rebuild block chain index from current blk000??.dat files @@ -2516,7 +2532,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. - + Verifying blocks... @@ -2526,12 +2542,17 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. - + Imports blocks from external blk000??.dat file - + + Set the number of script verification threads (up to 16, 0 = auto, <0 = leave that many cores free, default: 0) + + + + Information @@ -2540,6 +2561,16 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. Invalid -tor address: '%s' + + + Invalid amount for -minrelaytxfee=<amount>: '%s' + + + + + Invalid amount for -mintxfee=<amount>: '%s' + + Maintain a full transaction index (default: 0) @@ -2556,7 +2587,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. - + Only accept block chain matching built-in checkpoints (default: 1) @@ -2615,6 +2646,11 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. Shrink debug.log file on client startup (default: 1 when no -debug) + + + Signing transaction failed + + Specify connection timeout in milliseconds (default: 5000) @@ -2626,7 +2662,22 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. - + + Transaction amount too small + + + + + Transaction amounts must be positive + + + + + Transaction too large + + + + Use UPnP to map the listening port (default: 0) @@ -2666,7 +2717,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. - + Password for JSON-RPC connections @@ -2681,17 +2732,17 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. - + Execute command when the best block changes (%s in cmd is replaced by block hash) - + Upgrade wallet to latest format - + Set key pool size to <n> (default: 100) @@ -2701,12 +2752,12 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. - + Use OpenSSL (https) for JSON-RPC connections - + Server certificate file (default: server.cert) @@ -2716,37 +2767,37 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. - + Acceptable ciphers (default: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH) - + This help message - + Unable to bind to %s on this computer (bind returned error %d, %s) - + Connect through socks proxy - + Allow DNS lookups for -addnode, -seednode and -connect - + Loading addresses... - + Error loading wallet.dat: Wallet corrupted @@ -2756,22 +2807,22 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. - + Wallet needed to be rewritten: restart Bitcoin to complete - + Error loading wallet.dat - + Invalid -proxy address: '%s' - + Unknown network specified in -onlynet: '%s' @@ -2781,7 +2832,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. - + Cannot resolve -bind address: '%s' @@ -2801,17 +2852,17 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. - + Insufficient funds - + Loading block index... - + Add a node to connect to and attempt to keep the connection open @@ -2821,52 +2872,47 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. - + Fee per KB to add to transactions you send - + Loading wallet... - + Cannot downgrade wallet - - - Cannot initialize keypool - - Cannot write default address - + Rescanning... - + Done loading - + To use the %s option - + Error - + You must set rpcpassword=<password> in the configuration file: %s If the file does not exist, create it with owner-readable-only file permissions. diff --git a/src/qt/locale/bitcoin_gu_IN.ts b/src/qt/locale/bitcoin_gu_IN.ts index fdc6b33286..c9ad0e6afa 100644 --- a/src/qt/locale/bitcoin_gu_IN.ts +++ b/src/qt/locale/bitcoin_gu_IN.ts @@ -23,13 +23,13 @@ This product includes software developed by the OpenSSL Project for use in the O - + Copyright - 2009-%1 The Bitcoin developers + The Bitcoin developers @@ -61,7 +61,7 @@ This product includes software developed by the OpenSSL Project for use in the O - + These are your Bitcoin addresses for receiving payments. You may want to give a different one to each sender so you can keep track of who is paying you. @@ -91,7 +91,17 @@ This product includes software developed by the OpenSSL Project for use in the O - + + Export the data in the current tab to a file + + + + + &Export + + + + Verify a message to ensure it was signed with a specified Bitcoin address @@ -313,12 +323,12 @@ This product includes software developed by the OpenSSL Project for use in the O - + Synchronizing with network... - + &Overview @@ -393,7 +403,7 @@ This product includes software developed by the OpenSSL Project for use in the O - + Importing blocks from disk... @@ -403,12 +413,7 @@ This product includes software developed by the OpenSSL Project for use in the O - - &Export... - - - - + Send coins to a Bitcoin address @@ -418,12 +423,7 @@ This product includes software developed by the OpenSSL Project for use in the O - - Export the data in the current tab to a file - - - - + Backup wallet to another location @@ -433,7 +433,7 @@ This product includes software developed by the OpenSSL Project for use in the O - + &Debug window @@ -443,23 +443,23 @@ This product includes software developed by the OpenSSL Project for use in the O - + &Verify message... - - + + Bitcoin - + Wallet - + &Send @@ -504,12 +504,12 @@ This product includes software developed by the OpenSSL Project for use in the O - + &File - + &Settings @@ -524,12 +524,7 @@ This product includes software developed by the OpenSSL Project for use in the O - - Actions toolbar - - - - + [testnet] @@ -540,12 +535,17 @@ This product includes software developed by the OpenSSL Project for use in the O - + %n active connection(s) to Bitcoin network - + + No block source available... + + + + Processed %1 of %2 (estimated) blocks of transaction history. @@ -570,7 +570,7 @@ This product includes software developed by the OpenSSL Project for use in the O - + %1 behind @@ -585,7 +585,7 @@ This product includes software developed by the OpenSSL Project for use in the O - + Error @@ -600,22 +600,22 @@ This product includes software developed by the OpenSSL Project for use in the O - + This transaction is over the size limit. You can still send it for a fee of %1, which goes to the nodes that process your transaction and helps to support the network. Do you want to pay the fee? - + Up to date - + Catching up... - + Confirm transaction fee @@ -661,7 +661,7 @@ Address: %4 - + A fatal error occurred. Bitcoin can no longer continue safely and will quit. @@ -669,7 +669,7 @@ Address: %4 ClientModel - + Network Alert @@ -800,7 +800,7 @@ Address: %4 - Optional transaction fee per kB that helps make sure your transactions are processed quickly. Most transactions are 1 kB. Fee 0.01 recommended. + Optional transaction fee per kB that helps make sure your transactions are processed quickly. Most transactions are 1 kB. @@ -1050,7 +1050,7 @@ Address: %4 - + out of sync @@ -1636,6 +1636,19 @@ Address: %4 + + SplashScreen + + + The Bitcoin developers + + + + + [testnet] + + + TransactionDesc @@ -2110,10 +2123,28 @@ Address: %4 + + WalletModel + + + Send Coins + + + WalletView - + + &Export + + + + + Export the data in the current tab to a file + + + + Backup Wallet @@ -2146,37 +2177,37 @@ Address: %4 bitcoin-core - + Bitcoin version - + Usage: - + Send command to -server or bitcoind - + List commands - + Get help for a command - + Options: - + Specify configuration file (default: bitcoin.conf) @@ -2186,27 +2217,17 @@ Address: %4 - - Generate coins - - - - - Don't generate coins - - - - + Specify data directory - + Set database cache size in megabytes (default: 25) - + Listen for connections on <port> (default: 8333 or testnet: 18333) @@ -2221,7 +2242,7 @@ Address: %4 - + Specify your own public address @@ -2231,22 +2252,22 @@ Address: %4 - + Number of seconds to keep misbehaving peers from reconnecting (default: 86400) - + An error occurred while setting up the RPC port %u for listening on IPv4: %s - + Listen for JSON-RPC connections on <port> (default: 8332 or testnet: 18332) - + Accept command line and JSON-RPC commands @@ -2256,17 +2277,17 @@ Address: %4 - + Use the test network - + Accept connections from outside (default: 1 if no -proxy or -connect) - + %s, you must set a rpcpassword in the configuration file: %s It is recommended you use the following random password: @@ -2295,11 +2316,6 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. Cannot obtain a lock on data directory %s. Bitcoin is probably already running. - - - Error initializing database environment %s! To recover, BACKUP THAT DIRECTORY, then remove everything from it except for wallet.dat. - - Error: The transaction was rejected! This might happen if some of the coins in your wallet were already spent, such as if you used a copy of wallet.dat and coins were spent in the copy but not marked as spent here. @@ -2326,12 +2342,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. - - Set the number of script verification threads (1-16, 0=auto, default: 0) - - - - + This is a pre-release test build - use at your own risk - do not use for mining or merchant applications @@ -2371,7 +2382,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. - + Connect only to the specified node(s) @@ -2391,7 +2402,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. - + Error initializing block database @@ -2415,11 +2426,6 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. Error: Disk space is low! - - - Error: Transaction creation failed! - - Error: Wallet locked, unable to create transaction! @@ -2491,7 +2497,12 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. - + + Generate coins (default: 0) + + + + How many blocks to check at startup (default: 288, 0 = all) @@ -2501,7 +2512,12 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. - + + Not enough file descriptors available. + + + + Rebuild block chain index from current blk000??.dat files @@ -2511,7 +2527,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. - + Verifying blocks... @@ -2521,12 +2537,17 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. - + Imports blocks from external blk000??.dat file - + + Set the number of script verification threads (up to 16, 0 = auto, <0 = leave that many cores free, default: 0) + + + + Information @@ -2535,6 +2556,16 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. Invalid -tor address: '%s' + + + Invalid amount for -minrelaytxfee=<amount>: '%s' + + + + + Invalid amount for -mintxfee=<amount>: '%s' + + Maintain a full transaction index (default: 0) @@ -2551,7 +2582,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. - + Only accept block chain matching built-in checkpoints (default: 1) @@ -2610,6 +2641,11 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. Shrink debug.log file on client startup (default: 1 when no -debug) + + + Signing transaction failed + + Specify connection timeout in milliseconds (default: 5000) @@ -2621,7 +2657,22 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. - + + Transaction amount too small + + + + + Transaction amounts must be positive + + + + + Transaction too large + + + + Use UPnP to map the listening port (default: 0) @@ -2661,7 +2712,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. - + Password for JSON-RPC connections @@ -2676,17 +2727,17 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. - + Execute command when the best block changes (%s in cmd is replaced by block hash) - + Upgrade wallet to latest format - + Set key pool size to <n> (default: 100) @@ -2696,12 +2747,12 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. - + Use OpenSSL (https) for JSON-RPC connections - + Server certificate file (default: server.cert) @@ -2711,37 +2762,37 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. - + Acceptable ciphers (default: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH) - + This help message - + Unable to bind to %s on this computer (bind returned error %d, %s) - + Connect through socks proxy - + Allow DNS lookups for -addnode, -seednode and -connect - + Loading addresses... - + Error loading wallet.dat: Wallet corrupted @@ -2751,22 +2802,22 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. - + Wallet needed to be rewritten: restart Bitcoin to complete - + Error loading wallet.dat - + Invalid -proxy address: '%s' - + Unknown network specified in -onlynet: '%s' @@ -2776,7 +2827,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. - + Cannot resolve -bind address: '%s' @@ -2796,17 +2847,17 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. - + Insufficient funds - + Loading block index... - + Add a node to connect to and attempt to keep the connection open @@ -2816,52 +2867,47 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. - + Fee per KB to add to transactions you send - + Loading wallet... - + Cannot downgrade wallet - - - Cannot initialize keypool - - Cannot write default address - + Rescanning... - + Done loading - + To use the %s option - + Error - + You must set rpcpassword=<password> in the configuration file: %s If the file does not exist, create it with owner-readable-only file permissions. diff --git a/src/qt/locale/bitcoin_he.ts b/src/qt/locale/bitcoin_he.ts index 0fe26ac1b8..5fa577faff 100644 --- a/src/qt/locale/bitcoin_he.ts +++ b/src/qt/locale/bitcoin_he.ts @@ -28,14 +28,14 @@ This product includes software developed by the OpenSSL Project for use in the O המוצר הזה כולל תוכנה שפותחה ע"י פרויקט OpenSSL לשימוש בתיבת הכלים OpenSSL (http://www.openssl.org/) ותוכנה קריפטוגרפית שנכתבה ע"י אריק יאנג (eay@cryptsoft.com) ותוכנת UPnP שנכתבה ע"י תומס ברנרד. - + Copyright זכויות יוצרים - 2009-%1 The Bitcoin developers - 2009-%1 מפתחי ביטקוין + The Bitcoin developers + @@ -66,7 +66,7 @@ This product includes software developed by the OpenSSL Project for use in the O כתובת חדשה - + These are your Bitcoin addresses for receiving payments. You may want to give a different one to each sender so you can keep track of who is paying you. אלה כתובת הביטקוין שלך עבור קבלת תשלומים. ייתכן ותרצה לתת כתובת שונה לכל שולח כדי שתוכל לעקוב אחר מי משלם לך. @@ -96,7 +96,17 @@ This product includes software developed by the OpenSSL Project for use in the O מחק את הכתובת שנבחרה מהרשימה - + + Export the data in the current tab to a file + יצוא הנתונים בטאב הנוכחי לקובץ + + + + &Export + + + + Verify a message to ensure it was signed with a specified Bitcoin address אמת הודעה בכדי להבטיח שהיא נחתמה עם כתובת ביטקוין מסוימת. @@ -318,12 +328,12 @@ This product includes software developed by the OpenSSL Project for use in the O חתום על הודעה - + Synchronizing with network... מסתנכרן עם הרשת... - + &Overview &סקירה @@ -398,7 +408,7 @@ This product includes software developed by the OpenSSL Project for use in the O שנה סיסמא - + Importing blocks from disk... מייבא בלוקים מהדיסק... @@ -408,12 +418,7 @@ This product includes software developed by the OpenSSL Project for use in the O מחדש את אינדקס הבלוקים בדיסק... - - &Export... - י&צא לקובץ - - - + Send coins to a Bitcoin address שלח מטבעות לכתובת ביטקוין @@ -423,12 +428,7 @@ This product includes software developed by the OpenSSL Project for use in the O שנה אפשרויות תצורה עבור ביטקוין - - Export the data in the current tab to a file - יצוא הנתונים בטאב הנוכחי לקובץ - - - + Backup wallet to another location גיבוי הארנק למקום אחר @@ -438,7 +438,7 @@ This product includes software developed by the OpenSSL Project for use in the O שנה את הסיסמה להצפנת הארנק - + &Debug window חלון ניפוי @@ -448,23 +448,23 @@ This product includes software developed by the OpenSSL Project for use in the O פתח את לוח הבקרה לאבחון וניפוי - + &Verify message... אמת הודעה... - - + + Bitcoin ביטקוין - + Wallet ארנק - + &Send ושלח @@ -509,12 +509,12 @@ This product includes software developed by the OpenSSL Project for use in the O אמת הודעות כדי להבטיח שהן נחתמו עם כתובת ביטקוין מסוימות - + &File &קובץ - + &Settings ה&גדרות @@ -529,12 +529,7 @@ This product includes software developed by the OpenSSL Project for use in the O סרגל כלים טאבים - - Actions toolbar - סרגל כלים פעולות - - - + [testnet] [רשת-בדיקה] @@ -545,12 +540,17 @@ This product includes software developed by the OpenSSL Project for use in the O תוכנת ביטקוין - + %n active connection(s) to Bitcoin network חיבור פעיל אחד לרשת הביטקוין%n חיבורים פעילים לרשת הביטקוין - + + No block source available... + + + + Processed %1 of %2 (estimated) blocks of transaction history. 1% מתוך 2% (משוער) בלוקים של הסטוריית פעולת עובדו @@ -575,7 +575,7 @@ This product includes software developed by the OpenSSL Project for use in the O %n שבוע%n שבועות - + %1 behind 1% מאחור @@ -590,7 +590,7 @@ This product includes software developed by the OpenSSL Project for use in the O לאחר זאת פעולות נספות טרם יהיו גלויות - + Error שגיאה @@ -605,22 +605,22 @@ This product includes software developed by the OpenSSL Project for use in the O מידע - + This transaction is over the size limit. You can still send it for a fee of %1, which goes to the nodes that process your transaction and helps to support the network. Do you want to pay the fee? פעולה זו חורגת מגבולות הגודל. עדיין באפשרותך לשלוח אותה תמורת עמלה של %1, המיועדת לצמתים שמעבדים את הפעולה שלך ועוזרת לתמוך ברשת. האם ברצונך לשלם את העמלה? - + Up to date עדכני - + Catching up... מתעדכן... - + Confirm transaction fee אשר עמלת פעולה @@ -669,7 +669,7 @@ Address: %4 הארנק <b>מוצפן</b> וכרגע <b>נעול</b> - + A fatal error occurred. Bitcoin can no longer continue safely and will quit. שגיאה סופנית אירעה. ביטקוין אינו יכול להמשיך לפעול בבטחה ולכן ייסגר. @@ -677,7 +677,7 @@ Address: %4 ClientModel - + Network Alert אזעקת רשת @@ -808,8 +808,8 @@ Address: %4 - Optional transaction fee per kB that helps make sure your transactions are processed quickly. Most transactions are 1 kB. Fee 0.01 recommended. - עמלת פעולה אופציונלית לכל kB תבטיח שהפעולה שלך תעובד בזריזות. רוב הפעולות הן 1 kB. מומלצת עמלה בסך 0.01. + Optional transaction fee per kB that helps make sure your transactions are processed quickly. Most transactions are 1 kB. + @@ -1058,7 +1058,7 @@ Address: %4 הסכום הכולל של פעולות שטרם אושרו, ועוד אינן נספרות בחישוב היתרה הנוכחית - + out of sync לא מסונכרן @@ -1644,6 +1644,19 @@ Address: %4 ההודעה אומתה. + + SplashScreen + + + The Bitcoin developers + + + + + [testnet] + [רשת-בדיקה] + + TransactionDesc @@ -2118,10 +2131,28 @@ Address: %4 אל + + WalletModel + + + Send Coins + שלח מטבעות + + WalletView - + + &Export + + + + + Export the data in the current tab to a file + יצוא הנתונים בטאב הנוכחי לקובץ + + + Backup Wallet גבה ארנק @@ -2154,37 +2185,37 @@ Address: %4 bitcoin-core - + Bitcoin version גרסת ביטקוין - + Usage: שימוש: - + Send command to -server or bitcoind שלח פקודה ל -server או bitcoind - + List commands רשימת פקודות - + Get help for a command קבל עזרה עבור פקודה - + Options: אפשרויות: - + Specify configuration file (default: bitcoin.conf) ציין קובץ הגדרות (ברירת מחדל: bitcoin.conf) @@ -2194,27 +2225,17 @@ Address: %4 ציין קובץ pid (ברירת מחדל: bitcoind.pid) - - Generate coins - צור מטבעות - - - - Don't generate coins - אל תייצר מטבעות - - - + Specify data directory ציין תיקיית נתונים - + Set database cache size in megabytes (default: 25) קבע את גודל המטמון של מסד הנתונים במגהבייט (ברירת מחדל: 25) - + Listen for connections on <port> (default: 8333 or testnet: 18333) האזן לחיבורים ב<פורט> (ברירת מחדל: 8333 או ברשת הבדיקה: 18333) @@ -2229,7 +2250,7 @@ Address: %4 התחבר לצומת כדי לדלות כתובות עמיתים, ואז התנתק - + Specify your own public address ציין את הכתובת הפומבית שלך @@ -2239,22 +2260,22 @@ Address: %4 סף להתנתקות מעמיתים הנוהגים שלא כהלכה (ברירת מחדל: 100) - + Number of seconds to keep misbehaving peers from reconnecting (default: 86400) מספר שניות למנוע מעמיתים הנוהגים שלא כהלכה מלהתחבר מחדש (ברירת מחדל: 86400) - + An error occurred while setting up the RPC port %u for listening on IPv4: %s אירעה שגיאה בעת הגדרת פורט RPC %u להאזנה ב-IPv4: %s - + Listen for JSON-RPC connections on <port> (default: 8332 or testnet: 18332) האזן לחיבורי JSON-RPC ב- <port> (ברירת מחדל: 8332 או רשת בדיקה: 18332) - + Accept command line and JSON-RPC commands קבל פקודות משורת הפקודה ו- JSON-RPC @@ -2264,17 +2285,17 @@ Address: %4 רוץ ברקע כדימון וקבל פקודות - + Use the test network השתמש ברשת הבדיקה - + Accept connections from outside (default: 1 if no -proxy or -connect) קבל חיבורים מבחוץ (ברירת מחדל: 1 ללא -proxy או -connect) - + %s, you must set a rpcpassword in the configuration file: %s It is recommended you use the following random password: @@ -2313,11 +2334,6 @@ rpcpassword=%s Cannot obtain a lock on data directory %s. Bitcoin is probably already running. לא מסוגל להשיג נעילה על תיקיית הנתונים %s. כנראה שביטקוין כבר רץ. - - - Error initializing database environment %s! To recover, BACKUP THAT DIRECTORY, then remove everything from it except for wallet.dat. - שגיאה באתחול סביבת מסד הנתונים %s! בשביל להתאושש, גבה את התיקיה הזאת, ואז הסר הכל מלבד wallet.dat. - Error: The transaction was rejected! This might happen if some of the coins in your wallet were already spent, such as if you used a copy of wallet.dat and coins were spent in the copy but not marked as spent here. @@ -2344,12 +2360,7 @@ rpcpassword=%s קבע גודל מקסימלי עבור פעולות עדיפות גבוהה/עמלה נמוכה בבתים (ברירת מחדל: 27000) - - Set the number of script verification threads (1-16, 0=auto, default: 0) - קבע את מספר תהליכוני אימות הסקריפטים (1-16, 0 = אוטומטי, ברירת מחדל: 0) - - - + This is a pre-release test build - use at your own risk - do not use for mining or merchant applications זוהי בניית ניסיון טרום-שחרור - השימוש בה על אחריותך - אין להשתמש לצורך כריה או יישומי מסחר @@ -2389,7 +2400,7 @@ rpcpassword=%s אפשרויות יצירת בלוק: - + Connect only to the specified node(s) התחבר רק לצמתים המצוינים @@ -2409,7 +2420,7 @@ rpcpassword=%s האם תרצה כעט לבנות מחדש את מסד נתוני הבלוקים? - + Error initializing block database שגיאה באתחול מסד נתוני הבלוקים @@ -2433,11 +2444,6 @@ rpcpassword=%s Error: Disk space is low! שגיאה: מעט מקום פנוי בדיסק! - - - Error: Transaction creation failed! - שגיאה: יצירת הפעולה נכשלה! - Error: Wallet locked, unable to create transaction! @@ -2509,7 +2515,12 @@ rpcpassword=%s מצא עמיתים ע"י חיפוש DNS (ברירת מחדל: 1 ללא -connect) - + + Generate coins (default: 0) + + + + How many blocks to check at startup (default: 288, 0 = all) מספר הבלוקים לבדוק בעת אתחול (ברירת מחדל: 288, 0 = כולם) @@ -2519,7 +2530,12 @@ rpcpassword=%s מידת היסודיות של אימות הבלוקים (0-4, ברירת מחדל: 3) - + + Not enough file descriptors available. + + + + Rebuild block chain index from current blk000??.dat files בנה מחדש את אינדק שרשרת הבלוקים מקבצי ה-blk000??.dat הנוכחיים. @@ -2529,7 +2545,7 @@ rpcpassword=%s קבע את מספר תהליכוני לשירות קריאות RPC (ברירת מחדל: 4) - + Verifying blocks... מאמת את שלמות מסד הנתונים... @@ -2539,12 +2555,17 @@ rpcpassword=%s מאמת את יושרת הארנק... - + Imports blocks from external blk000??.dat file מייבא בלוקים מקובצי blk000??.dat חיצוניים - + + Set the number of script verification threads (up to 16, 0 = auto, <0 = leave that many cores free, default: 0) + + + + Information מידע @@ -2553,6 +2574,16 @@ rpcpassword=%s Invalid -tor address: '%s' כתובת לא תקינה ל -tor: '%s' + + + Invalid amount for -minrelaytxfee=<amount>: '%s' + + + + + Invalid amount for -mintxfee=<amount>: '%s' + + Maintain a full transaction index (default: 0) @@ -2569,7 +2600,7 @@ rpcpassword=%s חוצץ שליחה מירבי לכל חיבור, <n>*1000 בתים (ברירת מחדל: 1000) - + Only accept block chain matching built-in checkpoints (default: 1) קבל רק שרשרת בלוקים התואמת נקודות ביקורת מובנות (ברירת מחדל: 1) @@ -2628,6 +2659,11 @@ rpcpassword=%s Shrink debug.log file on client startup (default: 1 when no -debug) כווץ את קובץ debug.log בהפעלת הקליינט (ברירת מחדל: 1 ללא -debug) + + + Signing transaction failed + + Specify connection timeout in milliseconds (default: 5000) @@ -2639,7 +2675,22 @@ rpcpassword=%s שגיאת מערכת: - + + Transaction amount too small + + + + + Transaction amounts must be positive + + + + + Transaction too large + + + + Use UPnP to map the listening port (default: 0) השתמש ב-UPnP כדי למפות את הפורט להאזנה (ברירת מחדל: 0) @@ -2679,7 +2730,7 @@ rpcpassword=%s קובץ wallet.dat מושחת, החילוץ נכשל - + Password for JSON-RPC connections סיסמה לחיבורי JSON-RPC @@ -2694,17 +2745,17 @@ rpcpassword=%s שלח פקודות לצומת ב-<ip> (ברירת מחדל: 127.0.0.1) - + Execute command when the best block changes (%s in cmd is replaced by block hash) בצע פקודה זו כשהבלוק הטוב ביותר משתנה (%s בפקודה יוחלף בגיבוב הבלוק) - + Upgrade wallet to latest format שדרג את הארנק לפורמט העדכני - + Set key pool size to <n> (default: 100) קבע את גודל המאגר ל -<n> (ברירת מחדל: 100) @@ -2714,12 +2765,12 @@ rpcpassword=%s סרוק מחדש את שרשרת הבלוקים למציאת פעולות חסרות בארנק - + Use OpenSSL (https) for JSON-RPC connections השתמש ב-OpenSSL (https( עבור חיבורי JSON-RPC - + Server certificate file (default: server.cert) קובץ תעודת שרת (ברירת מחדל: server.cert) @@ -2729,37 +2780,37 @@ rpcpassword=%s מפתח פרטי של השרת (ברירת מחדל: server.pem) - + Acceptable ciphers (default: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH) צפנים קבילים (ברירת מחדל: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH) - + This help message הודעת העזרה הזו - + Unable to bind to %s on this computer (bind returned error %d, %s) לא מסוגל לקשור ל-%s במחשב זה (הקשירה החזירה שגיאה %d, %s) - + Connect through socks proxy התחבר דרך פרוקסי SOCKS - + Allow DNS lookups for -addnode, -seednode and -connect אפשר בדיקת DNS עבור -addnode, -seednode ו- -connect - + Loading addresses... טוען כתובות... - + Error loading wallet.dat: Wallet corrupted שגיאה בטעינת הקובץ wallet.dat: הארנק מושחת @@ -2769,22 +2820,22 @@ rpcpassword=%s שגיאה בטעינת הקובץ wallet.dat: הארנק דורש גרסה חדשה יותר של ביטקוין - + Wallet needed to be rewritten: restart Bitcoin to complete יש לכתוב מחדש את הארנק: אתחל את ביטקוין לסיום - + Error loading wallet.dat שגיאה בטעינת הקובץ wallet.dat - + Invalid -proxy address: '%s' כתובת -proxy לא תקינה: '%s' - + Unknown network specified in -onlynet: '%s' רשת לא ידועה צוינה ב- -onlynet: '%s' @@ -2794,7 +2845,7 @@ rpcpassword=%s התבקשה גרסת פרוקסי -socks לא ידועה: %i - + Cannot resolve -bind address: '%s' לא מסוגל לפתור כתובת -bind: '%s' @@ -2814,17 +2865,17 @@ rpcpassword=%s כמות לא תקינה - + Insufficient funds אין מספיק כספים - + Loading block index... טוען את אינדקס הבלוקים... - + Add a node to connect to and attempt to keep the connection open הוסף צומת להתחברות ונסה לשמור את החיבור פתוח @@ -2834,52 +2885,47 @@ rpcpassword=%s לא ניתן לקשור ל-%s במחשב זה. ביטקוין כנראה עדיין רץ. - + Fee per KB to add to transactions you send עמלה להוסיף לפעולות שאתה שולח עבור כל KB - + Loading wallet... טוען ארנק... - + Cannot downgrade wallet לא יכול להוריד דרגת הארנק - - - Cannot initialize keypool - לא יכול לאתחל את מאגר המפתחות - Cannot write default address לא יכול לכתוב את כתובת ברירת המחדל - + Rescanning... סורק מחדש... - + Done loading טעינה הושלמה - + To use the %s option להשתמש באפשרות %s - + Error שגיאה - + You must set rpcpassword=<password> in the configuration file: %s If the file does not exist, create it with owner-readable-only file permissions. diff --git a/src/qt/locale/bitcoin_hi_IN.ts b/src/qt/locale/bitcoin_hi_IN.ts index 42282f564a..f49e0e38a4 100644 --- a/src/qt/locale/bitcoin_hi_IN.ts +++ b/src/qt/locale/bitcoin_hi_IN.ts @@ -23,13 +23,13 @@ This product includes software developed by the OpenSSL Project for use in the O - + Copyright कापीराइट - 2009-%1 The Bitcoin developers + The Bitcoin developers @@ -61,7 +61,7 @@ This product includes software developed by the OpenSSL Project for use in the O &नया पता - + These are your Bitcoin addresses for receiving payments. You may want to give a different one to each sender so you can keep track of who is paying you. @@ -91,7 +91,17 @@ This product includes software developed by the OpenSSL Project for use in the O - + + Export the data in the current tab to a file + + + + + &Export + + + + Verify a message to ensure it was signed with a specified Bitcoin address @@ -313,12 +323,12 @@ This product includes software developed by the OpenSSL Project for use in the O - + Synchronizing with network... नेटवर्क से समकालिक (मिल) रहा है ... - + &Overview &विवरण @@ -394,7 +404,7 @@ This product includes software developed by the OpenSSL Project for use in the O - + Importing blocks from disk... @@ -404,12 +414,7 @@ This product includes software developed by the OpenSSL Project for use in the O - - &Export... - &निर्यात - - - + Send coins to a Bitcoin address @@ -419,12 +424,7 @@ This product includes software developed by the OpenSSL Project for use in the O - - Export the data in the current tab to a file - - - - + Backup wallet to another location @@ -434,7 +434,7 @@ This product includes software developed by the OpenSSL Project for use in the O पहचान शब्द/अक्षर जो वॉलेट एनक्रिपशन के लिए इस्तेमाल किया है उसे बदलिए! - + &Debug window @@ -444,23 +444,23 @@ This product includes software developed by the OpenSSL Project for use in the O - + &Verify message... - - + + Bitcoin बीटकोइन - + Wallet वॉलेट - + &Send @@ -505,12 +505,12 @@ This product includes software developed by the OpenSSL Project for use in the O - + &File &फाइल - + &Settings &सेट्टिंग्स @@ -525,12 +525,7 @@ This product includes software developed by the OpenSSL Project for use in the O टैबस टूलबार - - Actions toolbar - कार्य टूलबार - - - + [testnet] [टेस्टनेट] @@ -541,12 +536,17 @@ This product includes software developed by the OpenSSL Project for use in the O - + %n active connection(s) to Bitcoin network %n सक्रिया संपर्क बीटकोइन नेटवर्क से%n सक्रिया संपर्क बीटकोइन नेटवर्क से - + + No block source available... + + + + Processed %1 of %2 (estimated) blocks of transaction history. @@ -571,7 +571,7 @@ This product includes software developed by the OpenSSL Project for use in the O %n हफ़्ता%n हफ्ते - + %1 behind %1 पीछे @@ -586,7 +586,7 @@ This product includes software developed by the OpenSSL Project for use in the O - + Error भूल @@ -601,22 +601,22 @@ This product includes software developed by the OpenSSL Project for use in the O जानकारी - + This transaction is over the size limit. You can still send it for a fee of %1, which goes to the nodes that process your transaction and helps to support the network. Do you want to pay the fee? - + Up to date नवीनतम - + Catching up... - + Confirm transaction fee @@ -665,7 +665,7 @@ Address: %4 वॉलेट एन्क्रिप्टेड है तथा अभी लॉक्ड है - + A fatal error occurred. Bitcoin can no longer continue safely and will quit. @@ -673,7 +673,7 @@ Address: %4 ClientModel - + Network Alert @@ -804,7 +804,7 @@ Address: %4 - Optional transaction fee per kB that helps make sure your transactions are processed quickly. Most transactions are 1 kB. Fee 0.01 recommended. + Optional transaction fee per kB that helps make sure your transactions are processed quickly. Most transactions are 1 kB. @@ -1054,7 +1054,7 @@ Address: %4 लेन देन की पुष्टि अभी नहीं हुई है, इसलिए इन्हें अभी मोजुदा बैलेंस में गिना नहीं गया है| - + out of sync @@ -1641,6 +1641,19 @@ Address: %4 + + SplashScreen + + + The Bitcoin developers + + + + + [testnet] + + + TransactionDesc @@ -2115,10 +2128,28 @@ Address: %4 तक + + WalletModel + + + Send Coins + + + WalletView - + + &Export + + + + + Export the data in the current tab to a file + + + + Backup Wallet बैकप वॉलेट @@ -2151,37 +2182,37 @@ Address: %4 bitcoin-core - + Bitcoin version बीटकोइन संस्करण - + Usage: खपत : - + Send command to -server or bitcoind -server या bitcoind को कमांड भेजें - + List commands commands की लिस्ट बनाएं - + Get help for a command किसी command के लिए मदद लें - + Options: विकल्प: - + Specify configuration file (default: bitcoin.conf) configuraion की फाइल का विवरण दें (default: bitcoin.conf) @@ -2191,27 +2222,17 @@ Address: %4 pid फाइल का विवरण दें (default: bitcoin.pid) - - Generate coins - Coins बनाएं - - - - Don't generate coins - Coins न बनाएं - - - + Specify data directory - + Set database cache size in megabytes (default: 25) - + Listen for connections on <port> (default: 8333 or testnet: 18333) @@ -2226,7 +2247,7 @@ Address: %4 - + Specify your own public address @@ -2236,22 +2257,22 @@ Address: %4 - + Number of seconds to keep misbehaving peers from reconnecting (default: 86400) - + An error occurred while setting up the RPC port %u for listening on IPv4: %s - + Listen for JSON-RPC connections on <port> (default: 8332 or testnet: 18332) - + Accept command line and JSON-RPC commands @@ -2261,17 +2282,17 @@ Address: %4 - + Use the test network - + Accept connections from outside (default: 1 if no -proxy or -connect) - + %s, you must set a rpcpassword in the configuration file: %s It is recommended you use the following random password: @@ -2300,11 +2321,6 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. Cannot obtain a lock on data directory %s. Bitcoin is probably already running. - - - Error initializing database environment %s! To recover, BACKUP THAT DIRECTORY, then remove everything from it except for wallet.dat. - - Error: The transaction was rejected! This might happen if some of the coins in your wallet were already spent, such as if you used a copy of wallet.dat and coins were spent in the copy but not marked as spent here. @@ -2331,12 +2347,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. - - Set the number of script verification threads (1-16, 0=auto, default: 0) - - - - + This is a pre-release test build - use at your own risk - do not use for mining or merchant applications @@ -2376,7 +2387,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. - + Connect only to the specified node(s) @@ -2396,7 +2407,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. - + Error initializing block database @@ -2420,11 +2431,6 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. Error: Disk space is low! - - - Error: Transaction creation failed! - - Error: Wallet locked, unable to create transaction! @@ -2496,7 +2502,12 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. - + + Generate coins (default: 0) + + + + How many blocks to check at startup (default: 288, 0 = all) @@ -2506,7 +2517,12 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. - + + Not enough file descriptors available. + + + + Rebuild block chain index from current blk000??.dat files @@ -2516,7 +2532,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. - + Verifying blocks... ब्लॉक्स जाँचे जा रहा है... @@ -2526,12 +2542,17 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. वॉलेट जाँचा जा रहा है... - + Imports blocks from external blk000??.dat file - + + Set the number of script verification threads (up to 16, 0 = auto, <0 = leave that many cores free, default: 0) + + + + Information जानकारी @@ -2540,6 +2561,16 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. Invalid -tor address: '%s' + + + Invalid amount for -minrelaytxfee=<amount>: '%s' + + + + + Invalid amount for -mintxfee=<amount>: '%s' + + Maintain a full transaction index (default: 0) @@ -2556,7 +2587,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. - + Only accept block chain matching built-in checkpoints (default: 1) @@ -2615,6 +2646,11 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. Shrink debug.log file on client startup (default: 1 when no -debug) + + + Signing transaction failed + + Specify connection timeout in milliseconds (default: 5000) @@ -2626,7 +2662,22 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. - + + Transaction amount too small + + + + + Transaction amounts must be positive + + + + + Transaction too large + + + + Use UPnP to map the listening port (default: 0) @@ -2666,7 +2717,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. - + Password for JSON-RPC connections @@ -2681,17 +2732,17 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. - + Execute command when the best block changes (%s in cmd is replaced by block hash) - + Upgrade wallet to latest format - + Set key pool size to <n> (default: 100) @@ -2701,12 +2752,12 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. - + Use OpenSSL (https) for JSON-RPC connections - + Server certificate file (default: server.cert) @@ -2716,37 +2767,37 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. - + Acceptable ciphers (default: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH) - + This help message - + Unable to bind to %s on this computer (bind returned error %d, %s) - + Connect through socks proxy - + Allow DNS lookups for -addnode, -seednode and -connect - + Loading addresses... पता पुस्तक आ रही है... - + Error loading wallet.dat: Wallet corrupted @@ -2756,22 +2807,22 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. - + Wallet needed to be rewritten: restart Bitcoin to complete - + Error loading wallet.dat - + Invalid -proxy address: '%s' - + Unknown network specified in -onlynet: '%s' @@ -2781,7 +2832,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. - + Cannot resolve -bind address: '%s' @@ -2801,17 +2852,17 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. राशि ग़लत है - + Insufficient funds - + Loading block index... ब्लॉक इंडेक्स आ रहा है... - + Add a node to connect to and attempt to keep the connection open @@ -2821,52 +2872,47 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. - + Fee per KB to add to transactions you send - + Loading wallet... वॉलेट आ रहा है... - + Cannot downgrade wallet - - - Cannot initialize keypool - - Cannot write default address - + Rescanning... रि-स्केनी-इंग... - + Done loading लोड हो गया| - + To use the %s option - + Error भूल - + You must set rpcpassword=<password> in the configuration file: %s If the file does not exist, create it with owner-readable-only file permissions. diff --git a/src/qt/locale/bitcoin_hr.ts b/src/qt/locale/bitcoin_hr.ts index c11fd7008c..f0cd94fa5e 100644 --- a/src/qt/locale/bitcoin_hr.ts +++ b/src/qt/locale/bitcoin_hr.ts @@ -5,7 +5,7 @@ About Bitcoin - O Bitcoinu + O Bitcoin-u @@ -23,13 +23,13 @@ This product includes software developed by the OpenSSL Project for use in the O - + Copyright - 2009-%1 The Bitcoin developers + The Bitcoin developers @@ -61,7 +61,7 @@ This product includes software developed by the OpenSSL Project for use in the O &Nova adresa - + These are your Bitcoin addresses for receiving payments. You may want to give a different one to each sender so you can keep track of who is paying you. Ovo su vaše Bitcoin adrese za primanje isplate. Možda želite dati drukčiju adresu svakom primatelju tako da možete pratiti tko je platio. @@ -91,7 +91,17 @@ This product includes software developed by the OpenSSL Project for use in the O - + + Export the data in the current tab to a file + Izvoz podataka iz trenutnog taba u datoteku + + + + &Export + + + + Verify a message to ensure it was signed with a specified Bitcoin address @@ -313,12 +323,12 @@ This product includes software developed by the OpenSSL Project for use in the O &Potpišite poruku... - + Synchronizing with network... Usklađivanje s mrežom ... - + &Overview &Pregled @@ -393,22 +403,17 @@ This product includes software developed by the OpenSSL Project for use in the O &Promijena lozinke... - + Importing blocks from disk... - + Importiranje blokova sa diska... Reindexing blocks on disk... - + Re-indeksiranje blokova na disku... - - &Export... - &Izvoz... - - - + Send coins to a Bitcoin address Slanje novca na bitcoin adresu @@ -418,12 +423,7 @@ This product includes software developed by the OpenSSL Project for use in the O Promijeni postavke konfiguracije za bitcoin - - Export the data in the current tab to a file - Izvoz podataka iz trenutnog taba u datoteku - - - + Backup wallet to another location Napravite sigurnosnu kopiju novčanika na drugoj lokaciji @@ -433,7 +433,7 @@ This product includes software developed by the OpenSSL Project for use in the O Promijenite lozinku za šifriranje novčanika - + &Debug window @@ -443,23 +443,23 @@ This product includes software developed by the OpenSSL Project for use in the O - + &Verify message... - - + + Bitcoin Bitcoin - + Wallet Novčanik - + &Send @@ -504,12 +504,12 @@ This product includes software developed by the OpenSSL Project for use in the O - + &File &Datoteka - + &Settings &Konfiguracija @@ -524,12 +524,7 @@ This product includes software developed by the OpenSSL Project for use in the O Traka kartica - - Actions toolbar - Traka akcija - - - + [testnet] [testnet] @@ -540,19 +535,24 @@ This product includes software developed by the OpenSSL Project for use in the O Bitcoin klijent - + %n active connection(s) to Bitcoin network %n aktivna veza na Bitcoin mrežu%n aktivne veze na Bitcoin mrežu%n aktivnih veza na Bitcoin mrežu - + + No block source available... + + + + Processed %1 of %2 (estimated) blocks of transaction history. Processed %1 blocks of transaction history. - + Obrađeno %1 blokova povijesti transakcije. @@ -570,7 +570,7 @@ This product includes software developed by the OpenSSL Project for use in the O - + %1 behind @@ -585,7 +585,7 @@ This product includes software developed by the OpenSSL Project for use in the O - + Error Greška @@ -600,22 +600,22 @@ This product includes software developed by the OpenSSL Project for use in the O - + This transaction is over the size limit. You can still send it for a fee of %1, which goes to the nodes that process your transaction and helps to support the network. Do you want to pay the fee? - + Up to date Ažurno - + Catching up... Ažuriranje... - + Confirm transaction fee @@ -665,7 +665,7 @@ Adresa:%4 Novčanik je <b>šifriran</b> i trenutno <b>zaključan</b> - + A fatal error occurred. Bitcoin can no longer continue safely and will quit. @@ -673,7 +673,7 @@ Adresa:%4 ClientModel - + Network Alert @@ -804,8 +804,8 @@ Adresa:%4 - Optional transaction fee per kB that helps make sure your transactions are processed quickly. Most transactions are 1 kB. Fee 0.01 recommended. - Neobavezna naknada za transakciju po kB koja omogućuje da se vaša transakcija obavi brže. Većina transakcija ima 1 kB. Preporučena naknada je 0.01. + Optional transaction fee per kB that helps make sure your transactions are processed quickly. Most transactions are 1 kB. + @@ -1054,7 +1054,7 @@ Adresa:%4 Ukupni iznos transakcija koje tek trebaju biti potvrđene, i još uvijek nisu uračunate u trenutni saldo - + out of sync @@ -1185,22 +1185,22 @@ Adresa:%4 Block chain - + Lanac blokova Current number of blocks - + Trenutni broj blokova Estimated total blocks - + Procjenjeni ukupni broj blokova Last block time - + Posljednje vrijeme bloka @@ -1640,6 +1640,19 @@ Adresa:%4 + + SplashScreen + + + The Bitcoin developers + + + + + [testnet] + [testnet] + + TransactionDesc @@ -2114,10 +2127,28 @@ Adresa:%4 za + + WalletModel + + + Send Coins + Slanje novca + + WalletView - + + &Export + + + + + Export the data in the current tab to a file + Izvoz podataka iz trenutnog taba u datoteku + + + Backup Wallet @@ -2150,37 +2181,37 @@ Adresa:%4 bitcoin-core - + Bitcoin version Bitcoin verzija - + Usage: Upotreba: - + Send command to -server or bitcoind Pošalji komandu usluzi -server ili bitcoind - + List commands Prikaži komande - + Get help for a command Potraži pomoć za komandu - + Options: Postavke: - + Specify configuration file (default: bitcoin.conf) Odredi konfiguracijsku datoteku (ugrađeni izbor: bitcoin.conf) @@ -2190,27 +2221,17 @@ Adresa:%4 Odredi proces ID datoteku (ugrađeni izbor: bitcoin.pid) - - Generate coins - Generiraj novčiće - - - - Don't generate coins - Ne generiraj novčiće - - - + Specify data directory Odredi direktorij za datoteke - + Set database cache size in megabytes (default: 25) Postavi cache za bazu podataka u MB (zadano:25) - + Listen for connections on <port> (default: 8333 or testnet: 18333) Slušaj na <port>u (default: 8333 ili testnet: 18333) @@ -2225,7 +2246,7 @@ Adresa:%4 - + Specify your own public address @@ -2235,22 +2256,22 @@ Adresa:%4 Prag za odspajanje članova koji se čudno ponašaju (default: 100) - + Number of seconds to keep misbehaving peers from reconnecting (default: 86400) Broj sekundi koliko se članovima koji se čudno ponašaju neće dopustiti da se opet spoje (default: 86400) - + An error occurred while setting up the RPC port %u for listening on IPv4: %s - + Listen for JSON-RPC connections on <port> (default: 8332 or testnet: 18332) Prihvaćaj JSON-RPC povezivanje na portu broj <port> (ugrađeni izbor: 8332 or testnet: 18332) - + Accept command line and JSON-RPC commands Prihvati komande iz tekst moda i JSON-RPC @@ -2260,17 +2281,17 @@ Adresa:%4 Izvršavaj u pozadini kao uslužnik i prihvaćaj komande - + Use the test network Koristi test mrežu - + Accept connections from outside (default: 1 if no -proxy or -connect) - + %s, you must set a rpcpassword in the configuration file: %s It is recommended you use the following random password: @@ -2299,11 +2320,6 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. Cannot obtain a lock on data directory %s. Bitcoin is probably already running. - - - Error initializing database environment %s! To recover, BACKUP THAT DIRECTORY, then remove everything from it except for wallet.dat. - - Error: The transaction was rejected! This might happen if some of the coins in your wallet were already spent, such as if you used a copy of wallet.dat and coins were spent in the copy but not marked as spent here. @@ -2330,12 +2346,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. - - Set the number of script verification threads (1-16, 0=auto, default: 0) - - - - + This is a pre-release test build - use at your own risk - do not use for mining or merchant applications @@ -2372,10 +2383,10 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. Block creation options: - + Opcije za kreiranje bloka: - + Connect only to the specified node(s) Poveži se samo sa određenim nodom @@ -2395,7 +2406,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. - + Error initializing block database @@ -2419,11 +2430,6 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. Error: Disk space is low! - - - Error: Transaction creation failed! - - Error: Wallet locked, unable to create transaction! @@ -2495,7 +2501,12 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. - + + Generate coins (default: 0) + + + + How many blocks to check at startup (default: 288, 0 = all) @@ -2505,7 +2516,12 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. - + + Not enough file descriptors available. + + + + Rebuild block chain index from current blk000??.dat files @@ -2515,7 +2531,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. - + Verifying blocks... @@ -2525,12 +2541,17 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. - + Imports blocks from external blk000??.dat file + Importiraj blokove sa vanjskog blk000??.dat fajla + + + + Set the number of script verification threads (up to 16, 0 = auto, <0 = leave that many cores free, default: 0) - + Information @@ -2539,6 +2560,16 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. Invalid -tor address: '%s' Nevaljala -tor adresa: '%s' + + + Invalid amount for -minrelaytxfee=<amount>: '%s' + + + + + Invalid amount for -mintxfee=<amount>: '%s' + + Maintain a full transaction index (default: 0) @@ -2555,9 +2586,9 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. - + Only accept block chain matching built-in checkpoints (default: 1) - + Prihvati samo lance blokova koji se podudaraju sa ugrađenim checkpoint-ovima (default: 1) @@ -2602,18 +2633,23 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. Set maximum block size in bytes (default: 250000) - + Podesite maksimalnu veličinu bloka u bajtovima (default: 250000) Set minimum block size in bytes (default: 0) - + Podesite minimalnu veličinu bloka u bajtovima (default: 0) Shrink debug.log file on client startup (default: 1 when no -debug) + + + Signing transaction failed + + Specify connection timeout in milliseconds (default: 5000) @@ -2625,7 +2661,22 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. - + + Transaction amount too small + + + + + Transaction amounts must be positive + + + + + Transaction too large + + + + Use UPnP to map the listening port (default: 0) Pokušaj koristiti UPnP da otvoriš port za uslugu (default: 0) @@ -2665,7 +2716,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. - + Password for JSON-RPC connections Lozinka za JSON-RPC veze @@ -2680,17 +2731,17 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. Pošalji komande nodu na adresi <ip> (ugrađeni izbor: 127.0.0.1) - + Execute command when the best block changes (%s in cmd is replaced by block hash) - + Izvršite naredbu kada se najbolji blok promjeni (%s u cmd je zamjenjen sa block hash) - + Upgrade wallet to latest format Nadogradite novčanik u posljednji format. - + Set key pool size to <n> (default: 100) Podesi memorijski prostor za ključeve na <n> (ugrađeni izbor: 100) @@ -2700,12 +2751,12 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. Ponovno pretraži lanac blokova za transakcije koje nedostaju - + Use OpenSSL (https) for JSON-RPC connections Koristi OpenSSL (https) za JSON-RPC povezivanje - + Server certificate file (default: server.cert) Uslužnikov SSL certifikat (ugrađeni izbor: server.cert) @@ -2715,37 +2766,37 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. Uslužnikov privatni ključ (ugrađeni izbor: server.pem) - + Acceptable ciphers (default: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH) Prihvaljivi načini šifriranja (ugrađeni izbor: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH) - + This help message Ova poruka za pomoć - + Unable to bind to %s on this computer (bind returned error %d, %s) Program ne može koristiti %s na ovom računalu (bind returned error %d, %s) - + Connect through socks proxy Poveži se kroz socks proxy - + Allow DNS lookups for -addnode, -seednode and -connect Dozvoli DNS upite za dodavanje nodova i povezivanje - + Loading addresses... Učitavanje adresa... - + Error loading wallet.dat: Wallet corrupted Greška kod učitavanja wallet.dat: Novčanik pokvaren @@ -2755,22 +2806,22 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. Greška kod učitavanja wallet.dat: Novčanik zahtjeva noviju verziju Bitcoina - + Wallet needed to be rewritten: restart Bitcoin to complete Novčanik je trebao prepravak: ponovo pokrenite Bitcoin - + Error loading wallet.dat Greška kod učitavanja wallet.dat - + Invalid -proxy address: '%s' Nevaljala -proxy adresa: '%s' - + Unknown network specified in -onlynet: '%s' @@ -2780,7 +2831,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. - + Cannot resolve -bind address: '%s' @@ -2800,17 +2851,17 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. Nevaljali iznos za opciju - + Insufficient funds Nedovoljna sredstva - + Loading block index... Učitavanje indeksa blokova... - + Add a node to connect to and attempt to keep the connection open Unesite nod s kojim se želite spojiti and attempt to keep the connection open @@ -2820,52 +2871,47 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. Program ne može koristiti %s na ovom računalu. Bitcoin program je vjerojatno već pokrenut. - + Fee per KB to add to transactions you send Naknada posredniku po KB-u koja će biti dodana svakoj transakciji koju pošalješ - + Loading wallet... Učitavanje novčanika... - + Cannot downgrade wallet Nije moguće novčanik vratiti na prijašnju verziju. - - - Cannot initialize keypool - Keypool nije moguće inicijalizirati. - Cannot write default address Nije moguće upisati zadanu adresu. - + Rescanning... Rescaniranje - + Done loading Učitavanje gotovo - + To use the %s option - + Error Greška - + You must set rpcpassword=<password> in the configuration file: %s If the file does not exist, create it with owner-readable-only file permissions. diff --git a/src/qt/locale/bitcoin_hu.ts b/src/qt/locale/bitcoin_hu.ts index 578eaad178..ce43e91458 100644 --- a/src/qt/locale/bitcoin_hu.ts +++ b/src/qt/locale/bitcoin_hu.ts @@ -27,13 +27,13 @@ MIT/X11 szoftverlicenc alatt kiadva, lásd a mellékelt fájlt COPYING vagy http Ez a termék az OpenSSL Project által lett kifejlesztve az OpenSSL Toolkit (http://www.openssl.org/) és kriptográfiai szoftvertben való felhasználásra, írta Eric Young (eay@cryptsoft.com) és UPnP szoftver, írta Thomas Bernard. - + Copyright - 2009-%1 The Bitcoin developers + The Bitcoin developers @@ -65,7 +65,7 @@ Ez a termék az OpenSSL Project által lett kifejlesztve az OpenSSL Toolkit (htt &Új cím - + These are your Bitcoin addresses for receiving payments. You may want to give a different one to each sender so you can keep track of who is paying you. Ezekkel a Bitcoin-címekkel fogadhatod kifizetéseket. Érdemes lehet minden egyes kifizető számára külön címet létrehozni, hogy könnyebben nyomon követhesd, kitől kaptál már pénzt. @@ -95,7 +95,17 @@ Ez a termék az OpenSSL Project által lett kifejlesztve az OpenSSL Toolkit (htt - + + Export the data in the current tab to a file + Jelenlegi nézet exportálása fájlba + + + + &Export + + + + Verify a message to ensure it was signed with a specified Bitcoin address Üzenet ellenőrzése, hogy valóban a megjelölt Bitcoin címekkel van-e aláírva. @@ -317,12 +327,12 @@ Ez a termék az OpenSSL Project által lett kifejlesztve az OpenSSL Toolkit (htt Üzenet aláírása... - + Synchronizing with network... Szinkronizálás a hálózattal... - + &Overview &Áttekintés @@ -397,7 +407,7 @@ Ez a termék az OpenSSL Project által lett kifejlesztve az OpenSSL Toolkit (htt Jelszó &megváltoztatása... - + Importing blocks from disk... A blokkok importálása lemezről... @@ -407,12 +417,7 @@ Ez a termék az OpenSSL Project által lett kifejlesztve az OpenSSL Toolkit (htt A blokkok lemezen történő ujraindexelése... - - &Export... - &Exportálás... - - - + Send coins to a Bitcoin address Érmék küldése megadott címre @@ -422,12 +427,7 @@ Ez a termék az OpenSSL Project által lett kifejlesztve az OpenSSL Toolkit (htt Bitcoin konfigurációs opciók - - Export the data in the current tab to a file - Jelenlegi nézet exportálása fájlba - - - + Backup wallet to another location Biztonsági másolat készítése a Tárcáról egy másik helyre @@ -437,7 +437,7 @@ Ez a termék az OpenSSL Project által lett kifejlesztve az OpenSSL Toolkit (htt Tárcakódoló jelszó megváltoztatása - + &Debug window &Debug ablak @@ -447,23 +447,23 @@ Ez a termék az OpenSSL Project által lett kifejlesztve az OpenSSL Toolkit (htt Hibakereső és diagnosztikai konzol megnyitása - + &Verify message... Üzenet &valódiságának ellenőrzése - - + + Bitcoin Bitcoin - + Wallet Tárca - + &Send @@ -508,12 +508,12 @@ Ez a termék az OpenSSL Project által lett kifejlesztve az OpenSSL Toolkit (htt Annak ellenőrzése, hogy az üzenetek valóban a megjelölt Bitcoin címekkel vannak-e alaírva - + &File &Fájl - + &Settings &Beállítások @@ -528,12 +528,7 @@ Ez a termék az OpenSSL Project által lett kifejlesztve az OpenSSL Toolkit (htt Fül eszköztár - - Actions toolbar - Parancsok eszköztár - - - + [testnet] [teszthálózat] @@ -544,12 +539,17 @@ Ez a termék az OpenSSL Project által lett kifejlesztve az OpenSSL Toolkit (htt Bitcoin kliens - + %n active connection(s) to Bitcoin network %n aktív kapcsolat a Bitcoin-hálózattal%n aktív kapcsolat a Bitcoin-hálózattal - + + No block source available... + + + + Processed %1 of %2 (estimated) blocks of transaction history. @@ -574,7 +574,7 @@ Ez a termék az OpenSSL Project által lett kifejlesztve az OpenSSL Toolkit (htt - + %1 behind @@ -589,7 +589,7 @@ Ez a termék az OpenSSL Project által lett kifejlesztve az OpenSSL Toolkit (htt - + Error @@ -604,22 +604,22 @@ Ez a termék az OpenSSL Project által lett kifejlesztve az OpenSSL Toolkit (htt - + This transaction is over the size limit. You can still send it for a fee of %1, which goes to the nodes that process your transaction and helps to support the network. Do you want to pay the fee? - + Up to date Naprakész - + Catching up... Frissítés... - + Confirm transaction fee Tranzakciós díj jóváhagyása @@ -669,7 +669,7 @@ Cím: %4 Tárca <b>kódolva</b> és jelenleg <b>zárva</b>. - + A fatal error occurred. Bitcoin can no longer continue safely and will quit. @@ -677,7 +677,7 @@ Cím: %4 ClientModel - + Network Alert @@ -809,8 +809,8 @@ Cím: %4 - Optional transaction fee per kB that helps make sure your transactions are processed quickly. Most transactions are 1 kB. Fee 0.01 recommended. - Opcionális, kB-onkénti tranzakciós díj a tranzakcióid minél gyorsabb feldolgozásának elősegítésére. A legtöbb tranzakció 1 kB-os. 0,01 BTC ajánlott. + Optional transaction fee per kB that helps make sure your transactions are processed quickly. Most transactions are 1 kB. + @@ -1059,7 +1059,7 @@ Cím: %4 Még megerősítésre váró, a jelenlegi egyenlegbe be nem számított tranzakciók - + out of sync Nincs szinkronban. @@ -1646,6 +1646,19 @@ Cím: %4 + + SplashScreen + + + The Bitcoin developers + + + + + [testnet] + [teszthálózat] + + TransactionDesc @@ -2120,10 +2133,28 @@ Cím: %4 meddig + + WalletModel + + + Send Coins + Érmék küldése + + WalletView - + + &Export + + + + + Export the data in the current tab to a file + Jelenlegi nézet exportálása fájlba + + + Backup Wallet Biztonsági másolat készítése a Tárcáról @@ -2156,41 +2187,41 @@ Cím: %4 bitcoin-core - + Bitcoin version Bitcoin verzió - + Usage: Használat: - + Send command to -server or bitcoind Parancs küldése a -serverhez vagy a bitcoindhez - + List commands Parancsok kilistázása - + Get help for a command Segítség egy parancsról - + Options: Opciók - + Specify configuration file (default: bitcoin.conf) Konfigurációs fájl (alapértelmezett: bitcoin.conf) @@ -2202,30 +2233,18 @@ Cím: %4 - - Generate coins - Érmék generálása - - - - - Don't generate coins - Bitcoin-generálás leállítása - - - - + Specify data directory Adatkönyvtár - + Set database cache size in megabytes (default: 25) Az adatbázis gyorsítótár mérete megabájtban (alapértelmezés: 25) - + Listen for connections on <port> (default: 8333 or testnet: 18333) Csatlakozásokhoz figyelendő <port> (alapértelmezett: 8333 or testnet: 18333) @@ -2240,7 +2259,7 @@ Cím: %4 Kapcsolódás egy csomóponthoz a peerek címeinek megszerzése miatt, majd szétkapcsolás - + Specify your own public address Adja meg az Ön saját nyilvános címét @@ -2250,22 +2269,22 @@ Cím: %4 Helytelenül viselkedő peerek leválasztási határértéke (alapértelmezés: 100) - + Number of seconds to keep misbehaving peers from reconnecting (default: 86400) Helytelenül viselkedő peerek kizárási ideje másodpercben (alapértelmezés: 86400) - + An error occurred while setting up the RPC port %u for listening on IPv4: %s - + Listen for JSON-RPC connections on <port> (default: 8332 or testnet: 18332) JSON-RPC csatlakozásokhoz figyelendő <port> (alapértelmezett: 8332 or testnet: 18332) - + Accept command line and JSON-RPC commands Parancssoros és JSON-RPC parancsok elfogadása @@ -2277,18 +2296,18 @@ Cím: %4 - + Use the test network Teszthálózat használata - + Accept connections from outside (default: 1 if no -proxy or -connect) - + %s, you must set a rpcpassword in the configuration file: %s It is recommended you use the following random password: @@ -2317,11 +2336,6 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. Cannot obtain a lock on data directory %s. Bitcoin is probably already running. - - - Error initializing database environment %s! To recover, BACKUP THAT DIRECTORY, then remove everything from it except for wallet.dat. - - Error: The transaction was rejected! This might happen if some of the coins in your wallet were already spent, such as if you used a copy of wallet.dat and coins were spent in the copy but not marked as spent here. @@ -2348,12 +2362,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. - - Set the number of script verification threads (1-16, 0=auto, default: 0) - - - - + This is a pre-release test build - use at your own risk - do not use for mining or merchant applications @@ -2393,7 +2402,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. - + Connect only to the specified node(s) Csatlakozás csak a megadott csomóponthoz @@ -2413,7 +2422,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. - + Error initializing block database @@ -2437,11 +2446,6 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. Error: Disk space is low! - - - Error: Transaction creation failed! - - Error: Wallet locked, unable to create transaction! @@ -2513,7 +2517,12 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. - + + Generate coins (default: 0) + + + + How many blocks to check at startup (default: 288, 0 = all) @@ -2523,7 +2532,12 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. - + + Not enough file descriptors available. + + + + Rebuild block chain index from current blk000??.dat files @@ -2533,7 +2547,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. - + Verifying blocks... @@ -2543,12 +2557,17 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. - + Imports blocks from external blk000??.dat file - + + Set the number of script verification threads (up to 16, 0 = auto, <0 = leave that many cores free, default: 0) + + + + Information @@ -2557,6 +2576,16 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. Invalid -tor address: '%s' Érvénytelen -tor cím: '%s' + + + Invalid amount for -minrelaytxfee=<amount>: '%s' + + + + + Invalid amount for -mintxfee=<amount>: '%s' + + Maintain a full transaction index (default: 0) @@ -2573,7 +2602,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. - + Only accept block chain matching built-in checkpoints (default: 1) Csak blokklánccal egyező beépített ellenőrző pontok elfogadása (alapértelmezés: 1) @@ -2632,6 +2661,11 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. Shrink debug.log file on client startup (default: 1 when no -debug) + + + Signing transaction failed + + Specify connection timeout in milliseconds (default: 5000) @@ -2643,7 +2677,22 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. - + + Transaction amount too small + + + + + Transaction amounts must be positive + + + + + Transaction too large + + + + Use UPnP to map the listening port (default: 0) UPnP-használat engedélyezése a figyelő port feltérképezésénél (default: 0) @@ -2684,7 +2733,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. - + Password for JSON-RPC connections Jelszó JSON-RPC csatlakozásokhoz @@ -2702,17 +2751,17 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. - + Execute command when the best block changes (%s in cmd is replaced by block hash) Parancs, amit akkor hajt végre, amikor a legjobb blokk megváltozik (%s a cmd-ban lecserélődik a blokk hash-re) - + Upgrade wallet to latest format A Tárca frissítése a legfrissebb formátumra - + Set key pool size to <n> (default: 100) Kulcskarika mérete <n> (alapértelmezett: 100) @@ -2724,13 +2773,13 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. - + Use OpenSSL (https) for JSON-RPC connections OpenSSL (https) használata JSON-RPC csatalkozásokhoz - + Server certificate file (default: server.cert) Szervertanúsítvány-fájl (alapértelmezett: server.cert) @@ -2742,39 +2791,39 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. - + Acceptable ciphers (default: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH) Elfogadható rejtjelkulcsok (alapértelmezett: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH ) - + This help message Ez a súgó-üzenet - + Unable to bind to %s on this computer (bind returned error %d, %s) A %s nem elérhető ezen a gépen (bind returned error %d, %s) - + Connect through socks proxy Csatlakozás SOCKS proxyn keresztül - + Allow DNS lookups for -addnode, -seednode and -connect DNS-kikeresés engedélyezése az addnode-nál és a connect-nél - + Loading addresses... Címek betöltése... - + Error loading wallet.dat: Wallet corrupted Hiba a wallet.dat betöltése közben: meghibásodott tárca @@ -2784,22 +2833,22 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. Hiba a wallet.dat betöltése közben: ehhez a tárcához újabb verziójú Bitcoin-kliens szükséges - + Wallet needed to be rewritten: restart Bitcoin to complete A Tárca újraírása szükséges: Indítsa újra a teljesen a Bitcoin-t - + Error loading wallet.dat Hiba az wallet.dat betöltése közben - + Invalid -proxy address: '%s' Érvénytelen -proxy cím: '%s' - + Unknown network specified in -onlynet: '%s' Ismeretlen hálózat lett megadva -onlynet: '%s' @@ -2809,7 +2858,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. Ismeretlen -socks proxy kérése: %i - + Cannot resolve -bind address: '%s' @@ -2829,17 +2878,17 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. Étvénytelen összeg - + Insufficient funds Nincs elég bitcoinod. - + Loading block index... Blokkindex betöltése... - + Add a node to connect to and attempt to keep the connection open Elérendő csomópont megadása and attempt to keep the connection open @@ -2849,52 +2898,47 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. A %s nem elérhető ezen a gépen. A Bitcoin valószínűleg fut már. - + Fee per KB to add to transactions you send kB-onként felajánlandó díj az általad küldött tranzakciókhoz - + Loading wallet... Tárca betöltése... - + Cannot downgrade wallet Nem sikerült a Tárca visszaállítása a korábbi verzióra - - - Cannot initialize keypool - Nem lehet a keypool-t inicializálni - Cannot write default address Nem sikerült az alapértelmezett címet írni. - + Rescanning... Újraszkennelés... - + Done loading Betöltés befejezve. - + To use the %s option Használd a %s opciót - + Error Hiba - + You must set rpcpassword=<password> in the configuration file: %s If the file does not exist, create it with owner-readable-only file permissions. diff --git a/src/qt/locale/bitcoin_it.ts b/src/qt/locale/bitcoin_it.ts index 64efbd982e..48c03d6dc9 100644 --- a/src/qt/locale/bitcoin_it.ts +++ b/src/qt/locale/bitcoin_it.ts @@ -28,14 +28,14 @@ Distribuito sotto la licenza software MIT/X11, vedi il file COPYING incluso oppu Questo prodotto include software sviluppato dal progetto OpenSSL per l'uso del Toolkit OpenSSL (http://www.openssl.org/), software crittografico scritto da Eric Young (eay@cryptsoft.com) e software UPnP scritto da Thomas Bernard. - + Copyright Copyright - 2009-%1 The Bitcoin developers - 2009-%1 Gli sviluppatori di Bitcoin + The Bitcoin developers + Sviluppatori di Bitcoin @@ -66,7 +66,7 @@ Questo prodotto include software sviluppato dal progetto OpenSSL per l'uso &Nuovo indirizzo - + These are your Bitcoin addresses for receiving payments. You may want to give a different one to each sender so you can keep track of who is paying you. Questi sono i tuoi indirizzi Bitcoin per ricevere pagamenti. Potrai darne uno diverso ad ognuno per tenere così traccia di chi ti sta pagando. @@ -96,7 +96,17 @@ Questo prodotto include software sviluppato dal progetto OpenSSL per l'uso Cancella l'indirizzo attualmente selezionato dalla lista - + + Export the data in the current tab to a file + Esporta i dati nella tabella corrente su un file + + + + &Export + &Esporta... + + + Verify a message to ensure it was signed with a specified Bitcoin address Verifica un messaggio per accertarsi che sia firmato con un indirizzo Bitcoin specifico @@ -318,12 +328,12 @@ Questo prodotto include software sviluppato dal progetto OpenSSL per l'uso Firma il &messaggio... - + Synchronizing with network... Sto sincronizzando con la rete... - + &Overview &Sintesi @@ -398,7 +408,7 @@ Questo prodotto include software sviluppato dal progetto OpenSSL per l'uso &Cambia la passphrase... - + Importing blocks from disk... Importa blocchi dal disco... @@ -408,12 +418,7 @@ Questo prodotto include software sviluppato dal progetto OpenSSL per l'uso Re-indicizzazione blocchi su disco... - - &Export... - &Esporta... - - - + Send coins to a Bitcoin address Invia monete ad un indirizzo bitcoin @@ -423,12 +428,7 @@ Questo prodotto include software sviluppato dal progetto OpenSSL per l'uso Modifica configurazione opzioni per bitcoin - - Export the data in the current tab to a file - Esporta i dati nella tabella corrente su un file - - - + Backup wallet to another location Backup portamonete in un'altra locazione @@ -438,7 +438,7 @@ Questo prodotto include software sviluppato dal progetto OpenSSL per l'uso Cambia la passphrase per la cifratura del portamonete - + &Debug window Finestra &Debug @@ -448,35 +448,35 @@ Questo prodotto include software sviluppato dal progetto OpenSSL per l'uso Apri la console di degugging e diagnostica - + &Verify message... &Verifica messaggio... - - + + Bitcoin Bitcoin - + Wallet Portamonete - + &Send &Spedisci &Receive - + &Ricevi &Addresses - + &Indirizzi @@ -509,12 +509,12 @@ Questo prodotto include software sviluppato dal progetto OpenSSL per l'uso Verifica i messaggi per accertarsi che siano stati firmati con gli indirizzi Bitcoin specificati - + &File &File - + &Settings &Impostazioni @@ -529,12 +529,7 @@ Questo prodotto include software sviluppato dal progetto OpenSSL per l'uso Barra degli strumenti "Tabs" - - Actions toolbar - Barra degli strumenti "Azioni" - - - + [testnet] [testnet] @@ -545,12 +540,17 @@ Questo prodotto include software sviluppato dal progetto OpenSSL per l'uso Bitcoin client - + %n active connection(s) to Bitcoin network %n connessione attiva alla rete Bitcoin%n connessioni attive alla rete Bitcoin - + + No block source available... + + + + Processed %1 of %2 (estimated) blocks of transaction history. Processati %1 di %2 (circa) blocchi della cronologia transazioni. @@ -575,7 +575,7 @@ Questo prodotto include software sviluppato dal progetto OpenSSL per l'uso %n settimana%n settimane - + %1 behind @@ -590,7 +590,7 @@ Questo prodotto include software sviluppato dal progetto OpenSSL per l'uso - + Error Errore @@ -605,22 +605,22 @@ Questo prodotto include software sviluppato dal progetto OpenSSL per l'uso Informazione - + This transaction is over the size limit. You can still send it for a fee of %1, which goes to the nodes that process your transaction and helps to support the network. Do you want to pay the fee? Questa transazione è superiore al limite di dimensione. È comunque possibile inviarla con una commissione di %1, che va ai nodi che processano la tua transazione e contribuisce a sostenere la rete. Vuoi pagare la commissione? - + Up to date Aggiornato - + Catching up... In aggiornamento... - + Confirm transaction fee Conferma compenso transazione @@ -671,7 +671,7 @@ Indirizzo: %4 Il portamonete è <b>cifrato</b> e attualmente <b>bloccato</b> - + A fatal error occurred. Bitcoin can no longer continue safely and will quit. Riscontrato un errore irreversibile. Bitcoin non può più continuare in sicurezza e verrà terminato. @@ -679,7 +679,7 @@ Indirizzo: %4 ClientModel - + Network Alert Avviso di rete @@ -811,8 +811,8 @@ Indirizzo: %4 - Optional transaction fee per kB that helps make sure your transactions are processed quickly. Most transactions are 1 kB. Fee 0.01 recommended. - Commissione di transazione per kB; è opzionale e contribuisce ad assicurare che le transazioni siano elaborate velocemente. Le transazioni sono per la maggior parte da 1 kB. Commissione raccomandata 0,01. + Optional transaction fee per kB that helps make sure your transactions are processed quickly. Most transactions are 1 kB. + @@ -1061,7 +1061,7 @@ Indirizzo: %4 Totale delle transazioni in corso di conferma, che non sono ancora incluse nel saldo attuale - + out of sync fuori sincrono @@ -1647,6 +1647,19 @@ Indirizzo: %4 Messaggio verificato. + + SplashScreen + + + The Bitcoin developers + Sviluppatori di Bitcoin + + + + [testnet] + [testnet] + + TransactionDesc @@ -2121,10 +2134,28 @@ Indirizzo: %4 a + + WalletModel + + + Send Coins + Spedisci Bitcoin + + WalletView - + + &Export + + + + + Export the data in the current tab to a file + Esporta i dati nella tabella corrente su un file + + + Backup Wallet @@ -2136,7 +2167,7 @@ Indirizzo: %4 Backup Failed - + Backup fallito @@ -2157,41 +2188,41 @@ Indirizzo: %4 bitcoin-core - + Bitcoin version Versione di Bitcoin - + Usage: Utilizzo: - + Send command to -server or bitcoind Manda il comando a -server o bitcoind - + List commands Lista comandi - + Get help for a command Aiuto su un comando - + Options: Opzioni: - + Specify configuration file (default: bitcoin.conf) Specifica il file di configurazione (di default: bitcoin.conf) @@ -2203,30 +2234,18 @@ Indirizzo: %4 - - Generate coins - Genera Bitcoin - - - - - Don't generate coins - Non generare Bitcoin - - - - + Specify data directory Specifica la cartella dati - + Set database cache size in megabytes (default: 25) Imposta la dimensione cache del database in megabyte (default: 25) - + Listen for connections on <port> (default: 8333 or testnet: 18333) Ascolta le connessioni JSON-RPC su <porta> (default: 8333 o testnet: 18333) @@ -2241,7 +2260,7 @@ Indirizzo: %4 Connessione ad un nodo per ricevere l'indirizzo del peer, e disconnessione - + Specify your own public address Specifica il tuo indirizzo pubblico @@ -2251,22 +2270,22 @@ Indirizzo: %4 Soglia di disconnessione dei peer di cattiva qualità (default: 100) - + Number of seconds to keep misbehaving peers from reconnecting (default: 86400) Numero di secondi di sospensione che i peer di cattiva qualità devono trascorrere prima di riconnettersi (default: 86400) - + An error occurred while setting up the RPC port %u for listening on IPv4: %s Errore riscontrato durante l'impostazione della porta RPC %u per l'ascolto su IPv4: %s - + Listen for JSON-RPC connections on <port> (default: 8332 or testnet: 18332) Attendi le connessioni JSON-RPC su <porta> (default: 8332 or testnet: 18332) - + Accept command line and JSON-RPC commands Accetta da linea di comando e da comandi JSON-RPC @@ -2278,18 +2297,18 @@ Indirizzo: %4 - + Use the test network Utilizza la rete di prova - + Accept connections from outside (default: 1 if no -proxy or -connect) Accetta connessioni dall'esterno (default: 1 se no -proxy o -connect) - + %s, you must set a rpcpassword in the configuration file: %s It is recommended you use the following random password: @@ -2318,11 +2337,6 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. Cannot obtain a lock on data directory %s. Bitcoin is probably already running. Non è possibile ottenere i dati sulla cartella %s. Probabilmente Bitcoin è già in esecuzione. - - - Error initializing database environment %s! To recover, BACKUP THAT DIRECTORY, then remove everything from it except for wallet.dat. - Errore nell'inizializzazione dell'ambiente del database %s! Per ripristinare, FAI UN BACKUP DI QUELLA CARTELLA, poi rimuovi tutto all'interno eccetto wallet.dat. - Error: The transaction was rejected! This might happen if some of the coins in your wallet were already spent, such as if you used a copy of wallet.dat and coins were spent in the copy but not marked as spent here. @@ -2349,12 +2363,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. Imposta dimensione massima delle transazioni ad alta priorità/bassa-tassa in bytes (predefinito: 27000) - - Set the number of script verification threads (1-16, 0=auto, default: 0) - - - - + This is a pre-release test build - use at your own risk - do not use for mining or merchant applications Questa versione è una compilazione pre-rilascio - usala a tuo rischio - non utilizzarla per la generazione o per applicazioni di commercio @@ -2394,14 +2403,14 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. Opzioni creazione blocco: - + Connect only to the specified node(s) Connetti solo al nodo specificato Corrupted block database detected - + Rilevato database blocchi corrotto @@ -2411,10 +2420,10 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. Do you want to rebuild the block database now? - + Vuoi ricostruire ora il database dei blocchi? - + Error initializing block database @@ -2431,18 +2440,13 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. Error opening block database - + Errore caricamento database blocchi Error: Disk space is low! Errore: la spazio libero sul disco è poco! - - - Error: Transaction creation failed! - Errore: Creazione transazione fallita! - Error: Wallet locked, unable to create transaction! @@ -2514,7 +2518,12 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. Trova peer utilizzando la ricerca DNS (predefinito: 1 finché utilizzato -connect) - + + Generate coins (default: 0) + + + + How many blocks to check at startup (default: 288, 0 = all) Quanti blocchi da controllare all'avvio (predefinito: 288, 0 = tutti) @@ -2524,7 +2533,12 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. - + + Not enough file descriptors available. + + + + Rebuild block chain index from current blk000??.dat files @@ -2534,7 +2548,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. - + Verifying blocks... Verifica blocchi... @@ -2544,12 +2558,17 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. Verifica portafoglio... - + Imports blocks from external blk000??.dat file Importa blocchi da un file blk000??.dat esterno - + + Set the number of script verification threads (up to 16, 0 = auto, <0 = leave that many cores free, default: 0) + + + + Information Informazione @@ -2558,6 +2577,16 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. Invalid -tor address: '%s' Indirizzo -tor non valido: '%s' + + + Invalid amount for -minrelaytxfee=<amount>: '%s' + + + + + Invalid amount for -mintxfee=<amount>: '%s' + + Maintain a full transaction index (default: 0) @@ -2574,7 +2603,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. Buffer di invio massimo per connessione, <n>*1000 byte (default: 1000) - + Only accept block chain matching built-in checkpoints (default: 1) @@ -2633,6 +2662,11 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. Shrink debug.log file on client startup (default: 1 when no -debug) Riduci il file debug.log all'avvio del client (predefinito: 1 se non impostato -debug) + + + Signing transaction failed + + Specify connection timeout in milliseconds (default: 5000) @@ -2644,7 +2678,22 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. Errore di sistema: - + + Transaction amount too small + + + + + Transaction amounts must be positive + + + + + Transaction too large + + + + Use UPnP to map the listening port (default: 0) UPnP-használat engedélyezése a figyelő port feltérképezésénél (default: 0) @@ -2685,7 +2734,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. wallet.dat corrotto, salvataggio fallito - + Password for JSON-RPC connections Password per connessioni JSON-RPC @@ -2703,17 +2752,17 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. - + Execute command when the best block changes (%s in cmd is replaced by block hash) Esegui il comando quando il miglior block cambia(%s nel cmd è sostituito dall'hash del blocco) - + Upgrade wallet to latest format Aggiorna il wallet all'ultimo formato - + Set key pool size to <n> (default: 100) Impostare la quantità di chiavi di riserva a <n> (default: 100) @@ -2725,13 +2774,13 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. - + Use OpenSSL (https) for JSON-RPC connections Utilizzare OpenSSL (https) per le connessioni JSON-RPC - + Server certificate file (default: server.cert) File certificato del server (default: server.cert) @@ -2743,40 +2792,40 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. - + Acceptable ciphers (default: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH) Cifrari accettabili (default: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH) - + This help message Questo messaggio di aiuto - + Unable to bind to %s on this computer (bind returned error %d, %s) Impossibile collegarsi alla %s su questo computer (bind returned error %d, %s) - + Connect through socks proxy Connessione tramite socks proxy - + Allow DNS lookups for -addnode, -seednode and -connect Consenti ricerche DNS per aggiungere nodi e collegare - + Loading addresses... Caricamento indirizzi... - + Error loading wallet.dat: Wallet corrupted Errore caricamento wallet.dat: Wallet corrotto @@ -2786,22 +2835,22 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. Errore caricamento wallet.dat: il wallet richiede una versione nuova di Bitcoin - + Wallet needed to be rewritten: restart Bitcoin to complete Il portamonete deve essere riscritto: riavviare Bitcoin per completare - + Error loading wallet.dat Errore caricamento wallet.dat - + Invalid -proxy address: '%s' Indirizzo -proxy non valido: '%s' - + Unknown network specified in -onlynet: '%s' Rete sconosciuta specificata in -onlynet: '%s' @@ -2811,7 +2860,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. Versione -socks proxy sconosciuta richiesta: %i - + Cannot resolve -bind address: '%s' Impossibile risolvere -bind address: '%s' @@ -2831,17 +2880,17 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. Importo non valido - + Insufficient funds Fondi insufficienti - + Loading block index... Caricamento dell'indice del blocco... - + Add a node to connect to and attempt to keep the connection open Elérendő csomópont megadása and attempt to keep the connection open @@ -2851,52 +2900,47 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. Impossibile collegarsi alla %s su questo computer. Probabilmente Bitcoin è già in esecuzione. - + Fee per KB to add to transactions you send Commissione per KB da aggiungere alle transazioni in uscita - + Loading wallet... Caricamento portamonete... - + Cannot downgrade wallet Non è possibile retrocedere il wallet - - - Cannot initialize keypool - Non è possibile iniziare la keypool - Cannot write default address Non è possibile scrivere l'indirizzo di default - + Rescanning... Ripetere la scansione... - + Done loading Caricamento completato - + To use the %s option Per usare la opzione %s - + Error Errore - + You must set rpcpassword=<password> in the configuration file: %s If the file does not exist, create it with owner-readable-only file permissions. diff --git a/src/qt/locale/bitcoin_ja.ts b/src/qt/locale/bitcoin_ja.ts index bb785f7672..d7d0b7c78c 100644 --- a/src/qt/locale/bitcoin_ja.ts +++ b/src/qt/locale/bitcoin_ja.ts @@ -23,13 +23,13 @@ This product includes software developed by the OpenSSL Project for use in the O - + Copyright - 2009-%1 The Bitcoin developers + The Bitcoin developers @@ -43,12 +43,12 @@ This product includes software developed by the OpenSSL Project for use in the O Double-click to edit address or label - アドレスかレーベルを編集するのためにダブルクリックして + アドレスまたはラベルを編集するにはダブルクリック Create a new address - 新しいのアドレスを作る + 新規アドレスの作成 @@ -61,7 +61,7 @@ This product includes software developed by the OpenSSL Project for use in the O - + These are your Bitcoin addresses for receiving payments. You may want to give a different one to each sender so you can keep track of who is paying you. @@ -91,7 +91,17 @@ This product includes software developed by the OpenSSL Project for use in the O - + + Export the data in the current tab to a file + + + + + &Export + + + + Verify a message to ensure it was signed with a specified Bitcoin address @@ -103,7 +113,7 @@ This product includes software developed by the OpenSSL Project for use in the O &Delete - &消す + 削除(&D) @@ -128,17 +138,17 @@ This product includes software developed by the OpenSSL Project for use in the O Export Address Book Data - アドレス帳データーを輸出する + アドレス帳データをエクスポートする Comma separated file (*.csv) - テキスト CSV (*.csv) + CSVファイル (*.csv) Error exporting - エラー輸出 + エクスポートエラー @@ -151,7 +161,7 @@ This product includes software developed by the OpenSSL Project for use in the O Label - レーベル + ラベル @@ -161,7 +171,7 @@ This product includes software developed by the OpenSSL Project for use in the O (no label) - （レーベル無し） + （ラベル無し） @@ -174,62 +184,62 @@ This product includes software developed by the OpenSSL Project for use in the O Enter passphrase - パスフレーズを入って + パスフレーズを入力 New passphrase - 新しいのパスフレーズ + 新しいパスフレーズ Repeat new passphrase - 新しいのパスフレーズを繰り返して + 新しいパスフレーズをもう一度 Enter the new passphrase to the wallet.<br/>Please use a passphrase of <b>10 or more random characters</b>, or <b>eight or more words</b>. - 財布の新しいのパスフレーズを入って。<br/><b>8個以上のワードか10個以上のランダムな文字</b>を使ってください。 + ウォレットの新しいパスフレーズを入力してください。<br/><b>8個以上の単語か10個以上のランダムな文字</b>を使ってください。 Encrypt wallet - 財布を暗号化する + ウォレットを暗号化する This operation needs your wallet passphrase to unlock the wallet. - この動作は財布のアンロックするように財布のパスフレーズが必要です。 + この操作はウォレットをアンロックするためにパスフレーズが必要です。 Unlock wallet - 財布をアンロックする + ウォレットをアンロックする This operation needs your wallet passphrase to decrypt the wallet. - この動作は財布の解読するように財布のパスフレーズが必要です。 + この操作はウォレットの暗号化解除のためにパスフレーズが必要です。 Decrypt wallet - 財布を解読する + ウォレットの暗号化を解除する Change passphrase - パスフレーズを変わります + パスフレーズの変更 Enter the old and new passphrase to the wallet. - 前と新しいの財布のパスフレーズを入って。 + 新旧両方のパスフレーズを入力してください。 Confirm wallet encryption - 財布の暗号化を確認する + ウォレットの暗号化を確認する @@ -256,7 +266,7 @@ This product includes software developed by the OpenSSL Project for use in the O Wallet encrypted - 財布は暗号化しました + ウォレットは暗号化されました @@ -269,35 +279,35 @@ This product includes software developed by the OpenSSL Project for use in the O Wallet encryption failed - 財布の暗号化するのは失敗しました + ウォレットの暗号化に失敗しました Wallet encryption failed due to an internal error. Your wallet was not encrypted. - 内部エラーですから財布の暗号化が失敗しました。財布は暗号化しませんでした。 + 内部エラーによりウォレットの暗号化が失敗しました。ウォレットは暗号化されませんでした。 The supplied passphrases do not match. - パスフレーズは同じではありません。 + パスフレーズが同じではありません。 Wallet unlock failed - 財布のアンロックは失敗しました + ウォレットのアンロックに失敗しました The passphrase entered for the wallet decryption was incorrect. - 財布の + ウォレットの暗号化解除のパスフレーズが正しくありません。 Wallet decryption failed - 財布の解読は失敗しました + ウォレットの暗号化解除に失敗しました @@ -313,39 +323,39 @@ This product includes software developed by the OpenSSL Project for use in the O - + Synchronizing with network... - ネットワークと同期化中。。。 + ネットワークに同期中…… - + &Overview - &概観 + 概要(&O) Show general overview of wallet - 財布の概観を見せる + ウォレットの概要を見る &Transactions - &取引 + 取引(&T) Browse transaction history - 昔の取引をブラウズする + 取引履歴を閲覧 Edit the list of stored addresses and labels - アドレスとレーベルのリストを編集する + 保存されたアドレスとラベルのリストを編集 Show the list of addresses for receiving payments - 支払いを受け取るのアドレスのリストを見せる + 支払い受け取り用アドレスのリストを見る @@ -355,12 +365,12 @@ This product includes software developed by the OpenSSL Project for use in the O Quit application - アプリを終了 + アプリケーションを終了 Show information about Bitcoin - Bitcoinの事の情報を見せる + Bitcoinに関する情報を見る @@ -375,7 +385,7 @@ This product includes software developed by the OpenSSL Project for use in the O &Options... - &オプションズ + オプション(&O) @@ -393,7 +403,7 @@ This product includes software developed by the OpenSSL Project for use in the O - + Importing blocks from disk... @@ -403,12 +413,7 @@ This product includes software developed by the OpenSSL Project for use in the O - - &Export... - &輸出。。。 - - - + Send coins to a Bitcoin address @@ -418,22 +423,17 @@ This product includes software developed by the OpenSSL Project for use in the O - - Export the data in the current tab to a file - - - - + Backup wallet to another location Change the passphrase used for wallet encryption - 財布の暗号化のためのパスフレーズを変わる + ウォレット暗号化用パスフレーズの変更 - + &Debug window @@ -443,23 +443,23 @@ This product includes software developed by the OpenSSL Project for use in the O - + &Verify message... - - + + Bitcoin - + Wallet - + &Send @@ -504,19 +504,19 @@ This product includes software developed by the OpenSSL Project for use in the O - + &File - &ファイル + ファイル(&F) - + &Settings - &設定 + 設定(&S) &Help - &ヘルプ + ヘルプ(&H) @@ -524,15 +524,10 @@ This product includes software developed by the OpenSSL Project for use in the O タブツールバー - - Actions toolbar - アクションツールバー - - - + [testnet] - [テストネット] + [testnet] @@ -540,12 +535,17 @@ This product includes software developed by the OpenSSL Project for use in the O - + %n active connection(s) to Bitcoin network - + + No block source available... + + + + Processed %1 of %2 (estimated) blocks of transaction history. @@ -570,7 +570,7 @@ This product includes software developed by the OpenSSL Project for use in the O - + %1 behind @@ -585,7 +585,7 @@ This product includes software developed by the OpenSSL Project for use in the O - + Error @@ -600,34 +600,34 @@ This product includes software developed by the OpenSSL Project for use in the O - + This transaction is over the size limit. You can still send it for a fee of %1, which goes to the nodes that process your transaction and helps to support the network. Do you want to pay the fee? - + Up to date - 新しいのバージョンが無し + バージョンは最新です - + Catching up... - 追いつく中。。。 + - + Confirm transaction fee Sent transaction - 送ったの取引 + 送金取引 Incoming transaction - 入ってくるの取引 + 着金取引 @@ -653,15 +653,15 @@ Address: %4 Wallet is <b>encrypted</b> and currently <b>unlocked</b> - 財布は<b>暗号化とアンロックです</b> + ウォレットは<b>暗号化され、アンロックされています</b> Wallet is <b>encrypted</b> and currently <b>locked</b> - 財布は<b>暗号化とロックです</b> + ウォレットは<b>暗号化され、ロックされています</b> - + A fatal error occurred. Bitcoin can no longer continue safely and will quit. @@ -669,7 +669,7 @@ Address: %4 ClientModel - + Network Alert @@ -679,12 +679,12 @@ Address: %4 Edit Address - アドレスを編集する + アドレスの編集 &Label - &レーベル + ラベル(&L) @@ -800,7 +800,7 @@ Address: %4 - Optional transaction fee per kB that helps make sure your transactions are processed quickly. Most transactions are 1 kB. Fee 0.01 recommended. + Optional transaction fee per kB that helps make sure your transactions are processed quickly. Most transactions are 1 kB. @@ -1050,7 +1050,7 @@ Address: %4 - + out of sync @@ -1636,6 +1636,19 @@ Address: %4 + + SplashScreen + + + The Bitcoin developers + + + + + [testnet] + [testnet] + + TransactionDesc @@ -2110,10 +2123,28 @@ Address: %4 + + WalletModel + + + Send Coins + + + WalletView - + + &Export + + + + + Export the data in the current tab to a file + + + + Backup Wallet @@ -2146,37 +2177,37 @@ Address: %4 bitcoin-core - + Bitcoin version Bitcoin Bertsio - + Usage: - + Send command to -server or bitcoind - + List commands - + Get help for a command - + Options: - + Specify configuration file (default: bitcoin.conf) @@ -2186,27 +2217,17 @@ Address: %4 - - Generate coins - - - - - Don't generate coins - - - - + Specify data directory - + Set database cache size in megabytes (default: 25) - + Listen for connections on <port> (default: 8333 or testnet: 18333) @@ -2221,7 +2242,7 @@ Address: %4 - + Specify your own public address @@ -2231,22 +2252,22 @@ Address: %4 - + Number of seconds to keep misbehaving peers from reconnecting (default: 86400) - + An error occurred while setting up the RPC port %u for listening on IPv4: %s - + Listen for JSON-RPC connections on <port> (default: 8332 or testnet: 18332) - + Accept command line and JSON-RPC commands @@ -2256,17 +2277,17 @@ Address: %4 - + Use the test network - + Accept connections from outside (default: 1 if no -proxy or -connect) - + %s, you must set a rpcpassword in the configuration file: %s It is recommended you use the following random password: @@ -2295,11 +2316,6 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. Cannot obtain a lock on data directory %s. Bitcoin is probably already running. - - - Error initializing database environment %s! To recover, BACKUP THAT DIRECTORY, then remove everything from it except for wallet.dat. - - Error: The transaction was rejected! This might happen if some of the coins in your wallet were already spent, such as if you used a copy of wallet.dat and coins were spent in the copy but not marked as spent here. @@ -2326,12 +2342,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. - - Set the number of script verification threads (1-16, 0=auto, default: 0) - - - - + This is a pre-release test build - use at your own risk - do not use for mining or merchant applications @@ -2371,7 +2382,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. - + Connect only to the specified node(s) @@ -2391,7 +2402,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. - + Error initializing block database @@ -2415,11 +2426,6 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. Error: Disk space is low! - - - Error: Transaction creation failed! - - Error: Wallet locked, unable to create transaction! @@ -2491,7 +2497,12 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. - + + Generate coins (default: 0) + + + + How many blocks to check at startup (default: 288, 0 = all) @@ -2501,7 +2512,12 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. - + + Not enough file descriptors available. + + + + Rebuild block chain index from current blk000??.dat files @@ -2511,7 +2527,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. - + Verifying blocks... @@ -2521,12 +2537,17 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. - + Imports blocks from external blk000??.dat file - + + Set the number of script verification threads (up to 16, 0 = auto, <0 = leave that many cores free, default: 0) + + + + Information @@ -2535,6 +2556,16 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. Invalid -tor address: '%s' + + + Invalid amount for -minrelaytxfee=<amount>: '%s' + + + + + Invalid amount for -mintxfee=<amount>: '%s' + + Maintain a full transaction index (default: 0) @@ -2551,7 +2582,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. - + Only accept block chain matching built-in checkpoints (default: 1) @@ -2610,6 +2641,11 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. Shrink debug.log file on client startup (default: 1 when no -debug) + + + Signing transaction failed + + Specify connection timeout in milliseconds (default: 5000) @@ -2621,7 +2657,22 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. - + + Transaction amount too small + + + + + Transaction amounts must be positive + + + + + Transaction too large + + + + Use UPnP to map the listening port (default: 0) @@ -2661,7 +2712,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. - + Password for JSON-RPC connections @@ -2676,17 +2727,17 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. - + Execute command when the best block changes (%s in cmd is replaced by block hash) - + Upgrade wallet to latest format - + Set key pool size to <n> (default: 100) @@ -2696,12 +2747,12 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. - + Use OpenSSL (https) for JSON-RPC connections - + Server certificate file (default: server.cert) @@ -2711,37 +2762,37 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. - + Acceptable ciphers (default: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH) - + This help message - + Unable to bind to %s on this computer (bind returned error %d, %s) - + Connect through socks proxy - + Allow DNS lookups for -addnode, -seednode and -connect - + Loading addresses... - + Error loading wallet.dat: Wallet corrupted @@ -2751,22 +2802,22 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. - + Wallet needed to be rewritten: restart Bitcoin to complete - + Error loading wallet.dat - + Invalid -proxy address: '%s' - + Unknown network specified in -onlynet: '%s' @@ -2776,7 +2827,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. - + Cannot resolve -bind address: '%s' @@ -2796,17 +2847,17 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. - + Insufficient funds - + Loading block index... - + Add a node to connect to and attempt to keep the connection open @@ -2816,52 +2867,47 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. - + Fee per KB to add to transactions you send - + Loading wallet... - + Cannot downgrade wallet - - - Cannot initialize keypool - - Cannot write default address - + Rescanning... - + Done loading - + To use the %s option - + Error - + You must set rpcpassword=<password> in the configuration file: %s If the file does not exist, create it with owner-readable-only file permissions. diff --git a/src/qt/locale/bitcoin_la.ts b/src/qt/locale/bitcoin_la.ts index 80712275b9..35b951614e 100644 --- a/src/qt/locale/bitcoin_la.ts +++ b/src/qt/locale/bitcoin_la.ts @@ -27,14 +27,14 @@ Distributum sub MIT/X11 licentia programmatum, vide comitantem plicam COPYING ve Hoc productum continet programmata composita ab OpenSSL Project pro utendo in OpenSSL Toolkit (http://www.openssl.org/) et programmata cifrarum scripta ab Eric Young (eay@cryptsoft.com) et UPnP programmata scripta ab Thomas Bernard. - + Copyright Copyright - 2009-%1 The Bitcoin developers - 2009-%1 Bitcoin curatores + The Bitcoin developers + Bitcoin curatores @@ -65,7 +65,7 @@ Hoc productum continet programmata composita ab OpenSSL Project pro utendo in Op &Nova Inscriptio - + These are your Bitcoin addresses for receiving payments. You may want to give a different one to each sender so you can keep track of who is paying you. Haec sunt inscriptiones Bitcoin tuae pro accipendo pensitationes. Cupias variam ad quemque mittentem dare ut melius scias quem tibi pensare. @@ -95,7 +95,17 @@ Hoc productum continet programmata composita ab OpenSSL Project pro utendo in Op Dele active selectam inscriptionem ex enumeratione - + + Export the data in the current tab to a file + Exporta data in hac tabella in plicam + + + + &Export + &Exporta + + + Verify a message to ensure it was signed with a specified Bitcoin address Verifica nuntium ut cures signatum esse cum specificata inscriptione Bitcoin @@ -112,7 +122,7 @@ Hoc productum continet programmata composita ab OpenSSL Project pro utendo in Op These are your Bitcoin addresses for sending payments. Always check the amount and the receiving address before sending coins. - + Hae sunt inscriptiones mittendi pensitationes. Semper inspice quantitatem et inscriptionem accipiendi antequam nummos mittis. @@ -317,12 +327,12 @@ Hoc productum continet programmata composita ab OpenSSL Project pro utendo in Op Signa &nuntium... - + Synchronizing with network... Synchronizans cum rete... - + &Overview &Summarium @@ -397,7 +407,7 @@ Hoc productum continet programmata composita ab OpenSSL Project pro utendo in Op &Muta tesseram... - + Importing blocks from disk... Importans frusta ab disco... @@ -407,12 +417,7 @@ Hoc productum continet programmata composita ab OpenSSL Project pro utendo in Op Recreans indicem frustorum in disco... - - &Export... - &Exporta... - - - + Send coins to a Bitcoin address Mitte nummos ad inscriptionem Bitcoin @@ -422,12 +427,7 @@ Hoc productum continet programmata composita ab OpenSSL Project pro utendo in Op Muta configurationis optiones pro Bitcoin - - Export the data in the current tab to a file - Exporta data in activa tabella ad plicam - - - + Backup wallet to another location Conserva cassidile in locum alium @@ -437,7 +437,7 @@ Hoc productum continet programmata composita ab OpenSSL Project pro utendo in Op Muta tesseram utam pro cassidilis cifrando - + &Debug window Fenestra &Debug @@ -447,23 +447,23 @@ Hoc productum continet programmata composita ab OpenSSL Project pro utendo in Op Aperi terminalem debug et diagnosticalem - + &Verify message... &Verifica nuntium... - - + + Bitcoin Bitcoin - + Wallet Cassidile - + &Send &Mitte @@ -508,12 +508,12 @@ Hoc productum continet programmata composita ab OpenSSL Project pro utendo in Op Verifica nuntios ut certus sis eos signatos esse cum specificatis inscriptionibus Bitcoin - + &File &Plica - + &Settings &Configuratio @@ -528,12 +528,7 @@ Hoc productum continet programmata composita ab OpenSSL Project pro utendo in Op Tabella instrumentorum "Tabs" - - Actions toolbar - Tabella instrumentorum "Actiones" - - - + [testnet] [testnet] @@ -544,12 +539,17 @@ Hoc productum continet programmata composita ab OpenSSL Project pro utendo in Op Bitcoin cliens - + %n active connection(s) to Bitcoin network %n activa conexio ad rete Bitcoin%n activae conexiones ad rete Bitcoin - + + No block source available... + Nulla fons frustorum absens... + + + Processed %1 of %2 (estimated) blocks of transaction history. Perfecta %1 de %2 (aestimato) frusta historiae transactionum. @@ -574,7 +574,7 @@ Hoc productum continet programmata composita ab OpenSSL Project pro utendo in Op %n hebdomas%n hebdomades - + %1 behind %1 post @@ -589,7 +589,7 @@ Hoc productum continet programmata composita ab OpenSSL Project pro utendo in Op Transactiones post hoc nondum visibiles erunt. - + Error Error @@ -604,22 +604,22 @@ Hoc productum continet programmata composita ab OpenSSL Project pro utendo in Op Informatio - + This transaction is over the size limit. You can still send it for a fee of %1, which goes to the nodes that process your transaction and helps to support the network. Do you want to pay the fee? Haec transactio maior est quam limen magnitudinis. Adhuc potes id mittere mercede %1, quae it nodis qui procedunt tuam transactionem et adiuvat sustinere rete. Visne mercedem solvere? - + Up to date Recentissimo - + Catching up... Persequens... - + Confirm transaction fee Confirma mercedem transactionis @@ -669,7 +669,7 @@ Inscriptio: %4 Cassidile <b>cifratum</b> est et iam nunc <b>seratum</b> - + A fatal error occurred. Bitcoin can no longer continue safely and will quit. Error fatalis accidit. Bitcoin nondum pergere tute potest, et exibit. @@ -677,7 +677,7 @@ Inscriptio: %4 ClientModel - + Network Alert Monitio Retis @@ -808,8 +808,8 @@ Inscriptio: %4 - Optional transaction fee per kB that helps make sure your transactions are processed quickly. Most transactions are 1 kB. Fee 0.01 recommended. - Optionalis merces transactionum singulis kB quae adiuvat curare ut tuae transactiones processae sit celeriter. Plurimi transactiones 1kB sunt. Merces 0.01 hortata. + Optional transaction fee per kB that helps make sure your transactions are processed quickly. Most transactions are 1 kB. + Optionalis merces transactionum singulis kB quae adiuvat curare tuas transactiones processas esse celeriter. Plurimi transactiones 1kB sunt. @@ -1058,7 +1058,7 @@ Inscriptio: %4 Totali nummi transactionum quae adhuc confirmandae sunt, et nondum afficiunt pendendum - + out of sync non synchronizato @@ -1644,6 +1644,19 @@ Inscriptio: %4 Nuntius verificatus. + + SplashScreen + + + The Bitcoin developers + Bitcoin curatores + + + + [testnet] + [testnet] + + TransactionDesc @@ -2118,10 +2131,28 @@ Inscriptio: %4 ad + + WalletModel + + + Send Coins + Mitte Nummos + + WalletView - + + &Export + &Exporta + + + + Export the data in the current tab to a file + Exporta data in hac tabella in plicam + + + Backup Wallet Conserva cassidile @@ -2154,37 +2185,37 @@ Inscriptio: %4 bitcoin-core - + Bitcoin version Versio de Bitcoin - + Usage: Usus: - + Send command to -server or bitcoind Mitte mandatum ad -server vel bitcoind - + List commands Enumera mandata - + Get help for a command Accipe auxilium pro mandato - + Options: Optiones: - + Specify configuration file (default: bitcoin.conf) Specifica configurationis plicam (praedefinitum: bitcoin.conf) @@ -2194,27 +2225,17 @@ Inscriptio: %4 Specifica pid plicam (praedefinitum: bitcoin.pid) - - Generate coins - Genera nummos - - - - Don't generate coins - Nolite nummos generare - - - + Specify data directory Specifica indicem datorum - + Set database cache size in megabytes (default: 25) Constitue magnitudinem databasis cache in megabytes (praedefinitum: 25) - + Listen for connections on <port> (default: 8333 or testnet: 18333) Ausculta pro conexionibus in <porta> (praedefinitum: 8333 vel testnet: 18333) @@ -2229,7 +2250,7 @@ Inscriptio: %4 Conecta ad nodum acceptare inscriptiones parium, et disconecte - + Specify your own public address Specifica tuam propriam publicam inscriptionem @@ -2239,22 +2260,22 @@ Inscriptio: %4 Limen pro disconectendo paria improba (praedefinitum: 100) - + Number of seconds to keep misbehaving peers from reconnecting (default: 86400) Numerum secundorum prohibere ne paria improba reconectant (praedefinitum: 86400) - + An error occurred while setting up the RPC port %u for listening on IPv4: %s Error erat dum initians portam RPC %u pro auscultando in IPv4: %s - + Listen for JSON-RPC connections on <port> (default: 8332 or testnet: 18332) Ausculta pro conexionibus JSON-RPC in <porta> (praedefinitum: 8332 vel testnet: 18332) - + Accept command line and JSON-RPC commands Accipe terminalis et JSON-RPC mandata. @@ -2264,17 +2285,17 @@ Inscriptio: %4 Operare infere sicut daemon et mandata accipe - + Use the test network Utere rete experimentale - + Accept connections from outside (default: 1 if no -proxy or -connect) Accipe conexiones externas (praedefinitum: 1 nisi -proxy neque -connect) - + %s, you must set a rpcpassword in the configuration file: %s It is recommended you use the following random password: @@ -2313,11 +2334,6 @@ exempli gratia: alertnotify=echo %%s | mail -s "Bitcoin Notificatio" a Cannot obtain a lock on data directory %s. Bitcoin is probably already running. Non posse serare datorum indicem %s. Bitcoin probabiliter iam operatur. - - - Error initializing database environment %s! To recover, BACKUP THAT DIRECTORY, then remove everything from it except for wallet.dat. - Error initiando systema databasi %s! Ut restituas, CONSERVA ILLUM INDICEM PLICARUM, tunc remove omnes ex illo praeter wallet.dat. - Error: The transaction was rejected! This might happen if some of the coins in your wallet were already spent, such as if you used a copy of wallet.dat and coins were spent in the copy but not marked as spent here. @@ -2344,12 +2360,7 @@ exempli gratia: alertnotify=echo %%s | mail -s "Bitcoin Notificatio" a Constitue magnitudinem maximam transactionum magnae-prioritatis/parvae-mercedis in octetis/bytes (praedefinitum: 27000) - - Set the number of script verification threads (1-16, 0=auto, default: 0) - Constitue numerum filorum verificationis scriptorum (1-16, 0=auto, praedefinitum: 0) - - - + This is a pre-release test build - use at your own risk - do not use for mining or merchant applications Hoc est prae-dimittum experimentala aedes - utere eo periculo tuo proprio - nolite utere fodendo vel applicationibus mercatoriis @@ -2389,7 +2400,7 @@ exempli gratia: alertnotify=echo %%s | mail -s "Bitcoin Notificatio" a Optiones creandi frustorum: - + Connect only to the specified node(s) Conecte sole ad nodos specificatos (vel nodum specificatum) @@ -2409,7 +2420,7 @@ exempli gratia: alertnotify=echo %%s | mail -s "Bitcoin Notificatio" a Visne reficere databasum frustorum iam? - + Error initializing block database Error initiando databasem frustorum @@ -2433,11 +2444,6 @@ exempli gratia: alertnotify=echo %%s | mail -s "Bitcoin Notificatio" a Error: Disk space is low! Error: Inopia spatii disci! - - - Error: Transaction creation failed! - Error: Creare transactionum abortum est! - Error: Wallet locked, unable to create transaction! @@ -2509,7 +2515,12 @@ exempli gratia: alertnotify=echo %%s | mail -s "Bitcoin Notificatio" a Inveni paria utendo DNS quaerendo (praedefinitum: 1 nisi -connect) - + + Generate coins (default: 0) + Genera nummos (praedefinitum: 0) + + + How many blocks to check at startup (default: 288, 0 = all) Quot frusta proba ad initium (praedefinitum: 288, 0 = omnia) @@ -2519,17 +2530,22 @@ exempli gratia: alertnotify=echo %%s | mail -s "Bitcoin Notificatio" a Quam perfecta frustorum verificatio est (0-4, praedefinitum: 3) - + + Not enough file descriptors available. + Inopia descriptorum plicarum. + + + Rebuild block chain index from current blk000??.dat files Restituere indicem catenae frustorum ex activis plicis blk000??.dat Set the number of threads to service RPC calls (default: 4) - + Constitue numerum filorum ad tractandum RPC postulationes (praedefinitum: 4) - + Verifying blocks... Verificante frusta... @@ -2539,12 +2555,17 @@ exempli gratia: alertnotify=echo %%s | mail -s "Bitcoin Notificatio" a Verificante cassidilem... - + Imports blocks from external blk000??.dat file Importat frusta ab externa plica blk000??.dat - + + Set the number of script verification threads (up to 16, 0 = auto, <0 = leave that many cores free, default: 0) + Constitue numerum filorum verificationis scriptorum (Maximum 16, 0 = auto, <0 = tot corda libera erunt, praedefinitum: 0) + + + Information Informatio @@ -2553,6 +2574,16 @@ exempli gratia: alertnotify=echo %%s | mail -s "Bitcoin Notificatio" a Invalid -tor address: '%s' Inscriptio -tor non valida: '%s' + + + Invalid amount for -minrelaytxfee=<amount>: '%s' + Quantitas non valida pro -minrelaytxfee=<amount>: '%s' + + + + Invalid amount for -mintxfee=<amount>: '%s' + Quantitas non valida pro -mintxfee=<amount>: '%s' + Maintain a full transaction index (default: 0) @@ -2569,7 +2600,7 @@ exempli gratia: alertnotify=echo %%s | mail -s "Bitcoin Notificatio" a Maxima magnitudo memoriae pro datis mittendis singulis conexionibus, <n>*1000 octetis/bytes (praedefinitum: 1000) - + Only accept block chain matching built-in checkpoints (default: 1) Tantum accipe catenam frustorum convenientem internis lapidibus (praedefinitum: 1) @@ -2628,6 +2659,11 @@ exempli gratia: alertnotify=echo %%s | mail -s "Bitcoin Notificatio" a Shrink debug.log file on client startup (default: 1 when no -debug) Diminue plicam debug.log ad initium clientis (praedefinitum: 1 nisi -debug) + + + Signing transaction failed + Signandum transactionis abortum est + Specify connection timeout in milliseconds (default: 5000) @@ -2639,7 +2675,22 @@ exempli gratia: alertnotify=echo %%s | mail -s "Bitcoin Notificatio" a Systematis error: - + + Transaction amount too small + Magnitudo transactionis nimis parva + + + + Transaction amounts must be positive + Necesse est magnitudines transactionum positivas esse. + + + + Transaction too large + Transactio nimis magna + + + Use UPnP to map the listening port (default: 0) Utere UPnP designare portam auscultandi (praedefinitum: 0) @@ -2679,7 +2730,7 @@ exempli gratia: alertnotify=echo %%s | mail -s "Bitcoin Notificatio" a wallet.dat corrupta, salvare abortum est - + Password for JSON-RPC connections Tessera pro conexionibus JSON-RPC @@ -2694,17 +2745,17 @@ exempli gratia: alertnotify=echo %%s | mail -s "Bitcoin Notificatio" a Mitte mandata nodo operanti in <ip> (praedefinitum: 127.0.0.1) - + Execute command when the best block changes (%s in cmd is replaced by block hash) Pelle mandatum quando optissimum frustum mutat (%s in mandato substituitur ab hash frusti) - + Upgrade wallet to latest format Progredere cassidile ad formam recentissimam - + Set key pool size to <n> (default: 100) Constitue magnitudinem stagni clavium ad <n> (praedefinitum: 100) @@ -2714,12 +2765,12 @@ exempli gratia: alertnotify=echo %%s | mail -s "Bitcoin Notificatio" a Iterum perlege catenam frustorum propter absentes cassidilis transactiones - + Use OpenSSL (https) for JSON-RPC connections Utere OpenSSL (https) pro conexionibus JSON-RPC - + Server certificate file (default: server.cert) Plica certificationis daemonis moderantis (praedefinitum: server.cert) @@ -2729,37 +2780,37 @@ exempli gratia: alertnotify=echo %%s | mail -s "Bitcoin Notificatio" a Clavis privata daemonis moderans (praedefinitum: server.pem) - + Acceptable ciphers (default: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH) Acceptabiles cifrae (praedefinitum: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH) - + This help message Hic nuntius auxilii - + Unable to bind to %s on this computer (bind returned error %d, %s) Non posse conglutinare ad %s in hoc computatro (conglutinare redidit errorem %d, %s) - + Connect through socks proxy Conecte per socks vicarium - + Allow DNS lookups for -addnode, -seednode and -connect Permitte quaerenda DNS pro -addnode, -seednode, et -connect - + Loading addresses... Legens inscriptiones... - + Error loading wallet.dat: Wallet corrupted Error legendi wallet.dat: Cassidile corruptum @@ -2769,22 +2820,22 @@ exempli gratia: alertnotify=echo %%s | mail -s "Bitcoin Notificatio" a Error legendi wallet.dat: Cassidili necesse est recentior versio Bitcoin - + Wallet needed to be rewritten: restart Bitcoin to complete Cassidili necesse erat rescribi: Repelle Bitcoin ut compleas - + Error loading wallet.dat Error legendi wallet.dat - + Invalid -proxy address: '%s' Inscriptio -proxy non valida: '%s' - + Unknown network specified in -onlynet: '%s' Ignotum rete specificatum in -onlynet: '%s' @@ -2794,7 +2845,7 @@ exempli gratia: alertnotify=echo %%s | mail -s "Bitcoin Notificatio" a Ignota -socks vicarii versio postulata: %i - + Cannot resolve -bind address: '%s' Non posse resolvere -bind inscriptonem: '%s' @@ -2814,17 +2865,17 @@ exempli gratia: alertnotify=echo %%s | mail -s "Bitcoin Notificatio" a Quantitas non valida - + Insufficient funds Inopia nummorum - + Loading block index... Legens indicem frustorum... - + Add a node to connect to and attempt to keep the connection open Adice nodum cui conectere et conare sustinere conexionem apertam @@ -2834,52 +2885,47 @@ exempli gratia: alertnotify=echo %%s | mail -s "Bitcoin Notificatio" a Non posse conglutinare ad %s in hoc cumputatro. Bitcoin probabiliter iam operatur. - + Fee per KB to add to transactions you send Merces per KB addere ad transactiones tu mittas - + Loading wallet... Legens cassidile... - + Cannot downgrade wallet Non posse cassidile regredi - - - Cannot initialize keypool - Non posse initiare stagnum clavium - Cannot write default address Non posse scribere praedefinitam inscriptionem - + Rescanning... Iterum perlegens... - + Done loading Completo lengendi - + To use the %s option Ut utaris optione %s - + Error Error - + You must set rpcpassword=<password> in the configuration file: %s If the file does not exist, create it with owner-readable-only file permissions. diff --git a/src/qt/locale/bitcoin_lt.ts b/src/qt/locale/bitcoin_lt.ts index 65f9870009..1ba4b63e16 100644 --- a/src/qt/locale/bitcoin_lt.ts +++ b/src/qt/locale/bitcoin_lt.ts @@ -27,13 +27,13 @@ Platinama pagal MIT/X11 licenciją, kurią rasite faile COPYING arba http://www. Šiame produkte yra OpenSSL projekto kuriamas OpenSSL Toolkit (http://www.openssl.org/), Eric Young parašyta kriptografinė programinė įranga bei Thomas Bernard sukurta UPnP programinė įranga. - + Copyright - 2009-%1 The Bitcoin developers + The Bitcoin developers @@ -65,7 +65,7 @@ Platinama pagal MIT/X11 licenciją, kurią rasite faile COPYING arba http://www. &Naujas adresas - + These are your Bitcoin addresses for receiving payments. You may want to give a different one to each sender so you can keep track of who is paying you. Tai yra jūsų Bitcoin adresai mokėjimų gavimui. Galite duoti skirtingus adresus atskiriems siuntėjams, kad galėtumėte sekti, kas jums moka. @@ -95,7 +95,17 @@ Platinama pagal MIT/X11 licenciją, kurią rasite faile COPYING arba http://www. - + + Export the data in the current tab to a file + + + + + &Export + + + + Verify a message to ensure it was signed with a specified Bitcoin address Patikrinkite žinutę, jog įsitikintumėte, kad ją pasirašė nurodytas Bitcoin adresas @@ -317,12 +327,12 @@ Platinama pagal MIT/X11 licenciją, kurią rasite faile COPYING arba http://www. Pasirašyti ži&nutę... - + Synchronizing with network... Sinchronizavimas su tinklu ... - + &Overview &Apžvalga @@ -397,7 +407,7 @@ Platinama pagal MIT/X11 licenciją, kurią rasite faile COPYING arba http://www. &Keisti slaptafrazę... - + Importing blocks from disk... @@ -407,12 +417,7 @@ Platinama pagal MIT/X11 licenciją, kurią rasite faile COPYING arba http://www. - - &Export... - &Eksportuoti... - - - + Send coins to a Bitcoin address Siųsti monetas Bitcoin adresui @@ -422,12 +427,7 @@ Platinama pagal MIT/X11 licenciją, kurią rasite faile COPYING arba http://www. Keisti bitcoin konfigūracijos galimybes - - Export the data in the current tab to a file - - - - + Backup wallet to another location Daryti piniginės atsarginę kopiją @@ -437,7 +437,7 @@ Platinama pagal MIT/X11 licenciją, kurią rasite faile COPYING arba http://www. Pakeisti slaptafrazę naudojamą piniginės užšifravimui - + &Debug window &Derinimo langas @@ -447,23 +447,23 @@ Platinama pagal MIT/X11 licenciją, kurią rasite faile COPYING arba http://www. Atverti derinimo ir diagnostikos konsolę - + &Verify message... &Tikrinti žinutę... - - + + Bitcoin Bitcoin - + Wallet Piniginė - + &Send @@ -508,12 +508,12 @@ Platinama pagal MIT/X11 licenciją, kurią rasite faile COPYING arba http://www. - + &File &Failas - + &Settings &Nustatymai @@ -528,12 +528,7 @@ Platinama pagal MIT/X11 licenciją, kurią rasite faile COPYING arba http://www. Kortelių įrankinė - - Actions toolbar - Veiksmų įrankinė - - - + [testnet] [testavimotinklas] @@ -544,12 +539,17 @@ Platinama pagal MIT/X11 licenciją, kurią rasite faile COPYING arba http://www. Bitcoin klientas - + %n active connection(s) to Bitcoin network %n Bitcoin tinklo aktyvus ryšys%n Bitcoin tinklo aktyvūs ryšiai%n Bitcoin tinklo aktyvūs ryšiai - + + No block source available... + + + + Processed %1 of %2 (estimated) blocks of transaction history. @@ -574,7 +574,7 @@ Platinama pagal MIT/X11 licenciją, kurią rasite faile COPYING arba http://www. - + %1 behind @@ -589,7 +589,7 @@ Platinama pagal MIT/X11 licenciją, kurią rasite faile COPYING arba http://www. - + Error @@ -604,22 +604,22 @@ Platinama pagal MIT/X11 licenciją, kurią rasite faile COPYING arba http://www. - + This transaction is over the size limit. You can still send it for a fee of %1, which goes to the nodes that process your transaction and helps to support the network. Do you want to pay the fee? - + Up to date Atnaujinta - + Catching up... Vejamasi... - + Confirm transaction fee Patvirtinti sandorio mokestį @@ -668,7 +668,7 @@ Adresas: %4 Piniginė <b>užšifruota</b> ir šiuo metu <b>užrakinta</b> - + A fatal error occurred. Bitcoin can no longer continue safely and will quit. @@ -676,7 +676,7 @@ Adresas: %4 ClientModel - + Network Alert Tinklo įspėjimas @@ -807,8 +807,8 @@ Adresas: %4 - Optional transaction fee per kB that helps make sure your transactions are processed quickly. Most transactions are 1 kB. Fee 0.01 recommended. - Neprivalomas sandorio mokestis už KB, kuris padeda greičiau sutvarkyti sandorius. Daugelis sandorių yra tik 1KB dydžio. Rekomenduojamas 0,01 mokestis. + Optional transaction fee per kB that helps make sure your transactions are processed quickly. Most transactions are 1 kB. + @@ -1057,7 +1057,7 @@ Adresas: %4 Iš viso sandorių, įskaitant tuos kurie dar turi būti patvirtinti, ir jie dar nėra įskaičiuotii į einamosios sąskaitos balansą - + out of sync @@ -1643,6 +1643,19 @@ Adresas: %4 Žinutė patikrinta. + + SplashScreen + + + The Bitcoin developers + + + + + [testnet] + [testavimotinklas] + + TransactionDesc @@ -2117,10 +2130,28 @@ Adresas: %4 skirta + + WalletModel + + + Send Coins + Siųsti monetas + + WalletView - + + &Export + + + + + Export the data in the current tab to a file + + + + Backup Wallet @@ -2153,37 +2184,37 @@ Adresas: %4 bitcoin-core - + Bitcoin version Bitcoin versija - + Usage: Naudojimas: - + Send command to -server or bitcoind Siųsti komandą serveriui arba bitcoind - + List commands Komandų sąrašas - + Get help for a command Suteikti pagalba komandai - + Options: Parinktys: - + Specify configuration file (default: bitcoin.conf) Nurodyti konfigūracijos failą (pagal nutylėjimąt: bitcoin.conf) @@ -2193,27 +2224,17 @@ Adresas: %4 Nurodyti pid failą (pagal nutylėjimą: bitcoind.pid) - - Generate coins - Generuoti monetas - - - - Don't generate coins - Negeneruoti monetų - - - + Specify data directory Nustatyti duomenų aplanką - + Set database cache size in megabytes (default: 25) - + Listen for connections on <port> (default: 8333 or testnet: 18333) Sujungimo klausymas prijungčiai <port> (pagal nutylėjimą: 8333 arba testnet: 18333) @@ -2228,7 +2249,7 @@ Adresas: %4 - + Specify your own public address @@ -2238,22 +2259,22 @@ Adresas: %4 Atjungimo dėl netinkamo kolegų elgesio riba (pagal nutylėjimą: 100) - + Number of seconds to keep misbehaving peers from reconnecting (default: 86400) Sekundžių kiekis eikiamas palaikyti ryšį dėl lygiarangių nestabilumo (pagal nutylėjimą: 86.400) - + An error occurred while setting up the RPC port %u for listening on IPv4: %s - + Listen for JSON-RPC connections on <port> (default: 8332 or testnet: 18332) Klausymas JSON-RPC sujungimui prijungčiai <port> (pagal nutylėjimą: 8332 or testnet: 18332) - + Accept command line and JSON-RPC commands Priimti komandinę eilutę ir JSON-RPC komandas @@ -2263,17 +2284,17 @@ Adresas: %4 Dirbti fone kaip šešėlyje ir priimti komandas - + Use the test network Naudoti testavimo tinklą - + Accept connections from outside (default: 1 if no -proxy or -connect) - + %s, you must set a rpcpassword in the configuration file: %s It is recommended you use the following random password: @@ -2302,11 +2323,6 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. Cannot obtain a lock on data directory %s. Bitcoin is probably already running. - - - Error initializing database environment %s! To recover, BACKUP THAT DIRECTORY, then remove everything from it except for wallet.dat. - - Error: The transaction was rejected! This might happen if some of the coins in your wallet were already spent, such as if you used a copy of wallet.dat and coins were spent in the copy but not marked as spent here. @@ -2333,12 +2349,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. - - Set the number of script verification threads (1-16, 0=auto, default: 0) - - - - + This is a pre-release test build - use at your own risk - do not use for mining or merchant applications @@ -2378,7 +2389,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. - + Connect only to the specified node(s) Prisijungti tik prie nurodyto mazgo @@ -2398,7 +2409,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. - + Error initializing block database @@ -2422,11 +2433,6 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. Error: Disk space is low! - - - Error: Transaction creation failed! - - Error: Wallet locked, unable to create transaction! @@ -2498,7 +2504,12 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. - + + Generate coins (default: 0) + + + + How many blocks to check at startup (default: 288, 0 = all) @@ -2508,7 +2519,12 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. - + + Not enough file descriptors available. + + + + Rebuild block chain index from current blk000??.dat files @@ -2518,7 +2534,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. - + Verifying blocks... @@ -2528,12 +2544,17 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. - + Imports blocks from external blk000??.dat file - + + Set the number of script verification threads (up to 16, 0 = auto, <0 = leave that many cores free, default: 0) + + + + Information @@ -2542,6 +2563,16 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. Invalid -tor address: '%s' Neteisingas tor adresas: '%s' + + + Invalid amount for -minrelaytxfee=<amount>: '%s' + + + + + Invalid amount for -mintxfee=<amount>: '%s' + + Maintain a full transaction index (default: 0) @@ -2558,7 +2589,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. Maksimalus buferis siuntimo sujungimui <n>*1000 bitų (pagal nutylėjimą: 1000) - + Only accept block chain matching built-in checkpoints (default: 1) @@ -2617,6 +2648,11 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. Shrink debug.log file on client startup (default: 1 when no -debug) + + + Signing transaction failed + + Specify connection timeout in milliseconds (default: 5000) @@ -2628,7 +2664,22 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. - + + Transaction amount too small + + + + + Transaction amounts must be positive + + + + + Transaction too large + + + + Use UPnP to map the listening port (default: 0) Bandymas naudoti UPnP struktūra klausymosi prievadui (default: 0) @@ -2668,7 +2719,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. - + Password for JSON-RPC connections Slaptažodis JSON-RPC sujungimams @@ -2683,17 +2734,17 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. Siųsti komandą mazgui dirbančiam <ip> (pagal nutylėjimą: 127.0.0.1) - + Execute command when the best block changes (%s in cmd is replaced by block hash) - + Upgrade wallet to latest format Atnaujinti piniginę į naujausią formatą - + Set key pool size to <n> (default: 100) Nustatyti rakto apimties dydį <n> (pagal nutylėjimą: 100) @@ -2703,12 +2754,12 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. Ieškoti prarastų piniginės sandorių blokų grandinėje - + Use OpenSSL (https) for JSON-RPC connections Naudoti OpenSSL (https) jungimuisi JSON-RPC - + Server certificate file (default: server.cert) Serverio sertifikato failas (pagal nutylėjimą: server.cert) @@ -2718,37 +2769,37 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. Serverio privatus raktas (pagal nutylėjimą: server.pem) - + Acceptable ciphers (default: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH) Priimtini šifrai (pagal nutylėjimą: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH) - + This help message Pagelbos žinutė - + Unable to bind to %s on this computer (bind returned error %d, %s) Nepavyko susieti šiame kompiuteryje prievado %s (bind returned error %d, %s) - + Connect through socks proxy Jungtis per socks tarpinį serverį - + Allow DNS lookups for -addnode, -seednode and -connect Leisti DNS paiešką sujungimui ir mazgo pridėjimui - + Loading addresses... Užkraunami adresai... - + Error loading wallet.dat: Wallet corrupted wallet.dat pakrovimo klaida, wallet.dat sugadintas @@ -2758,22 +2809,22 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. wallet.dat pakrovimo klaida, wallet.dat reikalauja naujasnės Bitcoin versijos - + Wallet needed to be rewritten: restart Bitcoin to complete Piniginė turi būti prrašyta: įvykdymui perkraukite Bitcoin - + Error loading wallet.dat wallet.dat pakrovimo klaida - + Invalid -proxy address: '%s' Neteisingas proxy adresas: '%s' - + Unknown network specified in -onlynet: '%s' @@ -2783,7 +2834,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. - + Cannot resolve -bind address: '%s' @@ -2803,17 +2854,17 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. Neteisinga suma - + Insufficient funds Nepakanka lėšų - + Loading block index... Įkeliamas blokų indeksas... - + Add a node to connect to and attempt to keep the connection open Pridėti mazgą prie sujungti su and attempt to keep the connection open @@ -2823,52 +2874,47 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. Nepavyko susieti šiame kompiuteryje prievado %s. Bitcoin tikriausiai jau veikia. - + Fee per KB to add to transactions you send Įtraukti mokestį už kB siunčiamiems sandoriams - + Loading wallet... Užkraunama piniginė... - + Cannot downgrade wallet - - - Cannot initialize keypool - - Cannot write default address - + Rescanning... Peržiūra - + Done loading Įkėlimas baigtas - + To use the %s option - + Error Klaida - + You must set rpcpassword=<password> in the configuration file: %s If the file does not exist, create it with owner-readable-only file permissions. diff --git a/src/qt/locale/bitcoin_lv_LV.ts b/src/qt/locale/bitcoin_lv_LV.ts index bd01582778..b839461319 100644 --- a/src/qt/locale/bitcoin_lv_LV.ts +++ b/src/qt/locale/bitcoin_lv_LV.ts @@ -23,13 +23,13 @@ This product includes software developed by the OpenSSL Project for use in the O - + Copyright - 2009-%1 The Bitcoin developers + The Bitcoin developers @@ -61,7 +61,7 @@ This product includes software developed by the OpenSSL Project for use in the O &Jauna adrese - + These are your Bitcoin addresses for receiving payments. You may want to give a different one to each sender so you can keep track of who is paying you. @@ -91,7 +91,17 @@ This product includes software developed by the OpenSSL Project for use in the O - + + Export the data in the current tab to a file + + + + + &Export + + + + Verify a message to ensure it was signed with a specified Bitcoin address @@ -313,12 +323,12 @@ This product includes software developed by the OpenSSL Project for use in the O Parakstīt &ziņojumu... - + Synchronizing with network... Sinhronizācija ar tīklu... - + &Overview &Pārskats @@ -393,7 +403,7 @@ This product includes software developed by the OpenSSL Project for use in the O &Mainīt paroli - + Importing blocks from disk... @@ -403,12 +413,7 @@ This product includes software developed by the OpenSSL Project for use in the O - - &Export... - &Eksportēt... - - - + Send coins to a Bitcoin address Nosūtīt bitkoinus uz Bitcoin adresi @@ -418,12 +423,7 @@ This product includes software developed by the OpenSSL Project for use in the O Mainīt Bitcoin konfigurācijas uzstādījumus - - Export the data in the current tab to a file - Datus no tekošā ieliktņa eksportēt uz failu - - - + Backup wallet to another location Izveidot maciņa rezerves kopiju citur @@ -433,7 +433,7 @@ This product includes software developed by the OpenSSL Project for use in the O Mainīt maciņa šifrēšanas paroli - + &Debug window &Debug logs @@ -443,23 +443,23 @@ This product includes software developed by the OpenSSL Project for use in the O Atvērt atkļūdošanas un diagnostikas konsoli - + &Verify message... &Pārbaudīt ziņojumu... - - + + Bitcoin - + Wallet Maciņš - + &Send @@ -504,12 +504,12 @@ This product includes software developed by the OpenSSL Project for use in the O - + &File &Fails - + &Settings &Uzstādījumi @@ -524,12 +524,7 @@ This product includes software developed by the OpenSSL Project for use in the O Ciļņu rīkjosla - - Actions toolbar - Darbību rīkjosla - - - + [testnet] [testnet] @@ -540,12 +535,17 @@ This product includes software developed by the OpenSSL Project for use in the O Bitcoin klients - + %n active connection(s) to Bitcoin network %n aktīvu savienojumu ar Bitcoin tīklu%n aktīvs savienojums ar Bitcoin tīklu%n aktīvu savienojumu as Bitcoin tīklu - + + No block source available... + + + + Processed %1 of %2 (estimated) blocks of transaction history. @@ -570,7 +570,7 @@ This product includes software developed by the OpenSSL Project for use in the O - + %1 behind @@ -585,7 +585,7 @@ This product includes software developed by the OpenSSL Project for use in the O - + Error Kļūda @@ -600,22 +600,22 @@ This product includes software developed by the OpenSSL Project for use in the O - + This transaction is over the size limit. You can still send it for a fee of %1, which goes to the nodes that process your transaction and helps to support the network. Do you want to pay the fee? - + Up to date Sinhronizēts - + Catching up... Sinhronizējos... - + Confirm transaction fee Apstiprināt transakcijas maksu @@ -665,7 +665,7 @@ Adrese: %4 Maciņš ir <b>šifrēts</b> un pašlaik <b>slēgts</b> - + A fatal error occurred. Bitcoin can no longer continue safely and will quit. @@ -673,7 +673,7 @@ Adrese: %4 ClientModel - + Network Alert Tīkla brīdinājums @@ -804,8 +804,8 @@ Adrese: %4 - Optional transaction fee per kB that helps make sure your transactions are processed quickly. Most transactions are 1 kB. Fee 0.01 recommended. - Brīvprātīga maksa par transakcijas kB, kas nodrošina ātru transakciju apstrādi. Vairums transakciju aizņem 1 kB. Ieteicamā maksa 0.01. + Optional transaction fee per kB that helps make sure your transactions are processed quickly. Most transactions are 1 kB. + @@ -1054,7 +1054,7 @@ Adrese: %4 Kopējā apstiprināmo transakciju vērtība, vēl nav ieskaitīta kopējā bilancē - + out of sync nav sinhronizēts @@ -1640,6 +1640,19 @@ Adrese: %4 + + SplashScreen + + + The Bitcoin developers + + + + + [testnet] + + + TransactionDesc @@ -2114,10 +2127,28 @@ Adrese: %4 + + WalletModel + + + Send Coins + + + WalletView - + + &Export + + + + + Export the data in the current tab to a file + + + + Backup Wallet Izveidot maciņa rezerves kopiju @@ -2150,37 +2181,37 @@ Adrese: %4 bitcoin-core - + Bitcoin version Bitcoin versija - + Usage: Lietojums: - + Send command to -server or bitcoind Nosūtīt komantu uz -server vai bitcoind - + List commands Komandu saraksts - + Get help for a command Palīdzība par komandu - + Options: Iespējas: - + Specify configuration file (default: bitcoin.conf) Norādiet konfigurācijas failu (pēc noklusēšanas: bitcoin.conf) @@ -2190,27 +2221,17 @@ Adrese: %4 Norādiet pid failu (pēc noklusēšanas: bitcoind.pid) - - Generate coins - Bitkoinu ģenerēšana - - - - Don't generate coins - Neģenerēt bitkoinus - - - + Specify data directory Norādiet datu direktoriju - + Set database cache size in megabytes (default: 25) Uzstādiet datu bāzes bufera izmēru megabaitos (pēc noklusēšanas: 25) - + Listen for connections on <port> (default: 8333 or testnet: 18333) Gaidīt savienojumus portā <port> (pēc noklusēšanas: 8333 vai testnet: 18333) @@ -2225,7 +2246,7 @@ Adrese: %4 Pievienoties mezglam, lai iegūtu citu mezglu adreses, un atvienoties - + Specify your own public address Norādiet savu publisko adresi @@ -2235,22 +2256,22 @@ Adrese: %4 Slieksnis pārkāpējmezglu atvienošanai (pēc noklusēšanas: 100) - + Number of seconds to keep misbehaving peers from reconnecting (default: 86400) Sekundes, cik ilgi atturēt pārkāpējmezglus no atkārtotas pievienošanās (pēc noklusēšanas: 86400) - + An error occurred while setting up the RPC port %u for listening on IPv4: %s - + Listen for JSON-RPC connections on <port> (default: 8332 or testnet: 18332) - + Accept command line and JSON-RPC commands Pieņemt komandrindas un JSON-RPC komandas @@ -2260,17 +2281,17 @@ Adrese: %4 Darbināt fonā kā servisu un pieņemt komandas - + Use the test network Izmantot testa tīklu - + Accept connections from outside (default: 1 if no -proxy or -connect) - + %s, you must set a rpcpassword in the configuration file: %s It is recommended you use the following random password: @@ -2299,11 +2320,6 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. Cannot obtain a lock on data directory %s. Bitcoin is probably already running. - - - Error initializing database environment %s! To recover, BACKUP THAT DIRECTORY, then remove everything from it except for wallet.dat. - - Error: The transaction was rejected! This might happen if some of the coins in your wallet were already spent, such as if you used a copy of wallet.dat and coins were spent in the copy but not marked as spent here. @@ -2330,12 +2346,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. - - Set the number of script verification threads (1-16, 0=auto, default: 0) - - - - + This is a pre-release test build - use at your own risk - do not use for mining or merchant applications @@ -2375,7 +2386,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. - + Connect only to the specified node(s) @@ -2395,7 +2406,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. - + Error initializing block database @@ -2419,11 +2430,6 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. Error: Disk space is low! - - - Error: Transaction creation failed! - - Error: Wallet locked, unable to create transaction! @@ -2495,7 +2501,12 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. - + + Generate coins (default: 0) + + + + How many blocks to check at startup (default: 288, 0 = all) @@ -2505,7 +2516,12 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. - + + Not enough file descriptors available. + + + + Rebuild block chain index from current blk000??.dat files @@ -2515,7 +2531,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. - + Verifying blocks... @@ -2525,12 +2541,17 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. - + Imports blocks from external blk000??.dat file - + + Set the number of script verification threads (up to 16, 0 = auto, <0 = leave that many cores free, default: 0) + + + + Information @@ -2539,6 +2560,16 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. Invalid -tor address: '%s' + + + Invalid amount for -minrelaytxfee=<amount>: '%s' + + + + + Invalid amount for -mintxfee=<amount>: '%s' + + Maintain a full transaction index (default: 0) @@ -2555,7 +2586,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. - + Only accept block chain matching built-in checkpoints (default: 1) @@ -2614,6 +2645,11 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. Shrink debug.log file on client startup (default: 1 when no -debug) + + + Signing transaction failed + + Specify connection timeout in milliseconds (default: 5000) @@ -2625,7 +2661,22 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. - + + Transaction amount too small + + + + + Transaction amounts must be positive + + + + + Transaction too large + + + + Use UPnP to map the listening port (default: 0) @@ -2665,7 +2716,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. - + Password for JSON-RPC connections JSON-RPC savienojumu parole @@ -2680,17 +2731,17 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. Nosūtīt komandas mezglam, kas darbojas adresē <ip> (pēc noklusēšanas: 127.0.0.1) - + Execute command when the best block changes (%s in cmd is replaced by block hash) Izpildīt komandu, kad labāk atbilstošais bloks izmainās (%s cmd aizvieto ar bloka hešu) - + Upgrade wallet to latest format Atjaunot maciņa formātu uz jaunāko - + Set key pool size to <n> (default: 100) Uzstādīt atslēgu bufera izmēru uz <n> (pēc noklusēšanas: 100) @@ -2700,12 +2751,12 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. Atkārtoti skanēt bloku virkni, meklējot trūkstošās maciņa transakcijas - + Use OpenSSL (https) for JSON-RPC connections JSON-RPC savienojumiem izmantot OpenSSL (https) - + Server certificate file (default: server.cert) Servera sertifikāta fails (pēc noklusēšanas: server.cert) @@ -2715,37 +2766,37 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. Servera privātā atslēga (pēc noklusēšanas: server.pem) - + Acceptable ciphers (default: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH) Pieņemamie šifri (pēc noklusēšanas: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH) - + This help message Šis palīdzības paziņojums - + Unable to bind to %s on this computer (bind returned error %d, %s) Nevar pievienoties pie %s šajā datorā (pievienošanās atgrieza kļūdu %d, %s) - + Connect through socks proxy Savienoties caurs socks proxy - + Allow DNS lookups for -addnode, -seednode and -connect Atļaut DNS uzmeklēšanu priekš -addnode, -seednode un -connect - + Loading addresses... Ielādē adreses... - + Error loading wallet.dat: Wallet corrupted Nevar ielādēt wallet.dat: maciņš bojāts @@ -2755,22 +2806,22 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. Nevar ielādēt wallet.dat: maciņa atvēršanai nepieciešama jaunāka Bitcoin versija - + Wallet needed to be rewritten: restart Bitcoin to complete Bija nepieciešams pārstartēt maciņu: pabeigšanai pārstartējiet Bitcoin - + Error loading wallet.dat Kļūda ielādējot wallet.dat - + Invalid -proxy address: '%s' Nederīga -proxy adrese: '%s' - + Unknown network specified in -onlynet: '%s' -onlynet komandā norādīts nepazīstams tīkls: '%s' @@ -2780,7 +2831,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. Pieprasīta nezināma -socks proxy versija: %i - + Cannot resolve -bind address: '%s' Nevar uzmeklēt -bind adresi: '%s' @@ -2800,17 +2851,17 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. Nederīgs daudzums - + Insufficient funds Nepietiek bitkoinu - + Loading block index... Ielādē bloku indeksu... - + Add a node to connect to and attempt to keep the connection open Pievienot mezglu, kam pievienoties un turēt savienojumu atvērtu @@ -2820,52 +2871,47 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. Nevar pievienoties %s uz šī datora. Bitcoin droši vien jau darbojas. - + Fee per KB to add to transactions you send Maksa par KB, ko pievienot nosūtāmajām transakcijām - + Loading wallet... Ielādē maciņu... - + Cannot downgrade wallet Nevar maciņa formātu padarīt vecāku - - - Cannot initialize keypool - Nevar inicializēt atslēgu buferi - Cannot write default address Nevar ierakstīt adresi pēc noklusēšanas - + Rescanning... Skanēju no jauna... - + Done loading Ielāde pabeigta - + To use the %s option Izmantot opciju %s - + Error Kļūda - + You must set rpcpassword=<password> in the configuration file: %s If the file does not exist, create it with owner-readable-only file permissions. diff --git a/src/qt/locale/bitcoin_nb.ts b/src/qt/locale/bitcoin_nb.ts index aadc42e71f..47fffc835b 100644 --- a/src/qt/locale/bitcoin_nb.ts +++ b/src/qt/locale/bitcoin_nb.ts @@ -28,13 +28,13 @@ Distribuert under MIT/X11 programvarelisensen, se medfølgende fil COPYING eller Dette produktet inneholder programvare utviklet av OpenSSL prosjektet for bruk i OpenSSL Toolkit (http://www.openssl.org/) og kryptografisk programvare skrevet av Eric Young (eay@cryptsoft.com) og UPnP programvare skrevet av Thomas Bernard. - + Copyright - 2009-%1 The Bitcoin developers + The Bitcoin developers @@ -66,7 +66,7 @@ Dette produktet inneholder programvare utviklet av OpenSSL prosjektet for bruk i &Ny Adresse - + These are your Bitcoin addresses for receiving payments. You may want to give a different one to each sender so you can keep track of who is paying you. Dette er dine Bitcoin-adresser for mottak av betalinger. Du kan gi forskjellige adresser til alle som skal betale deg for å holde bedre oversikt. @@ -96,7 +96,17 @@ Dette produktet inneholder programvare utviklet av OpenSSL prosjektet for bruk i Slett den valgte adressen fra listen. - + + Export the data in the current tab to a file + Eksporter data fra nåværende fane til fil + + + + &Export + + + + Verify a message to ensure it was signed with a specified Bitcoin address Verifiser en melding for å være sikker på at den ble signert av en angitt Bitcoin-adresse @@ -318,12 +328,12 @@ Dette produktet inneholder programvare utviklet av OpenSSL prosjektet for bruk i Signer &melding... - + Synchronizing with network... Synkroniserer med nettverk... - + &Overview &Oversikt @@ -398,7 +408,7 @@ Dette produktet inneholder programvare utviklet av OpenSSL prosjektet for bruk i &Endre Adgangsfrase... - + Importing blocks from disk... Importere blokker... @@ -408,12 +418,7 @@ Dette produktet inneholder programvare utviklet av OpenSSL prosjektet for bruk i Re-indekserer blokker på disk... - - &Export... - &Eksporter... - - - + Send coins to a Bitcoin address Send til en Bitcoin-adresse @@ -423,12 +428,7 @@ Dette produktet inneholder programvare utviklet av OpenSSL prosjektet for bruk i Endre oppsett for Bitcoin - - Export the data in the current tab to a file - Eksporter data fra nåværende fane til fil - - - + Backup wallet to another location Sikkerhetskopiér lommebok til annet sted @@ -438,7 +438,7 @@ Dette produktet inneholder programvare utviklet av OpenSSL prosjektet for bruk i Endre adgangsfrasen brukt for kryptering av lommebok - + &Debug window &Feilsøkingsvindu @@ -448,23 +448,23 @@ Dette produktet inneholder programvare utviklet av OpenSSL prosjektet for bruk i Åpne konsoll for feilsøk og diagnostikk - + &Verify message... &Verifiser melding... - - + + Bitcoin Bitcoin - + Wallet Lommebok - + &Send &Send @@ -509,12 +509,12 @@ Dette produktet inneholder programvare utviklet av OpenSSL prosjektet for bruk i Bekreft meldinger for å være sikker på at de ble signert av en angitt Bitcoin-adresse - + &File &Fil - + &Settings &Innstillinger @@ -529,12 +529,7 @@ Dette produktet inneholder programvare utviklet av OpenSSL prosjektet for bruk i Verktøylinje for faner - - Actions toolbar - Verktøylinje for handlinger - - - + [testnet] [testnett] @@ -545,12 +540,17 @@ Dette produktet inneholder programvare utviklet av OpenSSL prosjektet for bruk i Bitcoinklient - + %n active connection(s) to Bitcoin network %n aktiv forbindelse til Bitcoin-nettverket%n aktive forbindelser til Bitcoin-nettverket - + + No block source available... + + + + Processed %1 of %2 (estimated) blocks of transaction history. @@ -575,7 +575,7 @@ Dette produktet inneholder programvare utviklet av OpenSSL prosjektet for bruk i - + %1 behind @@ -590,7 +590,7 @@ Dette produktet inneholder programvare utviklet av OpenSSL prosjektet for bruk i Transaksjoner etter dette vil ikke være synlige enda. - + Error @@ -605,22 +605,22 @@ Dette produktet inneholder programvare utviklet av OpenSSL prosjektet for bruk i - + This transaction is over the size limit. You can still send it for a fee of %1, which goes to the nodes that process your transaction and helps to support the network. Do you want to pay the fee? Denne transaksjonen overstiger størrelsesbegrensningen. Du kan likevel sende den med et gebyr på %1, som går til nodene som prosesserer transaksjonen din og støtter nettverket. Vil du betale gebyret? - + Up to date Ajour - + Catching up... Kommer ajour... - + Confirm transaction fee Bekreft transaksjonsgebyr @@ -670,7 +670,7 @@ Adresse: %4 Lommeboken er <b>kryptert</b> og for tiden <b>låst</b> - + A fatal error occurred. Bitcoin can no longer continue safely and will quit. En fatal feil har inntruffet. Det er ikke trygt å fortsette og Bitcoin må derfor avslutte. @@ -678,7 +678,7 @@ Adresse: %4 ClientModel - + Network Alert Nettverksvarsel @@ -810,8 +810,8 @@ Adresse: %4 - Optional transaction fee per kB that helps make sure your transactions are processed quickly. Most transactions are 1 kB. Fee 0.01 recommended. - Valgfritt transaksjonsgebyr per kB som sikrer at dine transaksjoner blir raskt prosessert. De fleste transaksjoner er 1 kB. Et gebyr på 0.01 er anbefalt. + Optional transaction fee per kB that helps make sure your transactions are processed quickly. Most transactions are 1 kB. + @@ -1060,7 +1060,7 @@ Adresse: %4 Totalt antall ubekreftede transaksjoner som ikke telles med i saldo enda - + out of sync ute av synk @@ -1646,6 +1646,19 @@ Adresse: %4 Melding verifisert. + + SplashScreen + + + The Bitcoin developers + + + + + [testnet] + [testnett] + + TransactionDesc @@ -2120,10 +2133,28 @@ Adresse: %4 til + + WalletModel + + + Send Coins + Send Bitcoins + + WalletView - + + &Export + + + + + Export the data in the current tab to a file + Eksporter data fra nåværende fane til fil + + + Backup Wallet Sikkerhetskopier lommebok @@ -2156,37 +2187,37 @@ Adresse: %4 bitcoin-core - + Bitcoin version Bitcoin versjon - + Usage: Bruk: - + Send command to -server or bitcoind Send kommando til -server eller bitcoind - + List commands List opp kommandoer - + Get help for a command Vis hjelpetekst for en kommando - + Options: Innstillinger: - + Specify configuration file (default: bitcoin.conf) Angi konfigurasjonsfil (standardverdi: bitcoin.conf) @@ -2196,27 +2227,17 @@ Adresse: %4 Angi pid-fil (standardverdi: bitcoind.pid) - - Generate coins - Generér bitcoins - - - - Don't generate coins - Ikke generér bitcoins - - - + Specify data directory Angi mappe for datafiler - + Set database cache size in megabytes (default: 25) Sett størrelse på mellomlager for database i megabytes (standardverdi: 25) - + Listen for connections on <port> (default: 8333 or testnet: 18333) Lytt etter tilkoblinger på <port> (standardverdi: 8333 eller testnet: 18333) @@ -2231,7 +2252,7 @@ Adresse: %4 Koble til node for å hente adresser til andre noder, koble så fra igjen - + Specify your own public address Angi din egen offentlige adresse @@ -2241,22 +2262,22 @@ Adresse: %4 Grenseverdi for å koble fra noder med dårlig oppførsel (standardverdi: 100) - + Number of seconds to keep misbehaving peers from reconnecting (default: 86400) Antall sekunder noder med dårlig oppførsel hindres fra å koble til på nytt (standardverdi: 86400) - + An error occurred while setting up the RPC port %u for listening on IPv4: %s En feil oppstod ved opprettelse av RPC port %u for lytting: %s - + Listen for JSON-RPC connections on <port> (default: 8332 or testnet: 18332) Lytt etter JSON-RPC tilkoblinger på <port> (standardverdi: 8332 or testnet: 18332) - + Accept command line and JSON-RPC commands Ta imot kommandolinje- og JSON-RPC-kommandoer @@ -2266,17 +2287,17 @@ Adresse: %4 Kjør i bakgrunnen som daemon og ta imot kommandoer - + Use the test network Bruk testnettverket - + Accept connections from outside (default: 1 if no -proxy or -connect) Ta imot tilkoblinger fra utsiden (standardverdi: 1 hvis uten -proxy eller -connect) - + %s, you must set a rpcpassword in the configuration file: %s It is recommended you use the following random password: @@ -2314,11 +2335,6 @@ For eksempel: varselmelding=echo %%s | mail -s "Bitcoin varsel" admin@ Cannot obtain a lock on data directory %s. Bitcoin is probably already running. - - - Error initializing database environment %s! To recover, BACKUP THAT DIRECTORY, then remove everything from it except for wallet.dat. - - Error: The transaction was rejected! This might happen if some of the coins in your wallet were already spent, such as if you used a copy of wallet.dat and coins were spent in the copy but not marked as spent here. @@ -2345,12 +2361,7 @@ For eksempel: varselmelding=echo %%s | mail -s "Bitcoin varsel" admin@ Sett maks størrelse for transaksjoner med høy prioritet / lavt gebyr, i bytes (standardverdi: 27000) - - Set the number of script verification threads (1-16, 0=auto, default: 0) - - - - + This is a pre-release test build - use at your own risk - do not use for mining or merchant applications @@ -2390,7 +2401,7 @@ For eksempel: varselmelding=echo %%s | mail -s "Bitcoin varsel" admin@ Valg for opprettelse av blokker: - + Connect only to the specified node(s) Koble kun til angitt(e) node(r) @@ -2410,7 +2421,7 @@ For eksempel: varselmelding=echo %%s | mail -s "Bitcoin varsel" admin@ Ønsker du å gjenopprette blokkdatabasen nå? - + Error initializing block database @@ -2434,11 +2445,6 @@ For eksempel: varselmelding=echo %%s | mail -s "Bitcoin varsel" admin@ Error: Disk space is low! - - - Error: Transaction creation failed! - Feil: Opprettelse av transaksjon feilet - Error: Wallet locked, unable to create transaction! @@ -2510,7 +2516,12 @@ For eksempel: varselmelding=echo %%s | mail -s "Bitcoin varsel" admin@ Finn andre noder gjennom DNS-oppslag (standardverdi: 1 med mindre -connect er oppgit) - + + Generate coins (default: 0) + + + + How many blocks to check at startup (default: 288, 0 = all) @@ -2520,7 +2531,12 @@ For eksempel: varselmelding=echo %%s | mail -s "Bitcoin varsel" admin@ - + + Not enough file descriptors available. + + + + Rebuild block chain index from current blk000??.dat files Gjenopprett blokkjedeindex fra blk000??.dat filer @@ -2530,7 +2546,7 @@ For eksempel: varselmelding=echo %%s | mail -s "Bitcoin varsel" admin@ - + Verifying blocks... Verifiserer blokker... @@ -2540,12 +2556,17 @@ For eksempel: varselmelding=echo %%s | mail -s "Bitcoin varsel" admin@ Verifiserer lommebok... - + Imports blocks from external blk000??.dat file - + + Set the number of script verification threads (up to 16, 0 = auto, <0 = leave that many cores free, default: 0) + + + + Information @@ -2554,6 +2575,16 @@ For eksempel: varselmelding=echo %%s | mail -s "Bitcoin varsel" admin@ Invalid -tor address: '%s' Ugyldig -tor adresse: '%s' + + + Invalid amount for -minrelaytxfee=<amount>: '%s' + + + + + Invalid amount for -mintxfee=<amount>: '%s' + + Maintain a full transaction index (default: 0) @@ -2570,7 +2601,7 @@ For eksempel: varselmelding=echo %%s | mail -s "Bitcoin varsel" admin@ Maks sendebuffer per forbindelse, <n>*1000 bytes (standardverdi: 1000) - + Only accept block chain matching built-in checkpoints (default: 1) @@ -2629,6 +2660,11 @@ For eksempel: varselmelding=echo %%s | mail -s "Bitcoin varsel" admin@ Shrink debug.log file on client startup (default: 1 when no -debug) Krymp debug.log filen når klienten starter (standardverdi: 1 hvis uten -debug) + + + Signing transaction failed + + Specify connection timeout in milliseconds (default: 5000) @@ -2640,7 +2676,22 @@ For eksempel: varselmelding=echo %%s | mail -s "Bitcoin varsel" admin@ - + + Transaction amount too small + + + + + Transaction amounts must be positive + + + + + Transaction too large + + + + Use UPnP to map the listening port (default: 0) Bruk UPnP for lytteport (standardverdi: 0) @@ -2680,7 +2731,7 @@ For eksempel: varselmelding=echo %%s | mail -s "Bitcoin varsel" admin@ - + Password for JSON-RPC connections Passord for JSON-RPC forbindelser @@ -2695,17 +2746,17 @@ For eksempel: varselmelding=echo %%s | mail -s "Bitcoin varsel" admin@ Send kommandoer til node på <ip> (standardverdi: 127.0.0.1) - + Execute command when the best block changes (%s in cmd is replaced by block hash) Eksekvér kommando når beste blokk endrer seg (%s i kommandoen erstattes med blokkens hash) - + Upgrade wallet to latest format Oppgradér lommebok til nyeste format - + Set key pool size to <n> (default: 100) Angi størrelse på nøkkel-lager til <n> (standardverdi: 100) @@ -2715,12 +2766,12 @@ For eksempel: varselmelding=echo %%s | mail -s "Bitcoin varsel" admin@ Se gjennom blokk-kjeden etter manglende lommeboktransaksjoner - + Use OpenSSL (https) for JSON-RPC connections Bruk OpenSSL (https) for JSON-RPC forbindelser - + Server certificate file (default: server.cert) Servers sertifikat (standardverdi: server.cert) @@ -2730,37 +2781,37 @@ For eksempel: varselmelding=echo %%s | mail -s "Bitcoin varsel" admin@ Servers private nøkkel (standardverdi: server.pem) - + Acceptable ciphers (default: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH) Akseptable krypteringsmetoder (standardverdi: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH) - + This help message Denne hjelpemeldingen - + Unable to bind to %s on this computer (bind returned error %d, %s) Kan ikke binde til %s på denne datamaskinen (bind returnerte feil %d, %s) - + Connect through socks proxy Koble til gjennom socks proxy - + Allow DNS lookups for -addnode, -seednode and -connect Tillat DNS oppslag for -addnode, -seednode og -connect - + Loading addresses... Laster adresser... - + Error loading wallet.dat: Wallet corrupted Feil ved lasting av wallet.dat: Lommeboken er skadet @@ -2770,22 +2821,22 @@ For eksempel: varselmelding=echo %%s | mail -s "Bitcoin varsel" admin@ Feil ved lasting av wallet.dat: Lommeboken krever en nyere versjon av Bitcoin - + Wallet needed to be rewritten: restart Bitcoin to complete Lommeboken måtte skrives om: start Bitcoin på nytt for å fullføre - + Error loading wallet.dat Feil ved lasting av wallet.dat - + Invalid -proxy address: '%s' Ugyldig -proxy adresse: '%s' - + Unknown network specified in -onlynet: '%s' Ukjent nettverk angitt i -onlynet '%s' @@ -2795,7 +2846,7 @@ For eksempel: varselmelding=echo %%s | mail -s "Bitcoin varsel" admin@ Ukjent -socks proxy versjon angitt: %i - + Cannot resolve -bind address: '%s' Kunne ikke slå opp -bind adresse: '%s' @@ -2815,17 +2866,17 @@ For eksempel: varselmelding=echo %%s | mail -s "Bitcoin varsel" admin@ Ugyldig beløp - + Insufficient funds Utilstrekkelige midler - + Loading block index... Laster blokkindeks... - + Add a node to connect to and attempt to keep the connection open Legg til node for tilkobling og hold forbindelsen åpen @@ -2835,52 +2886,47 @@ For eksempel: varselmelding=echo %%s | mail -s "Bitcoin varsel" admin@ Kan ikke binde til %s på denne datamaskinen. Sannsynligvis kjører Bitcoin allerede. - + Fee per KB to add to transactions you send Gebyr per KB for transaksjoner du sender - + Loading wallet... Laster lommebok... - + Cannot downgrade wallet Kan ikke nedgradere lommebok - - - Cannot initialize keypool - Kan ikke initialisere nøkkellager - Cannot write default address Kan ikke skrive standardadresse - + Rescanning... Leser gjennom... - + Done loading Ferdig med lasting - + To use the %s option For å bruke %s opsjonen - + Error Feil - + You must set rpcpassword=<password> in the configuration file: %s If the file does not exist, create it with owner-readable-only file permissions. diff --git a/src/qt/locale/bitcoin_nl.ts b/src/qt/locale/bitcoin_nl.ts index 52c05c7dcc..4048cc0132 100644 --- a/src/qt/locale/bitcoin_nl.ts +++ b/src/qt/locale/bitcoin_nl.ts @@ -28,14 +28,14 @@ Gedistribueerd onder de MIT/X11 software licentie, zie het bijgevoegde bestand C Dit product bevat software ontwikkeld door het OpenSSL Project voor gebruik in de OpenSSL Toolkit (http://www.openssl.org/) en cryptografische software gemaakt door Eric Young (eay@cryptsoft.com) en UPnP software geschreven door Thomas Bernard. - + Copyright Auteursrecht - 2009-%1 The Bitcoin developers - 2009-%1 De Bitcoinontwikkelaars + The Bitcoin developers + De Bitcoin-ontwikkelaars @@ -66,7 +66,7 @@ Dit product bevat software ontwikkeld door het OpenSSL Project voor gebruik in d &Nieuw Adres - + These are your Bitcoin addresses for receiving payments. You may want to give a different one to each sender so you can keep track of who is paying you. Dit zijn uw Bitcoinadressen om betalingen mee te ontvangen. U kunt er voor kiezen om een uniek adres aan te maken voor elke afzender. Op deze manier kunt u bijhouden wie al aan u betaald heeft. @@ -96,7 +96,17 @@ Dit product bevat software ontwikkeld door het OpenSSL Project voor gebruik in d Verwijder het geselecteerde adres van de lijst - + + Export the data in the current tab to a file + Exporteer de data in de huidige tab naar een bestand + + + + &Export + &Exporteer + + + Verify a message to ensure it was signed with a specified Bitcoin address Controleer een bericht om te verifiëren dat het gespecificeerde Bitcoinadres het bericht heeft ondertekend. @@ -318,12 +328,12 @@ Dit product bevat software ontwikkeld door het OpenSSL Project voor gebruik in d &Onderteken bericht... - + Synchronizing with network... Synchroniseren met netwerk... - + &Overview &Overzicht @@ -398,7 +408,7 @@ Dit product bevat software ontwikkeld door het OpenSSL Project voor gebruik in d &Wijzig Wachtwoord - + Importing blocks from disk... Blokken aan het importeren vanaf harde schijf... @@ -408,12 +418,7 @@ Dit product bevat software ontwikkeld door het OpenSSL Project voor gebruik in d Bezig met herindexeren van blokken op harde schijf... - - &Export... - &Exporteer... - - - + Send coins to a Bitcoin address Verstuur munten naar een Bitcoinadres @@ -423,12 +428,7 @@ Dit product bevat software ontwikkeld door het OpenSSL Project voor gebruik in d Wijzig instellingen van Bitcoin - - Export the data in the current tab to a file - Exporteer de data in de huidige tab naar een bestand - - - + Backup wallet to another location &Backup portemonnee naar een andere locatie @@ -438,7 +438,7 @@ Dit product bevat software ontwikkeld door het OpenSSL Project voor gebruik in d Wijzig het wachtwoord voor uw portemonneversleuteling - + &Debug window &Debugscherm @@ -448,23 +448,23 @@ Dit product bevat software ontwikkeld door het OpenSSL Project voor gebruik in d Open debugging en diagnostische console - + &Verify message... &Verifiëer bericht... - - + + Bitcoin Bitcoin - + Wallet Portemonnee - + &Send &Versturen @@ -509,12 +509,12 @@ Dit product bevat software ontwikkeld door het OpenSSL Project voor gebruik in d Verifiëer handtekeningen om zeker te zijn dat de berichten zijn ondertekend met de gespecificeerde Bitcoinadressen - + &File &Bestand - + &Settings &Instellingen @@ -529,12 +529,7 @@ Dit product bevat software ontwikkeld door het OpenSSL Project voor gebruik in d Tab-werkbalk - - Actions toolbar - Actie-werkbalk - - - + [testnet] [testnetwerk] @@ -545,12 +540,17 @@ Dit product bevat software ontwikkeld door het OpenSSL Project voor gebruik in d Bitcoin client - + %n active connection(s) to Bitcoin network %n actieve connectie naar Bitcoinnetwerk%n actieve connecties naar Bitcoinnetwerk - + + No block source available... + Geen bron van blokken beschikbaar... + + + Processed %1 of %2 (estimated) blocks of transaction history. %1 van %2 (geschat) blokken van de transactiehistorie verwerkt. @@ -575,7 +575,7 @@ Dit product bevat software ontwikkeld door het OpenSSL Project voor gebruik in d %n week%n weken - + %1 behind %1 achter @@ -590,7 +590,7 @@ Dit product bevat software ontwikkeld door het OpenSSL Project voor gebruik in d Transacties na dit moment zullen nu nog niet zichtbaar zijn. - + Error Fout @@ -605,22 +605,22 @@ Dit product bevat software ontwikkeld door het OpenSSL Project voor gebruik in d Informatie - + This transaction is over the size limit. You can still send it for a fee of %1, which goes to the nodes that process your transaction and helps to support the network. Do you want to pay the fee? Deze transactie overschrijdt de groottelimiet. Om de transactie alsnog te versturen kunt u transactiekosten betalen van %1. Deze transactiekosten gaan naar de nodes die uw transactie verwerken en het helpt op deze manier bij het ondersteunen van het Bitcoinnetwerk. Wilt u de transactiekosten betalen? - + Up to date Bijgewerkt - + Catching up... Aan het bijwerken... - + Confirm transaction fee Bevestig transactiekosten @@ -670,7 +670,7 @@ Adres: %4 Portemonnee is <b>versleuteld</b> en momenteel <b>gesloten</b> - + A fatal error occurred. Bitcoin can no longer continue safely and will quit. Er is een fatale fout opgetreden. Bitcoin kan niet meer veilig doorgaan en zal nu afgesloten worden. @@ -678,7 +678,7 @@ Adres: %4 ClientModel - + Network Alert Netwerkwaarschuwing @@ -809,8 +809,8 @@ Adres: %4 - Optional transaction fee per kB that helps make sure your transactions are processed quickly. Most transactions are 1 kB. Fee 0.01 recommended. - Optionele transactiekosten per kB die helpen om uw transacties snel te verwerken. De meeste transacties zijn 1 kB. Transactiekosten van 0,01 wordt aangeraden + Optional transaction fee per kB that helps make sure your transactions are processed quickly. Most transactions are 1 kB. + Optionele transactiekosten per kB. Transactiekosten helpen ervoor te zorgen dat uw transacties snel verwerkt worden. De meeste transacties zijn 1kB. @@ -1059,7 +1059,7 @@ Adres: %4 Totaal van de transacties die nog moeten worden bevestigd en nog niet zijn meegeteld in uw huidige saldo - + out of sync niet gesynchroniseerd @@ -1645,6 +1645,19 @@ Adres: %4 Bericht correct geverifiëerd. + + SplashScreen + + + The Bitcoin developers + De Bitcoin-ontwikkelaars + + + + [testnet] + [testnetwerk] + + TransactionDesc @@ -2119,10 +2132,28 @@ Adres: %4 naar + + WalletModel + + + Send Coins + Verstuur munten + + WalletView - + + &Export + &Exporteer + + + + Export the data in the current tab to a file + Exporteer de data in de huidige tab naar een bestand + + + Backup Wallet Portomonnee backuppen @@ -2155,37 +2186,37 @@ Adres: %4 bitcoin-core - + Bitcoin version Bitcoinversie - + Usage: Gebruik: - + Send command to -server or bitcoind Stuur commando naar -server of bitcoind - + List commands Lijst van commando's - + Get help for a command Toon hulp voor een commando - + Options: Opties: - + Specify configuration file (default: bitcoin.conf) Specificeer configuratiebestand (standaard: bitcoin.conf) @@ -2197,29 +2228,17 @@ Adres: %4 - - Generate coins - Genereer munten - - - - - Don't generate coins - Genereer geen munten - - - - + Specify data directory Stel datamap in - + Set database cache size in megabytes (default: 25) Stel databankcachegrootte in in megabytes (standaard: 25) - + Listen for connections on <port> (default: 8333 or testnet: 18333) Luister voor verbindingen op <poort> (standaard: 8333 of testnet: 18333) @@ -2234,7 +2253,7 @@ Adres: %4 Verbind naar een node om adressen van anderen op te halen, en verbreek vervolgens de verbinding - + Specify your own public address Specificeer uw eigen publieke adres @@ -2244,22 +2263,22 @@ Adres: %4 Drempel om verbinding te verbreken naar zich misdragende peers (standaard: 100) - + Number of seconds to keep misbehaving peers from reconnecting (default: 86400) Aantal seconden dat zich misdragende peers niet opnieuw mogen verbinden (standaard: 86400) - + An error occurred while setting up the RPC port %u for listening on IPv4: %s Er is een fout opgetreden tijdens het instellen van de inkomende RPC-poort %u op IPv4: %s - + Listen for JSON-RPC connections on <port> (default: 8332 or testnet: 18332) Wacht op JSON-RPC-connecties op poort <port> (standaard: 8332 of testnet: 18332) - + Accept command line and JSON-RPC commands Aanvaard commandoregel- en JSON-RPC-commando's @@ -2269,17 +2288,17 @@ Adres: %4 Draai in de achtergrond als daemon en aanvaard commando's - + Use the test network Gebruik het testnetwerk - + Accept connections from outside (default: 1 if no -proxy or -connect) Accepteer verbindingen van buitenaf (standaard: 1 als geen -proxy of -connect is opgegeven) - + %s, you must set a rpcpassword in the configuration file: %s It is recommended you use the following random password: @@ -2316,11 +2335,6 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. Cannot obtain a lock on data directory %s. Bitcoin is probably already running. Kan geen lock op de datamap %s verkrijgen. Bitcoin draait vermoedelijk reeds. - - - Error initializing database environment %s! To recover, BACKUP THAT DIRECTORY, then remove everything from it except for wallet.dat. - Fout bij het initialiseren van database-omgeving %s! Om te herstellen, MAAK EEN BACKUP VAN DIE MAP, verwijder vervolgens alle bestanden in de map behalve wallet.dat. - Error: The transaction was rejected! This might happen if some of the coins in your wallet were already spent, such as if you used a copy of wallet.dat and coins were spent in the copy but not marked as spent here. @@ -2347,12 +2361,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. Stel maximumgrootte in in bytes voor hoge-prioriteits-/lage-transactiekosten-transacties (standaard: 27000) - - Set the number of script verification threads (1-16, 0=auto, default: 0) - Stel het aantal threads in voor scriptverificatie (1-16, 0=auto, standaard: 0) - - - + This is a pre-release test build - use at your own risk - do not use for mining or merchant applications Dit is een pre-release testversie - gebruik op eigen risico! Gebruik deze niet voor het delven van munten of handelsdoeleinden @@ -2392,7 +2401,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. Blokcreatie-opties: - + Connect only to the specified node(s) Verbind alleen naar de gespecificeerde node(s) @@ -2412,7 +2421,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. Wilt u de blokkendatabase nu herbouwen? - + Error initializing block database Fout bij intialisatie blokkendatabase @@ -2436,11 +2445,6 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. Error: Disk space is low! Fout: Weinig vrije diskruimte! - - - Error: Transaction creation failed! - Fout: Aanmaak transactie mislukt! - Error: Wallet locked, unable to create transaction! @@ -2512,7 +2516,12 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. Vind andere nodes d.m.v. DNS-naslag (standaard: 1 tenzij -connect) - + + Generate coins (default: 0) + Genereer munten (standaard: 0) + + + How many blocks to check at startup (default: 288, 0 = all) Aantal te checken blokken bij het opstarten (standaard: 288, 0 = allemaal) @@ -2522,7 +2531,12 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. Hoe grondig de blokverificatie is (0-4, standaard: 3) - + + Not enough file descriptors available. + Niet genoeg file descriptors beschikbaar. + + + Rebuild block chain index from current blk000??.dat files Blokketen opnieuw opbouwen van huidige blk000??.dat-bestanden @@ -2532,7 +2546,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. Stel het aantal threads in om RPC-aanvragen mee te bedienen (standaard: 4) - + Verifying blocks... Blokken aan het controleren... @@ -2542,12 +2556,17 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. Portomonnee aan het controleren... - + Imports blocks from external blk000??.dat file Importeert blokken van extern blk000??.dat bestand - + + Set the number of script verification threads (up to 16, 0 = auto, <0 = leave that many cores free, default: 0) + Stel het aantal threads voor scriptverificatie in (max 16, 0 = auto, <0 = laat zoveel cores vrij, standaard: 0) + + + Information Informatie @@ -2556,6 +2575,16 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. Invalid -tor address: '%s' Ongeldig -tor adres: '%s' + + + Invalid amount for -minrelaytxfee=<amount>: '%s' + Ongeldig bedrag voor -minrelaytxfee=<bedrag>: '%s' + + + + Invalid amount for -mintxfee=<amount>: '%s' + Ongeldig bedrag voor -mintxfee=<bedrag>: '%s' + Maintain a full transaction index (default: 0) @@ -2572,7 +2601,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. Maximum per-connectie zendbuffer, <n>*1000 bytes (standaard: 1000) - + Only accept block chain matching built-in checkpoints (default: 1) Accepteer alleen blokketen die overeenkomt met de ingebouwde checkpoints (standaard: 1) @@ -2631,6 +2660,11 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. Shrink debug.log file on client startup (default: 1 when no -debug) Verklein debug.log-bestand bij het opstarten van de client (standaard: 1 als geen -debug) + + + Signing transaction failed + Ondertekenen van transactie mislukt + Specify connection timeout in milliseconds (default: 5000) @@ -2642,7 +2676,22 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. Systeemfout: - + + Transaction amount too small + Transactiebedrag te klein + + + + Transaction amounts must be positive + Transactiebedragen moeten positief zijn + + + + Transaction too large + Transactie te groot + + + Use UPnP to map the listening port (default: 0) Gebruik UPnP om de luisterende poort te mappen (standaard: 0) @@ -2682,7 +2731,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. wallet.dat corrupt, veiligstellen mislukt - + Password for JSON-RPC connections Wachtwoord voor JSON-RPC-verbindingen @@ -2697,17 +2746,17 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. Verstuur commando's naar proces dat op <ip> draait (standaard: 127.0.0.1) - + Execute command when the best block changes (%s in cmd is replaced by block hash) Voer commando uit zodra het beste blok verandert (%s in cmd wordt vervangen door blockhash) - + Upgrade wallet to latest format Vernieuw portemonnee naar nieuwste versie - + Set key pool size to <n> (default: 100) Stel sleutelpoelgrootte in op <n> (standaard: 100) @@ -2717,12 +2766,12 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. Doorzoek de blokketen op ontbrekende portemonnee-transacties - + Use OpenSSL (https) for JSON-RPC connections Gebruik OpenSSL (https) voor JSON-RPC-verbindingen - + Server certificate file (default: server.cert) Certificaat-bestand voor server (standaard: server.cert) @@ -2732,37 +2781,37 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. Geheime sleutel voor server (standaard: server.pem) - + Acceptable ciphers (default: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH) Aanvaardbare ciphers (standaard: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH) - + This help message Dit helpbericht - + Unable to bind to %s on this computer (bind returned error %d, %s) Niet in staat om aan %s te binden op deze computer (bind gaf error %d, %s) - + Connect through socks proxy Verbind via een socks-proxy - + Allow DNS lookups for -addnode, -seednode and -connect Sta DNS-naslag toe voor -addnode, -seednode en -connect - + Loading addresses... Adressen aan het laden... - + Error loading wallet.dat: Wallet corrupted Fout bij laden wallet.dat: Portemonnee corrupt @@ -2772,22 +2821,22 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. Fout bij laden wallet.dat: Portemonnee vereist een nieuwere versie van Bitcoin - + Wallet needed to be rewritten: restart Bitcoin to complete Portemonnee moest herschreven worden: Herstart Bitcoin om te voltooien - + Error loading wallet.dat Fout bij laden wallet.dat - + Invalid -proxy address: '%s' Ongeldig -proxy adres: '%s' - + Unknown network specified in -onlynet: '%s' Onbekend netwerk gespecificeerd in -onlynet: '%s' @@ -2797,7 +2846,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. Onbekende -socks proxyversie aangegeven: %i - + Cannot resolve -bind address: '%s' Kan -bind adres niet herleiden: '%s' @@ -2817,17 +2866,17 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. Ongeldig bedrag - + Insufficient funds Ontoereikend saldo - + Loading block index... Blokindex aan het laden... - + Add a node to connect to and attempt to keep the connection open Voeg een node om naar te verbinden toe en probeer de verbinding open te houden @@ -2837,52 +2886,47 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. Niet in staat om aan %s te binden op deze computer. Bitcoin draait vermoedelijk reeds. - + Fee per KB to add to transactions you send Kosten per KB om aan transacties toe te voegen die u verstuurt - + Loading wallet... Portemonnee aan het laden... - + Cannot downgrade wallet Kan portemonnee niet downgraden - - - Cannot initialize keypool - Kan sleutel-pool niet initialiseren - Cannot write default address Kan standaardadres niet schrijven - + Rescanning... Blokketen aan het doorzoeken... - + Done loading Klaar met laden - + To use the %s option Om de %s optie te gebruiken - + Error Fout - + You must set rpcpassword=<password> in the configuration file: %s If the file does not exist, create it with owner-readable-only file permissions. diff --git a/src/qt/locale/bitcoin_pl.ts b/src/qt/locale/bitcoin_pl.ts index b74fbdf88a..2738b2e811 100644 --- a/src/qt/locale/bitcoin_pl.ts +++ b/src/qt/locale/bitcoin_pl.ts @@ -28,14 +28,14 @@ Distributed under the MIT/X11 software license, see the accompanying file COPYIN This product includes software developed by the OpenSSL Project for use in the OpenSSL Toolkit (http://www.openssl.org/) and cryptographic software written by Eric Young (eay@cryptsoft.com) and UPnP software written by Thomas Bernard. - + Copyright Prawo autorskie - 2009-%1 The Bitcoin developers - 2009-%1 deweloperzy Bitcoin + The Bitcoin developers + Deweloperzy Bitcoin @@ -66,7 +66,7 @@ This product includes software developed by the OpenSSL Project for use in the O &Nowy Adres - + These are your Bitcoin addresses for receiving payments. You may want to give a different one to each sender so you can keep track of who is paying you. Tutaj znajdują się twoje adresy Bitcoin do odbioru płatności. Możesz nadać oddzielne adresy dla każdego z wysyłających monety, żeby śledzić oddzielnie ich opłaty. @@ -96,7 +96,17 @@ This product includes software developed by the OpenSSL Project for use in the O Usuń zaznaczony adres z listy - + + Export the data in the current tab to a file + Eksportuj dane z aktywnej karty do pliku + + + + &Export + &Eksportuj + + + Verify a message to ensure it was signed with a specified Bitcoin address Zweryfikuj wiadomość, aby upewnić się, że została podpisana odpowiednim adresem Bitcoin. @@ -318,12 +328,12 @@ This product includes software developed by the OpenSSL Project for use in the O Podpisz wiado&mość... - + Synchronizing with network... Synchronizacja z siecią... - + &Overview P&odsumowanie @@ -398,7 +408,7 @@ This product includes software developed by the OpenSSL Project for use in the O &Zmień hasło... - + Importing blocks from disk... Importowanie bloków z dysku... @@ -408,12 +418,7 @@ This product includes software developed by the OpenSSL Project for use in the O Ponowne indeksowanie bloków na dysku... - - &Export... - &Eksportuj... - - - + Send coins to a Bitcoin address Wyślij monety na adres Bitcoin @@ -423,12 +428,7 @@ This product includes software developed by the OpenSSL Project for use in the O Zmienia opcje konfiguracji bitcoina - - Export the data in the current tab to a file - Eksportuj dane z aktywnej karty do pliku - - - + Backup wallet to another location Zapasowy portfel w innej lokalizacji @@ -438,7 +438,7 @@ This product includes software developed by the OpenSSL Project for use in the O Zmień hasło użyte do szyfrowania portfela - + &Debug window &Okno debudowania @@ -448,23 +448,23 @@ This product includes software developed by the OpenSSL Project for use in the O Otwórz konsolę debugowania i diagnostyki - + &Verify message... &Zweryfikuj wiadomość... - - + + Bitcoin Bitcoin - + Wallet Portfel - + &Send Wyślij @@ -509,12 +509,12 @@ This product includes software developed by the OpenSSL Project for use in the O Zweryfikuj wiadomość, aby upewnić się, że została podpisana odpowiednim adresem Bitcoin. - + &File &Plik - + &Settings P&referencje @@ -529,12 +529,7 @@ This product includes software developed by the OpenSSL Project for use in the O Pasek zakładek - - Actions toolbar - Pasek akcji - - - + [testnet] [testnet] @@ -545,12 +540,17 @@ This product includes software developed by the OpenSSL Project for use in the O Bitcoin klient - + %n active connection(s) to Bitcoin network %n aktywne połączenie do sieci Bitcoin%n aktywne połączenia do sieci Bitcoin%n aktywnych połączeń do sieci Bitcoin - + + No block source available... + + + + Processed %1 of %2 (estimated) blocks of transaction history. Przetworzono (w przybliżeniu) %1 z %2 bloków historii transakcji. @@ -575,7 +575,7 @@ This product includes software developed by the OpenSSL Project for use in the O %n tydzień%n tygodni%n tygodni - + %1 behind @@ -590,7 +590,7 @@ This product includes software developed by the OpenSSL Project for use in the O - + Error Błąd @@ -605,22 +605,22 @@ This product includes software developed by the OpenSSL Project for use in the O Informacja - + This transaction is over the size limit. You can still send it for a fee of %1, which goes to the nodes that process your transaction and helps to support the network. Do you want to pay the fee? Transakcja przekracza limit. Możesz wysłać ją płacąc prowizję %1, która zostaje przekazana do węzłów, które ją prześlą i pomoże wspierać sieć Bitcoin. Czy chcesz zapłacić prowizję? - + Up to date Aktualny - + Catching up... Łapanie bloków... - + Confirm transaction fee Potwierdź prowizję transakcyjną @@ -670,7 +670,7 @@ Adres: %4 Portfel jest <b>zaszyfrowany</b> i obecnie <b>zablokowany</b> - + A fatal error occurred. Bitcoin can no longer continue safely and will quit. Błąd krytyczny. Bitcoin nie może kontynuować bezpiecznie więc zostanie zamknięty. @@ -678,7 +678,7 @@ Adres: %4 ClientModel - + Network Alert Sieć Alert @@ -809,8 +809,8 @@ Adres: %4 - Optional transaction fee per kB that helps make sure your transactions are processed quickly. Most transactions are 1 kB. Fee 0.01 recommended. - Opcjonalna prowizja za transakcje za kB, wspomaga ona szybkość przebiegu transakcji. Większość transakcji jest 1 kB. Zalecana prowizja 0.01 . + Optional transaction fee per kB that helps make sure your transactions are processed quickly. Most transactions are 1 kB. + @@ -1059,7 +1059,7 @@ Adres: %4 Suma transakcji, które nie zostały jeszcze potwierdzone, i które nie zostały wliczone do twojego obecnego salda - + out of sync desynchronizacja @@ -1645,6 +1645,19 @@ Adres: %4 Wiadomość zweryfikowana. + + SplashScreen + + + The Bitcoin developers + Deweloperzy Bitcoin + + + + [testnet] + [testnet] + + TransactionDesc @@ -2119,10 +2132,28 @@ Adres: %4 do + + WalletModel + + + Send Coins + Wyślij płatność + + WalletView - + + &Export + &Eksportuj + + + + Export the data in the current tab to a file + Eksportuj dane z aktywnej karty do pliku + + + Backup Wallet Kopia Zapasowa Portfela @@ -2155,37 +2186,37 @@ Adres: %4 bitcoin-core - + Bitcoin version Wersja Bitcoin - + Usage: Użycie: - + Send command to -server or bitcoind Wyślij polecenie do -server lub bitcoind - + List commands Lista poleceń - + Get help for a command Uzyskaj pomoc do polecenia - + Options: Opcje: - + Specify configuration file (default: bitcoin.conf) Wskaż plik konfiguracyjny (domyślnie: bitcoin.conf) @@ -2195,27 +2226,17 @@ Adres: %4 Wskaż plik pid (domyślnie: bitcoin.pid) - - Generate coins - Generuj monety - - - - Don't generate coins - Nie generuj monet - - - + Specify data directory Wskaż folder danych - + Set database cache size in megabytes (default: 25) Ustaw rozmiar w megabajtach cache-u bazy danych (domyślnie: 25) - + Listen for connections on <port> (default: 8333 or testnet: 18333) Nasłuchuj połączeń na <port> (domyślnie: 8333 lub testnet: 18333) @@ -2230,7 +2251,7 @@ Adres: %4 Podłącz się do węzła aby otrzymać adresy peerów i rozłącz - + Specify your own public address Podaj swój publiczny adres @@ -2240,22 +2261,22 @@ Adres: %4 Próg po którym nastąpi rozłączenie nietrzymających się zasad peerów (domyślnie: 100) - + Number of seconds to keep misbehaving peers from reconnecting (default: 86400) Czas w sekundach, przez jaki nietrzymający się zasad peerzy nie będą mogli ponownie się podłączyć (domyślnie: 86400) - + An error occurred while setting up the RPC port %u for listening on IPv4: %s Wystąpił błąd podczas ustawiania portu RPC %u w tryb nasłuchu: %s - + Listen for JSON-RPC connections on <port> (default: 8332 or testnet: 18332) Nasłuchuj połączeń JSON-RPC na <port> (domyślnie: 8332 or testnet: 18332) - + Accept command line and JSON-RPC commands Akceptuj linię poleceń oraz polecenia JSON-RPC @@ -2265,17 +2286,17 @@ Adres: %4 Uruchom w tle jako daemon i przyjmuj polecenia - + Use the test network Użyj sieci testowej - + Accept connections from outside (default: 1 if no -proxy or -connect) Akceptuj połączenia z zewnątrz (domyślnie: 1 jeśli nie ustawiono -proxy lub -connect) - + %s, you must set a rpcpassword in the configuration file: %s It is recommended you use the following random password: @@ -2313,11 +2334,6 @@ na przykład: alertnotify=echo %%s | mail -s "Alarm Bitcoin" admin@foo Cannot obtain a lock on data directory %s. Bitcoin is probably already running. Nie można zablokować folderu danych %s. Bitcoin prawdopodobnie już działa. - - - Error initializing database environment %s! To recover, BACKUP THAT DIRECTORY, then remove everything from it except for wallet.dat. - Błąd inicjowania środowiska bazy danych %s! Aby odtworzyć, ZACHOWAJ TEN KATALOG, po czym usuń z niego wszystko poza wallet.dat. - Error: The transaction was rejected! This might happen if some of the coins in your wallet were already spent, such as if you used a copy of wallet.dat and coins were spent in the copy but not marked as spent here. @@ -2344,12 +2360,7 @@ na przykład: alertnotify=echo %%s | mail -s "Alarm Bitcoin" admin@foo Ustaw maksymalny rozmiar transakcji o wysokim priorytecie/niskiej prowizji w bajtach (domyślnie: 27000) - - Set the number of script verification threads (1-16, 0=auto, default: 0) - Ustaw liczbę wątków weryfikacji skryptów (1-16, 0=auto, domyślnie: 0) - - - + This is a pre-release test build - use at your own risk - do not use for mining or merchant applications @@ -2389,7 +2400,7 @@ na przykład: alertnotify=echo %%s | mail -s "Alarm Bitcoin" admin@foo Opcje tworzenia bloku: - + Connect only to the specified node(s) Łącz tylko do wskazanego węzła @@ -2409,7 +2420,7 @@ na przykład: alertnotify=echo %%s | mail -s "Alarm Bitcoin" admin@foo Czy chcesz teraz przebudować bazę bloków? - + Error initializing block database Błąd inicjowania bloku bazy danych @@ -2433,11 +2444,6 @@ na przykład: alertnotify=echo %%s | mail -s "Alarm Bitcoin" admin@foo Error: Disk space is low! Błąd: Mało miejsca na dysku! - - - Error: Transaction creation failed! - Błąd: Utworzenie transakcji nie powiodło się! - Error: Wallet locked, unable to create transaction! @@ -2509,7 +2515,12 @@ na przykład: alertnotify=echo %%s | mail -s "Alarm Bitcoin" admin@foo Wyszukaj połączenia wykorzystując zapytanie DNS (domyślnie 1 jeśli nie użyto -connect) - + + Generate coins (default: 0) + Generuj monety (domyślnie: 0) + + + How many blocks to check at startup (default: 288, 0 = all) Ile bloków sprawdzić przy starcie (domyślnie: 288, 0 = wszystkie) @@ -2519,7 +2530,12 @@ na przykład: alertnotify=echo %%s | mail -s "Alarm Bitcoin" admin@foo Jak dokładna jest weryfikacja bloku (0-4, domyślnie: 3) - + + Not enough file descriptors available. + + + + Rebuild block chain index from current blk000??.dat files Odbuduj indeks łańcucha bloków z obecnych plików blk000??.dat @@ -2529,7 +2545,7 @@ na przykład: alertnotify=echo %%s | mail -s "Alarm Bitcoin" admin@foo Ustaw liczbę wątków do odwołań RPC (domyślnie: 4) - + Verifying blocks... Weryfikacja bloków... @@ -2539,12 +2555,17 @@ na przykład: alertnotify=echo %%s | mail -s "Alarm Bitcoin" admin@foo Weryfikacja portfela... - + Imports blocks from external blk000??.dat file Importuj bloki z zewnętrznego pliku blk000??.dat - + + Set the number of script verification threads (up to 16, 0 = auto, <0 = leave that many cores free, default: 0) + Ustaw liczbę wątków skryptu weryfikacji (do 16, 0 = auto, <0 = zostawia taką ilość rdzenie wolnych, domyślnie: 0) + + + Information Informacja @@ -2553,6 +2574,16 @@ na przykład: alertnotify=echo %%s | mail -s "Alarm Bitcoin" admin@foo Invalid -tor address: '%s' Nieprawidłowy adres -tor: '%s' + + + Invalid amount for -minrelaytxfee=<amount>: '%s' + + + + + Invalid amount for -mintxfee=<amount>: '%s' + + Maintain a full transaction index (default: 0) @@ -2569,7 +2600,7 @@ na przykład: alertnotify=echo %%s | mail -s "Alarm Bitcoin" admin@foo Maksymalny bufor wysyłu na połączenie, <n>*1000 bajtów (domyślnie: 1000) - + Only accept block chain matching built-in checkpoints (default: 1) Akceptuj tylko łańcuch bloków zgodny z wbudowanymi punktami kontrolnymi (domyślnie: 1) @@ -2628,6 +2659,11 @@ na przykład: alertnotify=echo %%s | mail -s "Alarm Bitcoin" admin@foo Shrink debug.log file on client startup (default: 1 when no -debug) Zmniejsz plik debug.log przy starcie programu (domyślnie: 1 jeśli nie użyto -debug) + + + Signing transaction failed + + Specify connection timeout in milliseconds (default: 5000) @@ -2639,7 +2675,22 @@ na przykład: alertnotify=echo %%s | mail -s "Alarm Bitcoin" admin@foo Błąd systemu: - + + Transaction amount too small + + + + + Transaction amounts must be positive + + + + + Transaction too large + + + + Use UPnP to map the listening port (default: 0) Używaj UPnP do mapowania portu nasłuchu (domyślnie: 0) @@ -2679,7 +2730,7 @@ na przykład: alertnotify=echo %%s | mail -s "Alarm Bitcoin" admin@foo wallet.dat uszkodzony, odtworzenie się nie powiodło - + Password for JSON-RPC connections Hasło do połączeń JSON-RPC @@ -2694,17 +2745,17 @@ na przykład: alertnotify=echo %%s | mail -s "Alarm Bitcoin" admin@foo Wysyłaj polecenia do węzła działającego na <ip> (domyślnie: 127.0.0.1) - + Execute command when the best block changes (%s in cmd is replaced by block hash) Wykonaj polecenie kiedy najlepszy blok ulegnie zmianie (%s w komendzie zastanie zastąpione przez hash bloku) - + Upgrade wallet to latest format Zaktualizuj portfel do najnowszego formatu. - + Set key pool size to <n> (default: 100) Ustaw rozmiar puli kluczy na <n> (domyślnie: 100) @@ -2714,12 +2765,12 @@ na przykład: alertnotify=echo %%s | mail -s "Alarm Bitcoin" admin@foo Przeskanuj blok łańcuchów żeby znaleźć zaginione transakcje portfela - + Use OpenSSL (https) for JSON-RPC connections Użyj OpenSSL (https) do połączeń JSON-RPC - + Server certificate file (default: server.cert) Plik certyfikatu serwera (domyślnie: server.cert) @@ -2729,37 +2780,37 @@ na przykład: alertnotify=echo %%s | mail -s "Alarm Bitcoin" admin@foo Klucz prywatny serwera (domyślnie: server.pem) - + Acceptable ciphers (default: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH) Aceptowalne szyfry (domyślnie: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH) - + This help message Ta wiadomość pomocy - + Unable to bind to %s on this computer (bind returned error %d, %s) Nie można przywiązać %s na tym komputerze (bind returned error %d, %s) - + Connect through socks proxy Łączy przez proxy socks - + Allow DNS lookups for -addnode, -seednode and -connect Zezwól -addnode, -seednode i -connect na łączenie się z serwerem DNS - + Loading addresses... Wczytywanie adresów... - + Error loading wallet.dat: Wallet corrupted Błąd ładowania wallet.dat: Uszkodzony portfel @@ -2769,22 +2820,22 @@ na przykład: alertnotify=echo %%s | mail -s "Alarm Bitcoin" admin@foo Błąd ładowania wallet.dat: Portfel wymaga nowszej wersji Bitcoin - + Wallet needed to be rewritten: restart Bitcoin to complete Portfel wymaga przepisania: zrestartuj Bitcoina żeby ukończyć - + Error loading wallet.dat Błąd ładowania wallet.dat - + Invalid -proxy address: '%s' Nieprawidłowy adres -proxy: '%s' - + Unknown network specified in -onlynet: '%s' Nieznana sieć w -onlynet: '%s' @@ -2794,7 +2845,7 @@ na przykład: alertnotify=echo %%s | mail -s "Alarm Bitcoin" admin@foo Nieznana wersja proxy w -socks: %i - + Cannot resolve -bind address: '%s' Nie można uzyskać adresu -bind: '%s' @@ -2814,17 +2865,17 @@ na przykład: alertnotify=echo %%s | mail -s "Alarm Bitcoin" admin@foo Nieprawidłowa kwota - + Insufficient funds Niewystarczające środki - + Loading block index... Ładowanie indeksu bloku... - + Add a node to connect to and attempt to keep the connection open Dodaj węzeł do łączenia się and attempt to keep the connection open @@ -2834,53 +2885,48 @@ na przykład: alertnotify=echo %%s | mail -s "Alarm Bitcoin" admin@foo Nie można przywiązać %s na tym komputerze. Bitcoin prawdopodobnie już działa. - + Fee per KB to add to transactions you send - + Loading wallet... Wczytywanie portfela... - + Cannot downgrade wallet Nie można dezaktualizować portfela - - - Cannot initialize keypool - Inicjalizacja puli kluczy nieudana - Cannot write default address Nie można zapisać domyślnego adresu - + Rescanning... Ponowne skanowanie... - + Done loading Wczytywanie zakończone - + To use the %s option Aby użyć opcji %s - + Error Błąd - + You must set rpcpassword=<password> in the configuration file: %s If the file does not exist, create it with owner-readable-only file permissions. diff --git a/src/qt/locale/bitcoin_pt_BR.ts b/src/qt/locale/bitcoin_pt_BR.ts index 87537f967c..3399f7ad94 100644 --- a/src/qt/locale/bitcoin_pt_BR.ts +++ b/src/qt/locale/bitcoin_pt_BR.ts @@ -28,14 +28,14 @@ Distribuido sob a licença de software MIT/X11, veja o arquivo anexo COPYING ou Este produto inclui software desenvolvido pelo Projeto OpenSSL para uso no OpenSSL Toolkit (http://www.openssl.org/), software de criptografia escrito por Eric Young (eay@cryptsoft.com) e sofware UPnP escrito por Thomas Bernard. - + Copyright Copyright - 2009-%1 The Bitcoin developers - 2009-%1 Os desenvolvedores do Bitcoin + The Bitcoin developers + Desenvolvedores do Bitcoin @@ -66,7 +66,7 @@ Este produto inclui software desenvolvido pelo Projeto OpenSSL para uso no OpenS &Novo endereço - + These are your Bitcoin addresses for receiving payments. You may want to give a different one to each sender so you can keep track of who is paying you. Estes são os seus endereços Bitcoin para receber pagamentos. Você pode querer enviar um endereço diferente para cada remetente, para acompanhar quem está pagando. @@ -96,7 +96,17 @@ Este produto inclui software desenvolvido pelo Projeto OpenSSL para uso no OpenS Excluir os endereços selecionados da lista - + + Export the data in the current tab to a file + Exportar os dados na aba atual para um arquivo + + + + &Export + &Exportar + + + Verify a message to ensure it was signed with a specified Bitcoin address Verificar mensagem para se assegurar que ela foi assinada pelo dono de um endereço Bitcoin específico. @@ -318,12 +328,12 @@ Este produto inclui software desenvolvido pelo Projeto OpenSSL para uso no OpenS &Assinar Mensagem... - + Synchronizing with network... Sincronizando com a rede... - + &Overview &Visão geral @@ -398,7 +408,7 @@ Este produto inclui software desenvolvido pelo Projeto OpenSSL para uso no OpenS &Mudar frase de segurança... - + Importing blocks from disk... Importando blocos do disco... @@ -408,12 +418,7 @@ Este produto inclui software desenvolvido pelo Projeto OpenSSL para uso no OpenS Reindexando blocos no disco... - - &Export... - &Exportar... - - - + Send coins to a Bitcoin address Enviar moedas para um endereço bitcoin @@ -423,12 +428,7 @@ Este produto inclui software desenvolvido pelo Projeto OpenSSL para uso no OpenS Modificar opções de configuração para bitcoin - - Export the data in the current tab to a file - Exportar os dados na aba atual para um arquivo - - - + Backup wallet to another location Fazer cópia de segurança da carteira para uma outra localização @@ -438,7 +438,7 @@ Este produto inclui software desenvolvido pelo Projeto OpenSSL para uso no OpenS Mudar a frase de segurança utilizada na criptografia da carteira - + &Debug window Janela de &Depuração @@ -448,23 +448,23 @@ Este produto inclui software desenvolvido pelo Projeto OpenSSL para uso no OpenS Abrir console de depuração e diagnóstico - + &Verify message... &Verificar mensagem... - - + + Bitcoin Bitcoin - + Wallet Carteira - + &Send &Enviar @@ -509,12 +509,12 @@ Este produto inclui software desenvolvido pelo Projeto OpenSSL para uso no OpenS Verificar mensagens para se assegurar que elas foram assinadas pelo dono de Endereços Bitcoin específicos - + &File &Arquivo - + &Settings &Configurações @@ -529,12 +529,7 @@ Este produto inclui software desenvolvido pelo Projeto OpenSSL para uso no OpenS Barra de ferramentas - - Actions toolbar - Barra de ações - - - + [testnet] [testnet] @@ -545,12 +540,17 @@ Este produto inclui software desenvolvido pelo Projeto OpenSSL para uso no OpenS Cliente Bitcoin - + %n active connection(s) to Bitcoin network %n conexão ativa na rede Bitcoin%n conexões ativas na rede Bitcoin - + + No block source available... + + + + Processed %1 of %2 (estimated) blocks of transaction history. Processado %1 de %2 blocos (estimado) de histórico de transações. @@ -575,7 +575,7 @@ Este produto inclui software desenvolvido pelo Projeto OpenSSL para uso no OpenS %n semana%n semanas - + %1 behind %1 atrás @@ -590,7 +590,7 @@ Este produto inclui software desenvolvido pelo Projeto OpenSSL para uso no OpenS Transações após isso ainda não estão visíveis. - + Error Erro @@ -605,22 +605,22 @@ Este produto inclui software desenvolvido pelo Projeto OpenSSL para uso no OpenS Informação - + This transaction is over the size limit. You can still send it for a fee of %1, which goes to the nodes that process your transaction and helps to support the network. Do you want to pay the fee? A transação está acima do tamanho limite. Você ainda enviar ela com uma taxa de %1, que vai para os nós processam sua transação e ajuda a manter a rede. Você quer pagar a taxa? - + Up to date Atualizado - + Catching up... Recuperando o atraso ... - + Confirm transaction fee Confirmar taxa de transação @@ -669,7 +669,7 @@ Endereço: %4 Carteira está <b>criptografada</b> e atualmente <b>bloqueada</b> - + A fatal error occurred. Bitcoin can no longer continue safely and will quit. Um erro fatal ocorreu. Bitcoin não pode continuar em segurança e irá fechar. @@ -677,7 +677,7 @@ Endereço: %4 ClientModel - + Network Alert Alerta da Rede @@ -808,8 +808,8 @@ Endereço: %4 - Optional transaction fee per kB that helps make sure your transactions are processed quickly. Most transactions are 1 kB. Fee 0.01 recommended. - Taxa opcional de transações por kB que ajuda a garantir que suas transações serão processadas rapidamente. A maior parte das transações é de 1 kB. Taxa de 0.01 recomendada. + Optional transaction fee per kB that helps make sure your transactions are processed quickly. Most transactions are 1 kB. + @@ -1058,7 +1058,7 @@ Endereço: %4 Total de transações ainda não confirmadas, e que ainda não contam no saldo atual - + out of sync fora de sincronia @@ -1644,6 +1644,19 @@ Endereço: %4 Mensagem verificada. + + SplashScreen + + + The Bitcoin developers + Desenvolvedores do Bitcoin + + + + [testnet] + [testnet] + + TransactionDesc @@ -2118,10 +2131,28 @@ Endereço: %4 para + + WalletModel + + + Send Coins + Send Coins + + WalletView - + + &Export + &Exportar + + + + Export the data in the current tab to a file + Exportar os dados na aba atual para um arquivo + + + Backup Wallet Fazer cópia de segurança da Carteira @@ -2154,37 +2185,37 @@ Endereço: %4 bitcoin-core - + Bitcoin version Versão do Bitcoin - + Usage: Uso: - + Send command to -server or bitcoind Enviar comando para -server ou bitcoind - + List commands Lista de comandos - + Get help for a command Obtenha ajuda sobre um comando - + Options: Opções: - + Specify configuration file (default: bitcoin.conf) Especifique um arquivo de configurações (padrão: bitcoin.conf) @@ -2194,27 +2225,17 @@ Endereço: %4 Especifique um arquivo de pid (padrão: bitcoind.pid) - - Generate coins - Gerar bitcoins - - - - Don't generate coins - Não gerar bitcoins - - - + Specify data directory Especificar diretório de dados - + Set database cache size in megabytes (default: 25) Definir o tamanho do cache do banco de dados em megabytes (padrão: 25) - + Listen for connections on <port> (default: 8333 or testnet: 18333) Procurar por conexões em <port> (padrão: 8333 ou testnet:18333) @@ -2229,7 +2250,7 @@ Endereço: %4 Conectar a um nó para receber endereços de participantes, e desconectar. - + Specify your own public address Especificar seu próprio endereço público @@ -2239,22 +2260,22 @@ Endereço: %4 Limite para desconectar peers mal comportados (padrão: 100) - + Number of seconds to keep misbehaving peers from reconnecting (default: 86400) Número de segundos para impedir que peers mal comportados reconectem (padrão: 86400) - + An error occurred while setting up the RPC port %u for listening on IPv4: %s Um erro ocorreu ao configurar a porta RPC %u para escuta em IPv4: %s - + Listen for JSON-RPC connections on <port> (default: 8332 or testnet: 18332) Escutar conexões JSON-RPC na porta <porta> (padrão: 8332 ou testnet: 18332) - + Accept command line and JSON-RPC commands Aceitar linha de comando e comandos JSON-RPC @@ -2264,17 +2285,17 @@ Endereço: %4 Rodar em segundo plano como serviço e aceitar comandos - + Use the test network Usar rede de teste - + Accept connections from outside (default: 1 if no -proxy or -connect) Aceitar conexões externas (padrão: 1 se opções -proxy ou -connect não estiverem presentes) - + %s, you must set a rpcpassword in the configuration file: %s It is recommended you use the following random password: @@ -2313,11 +2334,6 @@ por exemplo: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. Cannot obtain a lock on data directory %s. Bitcoin is probably already running. Não foi possível obter exclusividade de escrita no endereço %s. O Bitcoin provavelmente já está rodando. - - - Error initializing database environment %s! To recover, BACKUP THAT DIRECTORY, then remove everything from it except for wallet.dat. - Erro ao inicializar o ambiente de banco de dados %s! Para recuperar: FAÇA BACKUP DAQUELE DIRETÓRIO, e então remova tudo dele, exceto o arquivo wallet.dat. - Error: The transaction was rejected! This might happen if some of the coins in your wallet were already spent, such as if you used a copy of wallet.dat and coins were spent in the copy but not marked as spent here. @@ -2344,12 +2360,7 @@ por exemplo: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. Determinar tamanho máximo de transações de alta-prioridade/baixa-taxa em bytes (padrão: 27000) - - Set the number of script verification threads (1-16, 0=auto, default: 0) - Definir número de threads de script de verificação (1-16, 0=auto, padrão: 0) - - - + This is a pre-release test build - use at your own risk - do not use for mining or merchant applications Este pode ser um build de teste pré-lançamento - use por sua conta e risco - não use para mineração ou aplicações de comércio. @@ -2389,7 +2400,7 @@ por exemplo: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. Opções de criação de blocos: - + Connect only to the specified node(s) Conectar apenas a nó(s) específico(s) @@ -2409,7 +2420,7 @@ por exemplo: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. Você quer reconstruir o banco de dados de blocos agora? - + Error initializing block database Erro ao inicializar banco de dados de blocos @@ -2433,11 +2444,6 @@ por exemplo: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. Error: Disk space is low! Erro: Espaço em disco insuficiente! - - - Error: Transaction creation failed! - Erro: Criação da transação falhou! - Error: Wallet locked, unable to create transaction! @@ -2509,7 +2515,12 @@ por exemplo: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. Procurar pares usando consulta de DNS (padrão: 1 a menos que a opção -connect esteja presente) - + + Generate coins (default: 0) + + + + How many blocks to check at startup (default: 288, 0 = all) Quantos blocos checar ao inicializar (padrão: 288, 0 = todos) @@ -2519,7 +2530,12 @@ por exemplo: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. Quão minuciosa é a verificação dos blocos (0-4, padrão: 3) - + + Not enough file descriptors available. + + + + Rebuild block chain index from current blk000??.dat files Reconstruir índice de blockchain a partir dos arquivos atuais blk000??.dat @@ -2529,7 +2545,7 @@ por exemplo: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. Defina o número de threads de script de verificação. (Padrão: 4) - + Verifying blocks... Verificando blocos... @@ -2539,12 +2555,17 @@ por exemplo: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. Verificando carteira... - + Imports blocks from external blk000??.dat file Importar blocos de um arquivo externo blk000??.dat - + + Set the number of script verification threads (up to 16, 0 = auto, <0 = leave that many cores free, default: 0) + + + + Information Informação @@ -2553,6 +2574,16 @@ por exemplo: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. Invalid -tor address: '%s' Endereço -tor inválido: '%s' + + + Invalid amount for -minrelaytxfee=<amount>: '%s' + + + + + Invalid amount for -mintxfee=<amount>: '%s' + + Maintain a full transaction index (default: 0) @@ -2569,7 +2600,7 @@ por exemplo: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. Buffer máximo de envio por conexão, <n>*1000 bytes (padrão: 1000) - + Only accept block chain matching built-in checkpoints (default: 1) Apenas aceitar cadeia de blocos correspondente a marcas de verificação internas (padrão: 1) @@ -2628,6 +2659,11 @@ por exemplo: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. Shrink debug.log file on client startup (default: 1 when no -debug) Encolher arquivo debug.log ao iniciar o cliente (padrão 1 se opção -debug não estiver presente) + + + Signing transaction failed + + Specify connection timeout in milliseconds (default: 5000) @@ -2639,7 +2675,22 @@ por exemplo: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. Erro de sistema: - + + Transaction amount too small + + + + + Transaction amounts must be positive + + + + + Transaction too large + + + + Use UPnP to map the listening port (default: 0) Usar UPnP para mapear porta de escuta (padrão: 0) @@ -2679,7 +2730,7 @@ por exemplo: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. wallet.dat corrompido, recuperação falhou - + Password for JSON-RPC connections Senha para conexões JSON-RPC @@ -2694,17 +2745,17 @@ por exemplo: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. Enviar comando para nó rodando em <ip> (pardão: 127.0.0.1) - + Execute command when the best block changes (%s in cmd is replaced by block hash) Executar comando quando o melhor bloco mudar (%s no comando será substituído pelo hash do bloco) - + Upgrade wallet to latest format Atualizar carteira para o formato mais recente - + Set key pool size to <n> (default: 100) Determinar tamanho do pool de endereços para <n> (padrão: 100) @@ -2714,12 +2765,12 @@ por exemplo: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. Re-escanear blocos procurando por transações perdidas da carteira - + Use OpenSSL (https) for JSON-RPC connections Usar OpenSSL (https) para conexões JSON-RPC - + Server certificate file (default: server.cert) Arquivo de certificado do servidor (padrão: server.cert) @@ -2729,37 +2780,37 @@ por exemplo: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. Chave privada do servidor (padrão: server.pem) - + Acceptable ciphers (default: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH) Algoritmos de criptografia aceitos (padrão: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH) - + This help message Esta mensagem de ajuda - + Unable to bind to %s on this computer (bind returned error %d, %s) Impossível vincular a %s neste computador (bind retornou erro %d, %s) - + Connect through socks proxy Conectar através de um proxy socks - + Allow DNS lookups for -addnode, -seednode and -connect Permitir consultas DNS para -addnode, -seednode e -connect - + Loading addresses... Carregando endereços... - + Error loading wallet.dat: Wallet corrupted Erro ao carregar wallet.dat: Carteira corrompida @@ -2769,22 +2820,22 @@ por exemplo: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. Erro ao carregar wallet.dat: Carteira requer uma versão mais nova do Bitcoin - + Wallet needed to be rewritten: restart Bitcoin to complete A Carteira precisou ser reescrita: reinicie o Bitcoin para completar - + Error loading wallet.dat Erro ao carregar wallet.dat - + Invalid -proxy address: '%s' Endereço -proxy inválido: '%s' - + Unknown network specified in -onlynet: '%s' Rede desconhecida especificada em -onlynet: '%s' @@ -2794,7 +2845,7 @@ por exemplo: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. Versão desconhecida do proxy -socks requisitada: %i - + Cannot resolve -bind address: '%s' Impossível encontrar o endereço -bind: '%s' @@ -2814,17 +2865,17 @@ por exemplo: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. Quantidade inválida - + Insufficient funds Saldo insuficiente - + Loading block index... Carregando índice de blocos... - + Add a node to connect to and attempt to keep the connection open Adicionar um nó com o qual se conectar e tentar manter a conexão ativa @@ -2834,52 +2885,47 @@ por exemplo: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. Impossível vincular a %s neste computador. O Bitcoin provavelmente já está rodando. - + Fee per KB to add to transactions you send Taxa por KB a ser acrescida nas transações que você enviar - + Loading wallet... Carregando carteira... - + Cannot downgrade wallet Não é possível fazer downgrade da carteira - - - Cannot initialize keypool - Não foi possível inicializar o pool de chaves - Cannot write default address Não foi possível escrever no endereço padrão - + Rescanning... Re-escaneando... - + Done loading Carregamento terminado - + To use the %s option Para usar a opção %s - + Error Erro - + You must set rpcpassword=<password> in the configuration file: %s If the file does not exist, create it with owner-readable-only file permissions. diff --git a/src/qt/locale/bitcoin_pt_PT.ts b/src/qt/locale/bitcoin_pt_PT.ts index 1ff4461cd4..e2b6af5019 100644 --- a/src/qt/locale/bitcoin_pt_PT.ts +++ b/src/qt/locale/bitcoin_pt_PT.ts @@ -10,7 +10,7 @@ <b>Bitcoin</b> version - <b>Bitcoin</b> versão + Versão do <b>Bitcoin</b> @@ -28,14 +28,14 @@ Distribuído sob uma licença de software MIT/X11, por favor verifique o ficheir Este produto inclui software desenvolvido pelo Projecto OpenSSL para uso no OpenSSL Toolkit (http://www.openssl.org/), software criptográfico escrito por Eric Young (eay@cryptsoft.com) e software UPnP escrito por Thomas Bernard. - + Copyright Copyright - 2009-%1 The Bitcoin developers - 2009-%1 Os programadores Bitcoin + The Bitcoin developers + Os programadores Bitcoin @@ -66,7 +66,7 @@ Este produto inclui software desenvolvido pelo Projecto OpenSSL para uso no Open &Novo Endereço - + These are your Bitcoin addresses for receiving payments. You may want to give a different one to each sender so you can keep track of who is paying you. Estes são os seus endereços Bitcoin para receber pagamentos. Poderá enviar um endereço diferente para cada remetente para poder identificar os pagamentos. @@ -96,7 +96,17 @@ Este produto inclui software desenvolvido pelo Projecto OpenSSL para uso no Open Apagar o endereço selecionado da lista - + + Export the data in the current tab to a file + Exportar os dados no separador actual para um ficheiro + + + + &Export + &Exportar + + + Verify a message to ensure it was signed with a specified Bitcoin address Verifique a mensagem para assegurar que foi assinada com o endereço Bitcoin especificado @@ -148,7 +158,7 @@ Este produto inclui software desenvolvido pelo Projecto OpenSSL para uso no Open Could not write to file %1. - Não conseguiu escrever para o ficheiro %1. + Não foi possível escrever para o ficheiro %1. @@ -318,12 +328,12 @@ Este produto inclui software desenvolvido pelo Projecto OpenSSL para uso no Open Assinar &mensagem... - + Synchronizing with network... Sincronizando com a rede... - + &Overview Visã&o geral @@ -398,7 +408,7 @@ Este produto inclui software desenvolvido pelo Projecto OpenSSL para uso no Open Mudar &Palavra-passe... - + Importing blocks from disk... Importando blocos do disco... @@ -408,12 +418,7 @@ Este produto inclui software desenvolvido pelo Projecto OpenSSL para uso no Open Reindexando blocos no disco... - - &Export... - &Exportar... - - - + Send coins to a Bitcoin address Enviar moedas para um endereço bitcoin @@ -423,12 +428,7 @@ Este produto inclui software desenvolvido pelo Projecto OpenSSL para uso no Open Modificar opções de configuração para bitcoin - - Export the data in the current tab to a file - Exportar os dados no separador actual para um ficheiro - - - + Backup wallet to another location Faça uma cópia de segurança da carteira para outra localização @@ -438,7 +438,7 @@ Este produto inclui software desenvolvido pelo Projecto OpenSSL para uso no Open Mudar a frase de segurança utilizada na encriptação da carteira - + &Debug window Janela de &depuração @@ -448,23 +448,23 @@ Este produto inclui software desenvolvido pelo Projecto OpenSSL para uso no Open Abrir consola de diagnóstico e depuração - + &Verify message... &Verificar mensagem... - - + + Bitcoin Bitcoin - + Wallet Carteira - + &Send &Enviar @@ -509,12 +509,12 @@ Este produto inclui software desenvolvido pelo Projecto OpenSSL para uso no Open Verifique mensagens para assegurar que foram assinadas com o endereço Bitcoin especificado - + &File &Ficheiro - + &Settings Con&figurações @@ -529,12 +529,7 @@ Este produto inclui software desenvolvido pelo Projecto OpenSSL para uso no Open Barra de separadores - - Actions toolbar - Barra de ações - - - + [testnet] [rede de testes] @@ -545,12 +540,17 @@ Este produto inclui software desenvolvido pelo Projecto OpenSSL para uso no Open Cliente Bitcoin - + %n active connection(s) to Bitcoin network %n ligação ativa à rede Bitcoin%n ligações ativas à rede Bitcoin - + + No block source available... + Nenhum bloco fonto disponível + + + Processed %1 of %2 (estimated) blocks of transaction history. Processados %1 dos %2 blocos (estimados) do histórico de transacções. @@ -575,7 +575,7 @@ Este produto inclui software desenvolvido pelo Projecto OpenSSL para uso no Open %n semana%n semanas - + %1 behind %1 em atraso @@ -590,7 +590,7 @@ Este produto inclui software desenvolvido pelo Projecto OpenSSL para uso no Open Transações posteriores poderão não ser imediatamente visíveis. - + Error Erro @@ -605,22 +605,22 @@ Este produto inclui software desenvolvido pelo Projecto OpenSSL para uso no Open Informação - + This transaction is over the size limit. You can still send it for a fee of %1, which goes to the nodes that process your transaction and helps to support the network. Do you want to pay the fee? Esta transação tem um tamanho superior ao limite máximo. Poderá enviá-la pagando uma taxa de %1, que será entregue ao nó que processar a sua transação e ajudará a suportar a rede. Deseja pagar a taxa? - + Up to date Atualizado - + Catching up... Recuperando... - + Confirm transaction fee Confirme a taxa de transação @@ -670,7 +670,7 @@ Endereço: %4 A carteira está <b>encriptada</b> e atualmente <b>bloqueada</b> - + A fatal error occurred. Bitcoin can no longer continue safely and will quit. Ocorreu um erro fatal. O Bitcoin não pode continuar com segurança e irá fechar. @@ -678,7 +678,7 @@ Endereço: %4 ClientModel - + Network Alert Alerta da Rede @@ -809,8 +809,8 @@ Endereço: %4 - Optional transaction fee per kB that helps make sure your transactions are processed quickly. Most transactions are 1 kB. Fee 0.01 recommended. - Taxa de transação opcional por KB que ajuda a assegurar que as suas transações serão processadas rapidamente. A maioria das transações tem 1 kB. Taxa de 0.01 recomendada. + Optional transaction fee per kB that helps make sure your transactions are processed quickly. Most transactions are 1 kB. + Taxa de transação opcional por KB que ajuda a assegurar que as suas transações serão processadas rapidamente. A maioria das transações tem 1 kB. @@ -1059,7 +1059,7 @@ Endereço: %4 Total de transações ainda não confirmadas, e que não estão contabilizadas ainda no seu saldo actual - + out of sync fora de sincronia @@ -1645,6 +1645,19 @@ Endereço: %4 Mensagem verificada. + + SplashScreen + + + The Bitcoin developers + Os programadores Bitcoin + + + + [testnet] + [rede de testes] + + TransactionDesc @@ -2119,10 +2132,28 @@ Endereço: %4 até + + WalletModel + + + Send Coins + Enviar Moedas + + WalletView - + + &Export + &Exportar + + + + Export the data in the current tab to a file + Exportar os dados no separador actual para um ficheiro + + + Backup Wallet Cópia de Segurança da Carteira @@ -2155,37 +2186,37 @@ Endereço: %4 bitcoin-core - + Bitcoin version Versão Bitcoin - + Usage: Utilização: - + Send command to -server or bitcoind Enviar comando para -server ou bitcoind - + List commands Listar comandos - + Get help for a command Obter ajuda para um comando - + Options: Opções: - + Specify configuration file (default: bitcoin.conf) Especificar ficheiro de configuração (por defeito: bitcoin.conf) @@ -2195,27 +2226,17 @@ Endereço: %4 Especificar ficheiro pid (por defeito: bitcoind.pid) - - Generate coins - Gerar moedas - - - - Don't generate coins - Não gerar moedas - - - + Specify data directory Especificar pasta de dados - + Set database cache size in megabytes (default: 25) Definir o tamanho da cache de base de dados em megabytes (por defeito: 25) - + Listen for connections on <port> (default: 8333 or testnet: 18333) Escute por ligações em <port> (por defeito: 8333 ou testnet: 18333) @@ -2230,7 +2251,7 @@ Endereço: %4 Ligar a um nó para recuperar endereços de pares, e desligar - + Specify your own public address Especifique o seu endereço público @@ -2240,22 +2261,22 @@ Endereço: %4 Tolerância para desligar nós mal-formados (por defeito: 100) - + Number of seconds to keep misbehaving peers from reconnecting (default: 86400) Número de segundos a impedir que nós mal-formados se liguem de novo (por defeito: 86400) - + An error occurred while setting up the RPC port %u for listening on IPv4: %s Ocorreu um erro ao definir a porta %u do serviço RPC a escutar em IPv4: %s - + Listen for JSON-RPC connections on <port> (default: 8332 or testnet: 18332) Escutar por ligações JSON-RPC em <port> (por defeito: 8332 ou rede de testes: 18332) - + Accept command line and JSON-RPC commands Aceitar comandos da consola e JSON-RPC @@ -2265,17 +2286,17 @@ Endereço: %4 Correr o processo como um daemon e aceitar comandos - + Use the test network Utilizar a rede de testes - testnet - + Accept connections from outside (default: 1 if no -proxy or -connect) Aceitar ligações externas (padrão: 1 sem -proxy ou -connect) - + %s, you must set a rpcpassword in the configuration file: %s It is recommended you use the following random password: @@ -2314,11 +2335,6 @@ por exemplo: alertnotify=echo %%s | mail -s "Alerta Bitcoin" admin@foo Cannot obtain a lock on data directory %s. Bitcoin is probably already running. Impossível trancar a pasta de dados %s. Provavelmente o Bitcoin já está a ser executado. - - - Error initializing database environment %s! To recover, BACKUP THAT DIRECTORY, then remove everything from it except for wallet.dat. - Erro ao inicializar o ambiente de recuperação de base de dados %s! Para recuperar, COPIE A PASTA PARA OUTRO LOCAL, e então remova tudo de dentro dela excepto o ficheiro wallet.dat. - Error: The transaction was rejected! This might happen if some of the coins in your wallet were already spent, such as if you used a copy of wallet.dat and coins were spent in the copy but not marked as spent here. @@ -2345,12 +2361,7 @@ por exemplo: alertnotify=echo %%s | mail -s "Alerta Bitcoin" admin@foo Definir tamanho máximo de transações de alta-/baixa-prioridade em bytes (por defeito: 27000) - - Set the number of script verification threads (1-16, 0=auto, default: 0) - Defina o número de processos de verificação (1-16, 0=auto, por defeito: 0) - - - + This is a pre-release test build - use at your own risk - do not use for mining or merchant applications Esta é uma versão de pré-lançamento - use à sua responsabilidade - não usar para minar ou aplicações comerciais @@ -2390,7 +2401,7 @@ por exemplo: alertnotify=echo %%s | mail -s "Alerta Bitcoin" admin@foo Opções de criação de bloco: - + Connect only to the specified node(s) Apenas ligar ao(s) nó(s) especificado(s) @@ -2410,7 +2421,7 @@ por exemplo: alertnotify=echo %%s | mail -s "Alerta Bitcoin" admin@foo Deseja reconstruir agora a cadeia de blocos? - + Error initializing block database Erro ao inicializar a cadeia de blocos @@ -2434,11 +2445,6 @@ por exemplo: alertnotify=echo %%s | mail -s "Alerta Bitcoin" admin@foo Error: Disk space is low! Erro: Pouco espaço em disco! - - - Error: Transaction creation failed! - Erro: A criação da transacção falhou! - Error: Wallet locked, unable to create transaction! @@ -2510,7 +2516,12 @@ por exemplo: alertnotify=echo %%s | mail -s "Alerta Bitcoin" admin@foo Encontrar pares usando procura DNS (por defeito: 1 excepto -connect) - + + Generate coins (default: 0) + Gerar moedas (por defeito: 0) + + + How many blocks to check at startup (default: 288, 0 = all) Quantos blocos verificar ao começar (por defeito: 288, 0 = todos) @@ -2520,7 +2531,12 @@ por exemplo: alertnotify=echo %%s | mail -s "Alerta Bitcoin" admin@foo Qual a minúcia na verificação de blocos (0-4, por defeito: 3) - + + Not enough file descriptors available. + Descritores de ficheiros disponíveis são insuficientes. + + + Rebuild block chain index from current blk000??.dat files Reconstruir a cadeia de blocos dos ficheiros blk000??.dat actuais @@ -2530,7 +2546,7 @@ por exemplo: alertnotify=echo %%s | mail -s "Alerta Bitcoin" admin@foo Defina o número de processos para servir as chamadas RPC (por defeito: 4) - + Verifying blocks... Verificando blocos... @@ -2540,12 +2556,17 @@ por exemplo: alertnotify=echo %%s | mail -s "Alerta Bitcoin" admin@foo Verificando a carteira... - + Imports blocks from external blk000??.dat file Importar blocos de um ficheiro blk000??.dat externo - + + Set the number of script verification threads (up to 16, 0 = auto, <0 = leave that many cores free, default: 0) + Defina o número de processos de verificação (até 16, 0 = automático, <0 = disponibiliza esse número de núcleos livres, por defeito: 0) + + + Information Informação @@ -2554,6 +2575,16 @@ por exemplo: alertnotify=echo %%s | mail -s "Alerta Bitcoin" admin@foo Invalid -tor address: '%s' Endereço -tor inválido: '%s' + + + Invalid amount for -minrelaytxfee=<amount>: '%s' + Quantia inválida para -minrelaytxfee=<amount>: '%s' + + + + Invalid amount for -mintxfee=<amount>: '%s' + Quantia inválida para -mintxfee=<amount>: '%s' + Maintain a full transaction index (default: 0) @@ -2570,7 +2601,7 @@ por exemplo: alertnotify=echo %%s | mail -s "Alerta Bitcoin" admin@foo Armazenamento intermédio de envio por ligação, <n>*1000 bytes (por defeito: 1000) - + Only accept block chain matching built-in checkpoints (default: 1) Apenas aceitar cadeia de blocos coincidente com marcas de verificação internas (por defeito: 1) @@ -2629,6 +2660,11 @@ por exemplo: alertnotify=echo %%s | mail -s "Alerta Bitcoin" admin@foo Shrink debug.log file on client startup (default: 1 when no -debug) Encolher ficheiro debug.log ao iniciar o cliente (por defeito: 1 sem -debug definido) + + + Signing transaction failed + Falhou assinatura da transação + Specify connection timeout in milliseconds (default: 5000) @@ -2640,7 +2676,22 @@ por exemplo: alertnotify=echo %%s | mail -s "Alerta Bitcoin" admin@foo Erro de sistema: - + + Transaction amount too small + Quantia da transação é muito baixa + + + + Transaction amounts must be positive + Quantia da transação deverá ser positiva + + + + Transaction too large + Transação grande demais + + + Use UPnP to map the listening port (default: 0) Usar UPnP para mapear a porta de escuta (padrão: 0) @@ -2680,7 +2731,7 @@ por exemplo: alertnotify=echo %%s | mail -s "Alerta Bitcoin" admin@foo wallet.dat corrupta, recuperação falhou - + Password for JSON-RPC connections Palavra-passe para ligações JSON-RPC @@ -2695,17 +2746,17 @@ por exemplo: alertnotify=echo %%s | mail -s "Alerta Bitcoin" admin@foo Enviar comandos para o nó a correr em <ip> (por defeito: 127.0.0.1) - + Execute command when the best block changes (%s in cmd is replaced by block hash) Executar comando quando mudar o melhor bloco (no comando, %s é substituído pela hash do bloco) - + Upgrade wallet to latest format Atualize a carteira para o formato mais recente - + Set key pool size to <n> (default: 100) Definir o tamanho da memória de chaves para <n> (por defeito: 100) @@ -2715,12 +2766,12 @@ por exemplo: alertnotify=echo %%s | mail -s "Alerta Bitcoin" admin@foo Reexaminar a cadeia de blocos para transações em falta na carteira - + Use OpenSSL (https) for JSON-RPC connections Usar OpenSSL (https) para ligações JSON-RPC - + Server certificate file (default: server.cert) Ficheiro de certificado do servidor (por defeito: server.cert) @@ -2730,37 +2781,37 @@ por exemplo: alertnotify=echo %%s | mail -s "Alerta Bitcoin" admin@foo Chave privada do servidor (por defeito: server.pem) - + Acceptable ciphers (default: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH) Cifras aceitáveis (por defeito: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH) - + This help message Esta mensagem de ajuda - + Unable to bind to %s on this computer (bind returned error %d, %s) Incapaz de vincular a %s neste computador (vínculo retornou erro %d, %s) - + Connect through socks proxy Ligar através de um proxy socks - + Allow DNS lookups for -addnode, -seednode and -connect Permitir procuras DNS para -addnode, -seednode e -connect - + Loading addresses... Carregar endereços... - + Error loading wallet.dat: Wallet corrupted Erro ao carregar wallet.dat: Carteira danificada @@ -2770,22 +2821,22 @@ por exemplo: alertnotify=echo %%s | mail -s "Alerta Bitcoin" admin@foo Erro ao carregar wallet.dat: A Carteira requer uma versão mais recente do Bitcoin - + Wallet needed to be rewritten: restart Bitcoin to complete A Carteira precisou ser reescrita: reinicie o Bitcoin para completar - + Error loading wallet.dat Erro ao carregar wallet.dat - + Invalid -proxy address: '%s' Endereço -proxy inválido: '%s' - + Unknown network specified in -onlynet: '%s' Rede desconhecida especificada em -onlynet: '%s' @@ -2795,7 +2846,7 @@ por exemplo: alertnotify=echo %%s | mail -s "Alerta Bitcoin" admin@foo Versão desconhecida de proxy -socks requisitada: %i - + Cannot resolve -bind address: '%s' Não conseguiu resolver endereço -bind: '%s' @@ -2815,17 +2866,17 @@ por exemplo: alertnotify=echo %%s | mail -s "Alerta Bitcoin" admin@foo Quantia inválida - + Insufficient funds Fundos insuficientes - + Loading block index... Carregar índice de blocos... - + Add a node to connect to and attempt to keep the connection open Adicione um nó ao qual se ligar e tentar manter a ligação aberta @@ -2835,52 +2886,47 @@ por exemplo: alertnotify=echo %%s | mail -s "Alerta Bitcoin" admin@foo Incapaz de vincular à porta %s neste computador. Provavelmente o Bitcoin já está a funcionar. - + Fee per KB to add to transactions you send Taxa por KB a adicionar a transações enviadas - + Loading wallet... Carregar carteira... - + Cannot downgrade wallet Impossível mudar a carteira para uma versão anterior - - - Cannot initialize keypool - Impossível inicializar keypool - Cannot write default address Impossível escrever endereço por defeito - + Rescanning... Reexaminando... - + Done loading Carregamento completo - + To use the %s option Para usar a opção %s - + Error Erro - + You must set rpcpassword=<password> in the configuration file: %s If the file does not exist, create it with owner-readable-only file permissions. diff --git a/src/qt/locale/bitcoin_ro_RO.ts b/src/qt/locale/bitcoin_ro_RO.ts index b5c92b82e9..ee633e26fb 100644 --- a/src/qt/locale/bitcoin_ro_RO.ts +++ b/src/qt/locale/bitcoin_ro_RO.ts @@ -23,13 +23,13 @@ This product includes software developed by the OpenSSL Project for use in the O - + Copyright - 2009-%1 The Bitcoin developers + The Bitcoin developers @@ -61,7 +61,7 @@ This product includes software developed by the OpenSSL Project for use in the O &Adresă nouă - + These are your Bitcoin addresses for receiving payments. You may want to give a different one to each sender so you can keep track of who is paying you. Acestea sunt adresele dumneavoastră Bitcoin pentru a primi plăţi. Dacă doriţi, puteți da o adresa diferită fiecărui expeditor, pentru a putea ţine evidenţa plăţilor. @@ -91,7 +91,17 @@ This product includes software developed by the OpenSSL Project for use in the O Sterge adresele curent selectate din lista - + + Export the data in the current tab to a file + + + + + &Export + + + + Verify a message to ensure it was signed with a specified Bitcoin address Verifica mesajul pentru a te asigura ca a fost insemnat cu o adresa bitcoin specifica @@ -313,12 +323,12 @@ This product includes software developed by the OpenSSL Project for use in the O Semneaza &mesaj... - + Synchronizing with network... Se sincronizează cu reţeaua... - + &Overview &Detalii @@ -393,7 +403,7 @@ This product includes software developed by the OpenSSL Project for use in the O &Schimbă parola... - + Importing blocks from disk... Importare blocks de pe disk... @@ -403,12 +413,7 @@ This product includes software developed by the OpenSSL Project for use in the O - - &Export... - &Exportă... - - - + Send coins to a Bitcoin address &Trimiteţi Bitcoin către o anumită adresă @@ -418,12 +423,7 @@ This product includes software developed by the OpenSSL Project for use in the O Modifică setările pentru Bitcoin - - Export the data in the current tab to a file - Exporta datele din tab-ul curent catre un fiesier - - - + Backup wallet to another location Creaza copie de rezerva a portofelului intr-o locatie diferita @@ -433,7 +433,7 @@ This product includes software developed by the OpenSSL Project for use in the O &Schimbă parola folosită pentru criptarea portofelului electronic - + &Debug window & Fereastra debug @@ -443,23 +443,23 @@ This product includes software developed by the OpenSSL Project for use in the O Deschide consola de debug si diagnosticare - + &Verify message... Verifica mesajul - - + + Bitcoin Bitcoin - + Wallet Portofelul - + &Send @@ -504,12 +504,12 @@ This product includes software developed by the OpenSSL Project for use in the O - + &File &Fişier - + &Settings &Setări @@ -524,12 +524,7 @@ This product includes software developed by the OpenSSL Project for use in the O Bara de ferestre de lucru - - Actions toolbar - Bara de acţiuni - - - + [testnet] [testnet] @@ -540,12 +535,17 @@ This product includes software developed by the OpenSSL Project for use in the O Client Bitcoin - + %n active connection(s) to Bitcoin network %n active connections to Bitcoin network%n active connections to Bitcoin network%n active connections to Bitcoin network - + + No block source available... + + + + Processed %1 of %2 (estimated) blocks of transaction history. @@ -570,7 +570,7 @@ This product includes software developed by the OpenSSL Project for use in the O - + %1 behind @@ -585,7 +585,7 @@ This product includes software developed by the OpenSSL Project for use in the O - + Error @@ -600,22 +600,22 @@ This product includes software developed by the OpenSSL Project for use in the O - + This transaction is over the size limit. You can still send it for a fee of %1, which goes to the nodes that process your transaction and helps to support the network. Do you want to pay the fee? - + Up to date Actualizat - + Catching up... Se actualizează... - + Confirm transaction fee Confirma taxa tranzactiei @@ -661,7 +661,7 @@ Address: %4 Portofelul electronic este <b>criptat</b> iar in momentul de faţă este <b>blocat</b> - + A fatal error occurred. Bitcoin can no longer continue safely and will quit. @@ -669,7 +669,7 @@ Address: %4 ClientModel - + Network Alert Alerta retea @@ -800,8 +800,8 @@ Address: %4 - Optional transaction fee per kB that helps make sure your transactions are processed quickly. Most transactions are 1 kB. Fee 0.01 recommended. - Taxa de tranzacție opțional pe kB, care vă ajută sa va asigurati că tranzacțiile sunt procesate rapid. Cele mai multe tranzacții sunt de la 1 kB. Taxa de 0.01 recomandat. + Optional transaction fee per kB that helps make sure your transactions are processed quickly. Most transactions are 1 kB. + @@ -1050,7 +1050,7 @@ Address: %4 Totalul tranzacţiilor care aşteaptă să fie confirmate şi care nu sunt încă luate în calcul la afişarea soldului contului. - + out of sync Nu este sincronizat @@ -1636,6 +1636,19 @@ Address: %4 Mesaj verificat + + SplashScreen + + + The Bitcoin developers + + + + + [testnet] + [testnet] + + TransactionDesc @@ -2110,10 +2123,28 @@ Address: %4 către + + WalletModel + + + Send Coins + Trimite Bitcoin + + WalletView - + + &Export + + + + + Export the data in the current tab to a file + + + + Backup Wallet @@ -2146,37 +2177,37 @@ Address: %4 bitcoin-core - + Bitcoin version versiunea Bitcoin - + Usage: Uz: - + Send command to -server or bitcoind Trimite comanda la -server sau bitcoind - + List commands Listă de comenzi - + Get help for a command Ajutor pentru o comandă - + Options: Setări: - + Specify configuration file (default: bitcoin.conf) Specifica-ți configurația fisierului (in mod normal: bitcoin.conf) @@ -2186,27 +2217,17 @@ Address: %4 - - Generate coins - Generare monede - - - - Don't generate coins - Nu genera monede! - - - + Specify data directory Specifica datele directorului - + Set database cache size in megabytes (default: 25) Seteaza marimea cache a bazei de date in MB (initial: 25) - + Listen for connections on <port> (default: 8333 or testnet: 18333) Lista a conectiunile in <port> (initial: 8333 sau testnet: 18333) @@ -2221,7 +2242,7 @@ Address: %4 Conecteaza-te la nod pentru a optine adresa peer, si deconecteaza-te - + Specify your own public address Specifica adresa ta publica @@ -2231,22 +2252,22 @@ Address: %4 Prag pentru deconectarea colegii funcționează corect (implicit: 100) - + Number of seconds to keep misbehaving peers from reconnecting (default: 86400) Numărul de secunde pentru a păstra colegii funcționează corect la reconectare (implicit: 86400) - + An error occurred while setting up the RPC port %u for listening on IPv4: %s - + Listen for JSON-RPC connections on <port> (default: 8332 or testnet: 18332) - + Accept command line and JSON-RPC commands Se accepta command line si comenzi JSON-RPC @@ -2256,18 +2277,18 @@ Address: %4 Ruleaza în background ca un demon și accepta comenzi. - + Use the test network Utilizeaza test de retea - + Accept connections from outside (default: 1 if no -proxy or -connect) Accepta conexiuni de la straini (initial: 1 if no -proxy or -connect) - + %s, you must set a rpcpassword in the configuration file: %s It is recommended you use the following random password: @@ -2296,11 +2317,6 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. Cannot obtain a lock on data directory %s. Bitcoin is probably already running. - - - Error initializing database environment %s! To recover, BACKUP THAT DIRECTORY, then remove everything from it except for wallet.dat. - - Error: The transaction was rejected! This might happen if some of the coins in your wallet were already spent, such as if you used a copy of wallet.dat and coins were spent in the copy but not marked as spent here. @@ -2327,12 +2343,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. Seteaza marimea maxima a tranzactie mare/mica in bytes (initial:27000) - - Set the number of script verification threads (1-16, 0=auto, default: 0) - - - - + This is a pre-release test build - use at your own risk - do not use for mining or merchant applications @@ -2372,7 +2383,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. Optiuni creare block - + Connect only to the specified node(s) Conecteaza-te doar la nod(urile) specifice @@ -2392,7 +2403,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. - + Error initializing block database @@ -2416,11 +2427,6 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. Error: Disk space is low! - - - Error: Transaction creation failed! - - Error: Wallet locked, unable to create transaction! @@ -2492,7 +2498,12 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. - + + Generate coins (default: 0) + + + + How many blocks to check at startup (default: 288, 0 = all) @@ -2502,7 +2513,12 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. - + + Not enough file descriptors available. + + + + Rebuild block chain index from current blk000??.dat files @@ -2512,7 +2528,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. - + Verifying blocks... @@ -2522,12 +2538,17 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. - + Imports blocks from external blk000??.dat file - + + Set the number of script verification threads (up to 16, 0 = auto, <0 = leave that many cores free, default: 0) + + + + Information @@ -2536,6 +2557,16 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. Invalid -tor address: '%s' + + + Invalid amount for -minrelaytxfee=<amount>: '%s' + + + + + Invalid amount for -mintxfee=<amount>: '%s' + + Maintain a full transaction index (default: 0) @@ -2552,7 +2583,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. - + Only accept block chain matching built-in checkpoints (default: 1) @@ -2611,6 +2642,11 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. Shrink debug.log file on client startup (default: 1 when no -debug) + + + Signing transaction failed + + Specify connection timeout in milliseconds (default: 5000) @@ -2622,7 +2658,22 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. - + + Transaction amount too small + + + + + Transaction amounts must be positive + + + + + Transaction too large + + + + Use UPnP to map the listening port (default: 0) Foloseste UPnP pentru a vedea porturile (initial: 0) @@ -2662,7 +2713,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. - + Password for JSON-RPC connections Parola pentru conectiunile JSON-RPC @@ -2677,17 +2728,17 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. Trimite comenzi la nod, ruland pe ip-ul (initial: 127.0.0.1) - + Execute command when the best block changes (%s in cmd is replaced by block hash) Executa comanda cand cel mai bun block se schimba (%s in cmd se inlocuieste cu block hash) - + Upgrade wallet to latest format Actualizeaza portofelul la ultimul format - + Set key pool size to <n> (default: 100) Setarea marimii cheii bezinului la <n>(initial 100) @@ -2697,12 +2748,12 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. Rescanare lanțul de bloc pentru tranzacțiile portofel lipsă - + Use OpenSSL (https) for JSON-RPC connections Foloseste Open SSL(https) pentru coneciunile JSON-RPC - + Server certificate file (default: server.cert) Certificatul serverulu (initial: server.cert) @@ -2712,39 +2763,39 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. Cheia privata a serverului ( initial: server.pem) - + Acceptable ciphers (default: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH) Accepta cifruri (initial: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH) - + This help message Acest mesaj de ajutor. - + Unable to bind to %s on this computer (bind returned error %d, %s) Nu se poate lega %s cu acest calculator (retunare eroare legatura %d, %s) - + Connect through socks proxy Conectează prin proxy SOCKS - + Allow DNS lookups for -addnode, -seednode and -connect Permite DNS-ului sa se uite dupa -addnode, -seednode si -connect - + Loading addresses... Încarc adrese... - + Error loading wallet.dat: Wallet corrupted Eroare incarcand wallet.dat: Portofel corupt @@ -2754,22 +2805,22 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. Eroare incarcare wallet.dat: Portofelul are nevoie de o versiune Bitcoin mai noua - + Wallet needed to be rewritten: restart Bitcoin to complete Portofelul trebuie rescris: restarteaza aplicatia bitcoin pentru a face asta. - + Error loading wallet.dat Eroare incarcand wallet.dat - + Invalid -proxy address: '%s' Adresa proxy invalida: '%s' - + Unknown network specified in -onlynet: '%s' Retea specificata necunoscuta -onlynet: '%s' @@ -2779,7 +2830,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. Necunoscut -socks proxy version requested: %i - + Cannot resolve -bind address: '%s' Nu se poate rezolca -bind address: '%s' @@ -2799,17 +2850,17 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. Suma invalida - + Insufficient funds Fonduri insuficiente - + Loading block index... Încarc indice bloc... - + Add a node to connect to and attempt to keep the connection open Add a node to connect to and attempt to keep the connection open details suggestions history @@ -2821,52 +2872,47 @@ details suggestions history Imposibilitatea de a lega la% s pe acest computer. Bitcoin este, probabil, deja în execuție. - + Fee per KB to add to transactions you send Taxa pe kb pentru a adauga tranzactii trimise - + Loading wallet... Încarc portofel... - + Cannot downgrade wallet Nu se poate face downgrade la portofel - - - Cannot initialize keypool - Nu se poate initializa keypool - Cannot write default address Nu se poate scrie adresa initiala - + Rescanning... Rescanez... - + Done loading Încărcare terminată - + To use the %s option Pentru a folosii optiunea %s - + Error Eroare - + You must set rpcpassword=<password> in the configuration file: %s If the file does not exist, create it with owner-readable-only file permissions. diff --git a/src/qt/locale/bitcoin_ru.ts b/src/qt/locale/bitcoin_ru.ts index c7bcd641f7..5660bce014 100644 --- a/src/qt/locale/bitcoin_ru.ts +++ b/src/qt/locale/bitcoin_ru.ts @@ -28,14 +28,14 @@ This product includes software developed by the OpenSSL Project for use in the O Этот продукт включает ПО, разработанное OpenSSL Project для использования в OpenSSL Toolkit (http://www.openssl.org/) и криптографическое ПО, написанное Eric Young (eay@cryptsoft.com) и ПО для работы с UPnP, написанное Thomas Bernard. - + Copyright Все права защищены - 2009-%1 The Bitcoin developers - 2009-%1 разработчики Bitcoin + The Bitcoin developers + Разработчики Bitcoin @@ -66,7 +66,7 @@ This product includes software developed by the OpenSSL Project for use in the O &Новый адрес - + These are your Bitcoin addresses for receiving payments. You may want to give a different one to each sender so you can keep track of who is paying you. Это Ваши адреса для получения платежей. Вы можете дать разные адреса отправителям, чтобы отслеживать, кто именно вам платит. @@ -96,7 +96,17 @@ This product includes software developed by the OpenSSL Project for use in the O Удалить выбранный адрес из списка - + + Export the data in the current tab to a file + Экспортировать данные из вкладки в файл + + + + &Export + &Экспорт + + + Verify a message to ensure it was signed with a specified Bitcoin address Проверить сообщение, чтобы убедиться, что оно было подписано указанным адресом Bitcoin @@ -318,12 +328,12 @@ This product includes software developed by the OpenSSL Project for use in the O &Подписать сообщение... - + Synchronizing with network... Синхронизация с сетью... - + &Overview О&бзор @@ -398,7 +408,7 @@ This product includes software developed by the OpenSSL Project for use in the O &Изменить пароль... - + Importing blocks from disk... Импортируются блоки с диска... @@ -408,12 +418,7 @@ This product includes software developed by the OpenSSL Project for use in the O Идёт переиндексация блоков на диске... - - &Export... - &Экспорт... - - - + Send coins to a Bitcoin address Отправить монеты на указанный адрес Bitcoin @@ -423,12 +428,7 @@ This product includes software developed by the OpenSSL Project for use in the O Изменить параметры конфигурации Bitcoin - - Export the data in the current tab to a file - Экспортировать данные из вкладки в файл - - - + Backup wallet to another location Сделать резервную копию бумажника в другом месте @@ -438,7 +438,7 @@ This product includes software developed by the OpenSSL Project for use in the O Изменить пароль шифрования бумажника - + &Debug window &Окно отладки @@ -448,23 +448,23 @@ This product includes software developed by the OpenSSL Project for use in the O Открыть консоль отладки и диагностики - + &Verify message... &Проверить сообщение... - - + + Bitcoin Биткоин - + Wallet Бумажник - + &Send &Отправить @@ -509,12 +509,12 @@ This product includes software developed by the OpenSSL Project for use in the O Проверить сообщения, чтобы удостовериться, что они были подписаны определённым адресом Bitcoin - + &File &Файл - + &Settings &Настройки @@ -529,12 +529,7 @@ This product includes software developed by the OpenSSL Project for use in the O Панель вкладок - - Actions toolbar - Панель действий - - - + [testnet] [тестовая сеть] @@ -545,12 +540,17 @@ This product includes software developed by the OpenSSL Project for use in the O Bitcoin клиент - + %n active connection(s) to Bitcoin network %n активное соединение с сетью%n активных соединений с сетью%n активных соединений с сетью - + + No block source available... + Источник блоков недоступен... + + + Processed %1 of %2 (estimated) blocks of transaction history. Обработано %1 из %2 (примерно) блоков истории транзакций. @@ -575,7 +575,7 @@ This product includes software developed by the OpenSSL Project for use in the O %n неделя%n недели%n недель - + %1 behind %1 позади @@ -590,7 +590,7 @@ This product includes software developed by the OpenSSL Project for use in the O Транзакции после этой пока не будут видны. - + Error Ошибка @@ -605,22 +605,22 @@ This product includes software developed by the OpenSSL Project for use in the O Информация - + This transaction is over the size limit. You can still send it for a fee of %1, which goes to the nodes that process your transaction and helps to support the network. Do you want to pay the fee? Транзакция превышает максимальный размер. Вы можете провести её, заплатив комиссию %1, которая достанется узлам, обрабатывающим эту транзакцию, и поможет работе сети. Вы действительно хотите заплатить комиссию? - + Up to date Синхронизировано - + Catching up... Синхронизируется... - + Confirm transaction fee Подтвердите комиссию @@ -670,7 +670,7 @@ Address: %4 Бумажник <b>зашифрован</b> и в настоящее время <b>заблокирован</b> - + A fatal error occurred. Bitcoin can no longer continue safely and will quit. Произошла неисправимая ошибка. Bitcoin не может безопасно продолжать работу и будет закрыт. @@ -678,7 +678,7 @@ Address: %4 ClientModel - + Network Alert Сетевая Тревога @@ -809,8 +809,8 @@ Address: %4 - Optional transaction fee per kB that helps make sure your transactions are processed quickly. Most transactions are 1 kB. Fee 0.01 recommended. - Необязательная комиссия за каждый КБ транзакции, которая позволяет быть уверенным, что Ваша транзакция будет обработана быстро. Большинство транзакций занимают 1КБ. Рекомендуется комиссия 0.01. + Optional transaction fee per kB that helps make sure your transactions are processed quickly. Most transactions are 1 kB. + Необязательная комиссия за каждый КБ транзакции, которая ускоряет обработку Ваших транзакций. Большинство транзакций занимают 1КБ. @@ -1059,7 +1059,7 @@ Address: %4 Общая сумма всех транзакций, которые до сих пор не подтверждены, и до сих пор не учитываются в текущем балансе - + out of sync не синхронизировано @@ -1645,6 +1645,19 @@ Address: %4 Сообщение проверено. + + SplashScreen + + + The Bitcoin developers + Разработчики Bitcoin + + + + [testnet] + [тестовая сеть] + + TransactionDesc @@ -2119,10 +2132,28 @@ Address: %4 до + + WalletModel + + + Send Coins + Отправка + + WalletView - + + &Export + &Экспорт + + + + Export the data in the current tab to a file + Экспортировать данные из вкладки в файл + + + Backup Wallet Сделать резервную копию бумажника @@ -2155,38 +2186,38 @@ Address: %4 bitcoin-core - + Bitcoin version Версия - + Usage: Использование: - + Send command to -server or bitcoind Отправить команду на -server или bitcoind - + List commands Список команд - + Get help for a command Получить помощь по команде - + Options: Опции: - + Specify configuration file (default: bitcoin.conf) Указать конфигурационный файл (по умолчанию: bitcoin.conf) @@ -2196,27 +2227,17 @@ Address: %4 Задать pid-файл (по умолчанию: bitcoin.pid) - - Generate coins - Генерировать монеты - - - - Don't generate coins - Не генерировать монеты - - - + Specify data directory Задать каталог данных - + Set database cache size in megabytes (default: 25) Установить размер кэша базы данных в мегабайтах (по умолчанию: 25) - + Listen for connections on <port> (default: 8333 or testnet: 18333) Принимать входящие подключения на <port> (по умолчанию: 8333 или 18333 в тестовой сети) @@ -2231,7 +2252,7 @@ Address: %4 Подключиться к узлу, чтобы получить список адресов других участников и отключиться - + Specify your own public address Укажите ваш собственный публичный адрес @@ -2241,22 +2262,22 @@ Address: %4 Порог для отключения неправильно ведущих себя узлов (по умолчанию: 100) - + Number of seconds to keep misbehaving peers from reconnecting (default: 86400) Число секунд блокирования неправильно ведущих себя узлов (по умолчанию: 86400) - + An error occurred while setting up the RPC port %u for listening on IPv4: %s Произошла ошибка при открытии RPC-порта %u для прослушивания на IPv4: %s - + Listen for JSON-RPC connections on <port> (default: 8332 or testnet: 18332) Прослушивать подключения JSON-RPC на <порту> (по умолчанию: 8332 или для testnet: 18332) - + Accept command line and JSON-RPC commands Принимать командную строку и команды JSON-RPC @@ -2266,17 +2287,17 @@ Address: %4 Запускаться в фоне как демон и принимать команды - + Use the test network Использовать тестовую сеть - + Accept connections from outside (default: 1 if no -proxy or -connect) Принимать подключения извне (по умолчанию: 1, если не используется -proxy или -connect) - + %s, you must set a rpcpassword in the configuration file: %s It is recommended you use the following random password: @@ -2315,11 +2336,6 @@ rpcpassword=%s Cannot obtain a lock on data directory %s. Bitcoin is probably already running. Не удаётся установить блокировку на каталог данных %s. Возможно, Bitcoin уже работает. - - - Error initializing database environment %s! To recover, BACKUP THAT DIRECTORY, then remove everything from it except for wallet.dat. - Ошибка инициализации окружения базы данных %s! Чтобы восстановить работоспособность, СДЕЛАЙТЕ РЕЗЕРВНУЮ КОПИЮ ЭТОГО КАТАЛОГА, после чего удалите из него всё, кроме wallet.dat. - Error: The transaction was rejected! This might happen if some of the coins in your wallet were already spent, such as if you used a copy of wallet.dat and coins were spent in the copy but not marked as spent here. @@ -2346,12 +2362,7 @@ rpcpassword=%s Максимальный размер высокоприоритетных/низкокомиссионных транзакций в байтах (по умолчанию: 27000) - - Set the number of script verification threads (1-16, 0=auto, default: 0) - Задать число потоков проверки скрипта (1-16, 0=авто, по умолчанию: 0) - - - + This is a pre-release test build - use at your own risk - do not use for mining or merchant applications Это пре-релизная тестовая сборка - используйте на свой страх и риск - не используйте для добычи или торговых приложений @@ -2391,7 +2402,7 @@ rpcpassword=%s Параметры создания блоков: - + Connect only to the specified node(s) Подключаться только к указанному узлу(ам) @@ -2411,7 +2422,7 @@ rpcpassword=%s Пересобрать БД блоков прямо сейчас? - + Error initializing block database Ошибка инициализации БД блоков @@ -2435,11 +2446,6 @@ rpcpassword=%s Error: Disk space is low! Ошибка: мало места на диске! - - - Error: Transaction creation failed! - Ошибка: не удалось создать транзакцию! - Error: Wallet locked, unable to create transaction! @@ -2511,7 +2517,12 @@ rpcpassword=%s Искать узлы с помощью DNS (по умолчанию: 1, если не указан -connect) - + + Generate coins (default: 0) + Включить добычу монет (по умолчанию: 0) + + + How many blocks to check at startup (default: 288, 0 = all) Сколько блоков проверять при запуске (по умолчанию: 288, 0 = все) @@ -2521,7 +2532,12 @@ rpcpassword=%s Насколько тщательно проверять блок (0-4, по умолчанию: 3) - + + Not enough file descriptors available. + Недостаточно файловых дескрипторов. + + + Rebuild block chain index from current blk000??.dat files Перестроить индекс цепи блоков из текущих файлов blk000??.dat @@ -2531,7 +2547,7 @@ rpcpassword=%s Задать число потоков выполнения(по умолчанию: 4) - + Verifying blocks... Проверка блоков... @@ -2541,12 +2557,17 @@ rpcpassword=%s Проверка бумажника... - + Imports blocks from external blk000??.dat file Импортировать блоки из внешнего файла blk000??.dat - + + Set the number of script verification threads (up to 16, 0 = auto, <0 = leave that many cores free, default: 0) + Задать число потоков проверки скрипта (вплоть до 16, 0=авто, <0 = оставить столько ядер свободными, по умолчанию: 0) + + + Information Информация @@ -2555,6 +2576,16 @@ rpcpassword=%s Invalid -tor address: '%s' Неверный адрес -tor: '%s' + + + Invalid amount for -minrelaytxfee=<amount>: '%s' + Неверное количество в параметре -minrelaytxfee=<кол-во>: '%s' + + + + Invalid amount for -mintxfee=<amount>: '%s' + Неверное количество в параметре -mintxfee=<кол-во>: '%s' + Maintain a full transaction index (default: 0) @@ -2571,7 +2602,7 @@ rpcpassword=%s Максимальный размер буфера отправки на соединение, <n>*1000 байт (по умолчанию: 1000) - + Only accept block chain matching built-in checkpoints (default: 1) Принимать цепь блоков, только если она соответствует встроенным контрольным точкам (по умолчанию: 1) @@ -2631,6 +2662,11 @@ rpcpassword=%s Shrink debug.log file on client startup (default: 1 when no -debug) Сжимать файл debug.log при запуске клиента (по умолчанию: 1, если нет -debug) + + + Signing transaction failed + Не удалось подписать транзакцию + Specify connection timeout in milliseconds (default: 5000) @@ -2642,7 +2678,22 @@ rpcpassword=%s Системная ошибка: - + + Transaction amount too small + Объём транзакции слишком мал + + + + Transaction amounts must be positive + Объём транзакции должен быть положителен + + + + Transaction too large + Транзакция слишком большая + + + Use UPnP to map the listening port (default: 0) Использовать UPnP для проброса порта (по умолчанию: 0) @@ -2682,7 +2733,7 @@ rpcpassword=%s wallet.dat повреждён, спасение данных не удалось - + Password for JSON-RPC connections Пароль для подключений JSON-RPC @@ -2697,17 +2748,17 @@ rpcpassword=%s Посылать команды узлу, запущенному на <ip> (по умолчанию: 127.0.0.1) - + Execute command when the best block changes (%s in cmd is replaced by block hash) Выполнить команду, когда появляется новый блок (%s в команде заменяется на хэш блока) - + Upgrade wallet to latest format Обновить бумажник до последнего формата - + Set key pool size to <n> (default: 100) Установить размер запаса ключей в <n> (по умолчанию: 100) @@ -2717,12 +2768,12 @@ rpcpassword=%s Перепроверить цепь блоков на предмет отсутствующих в бумажнике транзакций - + Use OpenSSL (https) for JSON-RPC connections Использовать OpenSSL (https) для подключений JSON-RPC - + Server certificate file (default: server.cert) Файл серверного сертификата (по умолчанию: server.cert) @@ -2732,37 +2783,37 @@ rpcpassword=%s Приватный ключ сервера (по умолчанию: server.pem) - + Acceptable ciphers (default: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH) Разрешённые алгоритмы (по умолчанию: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH) - + This help message Эта справка - + Unable to bind to %s on this computer (bind returned error %d, %s) Невозможно привязаться к %s на этом компьютере (bind вернул ошибку %d, %s) - + Connect through socks proxy Подключаться через socks прокси - + Allow DNS lookups for -addnode, -seednode and -connect Разрешить поиск в DNS для -addnode, -seednode и -connect - + Loading addresses... Загрузка адресов... - + Error loading wallet.dat: Wallet corrupted Ошибка загрузки wallet.dat: Бумажник поврежден @@ -2772,22 +2823,22 @@ rpcpassword=%s Ошибка загрузки wallet.dat: бумажник требует более новую версию Bitcoin - + Wallet needed to be rewritten: restart Bitcoin to complete Необходимо перезаписать бумажник, перезапустите Bitcoin для завершения операции. - + Error loading wallet.dat Ошибка при загрузке wallet.dat - + Invalid -proxy address: '%s' Неверный адрес -proxy: '%s' - + Unknown network specified in -onlynet: '%s' В параметре -onlynet указана неизвестная сеть: '%s' @@ -2797,7 +2848,7 @@ rpcpassword=%s В параметре -socks запрошена неизвестная версия: %i - + Cannot resolve -bind address: '%s' Не удаётся разрешить адрес в параметре -bind: '%s' @@ -2817,17 +2868,17 @@ rpcpassword=%s Неверное количество - + Insufficient funds Недостаточно монет - + Loading block index... Загрузка индекса блоков... - + Add a node to connect to and attempt to keep the connection open Добавить узел для подключения и пытаться поддерживать соединение открытым @@ -2837,52 +2888,47 @@ rpcpassword=%s Невозможно привязаться к %s на этом компьютере. Возможно, Bitcoin уже работает. - + Fee per KB to add to transactions you send Комиссия на килобайт, добавляемая к вашим транзакциям - + Loading wallet... Загрузка бумажника... - + Cannot downgrade wallet Не удаётся понизить версию бумажника - - - Cannot initialize keypool - Не удаётся инициализировать массив ключей - Cannot write default address Не удаётся записать адрес по умолчанию - + Rescanning... Сканирование... - + Done loading Загрузка завершена - + To use the %s option Чтобы использовать опцию %s - + Error Ошибка - + You must set rpcpassword=<password> in the configuration file: %s If the file does not exist, create it with owner-readable-only file permissions. diff --git a/src/qt/locale/bitcoin_sk.ts b/src/qt/locale/bitcoin_sk.ts index 9f0ba22a82..72d8a8d57a 100644 --- a/src/qt/locale/bitcoin_sk.ts +++ b/src/qt/locale/bitcoin_sk.ts @@ -23,13 +23,13 @@ This product includes software developed by the OpenSSL Project for use in the O - + Copyright - 2009-%1 The Bitcoin developers + The Bitcoin developers @@ -61,7 +61,7 @@ This product includes software developed by the OpenSSL Project for use in the O &Nová adresa - + These are your Bitcoin addresses for receiving payments. You may want to give a different one to each sender so you can keep track of who is paying you. Toto sú Vaše Bitcoin adresy pre prijímanie platieb. Môžete dať každému odosielateľovi inú rôznu adresu a tak udržiavať prehľad o platbách. @@ -91,7 +91,17 @@ This product includes software developed by the OpenSSL Project for use in the O - + + Export the data in the current tab to a file + Exportovať tento náhľad do súboru + + + + &Export + + + + Verify a message to ensure it was signed with a specified Bitcoin address @@ -313,12 +323,12 @@ This product includes software developed by the OpenSSL Project for use in the O Podpísať &správu... - + Synchronizing with network... Synchronizácia so sieťou... - + &Overview &Prehľad @@ -393,7 +403,7 @@ This product includes software developed by the OpenSSL Project for use in the O &Zmena Hesla... - + Importing blocks from disk... @@ -403,12 +413,7 @@ This product includes software developed by the OpenSSL Project for use in the O - - &Export... - &Export... - - - + Send coins to a Bitcoin address Poslať bitcoins na adresu @@ -418,12 +423,7 @@ This product includes software developed by the OpenSSL Project for use in the O Upraviť možnosti nastavenia pre bitcoin - - Export the data in the current tab to a file - Exportovať tento náhľad do súboru - - - + Backup wallet to another location Zálohovať peňaženku na iné miesto @@ -433,33 +433,33 @@ This product includes software developed by the OpenSSL Project for use in the O Zmeniť heslo použité na šifrovanie peňaženky - + &Debug window - + &Okno pre ladenie Open debugging and diagnostic console - + Otvor konzolu pre ladenie a diagnostiku - + &Verify message... - - + + Bitcoin - + Wallet Peňaženka - + &Send @@ -504,12 +504,12 @@ This product includes software developed by the OpenSSL Project for use in the O - + &File &Súbor - + &Settings &Nastavenia @@ -524,12 +524,7 @@ This product includes software developed by the OpenSSL Project for use in the O Lišta záložiek - - Actions toolbar - Lišta aktvivít - - - + [testnet] [testovacia sieť] @@ -537,15 +532,20 @@ This product includes software developed by the OpenSSL Project for use in the O Bitcoin client - + Bitcoin klient - + %n active connection(s) to Bitcoin network %n aktívne spojenie v Bitcoin sieti%n aktívne spojenia v Bitcoin sieti%n aktívnych spojení v Bitconi sieti - + + No block source available... + + + + Processed %1 of %2 (estimated) blocks of transaction history. @@ -570,7 +570,7 @@ This product includes software developed by the OpenSSL Project for use in the O - + %1 behind @@ -585,7 +585,7 @@ This product includes software developed by the OpenSSL Project for use in the O - + Error @@ -600,24 +600,24 @@ This product includes software developed by the OpenSSL Project for use in the O - + This transaction is over the size limit. You can still send it for a fee of %1, which goes to the nodes that process your transaction and helps to support the network. Do you want to pay the fee? - + Up to date Aktualizovaný - + Catching up... Sťahujem... - + Confirm transaction fee - + Potvrď poplatok za transakciu. @@ -664,7 +664,7 @@ Adresa: %4 Peňaženka je <b>zašifrovaná</b> a momentálne <b>zamknutá</b> - + A fatal error occurred. Bitcoin can no longer continue safely and will quit. @@ -672,7 +672,7 @@ Adresa: %4 ClientModel - + Network Alert @@ -803,8 +803,8 @@ Adresa: %4 - Optional transaction fee per kB that helps make sure your transactions are processed quickly. Most transactions are 1 kB. Fee 0.01 recommended. - Voliteľný transakčný poplatok za kB ktorý pomôže rýchlemu spracovaniu transakcie. Väčšina transakcií má 1 kB. Poplatok 0.01 je odporúčaný. + Optional transaction fee per kB that helps make sure your transactions are processed quickly. Most transactions are 1 kB. + @@ -1053,7 +1053,7 @@ Adresa: %4 Suma transakcií ktoré ešte neboli potvrdené a nezapočítavaju sa do celkového zostatku. - + out of sync @@ -1102,7 +1102,7 @@ Adresa: %4 Error encoding URI into QR Code. - + Chyba v zakódovaní URI do QR kódu @@ -1112,17 +1112,17 @@ Adresa: %4 Resulting URI too long, try to reduce the text for label / message. - + Výsledné URI príliš dlhé, skráť text pre názov / správu. Save QR Code - + Ukladanie QR kódu PNG Images (*.png) - + PNG obrázky (*.png) @@ -1130,7 +1130,7 @@ Adresa: %4 Client name - + Meno klienta @@ -1144,12 +1144,12 @@ Adresa: %4 N/A - + nie je k dispozícii Client version - + Verzia klienta @@ -1169,27 +1169,27 @@ Adresa: %4 Network - + Sieť Number of connections - + Počet pripojení On testnet - + Na testovacej sieti Block chain - + Reťazec blokov Current number of blocks - + Aktuálny počet blokov @@ -1639,6 +1639,19 @@ Adresa: %4 + + SplashScreen + + + The Bitcoin developers + + + + + [testnet] + [testovacia sieť] + + TransactionDesc @@ -2113,10 +2126,28 @@ Adresa: %4 do + + WalletModel + + + Send Coins + Poslať Bitcoins + + WalletView - + + &Export + + + + + Export the data in the current tab to a file + Exportovať tento náhľad do súboru + + + Backup Wallet @@ -2149,37 +2180,37 @@ Adresa: %4 bitcoin-core - + Bitcoin version Bitcoin verzia - + Usage: Použitie: - + Send command to -server or bitcoind Odoslať príkaz -server alebo bitcoind - + List commands Zoznam príkazov - + Get help for a command Dostať pomoc pre príkaz - + Options: Možnosti: - + Specify configuration file (default: bitcoin.conf) Určiť súbor s nastaveniami (predvolené: bitcoin.conf) @@ -2189,27 +2220,17 @@ Adresa: %4 Určiť súbor pid (predvolené: bitcoind.pid) - - Generate coins - Počítaj bitcoins - - - - Don't generate coins - Nepočítaj bitcoins - - - + Specify data directory Určiť priečinok s dátami - + Set database cache size in megabytes (default: 25) - + Veľkosť vyrovnávajúcej pamäte pre databázu v megabytoch (predvolené:25) - + Listen for connections on <port> (default: 8333 or testnet: 18333) Načúvať spojeniam na <port> (prednastavené: 8333 alebo testovacia sieť: 18333) @@ -2224,32 +2245,32 @@ Adresa: %4 - + Specify your own public address Threshold for disconnecting misbehaving peers (default: 100) - + Hranica pre odpojenie zle sa správajúcich peerov (predvolené: 100) - + Number of seconds to keep misbehaving peers from reconnecting (default: 86400) - + Počet sekúnd kedy sa zabráni zle sa správajúcim peerom znovupripojenie (predvolené: 86400) - + An error occurred while setting up the RPC port %u for listening on IPv4: %s - + Listen for JSON-RPC connections on <port> (default: 8332 or testnet: 18332) Počúvať JSON-RPC spojeniam na <port> (predvolené: 8332 or testnet: 18332) - + Accept command line and JSON-RPC commands Prijímať príkazy z príkazového riadku a JSON-RPC @@ -2259,17 +2280,17 @@ Adresa: %4 Bežať na pozadí ako démon a prijímať príkazy - + Use the test network Použiť testovaciu sieť - + Accept connections from outside (default: 1 if no -proxy or -connect) - + %s, you must set a rpcpassword in the configuration file: %s It is recommended you use the following random password: @@ -2298,11 +2319,6 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. Cannot obtain a lock on data directory %s. Bitcoin is probably already running. - - - Error initializing database environment %s! To recover, BACKUP THAT DIRECTORY, then remove everything from it except for wallet.dat. - - Error: The transaction was rejected! This might happen if some of the coins in your wallet were already spent, such as if you used a copy of wallet.dat and coins were spent in the copy but not marked as spent here. @@ -2329,12 +2345,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. - - Set the number of script verification threads (1-16, 0=auto, default: 0) - - - - + This is a pre-release test build - use at your own risk - do not use for mining or merchant applications @@ -2374,7 +2385,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. - + Connect only to the specified node(s) Pripojiť sa len k určenej nóde @@ -2394,7 +2405,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. - + Error initializing block database @@ -2418,11 +2429,6 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. Error: Disk space is low! - - - Error: Transaction creation failed! - - Error: Wallet locked, unable to create transaction! @@ -2494,7 +2500,12 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. - + + Generate coins (default: 0) + + + + How many blocks to check at startup (default: 288, 0 = all) @@ -2504,7 +2515,12 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. - + + Not enough file descriptors available. + + + + Rebuild block chain index from current blk000??.dat files @@ -2514,7 +2530,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. - + Verifying blocks... @@ -2524,12 +2540,17 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. - + Imports blocks from external blk000??.dat file - + + Set the number of script verification threads (up to 16, 0 = auto, <0 = leave that many cores free, default: 0) + + + + Information @@ -2538,6 +2559,16 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. Invalid -tor address: '%s' Neplatná adresa tor: '%s' + + + Invalid amount for -minrelaytxfee=<amount>: '%s' + + + + + Invalid amount for -mintxfee=<amount>: '%s' + + Maintain a full transaction index (default: 0) @@ -2554,7 +2585,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. - + Only accept block chain matching built-in checkpoints (default: 1) @@ -2613,6 +2644,11 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. Shrink debug.log file on client startup (default: 1 when no -debug) + + + Signing transaction failed + + Specify connection timeout in milliseconds (default: 5000) @@ -2624,7 +2660,22 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. - + + Transaction amount too small + + + + + Transaction amounts must be positive + + + + + Transaction too large + + + + Use UPnP to map the listening port (default: 0) Skúsiť použiť UPnP pre mapovanie počúvajúceho portu (default: 0) @@ -2664,7 +2715,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. - + Password for JSON-RPC connections Heslo pre JSON-rPC spojenia @@ -2679,17 +2730,17 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. Poslať príkaz nóde bežiacej na <ip> (predvolené: 127.0.0.1) - + Execute command when the best block changes (%s in cmd is replaced by block hash) - + Vykonaj príkaz, ak zmeny v najlepšom bloku (%s v príkaze nahradí blok hash) - + Upgrade wallet to latest format - + Aktualizuj peňaženku na najnovší formát. - + Set key pool size to <n> (default: 100) Nastaviť zásobu adries na <n> (predvolené: 100) @@ -2699,12 +2750,12 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. Znovu skenovať reťaz blokov pre chýbajúce transakcie - + Use OpenSSL (https) for JSON-RPC connections Použiť OpenSSL (https) pre JSON-RPC spojenia - + Server certificate file (default: server.cert) Súbor s certifikátom servra (predvolené: server.cert) @@ -2714,37 +2765,37 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. Súkromný kľúč servra (predvolené: server.pem) - + Acceptable ciphers (default: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH) Prijateľné šifry (predvolené: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH) - + This help message Táto pomocná správa - + Unable to bind to %s on this computer (bind returned error %d, %s) - + Connect through socks proxy Pripojenie cez socks proxy - + Allow DNS lookups for -addnode, -seednode and -connect Povoliť vyhľadávanie DNS pre pridanie nódy a spojenie - + Loading addresses... Načítavanie adries... - + Error loading wallet.dat: Wallet corrupted Chyba načítania wallet.dat: Peňaženka je poškodená @@ -2754,22 +2805,22 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. Chyba načítania wallet.dat: Peňaženka vyžaduje novšiu verziu Bitcoin - + Wallet needed to be rewritten: restart Bitcoin to complete Bolo potrebné prepísať peňaženku: dokončite reštartovaním Bitcoin - + Error loading wallet.dat Chyba načítania wallet.dat - + Invalid -proxy address: '%s' Neplatná adresa proxy: '%s' - + Unknown network specified in -onlynet: '%s' @@ -2779,7 +2830,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. - + Cannot resolve -bind address: '%s' @@ -2799,19 +2850,19 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. Neplatná suma - + Insufficient funds - + Nedostatok prostriedkov - + Loading block index... Načítavanie zoznamu blokov... - + Add a node to connect to and attempt to keep the connection open - Pridať nódu a pripojiť sa and attempt to keep the connection open + Pridať nód na pripojenie a pokus o udržanie pripojenia otvoreného @@ -2819,56 +2870,53 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. - + Fee per KB to add to transactions you send Poplatok za kB ktorý treba pridať k odoslanej transakcii - + Loading wallet... Načítavam peňaženku... - + Cannot downgrade wallet - - - - - Cannot initialize keypool - + Nie je možné prejsť na nižšiu verziu peňaženky Cannot write default address - + Nie je možné zapísať predvolenú adresu. - + Rescanning... - + Done loading Dokončené načítavanie - + To use the %s option - + Použiť %s možnosť. - + Error Chyba - + You must set rpcpassword=<password> in the configuration file: %s If the file does not exist, create it with owner-readable-only file permissions. - + Musíš nastaviť rpcpassword=<heslo> v konfiguračnom súbore: +%s +Ak súbor neexistuje, vytvor ho s oprávnením pre čítanie len vlastníkom (owner-readable-only) \ No newline at end of file diff --git a/src/qt/locale/bitcoin_sr.ts b/src/qt/locale/bitcoin_sr.ts index 01802e9964..051127788d 100644 --- a/src/qt/locale/bitcoin_sr.ts +++ b/src/qt/locale/bitcoin_sr.ts @@ -23,13 +23,13 @@ This product includes software developed by the OpenSSL Project for use in the O - + Copyright - 2009-%1 The Bitcoin developers + The Bitcoin developers @@ -61,7 +61,7 @@ This product includes software developed by the OpenSSL Project for use in the O &Нова адреса - + These are your Bitcoin addresses for receiving payments. You may want to give a different one to each sender so you can keep track of who is paying you. Ово су Ваше Bitcoin адресе за примање уплата. Можете да сваком пошиљаоцу дате другачију адресу да би пратили ко је вршио уплате. @@ -91,7 +91,17 @@ This product includes software developed by the OpenSSL Project for use in the O - + + Export the data in the current tab to a file + + + + + &Export + + + + Verify a message to ensure it was signed with a specified Bitcoin address @@ -313,12 +323,12 @@ This product includes software developed by the OpenSSL Project for use in the O - + Synchronizing with network... Синхронизација са мрежом у току... - + &Overview &Општи преглед @@ -393,7 +403,7 @@ This product includes software developed by the OpenSSL Project for use in the O Промени &лозинку... - + Importing blocks from disk... @@ -403,12 +413,7 @@ This product includes software developed by the OpenSSL Project for use in the O - - &Export... - &Извоз... - - - + Send coins to a Bitcoin address Пошаљите новац на bitcoin адресу @@ -418,12 +423,7 @@ This product includes software developed by the OpenSSL Project for use in the O Изаберите могућности bitcoin-а - - Export the data in the current tab to a file - - - - + Backup wallet to another location @@ -433,7 +433,7 @@ This product includes software developed by the OpenSSL Project for use in the O Мењање лозинке којом се шифрује новчаник - + &Debug window @@ -443,23 +443,23 @@ This product includes software developed by the OpenSSL Project for use in the O - + &Verify message... - - + + Bitcoin - + Wallet новчаник - + &Send @@ -504,12 +504,12 @@ This product includes software developed by the OpenSSL Project for use in the O - + &File &Фајл - + &Settings &Подешавања @@ -524,12 +524,7 @@ This product includes software developed by the OpenSSL Project for use in the O Трака са картицама - - Actions toolbar - Трака са алаткама - - - + [testnet] [testnet] @@ -540,12 +535,17 @@ This product includes software developed by the OpenSSL Project for use in the O - + %n active connection(s) to Bitcoin network %n активна веза са Bitcoin мрежом%n активне везе са Bitcoin мрежом%n активних веза са Bitcoin мрежом - + + No block source available... + + + + Processed %1 of %2 (estimated) blocks of transaction history. @@ -570,7 +570,7 @@ This product includes software developed by the OpenSSL Project for use in the O - + %1 behind @@ -585,7 +585,7 @@ This product includes software developed by the OpenSSL Project for use in the O - + Error @@ -600,22 +600,22 @@ This product includes software developed by the OpenSSL Project for use in the O - + This transaction is over the size limit. You can still send it for a fee of %1, which goes to the nodes that process your transaction and helps to support the network. Do you want to pay the fee? - + Up to date Ажурно - + Catching up... Ажурирање у току... - + Confirm transaction fee @@ -661,7 +661,7 @@ Address: %4 Новчаник јс <b>шифрован</b> и тренутно <b>закључан</b> - + A fatal error occurred. Bitcoin can no longer continue safely and will quit. @@ -669,7 +669,7 @@ Address: %4 ClientModel - + Network Alert @@ -800,7 +800,7 @@ Address: %4 - Optional transaction fee per kB that helps make sure your transactions are processed quickly. Most transactions are 1 kB. Fee 0.01 recommended. + Optional transaction fee per kB that helps make sure your transactions are processed quickly. Most transactions are 1 kB. @@ -1050,7 +1050,7 @@ Address: %4 - + out of sync @@ -1636,6 +1636,19 @@ Address: %4 + + SplashScreen + + + The Bitcoin developers + + + + + [testnet] + [testnet] + + TransactionDesc @@ -2110,10 +2123,28 @@ Address: %4 do + + WalletModel + + + Send Coins + Слање новца + + WalletView - + + &Export + + + + + Export the data in the current tab to a file + + + + Backup Wallet @@ -2146,38 +2177,38 @@ Address: %4 bitcoin-core - + Bitcoin version Bitcoin верзија - + Usage: Korišćenje: - + Send command to -server or bitcoind Pošalji naredbu na -server ili bitcoinid - + List commands Listaj komande - + Get help for a command Zatraži pomoć za komande - + Options: Opcije - + Specify configuration file (default: bitcoin.conf) Potvrdi željeni konfiguracioni fajl (podrazumevani:bitcoin.conf) @@ -2187,27 +2218,17 @@ Address: %4 Konkretizuj pid fajl (podrazumevani: bitcoind.pid) - - Generate coins - Generiši novčiće - - - - Don't generate coins - Ne generiši novčiće - - - + Specify data directory Gde je konkretni data direktorijum - + Set database cache size in megabytes (default: 25) - + Listen for connections on <port> (default: 8333 or testnet: 18333) Slušaj konekcije na <port> (default: 8333 or testnet: 18333) @@ -2223,7 +2244,7 @@ Address: %4 - + Specify your own public address @@ -2233,22 +2254,22 @@ Address: %4 - + Number of seconds to keep misbehaving peers from reconnecting (default: 86400) - + An error occurred while setting up the RPC port %u for listening on IPv4: %s - + Listen for JSON-RPC connections on <port> (default: 8332 or testnet: 18332) - + Accept command line and JSON-RPC commands Prihvati komandnu liniju i JSON-RPC komande @@ -2258,17 +2279,17 @@ Address: %4 Radi u pozadini kao daemon servis i prihvati komande - + Use the test network Koristi testnu mrežu - + Accept connections from outside (default: 1 if no -proxy or -connect) - + %s, you must set a rpcpassword in the configuration file: %s It is recommended you use the following random password: @@ -2297,11 +2318,6 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. Cannot obtain a lock on data directory %s. Bitcoin is probably already running. - - - Error initializing database environment %s! To recover, BACKUP THAT DIRECTORY, then remove everything from it except for wallet.dat. - - Error: The transaction was rejected! This might happen if some of the coins in your wallet were already spent, such as if you used a copy of wallet.dat and coins were spent in the copy but not marked as spent here. @@ -2328,12 +2344,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. - - Set the number of script verification threads (1-16, 0=auto, default: 0) - - - - + This is a pre-release test build - use at your own risk - do not use for mining or merchant applications @@ -2373,7 +2384,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. - + Connect only to the specified node(s) @@ -2393,7 +2404,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. - + Error initializing block database @@ -2417,11 +2428,6 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. Error: Disk space is low! - - - Error: Transaction creation failed! - - Error: Wallet locked, unable to create transaction! @@ -2493,7 +2499,12 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. - + + Generate coins (default: 0) + + + + How many blocks to check at startup (default: 288, 0 = all) @@ -2503,7 +2514,12 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. - + + Not enough file descriptors available. + + + + Rebuild block chain index from current blk000??.dat files @@ -2513,7 +2529,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. - + Verifying blocks... @@ -2523,12 +2539,17 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. - + Imports blocks from external blk000??.dat file - + + Set the number of script verification threads (up to 16, 0 = auto, <0 = leave that many cores free, default: 0) + + + + Information @@ -2537,6 +2558,16 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. Invalid -tor address: '%s' + + + Invalid amount for -minrelaytxfee=<amount>: '%s' + + + + + Invalid amount for -mintxfee=<amount>: '%s' + + Maintain a full transaction index (default: 0) @@ -2553,7 +2584,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. - + Only accept block chain matching built-in checkpoints (default: 1) @@ -2612,6 +2643,11 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. Shrink debug.log file on client startup (default: 1 when no -debug) + + + Signing transaction failed + + Specify connection timeout in milliseconds (default: 5000) @@ -2623,7 +2659,22 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. - + + Transaction amount too small + + + + + Transaction amounts must be positive + + + + + Transaction too large + + + + Use UPnP to map the listening port (default: 0) @@ -2663,7 +2714,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. - + Password for JSON-RPC connections Lozinka za JSON-RPC konekcije @@ -2678,17 +2729,17 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. Pošalji komande to nodu koji radi na <ip> (default: 127.0.0.1) - + Execute command when the best block changes (%s in cmd is replaced by block hash) - + Upgrade wallet to latest format - + Set key pool size to <n> (default: 100) Odredi veličinu zaštićenih ključeva na <n> (default: 100) @@ -2698,12 +2749,12 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. Ponovo skeniraj lanac blokova za nedostajuće transakcije iz novčanika - + Use OpenSSL (https) for JSON-RPC connections Koristi OpenSSL (https) za JSON-RPC konekcije - + Server certificate file (default: server.cert) @@ -2713,37 +2764,37 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. privatni ključ za Server (podrazumevan: server.pem) - + Acceptable ciphers (default: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH) Prihvatljive cifre (podrazumevano: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH) - + This help message Ova poruka Pomoći - + Unable to bind to %s on this computer (bind returned error %d, %s) - + Connect through socks proxy - + Allow DNS lookups for -addnode, -seednode and -connect - + Loading addresses... učitavam adrese.... - + Error loading wallet.dat: Wallet corrupted @@ -2753,22 +2804,22 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. - + Wallet needed to be rewritten: restart Bitcoin to complete - + Error loading wallet.dat - + Invalid -proxy address: '%s' - + Unknown network specified in -onlynet: '%s' @@ -2778,7 +2829,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. - + Cannot resolve -bind address: '%s' @@ -2798,17 +2849,17 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. - + Insufficient funds - + Loading block index... Učitavam blok indeksa... - + Add a node to connect to and attempt to keep the connection open @@ -2818,52 +2869,47 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. - + Fee per KB to add to transactions you send - + Loading wallet... Новчаник се учитава... - + Cannot downgrade wallet - - - Cannot initialize keypool - - Cannot write default address - + Rescanning... Ponovo skeniram... - + Done loading Završeno učitavanje - + To use the %s option - + Error - + You must set rpcpassword=<password> in the configuration file: %s If the file does not exist, create it with owner-readable-only file permissions. diff --git a/src/qt/locale/bitcoin_sv.ts b/src/qt/locale/bitcoin_sv.ts index a6a27ffbad..461c84f1c7 100644 --- a/src/qt/locale/bitcoin_sv.ts +++ b/src/qt/locale/bitcoin_sv.ts @@ -29,14 +29,14 @@ Distribuerad under mjukvarulicensen MIT/X11, se den medföljande filen COPYING e Denna produkten innehåller mjukvara utvecklad av OpenSSL Project för användning i OpenSSL Toolkit (http://www.openssl.org/) och kryptografisk mjukvara utvecklad av Eric Young (eay@cryptsoft.com) samt UPnP-mjukvara skriven av Thomas Bernard. - + Copyright Copyright - 2009-%1 The Bitcoin developers - 2009-%1 Bitcoin-utvecklarna + The Bitcoin developers + Bitcoin-utvecklarna @@ -67,7 +67,7 @@ Denna produkten innehåller mjukvara utvecklad av OpenSSL Project för användni &Ny adress - + These are your Bitcoin addresses for receiving payments. You may want to give a different one to each sender so you can keep track of who is paying you. Detta är dina Bitcoin-adresser för att ta emot betalningar. Du kan ge varje avsändare en egen adress så att du kan hålla reda på vem som betalar dig. @@ -97,7 +97,17 @@ Denna produkten innehåller mjukvara utvecklad av OpenSSL Project för användni Ta bort den valda adressen från listan - + + Export the data in the current tab to a file + Exportera informationen i den nuvarande fliken till en fil + + + + &Export + &Exportera + + + Verify a message to ensure it was signed with a specified Bitcoin address Verifiera meddelandet för att vara säker på att den var signerad med den specificerade Bitcoin-adressen @@ -319,12 +329,12 @@ Denna produkten innehåller mjukvara utvecklad av OpenSSL Project för användni Signera &meddelande... - + Synchronizing with network... Synkroniserar med nätverk... - + &Overview &Översikt @@ -399,7 +409,7 @@ Denna produkten innehåller mjukvara utvecklad av OpenSSL Project för användni &Byt Lösenord... - + Importing blocks from disk... Importerar block från disk... @@ -409,12 +419,7 @@ Denna produkten innehåller mjukvara utvecklad av OpenSSL Project för användni Återindexerar block på disken... - - &Export... - &Exportera... - - - + Send coins to a Bitcoin address Skicka mynt till en Bitcoin-adress @@ -424,12 +429,7 @@ Denna produkten innehåller mjukvara utvecklad av OpenSSL Project för användni Ändra konfigurationsalternativ för Bitcoin - - Export the data in the current tab to a file - Exportera informationen i den nuvarande fliken till en fil - - - + Backup wallet to another location Säkerhetskopiera plånboken till en annan plats @@ -439,7 +439,7 @@ Denna produkten innehåller mjukvara utvecklad av OpenSSL Project för användni Byt lösenord för kryptering av plånbok - + &Debug window &Debug fönster @@ -449,23 +449,23 @@ Denna produkten innehåller mjukvara utvecklad av OpenSSL Project för användni Öppna debug- och diagnostikkonsolen - + &Verify message... &Verifiera meddelande... - - + + Bitcoin Bitcoin - + Wallet Plånbok - + &Send &Skicka @@ -510,12 +510,12 @@ Denna produkten innehåller mjukvara utvecklad av OpenSSL Project för användni Verifiera meddelanden för att vara säker på att de var signerade med den specificerade Bitcoin-adressen - + &File &Arkiv - + &Settings &Inställningar @@ -530,12 +530,7 @@ Denna produkten innehåller mjukvara utvecklad av OpenSSL Project för användni Verktygsfält för Tabbar - - Actions toolbar - Verktygsfältet för Handlingar - - - + [testnet] [testnet] @@ -546,12 +541,17 @@ Denna produkten innehåller mjukvara utvecklad av OpenSSL Project för användni Bitcoin-klient - + %n active connection(s) to Bitcoin network %n aktiv anslutning till Bitcoin-nätverket%n aktiva anslutningar till Bitcoin-nätverket - + + No block source available... + Ingen block-källa tillgänglig... + + + Processed %1 of %2 (estimated) blocks of transaction history. Bearbetat %1 av %2 (uppskattade) block av transaktionshistorik. @@ -576,7 +576,7 @@ Denna produkten innehåller mjukvara utvecklad av OpenSSL Project för användni %n vecka%n veckor - + %1 behind %1 efter @@ -591,7 +591,7 @@ Denna produkten innehåller mjukvara utvecklad av OpenSSL Project för användni Transaktioner efter denna kommer inte ännu vara synliga. - + Error Fel @@ -606,22 +606,22 @@ Denna produkten innehåller mjukvara utvecklad av OpenSSL Project för användni Information - + This transaction is over the size limit. You can still send it for a fee of %1, which goes to the nodes that process your transaction and helps to support the network. Do you want to pay the fee? Transaktionen överskrider storleksgränsen. Du kan dock fortfarande skicka den mot en kostnad av %1, som går till noderna som behandlar din transaktion och bidrar till nätverket. Vill du betala denna avgift? - + Up to date Uppdaterad - + Catching up... Hämtar senaste... - + Confirm transaction fee Bekräfta överföringsavgift @@ -671,7 +671,7 @@ Adress: %4 Denna plånbok är <b>krypterad</b> och för närvarande <b>låst</b> - + A fatal error occurred. Bitcoin can no longer continue safely and will quit. Ett allvarligt fel har uppstått. Bitcoin kan inte längre köras säkert och kommer att avslutas. @@ -679,7 +679,7 @@ Adress: %4 ClientModel - + Network Alert Nätverkslarm @@ -810,8 +810,8 @@ Adress: %4 - Optional transaction fee per kB that helps make sure your transactions are processed quickly. Most transactions are 1 kB. Fee 0.01 recommended. - Valfri transaktionsavgift per kB som ser till att dina transaktioner behandlas snabbt. De flesta transaktioner är 1 kB. Avgift 0.01 rekommenderas. + Optional transaction fee per kB that helps make sure your transactions are processed quickly. Most transactions are 1 kB. + Valfri transaktionsavgift per kB som ser till att dina transaktioner behandlas snabbt. De flesta transaktioner är 1 kB. @@ -1060,7 +1060,7 @@ Adress: %4 Totalt antal transaktioner som ännu inte bekräftats, och som ännu inte räknas med i aktuellt saldo - + out of sync osynkroniserad @@ -1646,6 +1646,19 @@ Adress: %4 Meddelandet är verifierad. + + SplashScreen + + + The Bitcoin developers + Bitcoin-utvecklarna + + + + [testnet] + [testnet] + + TransactionDesc @@ -2120,10 +2133,28 @@ Adress: %4 till + + WalletModel + + + Send Coins + Skicka pengar + + WalletView - + + &Export + &Exportera + + + + Export the data in the current tab to a file + Exportera informationen i den nuvarande fliken till en fil + + + Backup Wallet Säkerhetskopiera Plånbok @@ -2156,37 +2187,37 @@ Adress: %4 bitcoin-core - + Bitcoin version Bitcoin version - + Usage: Användning: - + Send command to -server or bitcoind Skicka kommando till -server eller bitcoind - + List commands Lista kommandon - + Get help for a command Få hjälp med ett kommando - + Options: Inställningar: - + Specify configuration file (default: bitcoin.conf) Ange konfigurationsfil (förvalt: bitcoin.conf) @@ -2196,27 +2227,17 @@ Adress: %4 Ange pid fil (förvalt: bitcoind.pid) - - Generate coins - Generera mynt - - - - Don't generate coins - Generera inte mynt - - - + Specify data directory Ange katalog för data - + Set database cache size in megabytes (default: 25) Sätt databas cache storleken i megabyte (förvalt: 25) - + Listen for connections on <port> (default: 8333 or testnet: 18333) Lyssna efter anslutningar på <port> (förvalt: 8333 eller testnet: 18333) @@ -2231,7 +2252,7 @@ Adress: %4 Anslut till en nod för att hämta klientadresser, och koppla från - + Specify your own public address Ange din egen publika adress @@ -2241,22 +2262,22 @@ Adress: %4 Tröskelvärde för att koppla ifrån klienter som missköter sig (förvalt: 100) - + Number of seconds to keep misbehaving peers from reconnecting (default: 86400) Antal sekunder att hindra klienter som missköter sig från att ansluta (förvalt: 86400) - + An error occurred while setting up the RPC port %u for listening on IPv4: %s Ett fel uppstod vid upprättandet av RPC port %u för att lyssna på IPv4: %s - + Listen for JSON-RPC connections on <port> (default: 8332 or testnet: 18332) Lyssna på JSON-RPC-anslutningar på <port> (förvalt: 8332 eller testnet: 18332) - + Accept command line and JSON-RPC commands Tillåt kommandon från kommandotolken och JSON-RPC-kommandon @@ -2266,17 +2287,17 @@ Adress: %4 Kör i bakgrunden som tjänst och acceptera kommandon - + Use the test network Använd testnätverket - + Accept connections from outside (default: 1 if no -proxy or -connect) Acceptera anslutningar utifrån (förvalt: 1 om ingen -proxy eller -connect) - + %s, you must set a rpcpassword in the configuration file: %s It is recommended you use the following random password: @@ -2315,11 +2336,6 @@ till exempel: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo Cannot obtain a lock on data directory %s. Bitcoin is probably already running. Kan inte låsa data-mappen %s. Bitcoin körs förmodligen redan. - - - Error initializing database environment %s! To recover, BACKUP THAT DIRECTORY, then remove everything from it except for wallet.dat. - Fel vid initiering databasmiljön %s! För att återställa, SÄKERHETSKOPIERA KATALOGEN, därefter ta bort allt från det utom wallet.dat. - Error: The transaction was rejected! This might happen if some of the coins in your wallet were already spent, such as if you used a copy of wallet.dat and coins were spent in the copy but not marked as spent here. @@ -2346,12 +2362,7 @@ till exempel: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo Sätt den maximala storleken av hög-prioriterade/låg-avgifts transaktioner i byte (förvalt: 27000) - - Set the number of script verification threads (1-16, 0=auto, default: 0) - Ange antalet skriptkontrolltrådar (1-16, 0 = auto, förval: 0) - - - + This is a pre-release test build - use at your own risk - do not use for mining or merchant applications Detta är ett förhands testbygge - använd på egen risk - använd inte för mining eller handels applikationer @@ -2391,7 +2402,7 @@ till exempel: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo Block skapande inställningar: - + Connect only to the specified node(s) Koppla enbart upp till den/de specificerade noden/noder @@ -2411,7 +2422,7 @@ till exempel: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo Vill du bygga om blockdatabasen nu? - + Error initializing block database Fel vid initiering av blockdatabasen @@ -2435,11 +2446,6 @@ till exempel: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo Error: Disk space is low! Fel: Hårddiskutrymme är lågt! - - - Error: Transaction creation failed! - Fel: Transaktionen gick inte att skapa! - Error: Wallet locked, unable to create transaction! @@ -2511,7 +2517,12 @@ till exempel: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo Sök efter klienter med DNS sökningen (förvalt: 1 om inte -connect) - + + Generate coins (default: 0) + Generera mynt (förvalt: 0) + + + How many blocks to check at startup (default: 288, 0 = all) Hur många block att kontrollera vid uppstart (standardvärde: 288, 0 = alla) @@ -2521,7 +2532,12 @@ till exempel: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo Hur grundlig blockverifikationen är (0-4, förvalt: 3) - + + Not enough file descriptors available. + Inte tillräckligt med filbeskrivningar tillgängliga. + + + Rebuild block chain index from current blk000??.dat files Återskapa blockkedjans index från nuvarande blk000??.dat filer @@ -2531,7 +2547,7 @@ till exempel: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo Ange antalet trådar för att hantera RPC anrop (standard: 4) - + Verifying blocks... Verifierar block... @@ -2541,12 +2557,17 @@ till exempel: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo Verifierar plånboken... - + Imports blocks from external blk000??.dat file Importerar block från extern blk000??.dat fil - + + Set the number of script verification threads (up to 16, 0 = auto, <0 = leave that many cores free, default: 0) + Ange antalet skriptkontrolltrådar (upp till 16, 0 = auto, <0 = lämna så många kärnor lediga, förval: 0) + + + Information Information @@ -2555,6 +2576,16 @@ till exempel: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo Invalid -tor address: '%s' Ogiltig -tor adress: '%s' + + + Invalid amount for -minrelaytxfee=<amount>: '%s' + Ogiltigt belopp för -minrelaytxfee=<belopp>: '%s' + + + + Invalid amount for -mintxfee=<amount>: '%s' + Ogiltigt belopp för -mintxfee=<belopp>: '%s' + Maintain a full transaction index (default: 0) @@ -2571,7 +2602,7 @@ till exempel: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo Maximal buffert för sändning per anslutning, <n>*1000 byte (förvalt: 5000) - + Only accept block chain matching built-in checkpoints (default: 1) Acceptera bara blockkedjans matchande inbyggda kontrollpunkter (förvalt: 1) @@ -2630,6 +2661,11 @@ till exempel: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo Shrink debug.log file on client startup (default: 1 when no -debug) Krymp debug.log filen vid klient start (förvalt: 1 vid ingen -debug) + + + Signing transaction failed + Signering av transaktion misslyckades + Specify connection timeout in milliseconds (default: 5000) @@ -2641,7 +2677,22 @@ till exempel: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo Systemfel: - + + Transaction amount too small + Transaktions belopp för liten + + + + Transaction amounts must be positive + Transaktionens belopp måste vara positiva + + + + Transaction too large + Transaktionen är för stor + + + Use UPnP to map the listening port (default: 0) Använd UPnP för att mappa den lyssnande porten (förvalt: 0) @@ -2681,7 +2732,7 @@ till exempel: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo wallet.dat korrupt, räddning misslyckades - + Password for JSON-RPC connections Lösenord för JSON-RPC-anslutningar @@ -2696,17 +2747,17 @@ till exempel: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo Skicka kommandon till klient på <ip> (förvalt: 127.0.0.1) - + Execute command when the best block changes (%s in cmd is replaced by block hash) Exekvera kommando när det bästa blocket ändras (%s i cmd är utbytt av blockhash) - + Upgrade wallet to latest format Uppgradera plånboken till senaste formatet - + Set key pool size to <n> (default: 100) Sätt storleken på nyckelpoolen till <n> (förvalt: 100) @@ -2716,12 +2767,12 @@ till exempel: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo Sök i blockkedjan efter saknade plånboks transaktioner - + Use OpenSSL (https) for JSON-RPC connections Använd OpenSSL (https) för JSON-RPC-anslutningar - + Server certificate file (default: server.cert) Serverns certifikatfil (förvalt: server.cert) @@ -2731,37 +2782,37 @@ till exempel: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo Serverns privata nyckel (förvalt: server.pem) - + Acceptable ciphers (default: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH) Accepterade krypteringsalgoritmer (förvalt: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH) - + This help message Det här hjälp medelandet - + Unable to bind to %s on this computer (bind returned error %d, %s) Det går inte att binda till %s på den här datorn (bind returnerade felmeddelande %d, %s) - + Connect through socks proxy Anslut genom socks-proxy - + Allow DNS lookups for -addnode, -seednode and -connect Tillåt DNS-sökningar för -addnode, -seednode och -connect - + Loading addresses... Laddar adresser... - + Error loading wallet.dat: Wallet corrupted Fel vid inläsningen av wallet.dat: Plånboken är skadad @@ -2771,22 +2822,22 @@ till exempel: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo Fel vid inläsningen av wallet.dat: Plånboken kräver en senare version av Bitcoin - + Wallet needed to be rewritten: restart Bitcoin to complete Plånboken behöver skrivas om: Starta om Bitcoin för att färdigställa - + Error loading wallet.dat Fel vid inläsning av plånboksfilen wallet.dat - + Invalid -proxy address: '%s' Ogiltig -proxy adress: '%s' - + Unknown network specified in -onlynet: '%s' Okänt nätverk som anges i -onlynet: '%s' @@ -2796,7 +2847,7 @@ till exempel: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo Okänd -socks proxy version begärd: %i - + Cannot resolve -bind address: '%s' Kan inte matcha -bind adress: '%s' @@ -2816,17 +2867,17 @@ till exempel: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo Ogiltig mängd - + Insufficient funds Otillräckligt med bitcoins - + Loading block index... Laddar blockindex... - + Add a node to connect to and attempt to keep the connection open Lägg till en nod att koppla upp mot och försök att hålla anslutningen öppen @@ -2836,52 +2887,47 @@ till exempel: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo Det går inte att binda till %s på den här datorn. Bitcoin är förmodligen redan igång. - + Fee per KB to add to transactions you send Avgift per KB att lägga till på transaktioner du skickar - + Loading wallet... Laddar plånbok... - + Cannot downgrade wallet Kan inte nedgradera plånboken - - - Cannot initialize keypool - Kan inte initiera keypool - Cannot write default address Kan inte skriva standardadress - + Rescanning... Söker igen... - + Done loading Klar med laddning - + To use the %s option Att använda %s alternativet - + Error Fel - + You must set rpcpassword=<password> in the configuration file: %s If the file does not exist, create it with owner-readable-only file permissions. diff --git a/src/qt/locale/bitcoin_th_TH.ts b/src/qt/locale/bitcoin_th_TH.ts index fca6c0197a..d808b014d5 100644 --- a/src/qt/locale/bitcoin_th_TH.ts +++ b/src/qt/locale/bitcoin_th_TH.ts @@ -5,12 +5,12 @@ About Bitcoin - + เกี่ยวกับ บิตคอย์น <b>Bitcoin</b> version - + <b>บิตคอย์น<b>รุ่น @@ -23,13 +23,13 @@ This product includes software developed by the OpenSSL Project for use in the O - + Copyright - 2009-%1 The Bitcoin developers + The Bitcoin developers @@ -38,22 +38,22 @@ This product includes software developed by the OpenSSL Project for use in the O Address Book - + สมุดรายชื่อ Double-click to edit address or label - + ดับเบิลคลิก เพื่อแก้ไขที่อยู่ หรือชื่อ Create a new address - + สร้างที่อยู่ใหม่ Copy the currently selected address to the system clipboard - + คัดลอกที่อยู่ที่ถูกเลือกไปยัง คลิปบอร์ดของระบบ @@ -61,7 +61,7 @@ This product includes software developed by the OpenSSL Project for use in the O - + These are your Bitcoin addresses for receiving payments. You may want to give a different one to each sender so you can keep track of who is paying you. @@ -91,7 +91,17 @@ This product includes software developed by the OpenSSL Project for use in the O - + + Export the data in the current tab to a file + + + + + &Export + + + + Verify a message to ensure it was signed with a specified Bitcoin address @@ -103,7 +113,7 @@ This product includes software developed by the OpenSSL Project for use in the O &Delete - + ลบ @@ -128,7 +138,7 @@ This product includes software developed by the OpenSSL Project for use in the O Export Address Book Data - + ส่งออกรายชื่อทั้งหมด @@ -138,12 +148,12 @@ This product includes software developed by the OpenSSL Project for use in the O Error exporting - + ส่งออกผิดพลาด Could not write to file %1. - + ไม่สามารถเขียนไปยังไฟล์ %1 @@ -151,17 +161,17 @@ This product includes software developed by the OpenSSL Project for use in the O Label - + ชื่อ Address - + ที่อยู่ (no label) - + (ไม่มีชื่อ) @@ -174,17 +184,17 @@ This product includes software developed by the OpenSSL Project for use in the O Enter passphrase - + ใส่รหัสผ่าน New passphrase - + รหัสผา่นใหม่ Repeat new passphrase - + กรุณากรอกรหัสผ่านใหม่อีกครั้งหนึ่ง @@ -194,7 +204,7 @@ This product includes software developed by the OpenSSL Project for use in the O Encrypt wallet - + กระเป๋าสตางค์ที่เข้ารหัส @@ -204,7 +214,7 @@ This product includes software developed by the OpenSSL Project for use in the O Unlock wallet - + เปิดกระเป๋าสตางค์ @@ -214,22 +224,22 @@ This product includes software developed by the OpenSSL Project for use in the O Decrypt wallet - + ถอดรหัสกระเป๋าสตางค์ Change passphrase - + เปลี่ยนรหัสผ่าน Enter the old and new passphrase to the wallet. - + กรอกรหัสผ่านเก่าและรหัสผ่านใหม่สำหรับกระเป๋าสตางค์ Confirm wallet encryption - + ยืนยันการเข้ารหัสกระเป๋าสตางค์ @@ -256,7 +266,7 @@ This product includes software developed by the OpenSSL Project for use in the O Wallet encrypted - + กระเป๋าสตางค์ถูกเข้ารหัสเรียบร้อยแล้ว @@ -269,7 +279,7 @@ This product includes software developed by the OpenSSL Project for use in the O Wallet encryption failed - + การเข้ารหัสกระเป๋าสตางค์ผิดพลาด @@ -280,7 +290,7 @@ This product includes software developed by the OpenSSL Project for use in the O The supplied passphrases do not match. - + รหัสผ่านที่คุณกรอกไม่ตรงกัน @@ -313,12 +323,12 @@ This product includes software developed by the OpenSSL Project for use in the O - + Synchronizing with network... - + &Overview @@ -393,7 +403,7 @@ This product includes software developed by the OpenSSL Project for use in the O - + Importing blocks from disk... @@ -403,12 +413,7 @@ This product includes software developed by the OpenSSL Project for use in the O - - &Export... - - - - + Send coins to a Bitcoin address @@ -418,12 +423,7 @@ This product includes software developed by the OpenSSL Project for use in the O - - Export the data in the current tab to a file - - - - + Backup wallet to another location @@ -433,7 +433,7 @@ This product includes software developed by the OpenSSL Project for use in the O - + &Debug window @@ -443,23 +443,23 @@ This product includes software developed by the OpenSSL Project for use in the O - + &Verify message... - - + + Bitcoin - + Wallet - + &Send @@ -504,12 +504,12 @@ This product includes software developed by the OpenSSL Project for use in the O - + &File - + &Settings @@ -524,12 +524,7 @@ This product includes software developed by the OpenSSL Project for use in the O - - Actions toolbar - - - - + [testnet] @@ -540,12 +535,17 @@ This product includes software developed by the OpenSSL Project for use in the O - + %n active connection(s) to Bitcoin network - + + No block source available... + + + + Processed %1 of %2 (estimated) blocks of transaction history. @@ -570,7 +570,7 @@ This product includes software developed by the OpenSSL Project for use in the O - + %1 behind @@ -585,7 +585,7 @@ This product includes software developed by the OpenSSL Project for use in the O - + Error @@ -600,22 +600,22 @@ This product includes software developed by the OpenSSL Project for use in the O - + This transaction is over the size limit. You can still send it for a fee of %1, which goes to the nodes that process your transaction and helps to support the network. Do you want to pay the fee? - + Up to date - + Catching up... - + Confirm transaction fee @@ -661,7 +661,7 @@ Address: %4 - + A fatal error occurred. Bitcoin can no longer continue safely and will quit. @@ -669,7 +669,7 @@ Address: %4 ClientModel - + Network Alert @@ -800,7 +800,7 @@ Address: %4 - Optional transaction fee per kB that helps make sure your transactions are processed quickly. Most transactions are 1 kB. Fee 0.01 recommended. + Optional transaction fee per kB that helps make sure your transactions are processed quickly. Most transactions are 1 kB. @@ -1050,7 +1050,7 @@ Address: %4 - + out of sync @@ -1636,6 +1636,19 @@ Address: %4 + + SplashScreen + + + The Bitcoin developers + + + + + [testnet] + + + TransactionDesc @@ -1838,7 +1851,7 @@ Address: %4 Address - + ที่อยู่ @@ -2072,12 +2085,12 @@ Address: %4 Label - + ชื่อ Address - + ที่อยู่ @@ -2092,12 +2105,12 @@ Address: %4 Error exporting - + ส่งออกผิดพลาด Could not write to file %1. - + ไม่สามารถเขียนไปยังไฟล์ %1 @@ -2110,10 +2123,28 @@ Address: %4 + + WalletModel + + + Send Coins + + + WalletView - + + &Export + + + + + Export the data in the current tab to a file + + + + Backup Wallet @@ -2146,37 +2177,37 @@ Address: %4 bitcoin-core - + Bitcoin version - + Usage: - + Send command to -server or bitcoind - + List commands - + Get help for a command - + Options: - + Specify configuration file (default: bitcoin.conf) @@ -2186,27 +2217,17 @@ Address: %4 - - Generate coins - - - - - Don't generate coins - - - - + Specify data directory - + Set database cache size in megabytes (default: 25) - + Listen for connections on <port> (default: 8333 or testnet: 18333) @@ -2221,7 +2242,7 @@ Address: %4 - + Specify your own public address @@ -2231,22 +2252,22 @@ Address: %4 - + Number of seconds to keep misbehaving peers from reconnecting (default: 86400) - + An error occurred while setting up the RPC port %u for listening on IPv4: %s - + Listen for JSON-RPC connections on <port> (default: 8332 or testnet: 18332) - + Accept command line and JSON-RPC commands @@ -2256,17 +2277,17 @@ Address: %4 - + Use the test network - + Accept connections from outside (default: 1 if no -proxy or -connect) - + %s, you must set a rpcpassword in the configuration file: %s It is recommended you use the following random password: @@ -2295,11 +2316,6 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. Cannot obtain a lock on data directory %s. Bitcoin is probably already running. - - - Error initializing database environment %s! To recover, BACKUP THAT DIRECTORY, then remove everything from it except for wallet.dat. - - Error: The transaction was rejected! This might happen if some of the coins in your wallet were already spent, such as if you used a copy of wallet.dat and coins were spent in the copy but not marked as spent here. @@ -2326,12 +2342,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. - - Set the number of script verification threads (1-16, 0=auto, default: 0) - - - - + This is a pre-release test build - use at your own risk - do not use for mining or merchant applications @@ -2371,7 +2382,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. - + Connect only to the specified node(s) @@ -2391,7 +2402,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. - + Error initializing block database @@ -2415,11 +2426,6 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. Error: Disk space is low! - - - Error: Transaction creation failed! - - Error: Wallet locked, unable to create transaction! @@ -2491,7 +2497,12 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. - + + Generate coins (default: 0) + + + + How many blocks to check at startup (default: 288, 0 = all) @@ -2501,7 +2512,12 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. - + + Not enough file descriptors available. + + + + Rebuild block chain index from current blk000??.dat files @@ -2511,7 +2527,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. - + Verifying blocks... @@ -2521,12 +2537,17 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. - + Imports blocks from external blk000??.dat file - + + Set the number of script verification threads (up to 16, 0 = auto, <0 = leave that many cores free, default: 0) + + + + Information @@ -2535,6 +2556,16 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. Invalid -tor address: '%s' + + + Invalid amount for -minrelaytxfee=<amount>: '%s' + + + + + Invalid amount for -mintxfee=<amount>: '%s' + + Maintain a full transaction index (default: 0) @@ -2551,7 +2582,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. - + Only accept block chain matching built-in checkpoints (default: 1) @@ -2610,6 +2641,11 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. Shrink debug.log file on client startup (default: 1 when no -debug) + + + Signing transaction failed + + Specify connection timeout in milliseconds (default: 5000) @@ -2621,7 +2657,22 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. - + + Transaction amount too small + + + + + Transaction amounts must be positive + + + + + Transaction too large + + + + Use UPnP to map the listening port (default: 0) @@ -2661,7 +2712,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. - + Password for JSON-RPC connections @@ -2676,17 +2727,17 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. - + Execute command when the best block changes (%s in cmd is replaced by block hash) - + Upgrade wallet to latest format - + Set key pool size to <n> (default: 100) @@ -2696,12 +2747,12 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. - + Use OpenSSL (https) for JSON-RPC connections - + Server certificate file (default: server.cert) @@ -2711,37 +2762,37 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. - + Acceptable ciphers (default: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH) - + This help message - + Unable to bind to %s on this computer (bind returned error %d, %s) - + Connect through socks proxy - + Allow DNS lookups for -addnode, -seednode and -connect - + Loading addresses... - + Error loading wallet.dat: Wallet corrupted @@ -2751,22 +2802,22 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. - + Wallet needed to be rewritten: restart Bitcoin to complete - + Error loading wallet.dat - + Invalid -proxy address: '%s' - + Unknown network specified in -onlynet: '%s' @@ -2776,7 +2827,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. - + Cannot resolve -bind address: '%s' @@ -2796,17 +2847,17 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. - + Insufficient funds - + Loading block index... - + Add a node to connect to and attempt to keep the connection open @@ -2816,52 +2867,47 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. - + Fee per KB to add to transactions you send - + Loading wallet... - + Cannot downgrade wallet - - - Cannot initialize keypool - - Cannot write default address - + Rescanning... - + Done loading - + To use the %s option - + Error - + You must set rpcpassword=<password> in the configuration file: %s If the file does not exist, create it with owner-readable-only file permissions. diff --git a/src/qt/locale/bitcoin_tr.ts b/src/qt/locale/bitcoin_tr.ts index 02760f4b4e..00888ae729 100644 --- a/src/qt/locale/bitcoin_tr.ts +++ b/src/qt/locale/bitcoin_tr.ts @@ -28,14 +28,14 @@ This product includes software developed by the OpenSSL Project for use in the O Bu ürün OpenSSL projesi tarafından OpenSSL araç takımı (http://www.openssl.org/) için geliştirilen yazılımlar, Eric Young (eay@cryptsoft.com) tarafından hazırlanmış şifreleme yazılımları ve Thomas Bernard tarafından programlanmış UPnP yazılımı içerir. - + Copyright Telif hakkı - 2009-%1 The Bitcoin developers - 2009-%1 Bitcoin geliştiricileri + The Bitcoin developers + Bitcoin geliştiricileri @@ -66,7 +66,7 @@ This product includes software developed by the OpenSSL Project for use in the O &Yeni adres - + These are your Bitcoin addresses for receiving payments. You may want to give a different one to each sender so you can keep track of who is paying you. Bunlar, ödeme almak için Bitcoin adresleridir. Kimin ödeme yaptığını izleyebilmek için her ödeme yollaması gereken kişiye değişik bir adres verebilirsiniz. @@ -96,7 +96,17 @@ This product includes software developed by the OpenSSL Project for use in the O Seçili adresi listeden sil - + + Export the data in the current tab to a file + Güncel sekmedeki verileri bir dosyaya aktar + + + + &Export + &Dışa aktar + + + Verify a message to ensure it was signed with a specified Bitcoin address Belirtilen Bitcoin adresi ile imzalandığını doğrulamak için bir mesajı kontrol et @@ -318,12 +328,12 @@ This product includes software developed by the OpenSSL Project for use in the O &Mesaj imzala... - + Synchronizing with network... Şebeke ile senkronizasyon... - + &Overview &Genel bakış @@ -398,7 +408,7 @@ This product includes software developed by the OpenSSL Project for use in the O Parolayı &değiştir... - + Importing blocks from disk... Bloklar diskten içe aktarılıyor... @@ -408,12 +418,7 @@ This product includes software developed by the OpenSSL Project for use in the O Diskteki bloklar yeniden endeksleniyor... - - &Export... - &Dışa aktar... - - - + Send coins to a Bitcoin address Bir Bitcoin adresine Bitcoin yolla @@ -423,12 +428,7 @@ This product includes software developed by the OpenSSL Project for use in the O Bitcoin seçeneklerinin yapılandırmasını değiştir - - Export the data in the current tab to a file - Güncel sekmedeki verileri bir dosyaya aktar - - - + Backup wallet to another location Cüzdanı diğer bir konumda yedekle @@ -438,7 +438,7 @@ This product includes software developed by the OpenSSL Project for use in the O Cüzdan şifrelemesi için kullanılan parolayı değiştir - + &Debug window &Hata ayıklama penceresi @@ -448,23 +448,23 @@ This product includes software developed by the OpenSSL Project for use in the O Hata ayıklama ve teşhis penceresini aç - + &Verify message... Mesaj &kontrol et... - - + + Bitcoin Bitcoin - + Wallet Cüzdan - + &Send &Gönder @@ -509,12 +509,12 @@ This product includes software developed by the OpenSSL Project for use in the O Belirtilen Bitcoin adresleri ile imzalandıklarından emin olmak için mesajları kontrol et - + &File &Dosya - + &Settings &Ayarlar @@ -529,12 +529,7 @@ This product includes software developed by the OpenSSL Project for use in the O Sekme araç çubuğu - - Actions toolbar - Faaliyet araç çubuğu - - - + [testnet] [testnet] @@ -545,12 +540,17 @@ This product includes software developed by the OpenSSL Project for use in the O Bitcoin istemcisi - + %n active connection(s) to Bitcoin network Bitcoin şebekesine %n faal bağlantıBitcoin şebekesine %n faal bağlantı - + + No block source available... + Hiçbir blok kaynağı mevcut değil... + + + Processed %1 of %2 (estimated) blocks of transaction history. Muamele tarihçesinin toplam (tahmini) %2 blokundan %1 blok işlendi. @@ -575,7 +575,7 @@ This product includes software developed by the OpenSSL Project for use in the O %n hafta%n hafta - + %1 behind %1 geride @@ -590,7 +590,7 @@ This product includes software developed by the OpenSSL Project for use in the O Bundan sonraki muameleler henüz görüntülenemez. - + Error Hata @@ -605,22 +605,22 @@ This product includes software developed by the OpenSSL Project for use in the O Bilgi - + This transaction is over the size limit. You can still send it for a fee of %1, which goes to the nodes that process your transaction and helps to support the network. Do you want to pay the fee? Bu muamele boyut sınırlarını aşmıştır. Gene de %1 ücret ödeyerek gönderebilirsiniz, ki bu ücret muamelenizi işleyen ve şebekeye yardım eden düğümlere ödenecektir. Ücreti ödemek istiyor musunuz? - + Up to date Güncel - + Catching up... Aralık kapatılıyor... - + Confirm transaction fee Muamele ücretini teyit et @@ -670,7 +670,7 @@ Adres: %4 Cüzdan <b>şifrelenmiştir</b> ve şu anda <b>kilitlidir</b> - + A fatal error occurred. Bitcoin can no longer continue safely and will quit. Ciddi bir hata oluştu. Bitcoin artık güvenli bir şekilde işlemeye devam edemez ve kapanacaktır. @@ -678,7 +678,7 @@ Adres: %4 ClientModel - + Network Alert Şebeke hakkında uyarı @@ -809,8 +809,8 @@ Adres: %4 - Optional transaction fee per kB that helps make sure your transactions are processed quickly. Most transactions are 1 kB. Fee 0.01 recommended. - Muamelelerin hızlı işlenmesini garantilemeye yardım eden, seçime dayalı kB başı muamele ücreti. Muamelelerin çoğunluğunun boyutu 1 kB'dir. 0.01 ücreti tavsiye edilir. + Optional transaction fee per kB that helps make sure your transactions are processed quickly. Most transactions are 1 kB. + Muamelelerin hızlı işlenmesini garantilemeye yardım eden, seçime dayalı kB başı muamele ücreti. Muamelelerin çoğunluğunun boyutu 1 kB'dir. @@ -1059,7 +1059,7 @@ Adres: %4 Doğrulanması beklenen ve henüz güncel bakiyeye ilâve edilmemiş muamelelerin toplamı - + out of sync eşleşme dışı @@ -1645,6 +1645,19 @@ Adres: %4 Mesaj doğrulandı. + + SplashScreen + + + The Bitcoin developers + Bitcoin geliştiricileri + + + + [testnet] + [testnet] + + TransactionDesc @@ -2119,10 +2132,28 @@ Adres: %4 ilâ + + WalletModel + + + Send Coins + Bitcoin yolla + + WalletView - + + &Export + &Dışa aktar + + + + Export the data in the current tab to a file + Güncel sekmedeki verileri bir dosyaya aktar + + + Backup Wallet Cüzdanı yedekle @@ -2155,37 +2186,37 @@ Adres: %4 bitcoin-core - + Bitcoin version Bitcoin sürümü - + Usage: Kullanım: - + Send command to -server or bitcoind -server ya da bitcoind'ye komut gönder - + List commands Komutları listele - + Get help for a command Bir komut için yardım al - + Options: Seçenekler: - + Specify configuration file (default: bitcoin.conf) Yapılandırma dosyası belirt (varsayılan: bitcoin.conf) @@ -2195,27 +2226,17 @@ Adres: %4 Pid dosyası belirt (varsayılan: bitcoind.pid) - - Generate coins - Madenî para (Bitcoin) oluştur - - - - Don't generate coins - Bitcoin oluşturmasını devre dışı bırak - - - + Specify data directory Veri dizinini belirt - + Set database cache size in megabytes (default: 25) Veritabanı önbellek boyutunu megabayt olarak belirt (varsayılan: 25) - + Listen for connections on <port> (default: 8333 or testnet: 18333) Bağlantılar için dinlenecek <port> (varsayılan: 8333 ya da testnet: 18333) @@ -2230,7 +2251,7 @@ Adres: %4 Eş adresleri elde etmek için bir düğüme bağlan ve ardından bağlantıyı kes - + Specify your own public address Kendi genel adresinizi tanımlayın @@ -2240,22 +2261,22 @@ Adres: %4 Aksaklık gösteren eşlerle bağlantıyı kesme sınırı (varsayılan: 100) - + Number of seconds to keep misbehaving peers from reconnecting (default: 86400) Aksaklık gösteren eşlerle yeni bağlantıları engelleme süresi, saniye olarak (varsayılan: 86400) - + An error occurred while setting up the RPC port %u for listening on IPv4: %s IPv4 üzerinde dinlemek için %u numaralı RPC portunun kurulumu sırasında hata meydana geldi: %s - + Listen for JSON-RPC connections on <port> (default: 8332 or testnet: 18332) JSON-RPC bağlantılarını <port> üzerinde dinle (varsayılan: 8332 veya tesnet: 18332) - + Accept command line and JSON-RPC commands Konut satırı ve JSON-RPC komutlarını kabul et @@ -2265,17 +2286,17 @@ Adres: %4 Arka planda daemon (servis) olarak çalış ve komutları kabul et - + Use the test network Deneme şebekesini kullan - + Accept connections from outside (default: 1 if no -proxy or -connect) Dışarıdan gelen bağlantıları kabul et (varsayılan: -proxy veya -connect yoksa 1) - + %s, you must set a rpcpassword in the configuration file: %s It is recommended you use the following random password: @@ -2314,11 +2335,6 @@ mesela: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com Cannot obtain a lock on data directory %s. Bitcoin is probably already running. %s veri dizininde kilit elde edilemedi. Bitcoin muhtemelen hâlihazırda çalışmaktadır. - - - Error initializing database environment %s! To recover, BACKUP THAT DIRECTORY, then remove everything from it except for wallet.dat. - %s veritabanı ortamının başlatılması sırasında bir hata meydana geldi! Düzeltmek için BU KLASÖRÜ YEDEKLEYİN, ardından klasörden wallet.dat dışında tüm dosyaları silin. - Error: The transaction was rejected! This might happen if some of the coins in your wallet were already spent, such as if you used a copy of wallet.dat and coins were spent in the copy but not marked as spent here. @@ -2345,12 +2361,7 @@ mesela: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com Yüksek öncelikli/düşük ücretli muamelelerin boyutunu bayt olarak tanımla (varsayılan: 27000) - - Set the number of script verification threads (1-16, 0=auto, default: 0) - Betik kontrolü iş parçacığı sayısını belirt (1 ilâ 6, 0=otomatik, varsayılan: 0) - - - + This is a pre-release test build - use at your own risk - do not use for mining or merchant applications Bu yayın öncesi bir deneme sürümüdür - tüm riski siz üstlenmiş olursunuz - bitcoin oluşturmak ya da ticari uygulamalar için kullanmayınız @@ -2390,7 +2401,7 @@ mesela: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com Blok oluşturma seçenekleri: - + Connect only to the specified node(s) Sadece belirtilen düğüme veya düğümlere bağlan @@ -2410,7 +2421,7 @@ mesela: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com Blok veritabanını şimdi yeniden inşa etmek istiyor musunuz? - + Error initializing block database Blok veritabanını başlatılırken bir hata meydana geldi @@ -2434,11 +2445,6 @@ mesela: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com Error: Disk space is low! Hata: Disk alanı düşük! - - - Error: Transaction creation failed! - Hata: Muamele oluşturması başarısız oldu! - Error: Wallet locked, unable to create transaction! @@ -2510,7 +2516,12 @@ mesela: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com Eşleri DNS araması vasıtasıyla bul (varsayılan: 1, eğer -connect kullanılmadıysa) - + + Generate coins (default: 0) + Bitcoin oluştur (varsayılan: 0) + + + How many blocks to check at startup (default: 288, 0 = all) Başlangıçta kontrol edilecek blok sayısı (varsayılan: 288, 0 = hepsi) @@ -2520,7 +2531,12 @@ mesela: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com Blok kontrolünün ne kadar derin olacağı (0 ilâ 4, varsayılan: 3) - + + Not enough file descriptors available. + Kafi derecede dosya tanımlayıcıları mevcut değil. + + + Rebuild block chain index from current blk000??.dat files Blok zinciri indeksini güncel blk000??.dat dosyalarından tekrar inşa et @@ -2530,7 +2546,7 @@ mesela: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com RPC aramaları için iş parçacığı sayısını belirle (varsayılan: 4) - + Verifying blocks... Bloklar kontrol ediliyor... @@ -2540,12 +2556,17 @@ mesela: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com Cüzdan kontrol ediliyor... - + Imports blocks from external blk000??.dat file Harici blk000??.dat dosyasından blokları içe aktarır - + + Set the number of script verification threads (up to 16, 0 = auto, <0 = leave that many cores free, default: 0) + Betik kontrolü iş parçacığı sayısını belirt (azami 16, 0 = otomatik, <0 = bu sayıda çekirdeği boş bırak, varsayılan: 0) + + + Information Bilgi @@ -2554,6 +2575,16 @@ mesela: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com Invalid -tor address: '%s' Geçersiz -tor adresi: '%s' + + + Invalid amount for -minrelaytxfee=<amount>: '%s' + -minrelaytxfee=<amount> için geçersiz meblağ: '%s' + + + + Invalid amount for -mintxfee=<amount>: '%s' + -mintxfee=<amount> için geçersiz meblağ: '%s' + Maintain a full transaction index (default: 0) @@ -2570,7 +2601,7 @@ mesela: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com Bağlantı başına azami yollama tamponu, <n>*1000 bayt (varsayılan: 1000) - + Only accept block chain matching built-in checkpoints (default: 1) Sadece yerleşik kontrol noktalarıyla eşleşen blok zincirini kabul et (varsayılan: 1) @@ -2629,6 +2660,11 @@ mesela: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com Shrink debug.log file on client startup (default: 1 when no -debug) İstemci başlatıldığında debug.log dosyasını küçült (varsayılan: -debug bulunmadığında 1) + + + Signing transaction failed + Muamelenin imzalanması başarısız oldu + Specify connection timeout in milliseconds (default: 5000) @@ -2640,7 +2676,22 @@ mesela: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com Sistem hatası: - + + Transaction amount too small + Muamele meblağı çok düşük + + + + Transaction amounts must be positive + Muamele tutarının pozitif olması lazımdır + + + + Transaction too large + Muamele çok büyük + + + Use UPnP to map the listening port (default: 0) Dinlenecek portu haritalamak için UPnP kullan (varsayılan: 0) @@ -2680,7 +2731,7 @@ mesela: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com wallet.dat bozuk, geri kazanım başarısız oldu - + Password for JSON-RPC connections JSON-RPC bağlantıları için parola @@ -2695,17 +2746,17 @@ mesela: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com Şu <ip> adresinde (varsayılan: 127.0.0.1) çalışan düğüme komut yolla - + Execute command when the best block changes (%s in cmd is replaced by block hash) En iyi blok değiştiğinde komutu çalıştır (komut için %s parametresi blok hash değeri ile değiştirilecektir) - + Upgrade wallet to latest format Cüzdanı en yeni biçime güncelle - + Set key pool size to <n> (default: 100) Anahtar alan boyutunu <n> değerine ayarla (varsayılan: 100) @@ -2715,12 +2766,12 @@ mesela: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com Blok zincirini eksik cüzdan muameleleri için tekrar tara - + Use OpenSSL (https) for JSON-RPC connections JSON-RPC bağlantıları için OpenSSL (https) kullan - + Server certificate file (default: server.cert) Sunucu sertifika dosyası (varsayılan: server.cert) @@ -2730,37 +2781,37 @@ mesela: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com Sunucu özel anahtarı (varsayılan: server.pem) - + Acceptable ciphers (default: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH) Kabul edilebilir şifreler (varsayılan: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH) - + This help message Bu yardım mesajı - + Unable to bind to %s on this computer (bind returned error %d, %s) Bu bilgisayarda %s unsuruna bağlanılamadı. (bind şu hatayı iletti: %d, %s) - + Connect through socks proxy Socks vekil sunucusu vasıtasıyla bağlan - + Allow DNS lookups for -addnode, -seednode and -connect -addnode, -seednode ve -connect için DNS aramalarına izin ver - + Loading addresses... Adresler yükleniyor... - + Error loading wallet.dat: Wallet corrupted wallet.dat dosyasının yüklenmesinde hata oluştu: bozuk cüzdan @@ -2770,22 +2821,22 @@ mesela: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com wallet.dat dosyasının yüklenmesinde hata oluştu: cüzdanın daha yeni bir Bitcoin sürümüne ihtiyacı var - + Wallet needed to be rewritten: restart Bitcoin to complete Cüzdanın tekrar yazılması gerekiyordu: işlemi tamamlamak için Bitcoin'i yeniden başlatınız - + Error loading wallet.dat wallet.dat dosyasının yüklenmesinde hata oluştu - + Invalid -proxy address: '%s' Geçersiz -proxy adresi: '%s' - + Unknown network specified in -onlynet: '%s' -onlynet için bilinmeyen bir şebeke belirtildi: '%s' @@ -2795,7 +2846,7 @@ mesela: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com Bilinmeyen bir -socks vekil sürümü talep edildi: %i - + Cannot resolve -bind address: '%s' -bind adresi çözümlenemedi: '%s' @@ -2815,17 +2866,17 @@ mesela: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com Geçersiz miktar - + Insufficient funds Yetersiz bakiye - + Loading block index... Blok indeksi yükleniyor... - + Add a node to connect to and attempt to keep the connection open Bağlanılacak düğüm ekle ve bağlantıyı zinde tutmaya çalış @@ -2835,52 +2886,47 @@ mesela: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com Bu bilgisayarda %s unsuruna bağlanılamadı. Bitcoin muhtemelen hâlihazırda çalışmaktadır. - + Fee per KB to add to transactions you send Yolladığınız muameleler için eklenecek KB başı ücret - + Loading wallet... Cüzdan yükleniyor... - + Cannot downgrade wallet Cüzdan eski biçime geri alınamaz - - - Cannot initialize keypool - Keypool başlatılamadı - Cannot write default address Varsayılan adres yazılamadı - + Rescanning... Yeniden tarama... - + Done loading Yükleme tamamlandı - + To use the %s option %s seçeneğini kullanmak için - + Error Hata - + You must set rpcpassword=<password> in the configuration file: %s If the file does not exist, create it with owner-readable-only file permissions. diff --git a/src/qt/locale/bitcoin_uk.ts b/src/qt/locale/bitcoin_uk.ts index 1d7c2980f3..ac0096ed68 100644 --- a/src/qt/locale/bitcoin_uk.ts +++ b/src/qt/locale/bitcoin_uk.ts @@ -28,14 +28,14 @@ This product includes software developed by the OpenSSL Project for use in the O Цей продукт включає в себе програмне забезпечення, розроблене в рамках проекту OpenSSL (http://www.openssl.org/), криптографічне програмне забезпечення, написане Еріком Янгом (eay@cryptsoft.com), та функції для роботи з UPnP, написані Томасом Бернардом. - + Copyright Авторське право - 2009-%1 The Bitcoin developers - 2009-%1 Розробники Bitcoin + The Bitcoin developers + @@ -66,7 +66,7 @@ This product includes software developed by the OpenSSL Project for use in the O &Створити адресу - + These are your Bitcoin addresses for receiving payments. You may want to give a different one to each sender so you can keep track of who is paying you. Це ваші адреси для отримання платежів. Ви можете давати різні адреси різним людям, таким чином маючи можливість відслідкувати хто конкретно і скільки вам заплатив. @@ -96,7 +96,17 @@ This product includes software developed by the OpenSSL Project for use in the O Вилучити вибрані адреси з переліку - + + Export the data in the current tab to a file + Експортувати дані з поточної вкладки в файл + + + + &Export + + + + Verify a message to ensure it was signed with a specified Bitcoin address Перевірте повідомлення для впевненості, що воно підписано вказаною Bitcoin-адресою @@ -318,12 +328,12 @@ This product includes software developed by the OpenSSL Project for use in the O &Підписати повідомлення... - + Synchronizing with network... Синхронізація з мережею... - + &Overview &Огляд @@ -398,7 +408,7 @@ This product includes software developed by the OpenSSL Project for use in the O Змінити парол&ь... - + Importing blocks from disk... Імпорт блоків з диску... @@ -408,12 +418,7 @@ This product includes software developed by the OpenSSL Project for use in the O - - &Export... - &Експорт... - - - + Send coins to a Bitcoin address Відправити монети на вказану адресу @@ -423,12 +428,7 @@ This product includes software developed by the OpenSSL Project for use in the O Редагувати параметри - - Export the data in the current tab to a file - Експортувати дані з поточної вкладки в файл - - - + Backup wallet to another location Резервне копіювання гаманця в інше місце @@ -438,7 +438,7 @@ This product includes software developed by the OpenSSL Project for use in the O Змінити пароль, який використовується для шифрування гаманця - + &Debug window Вікно зневадження @@ -448,23 +448,23 @@ This product includes software developed by the OpenSSL Project for use in the O Відкрити консоль зневадження і діагностики - + &Verify message... Перевірити повідомлення... - - + + Bitcoin Bitcoin - + Wallet Гаманець - + &Send @@ -509,12 +509,12 @@ This product includes software developed by the OpenSSL Project for use in the O Перевірте повідомлення для впевненості, що воно підписано вказаною Bitcoin-адресою - + &File &Файл - + &Settings &Налаштування @@ -529,12 +529,7 @@ This product includes software developed by the OpenSSL Project for use in the O Панель вкладок - - Actions toolbar - Панель дій - - - + [testnet] [тестова мережа] @@ -545,12 +540,17 @@ This product includes software developed by the OpenSSL Project for use in the O Bitcoin-клієнт - + %n active connection(s) to Bitcoin network %n активне з'єднання з мережею%n активні з'єднання з мережею%n активних з'єднань з мережею - + + No block source available... + + + + Processed %1 of %2 (estimated) blocks of transaction history. @@ -575,7 +575,7 @@ This product includes software developed by the OpenSSL Project for use in the O - + %1 behind @@ -590,7 +590,7 @@ This product includes software developed by the OpenSSL Project for use in the O - + Error Помилка @@ -605,22 +605,22 @@ This product includes software developed by the OpenSSL Project for use in the O Інформація - + This transaction is over the size limit. You can still send it for a fee of %1, which goes to the nodes that process your transaction and helps to support the network. Do you want to pay the fee? - + Up to date Синхронізовано - + Catching up... Синхронізується... - + Confirm transaction fee Підтвердити комісію @@ -670,7 +670,7 @@ Address: %4 <b>Зашифрований</b> гаманець <b>заблоковано</b> - + A fatal error occurred. Bitcoin can no longer continue safely and will quit. @@ -678,7 +678,7 @@ Address: %4 ClientModel - + Network Alert Сповіщення мережі @@ -809,8 +809,8 @@ Address: %4 - Optional transaction fee per kB that helps make sure your transactions are processed quickly. Most transactions are 1 kB. Fee 0.01 recommended. - Добровільна комісія за кожен КБ транзакції, яка дозволяє бути впевненим у тому, що ваш вона буде оброблено швидко. Розмір більшості транзакцій є 1 КБ. Рекомендована комісія: 0,01. + Optional transaction fee per kB that helps make sure your transactions are processed quickly. Most transactions are 1 kB. + @@ -1059,7 +1059,7 @@ Address: %4 Загальна сума всіх транзакцій, які ще не підтверджені, та до цих пір не враховуються в загальному балансі - + out of sync не синхронізовано @@ -1645,6 +1645,19 @@ Address: %4 Повідомлення перевірено. + + SplashScreen + + + The Bitcoin developers + + + + + [testnet] + [тестова мережа] + + TransactionDesc @@ -2119,10 +2132,28 @@ Address: %4 до + + WalletModel + + + Send Coins + Відправити + + WalletView - + + &Export + + + + + Export the data in the current tab to a file + Експортувати дані з поточної вкладки в файл + + + Backup Wallet @@ -2155,37 +2186,37 @@ Address: %4 bitcoin-core - + Bitcoin version Версія - + Usage: Використання: - + Send command to -server or bitcoind Відправити команду серверу -server чи демону - + List commands Список команд - + Get help for a command Отримати довідку по команді - + Options: Параметри: - + Specify configuration file (default: bitcoin.conf) Вкажіть файл конфігурації (типово: bitcoin.conf) @@ -2195,27 +2226,17 @@ Address: %4 Вкажіть pid-файл (типово: bitcoind.pid) - - Generate coins - Генерувати монети - - - - Don't generate coins - Не генерувати монети - - - + Specify data directory Вкажіть робочий каталог - + Set database cache size in megabytes (default: 25) Встановити розмір кешу бази даних в мегабайтах (типово: 25) - + Listen for connections on <port> (default: 8333 or testnet: 18333) Чекати на з'єднання на <port> (типово: 8333 або тестова мережа: 18333) @@ -2230,7 +2251,7 @@ Address: %4 - + Specify your own public address @@ -2240,22 +2261,22 @@ Address: %4 Поріг відключення неправильно під'єднаних пірів (типово: 100) - + Number of seconds to keep misbehaving peers from reconnecting (default: 86400) Максимальній розмір вхідного буферу на одне з'єднання (типово: 86400) - + An error occurred while setting up the RPC port %u for listening on IPv4: %s - + Listen for JSON-RPC connections on <port> (default: 8332 or testnet: 18332) Прослуховувати <port> для JSON-RPC-з'єднань (типово: 8332 або тестова мережа: 18332) - + Accept command line and JSON-RPC commands Приймати команди із командного рядка та команди JSON-RPC @@ -2265,17 +2286,17 @@ Address: %4 Запустити в фоновому режимі (як демон) та приймати команди - + Use the test network Використовувати тестову мережу - + Accept connections from outside (default: 1 if no -proxy or -connect) - + %s, you must set a rpcpassword in the configuration file: %s It is recommended you use the following random password: @@ -2304,11 +2325,6 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. Cannot obtain a lock on data directory %s. Bitcoin is probably already running. - - - Error initializing database environment %s! To recover, BACKUP THAT DIRECTORY, then remove everything from it except for wallet.dat. - - Error: The transaction was rejected! This might happen if some of the coins in your wallet were already spent, such as if you used a copy of wallet.dat and coins were spent in the copy but not marked as spent here. @@ -2335,12 +2351,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. - - Set the number of script verification threads (1-16, 0=auto, default: 0) - - - - + This is a pre-release test build - use at your own risk - do not use for mining or merchant applications @@ -2380,7 +2391,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. - + Connect only to the specified node(s) Підключитись лише до вказаного вузла @@ -2400,7 +2411,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. - + Error initializing block database Помилка ініціалізації бази даних блоків @@ -2424,11 +2435,6 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. Error: Disk space is low! Помилка: Мало вільного місця на диску! - - - Error: Transaction creation failed! - Помилка: Не вдалося створити транзакцію! - Error: Wallet locked, unable to create transaction! @@ -2500,7 +2506,12 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. - + + Generate coins (default: 0) + + + + How many blocks to check at startup (default: 288, 0 = all) Скільки блоків перевіряти під час запуску (типово: 288, 0 = всі) @@ -2510,7 +2521,12 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. - + + Not enough file descriptors available. + + + + Rebuild block chain index from current blk000??.dat files @@ -2520,7 +2536,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. - + Verifying blocks... @@ -2530,12 +2546,17 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. - + Imports blocks from external blk000??.dat file Імпорт блоків з зовнішнього файлу blk000??.dat - + + Set the number of script verification threads (up to 16, 0 = auto, <0 = leave that many cores free, default: 0) + + + + Information Інформація @@ -2544,6 +2565,16 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. Invalid -tor address: '%s' Помилка в адресі -tor: «%s» + + + Invalid amount for -minrelaytxfee=<amount>: '%s' + + + + + Invalid amount for -mintxfee=<amount>: '%s' + + Maintain a full transaction index (default: 0) @@ -2560,7 +2591,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. Максимальній розмір вихідного буферу на одне з'єднання, <n>*1000 байт (типово: 1000) - + Only accept block chain matching built-in checkpoints (default: 1) @@ -2619,6 +2650,11 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. Shrink debug.log file on client startup (default: 1 when no -debug) Стискати файл debug.log під час старту клієнта (типово: 1 коли відсутутній параметр -debug) + + + Signing transaction failed + + Specify connection timeout in milliseconds (default: 5000) @@ -2630,7 +2666,22 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. Системна помилка: - + + Transaction amount too small + + + + + Transaction amounts must be positive + + + + + Transaction too large + + + + Use UPnP to map the listening port (default: 0) Намагатись використовувати UPnP для відображення порту, що прослуховується на роутері (default: 0) @@ -2670,7 +2721,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. wallet.dat пошкоджено, відновлення не вдалося - + Password for JSON-RPC connections Пароль для JSON-RPC-з'єднань @@ -2685,17 +2736,17 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. Відправляти команди на вузол, запущений на <ip> (типово: 127.0.0.1) - + Execute command when the best block changes (%s in cmd is replaced by block hash) - + Upgrade wallet to latest format Модернізувати гаманець до останнього формату - + Set key pool size to <n> (default: 100) Встановити розмір пулу ключів <n> (типово: 100) @@ -2705,12 +2756,12 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. Пересканувати ланцюжок блоків, в пошуку втрачених транзакцій - + Use OpenSSL (https) for JSON-RPC connections Використовувати OpenSSL (https) для JSON-RPC-з'єднань - + Server certificate file (default: server.cert) Файл сертифіката сервера (типово: server.cert) @@ -2720,37 +2771,37 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. Закритий ключ сервера (типово: server.pem) - + Acceptable ciphers (default: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH) Допустимі шифри (типово: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH) - + This help message Дана довідка - + Unable to bind to %s on this computer (bind returned error %d, %s) Неможливо прив'язати до порту %s на цьому комп'ютері (bind returned error %d, %s) - + Connect through socks proxy Підключитись через SOCKS-проксі - + Allow DNS lookups for -addnode, -seednode and -connect Дозволити пошук в DNS для команд -addnode, -seednode та -connect - + Loading addresses... Завантаження адрес... - + Error loading wallet.dat: Wallet corrupted Помилка при завантаженні wallet.dat: Гаманець пошкоджено @@ -2760,22 +2811,22 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. Помилка при завантаженні wallet.dat: Гаманець потребує новішої версії Біткоін-клієнта - + Wallet needed to be rewritten: restart Bitcoin to complete Потрібно перезаписати гаманець: перезапустіть Біткоін-клієнт для завершення - + Error loading wallet.dat Помилка при завантаженні wallet.dat - + Invalid -proxy address: '%s' Помилка в адресі проксі-сервера: «%s» - + Unknown network specified in -onlynet: '%s' Невідома мережа вказана в -onlynet: «%s» @@ -2785,7 +2836,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. - + Cannot resolve -bind address: '%s' @@ -2805,17 +2856,17 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. Некоректна кількість - + Insufficient funds Недостатньо коштів - + Loading block index... Завантаження індексу блоків... - + Add a node to connect to and attempt to keep the connection open Додати вузол до підключення і лишити його відкритим @@ -2825,52 +2876,47 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. Неможливо прив'язати до порту %s на цьому комп'ютері. Можливо гаманець вже запущено. - + Fee per KB to add to transactions you send Комісія за КБ - + Loading wallet... Завантаження гаманця... - + Cannot downgrade wallet - - - Cannot initialize keypool - - Cannot write default address Неможливо записати типову адресу - + Rescanning... Сканування... - + Done loading Завантаження завершене - + To use the %s option - + Error Помилка - + You must set rpcpassword=<password> in the configuration file: %s If the file does not exist, create it with owner-readable-only file permissions. diff --git a/src/qt/locale/bitcoin_zh_CN.ts b/src/qt/locale/bitcoin_zh_CN.ts index e8d84f40f9..31895364f9 100644 --- a/src/qt/locale/bitcoin_zh_CN.ts +++ b/src/qt/locale/bitcoin_zh_CN.ts @@ -28,14 +28,14 @@ Distributed under the MIT/X11 software license, see the accompanying file COPYIN This product includes software developed by the OpenSSL Project for use in the OpenSSL Toolkit (http://www.openssl.org/) and cryptographic software written by Eric Young (eay@cryptsoft.com) and UPnP software written by Thomas Bernard. - + Copyright 版权 - 2009-%1 The Bitcoin developers - 2009-%1 The Bitcoin developers + The Bitcoin developers + Bitcoin-qt 客户端开发团队 @@ -66,7 +66,7 @@ This product includes software developed by the OpenSSL Project for use in the O &新建地址 - + These are your Bitcoin addresses for receiving payments. You may want to give a different one to each sender so you can keep track of who is paying you. 这是您用来收款的比特币地址。为了标记不同的资金来源，建议为每个付款人保留不同的收款地址。 @@ -96,7 +96,17 @@ This product includes software developed by the OpenSSL Project for use in the O 从列表中删除选中的地址 - + + Export the data in the current tab to a file + 导出当前数据到文件 + + + + &Export + &导出 + + + Verify a message to ensure it was signed with a specified Bitcoin address 验证消息，确保消息是由指定的比特币地址签名过的。 @@ -318,12 +328,12 @@ This product includes software developed by the OpenSSL Project for use in the O 对&消息签名... - + Synchronizing with network... 正在与网络同步... - + &Overview &概况 @@ -398,7 +408,7 @@ This product includes software developed by the OpenSSL Project for use in the O &修改密码... - + Importing blocks from disk... 正在从磁盘导入数据块... @@ -408,12 +418,7 @@ This product includes software developed by the OpenSSL Project for use in the O 正在为数据块建立索引... - - &Export... - &导出... - - - + Send coins to a Bitcoin address 向一个比特币地址发送比特币 @@ -423,12 +428,7 @@ This product includes software developed by the OpenSSL Project for use in the O 设置选项 - - Export the data in the current tab to a file - 导出当前数据到文件 - - - + Backup wallet to another location 备份钱包到其它文件夹 @@ -438,7 +438,7 @@ This product includes software developed by the OpenSSL Project for use in the O 修改钱包加密口令 - + &Debug window &调试窗口 @@ -448,23 +448,23 @@ This product includes software developed by the OpenSSL Project for use in the O 在诊断控制台调试 - + &Verify message... &验证消息... - - + + Bitcoin 比特币 - + Wallet 钱包 - + &Send &发送 @@ -509,12 +509,12 @@ This product includes software developed by the OpenSSL Project for use in the O 校验消息，确保该消息是由指定的比特币地址所有者签名的 - + &File &文件 - + &Settings &设置 @@ -529,12 +529,7 @@ This product includes software developed by the OpenSSL Project for use in the O 分页工具栏 - - Actions toolbar - 动作工具栏 - - - + [testnet] [testnet] @@ -545,12 +540,17 @@ This product includes software developed by the OpenSSL Project for use in the O 比特币客户端 - + %n active connection(s) to Bitcoin network 到比特币网络的连接共有%n条 - + + No block source available... + No block source available... + + + Processed %1 of %2 (estimated) blocks of transaction history. %1 / %2 个交易历史的区块已下载 @@ -575,7 +575,7 @@ This product includes software developed by the OpenSSL Project for use in the O %n 周前 - + %1 behind 落后 %1 @@ -590,7 +590,7 @@ This product includes software developed by the OpenSSL Project for use in the O 在此之后的交易尚未可见 - + Error 错误 @@ -605,22 +605,22 @@ This product includes software developed by the OpenSSL Project for use in the O 信息 - + This transaction is over the size limit. You can still send it for a fee of %1, which goes to the nodes that process your transaction and helps to support the network. Do you want to pay the fee? 该交易的字节数超标。您可以选择支付%1的交易费给处理您的交易的网络节点，有助于比特币网络的运行。您愿意支付这笔交易费用吗？ - + Up to date 最新状态 - + Catching up... 更新中... - + Confirm transaction fee 确认交易费 @@ -670,7 +670,7 @@ Address: %4 钱包已被<b>加密</b>，当前为<b>锁定</b>状态 - + A fatal error occurred. Bitcoin can no longer continue safely and will quit. 发生严重错误。 @@ -678,7 +678,7 @@ Address: %4 ClientModel - + Network Alert 网络警报 @@ -810,8 +810,8 @@ Address: %4 - Optional transaction fee per kB that helps make sure your transactions are processed quickly. Most transactions are 1 kB. Fee 0.01 recommended. - 建议支付交易费用，有助于您的交易得到尽快处理. 绝大多数交易的字节数为 1 kB. 建议支付0.01个比特币. + Optional transaction fee per kB that helps make sure your transactions are processed quickly. Most transactions are 1 kB. + @@ -1060,7 +1060,7 @@ Address: %4 尚未确认的交易总额, 未计入当前余额 - + out of sync 数据同步中 @@ -1646,6 +1646,19 @@ Address: %4 消息验证成功。 + + SplashScreen + + + The Bitcoin developers + Bitcoin-qt 客户端开发团队 + + + + [testnet] + [testnet] + + TransactionDesc @@ -2120,10 +2133,28 @@ Address: %4 到 + + WalletModel + + + Send Coins + 发送比特币 + + WalletView - + + &Export + + + + + Export the data in the current tab to a file + 导出当前数据到文件 + + + Backup Wallet 备份钱包 @@ -2156,41 +2187,41 @@ Address: %4 bitcoin-core - + Bitcoin version 比特币版本 - + Usage: 使用： - + Send command to -server or bitcoind 发送命令到服务器或者 bitcoind - + List commands 列出命令 - + Get help for a command 获得某条命令的帮助 - + Options: 选项： - + Specify configuration file (default: bitcoin.conf) 指定配置文件 (默认为 bitcoin.conf) @@ -2202,30 +2233,18 @@ Address: %4 - - Generate coins - 生成货币 - - - - - Don't generate coins - 不要生成货币 - - - - + Specify data directory 指定数据目录 - + Set database cache size in megabytes (default: 25) 设置数据库缓冲区大小 (缺省: 25MB) - + Listen for connections on <port> (default: 8333 or testnet: 18333) 监听端口连接 <port> (缺省: 8333 or testnet: 18333) @@ -2240,7 +2259,7 @@ Address: %4 连接一个节点并获取对端地址, 然后断开连接 - + Specify your own public address 指定您的公共地址 @@ -2250,22 +2269,22 @@ Address: %4 Threshold for disconnecting misbehaving peers (缺省: 100) - + Number of seconds to keep misbehaving peers from reconnecting (default: 86400) Number of seconds to keep misbehaving peers from reconnecting (缺省: 86400) - + An error occurred while setting up the RPC port %u for listening on IPv4: %s 设置RPC监听端口%u时发生错误, IPv4:%s - + Listen for JSON-RPC connections on <port> (default: 8332 or testnet: 18332) JSON-RPC连接监听端口<port> (缺省：8332　testnet：18332) - + Accept command line and JSON-RPC commands 接受命令行和 JSON-RPC 命令 @@ -2278,18 +2297,18 @@ Address: %4 - + Use the test network 使用测试网络 - + Accept connections from outside (default: 1 if no -proxy or -connect) 接受来自外部的连接 (缺省: 如果不带 -proxy or -connect 参数设置为1) - + %s, you must set a rpcpassword in the configuration file: %s It is recommended you use the following random password: @@ -2328,11 +2347,6 @@ rpcpassword=%s Cannot obtain a lock on data directory %s. Bitcoin is probably already running. 无法给数据目录 %s上锁。本软件可能已经在运行。 - - - Error initializing database environment %s! To recover, BACKUP THAT DIRECTORY, then remove everything from it except for wallet.dat. - 数据库环境%s初始化失败！恢复方法：备份该目录，然后删掉除wallet.dat之外的所有文件。 - Error: The transaction was rejected! This might happen if some of the coins in your wallet were already spent, such as if you used a copy of wallet.dat and coins were spent in the copy but not marked as spent here. @@ -2359,12 +2373,7 @@ rpcpassword=%s Set maximum size of high-priority/low-fee transactions in bytes (default: 27000) - - Set the number of script verification threads (1-16, 0=auto, default: 0) - 设置Script验证进程数(1-16，0=自动,缺省：0) - - - + This is a pre-release test build - use at your own risk - do not use for mining or merchant applications 这是测试用的预发布版本 - 请谨慎使用 - 不要用来挖矿，或者在正式商用环境下使用 @@ -2404,7 +2413,7 @@ rpcpassword=%s 数据块创建选项： - + Connect only to the specified node(s) 仅连接到指定节点 @@ -2424,7 +2433,7 @@ rpcpassword=%s 你想现在就重建块数据库吗？ - + Error initializing block database 初始化数据块数据库出错 @@ -2448,11 +2457,6 @@ rpcpassword=%s Error: Disk space is low! 错误：磁盘剩余空间低! - - - Error: Transaction creation failed! - 错误：创建交易失败！ - Error: Wallet locked, unable to create transaction! @@ -2524,7 +2528,12 @@ rpcpassword=%s 通过DNS查找节点(缺省：1 除非使用 -connect 选项) - + + Generate coins (default: 0) + + + + How many blocks to check at startup (default: 288, 0 = all) 启动时检测多少个数据块(缺省：288，0=所有) @@ -2534,7 +2543,12 @@ rpcpassword=%s How thorough the block verification is (0-4, default: 3) - + + Not enough file descriptors available. + + + + Rebuild block chain index from current blk000??.dat files 重新为当前的blk000??.dat文件建立索引 @@ -2544,7 +2558,7 @@ rpcpassword=%s 设置使用调用服务 RPC 的线程数量（默认：4） - + Verifying blocks... 正在验证数据库的完整性... @@ -2554,12 +2568,17 @@ rpcpassword=%s 正在检测钱包的完整性... - + Imports blocks from external blk000??.dat file 从blk000??.dat文件导入数据块 - + + Set the number of script verification threads (up to 16, 0 = auto, <0 = leave that many cores free, default: 0) + + + + Information 信息 @@ -2568,6 +2587,16 @@ rpcpassword=%s Invalid -tor address: '%s' 非法的 -tor 地址：'%s' + + + Invalid amount for -minrelaytxfee=<amount>: '%s' + + + + + Invalid amount for -mintxfee=<amount>: '%s' + + Maintain a full transaction index (default: 0) @@ -2584,7 +2613,7 @@ rpcpassword=%s 每个连接的最大发送缓存，<n>*1000 字节(缺省：1000) - + Only accept block chain matching built-in checkpoints (default: 1) 仅接受符合客户端检查点设置的数据块文件 @@ -2643,6 +2672,11 @@ rpcpassword=%s Shrink debug.log file on client startup (default: 1 when no -debug) 客户端启动时压缩debug.log文件(缺省：no-debug模式时为1) + + + Signing transaction failed + + Specify connection timeout in milliseconds (default: 5000) @@ -2654,7 +2688,22 @@ rpcpassword=%s 系统错误： - + + Transaction amount too small + + + + + Transaction amounts must be positive + + + + + Transaction too large + + + + Use UPnP to map the listening port (default: 0) 使用UPnp映射监听端口(缺省: 0) @@ -2695,7 +2744,7 @@ rpcpassword=%s 钱包文件wallet.dat损坏，抢救备份失败 - + Password for JSON-RPC connections JSON-RPC连接密码 @@ -2713,17 +2762,17 @@ rpcpassword=%s - + Execute command when the best block changes (%s in cmd is replaced by block hash) 当最佳数据块变化时执行命令 (命令行中的 %s 会被替换成数据块哈希值) - + Upgrade wallet to latest format 将钱包升级到最新的格式 - + Set key pool size to <n> (default: 100) 设置密钥池大小为 <n> (缺省: 100) @@ -2735,12 +2784,12 @@ rpcpassword=%s - + Use OpenSSL (https) for JSON-RPC connections 为 JSON-RPC 连接使用 OpenSSL (https)连接 - + Server certificate file (default: server.cert) 服务器证书 (默认为 server.cert) @@ -2752,39 +2801,39 @@ rpcpassword=%s - + Acceptable ciphers (default: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH) 可接受的加密器 (默认为 TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH) - + This help message 该帮助信息 - + Unable to bind to %s on this computer (bind returned error %d, %s) 无法绑定本机端口 %s (返回错误消息 %d, %s) - + Connect through socks proxy 通过 socks 代理连接 - + Allow DNS lookups for -addnode, -seednode and -connect 使用 -addnode, -seednode 和 -connect选项时允许DNS查找 - + Loading addresses... 正在加载地址... - + Error loading wallet.dat: Wallet corrupted wallet.dat钱包文件加载错误：钱包损坏 @@ -2794,22 +2843,22 @@ rpcpassword=%s wallet.dat钱包文件加载错误：请升级到最新Bitcoin客户端 - + Wallet needed to be rewritten: restart Bitcoin to complete 钱包文件需要重写：请退出并重新启动Bitcoin客户端 - + Error loading wallet.dat wallet.dat钱包文件加载错误 - + Invalid -proxy address: '%s' 非法的代理地址: '%s' - + Unknown network specified in -onlynet: '%s' 被指定的是未知网络 -onlynet: '%s' @@ -2819,7 +2868,7 @@ rpcpassword=%s 被指定的是未知socks代理版本: %i - + Cannot resolve -bind address: '%s' 无法解析 -bind 端口地址: '%s' @@ -2839,17 +2888,17 @@ rpcpassword=%s 金额不对 - + Insufficient funds 金额不足 - + Loading block index... 加载数据块索引... - + Add a node to connect to and attempt to keep the connection open 添加节点并与其保持连接 @@ -2859,52 +2908,47 @@ rpcpassword=%s 无法在本机绑定 %s 端口 . 比特币客户端软件可能已经在运行. - + Fee per KB to add to transactions you send 每发送1KB交易所需的费用 - + Loading wallet... 正在加载钱包... - + Cannot downgrade wallet 无法降级钱包格式 - - - Cannot initialize keypool - 无法初始化 keypool - Cannot write default address 无法写入缺省地址 - + Rescanning... 正在重新扫描... - + Done loading 加载完成 - + To use the %s option 使用 %s 选项 - + Error 错误 - + You must set rpcpassword=<password> in the configuration file: %s If the file does not exist, create it with owner-readable-only file permissions. diff --git a/src/qt/locale/bitcoin_zh_TW.ts b/src/qt/locale/bitcoin_zh_TW.ts index bf33751649..1b4e6c76e7 100644 --- a/src/qt/locale/bitcoin_zh_TW.ts +++ b/src/qt/locale/bitcoin_zh_TW.ts @@ -28,14 +28,14 @@ This product includes software developed by the OpenSSL Project for use in the O 此產品也包含了由 OpenSSL Project 所開發的 OpenSSL Toolkit (http://www.openssl.org/) 軟體, 由 Eric Young (eay@cryptsoft.com) 撰寫的加解密軟體, 以及由 Thomas Bernard 所撰寫的 UPnP 軟體. - + Copyright 版權 - 2009-%1 The Bitcoin developers - Bitcoin 開發人員自西元 2009 至 %1 年起所有 + The Bitcoin developers + 位元幣開發人員 @@ -66,7 +66,7 @@ This product includes software developed by the OpenSSL Project for use in the O 新增位址 - + These are your Bitcoin addresses for receiving payments. You may want to give a different one to each sender so you can keep track of who is paying you. 這些是你用來收款的位元幣位址. 你可以提供不同的位址給不同的付款人, 來追蹤是誰支付給你. @@ -83,7 +83,7 @@ This product includes software developed by the OpenSSL Project for use in the O Sign a message to prove you own a Bitcoin address - 簽署一則訊息來證明一個位元幣位址是你的 + 簽署訊息是用來證明位元幣位址是你的 @@ -96,9 +96,19 @@ This product includes software developed by the OpenSSL Project for use in the O 從列表中刪除目前選取的位址 - + + Export the data in the current tab to a file + 將目前分頁的資料匯出存成檔案 + + + + &Export + 匯出 + + + Verify a message to ensure it was signed with a specified Bitcoin address - 驗證一則訊息以確認它是用指定的位元幣位址簽署的 + 驗證訊息是用來確認訊息是用指定的位元幣位址簽署的 @@ -113,7 +123,7 @@ This product includes software developed by the OpenSSL Project for use in the O These are your Bitcoin addresses for sending payments. Always check the amount and the receiving address before sending coins. - + 這是你用來付款的位元幣位址. 在付錢之前, 務必要檢查金額和收款位址是否正確. @@ -318,12 +328,12 @@ This product includes software developed by the OpenSSL Project for use in the O 訊息簽署... - + Synchronizing with network... 網路同步中... - + &Overview 總覽 @@ -398,7 +408,7 @@ This product includes software developed by the OpenSSL Project for use in the O 密碼變更... - + Importing blocks from disk... 從磁碟匯入區塊中... @@ -408,14 +418,9 @@ This product includes software developed by the OpenSSL Project for use in the O 重建磁碟區塊索引中... - - &Export... - 匯出... - - - + Send coins to a Bitcoin address - 付錢到一個位元幣位址 + 付錢到位元幣位址 @@ -423,12 +428,7 @@ This product includes software developed by the OpenSSL Project for use in the O 修改位元幣的設定選項 - - Export the data in the current tab to a file - 將目前分頁的資料匯出存成檔案 - - - + Backup wallet to another location 將錢包備份到其它地方 @@ -438,7 +438,7 @@ This product includes software developed by the OpenSSL Project for use in the O 變更錢包加密用的密碼 - + &Debug window 除錯視窗 @@ -448,23 +448,23 @@ This product includes software developed by the OpenSSL Project for use in the O 開啓除錯與診斷主控台 - + &Verify message... 驗證訊息... - - + + Bitcoin 位元幣 - + Wallet 錢包 - + &Send 付出 @@ -506,15 +506,15 @@ This product includes software developed by the OpenSSL Project for use in the O Verify messages to ensure they were signed with specified Bitcoin addresses - 驗證訊息以確認那是用指定的位元幣位址簽署的 + 驗證訊息來確認是用指定的位元幣位址簽署的 - + &File 檔案 - + &Settings 設定 @@ -529,12 +529,7 @@ This product includes software developed by the OpenSSL Project for use in the O 分頁工具列 - - Actions toolbar - 動作工具列 - - - + [testnet] [testnet] @@ -545,12 +540,17 @@ This product includes software developed by the OpenSSL Project for use in the O 位元幣客戶端軟體 - + %n active connection(s) to Bitcoin network 與位元幣網路有 %n 個連線在使用中 - + + No block source available... + 目前沒有區塊來源... + + + Processed %1 of %2 (estimated) blocks of transaction history. 已處理了估計全部 %2 個中的 %1 個區塊的交易紀錄. @@ -575,7 +575,7 @@ This product includes software developed by the OpenSSL Project for use in the O %n 個星期 - + %1 behind 落後 %1 @@ -590,7 +590,7 @@ This product includes software developed by the OpenSSL Project for use in the O 會看不見在這之後的交易. - + Error 錯誤 @@ -605,22 +605,22 @@ This product includes software developed by the OpenSSL Project for use in the O 資訊 - + This transaction is over the size limit. You can still send it for a fee of %1, which goes to the nodes that process your transaction and helps to support the network. Do you want to pay the fee? 這筆交易的資料大小超過限制了. 你還是可以付出 %1 的費用來傳送, 這筆費用會付給處理你的交易的節點, 並幫助維持整個網路. 你願意支付這項費用嗎? - + Up to date 最新狀態 - + Catching up... 進度追趕中... - + Confirm transaction fee 確認交易手續費 @@ -669,7 +669,7 @@ Address: %4 錢包<b>已加密</b>並且正<b>上鎖中</b> - + A fatal error occurred. Bitcoin can no longer continue safely and will quit. 發生了致命的錯誤. 位元幣程式無法再繼續安全執行, 只好結束. @@ -677,7 +677,7 @@ Address: %4 ClientModel - + Network Alert 網路警報 @@ -707,7 +707,7 @@ Address: %4 The address associated with this address book entry. This can only be modified for sending addresses. - 與這個位址簿項目關聯的位址. 只能修改付款位址. + 與這個位址簿項目關聯的位址. 付款位址才能被更改. @@ -717,7 +717,7 @@ Address: %4 New sending address - 新付款位址 + 新增付款位址 @@ -809,8 +809,8 @@ Address: %4 - Optional transaction fee per kB that helps make sure your transactions are processed quickly. Most transactions are 1 kB. Fee 0.01 recommended. - 非必要的交易手續費, 以 kB 為計費單位, 且有助於縮短你的交易處理時間. 大部份交易的資料大小是 1 kB. 建議設定為 0.01 元. + Optional transaction fee per kB that helps make sure your transactions are processed quickly. Most transactions are 1 kB. + 非必要的交易手續費, 以 kB 為計費單位, 且有助於縮短你的交易處理時間. 大部份交易資料的大小是 1 kB. @@ -1059,7 +1059,7 @@ Address: %4 尚未確認之交易的總額, 不包含在目前餘額中 - + out of sync 沒同步 @@ -1375,7 +1375,7 @@ Address: %4 Duplicate address found, can only send to each address once per send operation. - 發現有重複的位址. 在一次付款動作中, 只能付給每個位址一次. + 發現有重複的位址. 每個付款動作中, 只能付給個別的位址一次. @@ -1514,7 +1514,7 @@ Address: %4 Sign the message to prove you own this Bitcoin address - 簽署一則訊息來證明一個位元幣位址是你的 + 簽署訊息是用來證明這個位元幣位址是你的 @@ -1550,7 +1550,7 @@ Address: %4 Verify the message to ensure it was signed with the specified Bitcoin address - 驗證這則訊息以確認它是用指定的位元幣位址簽署的 + 驗證訊息是用來確認訊息是用指定的位元幣位址簽署的 @@ -1645,6 +1645,19 @@ Address: %4 訊息已驗證. + + SplashScreen + + + The Bitcoin developers + 位元幣開發人員 + + + + [testnet] + [testnet] + + TransactionDesc @@ -2119,10 +2132,28 @@ Address: %4 至 + + WalletModel + + + Send Coins + 付錢 + + WalletView - + + &Export + 匯出 + + + + Export the data in the current tab to a file + 將目前分頁的資料匯出存成檔案 + + + Backup Wallet 錢包備份 @@ -2155,41 +2186,41 @@ Address: %4 bitcoin-core - + Bitcoin version 位元幣版本 - + Usage: 用法: - + Send command to -server or bitcoind - 送指令至 -server 或 bitcoind + 送指令給 -server 或 bitcoind - + List commands 列出指令 - + Get help for a command 取得指令說明 - + Options: 選項: - + Specify configuration file (default: bitcoin.conf) 指定設定檔 (預設: bitcoin.conf) @@ -2201,30 +2232,18 @@ Address: %4 - - Generate coins - 生產位元幣 - - - - - Don't generate coins - 不生產位元幣 - - - - + Specify data directory 指定資料目錄 - + Set database cache size in megabytes (default: 25) 設定資料庫快取大小為多少百萬位元組(MB, 預設: 25) - + Listen for connections on <port> (default: 8333 or testnet: 18333) 在通訊埠 <port> 聽候連線 (預設: 8333, 或若為測試網路: 18333) @@ -2239,7 +2258,7 @@ Address: %4 連線到某個節點以取得其它節點的位址, 然後斷線 - + Specify your own public address 指定自己公開的位址 @@ -2249,22 +2268,22 @@ Address: %4 與亂搞的節點斷線的臨界值 (預設: 100) - + Number of seconds to keep misbehaving peers from reconnecting (default: 86400) 避免與亂搞的節點連線的秒數 (預設: 86400) - + An error occurred while setting up the RPC port %u for listening on IPv4: %s 在 IPv4 網路上以通訊埠 %u 聽取 RPC 連線時發生錯誤: %s - + Listen for JSON-RPC connections on <port> (default: 8332 or testnet: 18332) 在通訊埠 <port> 聽候 JSON-RPC 連線 (預設: 8332, 或若為測試網路: 18332) - + Accept command line and JSON-RPC commands 接受命令列與 JSON-RPC 指令 @@ -2275,18 +2294,18 @@ Address: %4 以背景程式執行並接受指令 - + Use the test network 使用測試網路 - + Accept connections from outside (default: 1 if no -proxy or -connect) 是否接受外來連線 (預設: 當沒有 -proxy 或 -connect 時預設為 1) - + %s, you must set a rpcpassword in the configuration file: %s It is recommended you use the following random password: @@ -2326,11 +2345,6 @@ alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com Cannot obtain a lock on data directory %s. Bitcoin is probably already running. 無法鎖定資料目錄 %s. 也許位元幣已經在執行了. - - - Error initializing database environment %s! To recover, BACKUP THAT DIRECTORY, then remove everything from it except for wallet.dat. - 資料庫環境 %s 初始化失敗了! 要復原資料, 請*務必先備份該資料夾*, 然後將其中除了錢包檔 wallet.dat 外的東西都刪除掉. - Error: The transaction was rejected! This might happen if some of the coins in your wallet were already spent, such as if you used a copy of wallet.dat and coins were spent in the copy but not marked as spent here. @@ -2357,12 +2371,7 @@ alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com 設定高優先權或低手續費的交易資料大小上限為多少位元組 (預設: 27000) - - Set the number of script verification threads (1-16, 0=auto, default: 0) - 設定指令碼驗證的執行緒數目 (1 至 16, 0 表示程式自動決定, 預設為 0) - - - + This is a pre-release test build - use at your own risk - do not use for mining or merchant applications 這是尚未發表的測試版本 - 使用請自負風險 - 請不要用於開採或商業應用 @@ -2402,7 +2411,7 @@ alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com 區塊產生選項: - + Connect only to the specified node(s) 只連線至指定節點(可多個) @@ -2422,7 +2431,7 @@ alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com 你要現在重建區塊資料庫嗎? - + Error initializing block database 初始化區塊資料庫失敗 @@ -2446,11 +2455,6 @@ alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com Error: Disk space is low! 錯誤: 磁碟空間很少! - - - Error: Transaction creation failed! - 錯誤: 交易產生失敗! - Error: Wallet locked, unable to create transaction! @@ -2522,7 +2526,12 @@ alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com 是否允許在找節點時使用域名查詢 (預設: 當沒用 -connect 時為 1) - + + Generate coins (default: 0) + 生產位元幣 (預設值: 0) + + + How many blocks to check at startup (default: 288, 0 = all) 啓動時檢查的區塊數 (預設: 288, 指定 0 表示全部) @@ -2532,17 +2541,22 @@ alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com 區塊檢查的仔細程度 (0 至 4, 預設: 3) - + + Not enough file descriptors available. + 檔案描述器不足. + + + Rebuild block chain index from current blk000??.dat files 從目前的區塊檔 blk000??.dat 重建鎖鏈索引 Set the number of threads to service RPC calls (default: 4) - + 設定處理 RPC 服務請求的執行緒數目 (預設為 4) - + Verifying blocks... 驗證區塊資料中... @@ -2552,12 +2566,17 @@ alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com 驗證錢包資料中... - + Imports blocks from external blk000??.dat file 從其它來源的 blk000??.dat 檔匯入區塊 - + + Set the number of script verification threads (up to 16, 0 = auto, <0 = leave that many cores free, default: 0) + 設定指令碼驗證的執行緒數目 (最多為 16, 若為 0 表示程式自動決定, 小於 0 表示保留不用的處理器核心數目, 預設為 0) + + + Information 資訊 @@ -2566,6 +2585,16 @@ alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com Invalid -tor address: '%s' 無效的 -tor 位址: '%s' + + + Invalid amount for -minrelaytxfee=<amount>: '%s' + 設定 -minrelaytxfee=<金額> 的金額無效: '%s' + + + + Invalid amount for -mintxfee=<amount>: '%s' + 設定 -mintxfee=<amount> 的金額無效: '%s' + Maintain a full transaction index (default: 0) @@ -2582,7 +2611,7 @@ alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com 每個連線的傳送緩衝區大小上限為 <n>*1000 位元組 (預設: 1000) - + Only accept block chain matching built-in checkpoints (default: 1) 只接受與內建的檢查段點吻合的區塊鎖鏈 (預設: 1) @@ -2619,7 +2648,7 @@ alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com Send trace/debug info to console instead of debug.log file - 輸出追蹤或除錯資訊至終端機, 而非 debug.log 檔案 + 在終端機顯示追蹤或除錯資訊, 而非寫到 debug.log 檔 @@ -2641,6 +2670,11 @@ alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com Shrink debug.log file on client startup (default: 1 when no -debug) 客戶端軟體啓動時將 debug.log 檔縮小 (預設: 當沒有 -debug 時為 1) + + + Signing transaction failed + 簽署交易失敗 + Specify connection timeout in milliseconds (default: 5000) @@ -2652,7 +2686,22 @@ alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com 系統錯誤: - + + Transaction amount too small + 交易金額太小 + + + + Transaction amounts must be positive + 交易金額必須是正的 + + + + Transaction too large + 交易位元量太大 + + + Use UPnP to map the listening port (default: 0) 是否使用通用即插即用(UPnP)協定來設定聽候連線的通訊埠 (預設: 0) @@ -2692,7 +2741,7 @@ alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com 錢包檔 weallet.dat 壞掉了, 拯救失敗 - + Password for JSON-RPC connections JSON-RPC 連線密碼 @@ -2708,17 +2757,17 @@ alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com - + Execute command when the best block changes (%s in cmd is replaced by block hash) 當最新區塊改變時所要執行的指令 (指令中的 %s 會被取代為區塊的雜湊值) - + Upgrade wallet to latest format 將錢包升級成最新的格式 - + Set key pool size to <n> (default: 100) 設定密鑰池大小為 <n> (預設: 100) @@ -2729,13 +2778,13 @@ alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com 重新掃描區塊鎖鏈, 以尋找錢包所遺漏的交易. - + Use OpenSSL (https) for JSON-RPC connections 於 JSON-RPC 連線使用 OpenSSL (https) - + Server certificate file (default: server.cert) 伺服器憑證檔 (預設: server.cert) @@ -2747,39 +2796,39 @@ alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com - + Acceptable ciphers (default: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH) 可以接受的加密法 (預設: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH) - + This help message 此協助訊息 - + Unable to bind to %s on this computer (bind returned error %d, %s) 無法和這台電腦上的 %s 繫結 (繫結回傳錯誤 %d, %s) - + Connect through socks proxy 透過 SOCKS 代理伺服器連線 - + Allow DNS lookups for -addnode, -seednode and -connect 允許對 -addnode, -seednode, -connect 的參數使用域名查詢 - + Loading addresses... 載入位址中... - + Error loading wallet.dat: Wallet corrupted 載入檔案 wallet.dat 失敗: 錢包壞掉了 @@ -2789,22 +2838,22 @@ alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com 載入檔案 wallet.dat 失敗: 此錢包需要新版的 Bitcoin - + Wallet needed to be rewritten: restart Bitcoin to complete 錢包需要重寫: 請重啟位元幣來完成 - + Error loading wallet.dat 載入檔案 wallet.dat 失敗 - + Invalid -proxy address: '%s' 無效的 -proxy 位址: '%s' - + Unknown network specified in -onlynet: '%s' 在 -onlynet 指定了不明的網路別: '%s' @@ -2814,7 +2863,7 @@ alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com 在 -socks 指定了不明的代理協定版本: %i - + Cannot resolve -bind address: '%s' 無法解析 -bind 位址: '%s' @@ -2834,17 +2883,17 @@ alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com 無效的金額 - + Insufficient funds 累積金額不足 - + Loading block index... 載入區塊索引中... - + Add a node to connect to and attempt to keep the connection open 加入一個要連線的節線, 並試著保持對它的連線暢通 @@ -2854,52 +2903,47 @@ alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com 無法和這台電腦上的 %s 繫結. 也許位元幣已經在執行了. - + Fee per KB to add to transactions you send 交易付款時每 KB 的交易手續費 - + Loading wallet... 載入錢包中... - + Cannot downgrade wallet 無法將錢包格式降級 - - - Cannot initialize keypool - 無法將密鑰池初始化 - Cannot write default address 無法寫入預設位址 - + Rescanning... 重新掃描中... - + Done loading 載入完成 - + To use the %s option 為了要使用 %s 選項 - + Error 錯誤 - + You must set rpcpassword=<password> in the configuration file: %s If the file does not exist, create it with owner-readable-only file permissions. diff --git a/src/qt/macdockiconhandler.mm b/src/qt/macdockiconhandler.mm index b6ea8e1d03..53b49c42e6 100644 --- a/src/qt/macdockiconhandler.mm +++ b/src/qt/macdockiconhandler.mm @@ -2,8 +2,8 @@ #include #include - -extern void qt_mac_set_dock_menu(QMenu*); +#include +#include #undef slots #include @@ -47,11 +47,11 @@ extern void qt_mac_set_dock_menu(QMenu*); MacDockIconHandler::MacDockIconHandler() : QObject() { NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; - this->m_dockIconClickEventHandler = [[DockIconClickEventHandler alloc] initWithDockIconHandler:this]; + this->m_dockIconClickEventHandler = [[DockIconClickEventHandler alloc] initWithDockIconHandler:this]; this->m_dummyWidget = new QWidget(); this->m_dockMenu = new QMenu(this->m_dummyWidget); - qt_mac_set_dock_menu(this->m_dockMenu); + [pool release]; } @@ -74,15 +74,29 @@ QMenu *MacDockIconHandler::dockMenu() void MacDockIconHandler::setIcon(const QIcon &icon) { NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; - NSImage *image; + NSImage *image = nil; if (icon.isNull()) image = [[NSImage imageNamed:@"NSApplicationIcon"] retain]; else { + // generate NSImage from QIcon and use this as dock icon. QSize size = icon.actualSize(QSize(128, 128)); QPixmap pixmap = icon.pixmap(size); - CGImageRef cgImage = pixmap.toMacCGImageRef(); - image = [[NSImage alloc] initWithCGImage:cgImage size:NSZeroSize]; - CFRelease(cgImage); + + // write temp file hack (could also be done through QIODevice [memory]) + QTemporaryFile notificationIconFile; + if (!pixmap.isNull() && notificationIconFile.open()) { + QImageWriter writer(¬ificationIconFile, "PNG"); + if (writer.write(pixmap.toImage())) { + const char *cString = notificationIconFile.fileName().toUtf8().data(); + NSString *macString = [NSString stringWithCString:cString encoding:NSUTF8StringEncoding]; + image = [[NSImage alloc] initWithContentsOfFile:macString]; + } + } + + if(!image) { + // if testnet image could not be created, load std. app icon + image = [[NSImage imageNamed:@"NSApplicationIcon"] retain]; + } } [NSApp setApplicationIconImage:image]; diff --git a/src/qt/macnotificationhandler.h b/src/qt/macnotificationhandler.h new file mode 100644 index 0000000000..cd8064c61c --- /dev/null +++ b/src/qt/macnotificationhandler.h @@ -0,0 +1,25 @@ +#ifndef MACNOTIFICATIONHANDLER_H +#define MACNOTIFICATIONHANDLER_H +#include + +/** Macintosh-specific notification handler (supports UserNotificationCenter and Growl). + */ +class MacNotificationHandler : public QObject +{ + Q_OBJECT + +public: + /** shows a 10.8+ UserNotification in the UserNotificationCenter + */ + void showNotification(const QString &title, const QString &text); + + /** executes AppleScript */ + void sendAppleScript(const QString &script); + + /** check if OS can handle UserNotifications */ + bool hasUserNotificationCenterSupport(void); + static MacNotificationHandler *instance(); +}; + + +#endif // MACNOTIFICATIONHANDLER_H diff --git a/src/qt/macnotificationhandler.mm b/src/qt/macnotificationhandler.mm new file mode 100644 index 0000000000..8bb9b887a1 --- /dev/null +++ b/src/qt/macnotificationhandler.mm @@ -0,0 +1,65 @@ +#include "macnotificationhandler.h" + +#undef slots +#include + +void MacNotificationHandler::showNotification(const QString &title, const QString &text) +{ + // check if users OS has support for NSUserNotification + if(this->hasUserNotificationCenterSupport()) { + // okay, seems like 10.8+ + QByteArray utf8 = title.toUtf8(); + char* cString = (char *)utf8.constData(); + NSString *titleMac = [[NSString alloc] initWithUTF8String:cString]; + + utf8 = text.toUtf8(); + cString = (char *)utf8.constData(); + NSString *textMac = [[NSString alloc] initWithUTF8String:cString]; + + // do everything weak linked (because we will keep <10.8 compatibility) + id userNotification = [[NSClassFromString(@"NSUserNotification") alloc] init]; + [userNotification performSelector:@selector(setTitle:) withObject:titleMac]; + [userNotification performSelector:@selector(setInformativeText:) withObject:textMac]; + + id notificationCenterInstance = [NSClassFromString(@"NSUserNotificationCenter") performSelector:@selector(defaultUserNotificationCenter)]; + [notificationCenterInstance performSelector:@selector(deliverNotification:) withObject:userNotification]; + + [titleMac release]; + [textMac release]; + [userNotification release]; + } +} + +// sendAppleScript just take a QString and executes it as apple script +void MacNotificationHandler::sendAppleScript(const QString &script) +{ + QByteArray utf8 = script.toUtf8(); + char* cString = (char *)utf8.constData(); + NSString *scriptApple = [[NSString alloc] initWithUTF8String:cString]; + + NSAppleScript *as = [[NSAppleScript alloc] initWithSource:scriptApple]; + NSDictionary *err = nil; + [as executeAndReturnError:&err]; + [as release]; + [scriptApple release]; +} + +bool MacNotificationHandler::hasUserNotificationCenterSupport(void) +{ + Class possibleClass = NSClassFromString(@"NSUserNotificationCenter"); + + // check if users OS has support for NSUserNotification + if(possibleClass!=nil) { + return true; + } + return false; +} + + +MacNotificationHandler *MacNotificationHandler::instance() +{ + static MacNotificationHandler *s_instance = NULL; + if (!s_instance) + s_instance = new MacNotificationHandler(); + return s_instance; +} diff --git a/src/qt/notificator.cpp b/src/qt/notificator.cpp index 397e7aa4a0..7cfaef6079 100644 --- a/src/qt/notificator.cpp +++ b/src/qt/notificator.cpp @@ -18,7 +18,7 @@ #ifdef Q_OS_MAC #include -extern bool qt_mac_execute_apple_script(const QString &script, AEDesc *ret); +#include "macnotificationhandler.h" #endif // https://wiki.ubuntu.com/NotificationDevelopmentGuidelines recommends at least 128 @@ -47,19 +47,25 @@ Notificator::Notificator(const QString &programName, QSystemTrayIcon *trayicon, } #endif #ifdef Q_OS_MAC - // Check if Growl is installed (based on Qt's tray icon implementation) - CFURLRef cfurl; - OSStatus status = LSGetApplicationForInfo(kLSUnknownType, kLSUnknownCreator, CFSTR("growlTicket"), kLSRolesAll, 0, &cfurl); - if (status != kLSApplicationNotFoundErr) { - CFBundleRef bundle = CFBundleCreate(0, cfurl); - if (CFStringCompare(CFBundleGetIdentifier(bundle), CFSTR("com.Growl.GrowlHelperApp"), kCFCompareCaseInsensitive | kCFCompareBackwards) == kCFCompareEqualTo) { - if (CFStringHasSuffix(CFURLGetString(cfurl), CFSTR("/Growl.app/"))) - mode = Growl13; - else - mode = Growl12; + // check if users OS has support for NSUserNotification + if( MacNotificationHandler::instance()->hasUserNotificationCenterSupport()) { + mode = UserNotificationCenter; + } + else { + // Check if Growl is installed (based on Qt's tray icon implementation) + CFURLRef cfurl; + OSStatus status = LSGetApplicationForInfo(kLSUnknownType, kLSUnknownCreator, CFSTR("growlTicket"), kLSRolesAll, 0, &cfurl); + if (status != kLSApplicationNotFoundErr) { + CFBundleRef bundle = CFBundleCreate(0, cfurl); + if (CFStringCompare(CFBundleGetIdentifier(bundle), CFSTR("com.Growl.GrowlHelperApp"), kCFCompareCaseInsensitive | kCFCompareBackwards) == kCFCompareEqualTo) { + if (CFStringHasSuffix(CFURLGetString(cfurl), CFSTR("/Growl.app/"))) + mode = Growl13; + else + mode = Growl12; + } + CFRelease(cfurl); + CFRelease(bundle); } - CFRelease(cfurl); - CFRelease(bundle); } #endif } @@ -269,8 +275,14 @@ void Notificator::notifyGrowl(Class cls, const QString &title, const QString &te quotedTitle.replace("\\", "\\\\").replace("\"", "\\"); quotedText.replace("\\", "\\\\").replace("\"", "\\"); QString growlApp(this->mode == Notificator::Growl13 ? "Growl" : "GrowlHelperApp"); - qt_mac_execute_apple_script(script.arg(notificationApp, quotedTitle, quotedText, notificationIcon, growlApp), 0); + MacNotificationHandler::instance()->sendAppleScript(script.arg(notificationApp, quotedTitle, quotedText, notificationIcon, growlApp)); } + +void Notificator::notifyMacUserNotificationCenter(Class cls, const QString &title, const QString &text, const QIcon &icon) { + // icon is not supported by the user notification center yet. OSX will use the app icon. + MacNotificationHandler::instance()->showNotification(title, text); +} + #endif void Notificator::notify(Class cls, const QString &title, const QString &text, const QIcon &icon, int millisTimeout) @@ -286,6 +298,9 @@ void Notificator::notify(Class cls, const QString &title, const QString &text, c notifySystray(cls, title, text, icon, millisTimeout); break; #ifdef Q_OS_MAC + case UserNotificationCenter: + notifyMacUserNotificationCenter(cls, title, text, icon); + break; case Growl12: case Growl13: notifyGrowl(cls, title, text, icon); diff --git a/src/qt/notificator.h b/src/qt/notificator.h index d20673abb6..d1fe37fea5 100644 --- a/src/qt/notificator.h +++ b/src/qt/notificator.h @@ -46,11 +46,12 @@ public slots: private: QWidget *parent; enum Mode { - None, /**< Ignore informational notifications, and show a modal pop-up dialog for Critical notifications. */ - Freedesktop, /**< Use DBus org.freedesktop.Notifications */ - QSystemTray, /**< Use QSystemTray::showMessage */ - Growl12, /**< Use the Growl 1.2 notification system (Mac only) */ - Growl13 /**< Use the Growl 1.3 notification system (Mac only) */ + None, /**< Ignore informational notifications, and show a modal pop-up dialog for Critical notifications. */ + Freedesktop, /**< Use DBus org.freedesktop.Notifications */ + QSystemTray, /**< Use QSystemTray::showMessage */ + Growl12, /**< Use the Growl 1.2 notification system (Mac only) */ + Growl13, /**< Use the Growl 1.3 notification system (Mac only) */ + UserNotificationCenter /**< Use the 10.8+ User Notification Center (Mac only) */ }; QString programName; Mode mode; @@ -63,6 +64,7 @@ private: void notifySystray(Class cls, const QString &title, const QString &text, const QIcon &icon, int millisTimeout); #ifdef Q_OS_MAC void notifyGrowl(Class cls, const QString &title, const QString &text, const QIcon &icon); + void notifyMacUserNotificationCenter(Class cls, const QString &title, const QString &text, const QIcon &icon); #endif }; diff --git a/src/qt/paymentserver.cpp b/src/qt/paymentserver.cpp index a92e6fc329..0b0bce55bb 100644 --- a/src/qt/paymentserver.cpp +++ b/src/qt/paymentserver.cpp @@ -18,7 +18,9 @@ #include #include #include +#if QT_VERSION < 0x050000 #include +#endif using namespace boost; diff --git a/src/qt/qrcodedialog.cpp b/src/qt/qrcodedialog.cpp index ca94975128..6ddcaaf5d9 100644 --- a/src/qt/qrcodedialog.cpp +++ b/src/qt/qrcodedialog.cpp @@ -7,7 +7,9 @@ #include "optionsmodel.h" #include +#if QT_VERSION < 0x050000 #include +#endif #include diff --git a/src/qt/rpcconsole.cpp b/src/qt/rpcconsole.cpp index 50f22b877a..7f90f4a551 100644 --- a/src/qt/rpcconsole.cpp +++ b/src/qt/rpcconsole.cpp @@ -8,7 +8,9 @@ #include #include #include +#if QT_VERSION < 0x050000 #include +#endif #include #include diff --git a/src/qt/sendcoinsdialog.cpp b/src/qt/sendcoinsdialog.cpp index eb3ce48a6e..2c7bab2045 100644 --- a/src/qt/sendcoinsdialog.cpp +++ b/src/qt/sendcoinsdialog.cpp @@ -93,7 +93,11 @@ void SendCoinsDialog::on_sendButton_clicked() QStringList formatted; foreach(const SendCoinsRecipient &rcp, recipients) { +#if QT_VERSION < 0x050000 formatted.append(tr("%1 to %2 (%3)").arg(BitcoinUnits::formatWithUnit(BitcoinUnits::BTC, rcp.amount), Qt::escape(rcp.label), rcp.address)); +#else + formatted.append(tr("%1 to %2 (%3)").arg(BitcoinUnits::formatWithUnit(BitcoinUnits::BTC, rcp.amount), rcp.label.toHtmlEscaped(), rcp.address)); +#endif } fNewRecipientAllowed = false; diff --git a/src/qt/signverifymessagedialog.cpp b/src/qt/signverifymessagedialog.cpp index 7c43e5839e..9118770f4c 100644 --- a/src/qt/signverifymessagedialog.cpp +++ b/src/qt/signverifymessagedialog.cpp @@ -218,8 +218,8 @@ void SignVerifyMessageDialog::on_verifyMessageButton_VM_clicked() ss << strMessageMagic; ss << ui->messageIn_VM->document()->toPlainText().toStdString(); - CKey key; - if (!key.SetCompactSignature(Hash(ss.begin(), ss.end()), vchSig)) + CPubKey pubkey; + if (!pubkey.RecoverCompact(Hash(ss.begin(), ss.end()), vchSig)) { ui->signatureIn_VM->setValid(false); ui->statusLabel_VM->setStyleSheet("QLabel { color: red; }"); @@ -227,7 +227,7 @@ void SignVerifyMessageDialog::on_verifyMessageButton_VM_clicked() return; } - if (!(CBitcoinAddress(key.GetPubKey().GetID()) == addr)) + if (!(CBitcoinAddress(pubkey.GetID()) == addr)) { ui->statusLabel_VM->setStyleSheet("QLabel { color: red; }"); ui->statusLabel_VM->setText(QString("") + tr("Message verification failed.") + QString("")); diff --git a/src/qt/splashscreen.cpp b/src/qt/splashscreen.cpp index f8d16699ca..e400278123 100644 --- a/src/qt/splashscreen.cpp +++ b/src/qt/splashscreen.cpp @@ -3,6 +3,7 @@ #include "util.h" #include +#undef loop /* ugh, remove this when the #define loop is gone from util.h */ #include SplashScreen::SplashScreen(const QPixmap &pixmap, Qt::WindowFlags f) : @@ -26,7 +27,7 @@ SplashScreen::SplashScreen(const QPixmap &pixmap, Qt::WindowFlags f) : // load the bitmap for writing some text over it QPixmap newPixmap; - if(GetBoolArg("-testnet")) { + if(GetBoolArg("-testnet", false)) { newPixmap = QPixmap(":/images/splash_testnet"); } else { diff --git a/src/qt/transactionview.cpp b/src/qt/transactionview.cpp index 9240b71c71..a43e29c476 100644 --- a/src/qt/transactionview.cpp +++ b/src/qt/transactionview.cpp @@ -176,7 +176,11 @@ void TransactionView::setModel(WalletModel *model) transactionView->horizontalHeader()->resizeSection(TransactionTableModel::Status, 23); transactionView->horizontalHeader()->resizeSection(TransactionTableModel::Date, 120); transactionView->horizontalHeader()->resizeSection(TransactionTableModel::Type, 120); +#if QT_VERSION < 0x050000 transactionView->horizontalHeader()->setResizeMode(TransactionTableModel::ToAddress, QHeaderView::Stretch); +#else + transactionView->horizontalHeader()->setSectionResizeMode(TransactionTableModel::ToAddress, QHeaderView::Stretch); +#endif transactionView->horizontalHeader()->resizeSection(TransactionTableModel::Amount, 100); } } diff --git a/src/qt/walletframe.cpp b/src/qt/walletframe.cpp index 83e4255c9f..50c03ac62d 100644 --- a/src/qt/walletframe.cpp +++ b/src/qt/walletframe.cpp @@ -8,11 +8,9 @@ #include "bitcoingui.h" #include "walletstack.h" -#include +#include #include -#include - WalletFrame::WalletFrame(BitcoinGUI *_gui) : QFrame(_gui), gui(_gui), diff --git a/src/qt/walletframe.h b/src/qt/walletframe.h index 3649185e8a..d7092f9879 100644 --- a/src/qt/walletframe.h +++ b/src/qt/walletframe.h @@ -17,8 +17,9 @@ class WalletStack; class WalletFrame : public QFrame { Q_OBJECT + public: - explicit WalletFrame(BitcoinGUI *_gui); + explicit WalletFrame(BitcoinGUI *_gui = 0); ~WalletFrame(); void setClientModel(ClientModel *clientModel); diff --git a/src/qt/walletmodel.cpp b/src/qt/walletmodel.cpp index 20535a451d..fb3ffc5c91 100644 --- a/src/qt/walletmodel.cpp +++ b/src/qt/walletmodel.cpp @@ -181,7 +181,8 @@ WalletModel::SendCoinsReturn WalletModel::sendCoins(const QListCreateTransaction(vecSend, wtx, keyChange, nFeeRequired); + std::string strFailReason; + bool fCreated = wallet->CreateTransaction(vecSend, wtx, keyChange, nFeeRequired, strFailReason); if(!fCreated) { @@ -189,6 +190,8 @@ WalletModel::SendCoinsReturn WalletModel::sendCoins(const QList #include #include +#if QT_VERSION < 0x050000 #include +#else +#include +#endif #include #include @@ -232,7 +236,11 @@ void WalletView::encryptWallet(bool status) void WalletView::backupWallet() { +#if QT_VERSION < 0x050000 QString saveDir = QDesktopServices::storageLocation(QDesktopServices::DocumentsLocation); +#else + QString saveDir = QStandardPaths::writableLocation(QStandardPaths::DocumentsLocation); +#endif QString filename = QFileDialog::getSaveFileName(this, tr("Backup Wallet"), saveDir, tr("Wallet Data (*.dat)")); if (!filename.isEmpty()) { if (!walletModel->backupWallet(filename)) { diff --git a/src/rpcblockchain.cpp b/src/rpcblockchain.cpp index 2200679050..b1b0c1ac16 100644 --- a/src/rpcblockchain.cpp +++ b/src/rpcblockchain.cpp @@ -65,8 +65,9 @@ Object blockToJSON(const CBlock& block, const CBlockIndex* blockindex) if (blockindex->pprev) result.push_back(Pair("previousblockhash", blockindex->pprev->GetBlockHash().GetHex())); - if (blockindex->pnext) - result.push_back(Pair("nextblockhash", blockindex->pnext->GetBlockHash().GetHex())); + CBlockIndex *pnext = blockindex->GetNextInMainChain(); + if (pnext) + result.push_back(Pair("nextblockhash", pnext->GetBlockHash().GetHex())); return result; } @@ -172,10 +173,13 @@ Value gettxoutsetinfo(const Array& params, bool fHelp) CCoinsStats stats; if (pcoinsTip->GetStats(stats)) { - ret.push_back(Pair("bestblock", pcoinsTip->GetBestBlock()->GetBlockHash().GetHex())); + ret.push_back(Pair("height", (boost::int64_t)stats.nHeight)); + ret.push_back(Pair("bestblock", stats.hashBlock.GetHex())); ret.push_back(Pair("transactions", (boost::int64_t)stats.nTransactions)); ret.push_back(Pair("txouts", (boost::int64_t)stats.nTransactionOutputs)); ret.push_back(Pair("bytes_serialized", (boost::int64_t)stats.nSerializedSize)); + ret.push_back(Pair("hash_serialized", stats.hashSerialized.GetHex())); + ret.push_back(Pair("total_amount", ValueFromAmount(stats.nTotalAmount))); } return ret; } diff --git a/src/rpcdump.cpp b/src/rpcdump.cpp index 77cef02736..d46309eaa4 100644 --- a/src/rpcdump.cpp +++ b/src/rpcdump.cpp @@ -54,20 +54,18 @@ Value importprivkey(const Array& params, bool fHelp) if (!fGood) throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "Invalid private key"); - CKey key; - bool fCompressed; - CSecret secret = vchSecret.GetSecret(fCompressed); - key.SetSecret(secret, fCompressed); - CKeyID vchAddress = key.GetPubKey().GetID(); + CKey key = vchSecret.GetKey(); + CPubKey pubkey = key.GetPubKey(); + CKeyID vchAddress = pubkey.GetID(); { LOCK2(cs_main, pwalletMain->cs_wallet); pwalletMain->MarkDirty(); pwalletMain->SetAddressBookName(vchAddress, strLabel); - if (!pwalletMain->AddKey(key)) + if (!pwalletMain->AddKeyPubKey(key, pubkey)) throw JSONRPCError(RPC_WALLET_ERROR, "Error adding key to wallet"); - + if (fRescan) { pwalletMain->ScanForWalletTransactions(pindexGenesisBlock, true); pwalletMain->ReacceptWalletTransactions(); @@ -91,9 +89,8 @@ Value dumpprivkey(const Array& params, bool fHelp) CKeyID keyID; if (!address.GetKeyID(keyID)) throw JSONRPCError(RPC_TYPE_ERROR, "Address does not refer to a key"); - CSecret vchSecret; - bool fCompressed; - if (!pwalletMain->GetSecret(keyID, vchSecret, fCompressed)) + CKey vchSecret; + if (!pwalletMain->GetKey(keyID, vchSecret)) throw JSONRPCError(RPC_WALLET_ERROR, "Private key for address " + strAddress + " is not known"); - return CBitcoinSecret(vchSecret, fCompressed).ToString(); + return CBitcoinSecret(vchSecret).ToString(); } diff --git a/src/rpcmining.cpp b/src/rpcmining.cpp index fddda8b5f4..d2cac68706 100644 --- a/src/rpcmining.cpp +++ b/src/rpcmining.cpp @@ -11,6 +11,21 @@ using namespace json_spirit; using namespace std; +// Key used by getwork/getblocktemplate miners. +// Allocated in InitRPCMining, free'd in ShutdownRPCMining +static CReserveKey* pMiningKey = NULL; + +void InitRPCMining() +{ + // getwork/getblocktemplate mining rewards paid here: + pMiningKey = new CReserveKey(pwalletMain); +} + +void ShutdownRPCMining() +{ + delete pMiningKey; pMiningKey = NULL; +} + Value getgenerate(const Array& params, bool fHelp) { if (fHelp || params.size() != 0) @@ -18,7 +33,7 @@ Value getgenerate(const Array& params, bool fHelp) "getgenerate\n" "Returns true or false."); - return GetBoolArg("-gen"); + return GetBoolArg("-gen", false); } @@ -69,16 +84,16 @@ Value getmininginfo(const Array& params, bool fHelp) "Returns an object containing mining-related information."); Object obj; - obj.push_back(Pair("blocks", (int)nBestHeight)); - obj.push_back(Pair("currentblocksize",(uint64_t)nLastBlockSize)); - obj.push_back(Pair("currentblocktx",(uint64_t)nLastBlockTx)); - obj.push_back(Pair("difficulty", (double)GetDifficulty())); - obj.push_back(Pair("errors", GetWarnings("statusbar"))); - obj.push_back(Pair("generate", GetBoolArg("-gen"))); - obj.push_back(Pair("genproclimit", (int)GetArg("-genproclimit", -1))); - obj.push_back(Pair("hashespersec", gethashespersec(params, false))); - obj.push_back(Pair("pooledtx", (uint64_t)mempool.size())); - obj.push_back(Pair("testnet", fTestNet)); + obj.push_back(Pair("blocks", (int)nBestHeight)); + obj.push_back(Pair("currentblocksize", (uint64_t)nLastBlockSize)); + obj.push_back(Pair("currentblocktx", (uint64_t)nLastBlockTx)); + obj.push_back(Pair("difficulty", (double)GetDifficulty())); + obj.push_back(Pair("errors", GetWarnings("statusbar"))); + obj.push_back(Pair("generate", GetBoolArg("-gen", false))); + obj.push_back(Pair("genproclimit", (int)GetArg("-genproclimit", -1))); + obj.push_back(Pair("hashespersec", gethashespersec(params, false))); + obj.push_back(Pair("pooledtx", (uint64_t)mempool.size())); + obj.push_back(Pair("testnet", fTestNet)); return obj; } @@ -104,7 +119,6 @@ Value getwork(const Array& params, bool fHelp) typedef map > mapNewBlock_t; static mapNewBlock_t mapNewBlock; // FIXME: thread safety static vector vNewBlockTemplate; - static CReserveKey reservekey(pwalletMain); if (params.size() == 0) { @@ -134,7 +148,7 @@ Value getwork(const Array& params, bool fHelp) nStart = GetTime(); // Create new block - pblocktemplate = CreateNewBlock(reservekey); + pblocktemplate = CreateNewBlock(*pMiningKey); if (!pblocktemplate) throw JSONRPCError(RPC_OUT_OF_MEMORY, "Out of memory"); vNewBlockTemplate.push_back(pblocktemplate); @@ -192,7 +206,7 @@ Value getwork(const Array& params, bool fHelp) pblock->vtx[0].vin[0].scriptSig = mapNewBlock[pdata->hashMerkleRoot].second; pblock->hashMerkleRoot = pblock->BuildMerkleTree(); - return CheckWork(pblock, *pwalletMain, reservekey); + return CheckWork(pblock, *pwalletMain, *pMiningKey); } } @@ -243,8 +257,6 @@ Value getblocktemplate(const Array& params, bool fHelp) if (IsInitialBlockDownload()) throw JSONRPCError(RPC_CLIENT_IN_INITIAL_DOWNLOAD, "Bitcoin is downloading blocks..."); - static CReserveKey reservekey(pwalletMain); - // Update block static unsigned int nTransactionsUpdatedLast; static CBlockIndex* pindexPrev; @@ -267,7 +279,7 @@ Value getblocktemplate(const Array& params, bool fHelp) delete pblocktemplate; pblocktemplate = NULL; } - pblocktemplate = CreateNewBlock(reservekey); + pblocktemplate = CreateNewBlock(*pMiningKey); if (!pblocktemplate) throw JSONRPCError(RPC_OUT_OF_MEMORY, "Out of memory"); diff --git a/src/rpcrawtransaction.cpp b/src/rpcrawtransaction.cpp index fb9811b921..c1e05466e5 100644 --- a/src/rpcrawtransaction.cpp +++ b/src/rpcrawtransaction.cpp @@ -407,10 +407,7 @@ Value signrawtransaction(const Array& params, bool fHelp) bool fGood = vchSecret.SetString(k.get_str()); if (!fGood) throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "Invalid private key"); - CKey key; - bool fCompressed; - CSecret secret = vchSecret.GetSecret(fCompressed); - key.SetSecret(secret, fCompressed); + CKey key = vchSecret.GetKey(); tempKeystore.AddKey(key); } } diff --git a/src/rpcwallet.cpp b/src/rpcwallet.cpp index 9a899f9238..fbad1944de 100644 --- a/src/rpcwallet.cpp +++ b/src/rpcwallet.cpp @@ -84,7 +84,7 @@ Value getinfo(const Array& params, bool fHelp) obj.push_back(Pair("keypoolsize", pwalletMain->GetKeyPoolSize())); obj.push_back(Pair("paytxfee", ValueFromAmount(nTransactionFee))); if (pwalletMain->IsCrypted()) - obj.push_back(Pair("unlocked_until", (boost::int64_t)nWalletUnlockTime / 1000)); + obj.push_back(Pair("unlocked_until", (boost::int64_t)nWalletUnlockTime)); obj.push_back(Pair("errors", GetWarnings("statusbar"))); return obj; } @@ -374,11 +374,11 @@ Value verifymessage(const Array& params, bool fHelp) ss << strMessageMagic; ss << strMessage; - CKey key; - if (!key.SetCompactSignature(ss.GetHash(), vchSig)) + CPubKey pubkey; + if (!pubkey.RecoverCompact(ss.GetHash(), vchSig)) return false; - return (key.GetPubKey().GetID() == keyID); + return (pubkey.GetID() == keyID); } @@ -694,13 +694,10 @@ Value sendmany(const Array& params, bool fHelp) // Send CReserveKey keyChange(pwalletMain); int64 nFeeRequired = 0; - bool fCreated = pwalletMain->CreateTransaction(vecSend, wtx, keyChange, nFeeRequired); + string strFailReason; + bool fCreated = pwalletMain->CreateTransaction(vecSend, wtx, keyChange, nFeeRequired, strFailReason); if (!fCreated) - { - if (totalAmount + nFeeRequired > pwalletMain->GetBalance()) - throw JSONRPCError(RPC_WALLET_INSUFFICIENT_FUNDS, "Insufficient funds"); - throw JSONRPCError(RPC_WALLET_ERROR, "Transaction creation failed"); - } + throw JSONRPCError(RPC_WALLET_INSUFFICIENT_FUNDS, strFailReason); if (!pwalletMain->CommitTransaction(wtx, keyChange)) throw JSONRPCError(RPC_WALLET_ERROR, "Transaction commit failed"); @@ -722,7 +719,7 @@ static CScript _createmultisig(const Array& params) throw runtime_error( strprintf("not enough keys supplied " "(got %"PRIszu" keys, but need at least %d to redeem)", keys.size(), nRequired)); - std::vector pubkeys; + std::vector pubkeys; pubkeys.resize(keys.size()); for (unsigned int i = 0; i < keys.size(); i++) { @@ -740,16 +737,18 @@ static CScript _createmultisig(const Array& params) if (!pwalletMain->GetPubKey(keyID, vchPubKey)) throw runtime_error( strprintf("no full public key for address %s",ks.c_str())); - if (!vchPubKey.IsValid() || !pubkeys[i].SetPubKey(vchPubKey)) + if (!vchPubKey.IsFullyValid()) throw runtime_error(" Invalid public key: "+ks); + pubkeys[i] = vchPubKey; } // Case 2: hex public key else if (IsHex(ks)) { CPubKey vchPubKey(ParseHex(ks)); - if (!vchPubKey.IsValid() || !pubkeys[i].SetPubKey(vchPubKey)) + if (!vchPubKey.IsFullyValid()) throw runtime_error(" Invalid public key: "+ks); + pubkeys[i] = vchPubKey; } else { @@ -814,6 +813,7 @@ struct tallyitem { int64 nAmount; int nConf; + vector txids; tallyitem() { nAmount = 0; @@ -855,6 +855,7 @@ Value ListReceived(const Array& params, bool fByAccounts) tallyitem& item = mapTally[address]; item.nAmount += txout.nValue; item.nConf = min(item.nConf, nDepth); + item.txids.push_back(wtx.GetHash()); } } @@ -890,6 +891,15 @@ Value ListReceived(const Array& params, bool fByAccounts) obj.push_back(Pair("account", strAccount)); obj.push_back(Pair("amount", ValueFromAmount(nAmount))); obj.push_back(Pair("confirmations", (nConf == std::numeric_limits::max() ? 0 : nConf))); + Array transactions; + if (it != mapTally.end()) + { + BOOST_FOREACH(const uint256& item, (*it).second.txids) + { + transactions.push_back(item.GetHex()); + } + } + obj.push_back(Pair("txids", transactions)); ret.push_back(obj); } } @@ -922,7 +932,8 @@ Value listreceivedbyaddress(const Array& params, bool fHelp) " \"address\" : receiving address\n" " \"account\" : the account of the receiving address\n" " \"amount\" : total amount received by the address\n" - " \"confirmations\" : number of confirmations of the most recent transaction included"); + " \"confirmations\" : number of confirmations of the most recent transaction included\n" + " \"txids\" : list of transactions with outputs to the address\n"); return ListReceived(params, false); } @@ -1259,56 +1270,11 @@ Value keypoolrefill(const Array& params, bool fHelp) } -void ThreadTopUpKeyPool(void* parg) +static void LockWallet(CWallet* pWallet) { - // Make this thread recognisable as the key-topping-up thread - RenameThread("bitcoin-key-top"); - - pwalletMain->TopUpKeyPool(); -} - -void ThreadCleanWalletPassphrase(void* parg) -{ - // Make this thread recognisable as the wallet relocking thread - RenameThread("bitcoin-lock-wa"); - - int64 nMyWakeTime = GetTimeMillis() + *((int64*)parg) * 1000; - - ENTER_CRITICAL_SECTION(cs_nWalletUnlockTime); - - if (nWalletUnlockTime == 0) - { - nWalletUnlockTime = nMyWakeTime; - - do - { - if (nWalletUnlockTime==0) - break; - int64 nToSleep = nWalletUnlockTime - GetTimeMillis(); - if (nToSleep <= 0) - break; - - LEAVE_CRITICAL_SECTION(cs_nWalletUnlockTime); - MilliSleep(nToSleep); - ENTER_CRITICAL_SECTION(cs_nWalletUnlockTime); - - } while(1); - - if (nWalletUnlockTime) - { - nWalletUnlockTime = 0; - pwalletMain->Lock(); - } - } - else - { - if (nWalletUnlockTime < nMyWakeTime) - nWalletUnlockTime = nMyWakeTime; - } - - LEAVE_CRITICAL_SECTION(cs_nWalletUnlockTime); - - delete (int64*)parg; + LOCK(cs_nWalletUnlockTime); + nWalletUnlockTime = 0; + pWallet->Lock(); } Value walletpassphrase(const Array& params, bool fHelp) @@ -1322,9 +1288,6 @@ Value walletpassphrase(const Array& params, bool fHelp) if (!pwalletMain->IsCrypted()) throw JSONRPCError(RPC_WALLET_WRONG_ENC_STATE, "Error: running with an unencrypted wallet, but walletpassphrase was called."); - if (!pwalletMain->IsLocked()) - throw JSONRPCError(RPC_WALLET_ALREADY_UNLOCKED, "Error: Wallet is already unlocked."); - // Note that the walletpassphrase is stored in params[0] which is not mlock()ed SecureString strWalletPass; strWalletPass.reserve(100); @@ -1342,9 +1305,12 @@ Value walletpassphrase(const Array& params, bool fHelp) "walletpassphrase \n" "Stores the wallet decryption key in memory for seconds."); - NewThread(ThreadTopUpKeyPool, NULL); - int64* pnSleepTime = new int64(params[1].get_int64()); - NewThread(ThreadCleanWalletPassphrase, pnSleepTime); + pwalletMain->TopUpKeyPool(); + + int64 nSleepTime = params[1].get_int64(); + LOCK(cs_nWalletUnlockTime); + nWalletUnlockTime = GetTime() + nSleepTime; + RPCRunLater("lockwallet", boost::bind(LockWallet, pwalletMain), nSleepTime); return Value::null; } @@ -1448,7 +1414,7 @@ public: CPubKey vchPubKey; pwalletMain->GetPubKey(keyID, vchPubKey); obj.push_back(Pair("isscript", false)); - obj.push_back(Pair("pubkey", HexStr(vchPubKey.Raw()))); + obj.push_back(Pair("pubkey", HexStr(vchPubKey))); obj.push_back(Pair("iscompressed", vchPubKey.IsCompressed())); return obj; } diff --git a/src/script.cpp b/src/script.cpp index 5e5cd096cd..b411666353 100644 --- a/src/script.cpp +++ b/src/script.cpp @@ -16,7 +16,7 @@ using namespace boost; #include "sync.h" #include "util.h" -bool CheckSig(vector vchSig, vector vchPubKey, CScript scriptCode, const CTransaction& txTo, unsigned int nIn, int nHashType, int flags); +bool CheckSig(vector vchSig, const vector &vchPubKey, const CScript &scriptCode, const CTransaction& txTo, unsigned int nIn, int nHashType, int flags); @@ -54,32 +54,6 @@ bool CastToBool(const valtype& vch) return false; } -// -// WARNING: This does not work as expected for signed integers; the sign-bit -// is left in place as the integer is zero-extended. The correct behavior -// would be to move the most significant bit of the last byte during the -// resize process. MakeSameSize() is currently only used by the disabled -// opcodes OP_AND, OP_OR, and OP_XOR. -// -void MakeSameSize(valtype& vch1, valtype& vch2) -{ - // Lengthen the shorter one - if (vch1.size() < vch2.size()) - // PATCH: - // +unsigned char msb = vch1[vch1.size()-1]; - // +vch1[vch1.size()-1] &= 0x7f; - // vch1.resize(vch2.size(), 0); - // +vch1[vch1.size()-1] = msb; - vch1.resize(vch2.size(), 0); - if (vch2.size() < vch1.size()) - // PATCH: - // +unsigned char msb = vch2[vch2.size()-1]; - // +vch2[vch2.size()-1] &= 0x7f; - // vch2.resize(vch1.size(), 0); - // +vch2[vch2.size()-1] = msb; - vch2.resize(vch1.size(), 0); -} - // @@ -361,7 +335,7 @@ bool EvalScript(vector >& stack, const CScript& script, co opcode == OP_MOD || opcode == OP_LSHIFT || opcode == OP_RSHIFT) - return false; + return false; // Disabled opcodes. if (fExec && 0 <= opcode && opcode <= OP_PUSHDATA4) stack.push_back(vchPushValue); @@ -659,64 +633,6 @@ bool EvalScript(vector >& stack, const CScript& script, co break; - // - // Splice ops - // - case OP_CAT: - { - // (x1 x2 -- out) - if (stack.size() < 2) - return false; - valtype& vch1 = stacktop(-2); - valtype& vch2 = stacktop(-1); - vch1.insert(vch1.end(), vch2.begin(), vch2.end()); - popstack(stack); - if (stacktop(-1).size() > MAX_SCRIPT_ELEMENT_SIZE) - return false; - } - break; - - case OP_SUBSTR: - { - // (in begin size -- out) - if (stack.size() < 3) - return false; - valtype& vch = stacktop(-3); - int nBegin = CastToBigNum(stacktop(-2)).getint(); - int nEnd = nBegin + CastToBigNum(stacktop(-1)).getint(); - if (nBegin < 0 || nEnd < nBegin) - return false; - if (nBegin > (int)vch.size()) - nBegin = vch.size(); - if (nEnd > (int)vch.size()) - nEnd = vch.size(); - vch.erase(vch.begin() + nEnd, vch.end()); - vch.erase(vch.begin(), vch.begin() + nBegin); - popstack(stack); - popstack(stack); - } - break; - - case OP_LEFT: - case OP_RIGHT: - { - // (in size -- out) - if (stack.size() < 2) - return false; - valtype& vch = stacktop(-2); - int nSize = CastToBigNum(stacktop(-1)).getint(); - if (nSize < 0) - return false; - if (nSize > (int)vch.size()) - nSize = vch.size(); - if (opcode == OP_LEFT) - vch.erase(vch.begin() + nSize, vch.end()); - else - vch.erase(vch.begin(), vch.end() - nSize); - popstack(stack); - } - break; - case OP_SIZE: { // (in -- in size) @@ -731,51 +647,6 @@ bool EvalScript(vector >& stack, const CScript& script, co // // Bitwise logic // - case OP_INVERT: - { - // (in - out) - if (stack.size() < 1) - return false; - valtype& vch = stacktop(-1); - for (unsigned int i = 0; i < vch.size(); i++) - vch[i] = ~vch[i]; - } - break; - - // - // WARNING: These disabled opcodes exhibit unexpected behavior - // when used on signed integers due to a bug in MakeSameSize() - // [see definition of MakeSameSize() above]. - // - case OP_AND: - case OP_OR: - case OP_XOR: - { - // (x1 x2 - out) - if (stack.size() < 2) - return false; - valtype& vch1 = stacktop(-2); - valtype& vch2 = stacktop(-1); - MakeSameSize(vch1, vch2); // <-- NOT SAFE FOR SIGNED VALUES - if (opcode == OP_AND) - { - for (unsigned int i = 0; i < vch1.size(); i++) - vch1[i] &= vch2[i]; - } - else if (opcode == OP_OR) - { - for (unsigned int i = 0; i < vch1.size(); i++) - vch1[i] |= vch2[i]; - } - else if (opcode == OP_XOR) - { - for (unsigned int i = 0; i < vch1.size(); i++) - vch1[i] ^= vch2[i]; - } - popstack(stack); - } - break; - case OP_EQUAL: case OP_EQUALVERIFY: //case OP_NOTEQUAL: // use OP_NUMNOTEQUAL @@ -810,8 +681,6 @@ bool EvalScript(vector >& stack, const CScript& script, co // case OP_1ADD: case OP_1SUB: - case OP_2MUL: - case OP_2DIV: case OP_NEGATE: case OP_ABS: case OP_NOT: @@ -825,8 +694,6 @@ bool EvalScript(vector >& stack, const CScript& script, co { case OP_1ADD: bn += bnOne; break; case OP_1SUB: bn -= bnOne; break; - case OP_2MUL: bn <<= 1; break; - case OP_2DIV: bn >>= 1; break; case OP_NEGATE: bn = -bn; break; case OP_ABS: if (bn < bnZero) bn = -bn; break; case OP_NOT: bn = (bn == bnZero); break; @@ -840,11 +707,6 @@ bool EvalScript(vector >& stack, const CScript& script, co case OP_ADD: case OP_SUB: - case OP_MUL: - case OP_DIV: - case OP_MOD: - case OP_LSHIFT: - case OP_RSHIFT: case OP_BOOLAND: case OP_BOOLOR: case OP_NUMEQUAL: @@ -873,33 +735,6 @@ bool EvalScript(vector >& stack, const CScript& script, co bn = bn1 - bn2; break; - case OP_MUL: - if (!BN_mul(&bn, &bn1, &bn2, pctx)) - return false; - break; - - case OP_DIV: - if (!BN_div(&bn, NULL, &bn1, &bn2, pctx)) - return false; - break; - - case OP_MOD: - if (!BN_mod(&bn, &bn1, &bn2, pctx)) - return false; - break; - - case OP_LSHIFT: - if (bn2 < bnZero || bn2 > CBigNum(2048)) - return false; - bn = bn1 << bn2.getulong(); - break; - - case OP_RSHIFT: - if (bn2 < bnZero || bn2 > CBigNum(2048)) - return false; - bn = bn1 >> bn2.getulong(); - break; - case OP_BOOLAND: bn = (bn1 != bnZero && bn2 != bnZero); break; case OP_BOOLOR: bn = (bn1 != bnZero || bn2 != bnZero); break; case OP_NUMEQUAL: bn = (bn1 == bn2); break; @@ -1198,13 +1033,13 @@ class CSignatureCache { private: // sigdata_type is (signature hash, signature, public key): - typedef boost::tuple, std::vector > sigdata_type; + typedef boost::tuple, CPubKey> sigdata_type; std::set< sigdata_type> setValid; boost::shared_mutex cs_sigcache; public: bool - Get(uint256 hash, const std::vector& vchSig, const std::vector& pubKey) + Get(const uint256 &hash, const std::vector& vchSig, const CPubKey& pubKey) { boost::shared_lock lock(cs_sigcache); @@ -1215,7 +1050,7 @@ public: return false; } - void Set(uint256 hash, const std::vector& vchSig, const std::vector& pubKey) + void Set(const uint256 &hash, const std::vector& vchSig, const CPubKey& pubKey) { // DoS prevention: limit cache size to less than 10MB // (~200 bytes per cache entry times 50,000 entries) @@ -1246,11 +1081,15 @@ public: } }; -bool CheckSig(vector vchSig, vector vchPubKey, CScript scriptCode, +bool CheckSig(vector vchSig, const vector &vchPubKey, const CScript &scriptCode, const CTransaction& txTo, unsigned int nIn, int nHashType, int flags) { static CSignatureCache signatureCache; + CPubKey pubkey(vchPubKey); + if (!pubkey.IsValid()) + return false; + // Hash type is one byte tacked on to the end of the signature if (vchSig.empty()) return false; @@ -1262,18 +1101,14 @@ bool CheckSig(vector vchSig, vector vchPubKey, CSc uint256 sighash = SignatureHash(scriptCode, txTo, nIn, nHashType); - if (signatureCache.Get(sighash, vchSig, vchPubKey)) + if (signatureCache.Get(sighash, vchSig, pubkey)) return true; - CKey key; - if (!key.SetPubKey(vchPubKey)) - return false; - - if (!key.Verify(sighash, vchSig)) + if (!pubkey.Verify(sighash, vchSig)) return false; if (!(flags & SCRIPT_VERIFY_NOCACHE)) - signatureCache.Set(sighash, vchSig, vchPubKey); + signatureCache.Set(sighash, vchSig, pubkey); return true; } @@ -1935,13 +1770,13 @@ void CScript::SetDestination(const CTxDestination& dest) boost::apply_visitor(CScriptVisitor(this), dest); } -void CScript::SetMultisig(int nRequired, const std::vector& keys) +void CScript::SetMultisig(int nRequired, const std::vector& keys) { this->clear(); *this << EncodeOP_N(nRequired); - BOOST_FOREACH(const CKey& key, keys) - *this << key.GetPubKey(); + BOOST_FOREACH(const CPubKey& key, keys) + *this << key; *this << EncodeOP_N(keys.size()) << OP_CHECKMULTISIG; } @@ -1966,20 +1801,17 @@ bool CScriptCompressor::IsToScriptID(CScriptID &hash) const return false; } -bool CScriptCompressor::IsToPubKey(std::vector &pubkey) const +bool CScriptCompressor::IsToPubKey(CPubKey &pubkey) const { if (script.size() == 35 && script[0] == 33 && script[34] == OP_CHECKSIG && (script[1] == 0x02 || script[1] == 0x03)) { - pubkey.resize(33); - memcpy(&pubkey[0], &script[1], 33); + pubkey.Set(&script[1], &script[34]); return true; } if (script.size() == 67 && script[0] == 65 && script[66] == OP_CHECKSIG && script[1] == 0x04) { - pubkey.resize(65); - memcpy(&pubkey[0], &script[1], 65); - CKey key; - return (key.SetPubKey(CPubKey(pubkey))); // SetPubKey fails if this is not a valid public key, a case that would not be compressible + pubkey.Set(&script[1], &script[66]); + return pubkey.IsFullyValid(); // if not fully valid, a case that would not be compressible } return false; } @@ -2000,7 +1832,7 @@ bool CScriptCompressor::Compress(std::vector &out) const memcpy(&out[1], &scriptID, 20); return true; } - std::vector pubkey; + CPubKey pubkey; if (IsToPubKey(pubkey)) { out.resize(33); memcpy(&out[1], &pubkey[1], 32); @@ -2053,17 +1885,16 @@ bool CScriptCompressor::Decompress(unsigned int nSize, const std::vector vch(33, 0x00); + unsigned char vch[33] = {}; vch[0] = nSize - 2; memcpy(&vch[1], &in[0], 32); - CKey key; - if (!key.SetPubKey(CPubKey(vch))) + CPubKey pubkey(&vch[0], &vch[33]); + if (!pubkey.Decompress()) return false; - key.SetCompressedPubKey(false); // Decompress public key - CPubKey pubkey = key.GetPubKey(); + assert(pubkey.size() == 65); script.resize(67); script[0] = 65; - memcpy(&script[1], &pubkey.Raw()[0], 65); + memcpy(&script[1], pubkey.begin(), 65); script[66] = OP_CHECKSIG; return true; } diff --git a/src/script.h b/src/script.h index 4b29f6273c..3cbb2cf322 100644 --- a/src/script.h +++ b/src/script.h @@ -348,8 +348,10 @@ public: CScript& operator<<(const CPubKey& key) { - std::vector vchKey = key.Raw(); - return (*this) << vchKey; + assert(key.size() < OP_PUSHDATA1); + insert(end(), (unsigned char)key.size()); + insert(end(), key.begin(), key.end()); + return *this; } CScript& operator<<(const CBigNum& b) @@ -548,7 +550,7 @@ public: void SetDestination(const CTxDestination& address); - void SetMultisig(int nRequired, const std::vector& keys); + void SetMultisig(int nRequired, const std::vector& keys); void PrintHex() const @@ -619,7 +621,7 @@ protected: // form). bool IsToKeyID(CKeyID &hash) const; bool IsToScriptID(CScriptID &hash) const; - bool IsToPubKey(std::vector &pubkey) const; + bool IsToPubKey(CPubKey &pubkey) const; bool Compress(std::vector &out) const; unsigned int GetSpecialSize(unsigned int nSize) const; diff --git a/src/test/base58_tests.cpp b/src/test/base58_tests.cpp index 7602fa93a6..2741672a88 100644 --- a/src/test/base58_tests.cpp +++ b/src/test/base58_tests.cpp @@ -133,9 +133,8 @@ BOOST_AUTO_TEST_CASE(base58_keys_valid_parse) // Note: CBitcoinSecret::SetString tests isValid, whereas CBitcoinAddress does not! BOOST_CHECK_MESSAGE(secret.SetString(exp_base58string), "!SetString:"+ strTest); BOOST_CHECK_MESSAGE(secret.IsValid(), "!IsValid:" + strTest); - bool fCompressedOut = false; - CSecret privkey = secret.GetSecret(fCompressedOut); - BOOST_CHECK_MESSAGE(fCompressedOut == isCompressed, "compressed mismatch:" + strTest); + CKey privkey = secret.GetKey(); + BOOST_CHECK_MESSAGE(privkey.IsCompressed() == isCompressed, "compressed mismatch:" + strTest); BOOST_CHECK_MESSAGE(privkey.size() == exp_payload.size() && std::equal(privkey.begin(), privkey.end(), exp_payload.begin()), "key mismatch:" + strTest); // Private key must be invalid public key @@ -187,8 +186,11 @@ BOOST_AUTO_TEST_CASE(base58_keys_valid_gen) if(isPrivkey) { bool isCompressed = find_value(metadata, "isCompressed").get_bool(); + CKey key; + key.Set(exp_payload.begin(), exp_payload.end(), isCompressed); + assert(key.IsValid()); CBitcoinSecret secret; - secret.SetSecret(CSecret(exp_payload.begin(), exp_payload.end()), isCompressed); + secret.SetKey(key); BOOST_CHECK_MESSAGE(secret.ToString() == exp_base58string, "result mismatch: " + strTest); } else diff --git a/src/test/bloom_tests.cpp b/src/test/bloom_tests.cpp index 4a2851cf46..0d349a990c 100644 --- a/src/test/bloom_tests.cpp +++ b/src/test/bloom_tests.cpp @@ -73,14 +73,13 @@ BOOST_AUTO_TEST_CASE(bloom_create_insert_key) CBitcoinSecret vchSecret; BOOST_CHECK(vchSecret.SetString(strSecret)); - CKey key; - bool fCompressed; - CSecret secret = vchSecret.GetSecret(fCompressed); - key.SetSecret(secret, fCompressed); + CKey key = vchSecret.GetKey(); + CPubKey pubkey = key.GetPubKey(); + vector vchPubKey(pubkey.begin(), pubkey.end()); CBloomFilter filter(2, 0.001, 0, BLOOM_UPDATE_ALL); - filter.insert(key.GetPubKey().Raw()); - uint160 hash = key.GetPubKey().GetID(); + filter.insert(vchPubKey); + uint160 hash = pubkey.GetID(); filter.insert(vector(hash.begin(), hash.end())); CDataStream stream(SER_NETWORK, PROTOCOL_VERSION); diff --git a/src/test/checkblock_tests.cpp b/src/test/checkblock_tests.cpp index 3cfb6dbfa4..d626f9a6f4 100644 --- a/src/test/checkblock_tests.cpp +++ b/src/test/checkblock_tests.cpp @@ -52,8 +52,6 @@ BOOST_AUTO_TEST_CASE(May15) if (read_block("Mar12Fork.dat", forkingBlock)) { CValidationState state; - forkingBlock.nTime = tMay15-1; // Invalidates PoW - BOOST_CHECK(!forkingBlock.CheckBlock(state, false, false)); // After May 15'th, big blocks are OK: forkingBlock.nTime = tMay15; // Invalidates PoW diff --git a/src/test/data/tx_invalid.json b/src/test/data/tx_invalid.json index f01ee06cfa..81e77b7df8 100644 --- a/src/test/data/tx_invalid.json +++ b/src/test/data/tx_invalid.json @@ -60,5 +60,10 @@ ["Null txin"], [[["0000000000000000000000000000000000000000000000000000000000000000", -1, "HASH160 0x14 0x02dae7dbbda56097959cba59b1989dd3e47937bf EQUAL"]], -"01000000010000000000000000000000000000000000000000000000000000000000000000ffffffff6e49304602210086f39e028e46dafa8e1e3be63906465f4cf038fbe5ed6403dc3e74ae876e6431022100c4625c675cfc5c7e3a0e0d7eaec92ac24da20c73a88eb40d09253e51ac6def5201232103a183ddc41e84753aca47723c965d1b5c8b0e2b537963518355e6dd6cf8415e50acffffffff010000000000000000015100000000", true] +"01000000010000000000000000000000000000000000000000000000000000000000000000ffffffff6e49304602210086f39e028e46dafa8e1e3be63906465f4cf038fbe5ed6403dc3e74ae876e6431022100c4625c675cfc5c7e3a0e0d7eaec92ac24da20c73a88eb40d09253e51ac6def5201232103a183ddc41e84753aca47723c965d1b5c8b0e2b537963518355e6dd6cf8415e50acffffffff010000000000000000015100000000", true], + +["Same as the transactions in valid with one input SIGHASH_ALL and one SIGHASH_ANYONECANPAY, but we set the _ANYONECANPAY sequence number, invalidating the SIGHASH_ALL signature"], +[[["0000000000000000000000000000000000000000000000000000000000000100", 0, "0x21 0x035e7f0d4d0841bcd56c39337ed086b1a633ee770c1ffdd94ac552a95ac2ce0efc CHECKSIG"], + ["0000000000000000000000000000000000000000000000000000000000000200", 0, "0x21 0x035e7f0d4d0841bcd56c39337ed086b1a633ee770c1ffdd94ac552a95ac2ce0efc CHECKSIG"]], + "01000000020001000000000000000000000000000000000000000000000000000000000000000000004948304502203a0f5f0e1f2bdbcd04db3061d18f3af70e07f4f467cbc1b8116f267025f5360b022100c792b6e215afc5afc721a351ec413e714305cb749aae3d7fee76621313418df10101000000000200000000000000000000000000000000000000000000000000000000000000000000484730440220201dc2d030e380e8f9cfb41b442d930fa5a685bb2c8db5906671f865507d0670022018d9e7a8d4c8d86a73c2a724ee38ef983ec249827e0e464841735955c707ece98101000000010100000000000000015100000000", true] ] diff --git a/src/test/data/tx_valid.json b/src/test/data/tx_valid.json index 5528ae7243..c6099246fe 100644 --- a/src/test/data/tx_valid.json +++ b/src/test/data/tx_valid.json @@ -67,5 +67,15 @@ ["Coinbase of size 100"], ["Note the input is just required to make the tester happy"], [[["0000000000000000000000000000000000000000000000000000000000000000", -1, "1"]], -"01000000010000000000000000000000000000000000000000000000000000000000000000ffffffff6451515151515151515151515151515151515151515151515151515151515151515151515151515151515151515151515151515151515151515151515151515151515151515151515151515151515151515151515151515151515151515151515151515151ffffffff010000000000000000015100000000", true] +"01000000010000000000000000000000000000000000000000000000000000000000000000ffffffff6451515151515151515151515151515151515151515151515151515151515151515151515151515151515151515151515151515151515151515151515151515151515151515151515151515151515151515151515151515151515151515151515151515151ffffffff010000000000000000015100000000", true], + +["Simple transaction with first input is signed with SIGHASH_ALL, second with SIGHASH_ANYONECANPAY"], +[[["0000000000000000000000000000000000000000000000000000000000000100", 0, "0x21 0x035e7f0d4d0841bcd56c39337ed086b1a633ee770c1ffdd94ac552a95ac2ce0efc CHECKSIG"], + ["0000000000000000000000000000000000000000000000000000000000000200", 0, "0x21 0x035e7f0d4d0841bcd56c39337ed086b1a633ee770c1ffdd94ac552a95ac2ce0efc CHECKSIG"]], + "010000000200010000000000000000000000000000000000000000000000000000000000000000000049483045022100d180fd2eb9140aeb4210c9204d3f358766eb53842b2a9473db687fa24b12a3cc022079781799cd4f038b85135bbe49ec2b57f306b2bb17101b17f71f000fcab2b6fb01ffffffff0002000000000000000000000000000000000000000000000000000000000000000000004847304402205f7530653eea9b38699e476320ab135b74771e1c48b81a5d041e2ca84b9be7a802200ac8d1f40fb026674fe5a5edd3dea715c27baa9baca51ed45ea750ac9dc0a55e81ffffffff010100000000000000015100000000", true], + +["Same as above, but we change the sequence number of the first input to check that SIGHASH_ANYONECANPAY is being followed"], +[[["0000000000000000000000000000000000000000000000000000000000000100", 0, "0x21 0x035e7f0d4d0841bcd56c39337ed086b1a633ee770c1ffdd94ac552a95ac2ce0efc CHECKSIG"], + ["0000000000000000000000000000000000000000000000000000000000000200", 0, "0x21 0x035e7f0d4d0841bcd56c39337ed086b1a633ee770c1ffdd94ac552a95ac2ce0efc CHECKSIG"]], + "01000000020001000000000000000000000000000000000000000000000000000000000000000000004948304502203a0f5f0e1f2bdbcd04db3061d18f3af70e07f4f467cbc1b8116f267025f5360b022100c792b6e215afc5afc721a351ec413e714305cb749aae3d7fee76621313418df101010000000002000000000000000000000000000000000000000000000000000000000000000000004847304402205f7530653eea9b38699e476320ab135b74771e1c48b81a5d041e2ca84b9be7a802200ac8d1f40fb026674fe5a5edd3dea715c27baa9baca51ed45ea750ac9dc0a55e81ffffffff010100000000000000015100000000", true] ] diff --git a/src/test/getarg_tests.cpp b/src/test/getarg_tests.cpp index 78953d296f..c89d218f80 100644 --- a/src/test/getarg_tests.cpp +++ b/src/test/getarg_tests.cpp @@ -6,8 +6,7 @@ BOOST_AUTO_TEST_SUITE(getarg_tests) -static void -ResetArgs(const std::string& strArg) +static void ResetArgs(const std::string& strArg) { std::vector vecArg; boost::split(vecArg, strArg, boost::is_space(), boost::token_compress_on); @@ -26,62 +25,50 @@ ResetArgs(const std::string& strArg) BOOST_AUTO_TEST_CASE(boolarg) { ResetArgs("-foo"); - BOOST_CHECK(GetBoolArg("-foo")); BOOST_CHECK(GetBoolArg("-foo", false)); BOOST_CHECK(GetBoolArg("-foo", true)); - BOOST_CHECK(!GetBoolArg("-fo")); BOOST_CHECK(!GetBoolArg("-fo", false)); BOOST_CHECK(GetBoolArg("-fo", true)); - BOOST_CHECK(!GetBoolArg("-fooo")); BOOST_CHECK(!GetBoolArg("-fooo", false)); BOOST_CHECK(GetBoolArg("-fooo", true)); ResetArgs("-foo=0"); - BOOST_CHECK(!GetBoolArg("-foo")); BOOST_CHECK(!GetBoolArg("-foo", false)); BOOST_CHECK(!GetBoolArg("-foo", true)); ResetArgs("-foo=1"); - BOOST_CHECK(GetBoolArg("-foo")); BOOST_CHECK(GetBoolArg("-foo", false)); BOOST_CHECK(GetBoolArg("-foo", true)); // New 0.6 feature: auto-map -nosomething to !-something: ResetArgs("-nofoo"); - BOOST_CHECK(!GetBoolArg("-foo")); BOOST_CHECK(!GetBoolArg("-foo", false)); BOOST_CHECK(!GetBoolArg("-foo", true)); ResetArgs("-nofoo=1"); - BOOST_CHECK(!GetBoolArg("-foo")); BOOST_CHECK(!GetBoolArg("-foo", false)); BOOST_CHECK(!GetBoolArg("-foo", true)); ResetArgs("-foo -nofoo"); // -foo should win - BOOST_CHECK(GetBoolArg("-foo")); BOOST_CHECK(GetBoolArg("-foo", false)); BOOST_CHECK(GetBoolArg("-foo", true)); ResetArgs("-foo=1 -nofoo=1"); // -foo should win - BOOST_CHECK(GetBoolArg("-foo")); BOOST_CHECK(GetBoolArg("-foo", false)); BOOST_CHECK(GetBoolArg("-foo", true)); ResetArgs("-foo=0 -nofoo=0"); // -foo should win - BOOST_CHECK(!GetBoolArg("-foo")); BOOST_CHECK(!GetBoolArg("-foo", false)); BOOST_CHECK(!GetBoolArg("-foo", true)); // New 0.6 feature: treat -- same as -: ResetArgs("--foo=1"); - BOOST_CHECK(GetBoolArg("-foo")); BOOST_CHECK(GetBoolArg("-foo", false)); BOOST_CHECK(GetBoolArg("-foo", true)); ResetArgs("--nofoo=1"); - BOOST_CHECK(!GetBoolArg("-foo")); BOOST_CHECK(!GetBoolArg("-foo", false)); BOOST_CHECK(!GetBoolArg("-foo", true)); @@ -133,7 +120,7 @@ BOOST_AUTO_TEST_CASE(intarg) BOOST_AUTO_TEST_CASE(doubledash) { ResetArgs("--foo"); - BOOST_CHECK_EQUAL(GetBoolArg("-foo"), true); + BOOST_CHECK_EQUAL(GetBoolArg("-foo", false), true); ResetArgs("--foo=verbose --bar=1"); BOOST_CHECK_EQUAL(GetArg("-foo", ""), "verbose"); @@ -143,25 +130,24 @@ BOOST_AUTO_TEST_CASE(doubledash) BOOST_AUTO_TEST_CASE(boolargno) { ResetArgs("-nofoo"); - BOOST_CHECK(!GetBoolArg("-foo")); BOOST_CHECK(!GetBoolArg("-foo", true)); BOOST_CHECK(!GetBoolArg("-foo", false)); ResetArgs("-nofoo=1"); - BOOST_CHECK(!GetBoolArg("-foo")); BOOST_CHECK(!GetBoolArg("-foo", true)); BOOST_CHECK(!GetBoolArg("-foo", false)); ResetArgs("-nofoo=0"); - BOOST_CHECK(GetBoolArg("-foo")); BOOST_CHECK(GetBoolArg("-foo", true)); BOOST_CHECK(GetBoolArg("-foo", false)); ResetArgs("-foo --nofoo"); - BOOST_CHECK(GetBoolArg("-foo")); + BOOST_CHECK(GetBoolArg("-foo", true)); + BOOST_CHECK(GetBoolArg("-foo", false)); ResetArgs("-nofoo -foo"); // foo always wins: - BOOST_CHECK(GetBoolArg("-foo")); + BOOST_CHECK(GetBoolArg("-foo", true)); + BOOST_CHECK(GetBoolArg("-foo", false)); } BOOST_AUTO_TEST_SUITE_END() diff --git a/src/test/key_tests.cpp b/src/test/key_tests.cpp index 0a6df88fef..c004521d1a 100644 --- a/src/test/key_tests.cpp +++ b/src/test/key_tests.cpp @@ -26,8 +26,8 @@ static const string strAddressBad("1HV9Lc3sNHZxwj4Zk6fB38tEmBryq2cBiF"); #ifdef KEY_TESTS_DUMPINFO void dumpKeyInfo(uint256 privkey) { - CSecret secret; - secret.resize(32); + CKey key; + key.resize(32); memcpy(&secret[0], &privkey, 32); vector sec; sec.resize(32); @@ -62,29 +62,24 @@ BOOST_AUTO_TEST_CASE(key_test1) BOOST_CHECK( bsecret2C.SetString(strSecret2C)); BOOST_CHECK(!baddress1.SetString(strAddressBad)); - bool fCompressed; - CSecret secret1 = bsecret1.GetSecret (fCompressed); - BOOST_CHECK(fCompressed == false); - CSecret secret2 = bsecret2.GetSecret (fCompressed); - BOOST_CHECK(fCompressed == false); - CSecret secret1C = bsecret1C.GetSecret(fCompressed); - BOOST_CHECK(fCompressed == true); - CSecret secret2C = bsecret2C.GetSecret(fCompressed); - BOOST_CHECK(fCompressed == true); + CKey key1 = bsecret1.GetKey(); + BOOST_CHECK(key1.IsCompressed() == false); + CKey key2 = bsecret2.GetKey(); + BOOST_CHECK(key2.IsCompressed() == false); + CKey key1C = bsecret1C.GetKey(); + BOOST_CHECK(key1C.IsCompressed() == true); + CKey key2C = bsecret2C.GetKey(); + BOOST_CHECK(key1C.IsCompressed() == true); - BOOST_CHECK(secret1 == secret1C); - BOOST_CHECK(secret2 == secret2C); + CPubKey pubkey1 = key1. GetPubKey(); + CPubKey pubkey2 = key2. GetPubKey(); + CPubKey pubkey1C = key1C.GetPubKey(); + CPubKey pubkey2C = key2C.GetPubKey(); - CKey key1, key2, key1C, key2C; - key1.SetSecret(secret1, false); - key2.SetSecret(secret2, false); - key1C.SetSecret(secret1, true); - key2C.SetSecret(secret2, true); - - BOOST_CHECK(addr1.Get() == CTxDestination(key1.GetPubKey().GetID())); - BOOST_CHECK(addr2.Get() == CTxDestination(key2.GetPubKey().GetID())); - BOOST_CHECK(addr1C.Get() == CTxDestination(key1C.GetPubKey().GetID())); - BOOST_CHECK(addr2C.Get() == CTxDestination(key2C.GetPubKey().GetID())); + BOOST_CHECK(addr1.Get() == CTxDestination(pubkey1.GetID())); + BOOST_CHECK(addr2.Get() == CTxDestination(pubkey2.GetID())); + BOOST_CHECK(addr1C.Get() == CTxDestination(pubkey1C.GetID())); + BOOST_CHECK(addr2C.Get() == CTxDestination(pubkey2C.GetID())); for (int n=0; n<16; n++) { @@ -100,25 +95,25 @@ BOOST_AUTO_TEST_CASE(key_test1) BOOST_CHECK(key1C.Sign(hashMsg, sign1C)); BOOST_CHECK(key2C.Sign(hashMsg, sign2C)); - BOOST_CHECK( key1.Verify(hashMsg, sign1)); - BOOST_CHECK(!key1.Verify(hashMsg, sign2)); - BOOST_CHECK( key1.Verify(hashMsg, sign1C)); - BOOST_CHECK(!key1.Verify(hashMsg, sign2C)); + BOOST_CHECK( pubkey1.Verify(hashMsg, sign1)); + BOOST_CHECK(!pubkey1.Verify(hashMsg, sign2)); + BOOST_CHECK( pubkey1.Verify(hashMsg, sign1C)); + BOOST_CHECK(!pubkey1.Verify(hashMsg, sign2C)); - BOOST_CHECK(!key2.Verify(hashMsg, sign1)); - BOOST_CHECK( key2.Verify(hashMsg, sign2)); - BOOST_CHECK(!key2.Verify(hashMsg, sign1C)); - BOOST_CHECK( key2.Verify(hashMsg, sign2C)); + BOOST_CHECK(!pubkey2.Verify(hashMsg, sign1)); + BOOST_CHECK( pubkey2.Verify(hashMsg, sign2)); + BOOST_CHECK(!pubkey2.Verify(hashMsg, sign1C)); + BOOST_CHECK( pubkey2.Verify(hashMsg, sign2C)); - BOOST_CHECK( key1C.Verify(hashMsg, sign1)); - BOOST_CHECK(!key1C.Verify(hashMsg, sign2)); - BOOST_CHECK( key1C.Verify(hashMsg, sign1C)); - BOOST_CHECK(!key1C.Verify(hashMsg, sign2C)); + BOOST_CHECK( pubkey1C.Verify(hashMsg, sign1)); + BOOST_CHECK(!pubkey1C.Verify(hashMsg, sign2)); + BOOST_CHECK( pubkey1C.Verify(hashMsg, sign1C)); + BOOST_CHECK(!pubkey1C.Verify(hashMsg, sign2C)); - BOOST_CHECK(!key2C.Verify(hashMsg, sign1)); - BOOST_CHECK( key2C.Verify(hashMsg, sign2)); - BOOST_CHECK(!key2C.Verify(hashMsg, sign1C)); - BOOST_CHECK( key2C.Verify(hashMsg, sign2C)); + BOOST_CHECK(!pubkey2C.Verify(hashMsg, sign1)); + BOOST_CHECK( pubkey2C.Verify(hashMsg, sign2)); + BOOST_CHECK(!pubkey2C.Verify(hashMsg, sign1C)); + BOOST_CHECK( pubkey2C.Verify(hashMsg, sign2C)); // compact signatures (with key recovery) @@ -129,18 +124,17 @@ BOOST_AUTO_TEST_CASE(key_test1) BOOST_CHECK(key1C.SignCompact(hashMsg, csign1C)); BOOST_CHECK(key2C.SignCompact(hashMsg, csign2C)); - CKey rkey1, rkey2, rkey1C, rkey2C; + CPubKey rkey1, rkey2, rkey1C, rkey2C; - BOOST_CHECK(rkey1.SetCompactSignature (hashMsg, csign1)); - BOOST_CHECK(rkey2.SetCompactSignature (hashMsg, csign2)); - BOOST_CHECK(rkey1C.SetCompactSignature(hashMsg, csign1C)); - BOOST_CHECK(rkey2C.SetCompactSignature(hashMsg, csign2C)); + BOOST_CHECK(rkey1.RecoverCompact (hashMsg, csign1)); + BOOST_CHECK(rkey2.RecoverCompact (hashMsg, csign2)); + BOOST_CHECK(rkey1C.RecoverCompact(hashMsg, csign1C)); + BOOST_CHECK(rkey2C.RecoverCompact(hashMsg, csign2C)); - - BOOST_CHECK(rkey1.GetPubKey() == key1.GetPubKey()); - BOOST_CHECK(rkey2.GetPubKey() == key2.GetPubKey()); - BOOST_CHECK(rkey1C.GetPubKey() == key1C.GetPubKey()); - BOOST_CHECK(rkey2C.GetPubKey() == key2C.GetPubKey()); + BOOST_CHECK(rkey1 == pubkey1); + BOOST_CHECK(rkey2 == pubkey2); + BOOST_CHECK(rkey1C == pubkey1C); + BOOST_CHECK(rkey2C == pubkey2C); } } diff --git a/src/test/multisig_tests.cpp b/src/test/multisig_tests.cpp index d6f836d367..9ef932b5b4 100644 --- a/src/test/multisig_tests.cpp +++ b/src/test/multisig_tests.cpp @@ -30,7 +30,7 @@ sign_multisig(CScript scriptPubKey, vector keys, CTransaction transaction, CScript result; result << OP_0; // CHECKMULTISIG bug workaround - BOOST_FOREACH(CKey key, keys) + BOOST_FOREACH(const CKey &key, keys) { vector vchSig; BOOST_CHECK(key.Sign(hash, vchSig)); diff --git a/src/test/rpc_tests.cpp b/src/test/rpc_tests.cpp index f8fe443b87..35eabed0e2 100644 --- a/src/test/rpc_tests.cpp +++ b/src/test/rpc_tests.cpp @@ -79,6 +79,35 @@ static Value CallRPC(string args) } } +BOOST_AUTO_TEST_CASE(rpc_wallet) +{ + // Test RPC calls for various wallet statistics + Value r; + + BOOST_CHECK_NO_THROW(CallRPC("listunspent")); + BOOST_CHECK_THROW(CallRPC("listunspent string"), runtime_error); + BOOST_CHECK_THROW(CallRPC("listunspent 0 string"), runtime_error); + BOOST_CHECK_THROW(CallRPC("listunspent 0 1 not_array"), runtime_error); + BOOST_CHECK_THROW(CallRPC("listunspent 0 1 [] extra"), runtime_error); + BOOST_CHECK_NO_THROW(r=CallRPC("listunspent 0 1 []")); + BOOST_CHECK(r.get_array().empty()); + + BOOST_CHECK_NO_THROW(CallRPC("listreceivedbyaddress")); + BOOST_CHECK_NO_THROW(CallRPC("listreceivedbyaddress 0")); + BOOST_CHECK_THROW(CallRPC("listreceivedbyaddress not_int"), runtime_error); + BOOST_CHECK_THROW(CallRPC("listreceivedbyaddress 0 not_bool"), runtime_error); + BOOST_CHECK_NO_THROW(CallRPC("listreceivedbyaddress 0 true")); + BOOST_CHECK_THROW(CallRPC("listreceivedbyaddress 0 true extra"), runtime_error); + + BOOST_CHECK_NO_THROW(CallRPC("listreceivedbyaccount")); + BOOST_CHECK_NO_THROW(CallRPC("listreceivedbyaccount 0")); + BOOST_CHECK_THROW(CallRPC("listreceivedbyaccount not_int"), runtime_error); + BOOST_CHECK_THROW(CallRPC("listreceivedbyaccount 0 not_bool"), runtime_error); + BOOST_CHECK_NO_THROW(CallRPC("listreceivedbyaccount 0 true")); + BOOST_CHECK_THROW(CallRPC("listreceivedbyaccount 0 true extra"), runtime_error); +} + + BOOST_AUTO_TEST_CASE(rpc_rawparams) { // Test raw transaction API argument handling @@ -88,14 +117,6 @@ BOOST_AUTO_TEST_CASE(rpc_rawparams) BOOST_CHECK_THROW(CallRPC("getrawtransaction not_hex"), runtime_error); BOOST_CHECK_THROW(CallRPC("getrawtransaction a3b807410df0b60fcb9736768df5823938b2f838694939ba45f3c0a1bff150ed not_int"), runtime_error); - BOOST_CHECK_NO_THROW(CallRPC("listunspent")); - BOOST_CHECK_THROW(CallRPC("listunspent string"), runtime_error); - BOOST_CHECK_THROW(CallRPC("listunspent 0 string"), runtime_error); - BOOST_CHECK_THROW(CallRPC("listunspent 0 1 not_array"), runtime_error); - BOOST_CHECK_NO_THROW(r=CallRPC("listunspent 0 1 []")); - BOOST_CHECK_THROW(r=CallRPC("listunspent 0 1 [] extra"), runtime_error); - BOOST_CHECK(r.get_array().empty()); - BOOST_CHECK_THROW(CallRPC("createrawtransaction"), runtime_error); BOOST_CHECK_THROW(CallRPC("createrawtransaction null null"), runtime_error); BOOST_CHECK_THROW(CallRPC("createrawtransaction not_array"), runtime_error); diff --git a/src/test/script_P2SH_tests.cpp b/src/test/script_P2SH_tests.cpp index 3444726ca0..65f0ad0cdc 100644 --- a/src/test/script_P2SH_tests.cpp +++ b/src/test/script_P2SH_tests.cpp @@ -78,7 +78,9 @@ BOOST_AUTO_TEST_CASE(sign) for (int i = 0; i < 4; i++) { txFrom.vout[i].scriptPubKey = evalScripts[i]; + txFrom.vout[i].nValue = COIN; txFrom.vout[i+4].scriptPubKey = standardScripts[i]; + txFrom.vout[i+4].nValue = COIN; } BOOST_CHECK(txFrom.IsStandard()); @@ -143,19 +145,19 @@ BOOST_AUTO_TEST_CASE(set) // Test the CScript::Set* methods CBasicKeyStore keystore; CKey key[4]; - std::vector keys; + std::vector keys; for (int i = 0; i < 4; i++) { key[i].MakeNewKey(true); keystore.AddKey(key[i]); - keys.push_back(key[i]); + keys.push_back(key[i].GetPubKey()); } CScript inner[4]; inner[0].SetDestination(key[0].GetPubKey().GetID()); - inner[1].SetMultisig(2, std::vector(keys.begin(), keys.begin()+2)); - inner[2].SetMultisig(1, std::vector(keys.begin(), keys.begin()+2)); - inner[3].SetMultisig(2, std::vector(keys.begin(), keys.begin()+3)); + inner[1].SetMultisig(2, std::vector(keys.begin(), keys.begin()+2)); + inner[2].SetMultisig(1, std::vector(keys.begin(), keys.begin()+2)); + inner[3].SetMultisig(2, std::vector(keys.begin(), keys.begin()+3)); CScript outer[4]; for (int i = 0; i < 4; i++) @@ -169,6 +171,7 @@ BOOST_AUTO_TEST_CASE(set) for (int i = 0; i < 4; i++) { txFrom.vout[i].scriptPubKey = outer[i]; + txFrom.vout[i].nValue = CENT; } BOOST_CHECK(txFrom.IsStandard()); @@ -179,7 +182,7 @@ BOOST_AUTO_TEST_CASE(set) txTo[i].vout.resize(1); txTo[i].vin[0].prevout.n = i; txTo[i].vin[0].prevout.hash = txFrom.GetHash(); - txTo[i].vout[0].nValue = 1; + txTo[i].vout[0].nValue = 1*CENT; txTo[i].vout[0].scriptPubKey = inner[i]; BOOST_CHECK_MESSAGE(IsMine(keystore, txFrom.vout[i].scriptPubKey), strprintf("IsMine %d", i)); } @@ -245,12 +248,12 @@ BOOST_AUTO_TEST_CASE(AreInputsStandard) CCoinsViewCache coins(coinsDummy); CBasicKeyStore keystore; CKey key[3]; - vector keys; + vector keys; for (int i = 0; i < 3; i++) { key[i].MakeNewKey(true); keystore.AddKey(key[i]); - keys.push_back(key[i]); + keys.push_back(key[i].GetPubKey()); } CTransaction txFrom; diff --git a/src/test/script_tests.cpp b/src/test/script_tests.cpp index 5d5a1525f7..e7ad52627c 100644 --- a/src/test/script_tests.cpp +++ b/src/test/script_tests.cpp @@ -211,7 +211,7 @@ sign_multisig(CScript scriptPubKey, std::vector keys, CTransaction transac // and vice-versa) // result << OP_0; - BOOST_FOREACH(CKey key, keys) + BOOST_FOREACH(const CKey &key, keys) { vector vchSig; BOOST_CHECK(key.Sign(hash, vchSig)); @@ -221,7 +221,7 @@ sign_multisig(CScript scriptPubKey, std::vector keys, CTransaction transac return result; } CScript -sign_multisig(CScript scriptPubKey, CKey key, CTransaction transaction) +sign_multisig(CScript scriptPubKey, const CKey &key, CTransaction transaction) { std::vector keys; keys.push_back(key); @@ -333,11 +333,13 @@ BOOST_AUTO_TEST_CASE(script_combineSigs) // Test the CombineSignatures function CBasicKeyStore keystore; vector keys; + vector pubkeys; for (int i = 0; i < 3; i++) { CKey key; key.MakeNewKey(i%2 == 1); keys.push_back(key); + pubkeys.push_back(key.GetPubKey()); keystore.AddKey(key); } @@ -390,7 +392,7 @@ BOOST_AUTO_TEST_CASE(script_combineSigs) BOOST_CHECK(combined == scriptSig); // Hardest case: Multisig 2-of-3 - scriptPubKey.SetMultisig(2, keys); + scriptPubKey.SetMultisig(2, pubkeys); keystore.AddCScript(scriptPubKey); SignSignature(keystore, txFrom, txTo, 0); combined = CombineSignatures(scriptPubKey, txTo, 0, scriptSig, empty); diff --git a/src/test/sigopcount_tests.cpp b/src/test/sigopcount_tests.cpp index 1762680adf..5a87f17600 100644 --- a/src/test/sigopcount_tests.cpp +++ b/src/test/sigopcount_tests.cpp @@ -37,12 +37,12 @@ BOOST_AUTO_TEST_CASE(GetSigOpCount) scriptSig << OP_0 << Serialize(s1); BOOST_CHECK_EQUAL(p2sh.GetSigOpCount(scriptSig), 3U); - std::vector keys; + std::vector keys; for (int i = 0; i < 3; i++) { CKey k; k.MakeNewKey(true); - keys.push_back(k); + keys.push_back(k.GetPubKey()); } CScript s2; s2.SetMultisig(1, keys); diff --git a/src/test/transaction_tests.cpp b/src/test/transaction_tests.cpp index f44d46fdb8..ddff2acd4e 100644 --- a/src/test/transaction_tests.cpp +++ b/src/test/transaction_tests.cpp @@ -242,24 +242,34 @@ BOOST_AUTO_TEST_CASE(test_Get) BOOST_CHECK(!t1.AreInputsStandard(coins)); } -BOOST_AUTO_TEST_CASE(test_GetThrow) +BOOST_AUTO_TEST_CASE(test_IsStandard) { CBasicKeyStore keystore; CCoinsView coinsDummy; CCoinsViewCache coins(coinsDummy); std::vector dummyTransactions = SetupDummyInputs(keystore, coins); - CTransaction t1; - t1.vin.resize(3); - t1.vin[0].prevout.hash = dummyTransactions[0].GetHash(); - t1.vin[0].prevout.n = 0; - t1.vin[1].prevout.hash = dummyTransactions[1].GetHash();; - t1.vin[1].prevout.n = 0; - t1.vin[2].prevout.hash = dummyTransactions[1].GetHash();; - t1.vin[2].prevout.n = 1; - t1.vout.resize(2); - t1.vout[0].nValue = 90*CENT; - t1.vout[0].scriptPubKey << OP_1; + CTransaction t; + t.vin.resize(1); + t.vin[0].prevout.hash = dummyTransactions[0].GetHash(); + t.vin[0].prevout.n = 1; + t.vin[0].scriptSig << std::vector(65, 0); + t.vout.resize(1); + t.vout[0].nValue = 90*CENT; + CKey key; + key.MakeNewKey(true); + t.vout[0].scriptPubKey.SetDestination(key.GetPubKey().GetID()); + + BOOST_CHECK(t.IsStandard()); + + t.vout[0].nValue = 5011; // dust + BOOST_CHECK(!t.IsStandard()); + + t.vout[0].nValue = 6011; // not dust + BOOST_CHECK(t.IsStandard()); + + t.vout[0].scriptPubKey = CScript() << OP_1; + BOOST_CHECK(!t.IsStandard()); } BOOST_AUTO_TEST_SUITE_END() diff --git a/src/test/util_tests.cpp b/src/test/util_tests.cpp index 2d05794cc7..64bd3a1b28 100644 --- a/src/test/util_tests.cpp +++ b/src/test/util_tests.cpp @@ -31,7 +31,7 @@ BOOST_AUTO_TEST_CASE(util_criticalsection) } BOOST_AUTO_TEST_CASE(util_MedianFilter) -{ +{ CMedianFilter filter(5, 15); BOOST_CHECK_EQUAL(filter.median(), 15); @@ -56,10 +56,10 @@ BOOST_AUTO_TEST_CASE(util_MedianFilter) } static const unsigned char ParseHex_expected[65] = { - 0x04, 0x67, 0x8a, 0xfd, 0xb0, 0xfe, 0x55, 0x48, 0x27, 0x19, 0x67, 0xf1, 0xa6, 0x71, 0x30, 0xb7, - 0x10, 0x5c, 0xd6, 0xa8, 0x28, 0xe0, 0x39, 0x09, 0xa6, 0x79, 0x62, 0xe0, 0xea, 0x1f, 0x61, 0xde, - 0xb6, 0x49, 0xf6, 0xbc, 0x3f, 0x4c, 0xef, 0x38, 0xc4, 0xf3, 0x55, 0x04, 0xe5, 0x1e, 0xc1, 0x12, - 0xde, 0x5c, 0x38, 0x4d, 0xf7, 0xba, 0x0b, 0x8d, 0x57, 0x8a, 0x4c, 0x70, 0x2b, 0x6b, 0xf1, 0x1d, + 0x04, 0x67, 0x8a, 0xfd, 0xb0, 0xfe, 0x55, 0x48, 0x27, 0x19, 0x67, 0xf1, 0xa6, 0x71, 0x30, 0xb7, + 0x10, 0x5c, 0xd6, 0xa8, 0x28, 0xe0, 0x39, 0x09, 0xa6, 0x79, 0x62, 0xe0, 0xea, 0x1f, 0x61, 0xde, + 0xb6, 0x49, 0xf6, 0xbc, 0x3f, 0x4c, 0xef, 0x38, 0xc4, 0xf3, 0x55, 0x04, 0xe5, 0x1e, 0xc1, 0x12, + 0xde, 0x5c, 0x38, 0x4d, 0xf7, 0xba, 0x0b, 0x8d, 0x57, 0x8a, 0x4c, 0x70, 0x2b, 0x6b, 0xf1, 0x1d, 0x5f }; BOOST_AUTO_TEST_CASE(util_ParseHex) @@ -123,13 +123,13 @@ BOOST_AUTO_TEST_CASE(util_ParseParameters) BOOST_CHECK(mapArgs.empty() && mapMultiArgs.empty()); ParseParameters(5, (char**)argv_test); - // expectation: -ignored is ignored (program name argument), + // expectation: -ignored is ignored (program name argument), // -a, -b and -ccc end up in map, -d ignored because it is after // a non-option argument (non-GNU option parsing) BOOST_CHECK(mapArgs.size() == 3 && mapMultiArgs.size() == 3); - BOOST_CHECK(mapArgs.count("-a") && mapArgs.count("-b") && mapArgs.count("-ccc") + BOOST_CHECK(mapArgs.count("-a") && mapArgs.count("-b") && mapArgs.count("-ccc") && !mapArgs.count("f") && !mapArgs.count("-d")); - BOOST_CHECK(mapMultiArgs.count("-a") && mapMultiArgs.count("-b") && mapMultiArgs.count("-ccc") + BOOST_CHECK(mapMultiArgs.count("-a") && mapMultiArgs.count("-b") && mapMultiArgs.count("-ccc") && !mapMultiArgs.count("f") && !mapMultiArgs.count("-d")); BOOST_CHECK(mapArgs["-a"] == "" && mapArgs["-ccc"] == "multiple"); @@ -154,10 +154,10 @@ BOOST_AUTO_TEST_CASE(util_GetArg) BOOST_CHECK_EQUAL(GetArg("inttest1", -1), 12345); BOOST_CHECK_EQUAL(GetArg("inttest2", -1), 81985529216486895LL); BOOST_CHECK_EQUAL(GetArg("inttest3", -1), -1); - BOOST_CHECK_EQUAL(GetBoolArg("booltest1"), true); - BOOST_CHECK_EQUAL(GetBoolArg("booltest2"), false); - BOOST_CHECK_EQUAL(GetBoolArg("booltest3"), false); - BOOST_CHECK_EQUAL(GetBoolArg("booltest4"), true); + BOOST_CHECK_EQUAL(GetBoolArg("booltest1", false), true); + BOOST_CHECK_EQUAL(GetBoolArg("booltest2", false), false); + BOOST_CHECK_EQUAL(GetBoolArg("booltest3", false), false); + BOOST_CHECK_EQUAL(GetBoolArg("booltest4", false), true); } BOOST_AUTO_TEST_CASE(util_WildcardMatch) @@ -323,62 +323,4 @@ BOOST_AUTO_TEST_CASE(util_seed_insecure_rand) } } -static int nCounter = 0; - -static void Count() -{ - ++nCounter; - MilliSleep(10); -} - -static void CountWithArg(int arg) -{ - nCounter += arg; - MilliSleep(10); -} - -BOOST_AUTO_TEST_CASE(util_loop_forever1) -{ - boost::thread_group threadGroup; - - threadGroup.create_thread(boost::bind(&LoopForever, "count", &Count, 1)); - MilliSleep(1); - threadGroup.interrupt_all(); - BOOST_CHECK_EQUAL(nCounter, 1); - nCounter = 0; -} - -BOOST_AUTO_TEST_CASE(util_loop_forever2) -{ - boost::thread_group threadGroup; - - boost::function f = boost::bind(&CountWithArg, 11); - threadGroup.create_thread(boost::bind(&LoopForever >, "count11", f, 11)); - MilliSleep(1); - threadGroup.interrupt_all(); - BOOST_CHECK_EQUAL(nCounter, 11); - nCounter = 0; -} - -BOOST_AUTO_TEST_CASE(util_threadtrace1) -{ - boost::thread_group threadGroup; - - threadGroup.create_thread(boost::bind(&TraceThread, "count11", &Count)); - threadGroup.join_all(); - BOOST_CHECK_EQUAL(nCounter, 1); - nCounter = 0; -} - -BOOST_AUTO_TEST_CASE(util_threadtrace2) -{ - boost::thread_group threadGroup; - - boost::function f = boost::bind(&CountWithArg, 11); - threadGroup.create_thread(boost::bind(&TraceThread >, "count11", f)); - threadGroup.join_all(); - BOOST_CHECK_EQUAL(nCounter, 11); - nCounter = 0; -} - BOOST_AUTO_TEST_SUITE_END() diff --git a/src/test/wallet_tests.cpp b/src/test/wallet_tests.cpp index a4cbfaee41..a14f6b2b70 100644 --- a/src/test/wallet_tests.cpp +++ b/src/test/wallet_tests.cpp @@ -21,13 +21,12 @@ static vector vCoins; static void add_coin(int64 nValue, int nAge = 6*24, bool fIsFromMe = false, int nInput=0) { - static int i; - CTransaction* tx = new CTransaction; - tx->nLockTime = i++; // so all transactions get different hashes - tx->vout.resize(nInput+1); - tx->vout[nInput].nValue = nValue; - CWalletTx* wtx = new CWalletTx(&wallet, *tx); - delete tx; + static int nextLockTime = 0; + CTransaction tx; + tx.nLockTime = nextLockTime++; // so all transactions get different hashes + tx.vout.resize(nInput+1); + tx.vout[nInput].nValue = nValue; + CWalletTx* wtx = new CWalletTx(&wallet, tx); if (fIsFromMe) { // IsFromMe() returns (GetDebit() > 0), and GetDebit() is 0 if vin.empty(), @@ -55,8 +54,8 @@ static bool equal_sets(CoinSet a, CoinSet b) BOOST_AUTO_TEST_CASE(coin_selection_tests) { - static CoinSet setCoinsRet, setCoinsRet2; - static int64 nValueRet; + CoinSet setCoinsRet, setCoinsRet2; + int64 nValueRet; // test multiple times to allow for differences in the shuffle order for (int i = 0; i < RUN_TESTS; i++) diff --git a/src/txdb.cpp b/src/txdb.cpp index 5b0527c76c..3d34710d22 100644 --- a/src/txdb.cpp +++ b/src/txdb.cpp @@ -5,6 +5,7 @@ #include "txdb.h" #include "main.h" +#include "hash.h" using namespace std; @@ -114,6 +115,10 @@ bool CCoinsViewDB::GetStats(CCoinsStats &stats) { leveldb::Iterator *pcursor = db.NewIterator(); pcursor->SeekToFirst(); + CHashWriter ss(SER_GETHASH, PROTOCOL_VERSION); + stats.hashBlock = GetBestBlock()->GetBlockHash(); + ss << stats.hashBlock; + int64 nTotalAmount = 0; while (pcursor->Valid()) { boost::this_thread::interruption_point(); try { @@ -128,13 +133,22 @@ bool CCoinsViewDB::GetStats(CCoinsStats &stats) { ssValue >> coins; uint256 txhash; ssKey >> txhash; - + ss << txhash; + ss << VARINT(coins.nVersion); + ss << (coins.fCoinBase ? 'c' : 'n'); + ss << VARINT(coins.nHeight); stats.nTransactions++; - BOOST_FOREACH(const CTxOut &out, coins.vout) { - if (!out.IsNull()) + for (unsigned int i=0; iNext(); } catch (std::exception &e) { @@ -143,6 +157,8 @@ bool CCoinsViewDB::GetStats(CCoinsStats &stats) { } delete pcursor; stats.nHeight = GetBestBlock()->nHeight; + stats.hashSerialized = ss.GetHash(); + stats.nTotalAmount = nTotalAmount; return true; } diff --git a/src/uint256.h b/src/uint256.h index 8a9af8ba04..2a252c94f3 100644 --- a/src/uint256.h +++ b/src/uint256.h @@ -8,6 +8,7 @@ #include #include #include +#include #include #include @@ -20,14 +21,14 @@ inline int Testuint256AdHoc(std::vector vArg); /** Base class without constructors for uint256 and uint160. - * This makes the compiler let u use it in a union. + * This makes the compiler let you use it in a union. */ template class base_uint { protected: enum { WIDTH=BITS/32 }; - unsigned int pn[WIDTH]; + uint32_t pn[WIDTH]; public: bool operator!() const diff --git a/src/util.cpp b/src/util.cpp index 8b6d8b32c8..0bd2960233 100644 --- a/src/util.cpp +++ b/src/util.cpp @@ -83,6 +83,7 @@ bool fNoListen = false; bool fLogTimestamps = false; CMedianFilter vTimeOffsets(200,0); volatile bool fReopenDebugLog = false; +bool fCachedPath[2] = {false, false}; // Init OpenSSL library multithreading support static CCriticalSection** ppmutexOpenSSL; @@ -517,7 +518,7 @@ static void InterpretNegativeSetting(string name, map& mapSettin positive.append(name.begin()+3, name.end()); if (mapSettingsRet.count(positive) == 0) { - bool value = !GetBoolArg(name); + bool value = !GetBoolArg(name, false); mapSettingsRet[positive] = (value ? "1" : "0"); } } @@ -1048,13 +1049,12 @@ const boost::filesystem::path &GetDataDir(bool fNetSpecific) static fs::path pathCached[2]; static CCriticalSection csPathCached; - static bool cachedPath[2] = {false, false}; fs::path &path = pathCached[fNetSpecific]; // This can be called during exceptions by printf, so we cache the // value so we don't have to do memory allocations after that. - if (cachedPath[fNetSpecific]) + if (fCachedPath[fNetSpecific]) return path; LOCK(csPathCached); @@ -1073,7 +1073,7 @@ const boost::filesystem::path &GetDataDir(bool fNetSpecific) fs::create_directory(path); - cachedPath[fNetSpecific] = true; + fCachedPath[fNetSpecific] = true; return path; } @@ -1091,6 +1091,9 @@ void ReadConfigFile(map& mapSettingsRet, if (!streamConfig.good()) return; // No bitcoin.conf file is OK + // clear path cache after loading config file + fCachedPath[0] = fCachedPath[1] = false; + set setOptions; setOptions.insert("*"); @@ -1168,7 +1171,6 @@ bool TruncateFile(FILE *file, unsigned int length) { #endif } - // this function tries to raise the file descriptor limit to the requested number. // It returns the actual file descriptor limit (which may be more or less than nMinFD) int RaiseFileDescriptorLimit(int nMinFD) { @@ -1254,8 +1256,8 @@ void ShrinkDebugFile() fclose(file); } } - else if(file != NULL) - fclose(file); + else if (file != NULL) + fclose(file); } diff --git a/src/util.h b/src/util.h index 3d25364505..941e0d99ac 100644 --- a/src/util.h +++ b/src/util.h @@ -7,12 +7,12 @@ #include "uint256.h" +#include + #ifndef WIN32 #include #include #include -#else -typedef int pid_t; /* define for Windows compatibility */ #endif #include #include @@ -298,7 +298,8 @@ std::string HexStr(const T itbegin, const T itend, bool fSpaces=false) return rv; } -inline std::string HexStr(const std::vector& vch, bool fSpaces=false) +template +inline std::string HexStr(const T& vch, bool fSpaces=false) { return HexStr(vch.begin(), vch.end(), fSpaces); } @@ -389,7 +390,7 @@ int64 GetArg(const std::string& strArg, int64 nDefault); * @param default (true or false) * @return command-line argument or default value */ -bool GetBoolArg(const std::string& strArg, bool fDefault=false); +bool GetBoolArg(const std::string& strArg, bool fDefault); /** * Set an argument if it doesn't already have a value diff --git a/src/wallet.cpp b/src/wallet.cpp index c7eb4f74e8..27aab08ecb 100644 --- a/src/wallet.cpp +++ b/src/wallet.cpp @@ -32,26 +32,28 @@ CPubKey CWallet::GenerateNewKey() bool fCompressed = CanSupportFeature(FEATURE_COMPRPUBKEY); // default to compressed public keys if we want 0.6.0 wallets RandAddSeedPerfmon(); - CKey key; - key.MakeNewKey(fCompressed); + CKey secret; + secret.MakeNewKey(fCompressed); // Compressed public keys were introduced in version 0.6.0 if (fCompressed) SetMinVersion(FEATURE_COMPRPUBKEY); - if (!AddKey(key)) + CPubKey pubkey = secret.GetPubKey(); + if (!AddKeyPubKey(secret, pubkey)) throw std::runtime_error("CWallet::GenerateNewKey() : AddKey failed"); - return key.GetPubKey(); + return pubkey; } -bool CWallet::AddKey(const CKey& key) +bool CWallet::AddKeyPubKey(const CKey& secret, const CPubKey &pubkey) { - if (!CCryptoKeyStore::AddKey(key)) + if (!CCryptoKeyStore::AddKeyPubKey(secret, pubkey)) return false; if (!fFileBacked) return true; - if (!IsCrypted()) - return CWalletDB(strWalletFile).WriteKey(key.GetPubKey(), key.GetPrivKey()); + if (!IsCrypted()) { + return CWalletDB(strWalletFile).WriteKey(pubkey, secret.GetPrivKey()); + } return true; } @@ -71,6 +73,11 @@ bool CWallet::AddCryptedKey(const CPubKey &vchPubKey, const vector &vchCryptedSecret) +{ + return CCryptoKeyStore::AddCryptedKey(vchPubKey, vchCryptedSecret); +} + bool CWallet::AddCScript(const CScript& redeemScript) { if (!CCryptoKeyStore::AddCScript(redeemScript)) @@ -82,9 +89,6 @@ bool CWallet::AddCScript(const CScript& redeemScript) bool CWallet::Unlock(const SecureString& strWalletPassphrase) { - if (!IsLocked()) - return false; - CCrypter crypter; CKeyingMaterial vMasterKey; @@ -95,7 +99,7 @@ bool CWallet::Unlock(const SecureString& strWalletPassphrase) if(!crypter.SetKeyFromPassphrase(strWalletPassphrase, pMasterKey.second.vchSalt, pMasterKey.second.nDeriveIterations, pMasterKey.second.nDerivationMethod)) return false; if (!crypter.Decrypt(pMasterKey.second.vchCryptedKey, vMasterKey)) - return false; + continue; // try another master key if (CCryptoKeyStore::Unlock(vMasterKey)) return true; } @@ -457,17 +461,19 @@ bool CWallet::AddToWallet(const CWalletTx& wtxIn) return false; #ifndef QT_GUI // If default receiving address gets used, replace it with a new one - CScript scriptDefaultKey; - scriptDefaultKey.SetDestination(vchDefaultKey.GetID()); - BOOST_FOREACH(const CTxOut& txout, wtx.vout) - { - if (txout.scriptPubKey == scriptDefaultKey) + if (vchDefaultKey.IsValid()) { + CScript scriptDefaultKey; + scriptDefaultKey.SetDestination(vchDefaultKey.GetID()); + BOOST_FOREACH(const CTxOut& txout, wtx.vout) { - CPubKey newDefaultKey; - if (GetKeyFromPool(newDefaultKey, false)) + if (txout.scriptPubKey == scriptDefaultKey) { - SetDefaultKey(newDefaultKey); - SetAddressBookName(vchDefaultKey.GetID(), ""); + CPubKey newDefaultKey; + if (GetKeyFromPool(newDefaultKey, false)) + { + SetDefaultKey(newDefaultKey); + SetAddressBookName(vchDefaultKey.GetID(), ""); + } } } } @@ -773,7 +779,7 @@ int CWallet::ScanForWalletTransactions(CBlockIndex* pindexStart, bool fUpdate) if (AddToWalletIfInvolvingMe(tx.GetHash(), tx, &block, fUpdate)) ret++; } - pindex = pindex->pnext; + pindex = pindex->GetNextInMainChain(); } } return ret; @@ -1134,17 +1140,24 @@ bool CWallet::SelectCoins(int64 nTargetValue, set >& vecSend, CWalletTx& wtxNew, CReserveKey& reservekey, int64& nFeeRet) +bool CWallet::CreateTransaction(const vector >& vecSend, + CWalletTx& wtxNew, CReserveKey& reservekey, int64& nFeeRet, std::string& strFailReason) { int64 nValue = 0; BOOST_FOREACH (const PAIRTYPE(CScript, int64)& s, vecSend) { if (nValue < 0) + { + strFailReason = _("Transaction amounts must be positive"); return false; + } nValue += s.second; } if (vecSend.empty() || nValue < 0) + { + strFailReason = _("Transaction amounts must be positive"); return false; + } wtxNew.BindWallet(this); @@ -1162,13 +1175,24 @@ bool CWallet::CreateTransaction(const vector >& vecSend, CW double dPriority = 0; // vouts to the payees BOOST_FOREACH (const PAIRTYPE(CScript, int64)& s, vecSend) - wtxNew.vout.push_back(CTxOut(s.second, s.first)); + { + CTxOut txout(s.second, s.first); + if (txout.IsDust()) + { + strFailReason = _("Transaction amount too small"); + return false; + } + wtxNew.vout.push_back(txout); + } // Choose coins to use set > setCoins; int64 nValueIn = 0; if (!SelectCoins(nTotalValue, setCoins, nValueIn)) + { + strFailReason = _("Insufficient funds"); return false; + } BOOST_FOREACH(PAIRTYPE(const CWalletTx*, unsigned int) pcoin, setCoins) { int64 nCredit = pcoin.first->vout[pcoin.second].nValue; @@ -1179,12 +1203,12 @@ bool CWallet::CreateTransaction(const vector >& vecSend, CW } int64 nChange = nValueIn - nValue - nFeeRet; - // if sub-cent change is required, the fee must be raised to at least MIN_TX_FEE + // if sub-cent change is required, the fee must be raised to at least nMinTxFee // or until nChange becomes zero // NOTE: this depends on the exact behaviour of GetMinFee - if (nFeeRet < MIN_TX_FEE && nChange > 0 && nChange < CENT) + if (nFeeRet < CTransaction::nMinTxFee && nChange > 0 && nChange < CENT) { - int64 nMoveToFee = min(nChange, MIN_TX_FEE - nFeeRet); + int64 nMoveToFee = min(nChange, CTransaction::nMinTxFee - nFeeRet); nChange -= nMoveToFee; nFeeRet += nMoveToFee; } @@ -1199,8 +1223,8 @@ bool CWallet::CreateTransaction(const vector >& vecSend, CW // post-backup change. // Reserve a new key pair from key pool - CPubKey vchPubKey = reservekey.GetReservedKey(); - // assert(mapKeys.count(vchPubKey)); + CPubKey vchPubKey; + assert(reservekey.GetReservedKey(vchPubKey)); // should never fail, as we just unlocked // Fill a vout to ourself // TODO: pass in scriptChange instead of reservekey so @@ -1208,9 +1232,21 @@ bool CWallet::CreateTransaction(const vector >& vecSend, CW CScript scriptChange; scriptChange.SetDestination(vchPubKey.GetID()); - // Insert change txn at random position: - vector::iterator position = wtxNew.vout.begin()+GetRandInt(wtxNew.vout.size()+1); - wtxNew.vout.insert(position, CTxOut(nChange, scriptChange)); + CTxOut newTxOut(nChange, scriptChange); + + // Never create dust outputs; if we would, just + // add the dust to the fee. + if (newTxOut.IsDust()) + { + nFeeRet += nChange; + reservekey.ReturnKey(); + } + else + { + // Insert change txn at random position: + vector::iterator position = wtxNew.vout.begin()+GetRandInt(wtxNew.vout.size()+1); + wtxNew.vout.insert(position, newTxOut); + } } else reservekey.ReturnKey(); @@ -1223,12 +1259,18 @@ bool CWallet::CreateTransaction(const vector >& vecSend, CW int nIn = 0; BOOST_FOREACH(const PAIRTYPE(const CWalletTx*,unsigned int)& coin, setCoins) if (!SignSignature(*this, *coin.first, wtxNew, nIn++)) + { + strFailReason = _("Signing transaction failed"); return false; + } // Limit size unsigned int nBytes = ::GetSerializeSize(*(CTransaction*)&wtxNew, SER_NETWORK, PROTOCOL_VERSION); if (nBytes >= MAX_STANDARD_TX_SIZE) + { + strFailReason = _("Transaction too large"); return false; + } dPriority /= nBytes; // Check that enough fee is included @@ -1252,11 +1294,12 @@ bool CWallet::CreateTransaction(const vector >& vecSend, CW return true; } -bool CWallet::CreateTransaction(CScript scriptPubKey, int64 nValue, CWalletTx& wtxNew, CReserveKey& reservekey, int64& nFeeRet) +bool CWallet::CreateTransaction(CScript scriptPubKey, int64 nValue, + CWalletTx& wtxNew, CReserveKey& reservekey, int64& nFeeRet, std::string& strFailReason) { vector< pair > vecSend; vecSend.push_back(make_pair(scriptPubKey, nValue)); - return CreateTransaction(vecSend, wtxNew, reservekey, nFeeRet); + return CreateTransaction(vecSend, wtxNew, reservekey, nFeeRet, strFailReason); } // Call after CreateTransaction unless you want to abort @@ -1322,14 +1365,12 @@ string CWallet::SendMoney(CScript scriptPubKey, int64 nValue, CWalletTx& wtxNew, printf("SendMoney() : %s", strError.c_str()); return strError; } - if (!CreateTransaction(scriptPubKey, nValue, wtxNew, reservekey, nFeeRequired)) + string strError; + if (!CreateTransaction(scriptPubKey, nValue, wtxNew, reservekey, nFeeRequired, strError)) { - string strError; if (nValue + nFeeRequired > GetBalance()) strError = strprintf(_("Error: This transaction requires a transaction fee of at least %s because of its amount, complexity, or use of recently received funds!"), FormatMoney(nFeeRequired).c_str()); - else - strError = _("Error: Transaction creation failed!"); - printf("SendMoney() : %s", strError.c_str()); + printf("SendMoney() : %s\n", strError.c_str()); return strError; } @@ -1737,7 +1778,7 @@ set< set > CWallet::GetAddressGroupings() return ret; } -CPubKey CReserveKey::GetReservedKey() +bool CReserveKey::GetReservedKey(CPubKey& pubkey) { if (nIndex == -1) { @@ -1745,14 +1786,17 @@ CPubKey CReserveKey::GetReservedKey() pwallet->ReserveKeyFromKeyPool(nIndex, keypool); if (nIndex != -1) vchPubKey = keypool.vchPubKey; - else - { - printf("CReserveKey::GetReservedKey(): Warning: Using default key instead of a new key, top up your keypool!"); - vchPubKey = pwallet->vchDefaultKey; + else { + if (pwallet->vchDefaultKey.IsValid()) { + printf("CReserveKey::GetReservedKey(): Warning: Using default key instead of a new key, top up your keypool!"); + vchPubKey = pwallet->vchDefaultKey; + } else + return false; } } assert(vchPubKey.IsValid()); - return vchPubKey; + pubkey = vchPubKey; + return true; } void CReserveKey::KeepKey() diff --git a/src/wallet.h b/src/wallet.h index 2e007557b0..7fcb8e13ce 100644 --- a/src/wallet.h +++ b/src/wallet.h @@ -136,16 +136,16 @@ public: // Generate a new key CPubKey GenerateNewKey(); // Adds a key to the store, and saves it to disk. - bool AddKey(const CKey& key); + bool AddKeyPubKey(const CKey& key, const CPubKey &pubkey); // Adds a key to the store, without saving it to disk (used by LoadWallet) - bool LoadKey(const CKey& key) { return CCryptoKeyStore::AddKey(key); } + bool LoadKey(const CKey& key, const CPubKey &pubkey) { return CCryptoKeyStore::AddKeyPubKey(key, pubkey); } bool LoadMinVersion(int nVersion) { nWalletVersion = nVersion; nWalletMaxVersion = std::max(nWalletMaxVersion, nVersion); return true; } // Adds an encrypted key to the store, and saves it to disk. bool AddCryptedKey(const CPubKey &vchPubKey, const std::vector &vchCryptedSecret); // Adds an encrypted key to the store, without saving it to disk (used by LoadWallet) - bool LoadCryptedKey(const CPubKey &vchPubKey, const std::vector &vchCryptedSecret) { SetMinVersion(FEATURE_WALLETCRYPT); return CCryptoKeyStore::AddCryptedKey(vchPubKey, vchCryptedSecret); } + bool LoadCryptedKey(const CPubKey &vchPubKey, const std::vector &vchCryptedSecret); bool AddCScript(const CScript& redeemScript); bool LoadCScript(const CScript& redeemScript) { return CCryptoKeyStore::AddCScript(redeemScript); } @@ -178,8 +178,10 @@ public: int64 GetBalance() const; int64 GetUnconfirmedBalance() const; int64 GetImmatureBalance() const; - bool CreateTransaction(const std::vector >& vecSend, CWalletTx& wtxNew, CReserveKey& reservekey, int64& nFeeRet); - bool CreateTransaction(CScript scriptPubKey, int64 nValue, CWalletTx& wtxNew, CReserveKey& reservekey, int64& nFeeRet); + bool CreateTransaction(const std::vector >& vecSend, + CWalletTx& wtxNew, CReserveKey& reservekey, int64& nFeeRet, std::string& strFailReason); + bool CreateTransaction(CScript scriptPubKey, int64 nValue, + CWalletTx& wtxNew, CReserveKey& reservekey, int64& nFeeRet, std::string& strFailReason); bool CommitTransaction(CWalletTx& wtxNew, CReserveKey& reservekey); std::string SendMoney(CScript scriptPubKey, int64 nValue, CWalletTx& wtxNew, bool fAskFee=false); std::string SendMoneyToDestination(const CTxDestination &address, int64 nValue, CWalletTx& wtxNew, bool fAskFee=false); @@ -331,7 +333,7 @@ public: } void ReturnKey(); - CPubKey GetReservedKey(); + bool GetReservedKey(CPubKey &pubkey); void KeepKey(); }; diff --git a/src/walletdb.cpp b/src/walletdb.cpp index 81a21443a1..4a73413d26 100644 --- a/src/walletdb.cpp +++ b/src/walletdb.cpp @@ -262,52 +262,33 @@ ReadKeyValue(CWallet* pwallet, CDataStream& ssKey, CDataStream& ssValue, } else if (strType == "key" || strType == "wkey") { - vector vchPubKey; + CPubKey vchPubKey; ssKey >> vchPubKey; - CKey key; - if (strType == "key") + if (!vchPubKey.IsValid()) { - CPrivKey pkey; - ssValue >> pkey; - key.SetPubKey(vchPubKey); - if (!key.SetPrivKey(pkey)) - { - strErr = "Error reading wallet database: CPrivKey corrupt"; - return false; - } - if (key.GetPubKey() != vchPubKey) - { - strErr = "Error reading wallet database: CPrivKey pubkey inconsistency"; - return false; - } - if (!key.IsValid()) - { - strErr = "Error reading wallet database: invalid CPrivKey"; - return false; - } + strErr = "Error reading wallet database: CPubKey corrupt"; + return false; } - else - { + CKey key; + CPrivKey pkey; + if (strType == "key") + ssValue >> pkey; + else { CWalletKey wkey; ssValue >> wkey; - key.SetPubKey(vchPubKey); - if (!key.SetPrivKey(wkey.vchPrivKey)) - { - strErr = "Error reading wallet database: CPrivKey corrupt"; - return false; - } - if (key.GetPubKey() != vchPubKey) - { - strErr = "Error reading wallet database: CWalletKey pubkey inconsistency"; - return false; - } - if (!key.IsValid()) - { - strErr = "Error reading wallet database: invalid CWalletKey"; - return false; - } + pkey = wkey.vchPrivKey; } - if (!pwallet->LoadKey(key)) + if (!key.SetPrivKey(pkey, vchPubKey.IsCompressed())) + { + strErr = "Error reading wallet database: CPrivKey corrupt"; + return false; + } + if (key.GetPubKey() != vchPubKey) + { + strErr = "Error reading wallet database: CPrivKey pubkey inconsistency"; + return false; + } + if (!pwallet->LoadKey(key, vchPubKey)) { strErr = "Error reading wallet database: LoadKey failed"; return false; diff --git a/src/walletdb.h b/src/walletdb.h index a3e779ab9d..8ae6c3ff49 100644 --- a/src/walletdb.h +++ b/src/walletdb.h @@ -53,18 +53,18 @@ public: bool WriteKey(const CPubKey& vchPubKey, const CPrivKey& vchPrivKey) { nWalletDBUpdated++; - return Write(std::make_pair(std::string("key"), vchPubKey.Raw()), vchPrivKey, false); + return Write(std::make_pair(std::string("key"), vchPubKey), vchPrivKey, false); } bool WriteCryptedKey(const CPubKey& vchPubKey, const std::vector& vchCryptedSecret, bool fEraseUnencryptedKey = true) { nWalletDBUpdated++; - if (!Write(std::make_pair(std::string("ckey"), vchPubKey.Raw()), vchCryptedSecret, false)) + if (!Write(std::make_pair(std::string("ckey"), vchPubKey), vchCryptedSecret, false)) return false; if (fEraseUnencryptedKey) { - Erase(std::make_pair(std::string("key"), vchPubKey.Raw())); - Erase(std::make_pair(std::string("wkey"), vchPubKey.Raw())); + Erase(std::make_pair(std::string("key"), vchPubKey)); + Erase(std::make_pair(std::string("wkey"), vchPubKey)); } return true; } @@ -101,7 +101,7 @@ public: bool WriteDefaultKey(const CPubKey& vchPubKey) { nWalletDBUpdated++; - return Write(std::string("defaultkey"), vchPubKey.Raw()); + return Write(std::string("defaultkey"), vchPubKey); } bool ReadPool(int64 nPool, CKeyPool& keypool)