diff options
| author | Jonas Schnelli <jonas.schnelli@include7.ch> | 2013-06-03 15:18:41 +0200 |
|---|---|---|
| committer | Jonas Schnelli <jonas.schnelli@include7.ch> | 2013-06-03 15:18:41 +0200 |
| commit | 39fe9de6b2b255969971beca8fa25a33ad2e5750 (patch) | |
| tree | 6686041f6b801d0ea5185b026a480a5be61510e6 | |
| parent | f679b2900a3a9f863f888cfb0b1a5e593628e37b (diff) | |
| parent | fa9e5adddda0bee5adc040b957cf3f1a6a470802 (diff) | |
Merge branch 'master' of git://github.com/bitcoin/bitcoin into prefsFix
Signed-off-by: Jonas Schnelli <jonas.schnelli@include7.ch>
Conflicts:
bitcoin-qt.pro
166 files changed, 14968 insertions, 9049 deletions
@@ -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 <jonas.schnelli@include7.ch> 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<uint256, CBlockIndex*> mapBlockIndex; + std::vector<CBlockIndex*> 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 <git@bluematt.me> -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 <git@bluematt.me> -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 <git@bluematt.me> -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<uint256> 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 <algorithm> -- --#include <boost/assign/list_of.hpp> // for 'map_list_of()' --#include <boost/date_time/posix_time/posix_time_types.hpp> --#include <boost/test/unit_test.hpp> --#include <boost/foreach.hpp> -- --#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 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 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 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 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 Binary files differindex 61926807cc..f5480f4161 100644 --- a/share/pixmaps/bitcoin.ico +++ b/share/pixmaps/bitcoin.ico diff --git a/share/pixmaps/bitcoin128.png b/share/pixmaps/bitcoin128.png Binary files differnew file mode 100644 index 0000000000..04b56cf2a0 --- /dev/null +++ b/share/pixmaps/bitcoin128.png 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", +"<X c #ECDBC2", +"1X c #E2D7CA", +"2X c #E3D8CC", +"3X c #E2DCD6", +"4X c #E9DED2", +"5X c #E1DEDA", +"6X c #EEE0CE", +"7X c #EEE3D4", +"8X c #E7E2DA", +"9X c #EEE4D8", +"0X c #F3E6D1", +"qX c #C5D7ED", +"wX c #CDDBEB", +"eX c #DBDEE2", +"rX c #CBDCF1", +"tX c #C4DFFF", +"yX c #DEE1E4", +"uX c #DDE4EC", +"iX c #D3E1F2", +"pX c #DDE6F1", +"aX c #DEE9F4", +"sX c #D8E5F8", +"dX c #D6EEFF", +"fX c #DEECFB", +"gX c #D5F4FF", +"hX c #DDF3FF", +"jX c #DCF9FF", +"kX c #E3E4E6", +"lX c #EFEBE4", +"zX c #E1E5EB", +"xX c #E2E8ED", +"cX c #F1F1ED", +"vX c #E0E7F0", +"bX c #E2E9F2", +"nX c #EAEFF6", +"mX c #E1EEFD", +"MX c #E4F1F6", +"NX c #E3F4FF", +"BX c #EAF6FF", +"VX c #E5F9FF", +"CX c #EBFAFF", +"ZX c #F5F5F5", +"AX c #F9F7F5", +"SX c #FAF8F6", +"DX c #F3F7FB", +"FX c #F4FAFE", +"GX c #FEFEFE", +"HX c None", +/* pixels */ +"HXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHX", +"HXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHX", +"HXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHX", +"HXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHX", +"HXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHX", +"HXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHX", +"HXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHX", +"HXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHX1 Z L >.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.`.5XVXFXSXGXGXGXGXGXGXGXGXGXGXGXGXGXGXGXGXGXGXGXGXGXGXFX<X_ d d =.:.=.=.` ` ` ` ~ ~ ~ ~ ~ E W W W W W W W W W W W W W W W W W W W W R $.HXHXHXHXHXHXHXHXHXHXHXHX", +"HXHXHXHXHXHXHXHXHXHXHX8 $.T W W W W W W W W W W W E E ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ` ` ` ` ` =.=.~ f a a W b.xXFXSXGXGXGXGXGXGXGXGXGXGXGXGXGXGXGXGXGXGXGXGXGXSXFXmX~.x.T a =.:.=.` ` ` ~ ~ ~ ~ ~ ~ W W W W W W W W W W W W W W W W W W W W T $.3 HXHXHXHXHXHXHXHXHXHXHX", +"HXHXHXHXHXHXHXHXHXHXHX-.W W W W W W W W W W W W ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ` ` ` ` ` ` =.=.=.=.=.:.:.:.` e y.MXFXGXGXGXGXGXGXGXGXGXGXGXGXGXGXGXGXGXGXGXGXGXGXSXFXCXhX*Xn.p a :.=.` ` ` ~ ~ ~ ~ ~ E W W W W W W W W W W W W W W W W W W W W ~ O.HXHXHXHXHXHXHXHXHXHXHX", +"HXHXHXHXHXHXHXHXHXHXHX1.R W W W W W W W W W ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ` ` ` ` ` =.` =.=.=.:.:.:.:.:.:.:.a .XFXGXGXGXGXGXGXGXGXGXFXFXSXSXGXGXGXGXGXGXGXGXGXGXGXSXAXCXhX%Xq.t ~ =.` ` ` ~ ~ ~ ~ ~ E W W W W W W W W W W W W W W W W W W W R %.HXHXHXHXHXHXHXHXHXHXHX", +"HXHXHXHXHXHXHXHXHXHXb @.T W W W W W W W W E ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ` ` ` ` ` ` =.=.=.=.=.:.:.:.:.:.:.:.e.d [.CXGXGXGXGXGXGXGXGXSXZXnXNXNXBXDXSXSXGXGXGXGXGXGXGXGXGXSXAXCXhXH.t W :.` ` ~ ~ ~ ~ ~ ~ W W W W W W W W W W W W W W W W W W W T @.x HXHXHXHXHXHXHXHXHXHX", +"HXHXHXHXHXHXHXHXHXHX<.R W W W W W E E E ~ ~ ~ ~ ~ ~ ~ ~ ~ ` ~ ` ` ` ` ` =.=.=.=.=.:.:.:.:.:.:.:.:.e.=.' >XFXGXGXGXGXGXGXGXSXCX{.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.=.|.CXGXGXGXGXGXGXGXGXFX<X~ u.k.N.N.N.k.k.k.k.k.k.k.=.;.uXFXGXGXGXGXGXGXGXGXSXBXoXR =.=.=.` ` ` ~ ~ ~ ~ ~ ~ E W W W W W W W W W W W W W W W T $.O HXHXHXHXHXHXHX", +"HXHXHXHXHXHXHXl @.T W W W W W W W W W W ~ ~ ~ ~ ~ ~ ` ` ` =.=.=.:.:.:.:.e.e.e.r.r.u.u.u.u.f.f.u.t.>XFXGXGXGXGXGXGXGXGXFX9XA.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.,XkXmXNXDXSXSXGXGXGXGXGXGXGXGXGXGXGX<X_ y r.u.r.r.e.e.e.:.:.:.:.=.=.` ` ` ~ ~ ~ ~ ~ ~ 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 W E ~ ~ ~ ~ ~ ` ` ` ` =.=.=.:.:.:.e.e.e.r.r.e.;.>XFXGXGXGXGXGXGXGXSXVX{.,.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 ! <XFXGXGXGXGXGXFXSXSXGXGXGXGXGXGXGXGXGXGXGXGXGXGXGXGXGXGXGXGXGXGXGXGXGXAXjX`.y ` ` ` ` ` ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ E E W W W W W W W W W W W W ..O.HXHXHXHXHXHXHXHXHXHXHX", +"HXHXHXHXHXHXHXHXHXHXHX; $.T W W W W W W W W W W W W W W W W W W W W W ~ ~ ~ ~ ~ ~ ` ` ` =.~ p 2XFXGXGXGXSXZXMXNXVXFXSXGXGXGXGXGXGXGXGXGXGXGXGXGXGXGXGXGXGXGXGXGXGXZXjX%Xa W =.` ` ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ W W W W W W W W W W W W W W T %.= HXHXHXHXHXHXHXHXHXHXHX", +"HXHXHXHXHXHXHXHXHXHXHXHX%.R W W W W W W W W W W W W W W W W W W W W W ~ ~ ~ ~ ~ ~ ~ ` ` =.d a.mXSXGXGXSXCXY.:.U..XkXDXSXGXGXGXGXGXGXGXGXGXGXGXGXGXGXGXGXGXGXSXAXBXjX Xa d =.` ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ E W W W W W W W W W W W W W W W W R $.HXHXHXHXHXHXHXHXHXHXHXHX", +"HXHXHXHXHXHXHXHXHXHXHXHXv $.T W W W W W W W W W W W W W W W W W W W W E ~ ~ ~ ~ ~ ~ ` ` ` a C.NXSXGXGXDXNXg.a ~ ~ ~ '.FXGXGXGXGXFXFXFXDXDXSXSXSXSXSXSXSXSXDXBXhXuXZ.y d ` ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ E W W W W W W W W W W W W W W W W T $.x HXHXHXHXHXHXHXHXHXHXHXHX", +"HXHXHXHXHXHXHXHXHXHXHXHXHX%.R W W W W W W W W W W W W W W W W W W W W W W ~ ~ ~ ~ ~ ` ` =.i ].CXGXGXGXCX5X:.:.r.r.d [.FXGXGXGXFXlXXX3XzXmXNXNXNXNXNXNXNXfXuX,XJ.~ t ~ ` ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ E W W W W W W W W W W W W W W W W W W R %.HXHXHXHXHXHXHXHXHXHXHXHXHX", +"HXHXHXHXHXHXHXHXHXHXHXHXHXP @.T W W W W W W W W W W W W W W W W W W W W W ~ ~ ~ ~ ~ ~ ` ~ E :XFXGXGXGXVX|.R e.r.:.w.yXFXGXGXSXCX'.e ` t.g.m.J.L.R.R.L.A.x.;.d t f ` ` ~ ~ ~ ~ ~ ~ ~ ~ ~ W W W W W W W W W W W W W W W W W W W W T @.m HXHXHXHXHXHXHXHXHXHXHXHXHX", +"HXHXHXHXHXHXHXHXHXHXHXHXHXHX%.R W W W W W W W W W W W W W W W W W W W W W E ~ ~ ~ ~ ~ ` a q.fXDXGXGXSXNXJ.f e.r.~ x.hXSXGXGXSXNXV.d ` W f d d a a a a a a d ~ ` ` ~ ~ ~ ~ ~ ~ ~ ~ E E W W W W W W W W W W W W W W W W W W W W W R %.HXHXHXHXHXHXHXHXHXHXHXHXHXHX", +"HXHXHXHXHXHXHXHXHXHXHXHXHXHXP $.T W W W W W W W W W W W W W W W W W W W W W E ~ ~ ~ ~ ` t C.VXSXGXGXDXfXg.W e.r.f K.VXSXGXGXDXbXt.W :.:.:.=.=.=.` ` ` ` ` ` ~ ~ ~ ~ ~ ~ ~ ~ ~ E E W W W W W W W W W W W W W W W W W W W W W W T $.v HXHXHXHXHXHXHXHXHXHXHXHXHXHX", +"HXHXHXHXHXHXHXHXHXHXHXHXHXHXHX%.W W W W W W W W W W W W W W W W W W W W W W E ~ ~ ~ ~ ~ t ].CXSXGXGXFX3X` =.e.e.R ).CXGXGXGXCX2XW ` =.=.=.` ` ` ` ` ` ~ ` ~ ~ ~ ~ ~ ~ ~ ~ ~ E E W W W W W W W W W W W W W W W W W W W W W W W W %.HXHXHXHXHXHXHXHXHXHXHXHXHXHXHX", +"HXHXHXHXHXHXHXHXHXHXHXHXHXHXHX* %.R W W W W W W W W W W W W W W W W W W W W W ~ ~ ~ ~ R Q wXNXAXSXSXVX[.d :.e.=.;.yXFXGXGXSXVX`.a =.=.=.` ` ` ` ` ` ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ E 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 %.* HXHXHXHXHXHXHXHXHXHXHXHXHXHXHX", +"HXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHX@.O.T W W W W W W W W W W W W W W W W W W W W E ~ ~ ~ d ' @XyXNXVXNXdXZ.d :.e.R s.NXSXGXGXSXNXV.a =.` ` ` ` ` ` ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ 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 O.@.HXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHX", +"HXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHX5.R W W W W W W W W W W W W W W W W W W W W W ~ ~ ~ ! ~ d ' b.W.%XrXd.R :.:.a K.NXSXGXGXFXbXw.f =.` ` ` ` ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ E E 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 R 5.HXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHX", +"HXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXg %.R W W W W W W W W W W W W W W W W W W W W E ~ ~ ~ ~ ~ d a y R w.:.=.:.=.R =XgXDXSXAXBX1XR ~ ` ` ` ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ E 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 %.w HXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHX", +"HXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHX+.@.T W W W W W W W W W W W W W W W W W W W W ~ ~ ~ ~ ~ ` ` ` ~ R ` :.:.=.` K.%XzXNXNXgXE.y ` ` ` ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ 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 @.o.HXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHX", +"HXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHX%.~ T W W W W W W W W W W W W W W W W W W W W ~ ~ ~ ~ ~ ` ` ` ` =.=.:.:.:.d d ;.b.R.&Xv.a ` ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ 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 ~ %.HXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHX", +"HXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHX4.R T W W W W W W W W W W W W W W W W W W W E ~ ~ ~ ~ ~ ` ` ` ` =.=.=.=.=.` R a y R ~ ` ~ ~ ~ ~ ~ ~ ~ ~ ~ E 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 5.HXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHX", +"HXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHX& %.R 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 W W W W W W W W W W W W W W W W W R 4.$ HXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHX", +"HXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXk %.R 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 W W W W W W W W W W W W W W W W W W W W R %.g HXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHX", +"HXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXM %.R 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 W W W W W W W W W W W W W W W W W R %.n HXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHX", +"HXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHX{ $.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 W W W W W W W W W W W W W W W W W R $.U HXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHX", +"HXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHX{ $.R 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 W W W W W W W W W W W W W W W W W W W W W W R %.M HXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHX", +"HXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXM %.R 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 W W W W W W W W W W W W W W W W W W W W W R %.n HXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHX", +"HXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXk %.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 W W W W W W W W W W W W W W W T W %.g HXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHX", +"HXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHX* 4.~ T 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 W W W W W W W W W W W W W W W W W W W W W W T ..4.# HXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHX", +"HXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHX%.@.T 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 W W W W W W W W W W W W W W W W W W W W W W T @.%.HXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHX", +"HXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHX .%.R T 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 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", +"HXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHX7 4.O.T 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 W W W W W W W W W W W W W W W W W W W W W W W T O.%.- HXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHX", +"HXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHX+.%.W T 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 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 W %. .HXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHX", +"HXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHX- %.@.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 W W W W W W W W W W W T R $.%.* HXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHX", +"HXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXk %.@.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 W W W W W W W W T R @.%.j HXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHX", +"HXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXn %.@.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 W W W W T W @.%.n HXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHX", +"HXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXk $.$.~ 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 ..$.$.j HXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHX", +"HXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHX- O.%.@.W 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 W @.%.O.* HXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHX", +"HXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXk @.%.$.O.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 O.$.%.@.h HXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHX", +"HXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHX; E $.%.$.O.~ W W T T T T T T T T T T T T T T W W W O.$.$.$.E ; HXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHX", +"HXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHX ; P ..$.$.$.$.$.@.@.@.@.@.@.@.@.$.$.$.$.$.O.P ; . HXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHX", +"HXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXO % ; g h h h h h h h ; % O HXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHX", +"HXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHX", +"HXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHX", +"HXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHX", +"HXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHX", +"HXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHX", +"HXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHX", +"HXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHX" +}; diff --git a/share/pixmaps/bitcoin16.png b/share/pixmaps/bitcoin16.png Binary files differnew file mode 100644 index 0000000000..16e240e79e --- /dev/null +++ b/share/pixmaps/bitcoin16.png diff --git a/share/pixmaps/bitcoin16.xpm b/share/pixmaps/bitcoin16.xpm new file mode 100644 index 0000000000..40a0624ac7 --- /dev/null +++ b/share/pixmaps/bitcoin16.xpm @@ -0,0 +1,181 @@ +/* XPM */ +static char *bitcoin__[] = { +/* columns rows colors chars-per-pixel */ +"16 16 159 2", +" c #CA7C1E", +". c #CB7D1E", +"X c #D1811E", +"o c #D0801F", +"O c #D1801F", +"+ c #D3821F", +"@ c #D7831F", +"# c #EE8D18", +"$ c #F4931F", +"% c #D78625", +"& c #D88520", +"* c #D98521", +"= c #D98620", +"- c #D78B2D", +"; c #DF8D2A", +": c #DF8F2F", +"> 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 Binary files differnew file mode 100644 index 0000000000..0ba94fb46d --- /dev/null +++ b/share/pixmaps/bitcoin256.png 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 c None", +/* pixels */ +"<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X", +"<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X", +"<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X", +"<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X", +"<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X", +"<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X", +"<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X", +"<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X", +"<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X", +"<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X", +"<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X", +"<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X", +"<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X", +"<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X", +"<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<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 C S H H J J J G J J J J J S S B M <X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X", +"<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<XV S J U T R Y I I L L n n n n n n n n n n n n n n n n L L I I U U J S M <X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X", +"<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<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 J T R Y L L n n v z z z z s s s s s s s s s s s s s s s s s s s z z z v v n n n L I U J B <X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X", +"<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<XV H T R I L n n v z z s s 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 u u s s s z z v n n L I U 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<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X", +"<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<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 R I L n v z s s 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 s s s z v n n L K 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<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X", +"<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<XV W R I L n v z s 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 i i i i i i i i i i i i i i i i i i u s s z v n n L 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<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X", +"<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<XV W R I n n z s 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 i i 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 s s z z n L 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<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X", +"<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<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 R I n n z 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 i i i i i i i i i 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 s s z z n L 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<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X", +"<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<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 T Y L n z 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 i i i i i i i i i i i i i i i 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 s s z v n K 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<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X", +"<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<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 R I n v 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 i i i i i i i i i i i i i i i i i i i i i 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 s s z n n 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<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X", +"<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<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 R L n z 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 i i i i i i i i i i i i i i i 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 i i i i i i i i i u s z z 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<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X", +"<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<XV T Y n v 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 i i i i i i i i i i i i i i i i i 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 i i i i i i i i i i i u s s z n b 5 <X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X", +"<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<XV ) I n v 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 i i i i i i i i i i i i i i i i i i 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 u i i i i i i i i i i i i i s s z v b 3 <X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X", +"<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<XV ) I n v 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 i i i i i i i i i i i i i i i i i i 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 u u u u i i i i i i i i i i i i i i u s z v b 3 <X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X", +"<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<XT I n v 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 i i i i i i i i i i i i i i i i i 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 u u u u u u u i i i i i i i i i i i i i i i i i u s z v x <X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X", +"<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<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 R L v 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 i i i i i i i i i i i i i i i i i i 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 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 u s z v 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<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X", +"<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<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 L n 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 i i i i i i i i i i i i i i i i i i i 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 u u 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 s s z n h <X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X", +"<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<XT I n z 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 i i i i i i i i i i i i i i i i i i i i u u u u u u u s u 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 u s s z c <X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X", +"<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<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 R n z s i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i 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 u u u 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 u s s z 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<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X", +"<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<XV T L n 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 i i i i i i i i i i i i i i i i i i 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 u u u 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 u s z c 3 <X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X", +"<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<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 n z s i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i 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 u u u u u 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 u s s z 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<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X", +"<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<XT L n 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 i i i i i i i i i i i i i i i i i 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 u u u 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 i i i i i i i i i i i i i i i i i i u s s c <X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X", +"<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<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 n z s i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i 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 u u u u 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 i i i i i i i i i i i i i i i i i i u s s z 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<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X", +"<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<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 I n 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 i i i i i i i i i i i i i i i i i 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 u u u s s s s s s s 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 u s s 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<X<X<X<X<X<X<X<X<X<X<X", +"<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<XT L v s i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i 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 u u u u 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 i i i i i i i i i i i i i i i i i i i i i u s s 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<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X", +"<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<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 Y n z 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 i i i i i i i i i i i i i i i i i u u u u u u u u s 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 i i i i 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 s s s 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<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X", +"<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<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 n 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 i i i i i i i i i i i i i i 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 u u u s s s s s 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 i i i i i 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 s s 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<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X", +"<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<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 n s i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i 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 u u u u s s s s s s s 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 i i i i i i 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 s s 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<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X", +"<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<XT L v s i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i 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 u u u s s s s s s s s s 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 i i i i i i 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 s s 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<X<X<X<X<X", +"<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<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 z s i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i 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 u u u u s s s s s s s s s s s s s s s s s s s s 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 s s 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<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X", +"<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<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 n z 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 i i i i i i i i i i i i i i i u u u u u u s s s s s s s s s s s s s s s s s s s s s s 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 s s s <X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X", +"<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<XY n 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 i i i i i i i i i i i i 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 u u u u s s s s s s s s s s s s s s s s s s s 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 u s s <X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X", +"<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<Xm I n 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 i i i i i i i i i i i 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 u u u s s s s s s s s s s s s s s s s s s s s s z 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 u s s <X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X", +"<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<XM I n 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 i i i i i i i i i 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 u u u u s s s s s s s s s s s s s s s s s s s s s 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 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 s s <X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X", +"<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<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 n 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 i i i i i i i i 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 u u u u s s s s s s s s s s s s s s s s s s s s s s 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 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 s s <X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X", +"<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<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 n 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 i i i i i i i i 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 u u u s s s s s s s s s s s s s s s s s s s s s s 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 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 u s s <X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X", +"<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<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 n 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 i i i i i i i 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 u u u u s s s s s s s s s s s s s s s s s s s s s z z z 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 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 s s <X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X", +"<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<XY n 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 i i i i i 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 u u u u u s s s s s s s s s s s s s s s s s s s s s z z z z z z z z z z z z z z 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 u s s <X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X", +"<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<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 n 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 i i i i i 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 u u u u s s s s s s s a t t a a s s s s s s s s z z z z z z z z z z z z z z z 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 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<X<X<X<X<X<X<X", +"<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<XY n z 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 i i i i i u u u u u u u u s s s s s s s s s a e f w 8 q t p a a a s s z z z z z z z z z z z z z 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 i 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 p <X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X", +"<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<XU L z 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 i i i i i u u u u u u u u s s s s s s s s s s p e M.B.9.o.Z e q q p p a l z z z z z z z z z z 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 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 u i e <X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X", +"<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<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 v 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 i i i i i u u u u u u u s s s s s s s s s s s s t Z `.`.[.[.[.C.p.o.Z e q q a z z z z z z v v v 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 i i i i i i i i i i i i i i i i i i i i i i i i i i s i 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<X<X<X<X<X<X<X<X<X", +"<X<X<X<X<X<X<X<X<X<X<X<X<X<X<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 v s i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i 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 u u u s s s s s s s s s s s s s a % ;.`.[.*X*X*X*X*X[.[.C.9.-.J z z z z z v v v v 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 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 u u 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<X<X<X<X<X<X<X<X", +"<X<X<X<X<X<X<X<X<X<X<X<X<X<X<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 n s i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i 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 u u u s u s s s s s s s s s s s s s s a % v.[.*X-X;X;X;X;X*X*X[.`.`.v.s z z v v v v v c c c c 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 u u 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<X<X<X<X<X<X<X<X", +"<X<X<X<X<X<X<X<X<X<X<X<X<X<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 n s i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i 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 u u u u u s s s s s s s s s s s s s s s s s p e (.*X;X;X>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<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X", +"<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<XU n z 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 i u u u u u u s s s s s s s s s s s s s s s s s s s t D [.*X;X>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<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X", +"<X<X<X<X<X<X<X<X<X<X<X<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 L z 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 u u u u u u u u s s s s s s s s s s s s s s s s s s s s a q ;.*X;X>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<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X", +"<X<X<X<X<X<X<X<X<X<X<X<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 n s i i i i i i i i i i i i i i i i i i i i i i i i i i i 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 u u u u s s s s s s s s s s s s s s s s s s s s z a q A.*X;X>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<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X", +"<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<XY n s i i i i i i i i i i i i i i i i i i i i i i i i i i 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 u u u u s s s s s s s s s s s s s s s s s s s s s z z a e (.*X;X>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<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X", +"<X<X<X<X<X<X<X<X<X<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 n z 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 u u u u u u u u u u s s s s s s s s s s s s s s s s s s s s s z z z p D [.-X;X>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<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X", +"<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<XM L v 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 u u u u u u u u u s s s s s s s s s s s s s s s s s s s s z z z z z z q ;.*X;X>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<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X", +"<X<X<X<X<X<X<X<X<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 n s i i i i i i i i i i i i i i i i i i i i i i 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 u u u u u s s s s s s s s s s s s s s s s s s s s s z z z z z z l q A.*X;X>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<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X", +"<X<X<X<X<X<X<X<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 n z 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 u u u u u u u u u s s s u u a s s s s s s s s s s s s s s s z z z z z z z z a e _.*X;X>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<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X", +"<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<XL v 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 u u u u u u u u s s s s s a q q q & t p a a s s s s s s s s z z z z z z z z z z p D [.-X;X>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<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X", +"<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<XP n s i i i i i i i i i i i i i i i i i i 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 u u u u s s s s s s s t j i.7.! d q q q p a a a s s z z z z z z z z z z z z q ,.*X;X>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<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X", +"<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<XZ n z 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 u u u u u u u u u s s s s s s s a % } `.`.`._.N.r.! d e q q p a a z z z z z z z z z z l e G.*X;X>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<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X", +"<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<XL v s i i i i i i i i i i i i i i i i i 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 u u u s s s s s s s s s a % 0.`.[.*X*X*X*X*X'.m.w.! d e q q p l l z z z z z v l f X*X;X>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<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X", +"<X<X<X<X<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 n s i i i i i i i i i i i i i i i i 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 u u u s s s s s s s s s s s p e C.[.*X*X;X;X;X;X*X*X*X*X'.N.r...j e e p a l l z z p H *X;X>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<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X", +"<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<XL v 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 u u u u u u u u s s s s s s s s s s s s t A [.*X;X;X>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<X<X<X<X<X<X<X<X<X<X<X<X", +"<X<X<X<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 n s i i i i i i i i i i i i 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 u u u u s s s s s s s s s s s s s s a q -.[.*X;X>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<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X3 n z 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 u u u u u u u u s s s s s s s s s s s s s s s s a q 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,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<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<XL n s i i i i i i i i i 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 u u u u s s s s s s s s s s s s s s s s s s p e (.*X;X>X,X,X,X,X,X,X,X,X,X,X,X>X>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<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X3 n z 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 u u u u u u s s s s s s s s s s s s s s s s s s s a p 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,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<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<XL n s i i i i i i i 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 u u u u s s s s s s s s s s s s s s s s s s s s z 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: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<X<X<X<X<X<X<X<X<X<X<X5 n z 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 u u u u u u s s s s s s s s s s s s s s s s s s s s s z a q 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+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<X<X<X<X<X<X<X<XL n s i i i i 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 u u u u s u s s s s s s s s s s s s s s s s s s s z z z a e V.[.*X-X;X>X>X>X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,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<Xn z 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 u u u u u u u s s s s s s s s s s s s s s s s s s s s s s z z z z u 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,X,X,X,X,X,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<XK n s i 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 u u u u s s s s s s s s s s s s s s s s s s s s s s z z z z z z s ( v.^.`.[.*X*X-X;X;X>X>X>X>X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,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<Xn z 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 u u u u u u u s s s s s s s s s s s s s s s s s s s s s z z z z z z z z z v c L _ %.t.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,X,X,X,X,X,X,X,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<XG n s 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 u u u s s s s s s s s s s s s s s s s s s s s s s z z z z z z z z z z z v n n L L R _ %.a.U.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|.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<XL v u 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 u u u s s s s s s s s s s s s s s s s s s s s s z z z z z z z z z z z z z v v v v n L L L L R ' 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,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<X6 n s 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 u u u s s s s s s s s s s s s s s s s s s s s s z z z z z z z z z z z z z v v v v v v v v n n n L L L L 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,X,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<XK v s i i i i i i i i i i i i i i i i i i i i u u u u u u s s s s s s s s s s s s s s s s s s s s z s z z z z z z z z z z z z v v v v v v v v v v n n n n n L n z 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,X,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<Xn z u i i i i i i i i i i i i i i i i i u u u u u u s s s s s s s s s s s s s s s s s s s s s s z z z z z z z z z z z z v v v v v v v v v v n n n n n n n n n L z 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,X,X,X,X,X,X,X,X,X,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<XA n s i i i i i i i i i i i i i i i u u u u u u u s s s s s s s s s s s s s s s s s s s s s s z z z z z z z z z z z z z z v v v v v v v v n n n n n n n n n n n n n l 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,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<XL z u i i i i i i i i i i i i i u u u u u u u s s s s s s s s s s s s s s s s s s s s s s z z z z z z z z z z z z z v v v v v v v v v n n n n n n n n n n n n n n n l h.*X;X>X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X>X>X>X>X>X>X>X>X,X,X,X,X,X,X,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<Xn s i i i i i i i i i i i i i u u u u u u u u s s s s s s s s s s s s s s s s s s s s z z z z z z z z z z z z z z v v v v v v v v v n n n n n n n n n n n n n n n b l e.*X;X>X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X>X>X>X>X;X;X;X;X>X>X>X>X>X>X,X,X,X,X,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<Xk v s i i i i i i i i i i i u u u u u u u u s s s s s s s s s s s s s s s s s s s s s z z z z z z z z z z z z z v v v v v v v v n n n n n n n n n n n n n n n n L L K g S.*X;X>X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X>X>X>X-X-X-X*X*X-X;X;X;X;X>X>X>X>X>X,X,X,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<X", +"<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<Xn z u i i i i i i i i i u u u u u u u u s s s s s s s s s s s s s s s s s s s s s s z z z z z z z z z z z z z v v v v v v v n n n n n n n n n n n n n n n n L L L L b k {.*X;X>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<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X< n s i i i i i i i u u i u u u u u u s s s s s s s s s s s s s s s s s s s s z z z z z z z z z z z z z z v v v v v v v v v n n n n n n n n n n n n n n L L L L L L L x H [.-X>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<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<Xk v s i i i i i i i u u u u u u u s s s s s s s s s s s s s s s s s s s s s z z z z z z z z z z z z z v v v v v v v v v n n n n n n n n n n n n n n n L L L L L L L L x ;.*X;X>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", +"<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<Xn z u i i i i u u u u u u u s s s s s s s s s s s s s s s s s s s s s s z z z z z z z z z z z z z z v v v v v v v v v n n n n n n n n n n n n n n L L L L L L L L L L k j.*X;X>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", +"<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<Xn s i i i i i u u u u u u s s s s s s s s s s s s s s s s s s s s z z z z z z z z z z z z z z v z v v v v v v v v n n n n n n n n n n n n n n L L L L L L L L L L L K k (.*X;X>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<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<Xh v s i i i i i i u u u u s s s s s s s s s s s s s s s s s s s s s z z z z z z z z z z z z z v v v v v v v v n n n n n n n n n n n n n n n L L L L L L L L L L L I I b W [.*X;X>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<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<Xx z s i i i i i i i u u u s s s s s s s s s s s s s s s s s s z z z z z z z z z z z z z v v v v v v v v v n n n n n n n n n n n n n n n L L L L L L L L L L L I I I I x ,.*X;X>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<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<Xn z u i i i i i i i u u u u s s s s s s s s s s s s s s s z z z z z z z z z z z z z v v v v v v v v v v n n n n n n n n n n n n n n n L L L L L L L L L L L I I I I P k A.*X;X>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<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X1 n s i i i i i i i i u u u u u s s s s s s s s s s s s s s z z z z z z z z z z v z z v v v v v v v v n n n n n n n n n n n n n n n L L L L L L L L L L L I I I I I I K A (.*X;X>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<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<Xh v s i i i i i i i i i i u u u s s s s s s s s s s s z z z z z z z z z z z z z z v v v v v v v v n n n n n n n n n n n n n n n L L L L L L L L L L L I I I I I I I Y K W [.*X;X>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<X<X<X<X<X<X<X<X<X<X<X<X<X<Xx z u 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 z z v v v z v v v v v v n n n n n n n n n n n n n n n n L L L L L L L L L L L I I I I I I I Y P x ,.*X;X>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<X<X<X<X<X<X<X<X<X<X<X<X<X<X<Xn z u 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 z v v v v v v v v v n n n n n n n n n n n n n n n L L L L L L L L L L L I I I I I I I Y I R R Y k j.*X;X>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<X<X<X<X<X<X<X<X<X<X<X<X<X<X<Xn s i i i i i i i i i i i u u u u u s s s s s s s s s s s z z z z z z v v v v v v v v v n n n n n n n n n n n n n n n L L L L L L L L L L I I I I I I I I I R R R R U G (.*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 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<X<X<X<X<X<X<X<X<X<X<X<X<X<X6 v s 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 v n n n n n n n n n n n n n n n L L L L L L L L L L I I I I I I I I I R Y R R R R K W [.*X;X>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<X<X<X<X<X<X<X<X<X<X<X<Xk z s 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 n n n n n L L L L L L L L L L L I I I I I I I I I R R R 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{.#.{ ] ] { { { { { { { { { { ] ] ] _ _ _ _ _ _ _ _ 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<X<X<X<X<X<X<X<X<X<X<X<X<Xx z u i i i i i i i i i i i i i i u u u s s s s s s s s s s s s z z z z z z v v v v v n n n n n n n n n n L L L L L L L L L L L I I I I I I I I I I R R R R R R R R T G j.*X;X>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<X<X<X<X<X<X<X<X<X<X<X<X<Xn s 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 z v v v v n n n n n n n n L L L L L L L L L L I I I I I I I I I I R R R R R R R R R R T G (.*X;X>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<X<X<X<X<X<X<X<X<X<X<X<X<Xv s 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 z v v v v n n n n n n n n n L L L L L L L L I I I I I I I I I R R R R R R R R R R R R K Q [.*X;X>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<X<X<X<X<X<X<X<X<X<X<X1 z s 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 I I I I I I R R R R R R R R R R R 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{.$.#.{ { { { { { { { { { { { { { { ] ] ] ] _ _ _ _ _ _ _ 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<X<X<X<X<X<X<X<X<X<X<Xd z s i i i i i i i i i i i i i i i i u u u u u s s s s s s s s s s s z z z z z z v v v v v n n n n n n n n n L L L L L I I I I I I I R R R R R R R R R R R R R R R T G A.*X;X>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<X<X<X<X<X<X<X<X<X<X<Xg z s 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 I I R R R R R R R R R R R R R R R _ _ T J (.*X;X>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<X<X<X<X<X<X<X<X<X<X<Xx z u i i i i i i i i i i i i i i i i i u 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 n n n n n n n n n L L L L L L I I I I R R R R R R R R R R R R _ _ _ _ U Q [.*X;X>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<X<X<X<X<X<X<X<X<X<Xx z u 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 I I I R R R R R R R R _ R R _ _ _ _ U ,.*X;X>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<X<X<X<X<X<X<X<X<X<X<Xv s i i i i i i i i i i i i i i i i i i i i u u u s s s s s s s s s s s s z z z z z z z v v v v n n n n n n n n n L L L L L I I I I I R R R R R R R R _ _ _ _ _ _ ) J j.*X;X>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<X<X<X<X<X<X<X<X<X<X<Xv s 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 I I I R R R R R R R R _ _ _ _ _ ) J Z.*X;X>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<X<X<X<X<X<X<X<X<X<Xz s i i i i i i i i i i i i i i i i i i i i u 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 n n n n n n n n n L L L L L L I I I I R R R R R R R R _ _ _ _ _ T / [.*X;X>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<X<X<X<Xz s 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 n L L L L L I I I I I R R R R R R R 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>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<X1 z s 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 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 I I R R R R R R R R _ _ _ ) J 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*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<X2 z s 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 s s s s s s s s s s s s z z z z z z z v v v v n n n n n n n n n L L L L L I I I I Y R R R R R R R R _ _ 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>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<X4 z s 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 I I R R R R R R R R _ _ 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_ 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<Xd z s 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 I I I R R R R R 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,X,X,X,X,X>X>X>X>X>X>X>X>X>X>X>X;X;X;X>X>X>X>X>X>X>X,X,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<Xf z 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 u u u u s s s s s s s s s s s z z z z z z z z v v v v n n n n n n n n L L L L L L I I I I R R R R R R R R 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,X,X,X,X,X,X,X,X,X,X,X,X>X>X>X>X>X>X>X>X>X>X>X>X>X,X,X,X,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<Xf 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 u u u s s s s s s s s s s s z z z z z z z z v v v v n n n n n n n n L L L L L L I I I I I R R R R R R R T 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,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,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<Xf 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 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 I I R Y R R R R R U 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,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,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<Xf 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 u u u u s s s s s s s s s s s s z z z z z z z v v v v n n n n n n n n n L L L L L I I I I I R R 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>X>X>X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,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<Xf 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 u u u s 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 I Y I R R R R T G 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>X>X>X>X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,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<Xf 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 u u u u s 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 I I I I I Y R R R U 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;X>X>X>X>X>X>X,X,X,X,X,X,X,X,X,X,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<X<X<X<X<X<X<X<X<Xf 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 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 I I R R R R K W [.*X;X>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<X<X<X<X<X<X<X<X<Xf 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 u u u u s s s s s s s s s s s z z z z z z z z v v v v n n n n n n n n L L L L L I I I I I Y R R K ,.*X;X>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<X<X<X<X<X<X<X<X<Xf 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 u u u u s s s s s s s s s s s z z z z z z z z v v v v n n n n n n n n L L L L L L I I I I I R Y k j.*X;X>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<X<X<X<X<X<X<X<X<Xw 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 u 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 I I I I I R P A Z.*X;X>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<X<X<X<X<X<X<X<X<Xw 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 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 I I Y K W [.*X;X>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<X<X<X<X<X<X<X<Xw 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 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 I P x ;.*X;X>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<X<X<X<X<X<X<X<X<X, 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 u u u u s s s s s s s s s s s s z z z z z z z v v v v n n n n n n n n L L L L L L I I I P k j.*X;X>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 * <X<X<X<X<X<X<X<X<X<X<X<X<X<X", +"<X<X<X<X<X<X<X<X<X<X<X<X<X<X> 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<X<X<X<X<X<X<X<X<X<Xs s i i i i i i i 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 z v v v v v n n n n n n n n L L L L L I I b J [.*X;X>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<X<X<X<X<X<X<X<X<X<Xs s i i i i i i i i 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 I L x ;.*X;X>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<X<X<X<X<X<X<X<X<X<X<Xs s i i i i i i i i 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 s 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 K k j.*X;X>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<X<X<X<X<X<X<X<X<X<X<Xs s i i i i i i i i i 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 z v v v v n n n n n n n n L L L L L K k Z.*X;X>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<X<X<X<X<X<X<X<X<X<X<Xa 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 u u u s s s s s s s s s s s s z z z z z z z v v v v n n n n n n n n n L L L L x J [.*X;X>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<X<X<X<X<X<X<X<X<X<Xp s i i i i i i i i i i 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 x ;.*X;X>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<X<X<X<X<X<X<X<X<X<X<Xe s i i i i i i i i i i 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 u s s s s s s s s s s s z z z z z z v v v v v n n n n n n n n n L L K g j.*X;X>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<X<X<X<X<X<X<X<X<X<X<X9 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 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 b k E.*X;X>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<X<X<X<X<X<X<X<X<X<X: 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 i i i i u u u s 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 L L x G +X-X>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<X<X<X<X<X<X<X<X<X<X<X<Xs 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 u u u s s s s s s s s s s s z z z z z z z l l l c c n n n n n n n n b g o.*X;X>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<X<X<X<X<X<X<X<X<X<X<X<X<Xs 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 u u u u s s s s s s s s s s s z z z z z l f j e r p l x n n n n n b b f H.-X;X>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<X<X<X<X<X<X<X<X<X<X<X<Xp 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 u u u u s s s s s s s s s s s z z z z l q 7.^.v. .E d f g l l x x k w ..*X;X>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<X<X<X<X<X<X<X<X<X<X<Xe 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 u u u s s s s s s s s s s s z z z p e /.`.[.[.[._.v.q.! j f w d ;.*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 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<X<X<X<X<X<X<X<X<X<X, 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 i i i i i u u u u s s s s s s s s s s s z z l q -.[.[.*X*X*X*X*X*X*XoXE.E..X-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 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<X<X<X<X<X<X<X<X<X<X<Xs 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 u u u u u s s s s s s s s s s s z p e (.[.*X;X;X;X;X;X;X;X;X;X;X;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.{ { _ _ _ ] ] ] ] ] ] ] ] ' _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ 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<Xu 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 u u u s s s s s s s s s s s a 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*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<Xp 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 u u u u s s s s s s s s s a a 8 m.*X;X>X>X>X,X,X>X>X>X>X>X>X>X,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<X0 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 u u u s s s s s s s s a q 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,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= 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 u u s s s s s s s s a % 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;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<Xu 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 u u u s s s s s s s 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,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<Xu i i i i i i i i i i i i i i i i 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 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,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<X7 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 u u u s s s s s s p 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(.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<Xu 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 u u u s s s s 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,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<Xu i i i i i i i i i i i i i i i i i 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 s s s s u q b.`.[.*X;X;X>X>X>X>X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,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<Xq i i i i i i i i i i i i i i i i i 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 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,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X>X>X>X>X>X>X;X;X;X;X-X*X*X*X*X*X*X*X+X+X+X+X*X*X*X*X*X;X;X;X>X>X>X,X,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= i i i i i i i i i i i i i i i i i 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 u s s u K ,.j.C.[.[.*X*X*X;X;X;X;X>X>X>X>X>X>X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X>X>X>X>X>X>X>X>X;X;X;X;X;X;X;X;X;X;X;X;X;X;X;X;X>X>X>X>X,X,X,X,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<Xi i i i i i i i i i i i i i i i i i 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 z z L I [ e.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,X,X,X,X,X,X,X,X,X,X,X,X,X,X>X>X>X>X>X>X>X>X>X>X>X>X>X>X>X>X>X>X>X>X>X>X,X,X,X,X,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<Xq i i i i i i i i i i i i i i i i i i 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 z c n n n Y @.a.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,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X>X>X>X>X>X>X>X>X>X>X>X>X,X,X,X,X,X,X,X,X,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@ i i i i i i i i i i i i i i i i i i 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 u s s s s s s z c c n n I R @.e.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,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,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<Xi i i i i i i i i i i i i i i i i i i 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 z z v n n L I R @.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,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,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<Xq i i i i i i i i i i i i i i i i i i i 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 s s s s s s s s s s s z z z v n n L L I _ %.a.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,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,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<Xi i i i i i i i i i i i i i i i i i i 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 v n n L L I R _ @.P.>X>X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,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<Xt i i i i i i i i i i i i i i i i i i 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 s z z z z z z z v v n L n u e.;X>X>X,X,X,X,X,X,X,X,X>X>X>X>X>X>X>X>X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,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- i i i i i i i i i i i i i i i i i i i 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 z v v v l 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,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,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<Xi i i i i i i i i i i i i i i i i i i 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 u s s s s s s s s s s s z z z z z z z v v c l 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,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,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<X<X<X<X<X<X<X<X<X<X<X<X", +"<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<Xq i i i i i i i i i i i i i i i i i i i 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 l p o.*X;X>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<X<X<X<X<X<X<X<X<X<X<X<X<X", +"<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<Xu i i i i i i i i i i i i i i i i i i 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 u s s s s s s s s s s s z z z z z z z v l e u.*X;X>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<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X", +"<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<Xq i i i i i i i i i i i i i i i i i i i 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 z l r C.*X;X>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<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X", +"<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<Xu i i i i i i i i i i i i i i i i i i i 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 a k [.*X;X>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<X<X<X<X<X<X<X<X<X<X<X<X<X<X", +"<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<Xt i i i i i i i i i i i i i i i i i i i 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 u s s s s s s s s s s z z z z z z z p ..*X;X>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<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X", +"<X<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 i i i i i i i i i i i i i i i i i i 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 u s s s s s s s s s s s z z z z z l q u.*X;X>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<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X", +"<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<Xt 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 u u u u s s s s s s s s s s s z z z z z l e C.*X;X>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<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X", +"<X<X<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 i i i i i i i i i i i i i i i i i i i 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 a k [.*X;X>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<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X", +"<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<Xt 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 u u u s s s s s s s s s s s s z z z q ..*X;X>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<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X", +"<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<Xt i i i i i i i i i i i i i i i i i i i 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 s s s s s s s s s s s s z z l q u.*X;X>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<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X", +"<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<Xq 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 u u u u s s s s s s s s s s s s z a e C.*X;X>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<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X", +"<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<Xt 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 u u u u s s s s s s s s s s s a p k ].*X;X>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<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X", +"<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<Xq t i i i i i i i i i i i i i i i i i i 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 u s s s s s s s s s s a q ..[.*X;X>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<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X", +"<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<Xt 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 u u u u s s s s s s s s s s a q 8.[.*X;X>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<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X", +"<X<X<X<X<X<X<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 i i i i i i i i i i i i i i i i i i 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 u s s s s s s s s s a q N.[.*X;X>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<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X", +"<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<Xt t i i i i i i i i i i i i i i i i i i 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 a t k ).[.*X-X;X>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<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X", +"<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<Xt 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 u u u u u s s s s s s s s t o.~.`.[.*X*X;X;X;X;X;X*X*X'.R L n n n n n n b g w.*X;X>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<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X", +"<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X7 t i i i i i i i i i i i i i i i i i i 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 U w.n._.[.[.*X*X*X*X*X*X[.Y.I L n n n n n n b g H.*X;X>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<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X", +"<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<Xt t i i i i i i i i i i i i i i i i i 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 u s s s s s s s z z v I R *.h.I..X[.[.[.`.`.u.L n n n n n n n x k _.*X;X>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 <X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X", +"<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<Xt 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 u u u u s s s s s s s s z v c n n L I _ 2.h.N./.~.>.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<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X", +"<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X7 t i i i i i i i i i i i i i i i i i i 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 z z v n n n L R ' 2._ L n n n n n n b r 7.`.*X*X;X>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<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X", +"<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<Xt t i i i i i i i i i i i i i i i i i 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 u s s s s s s s s s s s z z z v n n n n L n n n n n n n c l M.`.[.*X;X;X>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 <X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X", +"<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<Xt t i i i i i i i i i i i i i i i i 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 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 z b M.`.`.[.*X*X;X;X;X;X*X*X[.<.n c 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 i u q 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; t 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 u u u u s s s s s s s s s s s s z z z z z z z v v v v n n n n n n P %.a.H._.[.*X*X*X*X[.[.`._ n 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 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 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<X8 t i i i i i i i i i i i i i i i i i 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 z v v v n n v v n n n L I R _ 1.a.I._.[.`.`.^.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 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 i i i i i t 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<X<X<X<Xt t i i i i i i i i i i i i i i i i i 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 v v v v v n n n n n L I R 1.t.n.u.I v 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 i i i i i i i t 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<X<X<X<X<X<Xt t i i i i i i i i i i i i i i i i 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 v v v v v v z z z z n n n n L I I n 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 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<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X", +"<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<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 t i i i i i i i i i i i i i i i 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 s z z z z z z z v v v v v v v z z z z z z z z z z z v v 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 i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i 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 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; t 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 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 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 u 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 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<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X", +"<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X8 t 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 u u u s s s s s s s s s s s z z z z z z z 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 i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i 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<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<Xq t 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 u u s s s s s s s s s s s z z z z z 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 s s s 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 i i i i i i i 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<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X", +"<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<Xt t i i i i i i i i i i i i i i i 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 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 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<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X", +"<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<Xt t i i i i i i i i i i i i i i i 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 s s s s s s s s s s s s 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 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 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<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X", +"<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<Xt t i i i i i i i i i i i i i i 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 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 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<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X", +"<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<Xt t i i i i i i i i i i i i i 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 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 i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i 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<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X", +"<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<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 t t i i i i i i i i i i i i 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 s 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 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 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<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X", +"<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<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 t t i i i i i i i i i i i i i 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 s s s s s s s s s s s s 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 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<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X", +"<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<Xt t i i i i i i i i i i i i 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 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 i i i i i i i i i i i 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<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X", +"<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<Xq t 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 u u u u u s s s s s s s s s s s 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 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<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X", +"<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<Xq t 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 u u u u s s s s s s s s s 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 i i i i i i i i i i i i i i i i i i 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<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X", +"<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<Xq t 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 u u u u s s s s s s s 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 i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i 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 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<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X8 t t i i i i i i i i i 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 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 i i i i i i i i i i i i i i i i i i i i i u t 8 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<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X7 t t i i i i i i i i i 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 s 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 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 i i i i i i i i i i i i i i i i i i i t q 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<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X; q t i i i i i i i i 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 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 i i 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<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X", +"<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<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 t 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 s s s s s s s u s 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 i i i i i i i i i i i i i i i i i i 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<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X", +"<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<Xq t t i i i i i i 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 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 i i i i i 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 8 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<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X7 q t i i i i i i 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 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 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 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<X<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 t 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 u u u 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 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 q 7 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<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<Xq t t i i i 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 u 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 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 8 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<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<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 t 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 u u u u 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 i i i i i 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 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<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<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 q q t i i 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 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 i i i i i i 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 8 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<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<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 t t 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 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 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 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<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X8 q t u 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 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 i 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 8 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<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<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 q t u 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 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 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 8 7 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<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<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 t t 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 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 i 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 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", +"<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X7 q t t i i i i i i i i i i i i i i i i i i i 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 i 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 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<X<X", +"<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<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 7 q t t i i i i i i i i i i i i i i i i i 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 i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i 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 q 7 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<X<X<X", +"<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<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 7 q t t u i i i i i i i i i i i i i i 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 i i i i i i i i i i i i i i i i i i i i 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 q 7 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<X<X<X<X<X", +"<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<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 7 q q t 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 i i i i i i i i i i i 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 q 7 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<X<X<X<X<X<X<X", +"<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<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 q t t i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i i 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 q 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<X<X<X<X<X<X<X<X<X<X", +"<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X- 8 q t t 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 i 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 q 8 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<X<X<X<X<X<X<X<X<X<X<X<X", +"<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<Xo 7 q q t t 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 i i i i i i i i i i i i i i i i i i i t t q q 7 7 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<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X", +"<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X$ 8 q q t t 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 i i i i i i i i i i i i i t t q q 8 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<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X", +"<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X $ 8 q q t t 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 i i i i i i u t t q q 8 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<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X", +"<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X. $ 7 8 q t t t 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 u t t t q 8 7 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<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X", +"<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<XO ; 8 q q t t t t 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 u t t t q q 8 7 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<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X", +"<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X # ; 8 8 q q t t t t t 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 t t t t q q 8 7 7 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<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X", +"<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<Xo $ 7 7 8 q q q q t t t t t t t t u u u u u u u u u u u t t t t t t t t q q q q 8 7 7 7 $ 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<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X", +"<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X. O $ ; 7 7 8 8 8 q q q q q q q q q q q q q q q q q 8 8 8 7 7 7 ; $ 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<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X", +"<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<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 o o # $ $ $ $ $ - - $ $ # # # 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<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X", +"<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X", +"<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X", +"<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X", +"<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X", +"<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X", +"<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X", +"<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X", +"<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X", +"<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X", +"<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X", +"<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X", +"<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X", +"<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X", +"<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X" +}; diff --git a/share/pixmaps/bitcoin32.png b/share/pixmaps/bitcoin32.png Binary files differnew file mode 100644 index 0000000000..97a3f28029 --- /dev/null +++ b/share/pixmaps/bitcoin32.png diff --git a/share/pixmaps/bitcoin32.xpm b/share/pixmaps/bitcoin32.xpm index f538a44d2d..bffedd4c68 100644 --- a/share/pixmaps/bitcoin32.xpm +++ b/share/pixmaps/bitcoin32.xpm @@ -1,232 +1,140 @@ /* XPM */ -static const char * bitcoin32_xpm[] = { +static char *bitcoin__[] = { /* columns rows colors chars-per-pixel */ -"32 32 194 2", -" c #745305", -". c #785704", -"X c #7C5903", -"o c #75560B", -"O c #77590F", -"+ c #7C5C0B", -"@ c #795B12", -"# c #7F631D", -"$ c #825E07", -"% c #825F0B", -"& c #85610A", -"* c #8C660C", -"= c #8E680E", -"- c #916B0F", -"; c #856515", -": c #8B6714", -"> 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 Binary files differnew file mode 100644 index 0000000000..8aedee811f --- /dev/null +++ b/share/pixmaps/bitcoin64.png 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", -"<X c #FAE6A6", -"1X c #FAE7A8", -"2X c #FDEAAB", -"3X c None", -/* pixels */ -"3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X", -"3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X", -"3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X", -"3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X", -"3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X", -"3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3Xu u u u u u u y y u y 3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X", -"3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3Xu u u u u u u u u a u u u u u u a u u 2 3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X", -"3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3Xu u u u u u u u s m V D ' { ' D M d u u a u u u u 2 3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X", -"3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3Xu u u u u u M } m.~.oX=X=X=X=X=X-X-X=X&X/.m.=.V u u a u u w 3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X", -"3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3Xu u u u u M 4.~.=X=X=X=X=X=X=X=X=X=X=X=X=X=X=X=X=X=X/.5.Z u u u u u 3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X", -"3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3Xu u u u ] V.&X=X=X&X=X=X=X=X=X=X=X=X=X&X=X=X=X=X=X=X=X=X=X=XW.} a u u u 2 3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X", -"3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3Xu a u u ' 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~.} a u u u < 3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X", -"3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3Xu u u M N.=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=XL.M u u u < 3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X", -"3X3X3X3X3X3X3X3X3X3X3X3X3X3X3Xu u u u } XX=X=X=X&X=X=X=X=X=X=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<.a u u 2 3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X", -"3X3X3X3X3X3X3X3X3X3X3X3X3X3Xu u u s m.&X=X=X=X=X=X=X=X=X=X=X=X=X=X/.L.M.m.9.m.9.m.C.~.&X*X=X=X=X=X=X=X=X=X=X=X=X=XV.m u u 2 o 3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X", -"3X3X3X3X3X3X3X3X3X3X3X3X3Xu u u c R.=X=X=X=X=X=X=X=X=X=X=XoXC.1.| S S A S D D D D ] ] ..<.N./.=X-X=X-X=X=X=X=X=X=X=XXXZ u a 2 o 3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X", -"3X3X3X3X3X3X3X3X3X3X3X3Xu u u m XX=X=X=X=X=X=X=X=X=X=XW.3.| ^ A C M M M C S S A A A / ( { =.<.l.I.=X-X-X=X=X=X=X=X=X=X=XV a u 2 . 3X3X3X3X3X3X3X3X3X3X3X3X3X3X3X", -"3X3X3X3X3X3X3X3X3X3X3X3Xu u m /.=X=X=X-X=X=X=X=X=X~.1.D ] S Z v x p s u s d d v c c v V { =.7.8.7.l.T.=X-X=X-X-X-X-X-X=X=XV u a 1 3X3X3X3X3X3X3X3X3X3X3X3X3X3X", -"3X3X3X3X3X3X3X3X3X3X3Xu u d /.=X=X=X=X=X=X=X=X&X8.^ A ( S M v e $.r.e.r.u w i a.a.a.&.b ^ =.l.l.l.c.z.z.XX-X-X-X-X=X-X-X;X&XV u u : 3X3X3X3X3X3X3X3X3X3X3X3X3X", -"3X3X3X3X3X3X3X3X3X3Xu u s R.=X=X=X=X=X=X=X=XU.{ ^ Z C ( A M u w [.2X2X2X0 - 7 2X2X1X@Xi P *.l.x.B.U.C.z.z.W.-X-X-X-X-X-X=X-X*Xd a u # . 3X3X3X3X3X3X3X3X3X3X3X3X", -"3X3X3X3X3X3X3X3X3Xu u u l.=X=X=X=X-X=X=X=Xm.Z Z Z Z n Z Z v e , '.2X2X2X5 & ; 2X2X2X}.7 b { 3.x.^.^.^.Y.A.z.R.-X;X;X;X;X-X;X-XP.a u y . 3X3X3X3X3X3X3X3X3X3X3X3X", -"3X3X3X3X3X3X3X3X3Xu u } -X-X=X-X=X=X=X=Xl.M M Z C C C C C x e ; '.2X2X2X, $ = 2X2X2X}.6 h ) >.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<X<X1X2X<X<X2X2X2X2X1X1X<X2X2X2X<X$X[.b.~ J I ~ b.P.&X&X&X).!.F.m.).;X;X;X;X;X&X).u y y 3X3X3X3X3X3X3X3X3X", -"3X3X3X3X3X3Xu u U -X-X-X-X-X-X-Xc.=.=. ._ ^ x z 2X2X1X2X2X2X2X2X2X2X2X2X2X2X2X2X2X2X2X2X2X2X2X<Xn.l I ,.K./.).).).F.Z.Z.&X;X;X=X-X-X&X} u u O 3X3X3X3X3X3X3X3X", -"3X3X3X3X3X3Xu u V.-X;X-X-X-X-XOX>.>.>.=.=._ 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.'.<X2X2X2X2X2X2X2X2X'.0 ' m./.!.!.Q.S.9.F.=X;X-X=X-X&X4.u u @ 3X3X3X3X3X3X3X", -"3X3X3X3X3Xu u P.;X;X;X;X-X:XN.>.>.>.>.>.>.>.=._ 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<Xt t D 7.M.Z.z.z.9.9.9.6.M.-X=X=X=X;X=Xm u 1 3X3X3X3X3X", -"3X3X3Xy u a =X;X;X;X;X;XXXl.z.c.c.c.c.T.J.J.T.v.J.J.s.` z 2X2X2X2X2X2X#XW ~ ~ t.n.$X2X2X2X2X2X2X2X,Xt % t V X.8.9.8.9.9.9.6.6.M.-X=X=X=X=X&XM u 2 3X3X3X3X3X", -"3X3X3Xu u m -X-X-X;X;X;X~.z.z.c.c.c.c..XJ.J.J.J.J.J.x.O.b 2X2X2X2X2X2X2X2X2X2X2X2X2X2X2X2X2X2X2X2Xw.$ * y V X.7.8.8.9.7.8.7.6.8.=X=X-X-X=X-XV a y 3X3X3X3X3X", -"3X3X3Xu a m -X-X-X;X;X;X~.7.z.c.c.c.c.c.c.J.T.J.T.J.B.O.b 2X2X2X2X2X2X2X2X2X2X2X2X2X2X2X2X2X2X2X2X2X,X~ , c ' X.6.6.7.6.6.6.6.8.=X=X=X-X&X-XV u y 3X3X3X3X3X", -"3X3X3Xu u m -X-X-X-X-X-X/.8.l.z.c.T.c.J.c.J.T.v.J.J.x.O.G 2X2X2X2X2X2X2X2X2X2X2X2X2X2X2X2X2X2X2X2X2X2X2Xn.r v { 6.6.6.6.6.6.-.7.&X-X=X=X=X-XD u y 3X3X3X3X3X", -"3X3X3Xu u d =X-X-X-X-X-X~.7.z.z.c.c.c.c.c.J.c.T.T.^.T.y.R 2X2X2X2X2X2X@XK K W W W ~ h.#X1X2X2X2X2X2X2X2X2Xa.i Z ..X.6.6.-.-.6.7.-X-X-X-X-X-XD u 2 3X3X3X3X3X", -"3X3X3Xw u a =X-X-X-X-X-X~.7.7.8.c.c.c.c.T..X.X+X+X+XXXi.R 2X2X2X2X2X2Xn.. * 5 8 5 3 = * q `.2X2X2X2X2X2X2X<Xk c | X.6.-.-.-.-.z.&X;X=X;X-X;XV u w 3X3X3X3X3X", -"3X3X3Xu u u =X-X=X-X-X-X/.8.M.B.Y.T.^.^.^..X.XoXoX+XXXi.R 2X2X2X2X2X2X_.$ 0 b U U N l t 5 $ `.2X2X2X2X2X2X2X0.e Z .....-.-.6.c.;X=X;X=X;X-Xd u 1 3X3X3X3X3X", -"3X3X3X3Xu a E.-X-X-X-X-X=Xz.S.D.Y.^.Q.^.^.^..XoX+X+XXXi.R 2X2X2X2X2X2X_.= l +.u.i.,.O.E h 5 G 2X2X2X2X2X2X2X_.0 n | . .*. .*.T.-X;X;X;X-X=Xa u : 3X3X3X3X3X", -"3X3X3X3Xu u N.-X-X-X=X-X-XA.Z.S.Y.Q.Q.^.^..X.XoXoX&X.Xi.R 2X2X2X2X2X2X_.= N y.H.H.m.i.y.E f 8 2X2X2X2X2X2X2X'.6 n | . . . . ..X;X;X;X;X-X~.u u & 3X3X3X3X3X", -"3X3X3X3Xu u <.-X-X=X=X-X-XW.Z.S.Y.Y.Q.^.^.^.(..XoX=XXXi.R 2X2X2X2X2X2X_.= L 4.H.J.H.x.i.o.k j 2X2X2X2X2X2X2X_.6 B . . . .{ =.-X;X-X;X-X-Xb.a u @ 3X3X3X3X3X", -"3X3X3X3Xy a V =X=X-X-X=X-XXXZ.S.Y.Y.Y.Q.!.^..X.XoXoXE.y.I 2X2X2X2X2X2X_.= J y.b.H.N.p.&.P 0 g.2X2X2X2X2X2X2Xr.r B _ { .| ] l.-X;X;X-X-X;X..u u . . 3X3X3X3X3X", -"3X3X3X3Xy u a =X=X=X=X-X=X-XM.Z.S.Y.Y.Q.Q.^.^.^.U.J.u.E l 2X2X2X2X2X2X_.* k o.e.e.$.` P q W 1X2X2X2X2X2X2X2XG i B ] | ] ] ( ~.=X;X;X;X;X;XM u y 3X3X3X3X3X3X", -"3X3X3X3X3Xu u V.-X=X-X=X-X-XF.M.A.D.Y.Q.Y.Q.Y.B.2.[ N 0 j 2X2X2X2X2X2X_.O 5 l G z H H Q _.2X2X2X2X2X2X2X2X#X, g ^ ] ] | ] ..-X-X-X-X&X;X).u u : 3X3X3X3X3X3X", -"3X3X3X3X3Xu u } =X=X=X=X-X=X&XM.Z.S.D.W.Q.Y.B.*.a.#X@X|.,X2X2X2X2X2X2X,X[.[.}.}.%X<X2X2X2X2X2X2X2X2X2X2X<Xj 6 b / ] ] ] ] M.-X-X-X-X-X-X4.u u O 3X3X3X3X3X3X", -"3X3X3X3X3Xy u d =X=X=X=X=X=X-XS.M.A.S.S.U.A.u.) n.2X2X2X2X2X2X2X2X2X2X2X2X1X2X2X2X2X2X2X2X2X2X2X2X2X2X2XW ; i M ( S S S ] &X-X-X-X-X=X-Xm u y . X 3X3X3X3X3X3X", -"3X3X3X3X3X3Xu u p.=X=X=X=X=X-X&X9.Z.C.S.S.M.:.b [.2X2X2X2X2X2X2X2X2X2X2X2X2X2X2X2X2X2X2X2X2X2X2X2X2X%XG = r x v C D D D m.-X-X-X-X-X-XR.u u : 3X3X3X3X3X3X3X", -"3X3X3X3X3X3Xy u B =X=X=X=X=X=X=XF.9.M.A.C.M.=.h %X2X2X2X2X2X2X2X2X2X2X2X2X2X2X2X2X2X2X2X2X2X2X1X#X~ 4 ; r p v v M C A | &X-X-X-X-X-X-X] u u X 3X3X3X3X3X3X3X", -"3X3X3X3X3X3Xy u u N.=X=X-X=X-X=X=XM.z.M.M.M.1.V #X%X%X%X%X$X%X%X<X2X2X2X%X$X%X2X2X2X<X[.n.t.W q = , r i x v C C C M C W.-X-X-X-X-X-X/.u u 1 X 3X3X3X3X3X3X3X", -"3X3X3X3X3X3X3Xu u V *X=X=X*X=X=X=XoX8.M.M.M.5.{ m r , ; $ $ o o `.2X2X2X3 o $ 2X2X2X[.o $ 4 9 0 r g x v m C M C C C 8.&X-X-X-X-X-X-X[ u u @ 3X3X3X3X3X3X3X3X", -"3X3X3X3X3X3X3X2 u u 5.=X=X=X=X=X=X=XI.8.M.M.z.3.O.) P b r 0 4 % `.2X2X2X3 $ * 2X2X2X[.$ 4 r e ^ n n Z Z Z C C C M | =X=X-X-X-X-X-XR.u u < 3X3X3X3X3X3X3X3X", -"3X3X3X3X3X3X3X3Xy u d XX=X=X=X=X-X=X=XS.8.8.M.M.z.z.7.{ _ U g 5 `.2X2X2X8 = 3 2X2X2X}.3 0 x ^ _ ^ ^ ^ Z ^ B ^ C .&X-X-X-X-X-X-X=XB u u o 3X3X3X3X3X3X3X3X3X", -"3X3X3X3X3X3X3X3X1 u u ' =X=X*X=X=X*X=X=XW.8.M.M.A.S.l.u.>.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 Binary files differindex d249e41feb..754eebc488 100644 --- a/share/pixmaps/favicon.ico +++ b/share/pixmaps/favicon.ico 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 @@ <key>CFBundlePackageType</key> <string>APPL</string> <key>CFBundleGetInfoString</key> - <string>Bitcoin-Qt</string> + <string>$VERSION, Copyright © 2009-$YEAR The Bitcoin developers</string> + <key>CFBundleShortVersionString</key> + <string>$VERSION</string> + <key>CFBundleVersion</key> + <string>$VERSION</string> <key>CFBundleSignature</key> <string>????</string> <key>CFBundleExecutable</key> @@ -27,5 +31,7 @@ </array> </dict> </array> + <key>NSHighResolutionCapable</key> + <true/> </dict> </plist> 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 @@ -177,6 +177,19 @@ private: }; // +// Functions for directly locking/unlocking memory objects. +// Intended for non-dynamically allocated structures. +// +template<typename T> void LockObject(const T &t) { + LockedPageManager::instance.LockRange((void*)(&t), sizeof(T)); +} + +template<typename T> 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 <boost/algorithm/string.hpp> #include <boost/asio.hpp> #include <boost/asio/ip/v6_only.hpp> +#include <boost/asio/ssl.hpp> #include <boost/bind.hpp> #include <boost/filesystem.hpp> +#include <boost/filesystem/fstream.hpp> #include <boost/foreach.hpp> #include <boost/iostreams/concepts.hpp> #include <boost/iostreams/stream.hpp> -#include <boost/algorithm/string.hpp> #include <boost/lexical_cast.hpp> -#include <boost/asio/ssl.hpp> -#include <boost/filesystem/fstream.hpp> #include <boost/shared_ptr.hpp> #include <list> @@ -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<string, boost::shared_ptr<deadline_timer> > 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<void(void)> func) +{ + if (!err) + func(); +} + +void RPCRunLater(const std::string& name, boost::function<void(void)> func, int64 nSeconds) +{ + assert(rpc_io_service != NULL); + + if (deadlineTimers.count(name) == 0) + { + deadlineTimers.insert(make_pair(name, + boost::shared_ptr<deadline_timer>(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 <map> 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<std::string, json_spirit::Value_type>& typesExpected, bool fAllowNull=false); +/* + Run func nSeconds from now. Uses boost deadline timers. + Overrides previous timer <name> (if any). + */ +void RPCRunLater(const std::string& name, boost::function<void(void)> 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<uint256, CBlockIndex*>& 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<uint256, CBlockIndex*>& 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<unsigned char>& vchCiphertext, CKeyingM } -bool EncryptSecret(CKeyingMaterial& vMasterKey, const CSecret &vchPlaintext, const uint256& nIV, std::vector<unsigned char> &vchCiphertext) +bool EncryptSecret(const CKeyingMaterial& vMasterKey, const CKeyingMaterial &vchPlaintext, const uint256& nIV, std::vector<unsigned char> &vchCiphertext) { CCrypter cKeyCrypter; std::vector<unsigned char> 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<unsigned char>& vchCiphertext, const uint256& nIV, CSecret& vchPlaintext) +bool DecryptSecret(const CKeyingMaterial& vMasterKey, const std::vector<unsigned char>& vchCiphertext, const uint256& nIV, CKeyingMaterial& vchPlaintext) { CCrypter cKeyCrypter; std::vector<unsigned char> 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<unsigned char> &vchCiphertext); -bool DecryptSecret(const CKeyingMaterial& vMasterKey, const std::vector<unsigned char> &vchCiphertext, const uint256& nIV, CSecret &vchPlaintext); +bool EncryptSecret(const CKeyingMaterial& vMasterKey, const CKeyingMaterial &vchPlaintext, const uint256& nIV, std::vector<unsigned char> &vchCiphertext); +bool DecryptSecret(const CKeyingMaterial& vMasterKey, const std::vector<unsigned char>& 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<unsigned char> vchData; vchData.resize(dataSize); uint256 hashIn; @@ -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<unsigned char>& vch) +template<typename T1> +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<unsigned char>& vch) +{ + return Hash160(vch.begin(), vch.end()); +} + unsigned int MurmurHash3(unsigned int nHashSeed, const std::vector<unsigned char>& 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 <boost/filesystem.hpp> #include <boost/filesystem/fstream.hpp> @@ -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=<file> " + _("Specify configuration file (default: bitcoin.conf)") + "\n" + " -pid=<file> " + _("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=<dir> " + _("Specify data directory") + "\n" + " -dbcache=<n> " + _("Set database cache size in megabytes (default: 25)") + "\n" + " -timeout=<n> " + _("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=<file> " + _("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=<n> " + _("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=<n> " + _("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<unsigned char>(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=<amount>: '%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=<amount>: '%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 <map> - #include <openssl/ecdsa.h> +#include <openssl/rand.h> #include <openssl/obj_mac.h> #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 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; + } -bool CKey::IsNull() const -{ - return !fSet; -} + 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]); + } -bool CKey::IsCompressed() const -{ - return fCompressedPubKey; -} + bool SetPubKey(const CPubKey &pubkey) { + const unsigned char* pbegin = pubkey.begin(); + return o2i_ECPublicKey(&pkey, &pbegin, pubkey.size()); + } -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 Sign(const uint256 &hash, std::vector<unsigned char>& 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; + } -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 Verify(const uint256 &hash, const std::vector<unsigned char>& 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; } - // 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)) + // 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) { - BN_clear_free(bn); - throw key_error("CKey::SetSecret() : EC_KEY_regenerate_key failed"); + 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; } - 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; +void CKey::MakeNewKey(bool fCompressedIn) { + do { + RAND_bytes(vch, sizeof(vch)); + } while (!Check(vch)); + fValid = true; + fCompressed = fCompressedIn; } -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::SetPrivKey(const CPrivKey &privkey, bool fCompressedIn) { + CECKey key; + if (!key.SetPrivKey(privkey)) + return false; + key.GetSecretBytes(vch); + fCompressed = fCompressedIn; + fValid = true; + return true; } -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(); - return true; - } - pkey = NULL; - Reset(); - return false; +CPrivKey CKey::GetPrivKey() const { + assert(fValid); + CECKey key; + key.SetSecretBytes(vch); + CPrivKey privkey; + key.GetPrivKey(privkey); + return privkey; } -CPubKey CKey::GetPubKey() const -{ - int nSize = i2o_ECPublicKey(pkey, NULL); - if (!nSize) - throw key_error("CKey::GetPubKey() : i2o_ECPublicKey failed"); - std::vector<unsigned char> 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); +CPubKey CKey::GetPubKey() const { + assert(fValid); + CECKey key; + key.SetSecretBytes(vch); + CPubKey pubkey; + key.GetPubKey(pubkey, fCompressed); + return pubkey; } -bool CKey::Sign(uint256 hash, std::vector<unsigned char>& 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(); +bool CKey::Sign(const uint256 &hash, std::vector<unsigned char>& vchSig) const { + if (!fValid) return false; - } - vchSig.resize(nSize); // Shrink to fit actual size - return true; + CECKey key; + key.SetSecretBytes(vch); + return key.Sign(hash, vchSig); } -// 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<unsigned char>& vchSig) -{ - bool fOk = false; - ECDSA_SIG *sig = ECDSA_do_sign((unsigned char*)&hash, sizeof(hash), pkey); - if (sig==NULL) +bool CKey::SignCompact(const uint256 &hash, std::vector<unsigned char>& vchSig) const { + if (!fValid) 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"); + 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; +} - 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; +bool CPubKey::Verify(const uint256 &hash, const std::vector<unsigned char>& vchSig) const { + if (!IsValid()) + return false; + CECKey key; + if (!key.SetPubKey(*this)) + return false; + if (!key.Verify(hash, vchSig)) + return false; + return true; } -// 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<unsigned char>& vchSig) -{ +bool CPubKey::RecoverCompact(const uint256 &hash, const std::vector<unsigned char>& 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; + key.GetPubKey(*this, (vchSig[0] - 27) & 4); + return true; } -bool CKey::Verify(uint256 hash, const std::vector<unsigned char>& vchSig) -{ - // -1 = error, 0 = bad sig, 1 = good - if (ECDSA_verify(0, (unsigned char*)&hash, sizeof(hash), &vchSig[0], vchSig.size(), pkey) != 1) +bool CPubKey::VerifyCompact(const uint256 &hash, const std::vector<unsigned char>& vchSig) const { + if (!IsValid()) + return false; + 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::VerifyCompact(uint256 hash, const std::vector<unsigned char>& vchSig) -{ - CKey key; - if (!key.SetCompactSignature(hash, vchSig)) +bool CPubKey::IsFullyValid() const { + if (!IsValid()) return false; - if (GetPubKey() != key.GetPubKey()) + CECKey key; + if (!key.SetPubKey(*this)) return false; - return true; } -bool CKey::IsValid() -{ - if (!fSet) +bool CPubKey::Decompress() { + 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(); + key.GetPubKey(*this, false); + return true; } @@ -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 <stdexcept> #include <vector> #include "allocators.h" @@ -13,23 +12,6 @@ #include "uint256.h" #include "hash.h" -#include <openssl/ec.h> // 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<unsigned char> 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<unsigned char> &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<typename T> + 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<typename T> + CPubKey(const T pbegin, const T pend) { + Set(pbegin, pend); + } + + // Construct a public key from a byte vector. + CPubKey(const std::vector<unsigned char> &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<typename Stream> void Serialize(Stream &s, int nType, int nVersion) const { + unsigned int len = size(); + ::WriteCompactSize(s, len); + s.write((char*)vch, len); + } + template<typename Stream> 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<unsigned char> 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<unsigned char>& vchSig) const; + + // Verify a compact signature (~65 bytes). + // See CKey::SignCompact. + bool VerifyCompact(const uint256 &hash, const std::vector<unsigned char>& vchSig) const; + + // Recover a public key from a compact signature. + bool RecoverCompact(const uint256 &hash, const std::vector<unsigned char>& 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<unsigned char, secure_allocator<unsigned char> > CPrivKey; -// CSecret is a serialization of just the secret parameter (32 bytes) -typedef std::vector<unsigned char, secure_allocator<unsigned char> > 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); + } + + // 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)); + } + + // Destructor (again necessary because of memlocking). + ~CKey() { + UnlockObject(vch); + } + + // Initialize using begin and end iterators to byte data. + template<typename T> + 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; + } + } - CKey(); - CKey(const CKey& b); + // 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(); } - CKey& operator=(const CKey& b); + // Check whether this private key is valid. + bool IsValid() const { return fValid; } - ~CKey(); + // Check whether the public key corresponding to this private key is (to be) compressed. + bool IsCompressed() const { return fCompressed; } - bool IsNull() const; - bool IsCompressed() const; + // 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<unsigned char>& vchSig); + // Create a DER-serialized signature. + bool Sign(const uint256 &hash, std::vector<unsigned char>& 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<unsigned char>& 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<unsigned char>& vchSig); - - bool Verify(uint256 hash, const std::vector<unsigned char>& vchSig); - - // Verify a compact signature - bool VerifyCompact(uint256 hash, const std::vector<unsigned char>& 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<unsigned char>& 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<unsigned char> &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<unsigned char> 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<unsigned char> &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<unsigned char> 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<CKeyID, std::pair<CSecret, bool> > KeyMap; +typedef std::map<CKeyID, CKey> KeyMap; typedef std::map<CScriptID, CScript > 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<unsigned char> &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<uint256, CBlockIndex*> mapBlockIndex; +std::vector<CBlockIndex*> 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<int> cPeerBlockCounts(8, 0); // Amount of blocks that other nodes claim to have map<uint256, CBlock*> 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<uint256> 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<CBlockIndex*>& 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<CBlock> 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<COrphan> vOrphan; // list memory doesn't move map<uint256, vector<COrphan*> > mapDependers; - bool fPrintPriority = GetBoolArg("-printpriority"); + bool fPrintPriority = GetBoolArg("-printpriority", false); // This vector will be sorted into a priority queue: vector<TxPriority> 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<uint256, CBlockIndex*> mapBlockIndex; +extern std::vector<CBlockIndex*> vBlockIndexByHeight; extern std::set<CBlockIndex*, CBlockIndexWorkComparator> 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<CTxIn> vin; @@ -659,7 +660,7 @@ public: std::vector<CScriptCheck> *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 <QMessageBox> +#if QT_VERSION < 0x050000 #include <QTextCodec> +#endif #include <QLocale> #include <QTimer> #include <QTranslator> @@ -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 @@ <file alias="update_spinner">res/movies/update_spinner.mng</file> </qresource> <qresource prefix="/translations"> + <file alias="af_ZA">locale/bitcoin_af_ZA.qm</file> + <file alias="ar">locale/bitcoin_ar.qm</file> <file alias="bg">locale/bitcoin_bg.qm</file> <file alias="bs">locale/bitcoin_bs.ts</file> <file alias="ca">locale/bitcoin_ca.ts</file> @@ -87,7 +89,6 @@ <file alias="pt_PT">locale/bitcoin_pt_PT.qm</file> <file alias="ro_RO">locale/bitcoin_ro_RO.qm</file> <file alias="ru">locale/bitcoin_ru.qm</file> - <file alias="se">locale/bitcoin_se.qm</file> <file alias="sk">locale/bitcoin_sk.qm</file> <file alias="sr">locale/bitcoin_sr.qm</file> <file alias="sv">locale/bitcoin_sv.qm</file> 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 <QMovie> #include <QTimer> #include <QDragEnterEvent> +#if QT_VERSION < 0x050000 #include <QUrl> +#endif #include <QMimeData> #include <QStyle> #include <QSettings> @@ -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=<amount>: '%s'"), +QT_TRANSLATE_NOOP("bitcoin-core", "Invalid amount for -mintxfee=<amount>: '%s'"), QT_TRANSLATE_NOOP("bitcoin-core", "Invalid amount for -paytxfee=<amount>: '%s'"), QT_TRANSLATE_NOOP("bitcoin-core", "Invalid amount"), QT_TRANSLATE_NOOP("bitcoin-core", "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 <n> connections to peers (default: 125)"), QT_TRANSLATE_NOOP("bitcoin-core", "Maximum per-connection receive buffer, <n>*1000 bytes (default: 5000)"), QT_TRANSLATE_NOOP("bitcoin-core", "Maximum per-connection send buffer, <n>*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 <net> (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 <QDoubleValidator> #include <QFont> #include <QLineEdit> +#if QT_VERSION >= 0x050000 +#include <QUrlQuery> +#else #include <QUrl> -#include <QTextDocument> // For Qt::escape +#endif +#include <QTextDocument> // for Qt::mightBeRichText #include <QAbstractItemView> #include <QClipboard> #include <QFileDialog> @@ -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<QPair<QString, QString> > items = uri.queryItems(); +#else + QUrlQuery uriQuery(uri); + QList<QPair<QString, QString> > items = uriQuery.queryItems(); +#endif for (QList<QPair<QString, QString> >::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", "<br>\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 @@ +<?xml version="1.0" ?><!DOCTYPE TS><TS language="af_ZA" version="2.0"> +<defaultcodec>UTF-8</defaultcodec> +<context> + <name>AboutDialog</name> + <message> + <location filename="../forms/aboutdialog.ui" line="+14"/> + <source>About Bitcoin</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+39"/> + <source><b>Bitcoin</b> version</source> + <translation><b>Bitcoin</b> weergawe</translation> + </message> + <message> + <location line="+57"/> + <source> +This is experimental software. + +Distributed under the MIT/X11 software license, see the accompanying file COPYING or http://www.opensource.org/licenses/mit-license.php. + +This product includes software developed by the OpenSSL Project for use in the OpenSSL Toolkit (http://www.openssl.org/) and cryptographic software written by Eric Young (eay@cryptsoft.com) and UPnP software written by Thomas Bernard.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../aboutdialog.cpp" line="+14"/> + <source>Copyright</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+0"/> + <source>The Bitcoin developers</source> + <translation type="unfinished"/> + </message> +</context> +<context> + <name>AddressBookPage</name> + <message> + <location filename="../forms/addressbookpage.ui" line="+14"/> + <source>Address Book</source> + <translation>Adres Boek</translation> + </message> + <message> + <location line="+19"/> + <source>Double-click to edit address or label</source> + <translation>Dubbel-klik om die adres of etiket te wysig</translation> + </message> + <message> + <location line="+27"/> + <source>Create a new address</source> + <translation>Skep 'n nuwe adres</translation> + </message> + <message> + <location line="+14"/> + <source>Copy the currently selected address to the system clipboard</source> + <translation>Maak 'n kopie van die huidige adres na die stelsel klipbord</translation> + </message> + <message> + <location line="-11"/> + <source>&New Address</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../addressbookpage.cpp" line="+63"/> + <source>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.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../forms/addressbookpage.ui" line="+14"/> + <source>&Copy Address</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+11"/> + <source>Show &QR Code</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+11"/> + <source>Sign a message to prove you own a Bitcoin address</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+3"/> + <source>Sign &Message</source> + <translation>Teken &Boodskap</translation> + </message> + <message> + <location line="+25"/> + <source>Delete the currently selected address from the list</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+27"/> + <source>Export the data in the current tab to a file</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+3"/> + <source>&Export</source> + <translation type="unfinished"/> + </message> + <message> + <location line="-44"/> + <source>Verify a message to ensure it was signed with a specified Bitcoin address</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+3"/> + <source>&Verify Message</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+14"/> + <source>&Delete</source> + <translation>&Verwyder</translation> + </message> + <message> + <location filename="../addressbookpage.cpp" line="-5"/> + <source>These are your Bitcoin addresses for sending payments. Always check the amount and the receiving address before sending coins.</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+13"/> + <source>Copy &Label</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>&Edit</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Send &Coins</source> + <translation>Stuur &Muntstukke</translation> + </message> + <message> + <location line="+260"/> + <source>Export Address Book Data</source> + <translation>Voer die Adresboek Data Uit</translation> + </message> + <message> + <location line="+1"/> + <source>Comma separated file (*.csv)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+13"/> + <source>Error exporting</source> + <translation>Fout uitvoering</translation> + </message> + <message> + <location line="+0"/> + <source>Could not write to file %1.</source> + <translation>Kon nie na die %1 lêer skryf nie</translation> + </message> +</context> +<context> + <name>AddressTableModel</name> + <message> + <location filename="../addresstablemodel.cpp" line="+144"/> + <source>Label</source> + <translation>Etiket</translation> + </message> + <message> + <location line="+0"/> + <source>Address</source> + <translation>Adres</translation> + </message> + <message> + <location line="+36"/> + <source>(no label)</source> + <translation>(geen etiket)</translation> + </message> +</context> +<context> + <name>AskPassphraseDialog</name> + <message> + <location filename="../forms/askpassphrasedialog.ui" line="+26"/> + <source>Passphrase Dialog</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+21"/> + <source>Enter passphrase</source> + <translation>Tik Wagwoord in</translation> + </message> + <message> + <location line="+14"/> + <source>New passphrase</source> + <translation>Nuwe wagwoord</translation> + </message> + <message> + <location line="+14"/> + <source>Repeat new passphrase</source> + <translation>Herhaal nuwe wagwoord</translation> + </message> + <message> + <location filename="../askpassphrasedialog.cpp" line="+33"/> + <source>Enter the new passphrase to the wallet.<br/>Please use a passphrase of <b>10 or more random characters</b>, or <b>eight or more words</b>.</source> + <translation>Tik die nuwe wagwoord vir die beursie in.<br/>Gebruik asseblief 'n wagwoord van <b>ten minste 10 ewekansige karakters</b>, of <b>agt (8) of meer woorde.</b></translation> + </message> + <message> + <location line="+1"/> + <source>Encrypt wallet</source> + <translation>Enkripteer beursie</translation> + </message> + <message> + <location line="+3"/> + <source>This operation needs your wallet passphrase to unlock the wallet.</source> + <translation>Hierdie operasie benodig 'n wagwoord om die beursie oop te sluit.</translation> + </message> + <message> + <location line="+5"/> + <source>Unlock wallet</source> + <translation>Sluit beursie oop</translation> + </message> + <message> + <location line="+3"/> + <source>This operation needs your wallet passphrase to decrypt the wallet.</source> + <translation>Hierdie operasie benodig 'n wagwoord om die beursie oop te sluit.</translation> + </message> + <message> + <location line="+5"/> + <source>Decrypt wallet</source> + <translation>Sluit beursie oop</translation> + </message> + <message> + <location line="+3"/> + <source>Change passphrase</source> + <translation>Verander wagwoord</translation> + </message> + <message> + <location line="+1"/> + <source>Enter the old and new passphrase to the wallet.</source> + <translation>Tik asseblief die ou en nuwe wagwoord vir die beursie in.</translation> + </message> + <message> + <location line="+46"/> + <source>Confirm wallet encryption</source> + <translation>Bevestig beursie enkripsie.</translation> + </message> + <message> + <location line="+1"/> + <source>Warning: If you encrypt your wallet and lose your passphrase, you will <b>LOSE ALL OF YOUR BITCOINS</b>!</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+0"/> + <source>Are you sure you wish to encrypt your wallet?</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+15"/> + <source>IMPORTANT: Any previous backups you have made of your wallet file should be replaced with the newly generated, encrypted wallet file. For security reasons, previous backups of the unencrypted wallet file will become useless as soon as you start using the new, encrypted wallet.</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+100"/> + <location line="+24"/> + <source>Warning: The Caps Lock key is on!</source> + <translation type="unfinished"/> + </message> + <message> + <location line="-130"/> + <location line="+58"/> + <source>Wallet encrypted</source> + <translation>Die beursie is nou bewaak</translation> + </message> + <message> + <location line="-56"/> + <source>Bitcoin will close now to finish the encryption process. Remember that encrypting your wallet cannot fully protect your bitcoins from being stolen by malware infecting your computer.</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+13"/> + <location line="+7"/> + <location line="+42"/> + <location line="+6"/> + <source>Wallet encryption failed</source> + <translation>Die beursie kon nie bewaak word nie</translation> + </message> + <message> + <location line="-54"/> + <source>Wallet encryption failed due to an internal error. Your wallet was not encrypted.</source> + <translation>Beursie bewaaking het misluk as gevolg van 'n interne fout. Die beursie is nie bewaak nie!</translation> + </message> + <message> + <location line="+7"/> + <location line="+48"/> + <source>The supplied passphrases do not match.</source> + <translation>Die wagwoord stem nie ooreen nie</translation> + </message> + <message> + <location line="-37"/> + <source>Wallet unlock failed</source> + <translation>Beursie oopsluiting het misluk</translation> + </message> + <message> + <location line="+1"/> + <location line="+11"/> + <location line="+19"/> + <source>The passphrase entered for the wallet decryption was incorrect.</source> + <translation>Die wagwoord wat ingetik was om die beursie oop te sluit, was verkeerd.</translation> + </message> + <message> + <location line="-20"/> + <source>Wallet decryption failed</source> + <translation>Beursie dekripsie het misluk</translation> + </message> + <message> + <location line="+14"/> + <source>Wallet passphrase was successfully changed.</source> + <translation type="unfinished"/> + </message> +</context> +<context> + <name>BitcoinGUI</name> + <message> + <location filename="../bitcoingui.cpp" line="+233"/> + <source>Sign &message...</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+280"/> + <source>Synchronizing with network...</source> + <translation>Sinchroniseer met die netwerk ...</translation> + </message> + <message> + <location line="-349"/> + <source>&Overview</source> + <translation>&Oorsig</translation> + </message> + <message> + <location line="+1"/> + <source>Show general overview of wallet</source> + <translation>Wys algemene oorsig van die beursie</translation> + </message> + <message> + <location line="+20"/> + <source>&Transactions</source> + <translation>&Transaksies</translation> + </message> + <message> + <location line="+1"/> + <source>Browse transaction history</source> + <translation>Besoek transaksie geskiedenis</translation> + </message> + <message> + <location line="+7"/> + <source>Edit the list of stored addresses and labels</source> + <translation>Wysig die lys van gestoorde adresse en etikette</translation> + </message> + <message> + <location line="-14"/> + <source>Show the list of addresses for receiving payments</source> + <translation>Wys die lys van adresse vir die ontvangs van betalings</translation> + </message> + <message> + <location line="+31"/> + <source>E&xit</source> + <translation>S&luit af</translation> + </message> + <message> + <location line="+1"/> + <source>Quit application</source> + <translation>Sluit af</translation> + </message> + <message> + <location line="+4"/> + <source>Show information about Bitcoin</source> + <translation>Wys inligting oor Bitcoin</translation> + </message> + <message> + <location line="+2"/> + <source>About &Qt</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Show information about Qt</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+2"/> + <source>&Options...</source> + <translation>&Opsies</translation> + </message> + <message> + <location line="+6"/> + <source>&Encrypt Wallet...</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+3"/> + <source>&Backup Wallet...</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+2"/> + <source>&Change Passphrase...</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+285"/> + <source>Importing blocks from disk...</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+3"/> + <source>Reindexing blocks on disk...</source> + <translation type="unfinished"/> + </message> + <message> + <location line="-347"/> + <source>Send coins to a Bitcoin address</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+49"/> + <source>Modify configuration options for Bitcoin</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+9"/> + <source>Backup wallet to another location</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+2"/> + <source>Change the passphrase used for wallet encryption</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+6"/> + <source>&Debug window</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Open debugging and diagnostic console</source> + <translation type="unfinished"/> + </message> + <message> + <location line="-4"/> + <source>&Verify message...</source> + <translation type="unfinished"/> + </message> + <message> + <location line="-165"/> + <location line="+530"/> + <source>Bitcoin</source> + <translation>Bitcoin</translation> + </message> + <message> + <location line="-530"/> + <source>Wallet</source> + <translation>Beursie</translation> + </message> + <message> + <location line="+101"/> + <source>&Send</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+7"/> + <source>&Receive</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+14"/> + <source>&Addresses</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+22"/> + <source>&About Bitcoin</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+9"/> + <source>&Show / Hide</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Show or hide the main Window</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+3"/> + <source>Encrypt the private keys that belong to your wallet</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+7"/> + <source>Sign messages with your Bitcoin addresses to prove you own them</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+2"/> + <source>Verify messages to ensure they were signed with specified Bitcoin addresses</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+28"/> + <source>&File</source> + <translation>&Lêer</translation> + </message> + <message> + <location line="+7"/> + <source>&Settings</source> + <translation>&Instellings</translation> + </message> + <message> + <location line="+6"/> + <source>&Help</source> + <translation>&Hulp</translation> + </message> + <message> + <location line="+9"/> + <source>Tabs toolbar</source> + <translation>Blad nutsbalk</translation> + </message> + <message> + <location line="+17"/> + <location line="+10"/> + <source>[testnet]</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+47"/> + <source>Bitcoin client</source> + <translation type="unfinished"/> + </message> + <message numerus="yes"> + <location line="+141"/> + <source>%n active connection(s) to Bitcoin network</source> + <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation> + </message> + <message> + <location line="+22"/> + <source>No block source available...</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+12"/> + <source>Processed %1 of %2 (estimated) blocks of transaction history.</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+4"/> + <source>Processed %1 blocks of transaction history.</source> + <translation type="unfinished"/> + </message> + <message numerus="yes"> + <location line="+20"/> + <source>%n hour(s)</source> + <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation> + </message> + <message numerus="yes"> + <location line="+4"/> + <source>%n day(s)</source> + <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation> + </message> + <message numerus="yes"> + <location line="+4"/> + <source>%n week(s)</source> + <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation> + </message> + <message> + <location line="+4"/> + <source>%1 behind</source> + <translation>%1 agter</translation> + </message> + <message> + <location line="+14"/> + <source>Last received block was generated %1 ago.</source> + <translation>Ontvangs van laaste blok is %1 terug.</translation> + </message> + <message> + <location line="+2"/> + <source>Transactions after this will not yet be visible.</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+22"/> + <source>Error</source> + <translation>Fout</translation> + </message> + <message> + <location line="+3"/> + <source>Warning</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+3"/> + <source>Information</source> + <translation>Informasie</translation> + </message> + <message> + <location line="+70"/> + <source>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?</source> + <translation type="unfinished"/> + </message> + <message> + <location line="-140"/> + <source>Up to date</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+31"/> + <source>Catching up...</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+113"/> + <source>Confirm transaction fee</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+8"/> + <source>Sent transaction</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+0"/> + <source>Incoming transaction</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Date: %1 +Amount: %2 +Type: %3 +Address: %4 +</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+33"/> + <location line="+23"/> + <source>URI handling</source> + <translation type="unfinished"/> + </message> + <message> + <location line="-23"/> + <location line="+23"/> + <source>URI can not be parsed! This can be caused by an invalid Bitcoin address or malformed URI parameters.</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+17"/> + <source>Wallet is <b>encrypted</b> and currently <b>unlocked</b></source> + <translation type="unfinished"/> + </message> + <message> + <location line="+8"/> + <source>Wallet is <b>encrypted</b> and currently <b>locked</b></source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../bitcoin.cpp" line="+111"/> + <source>A fatal error occurred. Bitcoin can no longer continue safely and will quit.</source> + <translation type="unfinished"/> + </message> +</context> +<context> + <name>ClientModel</name> + <message> + <location filename="../clientmodel.cpp" line="+104"/> + <source>Network Alert</source> + <translation type="unfinished"/> + </message> +</context> +<context> + <name>EditAddressDialog</name> + <message> + <location filename="../forms/editaddressdialog.ui" line="+14"/> + <source>Edit Address</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+11"/> + <source>&Label</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+10"/> + <source>The label associated with this address book entry</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+7"/> + <source>&Address</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+10"/> + <source>The address associated with this address book entry. This can only be modified for sending addresses.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../editaddressdialog.cpp" line="+21"/> + <source>New receiving address</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+4"/> + <source>New sending address</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+3"/> + <source>Edit receiving address</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+4"/> + <source>Edit sending address</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+76"/> + <source>The entered address "%1" is already in the address book.</source> + <translation type="unfinished"/> + </message> + <message> + <location line="-5"/> + <source>The entered address "%1" is not a valid Bitcoin address.</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+10"/> + <source>Could not unlock wallet.</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+5"/> + <source>New key generation failed.</source> + <translation type="unfinished"/> + </message> +</context> +<context> + <name>GUIUtil::HelpMessageBox</name> + <message> + <location filename="../guiutil.cpp" line="+424"/> + <location line="+12"/> + <source>Bitcoin-Qt</source> + <translation type="unfinished"/> + </message> + <message> + <location line="-12"/> + <source>version</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+2"/> + <source>Usage:</source> + <translation>Gebruik:</translation> + </message> + <message> + <location line="+1"/> + <source>command-line options</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+4"/> + <source>UI options</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Set language, for example "de_DE" (default: system locale)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Start minimized</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Show splash screen on startup (default: 1)</source> + <translation type="unfinished"/> + </message> +</context> +<context> + <name>OptionsDialog</name> + <message> + <location filename="../forms/optionsdialog.ui" line="+14"/> + <source>Options</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+16"/> + <source>&Main</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+6"/> + <source>Optional transaction fee per kB that helps make sure your transactions are processed quickly. Most transactions are 1 kB.</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+15"/> + <source>Pay transaction &fee</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+31"/> + <source>Automatically start Bitcoin after logging in to the system.</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+3"/> + <source>&Start Bitcoin on system login</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+35"/> + <source>Reset all client options to default.</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+3"/> + <source>&Reset Options</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+13"/> + <source>&Network</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+6"/> + <source>Automatically open the Bitcoin client port on the router. This only works when your router supports UPnP and it is enabled.</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+3"/> + <source>Map port using &UPnP</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+7"/> + <source>Connect to the Bitcoin network through a SOCKS proxy (e.g. when connecting through Tor).</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+3"/> + <source>&Connect through SOCKS proxy:</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+9"/> + <source>Proxy &IP:</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+19"/> + <source>IP address of the proxy (e.g. 127.0.0.1)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+7"/> + <source>&Port:</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+19"/> + <source>Port of the proxy (e.g. 9050)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+7"/> + <source>SOCKS &Version:</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+13"/> + <source>SOCKS version of the proxy (e.g. 5)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+36"/> + <source>&Window</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+6"/> + <source>Show only a tray icon after minimizing the window.</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+3"/> + <source>&Minimize to the tray instead of the taskbar</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+7"/> + <source>Minimize instead of exit the application when the window is closed. When this option is enabled, the application will be closed only after selecting Quit in the menu.</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+3"/> + <source>M&inimize on close</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+21"/> + <source>&Display</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+8"/> + <source>User Interface &language:</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+13"/> + <source>The user interface language can be set here. This setting will take effect after restarting Bitcoin.</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+11"/> + <source>&Unit to show amounts in:</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+13"/> + <source>Choose the default subdivision unit to show in the interface and when sending coins.</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+9"/> + <source>Whether to show Bitcoin addresses in the transaction list or not.</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+3"/> + <source>&Display addresses in transaction list</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+71"/> + <source>&OK</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+7"/> + <source>&Cancel</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+10"/> + <source>&Apply</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../optionsdialog.cpp" line="+53"/> + <source>default</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+130"/> + <source>Confirm options reset</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Some settings may require a client restart to take effect.</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+0"/> + <source>Do you want to proceed?</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+42"/> + <location line="+9"/> + <source>Warning</source> + <translation type="unfinished"/> + </message> + <message> + <location line="-9"/> + <location line="+9"/> + <source>This setting will take effect after restarting Bitcoin.</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+29"/> + <source>The supplied proxy address is invalid.</source> + <translation type="unfinished"/> + </message> +</context> +<context> + <name>OverviewPage</name> + <message> + <location filename="../forms/overviewpage.ui" line="+14"/> + <source>Form</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+50"/> + <location line="+166"/> + <source>The displayed information may be out of date. Your wallet automatically synchronizes with the Bitcoin network after a connection is established, but this process has not completed yet.</source> + <translation type="unfinished"/> + </message> + <message> + <location line="-124"/> + <source>Balance:</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+29"/> + <source>Unconfirmed:</source> + <translation type="unfinished"/> + </message> + <message> + <location line="-78"/> + <source>Wallet</source> + <translation>Beursie</translation> + </message> + <message> + <location line="+107"/> + <source>Immature:</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+13"/> + <source>Mined balance that has not yet matured</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+46"/> + <source><b>Recent transactions</b></source> + <translation type="unfinished"/> + </message> + <message> + <location line="-101"/> + <source>Your current balance</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+29"/> + <source>Total of transactions that have yet to be confirmed, and do not yet count toward the current balance</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../overviewpage.cpp" line="+116"/> + <location line="+1"/> + <source>out of sync</source> + <translation type="unfinished"/> + </message> +</context> +<context> + <name>PaymentServer</name> + <message> + <location filename="../paymentserver.cpp" line="+107"/> + <source>Cannot start bitcoin: click-to-pay handler</source> + <translation type="unfinished"/> + </message> +</context> +<context> + <name>QRCodeDialog</name> + <message> + <location filename="../forms/qrcodedialog.ui" line="+14"/> + <source>QR Code Dialog</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+59"/> + <source>Request Payment</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+56"/> + <source>Amount:</source> + <translation type="unfinished"/> + </message> + <message> + <location line="-44"/> + <source>Label:</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+19"/> + <source>Message:</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+71"/> + <source>&Save As...</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qrcodedialog.cpp" line="+62"/> + <source>Error encoding URI into QR Code.</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+40"/> + <source>The entered amount is invalid, please check.</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+23"/> + <source>Resulting URI too long, try to reduce the text for label / message.</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+25"/> + <source>Save QR Code</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+0"/> + <source>PNG Images (*.png)</source> + <translation type="unfinished"/> + </message> +</context> +<context> + <name>RPCConsole</name> + <message> + <location filename="../forms/rpcconsole.ui" line="+46"/> + <source>Client name</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+10"/> + <location line="+23"/> + <location line="+26"/> + <location line="+23"/> + <location line="+23"/> + <location line="+36"/> + <location line="+53"/> + <location line="+23"/> + <location line="+23"/> + <location filename="../rpcconsole.cpp" line="+339"/> + <source>N/A</source> + <translation type="unfinished"/> + </message> + <message> + <location line="-217"/> + <source>Client version</source> + <translation type="unfinished"/> + </message> + <message> + <location line="-45"/> + <source>&Information</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+68"/> + <source>Using OpenSSL version</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+49"/> + <source>Startup time</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+29"/> + <source>Network</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+7"/> + <source>Number of connections</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+23"/> + <source>On testnet</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+23"/> + <source>Block chain</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+7"/> + <source>Current number of blocks</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+23"/> + <source>Estimated total blocks</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+23"/> + <source>Last block time</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+52"/> + <source>&Open</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+16"/> + <source>Command-line options</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+7"/> + <source>Show the Bitcoin-Qt help message to get a list with possible Bitcoin command-line options.</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+3"/> + <source>&Show</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+24"/> + <source>&Console</source> + <translation type="unfinished"/> + </message> + <message> + <location line="-260"/> + <source>Build date</source> + <translation type="unfinished"/> + </message> + <message> + <location line="-104"/> + <source>Bitcoin - Debug window</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+25"/> + <source>Bitcoin Core</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+279"/> + <source>Debug log file</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+7"/> + <source>Open the Bitcoin debug log file from the current data directory. This can take a few seconds for large log files.</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+102"/> + <source>Clear console</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../rpcconsole.cpp" line="-30"/> + <source>Welcome to the Bitcoin RPC console.</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Use up and down arrows to navigate history, and <b>Ctrl-L</b> to clear screen.</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Type <b>help</b> for an overview of available commands.</source> + <translation type="unfinished"/> + </message> +</context> +<context> + <name>SendCoinsDialog</name> + <message> + <location filename="../forms/sendcoinsdialog.ui" line="+14"/> + <location filename="../sendcoinsdialog.cpp" line="+124"/> + <location line="+5"/> + <location line="+5"/> + <location line="+5"/> + <location line="+6"/> + <location line="+5"/> + <location line="+5"/> + <source>Send Coins</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+50"/> + <source>Send to multiple recipients at once</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+3"/> + <source>Add &Recipient</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+20"/> + <source>Remove all transaction fields</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+3"/> + <source>Clear &All</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+22"/> + <source>Balance:</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+10"/> + <source>123.456 BTC</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+31"/> + <source>Confirm the send action</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+3"/> + <source>S&end</source> + <translation>S&tuur</translation> + </message> + <message> + <location filename="../sendcoinsdialog.cpp" line="-59"/> + <source><b>%1</b> to %2 (%3)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+5"/> + <source>Confirm send coins</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Are you sure you want to send %1?</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+0"/> + <source> and </source> + <translation type="unfinished"/> + </message> + <message> + <location line="+23"/> + <source>The recipient address is not valid, please recheck.</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+5"/> + <source>The amount to pay must be larger than 0.</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+5"/> + <source>The amount exceeds your balance.</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+5"/> + <source>The total exceeds your balance when the %1 transaction fee is included.</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+6"/> + <source>Duplicate address found, can only send to each address once per send operation.</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+5"/> + <source>Error: Transaction creation failed!</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+5"/> + <source>Error: The transaction was rejected. This might happen if some of the coins in your wallet were already spent, such as if you used a copy of wallet.dat and coins were spent in the copy but not marked as spent here.</source> + <translation type="unfinished"/> + </message> +</context> +<context> + <name>SendCoinsEntry</name> + <message> + <location filename="../forms/sendcoinsentry.ui" line="+14"/> + <source>Form</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+15"/> + <source>A&mount:</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+13"/> + <source>Pay &To:</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+34"/> + <source>The address to send the payment to (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source> + <translation>Die adres waarheen die betaling gestuur moet word (b.v. 1H7wyVL5HCNoVFyyBJSDojwyxcCChU7TPA)</translation> + </message> + <message> + <location line="+60"/> + <location filename="../sendcoinsentry.cpp" line="+26"/> + <source>Enter a label for this address to add it to your address book</source> + <translation type="unfinished"/> + </message> + <message> + <location line="-78"/> + <source>&Label:</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+28"/> + <source>Choose address from address book</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+10"/> + <source>Alt+A</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+7"/> + <source>Paste address from clipboard</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+10"/> + <source>Alt+P</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+7"/> + <source>Remove this recipient</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../sendcoinsentry.cpp" line="+1"/> + <source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source> + <translation type="unfinished"/> + </message> +</context> +<context> + <name>SignVerifyMessageDialog</name> + <message> + <location filename="../forms/signverifymessagedialog.ui" line="+14"/> + <source>Signatures - Sign / Verify a Message</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+13"/> + <source>&Sign Message</source> + <translation>&Teken boodskap</translation> + </message> + <message> + <location line="+6"/> + <source>You can sign messages with your addresses to prove you own them. Be careful not to sign anything vague, as phishing attacks may try to trick you into signing your identity over to them. Only sign fully-detailed statements you agree to.</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+18"/> + <source>The address to sign the message with (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+10"/> + <location line="+213"/> + <source>Choose an address from the address book</source> + <translation type="unfinished"/> + </message> + <message> + <location line="-203"/> + <location line="+213"/> + <source>Alt+A</source> + <translation type="unfinished"/> + </message> + <message> + <location line="-203"/> + <source>Paste address from clipboard</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+10"/> + <source>Alt+P</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+12"/> + <source>Enter the message you want to sign here</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+7"/> + <source>Signature</source> + <translation>Handtekening</translation> + </message> + <message> + <location line="+27"/> + <source>Copy the current signature to the system clipboard</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+21"/> + <source>Sign the message to prove you own this Bitcoin address</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+3"/> + <source>Sign &Message</source> + <translation>Teken &Boodskap</translation> + </message> + <message> + <location line="+14"/> + <source>Reset all sign message fields</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+3"/> + <location line="+146"/> + <source>Clear &All</source> + <translation type="unfinished"/> + </message> + <message> + <location line="-87"/> + <source>&Verify Message</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+6"/> + <source>Enter the signing address, message (ensure you copy line breaks, spaces, tabs, etc. exactly) and signature below to verify the message. Be careful not to read more into the signature than what is in the signed message itself, to avoid being tricked by a man-in-the-middle attack.</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+21"/> + <source>The address the message was signed with (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+40"/> + <source>Verify the message to ensure it was signed with the specified Bitcoin address</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+3"/> + <source>Verify &Message</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+14"/> + <source>Reset all verify message fields</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../signverifymessagedialog.cpp" line="+27"/> + <location line="+3"/> + <source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="-2"/> + <source>Click "Sign Message" to generate signature</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+3"/> + <source>Enter Bitcoin signature</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+82"/> + <location line="+81"/> + <source>The entered address is invalid.</source> + <translation type="unfinished"/> + </message> + <message> + <location line="-81"/> + <location line="+8"/> + <location line="+73"/> + <location line="+8"/> + <source>Please check the address and try again.</source> + <translation type="unfinished"/> + </message> + <message> + <location line="-81"/> + <location line="+81"/> + <source>The entered address does not refer to a key.</source> + <translation type="unfinished"/> + </message> + <message> + <location line="-73"/> + <source>Wallet unlock was cancelled.</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+8"/> + <source>Private key for the entered address is not available.</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+12"/> + <source>Message signing failed.</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+5"/> + <source>Message signed.</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+59"/> + <source>The signature could not be decoded.</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+0"/> + <location line="+13"/> + <source>Please check the signature and try again.</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+0"/> + <source>The signature did not match the message digest.</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+7"/> + <source>Message verification failed.</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+5"/> + <source>Message verified.</source> + <translation type="unfinished"/> + </message> +</context> +<context> + <name>SplashScreen</name> + <message> + <location filename="../splashscreen.cpp" line="+22"/> + <source>The Bitcoin developers</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>[testnet]</source> + <translation type="unfinished"/> + </message> +</context> +<context> + <name>TransactionDesc</name> + <message> + <location filename="../transactiondesc.cpp" line="+20"/> + <source>Open until %1</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+6"/> + <source>%1/offline</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+2"/> + <source>%1/unconfirmed</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+2"/> + <source>%1 confirmations</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+18"/> + <source>Status</source> + <translation type="unfinished"/> + </message> + <message numerus="yes"> + <location line="+7"/> + <source>, broadcast through %n node(s)</source> + <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation> + </message> + <message> + <location line="+4"/> + <source>Date</source> + <translation>Datum</translation> + </message> + <message> + <location line="+7"/> + <source>Source</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+0"/> + <source>Generated</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+5"/> + <location line="+17"/> + <source>From</source> + <translation>Van</translation> + </message> + <message> + <location line="+1"/> + <location line="+22"/> + <location line="+58"/> + <source>To</source> + <translation>Na</translation> + </message> + <message> + <location line="-77"/> + <location line="+2"/> + <source>own address</source> + <translation>eie adres</translation> + </message> + <message> + <location line="-2"/> + <source>label</source> + <translation>etiket</translation> + </message> + <message> + <location line="+37"/> + <location line="+12"/> + <location line="+45"/> + <location line="+17"/> + <location line="+30"/> + <source>Credit</source> + <translation>Krediet</translation> + </message> + <message numerus="yes"> + <location line="-102"/> + <source>matures in %n more block(s)</source> + <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation> + </message> + <message> + <location line="+2"/> + <source>not accepted</source> + <translation>nie aanvaar nie</translation> + </message> + <message> + <location line="+44"/> + <location line="+8"/> + <location line="+15"/> + <location line="+30"/> + <source>Debit</source> + <translation>Debiet</translation> + </message> + <message> + <location line="-39"/> + <source>Transaction fee</source> + <translation>Transaksie fooi</translation> + </message> + <message> + <location line="+16"/> + <source>Net amount</source> + <translation>Netto bedrag</translation> + </message> + <message> + <location line="+6"/> + <source>Message</source> + <translation>Boodskap</translation> + </message> + <message> + <location line="+2"/> + <source>Comment</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+2"/> + <source>Transaction ID</source> + <translation>Transaksie ID</translation> + </message> + <message> + <location line="+3"/> + <source>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.</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+7"/> + <source>Debug information</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+8"/> + <source>Transaction</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+3"/> + <source>Inputs</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+23"/> + <source>Amount</source> + <translation>Bedrag</translation> + </message> + <message> + <location line="+1"/> + <source>true</source> + <translation>waar</translation> + </message> + <message> + <location line="+0"/> + <source>false</source> + <translation>onwaar</translation> + </message> + <message> + <location line="-209"/> + <source>, has not been successfully broadcast yet</source> + <translation type="unfinished"/> + </message> + <message numerus="yes"> + <location line="-35"/> + <source>Open for %n more block(s)</source> + <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation> + </message> + <message> + <location line="+70"/> + <source>unknown</source> + <translation type="unfinished"/> + </message> +</context> +<context> + <name>TransactionDescDialog</name> + <message> + <location filename="../forms/transactiondescdialog.ui" line="+14"/> + <source>Transaction details</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+6"/> + <source>This pane shows a detailed description of the transaction</source> + <translation type="unfinished"/> + </message> +</context> +<context> + <name>TransactionTableModel</name> + <message> + <location filename="../transactiontablemodel.cpp" line="+225"/> + <source>Date</source> + <translation>Datum</translation> + </message> + <message> + <location line="+0"/> + <source>Type</source> + <translation>Tipe</translation> + </message> + <message> + <location line="+0"/> + <source>Address</source> + <translation>Adres</translation> + </message> + <message> + <location line="+0"/> + <source>Amount</source> + <translation>Bedrag</translation> + </message> + <message numerus="yes"> + <location line="+57"/> + <source>Open for %n more block(s)</source> + <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation> + </message> + <message> + <location line="+3"/> + <source>Open until %1</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+3"/> + <source>Offline (%1 confirmations)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+3"/> + <source>Unconfirmed (%1 of %2 confirmations)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+3"/> + <source>Confirmed (%1 confirmations)</source> + <translation type="unfinished"/> + </message> + <message numerus="yes"> + <location line="+8"/> + <source>Mined balance will be available when it matures in %n more block(s)</source> + <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation> + </message> + <message> + <location line="+5"/> + <source>This block was not received by any other nodes and will probably not be accepted!</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+3"/> + <source>Generated but not accepted</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+43"/> + <source>Received with</source> + <translation>Ontvang met</translation> + </message> + <message> + <location line="+2"/> + <source>Received from</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+3"/> + <source>Sent to</source> + <translation>Gestuur na</translation> + </message> + <message> + <location line="+2"/> + <source>Payment to yourself</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+2"/> + <source>Mined</source> + <translation>Gemyn</translation> + </message> + <message> + <location line="+38"/> + <source>(n/a)</source> + <translation>(n.v.t)</translation> + </message> + <message> + <location line="+199"/> + <source>Transaction status. Hover over this field to show number of confirmations.</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+2"/> + <source>Date and time that the transaction was received.</source> + <translation>Datum en tyd wat die transaksie ontvang was.</translation> + </message> + <message> + <location line="+2"/> + <source>Type of transaction.</source> + <translation>Tipe transaksie.</translation> + </message> + <message> + <location line="+2"/> + <source>Destination address of transaction.</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+2"/> + <source>Amount removed from or added to balance.</source> + <translation type="unfinished"/> + </message> +</context> +<context> + <name>TransactionView</name> + <message> + <location filename="../transactionview.cpp" line="+52"/> + <location line="+16"/> + <source>All</source> + <translation>Alles</translation> + </message> + <message> + <location line="-15"/> + <source>Today</source> + <translation>Vandag</translation> + </message> + <message> + <location line="+1"/> + <source>This week</source> + <translation>Hierdie week</translation> + </message> + <message> + <location line="+1"/> + <source>This month</source> + <translation>Hierdie maand</translation> + </message> + <message> + <location line="+1"/> + <source>Last month</source> + <translation>Verlede maand</translation> + </message> + <message> + <location line="+1"/> + <source>This year</source> + <translation>Hierdie jaar</translation> + </message> + <message> + <location line="+1"/> + <source>Range...</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+11"/> + <source>Received with</source> + <translation>Ontvang met</translation> + </message> + <message> + <location line="+2"/> + <source>Sent to</source> + <translation>Gestuur na</translation> + </message> + <message> + <location line="+2"/> + <source>To yourself</source> + <translation>Aan/na jouself</translation> + </message> + <message> + <location line="+1"/> + <source>Mined</source> + <translation>Gemyn</translation> + </message> + <message> + <location line="+1"/> + <source>Other</source> + <translation>Ander</translation> + </message> + <message> + <location line="+7"/> + <source>Enter address or label to search</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+7"/> + <source>Min amount</source> + <translation>Min bedrag</translation> + </message> + <message> + <location line="+34"/> + <source>Copy address</source> + <translation>Maak kopie van adres</translation> + </message> + <message> + <location line="+1"/> + <source>Copy label</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Copy amount</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Copy transaction ID</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Edit label</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Show transaction details</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+139"/> + <source>Export Transaction Data</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Comma separated file (*.csv)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+8"/> + <source>Confirmed</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Date</source> + <translation>Datum</translation> + </message> + <message> + <location line="+1"/> + <source>Type</source> + <translation>Tipe</translation> + </message> + <message> + <location line="+1"/> + <source>Label</source> + <translation>Etiket</translation> + </message> + <message> + <location line="+1"/> + <source>Address</source> + <translation>Adres</translation> + </message> + <message> + <location line="+1"/> + <source>Amount</source> + <translation>Bedrag</translation> + </message> + <message> + <location line="+1"/> + <source>ID</source> + <translation>ID</translation> + </message> + <message> + <location line="+4"/> + <source>Error exporting</source> + <translation>Fout uitvoering</translation> + </message> + <message> + <location line="+0"/> + <source>Could not write to file %1.</source> + <translation>Kon nie na die %1 lêer skryf nie</translation> + </message> + <message> + <location line="+100"/> + <source>Range:</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+8"/> + <source>to</source> + <translation type="unfinished"/> + </message> +</context> +<context> + <name>WalletModel</name> + <message> + <location filename="../walletmodel.cpp" line="+193"/> + <source>Send Coins</source> + <translation type="unfinished"/> + </message> +</context> +<context> + <name>WalletView</name> + <message> + <location filename="../walletview.cpp" line="+42"/> + <source>&Export</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Export the data in the current tab to a file</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+193"/> + <source>Backup Wallet</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+0"/> + <source>Wallet Data (*.dat)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+3"/> + <source>Backup Failed</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+0"/> + <source>There was an error trying to save the wallet data to the new location.</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+4"/> + <source>Backup Successful</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+0"/> + <source>The wallet data was successfully saved to the new location.</source> + <translation type="unfinished"/> + </message> +</context> +<context> + <name>bitcoin-core</name> + <message> + <location filename="../bitcoinstrings.cpp" line="+94"/> + <source>Bitcoin version</source> + <translation>Bitcoin weergawe</translation> + </message> + <message> + <location line="+102"/> + <source>Usage:</source> + <translation>Gebruik:</translation> + </message> + <message> + <location line="-29"/> + <source>Send command to -server or bitcoind</source> + <translation type="unfinished"/> + </message> + <message> + <location line="-23"/> + <source>List commands</source> + <translation type="unfinished"/> + </message> + <message> + <location line="-12"/> + <source>Get help for a command</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+24"/> + <source>Options:</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+24"/> + <source>Specify configuration file (default: bitcoin.conf)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+3"/> + <source>Specify pid file (default: bitcoind.pid)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="-1"/> + <source>Specify data directory</source> + <translation type="unfinished"/> + </message> + <message> + <location line="-9"/> + <source>Set database cache size in megabytes (default: 25)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="-28"/> + <source>Listen for connections on <port> (default: 8333 or testnet: 18333)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+5"/> + <source>Maintain at most <n> connections to peers (default: 125)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="-48"/> + <source>Connect to a node to retrieve peer addresses, and disconnect</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+82"/> + <source>Specify your own public address</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+3"/> + <source>Threshold for disconnecting misbehaving peers (default: 100)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="-134"/> + <source>Number of seconds to keep misbehaving peers from reconnecting (default: 86400)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="-29"/> + <source>An error occurred while setting up the RPC port %u for listening on IPv4: %s</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+27"/> + <source>Listen for JSON-RPC connections on <port> (default: 8332 or testnet: 18332)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+37"/> + <source>Accept command line and JSON-RPC commands</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+76"/> + <source>Run in the background as a daemon and accept commands</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+37"/> + <source>Use the test network</source> + <translation type="unfinished"/> + </message> + <message> + <location line="-112"/> + <source>Accept connections from outside (default: 1 if no -proxy or -connect)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="-80"/> + <source>%s, you must set a rpcpassword in the configuration file: +%s +It is recommended you use the following random password: +rpcuser=bitcoinrpc +rpcpassword=%s +(you do not need to remember this password) +The username and password MUST NOT be the same. +If the file does not exist, create it with owner-readable-only file permissions. +It is also recommended to set alertnotify so you are notified of problems; +for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com +</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+17"/> + <source>An error occurred while setting up the RPC port %u for listening on IPv6, falling back to IPv4: %s</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+3"/> + <source>Bind to given address and always listen on it. Use [host]:port notation for IPv6</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+3"/> + <source>Cannot obtain a lock on data directory %s. Bitcoin is probably already running.</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+3"/> + <source>Error: The transaction was rejected! This might happen if some of the coins in your wallet were already spent, such as if you used a copy of wallet.dat and coins were spent in the copy but not marked as spent here.</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+4"/> + <source>Error: This transaction requires a transaction fee of at least %s because of its amount, complexity, or use of recently received funds!</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+3"/> + <source>Execute command when a relevant alert is received (%s in cmd is replaced by message)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+3"/> + <source>Execute command when a wallet transaction changes (%s in cmd is replaced by TxID)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+11"/> + <source>Set maximum size of high-priority/low-fee transactions in bytes (default: 27000)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+6"/> + <source>This is a pre-release test build - use at your own risk - do not use for mining or merchant applications</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+5"/> + <source>Warning: -paytxfee is set very high! This is the transaction fee you will pay if you send a transaction.</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+3"/> + <source>Warning: Displayed transactions may not be correct! You may need to upgrade, or other nodes may need to upgrade.</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+3"/> + <source>Warning: Please check that your computer's date and time are correct! If your clock is wrong Bitcoin will not work properly.</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+3"/> + <source>Warning: error reading wallet.dat! All keys read correctly, but transaction data or address book entries might be missing or incorrect.</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+3"/> + <source>Warning: wallet.dat corrupt, data salvaged! Original wallet.dat saved as wallet.{timestamp}.bak in %s; if your balance or transactions are incorrect you should restore from a backup.</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+14"/> + <source>Attempt to recover private keys from a corrupt wallet.dat</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+2"/> + <source>Block creation options:</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+5"/> + <source>Connect only to the specified node(s)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+3"/> + <source>Corrupted block database detected</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Discover own IP address (default: 1 when listening and no -externalip)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Do you want to rebuild the block database now?</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+2"/> + <source>Error initializing block database</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Error initializing wallet database environment %s!</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Error loading block database</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+4"/> + <source>Error opening block database</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+2"/> + <source>Error: Disk space is low!</source> + <translation>Fout: Hardeskyf spasie is baie laag!</translation> + </message> + <message> + <location line="+1"/> + <source>Error: Wallet locked, unable to create transaction!</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Error: system error: </source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Failed to listen on any port. Use -listen=0 if you want this.</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Failed to read block info</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Failed to read block</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Failed to sync block index</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Failed to write block index</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Failed to write block info</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Failed to write block</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Failed to write file info</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Failed to write to coin database</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Failed to write transaction index</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Failed to write undo data</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+2"/> + <source>Find peers using DNS lookup (default: 1 unless -connect)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Generate coins (default: 0)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+2"/> + <source>How many blocks to check at startup (default: 288, 0 = all)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>How thorough the block verification is (0-4, default: 3)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+19"/> + <source>Not enough file descriptors available.</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+8"/> + <source>Rebuild block chain index from current blk000??.dat files</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+16"/> + <source>Set the number of threads to service RPC calls (default: 4)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+26"/> + <source>Verifying blocks...</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Verifying wallet...</source> + <translation type="unfinished"/> + </message> + <message> + <location line="-69"/> + <source>Imports blocks from external blk000??.dat file</source> + <translation type="unfinished"/> + </message> + <message> + <location line="-76"/> + <source>Set the number of script verification threads (up to 16, 0 = auto, <0 = leave that many cores free, default: 0)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+77"/> + <source>Information</source> + <translation>Informasie</translation> + </message> + <message> + <location line="+3"/> + <source>Invalid -tor address: '%s'</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Invalid amount for -minrelaytxfee=<amount>: '%s'</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Invalid amount for -mintxfee=<amount>: '%s'</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+8"/> + <source>Maintain a full transaction index (default: 0)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+2"/> + <source>Maximum per-connection receive buffer, <n>*1000 bytes (default: 5000)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Maximum per-connection send buffer, <n>*1000 bytes (default: 1000)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+2"/> + <source>Only accept block chain matching built-in checkpoints (default: 1)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Only connect to nodes in network <net> (IPv4, IPv6 or Tor)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+2"/> + <source>Output extra debugging information. Implies all other -debug* options</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Output extra network debugging information</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+2"/> + <source>Prepend debug output with timestamp</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+5"/> + <source>SSL options: (see the Bitcoin Wiki for SSL setup instructions)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Select the version of socks proxy to use (4-5, default: 5)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+3"/> + <source>Send trace/debug info to console instead of debug.log file</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Send trace/debug info to debugger</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+5"/> + <source>Set maximum block size in bytes (default: 250000)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Set minimum block size in bytes (default: 0)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+2"/> + <source>Shrink debug.log file on client startup (default: 1 when no -debug)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Signing transaction failed</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+2"/> + <source>Specify connection timeout in milliseconds (default: 5000)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+4"/> + <source>System error: </source> + <translation>Sisteem fout:</translation> + </message> + <message> + <location line="+4"/> + <source>Transaction amount too small</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Transaction amounts must be positive</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Transaction too large</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+7"/> + <source>Use UPnP to map the listening port (default: 0)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Use UPnP to map the listening port (default: 1 when listening)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Use proxy to reach tor hidden services (default: same as -proxy)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+2"/> + <source>Username for JSON-RPC connections</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+4"/> + <source>Warning</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Warning: This version is obsolete, upgrade required!</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>You need to rebuild the databases using -reindex to change -txindex</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>wallet.dat corrupt, salvage failed</source> + <translation type="unfinished"/> + </message> + <message> + <location line="-50"/> + <source>Password for JSON-RPC connections</source> + <translation type="unfinished"/> + </message> + <message> + <location line="-67"/> + <source>Allow JSON-RPC connections from specified IP address</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+76"/> + <source>Send commands to node running on <ip> (default: 127.0.0.1)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="-120"/> + <source>Execute command when the best block changes (%s in cmd is replaced by block hash)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+147"/> + <source>Upgrade wallet to latest format</source> + <translation type="unfinished"/> + </message> + <message> + <location line="-21"/> + <source>Set key pool size to <n> (default: 100)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="-12"/> + <source>Rescan the block chain for missing wallet transactions</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+35"/> + <source>Use OpenSSL (https) for JSON-RPC connections</source> + <translation type="unfinished"/> + </message> + <message> + <location line="-26"/> + <source>Server certificate file (default: server.cert)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Server private key (default: server.pem)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="-151"/> + <source>Acceptable ciphers (default: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+165"/> + <source>This help message</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+6"/> + <source>Unable to bind to %s on this computer (bind returned error %d, %s)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="-91"/> + <source>Connect through socks proxy</source> + <translation type="unfinished"/> + </message> + <message> + <location line="-10"/> + <source>Allow DNS lookups for -addnode, -seednode and -connect</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+55"/> + <source>Loading addresses...</source> + <translation>Laai adresse...</translation> + </message> + <message> + <location line="-35"/> + <source>Error loading wallet.dat: Wallet corrupted</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Error loading wallet.dat: Wallet requires newer version of Bitcoin</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+93"/> + <source>Wallet needed to be rewritten: restart Bitcoin to complete</source> + <translation type="unfinished"/> + </message> + <message> + <location line="-95"/> + <source>Error loading wallet.dat</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+28"/> + <source>Invalid -proxy address: '%s'</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+56"/> + <source>Unknown network specified in -onlynet: '%s'</source> + <translation type="unfinished"/> + </message> + <message> + <location line="-1"/> + <source>Unknown -socks proxy version requested: %i</source> + <translation type="unfinished"/> + </message> + <message> + <location line="-96"/> + <source>Cannot resolve -bind address: '%s'</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Cannot resolve -externalip address: '%s'</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+44"/> + <source>Invalid amount for -paytxfee=<amount>: '%s'</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Invalid amount</source> + <translation type="unfinished"/> + </message> + <message> + <location line="-6"/> + <source>Insufficient funds</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+10"/> + <source>Loading block index...</source> + <translation>Laai blok indeks...</translation> + </message> + <message> + <location line="-57"/> + <source>Add a node to connect to and attempt to keep the connection open</source> + <translation type="unfinished"/> + </message> + <message> + <location line="-25"/> + <source>Unable to bind to %s on this computer. Bitcoin is probably already running.</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+64"/> + <source>Fee per KB to add to transactions you send</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+19"/> + <source>Loading wallet...</source> + <translation>Laai beursie...</translation> + </message> + <message> + <location line="-52"/> + <source>Cannot downgrade wallet</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+3"/> + <source>Cannot write default address</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+64"/> + <source>Rescanning...</source> + <translation type="unfinished"/> + </message> + <message> + <location line="-57"/> + <source>Done loading</source> + <translation>Klaar gelaai</translation> + </message> + <message> + <location line="+82"/> + <source>To use the %s option</source> + <translation type="unfinished"/> + </message> + <message> + <location line="-74"/> + <source>Error</source> + <translation>Fout</translation> + </message> + <message> + <location line="-31"/> + <source>You must set rpcpassword=<password> in the configuration file: +%s +If the file does not exist, create it with owner-readable-only file permissions.</source> + <translation type="unfinished"/> + </message> +</context> +</TS>
\ No newline at end of file diff --git a/src/qt/locale/bitcoin_se.ts b/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 @@ -<?xml version="1.0" ?><!DOCTYPE TS><TS language="se" version="2.0"> +<?xml version="1.0" ?><!DOCTYPE TS><TS language="ar" version="2.0"> <defaultcodec>UTF-8</defaultcodec> <context> <name>AboutDialog</name> <message> <location filename="../forms/aboutdialog.ui" line="+14"/> <source>About Bitcoin</source> - <translation type="unfinished"/> + <translation>عن Bitcoin</translation> </message> <message> <location line="+39"/> <source><b>Bitcoin</b> version</source> - <translation type="unfinished"/> + <translation>نسخة <b>Bitcoin</b></translation> </message> <message> <location line="+57"/> @@ -23,13 +23,13 @@ This product includes software developed by the OpenSSL Project for use in the O <translation type="unfinished"/> </message> <message> - <location filename="../aboutdialog.cpp" line="+17"/> + <location filename="../aboutdialog.cpp" line="+14"/> <source>Copyright</source> <translation type="unfinished"/> </message> <message> <location line="+0"/> - <source>2009-%1 The Bitcoin developers</source> + <source>The Bitcoin developers</source> <translation type="unfinished"/> </message> </context> @@ -38,22 +38,22 @@ This product includes software developed by the OpenSSL Project for use in the O <message> <location filename="../forms/addressbookpage.ui" line="+14"/> <source>Address Book</source> - <translation type="unfinished"/> + <translation>دفتر العناوين</translation> </message> <message> <location line="+19"/> <source>Double-click to edit address or label</source> - <translation type="unfinished"/> + <translation>أنقر على الماوس مرتين لتعديل عنوان</translation> </message> <message> <location line="+27"/> <source>Create a new address</source> - <translation type="unfinished"/> + <translation>قم بعمل عنوان جديد</translation> </message> <message> <location line="+14"/> <source>Copy the currently selected address to the system clipboard</source> - <translation type="unfinished"/> + <translation>قم بنسخ القوانين المختارة لحافظة النظام</translation> </message> <message> <location line="-11"/> @@ -61,7 +61,7 @@ This product includes software developed by the OpenSSL Project for use in the O <translation type="unfinished"/> </message> <message> - <location filename="../addressbookpage.cpp" line="+59"/> + <location filename="../addressbookpage.cpp" line="+63"/> <source>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.</source> <translation type="unfinished"/> </message> @@ -91,7 +91,17 @@ This product includes software developed by the OpenSSL Project for use in the O <translation type="unfinished"/> </message> <message> - <location line="-14"/> + <location line="+27"/> + <source>Export the data in the current tab to a file</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+3"/> + <source>&Export</source> + <translation type="unfinished"/> + </message> + <message> + <location line="-44"/> <source>Verify a message to ensure it was signed with a specified Bitcoin address</source> <translation type="unfinished"/> </message> @@ -103,7 +113,7 @@ This product includes software developed by the OpenSSL Project for use in the O <message> <location line="+14"/> <source>&Delete</source> - <translation type="unfinished"/> + <translation>&أمسح</translation> </message> <message> <location filename="../addressbookpage.cpp" line="-5"/> @@ -313,12 +323,12 @@ This product includes software developed by the OpenSSL Project for use in the O <translation type="unfinished"/> </message> <message> - <location line="+299"/> + <location line="+280"/> <source>Synchronizing with network...</source> <translation type="unfinished"/> </message> <message> - <location line="-368"/> + <location line="-349"/> <source>&Overview</source> <translation type="unfinished"/> </message> @@ -393,7 +403,7 @@ This product includes software developed by the OpenSSL Project for use in the O <translation type="unfinished"/> </message> <message> - <location line="+304"/> + <location line="+285"/> <source>Importing blocks from disk...</source> <translation type="unfinished"/> </message> @@ -403,12 +413,7 @@ This product includes software developed by the OpenSSL Project for use in the O <translation type="unfinished"/> </message> <message> - <location line="-300"/> - <source>&Export...</source> - <translation type="unfinished"/> - </message> - <message> - <location line="-66"/> + <location line="-347"/> <source>Send coins to a Bitcoin address</source> <translation type="unfinished"/> </message> @@ -418,12 +423,7 @@ This product includes software developed by the OpenSSL Project for use in the O <translation type="unfinished"/> </message> <message> - <location line="+18"/> - <source>Export the data in the current tab to a file</source> - <translation type="unfinished"/> - </message> - <message> - <location line="-9"/> + <location line="+9"/> <source>Backup wallet to another location</source> <translation type="unfinished"/> </message> @@ -433,7 +433,7 @@ This product includes software developed by the OpenSSL Project for use in the O <translation type="unfinished"/> </message> <message> - <location line="+9"/> + <location line="+6"/> <source>&Debug window</source> <translation type="unfinished"/> </message> @@ -443,23 +443,23 @@ This product includes software developed by the OpenSSL Project for use in the O <translation type="unfinished"/> </message> <message> - <location line="-7"/> + <location line="-4"/> <source>&Verify message...</source> <translation type="unfinished"/> </message> <message> - <location line="-163"/> - <location line="+541"/> + <location line="-165"/> + <location line="+530"/> <source>Bitcoin</source> <translation type="unfinished"/> </message> <message> - <location line="-541"/> + <location line="-530"/> <source>Wallet</source> <translation type="unfinished"/> </message> <message> - <location line="+99"/> + <location line="+101"/> <source>&Send</source> <translation type="unfinished"/> </message> @@ -504,12 +504,12 @@ This product includes software developed by the OpenSSL Project for use in the O <translation type="unfinished"/> </message> <message> - <location line="+31"/> + <location line="+28"/> <source>&File</source> <translation type="unfinished"/> </message> <message> - <location line="+8"/> + <location line="+7"/> <source>&Settings</source> <translation type="unfinished"/> </message> @@ -524,12 +524,7 @@ This product includes software developed by the OpenSSL Project for use in the O <translation type="unfinished"/> </message> <message> - <location line="+8"/> - <source>Actions toolbar</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+13"/> + <location line="+17"/> <location line="+10"/> <source>[testnet]</source> <translation type="unfinished"/> @@ -540,12 +535,17 @@ This product includes software developed by the OpenSSL Project for use in the O <translation type="unfinished"/> </message> <message numerus="yes"> - <location line="+140"/> + <location line="+141"/> <source>%n active connection(s) to Bitcoin network</source> - <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation> + <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation> </message> <message> - <location line="+39"/> + <location line="+22"/> + <source>No block source available...</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+12"/> <source>Processed %1 of %2 (estimated) blocks of transaction history.</source> <translation type="unfinished"/> </message> @@ -557,20 +557,20 @@ This product includes software developed by the OpenSSL Project for use in the O <message numerus="yes"> <location line="+20"/> <source>%n hour(s)</source> - <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation> + <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation> </message> <message numerus="yes"> <location line="+4"/> <source>%n day(s)</source> - <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation> + <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation> </message> <message numerus="yes"> <location line="+4"/> <source>%n week(s)</source> - <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation> + <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation> </message> <message> - <location line="+5"/> + <location line="+4"/> <source>%1 behind</source> <translation type="unfinished"/> </message> @@ -585,7 +585,7 @@ This product includes software developed by the OpenSSL Project for use in the O <translation type="unfinished"/> </message> <message> - <location line="+21"/> + <location line="+22"/> <source>Error</source> <translation type="unfinished"/> </message> @@ -600,22 +600,22 @@ This product includes software developed by the OpenSSL Project for use in the O <translation type="unfinished"/> </message> <message> - <location line="+68"/> + <location line="+70"/> <source>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?</source> <translation type="unfinished"/> </message> <message> - <location line="-138"/> + <location line="-140"/> <source>Up to date</source> <translation type="unfinished"/> </message> <message> - <location line="+32"/> + <location line="+31"/> <source>Catching up...</source> <translation type="unfinished"/> </message> <message> - <location line="+110"/> + <location line="+113"/> <source>Confirm transaction fee</source> <translation type="unfinished"/> </message> @@ -661,7 +661,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location filename="../bitcoin.cpp" line="+104"/> + <location filename="../bitcoin.cpp" line="+111"/> <source>A fatal error occurred. Bitcoin can no longer continue safely and will quit.</source> <translation type="unfinished"/> </message> @@ -669,7 +669,7 @@ Address: %4 <context> <name>ClientModel</name> <message> - <location filename="../clientmodel.cpp" line="+98"/> + <location filename="../clientmodel.cpp" line="+104"/> <source>Network Alert</source> <translation type="unfinished"/> </message> @@ -800,7 +800,7 @@ Address: %4 </message> <message> <location line="+6"/> - <source>Optional transaction fee per kB that helps make sure your transactions are processed quickly. Most transactions are 1 kB. Fee 0.01 recommended.</source> + <source>Optional transaction fee per kB that helps make sure your transactions are processed quickly. Most transactions are 1 kB.</source> <translation type="unfinished"/> </message> <message> @@ -1050,7 +1050,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location filename="../overviewpage.cpp" line="+115"/> + <location filename="../overviewpage.cpp" line="+116"/> <location line="+1"/> <source>out of sync</source> <translation type="unfinished"/> @@ -1637,6 +1637,19 @@ Address: %4 </message> </context> <context> + <name>SplashScreen</name> + <message> + <location filename="../splashscreen.cpp" line="+22"/> + <source>The Bitcoin developers</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>[testnet]</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>TransactionDesc</name> <message> <location filename="../transactiondesc.cpp" line="+20"/> @@ -1666,7 +1679,7 @@ Address: %4 <message numerus="yes"> <location line="+7"/> <source>, broadcast through %n node(s)</source> - <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation> + <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation> </message> <message> <location line="+4"/> @@ -1719,7 +1732,7 @@ Address: %4 <message numerus="yes"> <location line="-102"/> <source>matures in %n more block(s)</source> - <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation> + <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation> </message> <message> <location line="+2"/> @@ -1802,7 +1815,7 @@ Address: %4 <message numerus="yes"> <location line="-35"/> <source>Open for %n more block(s)</source> - <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation> + <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation> </message> <message> <location line="+70"/> @@ -1848,7 +1861,7 @@ Address: %4 <message numerus="yes"> <location line="+57"/> <source>Open for %n more block(s)</source> - <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation> + <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation> </message> <message> <location line="+3"/> @@ -1873,7 +1886,7 @@ Address: %4 <message numerus="yes"> <location line="+8"/> <source>Mined balance will be available when it matures in %n more block(s)</source> - <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation> + <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation> </message> <message> <location line="+5"/> @@ -2111,9 +2124,27 @@ Address: %4 </message> </context> <context> + <name>WalletModel</name> + <message> + <location filename="../walletmodel.cpp" line="+193"/> + <source>Send Coins</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>WalletView</name> <message> - <location filename="../walletview.cpp" line="+247"/> + <location filename="../walletview.cpp" line="+42"/> + <source>&Export</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Export the data in the current tab to a file</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+193"/> <source>Backup Wallet</source> <translation type="unfinished"/> </message> @@ -2146,37 +2177,37 @@ Address: %4 <context> <name>bitcoin-core</name> <message> - <location filename="../bitcoinstrings.cpp" line="+96"/> + <location filename="../bitcoinstrings.cpp" line="+94"/> <source>Bitcoin version</source> <translation type="unfinished"/> </message> <message> - <location line="+98"/> + <location line="+102"/> <source>Usage:</source> <translation type="unfinished"/> </message> <message> - <location line="-25"/> + <location line="-29"/> <source>Send command to -server or bitcoind</source> <translation type="unfinished"/> </message> <message> - <location line="-22"/> + <location line="-23"/> <source>List commands</source> <translation type="unfinished"/> </message> <message> - <location line="-10"/> + <location line="-12"/> <source>Get help for a command</source> <translation type="unfinished"/> </message> <message> - <location line="+21"/> + <location line="+24"/> <source>Options:</source> <translation type="unfinished"/> </message> <message> - <location line="+23"/> + <location line="+24"/> <source>Specify configuration file (default: bitcoin.conf)</source> <translation type="unfinished"/> </message> @@ -2186,27 +2217,17 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="-48"/> - <source>Generate coins</source> - <translation type="unfinished"/> - </message> - <message> - <location line="-27"/> - <source>Don't generate coins</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+74"/> + <location line="-1"/> <source>Specify data directory</source> <translation type="unfinished"/> </message> <message> - <location line="-8"/> + <location line="-9"/> <source>Set database cache size in megabytes (default: 25)</source> <translation type="unfinished"/> </message> <message> - <location line="-27"/> + <location line="-28"/> <source>Listen for connections on <port> (default: 8333 or testnet: 18333)</source> <translation type="unfinished"/> </message> @@ -2221,7 +2242,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+80"/> + <location line="+82"/> <source>Specify your own public address</source> <translation type="unfinished"/> </message> @@ -2231,22 +2252,22 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="-132"/> + <location line="-134"/> <source>Number of seconds to keep misbehaving peers from reconnecting (default: 86400)</source> <translation type="unfinished"/> </message> <message> - <location line="-32"/> + <location line="-29"/> <source>An error occurred while setting up the RPC port %u for listening on IPv4: %s</source> <translation type="unfinished"/> </message> <message> - <location line="+30"/> + <location line="+27"/> <source>Listen for JSON-RPC connections on <port> (default: 8332 or testnet: 18332)</source> <translation type="unfinished"/> </message> <message> - <location line="+36"/> + <location line="+37"/> <source>Accept command line and JSON-RPC commands</source> <translation type="unfinished"/> </message> @@ -2256,17 +2277,17 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+33"/> + <location line="+37"/> <source>Use the test network</source> <translation type="unfinished"/> </message> <message> - <location line="-108"/> + <location line="-112"/> <source>Accept connections from outside (default: 1 if no -proxy or -connect)</source> <translation type="unfinished"/> </message> <message> - <location line="-82"/> + <location line="-80"/> <source>%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. </message> <message> <location line="+3"/> - <source>Error initializing database environment %s! To recover, BACKUP THAT DIRECTORY, then remove everything from it except for wallet.dat.</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+3"/> <source>Error: The transaction was rejected! This might happen if some of the coins in your wallet were already spent, such as if you used a copy of wallet.dat and coins were spent in the copy but not marked as spent here.</source> <translation type="unfinished"/> </message> @@ -2326,12 +2342,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+3"/> - <source>Set the number of script verification threads (1-16, 0=auto, default: 0)</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+2"/> + <location line="+6"/> <source>This is a pre-release test build - use at your own risk - do not use for mining or merchant applications</source> <translation type="unfinished"/> </message> @@ -2371,7 +2382,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+6"/> + <location line="+5"/> <source>Connect only to the specified node(s)</source> <translation type="unfinished"/> </message> @@ -2391,7 +2402,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+3"/> + <location line="+2"/> <source>Error initializing block database</source> <translation type="unfinished"/> </message> @@ -2417,11 +2428,6 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. </message> <message> <location line="+1"/> - <source>Error: Transaction creation failed!</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+1"/> <source>Error: Wallet locked, unable to create transaction!</source> <translation type="unfinished"/> </message> @@ -2491,7 +2497,12 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+3"/> + <location line="+1"/> + <source>Generate coins (default: 0)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+2"/> <source>How many blocks to check at startup (default: 288, 0 = all)</source> <translation type="unfinished"/> </message> @@ -2501,7 +2512,12 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+24"/> + <location line="+19"/> + <source>Not enough file descriptors available.</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+8"/> <source>Rebuild block chain index from current blk000??.dat files</source> <translation type="unfinished"/> </message> @@ -2511,7 +2527,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+22"/> + <location line="+26"/> <source>Verifying blocks...</source> <translation type="unfinished"/> </message> @@ -2521,12 +2537,17 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="-62"/> + <location line="-69"/> <source>Imports blocks from external blk000??.dat file</source> <translation type="unfinished"/> </message> <message> - <location line="+1"/> + <location line="-76"/> + <source>Set the number of script verification threads (up to 16, 0 = auto, <0 = leave that many cores free, default: 0)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+77"/> <source>Information</source> <translation type="unfinished"/> </message> @@ -2536,6 +2557,16 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> + <location line="+1"/> + <source>Invalid amount for -minrelaytxfee=<amount>: '%s'</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Invalid amount for -mintxfee=<amount>: '%s'</source> + <translation type="unfinished"/> + </message> + <message> <location line="+8"/> <source>Maintain a full transaction index (default: 0)</source> <translation type="unfinished"/> @@ -2551,7 +2582,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+1"/> + <location line="+2"/> <source>Only accept block chain matching built-in checkpoints (default: 1)</source> <translation type="unfinished"/> </message> @@ -2611,6 +2642,11 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> + <location line="+1"/> + <source>Signing transaction failed</source> + <translation type="unfinished"/> + </message> + <message> <location line="+2"/> <source>Specify connection timeout in milliseconds (default: 5000)</source> <translation type="unfinished"/> @@ -2621,7 +2657,22 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+10"/> + <location line="+4"/> + <source>Transaction amount too small</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Transaction amounts must be positive</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Transaction too large</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+7"/> <source>Use UPnP to map the listening port (default: 0)</source> <translation type="unfinished"/> </message> @@ -2661,7 +2712,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="-46"/> + <location line="-50"/> <source>Password for JSON-RPC connections</source> <translation type="unfinished"/> </message> @@ -2676,17 +2727,17 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="-119"/> + <location line="-120"/> <source>Execute command when the best block changes (%s in cmd is replaced by block hash)</source> <translation type="unfinished"/> </message> <message> - <location line="+142"/> + <location line="+147"/> <source>Upgrade wallet to latest format</source> <translation type="unfinished"/> </message> <message> - <location line="-17"/> + <location line="-21"/> <source>Set key pool size to <n> (default: 100)</source> <translation type="unfinished"/> </message> @@ -2696,12 +2747,12 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+31"/> + <location line="+35"/> <source>Use OpenSSL (https) for JSON-RPC connections</source> <translation type="unfinished"/> </message> <message> - <location line="-22"/> + <location line="-26"/> <source>Server certificate file (default: server.cert)</source> <translation type="unfinished"/> </message> @@ -2711,37 +2762,37 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="-153"/> + <location line="-151"/> <source>Acceptable ciphers (default: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH)</source> <translation type="unfinished"/> </message> <message> - <location line="+166"/> + <location line="+165"/> <source>This help message</source> <translation type="unfinished"/> </message> <message> - <location line="+3"/> + <location line="+6"/> <source>Unable to bind to %s on this computer (bind returned error %d, %s)</source> <translation type="unfinished"/> </message> <message> - <location line="-86"/> + <location line="-91"/> <source>Connect through socks proxy</source> <translation type="unfinished"/> </message> <message> - <location line="-11"/> + <location line="-10"/> <source>Allow DNS lookups for -addnode, -seednode and -connect</source> <translation type="unfinished"/> </message> <message> - <location line="+56"/> + <location line="+55"/> <source>Loading addresses...</source> <translation type="unfinished"/> </message> <message> - <location line="-34"/> + <location line="-35"/> <source>Error loading wallet.dat: Wallet corrupted</source> <translation type="unfinished"/> </message> @@ -2751,22 +2802,22 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+87"/> + <location line="+93"/> <source>Wallet needed to be rewritten: restart Bitcoin to complete</source> <translation type="unfinished"/> </message> <message> - <location line="-89"/> + <location line="-95"/> <source>Error loading wallet.dat</source> <translation type="unfinished"/> </message> <message> - <location line="+29"/> + <location line="+28"/> <source>Invalid -proxy address: '%s'</source> <translation type="unfinished"/> </message> <message> - <location line="+49"/> + <location line="+56"/> <source>Unknown network specified in -onlynet: '%s'</source> <translation type="unfinished"/> </message> @@ -2776,7 +2827,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="-91"/> + <location line="-96"/> <source>Cannot resolve -bind address: '%s'</source> <translation type="unfinished"/> </message> @@ -2796,17 +2847,17 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="-4"/> + <location line="-6"/> <source>Insufficient funds</source> <translation type="unfinished"/> </message> <message> - <location line="+8"/> + <location line="+10"/> <source>Loading block index...</source> <translation type="unfinished"/> </message> <message> - <location line="-58"/> + <location line="-57"/> <source>Add a node to connect to and attempt to keep the connection open</source> <translation type="unfinished"/> </message> @@ -2816,52 +2867,47 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+67"/> + <location line="+64"/> <source>Fee per KB to add to transactions you send</source> <translation type="unfinished"/> </message> <message> - <location line="+17"/> + <location line="+19"/> <source>Loading wallet...</source> <translation type="unfinished"/> </message> <message> - <location line="-53"/> + <location line="-52"/> <source>Cannot downgrade wallet</source> <translation type="unfinished"/> </message> <message> - <location line="+1"/> - <source>Cannot initialize keypool</source> - <translation type="unfinished"/> - </message> - <message> <location line="+3"/> <source>Cannot write default address</source> <translation type="unfinished"/> </message> <message> - <location line="+63"/> + <location line="+64"/> <source>Rescanning...</source> <translation type="unfinished"/> </message> <message> - <location line="-55"/> + <location line="-57"/> <source>Done loading</source> <translation type="unfinished"/> </message> <message> - <location line="+79"/> + <location line="+82"/> <source>To use the %s option</source> <translation type="unfinished"/> </message> <message> - <location line="-71"/> + <location line="-74"/> <source>Error</source> <translation type="unfinished"/> </message> <message> - <location line="-33"/> + <location line="-31"/> <source>You must set rpcpassword=<password> in the configuration file: %s If the file does not exist, create it with owner-readable-only file permissions.</source> diff --git a/src/qt/locale/bitcoin_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.</translation> </message> <message> - <location filename="../aboutdialog.cpp" line="+17"/> + <location filename="../aboutdialog.cpp" line="+14"/> <source>Copyright</source> <translation type="unfinished"/> </message> <message> <location line="+0"/> - <source>2009-%1 The Bitcoin developers</source> + <source>The Bitcoin developers</source> <translation type="unfinished"/> </message> </context> @@ -66,7 +66,7 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>&Нов адрес</translation> </message> <message> - <location filename="../addressbookpage.cpp" line="+59"/> + <location filename="../addressbookpage.cpp" line="+63"/> <source>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.</source> <translation>Това са вашите Биткоин адреси за получаване на плащания. За по-лесно проследяване на плащанията и повишена анонимност можете да използвате нов адрес за всяко плащане.</translation> </message> @@ -96,7 +96,17 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>Изтрий избрания адрес от списъка</translation> </message> <message> - <location line="-14"/> + <location line="+27"/> + <source>Export the data in the current tab to a file</source> + <translation>Запишете данните от текущия раздел във файл</translation> + </message> + <message> + <location line="+3"/> + <source>&Export</source> + <translation type="unfinished"/> + </message> + <message> + <location line="-44"/> <source>Verify a message to ensure it was signed with a specified Bitcoin address</source> <translation>Проверете съобщение, за да сте сигурни че е подписано с определен Биткоин адрес</translation> </message> @@ -318,12 +328,12 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>Подписване на &съобщение...</translation> </message> <message> - <location line="+299"/> + <location line="+280"/> <source>Synchronizing with network...</source> <translation>Синхронизиране с мрежата...</translation> </message> <message> - <location line="-368"/> + <location line="-349"/> <source>&Overview</source> <translation>&Баланс</translation> </message> @@ -398,7 +408,7 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>&Смяна на паролата...</translation> </message> <message> - <location line="+304"/> + <location line="+285"/> <source>Importing blocks from disk...</source> <translation type="unfinished"/> </message> @@ -408,12 +418,7 @@ This product includes software developed by the OpenSSL Project for use in the O <translation type="unfinished"/> </message> <message> - <location line="-300"/> - <source>&Export...</source> - <translation>&Експорт...</translation> - </message> - <message> - <location line="-66"/> + <location line="-347"/> <source>Send coins to a Bitcoin address</source> <translation>Изпращане към Биткоин адрес</translation> </message> @@ -423,12 +428,7 @@ This product includes software developed by the OpenSSL Project for use in the O <translation type="unfinished"/> </message> <message> - <location line="+18"/> - <source>Export the data in the current tab to a file</source> - <translation>Запишете данните от текущия раздел във файл</translation> - </message> - <message> - <location line="-9"/> + <location line="+9"/> <source>Backup wallet to another location</source> <translation type="unfinished"/> </message> @@ -438,7 +438,7 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>Променя паролата за портфейла</translation> </message> <message> - <location line="+9"/> + <location line="+6"/> <source>&Debug window</source> <translation type="unfinished"/> </message> @@ -448,23 +448,23 @@ This product includes software developed by the OpenSSL Project for use in the O <translation type="unfinished"/> </message> <message> - <location line="-7"/> + <location line="-4"/> <source>&Verify message...</source> <translation>&Проверка на съобщение...</translation> </message> <message> - <location line="-163"/> - <location line="+541"/> + <location line="-165"/> + <location line="+530"/> <source>Bitcoin</source> <translation>Биткоин</translation> </message> <message> - <location line="-541"/> + <location line="-530"/> <source>Wallet</source> <translation>Портфейл</translation> </message> <message> - <location line="+99"/> + <location line="+101"/> <source>&Send</source> <translation type="unfinished"/> </message> @@ -509,12 +509,12 @@ This product includes software developed by the OpenSSL Project for use in the O <translation type="unfinished"/> </message> <message> - <location line="+31"/> + <location line="+28"/> <source>&File</source> <translation>&Файл</translation> </message> <message> - <location line="+8"/> + <location line="+7"/> <source>&Settings</source> <translation>&Настройки</translation> </message> @@ -529,12 +529,7 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>Раздели</translation> </message> <message> - <location line="+8"/> - <source>Actions toolbar</source> - <translation>Функции</translation> - </message> - <message> - <location line="+13"/> + <location line="+17"/> <location line="+10"/> <source>[testnet]</source> <translation>[testnet]</translation> @@ -545,12 +540,17 @@ This product includes software developed by the OpenSSL Project for use in the O <translation type="unfinished"/> </message> <message numerus="yes"> - <location line="+140"/> + <location line="+141"/> <source>%n active connection(s) to Bitcoin network</source> <translation><numerusform>%n връзка към Биткоин мрежата</numerusform><numerusform>%n връзки към Биткоин мрежата</numerusform></translation> </message> <message> - <location line="+39"/> + <location line="+22"/> + <source>No block source available...</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+12"/> <source>Processed %1 of %2 (estimated) blocks of transaction history.</source> <translation type="unfinished"/> </message> @@ -575,7 +575,7 @@ This product includes software developed by the OpenSSL Project for use in the O <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation> </message> <message> - <location line="+5"/> + <location line="+4"/> <source>%1 behind</source> <translation type="unfinished"/> </message> @@ -590,7 +590,7 @@ This product includes software developed by the OpenSSL Project for use in the O <translation type="unfinished"/> </message> <message> - <location line="+21"/> + <location line="+22"/> <source>Error</source> <translation type="unfinished"/> </message> @@ -605,22 +605,22 @@ This product includes software developed by the OpenSSL Project for use in the O <translation type="unfinished"/> </message> <message> - <location line="+68"/> + <location line="+70"/> <source>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?</source> <translation type="unfinished"/> </message> <message> - <location line="-138"/> + <location line="-140"/> <source>Up to date</source> <translation>Синхронизиран</translation> </message> <message> - <location line="+32"/> + <location line="+31"/> <source>Catching up...</source> <translation>Зарежда блокове...</translation> </message> <message> - <location line="+110"/> + <location line="+113"/> <source>Confirm transaction fee</source> <translation>Потвърждение за такса</translation> </message> @@ -666,7 +666,7 @@ Address: %4 <translation>Портфейлът е <b>криптиран</b> и <b>заключен</b></translation> </message> <message> - <location filename="../bitcoin.cpp" line="+104"/> + <location filename="../bitcoin.cpp" line="+111"/> <source>A fatal error occurred. Bitcoin can no longer continue safely and will quit.</source> <translation type="unfinished"/> </message> @@ -674,7 +674,7 @@ Address: %4 <context> <name>ClientModel</name> <message> - <location filename="../clientmodel.cpp" line="+98"/> + <location filename="../clientmodel.cpp" line="+104"/> <source>Network Alert</source> <translation type="unfinished"/> </message> @@ -805,8 +805,8 @@ Address: %4 </message> <message> <location line="+6"/> - <source>Optional transaction fee per kB that helps make sure your transactions are processed quickly. Most transactions are 1 kB. Fee 0.01 recommended.</source> - <translation>Такса за транзакция на kB. Подпомага участниците в мрежата, които верифицират транзакции (miners). По-висока стойност би трябвало да ускори обработката на транзакции. Повечето транзакции са около 1 kB. Препоръчителна стойност - 0.0005 BTC.</translation> + <source>Optional transaction fee per kB that helps make sure your transactions are processed quickly. Most transactions are 1 kB.</source> + <translation type="unfinished"/> </message> <message> <location line="+15"/> @@ -1055,7 +1055,7 @@ Address: %4 <translation>Сборът на все още непотвърдените транзакции, които не са част от текущия баланс</translation> </message> <message> - <location filename="../overviewpage.cpp" line="+115"/> + <location filename="../overviewpage.cpp" line="+116"/> <location line="+1"/> <source>out of sync</source> <translation>несинхронизиран</translation> @@ -1642,6 +1642,19 @@ Address: %4 </message> </context> <context> + <name>SplashScreen</name> + <message> + <location filename="../splashscreen.cpp" line="+22"/> + <source>The Bitcoin developers</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>[testnet]</source> + <translation>[testnet]</translation> + </message> +</context> +<context> <name>TransactionDesc</name> <message> <location filename="../transactiondesc.cpp" line="+20"/> @@ -2116,9 +2129,27 @@ Address: %4 </message> </context> <context> + <name>WalletModel</name> + <message> + <location filename="../walletmodel.cpp" line="+193"/> + <source>Send Coins</source> + <translation>Изпращане</translation> + </message> +</context> +<context> <name>WalletView</name> <message> - <location filename="../walletview.cpp" line="+247"/> + <location filename="../walletview.cpp" line="+42"/> + <source>&Export</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Export the data in the current tab to a file</source> + <translation>Запишете данните от текущия раздел във файл</translation> + </message> + <message> + <location line="+193"/> <source>Backup Wallet</source> <translation type="unfinished"/> </message> @@ -2151,37 +2182,37 @@ Address: %4 <context> <name>bitcoin-core</name> <message> - <location filename="../bitcoinstrings.cpp" line="+96"/> + <location filename="../bitcoinstrings.cpp" line="+94"/> <source>Bitcoin version</source> <translation>Биткоин версия</translation> </message> <message> - <location line="+98"/> + <location line="+102"/> <source>Usage:</source> <translation type="unfinished"/> </message> <message> - <location line="-25"/> + <location line="-29"/> <source>Send command to -server or bitcoind</source> <translation type="unfinished"/> </message> <message> - <location line="-22"/> + <location line="-23"/> <source>List commands</source> <translation type="unfinished"/> </message> <message> - <location line="-10"/> + <location line="-12"/> <source>Get help for a command</source> <translation type="unfinished"/> </message> <message> - <location line="+21"/> + <location line="+24"/> <source>Options:</source> <translation>Опции:</translation> </message> <message> - <location line="+23"/> + <location line="+24"/> <source>Specify configuration file (default: bitcoin.conf)</source> <translation type="unfinished"/> </message> @@ -2191,27 +2222,17 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="-48"/> - <source>Generate coins</source> - <translation type="unfinished"/> - </message> - <message> - <location line="-27"/> - <source>Don't generate coins</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+74"/> + <location line="-1"/> <source>Specify data directory</source> <translation type="unfinished"/> </message> <message> - <location line="-8"/> + <location line="-9"/> <source>Set database cache size in megabytes (default: 25)</source> <translation type="unfinished"/> </message> <message> - <location line="-27"/> + <location line="-28"/> <source>Listen for connections on <port> (default: 8333 or testnet: 18333)</source> <translation type="unfinished"/> </message> @@ -2226,7 +2247,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+80"/> + <location line="+82"/> <source>Specify your own public address</source> <translation type="unfinished"/> </message> @@ -2236,22 +2257,22 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="-132"/> + <location line="-134"/> <source>Number of seconds to keep misbehaving peers from reconnecting (default: 86400)</source> <translation type="unfinished"/> </message> <message> - <location line="-32"/> + <location line="-29"/> <source>An error occurred while setting up the RPC port %u for listening on IPv4: %s</source> <translation type="unfinished"/> </message> <message> - <location line="+30"/> + <location line="+27"/> <source>Listen for JSON-RPC connections on <port> (default: 8332 or testnet: 18332)</source> <translation type="unfinished"/> </message> <message> - <location line="+36"/> + <location line="+37"/> <source>Accept command line and JSON-RPC commands</source> <translation type="unfinished"/> </message> @@ -2261,17 +2282,17 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+33"/> + <location line="+37"/> <source>Use the test network</source> <translation type="unfinished"/> </message> <message> - <location line="-108"/> + <location line="-112"/> <source>Accept connections from outside (default: 1 if no -proxy or -connect)</source> <translation type="unfinished"/> </message> <message> - <location line="-82"/> + <location line="-80"/> <source>%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. </message> <message> <location line="+3"/> - <source>Error initializing database environment %s! To recover, BACKUP THAT DIRECTORY, then remove everything from it except for wallet.dat.</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+3"/> <source>Error: The transaction was rejected! This might happen if some of the coins in your wallet were already spent, such as if you used a copy of wallet.dat and coins were spent in the copy but not marked as spent here.</source> <translation type="unfinished"/> </message> @@ -2331,12 +2347,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+3"/> - <source>Set the number of script verification threads (1-16, 0=auto, default: 0)</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+2"/> + <location line="+6"/> <source>This is a pre-release test build - use at your own risk - do not use for mining or merchant applications</source> <translation type="unfinished"/> </message> @@ -2376,7 +2387,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+6"/> + <location line="+5"/> <source>Connect only to the specified node(s)</source> <translation type="unfinished"/> </message> @@ -2396,7 +2407,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+3"/> + <location line="+2"/> <source>Error initializing block database</source> <translation type="unfinished"/> </message> @@ -2422,11 +2433,6 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. </message> <message> <location line="+1"/> - <source>Error: Transaction creation failed!</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+1"/> <source>Error: Wallet locked, unable to create transaction!</source> <translation type="unfinished"/> </message> @@ -2496,7 +2502,12 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+3"/> + <location line="+1"/> + <source>Generate coins (default: 0)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+2"/> <source>How many blocks to check at startup (default: 288, 0 = all)</source> <translation type="unfinished"/> </message> @@ -2506,7 +2517,12 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+24"/> + <location line="+19"/> + <source>Not enough file descriptors available.</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+8"/> <source>Rebuild block chain index from current blk000??.dat files</source> <translation type="unfinished"/> </message> @@ -2516,7 +2532,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+22"/> + <location line="+26"/> <source>Verifying blocks...</source> <translation type="unfinished"/> </message> @@ -2526,12 +2542,17 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="-62"/> + <location line="-69"/> <source>Imports blocks from external blk000??.dat file</source> <translation type="unfinished"/> </message> <message> - <location line="+1"/> + <location line="-76"/> + <source>Set the number of script verification threads (up to 16, 0 = auto, <0 = leave that many cores free, default: 0)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+77"/> <source>Information</source> <translation type="unfinished"/> </message> @@ -2541,6 +2562,16 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Невалиден -tor адрес: '%s'</translation> </message> <message> + <location line="+1"/> + <source>Invalid amount for -minrelaytxfee=<amount>: '%s'</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Invalid amount for -mintxfee=<amount>: '%s'</source> + <translation type="unfinished"/> + </message> + <message> <location line="+8"/> <source>Maintain a full transaction index (default: 0)</source> <translation type="unfinished"/> @@ -2556,7 +2587,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+1"/> + <location line="+2"/> <source>Only accept block chain matching built-in checkpoints (default: 1)</source> <translation type="unfinished"/> </message> @@ -2616,6 +2647,11 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> + <location line="+1"/> + <source>Signing transaction failed</source> + <translation type="unfinished"/> + </message> + <message> <location line="+2"/> <source>Specify connection timeout in milliseconds (default: 5000)</source> <translation type="unfinished"/> @@ -2626,7 +2662,22 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+10"/> + <location line="+4"/> + <source>Transaction amount too small</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Transaction amounts must be positive</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Transaction too large</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+7"/> <source>Use UPnP to map the listening port (default: 0)</source> <translation type="unfinished"/> </message> @@ -2666,7 +2717,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="-46"/> + <location line="-50"/> <source>Password for JSON-RPC connections</source> <translation type="unfinished"/> </message> @@ -2681,17 +2732,17 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="-119"/> + <location line="-120"/> <source>Execute command when the best block changes (%s in cmd is replaced by block hash)</source> <translation type="unfinished"/> </message> <message> - <location line="+142"/> + <location line="+147"/> <source>Upgrade wallet to latest format</source> <translation type="unfinished"/> </message> <message> - <location line="-17"/> + <location line="-21"/> <source>Set key pool size to <n> (default: 100)</source> <translation type="unfinished"/> </message> @@ -2701,12 +2752,12 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+31"/> + <location line="+35"/> <source>Use OpenSSL (https) for JSON-RPC connections</source> <translation type="unfinished"/> </message> <message> - <location line="-22"/> + <location line="-26"/> <source>Server certificate file (default: server.cert)</source> <translation type="unfinished"/> </message> @@ -2716,37 +2767,37 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="-153"/> + <location line="-151"/> <source>Acceptable ciphers (default: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH)</source> <translation type="unfinished"/> </message> <message> - <location line="+166"/> + <location line="+165"/> <source>This help message</source> <translation type="unfinished"/> </message> <message> - <location line="+3"/> + <location line="+6"/> <source>Unable to bind to %s on this computer (bind returned error %d, %s)</source> <translation type="unfinished"/> </message> <message> - <location line="-86"/> + <location line="-91"/> <source>Connect through socks proxy</source> <translation type="unfinished"/> </message> <message> - <location line="-11"/> + <location line="-10"/> <source>Allow DNS lookups for -addnode, -seednode and -connect</source> <translation type="unfinished"/> </message> <message> - <location line="+56"/> + <location line="+55"/> <source>Loading addresses...</source> <translation>Зареждане на адресите...</translation> </message> <message> - <location line="-34"/> + <location line="-35"/> <source>Error loading wallet.dat: Wallet corrupted</source> <translation type="unfinished"/> </message> @@ -2756,22 +2807,22 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+87"/> + <location line="+93"/> <source>Wallet needed to be rewritten: restart Bitcoin to complete</source> <translation type="unfinished"/> </message> <message> - <location line="-89"/> + <location line="-95"/> <source>Error loading wallet.dat</source> <translation type="unfinished"/> </message> <message> - <location line="+29"/> + <location line="+28"/> <source>Invalid -proxy address: '%s'</source> <translation>Невалиден -proxy address: '%s'</translation> </message> <message> - <location line="+49"/> + <location line="+56"/> <source>Unknown network specified in -onlynet: '%s'</source> <translation type="unfinished"/> </message> @@ -2781,7 +2832,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="-91"/> + <location line="-96"/> <source>Cannot resolve -bind address: '%s'</source> <translation type="unfinished"/> </message> @@ -2801,17 +2852,17 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="-4"/> + <location line="-6"/> <source>Insufficient funds</source> <translation type="unfinished"/> </message> <message> - <location line="+8"/> + <location line="+10"/> <source>Loading block index...</source> <translation>Зареждане на блок индекса...</translation> </message> <message> - <location line="-58"/> + <location line="-57"/> <source>Add a node to connect to and attempt to keep the connection open</source> <translation type="unfinished"/> </message> @@ -2821,52 +2872,47 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+67"/> + <location line="+64"/> <source>Fee per KB to add to transactions you send</source> <translation type="unfinished"/> </message> <message> - <location line="+17"/> + <location line="+19"/> <source>Loading wallet...</source> <translation>Зареждане на портфейла...</translation> </message> <message> - <location line="-53"/> + <location line="-52"/> <source>Cannot downgrade wallet</source> <translation type="unfinished"/> </message> <message> - <location line="+1"/> - <source>Cannot initialize keypool</source> - <translation type="unfinished"/> - </message> - <message> <location line="+3"/> <source>Cannot write default address</source> <translation type="unfinished"/> </message> <message> - <location line="+63"/> + <location line="+64"/> <source>Rescanning...</source> <translation>Преразглеждане на последовтелността от блокове...</translation> </message> <message> - <location line="-55"/> + <location line="-57"/> <source>Done loading</source> <translation>Зареждането е завършено</translation> </message> <message> - <location line="+79"/> + <location line="+82"/> <source>To use the %s option</source> <translation type="unfinished"/> </message> <message> - <location line="-71"/> + <location line="-74"/> <source>Error</source> <translation>Грешка</translation> </message> <message> - <location line="-33"/> + <location line="-31"/> <source>You must set rpcpassword=<password> in the configuration file: %s If the file does not exist, create it with owner-readable-only file permissions.</source> diff --git a/src/qt/locale/bitcoin_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 <translation type="unfinished"/> </message> <message> - <location filename="../aboutdialog.cpp" line="+17"/> + <location filename="../aboutdialog.cpp" line="+14"/> <source>Copyright</source> <translation type="unfinished"/> </message> <message> <location line="+0"/> - <source>2009-%1 The Bitcoin developers</source> + <source>The Bitcoin developers</source> <translation type="unfinished"/> </message> </context> @@ -61,7 +61,7 @@ This product includes software developed by the OpenSSL Project for use in the O <translation type="unfinished"/> </message> <message> - <location filename="../addressbookpage.cpp" line="+59"/> + <location filename="../addressbookpage.cpp" line="+63"/> <source>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.</source> <translation type="unfinished"/> </message> @@ -91,7 +91,17 @@ This product includes software developed by the OpenSSL Project for use in the O <translation type="unfinished"/> </message> <message> - <location line="-14"/> + <location line="+27"/> + <source>Export the data in the current tab to a file</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+3"/> + <source>&Export</source> + <translation type="unfinished"/> + </message> + <message> + <location line="-44"/> <source>Verify a message to ensure it was signed with a specified Bitcoin address</source> <translation type="unfinished"/> </message> @@ -313,12 +323,12 @@ This product includes software developed by the OpenSSL Project for use in the O <translation type="unfinished"/> </message> <message> - <location line="+299"/> + <location line="+280"/> <source>Synchronizing with network...</source> <translation type="unfinished"/> </message> <message> - <location line="-368"/> + <location line="-349"/> <source>&Overview</source> <translation type="unfinished"/> </message> @@ -393,7 +403,7 @@ This product includes software developed by the OpenSSL Project for use in the O <translation type="unfinished"/> </message> <message> - <location line="+304"/> + <location line="+285"/> <source>Importing blocks from disk...</source> <translation type="unfinished"/> </message> @@ -403,12 +413,7 @@ This product includes software developed by the OpenSSL Project for use in the O <translation type="unfinished"/> </message> <message> - <location line="-300"/> - <source>&Export...</source> - <translation type="unfinished"/> - </message> - <message> - <location line="-66"/> + <location line="-347"/> <source>Send coins to a Bitcoin address</source> <translation type="unfinished"/> </message> @@ -418,12 +423,7 @@ This product includes software developed by the OpenSSL Project for use in the O <translation type="unfinished"/> </message> <message> - <location line="+18"/> - <source>Export the data in the current tab to a file</source> - <translation type="unfinished"/> - </message> - <message> - <location line="-9"/> + <location line="+9"/> <source>Backup wallet to another location</source> <translation type="unfinished"/> </message> @@ -433,7 +433,7 @@ This product includes software developed by the OpenSSL Project for use in the O <translation type="unfinished"/> </message> <message> - <location line="+9"/> + <location line="+6"/> <source>&Debug window</source> <translation type="unfinished"/> </message> @@ -443,23 +443,23 @@ This product includes software developed by the OpenSSL Project for use in the O <translation type="unfinished"/> </message> <message> - <location line="-7"/> + <location line="-4"/> <source>&Verify message...</source> <translation type="unfinished"/> </message> <message> - <location line="-163"/> - <location line="+541"/> + <location line="-165"/> + <location line="+530"/> <source>Bitcoin</source> <translation type="unfinished"/> </message> <message> - <location line="-541"/> + <location line="-530"/> <source>Wallet</source> <translation type="unfinished"/> </message> <message> - <location line="+99"/> + <location line="+101"/> <source>&Send</source> <translation type="unfinished"/> </message> @@ -504,12 +504,12 @@ This product includes software developed by the OpenSSL Project for use in the O <translation type="unfinished"/> </message> <message> - <location line="+31"/> + <location line="+28"/> <source>&File</source> <translation type="unfinished"/> </message> <message> - <location line="+8"/> + <location line="+7"/> <source>&Settings</source> <translation type="unfinished"/> </message> @@ -524,12 +524,7 @@ This product includes software developed by the OpenSSL Project for use in the O <translation type="unfinished"/> </message> <message> - <location line="+8"/> - <source>Actions toolbar</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+13"/> + <location line="+17"/> <location line="+10"/> <source>[testnet]</source> <translation type="unfinished"/> @@ -540,12 +535,17 @@ This product includes software developed by the OpenSSL Project for use in the O <translation type="unfinished"/> </message> <message numerus="yes"> - <location line="+140"/> + <location line="+141"/> <source>%n active connection(s) to Bitcoin network</source> <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation> </message> <message> - <location line="+39"/> + <location line="+22"/> + <source>No block source available...</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+12"/> <source>Processed %1 of %2 (estimated) blocks of transaction history.</source> <translation type="unfinished"/> </message> @@ -570,7 +570,7 @@ This product includes software developed by the OpenSSL Project for use in the O <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation> </message> <message> - <location line="+5"/> + <location line="+4"/> <source>%1 behind</source> <translation type="unfinished"/> </message> @@ -585,7 +585,7 @@ This product includes software developed by the OpenSSL Project for use in the O <translation type="unfinished"/> </message> <message> - <location line="+21"/> + <location line="+22"/> <source>Error</source> <translation type="unfinished"/> </message> @@ -600,22 +600,22 @@ This product includes software developed by the OpenSSL Project for use in the O <translation type="unfinished"/> </message> <message> - <location line="+68"/> + <location line="+70"/> <source>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?</source> <translation type="unfinished"/> </message> <message> - <location line="-138"/> + <location line="-140"/> <source>Up to date</source> <translation type="unfinished"/> </message> <message> - <location line="+32"/> + <location line="+31"/> <source>Catching up...</source> <translation type="unfinished"/> </message> <message> - <location line="+110"/> + <location line="+113"/> <source>Confirm transaction fee</source> <translation type="unfinished"/> </message> @@ -661,7 +661,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location filename="../bitcoin.cpp" line="+104"/> + <location filename="../bitcoin.cpp" line="+111"/> <source>A fatal error occurred. Bitcoin can no longer continue safely and will quit.</source> <translation type="unfinished"/> </message> @@ -669,7 +669,7 @@ Address: %4 <context> <name>ClientModel</name> <message> - <location filename="../clientmodel.cpp" line="+98"/> + <location filename="../clientmodel.cpp" line="+104"/> <source>Network Alert</source> <translation type="unfinished"/> </message> @@ -800,7 +800,7 @@ Address: %4 </message> <message> <location line="+6"/> - <source>Optional transaction fee per kB that helps make sure your transactions are processed quickly. Most transactions are 1 kB. Fee 0.01 recommended.</source> + <source>Optional transaction fee per kB that helps make sure your transactions are processed quickly. Most transactions are 1 kB.</source> <translation type="unfinished"/> </message> <message> @@ -1050,7 +1050,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location filename="../overviewpage.cpp" line="+115"/> + <location filename="../overviewpage.cpp" line="+116"/> <location line="+1"/> <source>out of sync</source> <translation type="unfinished"/> @@ -1637,6 +1637,19 @@ Address: %4 </message> </context> <context> + <name>SplashScreen</name> + <message> + <location filename="../splashscreen.cpp" line="+22"/> + <source>The Bitcoin developers</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>[testnet]</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>TransactionDesc</name> <message> <location filename="../transactiondesc.cpp" line="+20"/> @@ -2111,9 +2124,27 @@ Address: %4 </message> </context> <context> + <name>WalletModel</name> + <message> + <location filename="../walletmodel.cpp" line="+193"/> + <source>Send Coins</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>WalletView</name> <message> - <location filename="../walletview.cpp" line="+247"/> + <location filename="../walletview.cpp" line="+42"/> + <source>&Export</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Export the data in the current tab to a file</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+193"/> <source>Backup Wallet</source> <translation type="unfinished"/> </message> @@ -2146,37 +2177,37 @@ Address: %4 <context> <name>bitcoin-core</name> <message> - <location filename="../bitcoinstrings.cpp" line="+96"/> + <location filename="../bitcoinstrings.cpp" line="+94"/> <source>Bitcoin version</source> <translation type="unfinished"/> </message> <message> - <location line="+98"/> + <location line="+102"/> <source>Usage:</source> <translation type="unfinished"/> </message> <message> - <location line="-25"/> + <location line="-29"/> <source>Send command to -server or bitcoind</source> <translation type="unfinished"/> </message> <message> - <location line="-22"/> + <location line="-23"/> <source>List commands</source> <translation type="unfinished"/> </message> <message> - <location line="-10"/> + <location line="-12"/> <source>Get help for a command</source> <translation type="unfinished"/> </message> <message> - <location line="+21"/> + <location line="+24"/> <source>Options:</source> <translation type="unfinished"/> </message> <message> - <location line="+23"/> + <location line="+24"/> <source>Specify configuration file (default: bitcoin.conf)</source> <translation type="unfinished"/> </message> @@ -2186,27 +2217,17 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="-48"/> - <source>Generate coins</source> - <translation type="unfinished"/> - </message> - <message> - <location line="-27"/> - <source>Don't generate coins</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+74"/> + <location line="-1"/> <source>Specify data directory</source> <translation type="unfinished"/> </message> <message> - <location line="-8"/> + <location line="-9"/> <source>Set database cache size in megabytes (default: 25)</source> <translation type="unfinished"/> </message> <message> - <location line="-27"/> + <location line="-28"/> <source>Listen for connections on <port> (default: 8333 or testnet: 18333)</source> <translation type="unfinished"/> </message> @@ -2221,7 +2242,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+80"/> + <location line="+82"/> <source>Specify your own public address</source> <translation type="unfinished"/> </message> @@ -2231,22 +2252,22 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="-132"/> + <location line="-134"/> <source>Number of seconds to keep misbehaving peers from reconnecting (default: 86400)</source> <translation type="unfinished"/> </message> <message> - <location line="-32"/> + <location line="-29"/> <source>An error occurred while setting up the RPC port %u for listening on IPv4: %s</source> <translation type="unfinished"/> </message> <message> - <location line="+30"/> + <location line="+27"/> <source>Listen for JSON-RPC connections on <port> (default: 8332 or testnet: 18332)</source> <translation type="unfinished"/> </message> <message> - <location line="+36"/> + <location line="+37"/> <source>Accept command line and JSON-RPC commands</source> <translation type="unfinished"/> </message> @@ -2256,17 +2277,17 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+33"/> + <location line="+37"/> <source>Use the test network</source> <translation type="unfinished"/> </message> <message> - <location line="-108"/> + <location line="-112"/> <source>Accept connections from outside (default: 1 if no -proxy or -connect)</source> <translation type="unfinished"/> </message> <message> - <location line="-82"/> + <location line="-80"/> <source>%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. </message> <message> <location line="+3"/> - <source>Error initializing database environment %s! To recover, BACKUP THAT DIRECTORY, then remove everything from it except for wallet.dat.</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+3"/> <source>Error: The transaction was rejected! This might happen if some of the coins in your wallet were already spent, such as if you used a copy of wallet.dat and coins were spent in the copy but not marked as spent here.</source> <translation type="unfinished"/> </message> @@ -2326,12 +2342,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+3"/> - <source>Set the number of script verification threads (1-16, 0=auto, default: 0)</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+2"/> + <location line="+6"/> <source>This is a pre-release test build - use at your own risk - do not use for mining or merchant applications</source> <translation type="unfinished"/> </message> @@ -2371,7 +2382,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+6"/> + <location line="+5"/> <source>Connect only to the specified node(s)</source> <translation type="unfinished"/> </message> @@ -2391,7 +2402,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+3"/> + <location line="+2"/> <source>Error initializing block database</source> <translation type="unfinished"/> </message> @@ -2417,11 +2428,6 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. </message> <message> <location line="+1"/> - <source>Error: Transaction creation failed!</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+1"/> <source>Error: Wallet locked, unable to create transaction!</source> <translation type="unfinished"/> </message> @@ -2491,7 +2497,12 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+3"/> + <location line="+1"/> + <source>Generate coins (default: 0)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+2"/> <source>How many blocks to check at startup (default: 288, 0 = all)</source> <translation type="unfinished"/> </message> @@ -2501,7 +2512,12 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+24"/> + <location line="+19"/> + <source>Not enough file descriptors available.</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+8"/> <source>Rebuild block chain index from current blk000??.dat files</source> <translation type="unfinished"/> </message> @@ -2511,7 +2527,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+22"/> + <location line="+26"/> <source>Verifying blocks...</source> <translation type="unfinished"/> </message> @@ -2521,12 +2537,17 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="-62"/> + <location line="-69"/> <source>Imports blocks from external blk000??.dat file</source> <translation type="unfinished"/> </message> <message> - <location line="+1"/> + <location line="-76"/> + <source>Set the number of script verification threads (up to 16, 0 = auto, <0 = leave that many cores free, default: 0)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+77"/> <source>Information</source> <translation type="unfinished"/> </message> @@ -2536,6 +2557,16 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> + <location line="+1"/> + <source>Invalid amount for -minrelaytxfee=<amount>: '%s'</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Invalid amount for -mintxfee=<amount>: '%s'</source> + <translation type="unfinished"/> + </message> + <message> <location line="+8"/> <source>Maintain a full transaction index (default: 0)</source> <translation type="unfinished"/> @@ -2551,7 +2582,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+1"/> + <location line="+2"/> <source>Only accept block chain matching built-in checkpoints (default: 1)</source> <translation type="unfinished"/> </message> @@ -2611,6 +2642,11 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> + <location line="+1"/> + <source>Signing transaction failed</source> + <translation type="unfinished"/> + </message> + <message> <location line="+2"/> <source>Specify connection timeout in milliseconds (default: 5000)</source> <translation type="unfinished"/> @@ -2621,7 +2657,22 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+10"/> + <location line="+4"/> + <source>Transaction amount too small</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Transaction amounts must be positive</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Transaction too large</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+7"/> <source>Use UPnP to map the listening port (default: 0)</source> <translation type="unfinished"/> </message> @@ -2661,7 +2712,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="-46"/> + <location line="-50"/> <source>Password for JSON-RPC connections</source> <translation type="unfinished"/> </message> @@ -2676,17 +2727,17 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="-119"/> + <location line="-120"/> <source>Execute command when the best block changes (%s in cmd is replaced by block hash)</source> <translation type="unfinished"/> </message> <message> - <location line="+142"/> + <location line="+147"/> <source>Upgrade wallet to latest format</source> <translation type="unfinished"/> </message> <message> - <location line="-17"/> + <location line="-21"/> <source>Set key pool size to <n> (default: 100)</source> <translation type="unfinished"/> </message> @@ -2696,12 +2747,12 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+31"/> + <location line="+35"/> <source>Use OpenSSL (https) for JSON-RPC connections</source> <translation type="unfinished"/> </message> <message> - <location line="-22"/> + <location line="-26"/> <source>Server certificate file (default: server.cert)</source> <translation type="unfinished"/> </message> @@ -2711,37 +2762,37 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="-153"/> + <location line="-151"/> <source>Acceptable ciphers (default: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH)</source> <translation type="unfinished"/> </message> <message> - <location line="+166"/> + <location line="+165"/> <source>This help message</source> <translation type="unfinished"/> </message> <message> - <location line="+3"/> + <location line="+6"/> <source>Unable to bind to %s on this computer (bind returned error %d, %s)</source> <translation type="unfinished"/> </message> <message> - <location line="-86"/> + <location line="-91"/> <source>Connect through socks proxy</source> <translation type="unfinished"/> </message> <message> - <location line="-11"/> + <location line="-10"/> <source>Allow DNS lookups for -addnode, -seednode and -connect</source> <translation type="unfinished"/> </message> <message> - <location line="+56"/> + <location line="+55"/> <source>Loading addresses...</source> <translation type="unfinished"/> </message> <message> - <location line="-34"/> + <location line="-35"/> <source>Error loading wallet.dat: Wallet corrupted</source> <translation type="unfinished"/> </message> @@ -2751,22 +2802,22 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+87"/> + <location line="+93"/> <source>Wallet needed to be rewritten: restart Bitcoin to complete</source> <translation type="unfinished"/> </message> <message> - <location line="-89"/> + <location line="-95"/> <source>Error loading wallet.dat</source> <translation type="unfinished"/> </message> <message> - <location line="+29"/> + <location line="+28"/> <source>Invalid -proxy address: '%s'</source> <translation type="unfinished"/> </message> <message> - <location line="+49"/> + <location line="+56"/> <source>Unknown network specified in -onlynet: '%s'</source> <translation type="unfinished"/> </message> @@ -2776,7 +2827,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="-91"/> + <location line="-96"/> <source>Cannot resolve -bind address: '%s'</source> <translation type="unfinished"/> </message> @@ -2796,17 +2847,17 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="-4"/> + <location line="-6"/> <source>Insufficient funds</source> <translation type="unfinished"/> </message> <message> - <location line="+8"/> + <location line="+10"/> <source>Loading block index...</source> <translation type="unfinished"/> </message> <message> - <location line="-58"/> + <location line="-57"/> <source>Add a node to connect to and attempt to keep the connection open</source> <translation type="unfinished"/> </message> @@ -2816,52 +2867,47 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+67"/> + <location line="+64"/> <source>Fee per KB to add to transactions you send</source> <translation type="unfinished"/> </message> <message> - <location line="+17"/> + <location line="+19"/> <source>Loading wallet...</source> <translation type="unfinished"/> </message> <message> - <location line="-53"/> + <location line="-52"/> <source>Cannot downgrade wallet</source> <translation type="unfinished"/> </message> <message> - <location line="+1"/> - <source>Cannot initialize keypool</source> - <translation type="unfinished"/> - </message> - <message> <location line="+3"/> <source>Cannot write default address</source> <translation type="unfinished"/> </message> <message> - <location line="+63"/> + <location line="+64"/> <source>Rescanning...</source> <translation type="unfinished"/> </message> <message> - <location line="-55"/> + <location line="-57"/> <source>Done loading</source> <translation type="unfinished"/> </message> <message> - <location line="+79"/> + <location line="+82"/> <source>To use the %s option</source> <translation type="unfinished"/> </message> <message> - <location line="-71"/> + <location line="-74"/> <source>Error</source> <translation type="unfinished"/> </message> <message> - <location line="-33"/> + <location line="-31"/> <source>You must set rpcpassword=<password> in the configuration file: %s If the file does not exist, create it with owner-readable-only file permissions.</source> diff --git a/src/qt/locale/bitcoin_ca.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 <translation type="unfinished"/> </message> <message> - <location filename="../aboutdialog.cpp" line="+17"/> + <location filename="../aboutdialog.cpp" line="+14"/> <source>Copyright</source> <translation type="unfinished"/> </message> <message> <location line="+0"/> - <source>2009-%1 The Bitcoin developers</source> + <source>The Bitcoin developers</source> <translation type="unfinished"/> </message> </context> @@ -61,7 +61,7 @@ This product includes software developed by the OpenSSL Project for use in the O <translation type="unfinished"/> </message> <message> - <location filename="../addressbookpage.cpp" line="+59"/> + <location filename="../addressbookpage.cpp" line="+63"/> <source>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.</source> <translation type="unfinished"/> </message> @@ -91,7 +91,17 @@ This product includes software developed by the OpenSSL Project for use in the O <translation type="unfinished"/> </message> <message> - <location line="-14"/> + <location line="+27"/> + <source>Export the data in the current tab to a file</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+3"/> + <source>&Export</source> + <translation type="unfinished"/> + </message> + <message> + <location line="-44"/> <source>Verify a message to ensure it was signed with a specified Bitcoin address</source> <translation type="unfinished"/> </message> @@ -313,12 +323,12 @@ This product includes software developed by the OpenSSL Project for use in the O <translation type="unfinished"/> </message> <message> - <location line="+299"/> + <location line="+280"/> <source>Synchronizing with network...</source> <translation type="unfinished"/> </message> <message> - <location line="-368"/> + <location line="-349"/> <source>&Overview</source> <translation type="unfinished"/> </message> @@ -393,7 +403,7 @@ This product includes software developed by the OpenSSL Project for use in the O <translation type="unfinished"/> </message> <message> - <location line="+304"/> + <location line="+285"/> <source>Importing blocks from disk...</source> <translation type="unfinished"/> </message> @@ -403,12 +413,7 @@ This product includes software developed by the OpenSSL Project for use in the O <translation type="unfinished"/> </message> <message> - <location line="-300"/> - <source>&Export...</source> - <translation type="unfinished"/> - </message> - <message> - <location line="-66"/> + <location line="-347"/> <source>Send coins to a Bitcoin address</source> <translation type="unfinished"/> </message> @@ -418,12 +423,7 @@ This product includes software developed by the OpenSSL Project for use in the O <translation type="unfinished"/> </message> <message> - <location line="+18"/> - <source>Export the data in the current tab to a file</source> - <translation type="unfinished"/> - </message> - <message> - <location line="-9"/> + <location line="+9"/> <source>Backup wallet to another location</source> <translation type="unfinished"/> </message> @@ -433,7 +433,7 @@ This product includes software developed by the OpenSSL Project for use in the O <translation type="unfinished"/> </message> <message> - <location line="+9"/> + <location line="+6"/> <source>&Debug window</source> <translation type="unfinished"/> </message> @@ -443,23 +443,23 @@ This product includes software developed by the OpenSSL Project for use in the O <translation type="unfinished"/> </message> <message> - <location line="-7"/> + <location line="-4"/> <source>&Verify message...</source> <translation type="unfinished"/> </message> <message> - <location line="-163"/> - <location line="+541"/> + <location line="-165"/> + <location line="+530"/> <source>Bitcoin</source> <translation type="unfinished"/> </message> <message> - <location line="-541"/> + <location line="-530"/> <source>Wallet</source> <translation type="unfinished"/> </message> <message> - <location line="+99"/> + <location line="+101"/> <source>&Send</source> <translation type="unfinished"/> </message> @@ -504,12 +504,12 @@ This product includes software developed by the OpenSSL Project for use in the O <translation type="unfinished"/> </message> <message> - <location line="+31"/> + <location line="+28"/> <source>&File</source> <translation type="unfinished"/> </message> <message> - <location line="+8"/> + <location line="+7"/> <source>&Settings</source> <translation type="unfinished"/> </message> @@ -524,12 +524,7 @@ This product includes software developed by the OpenSSL Project for use in the O <translation type="unfinished"/> </message> <message> - <location line="+8"/> - <source>Actions toolbar</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+13"/> + <location line="+17"/> <location line="+10"/> <source>[testnet]</source> <translation type="unfinished"/> @@ -540,12 +535,17 @@ This product includes software developed by the OpenSSL Project for use in the O <translation type="unfinished"/> </message> <message numerus="yes"> - <location line="+140"/> + <location line="+141"/> <source>%n active connection(s) to Bitcoin network</source> <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation> </message> <message> - <location line="+39"/> + <location line="+22"/> + <source>No block source available...</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+12"/> <source>Processed %1 of %2 (estimated) blocks of transaction history.</source> <translation type="unfinished"/> </message> @@ -570,7 +570,7 @@ This product includes software developed by the OpenSSL Project for use in the O <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation> </message> <message> - <location line="+5"/> + <location line="+4"/> <source>%1 behind</source> <translation type="unfinished"/> </message> @@ -585,7 +585,7 @@ This product includes software developed by the OpenSSL Project for use in the O <translation type="unfinished"/> </message> <message> - <location line="+21"/> + <location line="+22"/> <source>Error</source> <translation type="unfinished"/> </message> @@ -600,22 +600,22 @@ This product includes software developed by the OpenSSL Project for use in the O <translation type="unfinished"/> </message> <message> - <location line="+68"/> + <location line="+70"/> <source>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?</source> <translation type="unfinished"/> </message> <message> - <location line="-138"/> + <location line="-140"/> <source>Up to date</source> <translation type="unfinished"/> </message> <message> - <location line="+32"/> + <location line="+31"/> <source>Catching up...</source> <translation type="unfinished"/> </message> <message> - <location line="+110"/> + <location line="+113"/> <source>Confirm transaction fee</source> <translation type="unfinished"/> </message> @@ -661,7 +661,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location filename="../bitcoin.cpp" line="+104"/> + <location filename="../bitcoin.cpp" line="+111"/> <source>A fatal error occurred. Bitcoin can no longer continue safely and will quit.</source> <translation type="unfinished"/> </message> @@ -669,7 +669,7 @@ Address: %4 <context> <name>ClientModel</name> <message> - <location filename="../clientmodel.cpp" line="+98"/> + <location filename="../clientmodel.cpp" line="+104"/> <source>Network Alert</source> <translation type="unfinished"/> </message> @@ -800,7 +800,7 @@ Address: %4 </message> <message> <location line="+6"/> - <source>Optional transaction fee per kB that helps make sure your transactions are processed quickly. Most transactions are 1 kB. Fee 0.01 recommended.</source> + <source>Optional transaction fee per kB that helps make sure your transactions are processed quickly. Most transactions are 1 kB.</source> <translation type="unfinished"/> </message> <message> @@ -1050,7 +1050,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location filename="../overviewpage.cpp" line="+115"/> + <location filename="../overviewpage.cpp" line="+116"/> <location line="+1"/> <source>out of sync</source> <translation type="unfinished"/> @@ -1637,6 +1637,19 @@ Address: %4 </message> </context> <context> + <name>SplashScreen</name> + <message> + <location filename="../splashscreen.cpp" line="+22"/> + <source>The Bitcoin developers</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>[testnet]</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>TransactionDesc</name> <message> <location filename="../transactiondesc.cpp" line="+20"/> @@ -2111,9 +2124,27 @@ Address: %4 </message> </context> <context> + <name>WalletModel</name> + <message> + <location filename="../walletmodel.cpp" line="+193"/> + <source>Send Coins</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>WalletView</name> <message> - <location filename="../walletview.cpp" line="+247"/> + <location filename="../walletview.cpp" line="+42"/> + <source>&Export</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Export the data in the current tab to a file</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+193"/> <source>Backup Wallet</source> <translation type="unfinished"/> </message> @@ -2146,37 +2177,37 @@ Address: %4 <context> <name>bitcoin-core</name> <message> - <location filename="../bitcoinstrings.cpp" line="+96"/> + <location filename="../bitcoinstrings.cpp" line="+94"/> <source>Bitcoin version</source> <translation type="unfinished"/> </message> <message> - <location line="+98"/> + <location line="+102"/> <source>Usage:</source> <translation type="unfinished"/> </message> <message> - <location line="-25"/> + <location line="-29"/> <source>Send command to -server or bitcoind</source> <translation type="unfinished"/> </message> <message> - <location line="-22"/> + <location line="-23"/> <source>List commands</source> <translation type="unfinished"/> </message> <message> - <location line="-10"/> + <location line="-12"/> <source>Get help for a command</source> <translation type="unfinished"/> </message> <message> - <location line="+21"/> + <location line="+24"/> <source>Options:</source> <translation type="unfinished"/> </message> <message> - <location line="+23"/> + <location line="+24"/> <source>Specify configuration file (default: bitcoin.conf)</source> <translation type="unfinished"/> </message> @@ -2186,27 +2217,17 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="-48"/> - <source>Generate coins</source> - <translation type="unfinished"/> - </message> - <message> - <location line="-27"/> - <source>Don't generate coins</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+74"/> + <location line="-1"/> <source>Specify data directory</source> <translation type="unfinished"/> </message> <message> - <location line="-8"/> + <location line="-9"/> <source>Set database cache size in megabytes (default: 25)</source> <translation type="unfinished"/> </message> <message> - <location line="-27"/> + <location line="-28"/> <source>Listen for connections on <port> (default: 8333 or testnet: 18333)</source> <translation type="unfinished"/> </message> @@ -2221,7 +2242,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+80"/> + <location line="+82"/> <source>Specify your own public address</source> <translation type="unfinished"/> </message> @@ -2231,22 +2252,22 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="-132"/> + <location line="-134"/> <source>Number of seconds to keep misbehaving peers from reconnecting (default: 86400)</source> <translation type="unfinished"/> </message> <message> - <location line="-32"/> + <location line="-29"/> <source>An error occurred while setting up the RPC port %u for listening on IPv4: %s</source> <translation type="unfinished"/> </message> <message> - <location line="+30"/> + <location line="+27"/> <source>Listen for JSON-RPC connections on <port> (default: 8332 or testnet: 18332)</source> <translation type="unfinished"/> </message> <message> - <location line="+36"/> + <location line="+37"/> <source>Accept command line and JSON-RPC commands</source> <translation type="unfinished"/> </message> @@ -2256,17 +2277,17 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+33"/> + <location line="+37"/> <source>Use the test network</source> <translation type="unfinished"/> </message> <message> - <location line="-108"/> + <location line="-112"/> <source>Accept connections from outside (default: 1 if no -proxy or -connect)</source> <translation type="unfinished"/> </message> <message> - <location line="-82"/> + <location line="-80"/> <source>%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. </message> <message> <location line="+3"/> - <source>Error initializing database environment %s! To recover, BACKUP THAT DIRECTORY, then remove everything from it except for wallet.dat.</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+3"/> <source>Error: The transaction was rejected! This might happen if some of the coins in your wallet were already spent, such as if you used a copy of wallet.dat and coins were spent in the copy but not marked as spent here.</source> <translation type="unfinished"/> </message> @@ -2326,12 +2342,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+3"/> - <source>Set the number of script verification threads (1-16, 0=auto, default: 0)</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+2"/> + <location line="+6"/> <source>This is a pre-release test build - use at your own risk - do not use for mining or merchant applications</source> <translation type="unfinished"/> </message> @@ -2371,7 +2382,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+6"/> + <location line="+5"/> <source>Connect only to the specified node(s)</source> <translation type="unfinished"/> </message> @@ -2391,7 +2402,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+3"/> + <location line="+2"/> <source>Error initializing block database</source> <translation type="unfinished"/> </message> @@ -2417,11 +2428,6 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. </message> <message> <location line="+1"/> - <source>Error: Transaction creation failed!</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+1"/> <source>Error: Wallet locked, unable to create transaction!</source> <translation type="unfinished"/> </message> @@ -2491,7 +2497,12 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+3"/> + <location line="+1"/> + <source>Generate coins (default: 0)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+2"/> <source>How many blocks to check at startup (default: 288, 0 = all)</source> <translation type="unfinished"/> </message> @@ -2501,7 +2512,12 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+24"/> + <location line="+19"/> + <source>Not enough file descriptors available.</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+8"/> <source>Rebuild block chain index from current blk000??.dat files</source> <translation type="unfinished"/> </message> @@ -2511,7 +2527,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+22"/> + <location line="+26"/> <source>Verifying blocks...</source> <translation type="unfinished"/> </message> @@ -2521,12 +2537,17 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="-62"/> + <location line="-69"/> <source>Imports blocks from external blk000??.dat file</source> <translation type="unfinished"/> </message> <message> - <location line="+1"/> + <location line="-76"/> + <source>Set the number of script verification threads (up to 16, 0 = auto, <0 = leave that many cores free, default: 0)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+77"/> <source>Information</source> <translation type="unfinished"/> </message> @@ -2536,6 +2557,16 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> + <location line="+1"/> + <source>Invalid amount for -minrelaytxfee=<amount>: '%s'</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Invalid amount for -mintxfee=<amount>: '%s'</source> + <translation type="unfinished"/> + </message> + <message> <location line="+8"/> <source>Maintain a full transaction index (default: 0)</source> <translation type="unfinished"/> @@ -2551,7 +2582,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+1"/> + <location line="+2"/> <source>Only accept block chain matching built-in checkpoints (default: 1)</source> <translation type="unfinished"/> </message> @@ -2611,6 +2642,11 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> + <location line="+1"/> + <source>Signing transaction failed</source> + <translation type="unfinished"/> + </message> + <message> <location line="+2"/> <source>Specify connection timeout in milliseconds (default: 5000)</source> <translation type="unfinished"/> @@ -2621,7 +2657,22 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+10"/> + <location line="+4"/> + <source>Transaction amount too small</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Transaction amounts must be positive</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Transaction too large</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+7"/> <source>Use UPnP to map the listening port (default: 0)</source> <translation type="unfinished"/> </message> @@ -2661,7 +2712,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="-46"/> + <location line="-50"/> <source>Password for JSON-RPC connections</source> <translation type="unfinished"/> </message> @@ -2676,17 +2727,17 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="-119"/> + <location line="-120"/> <source>Execute command when the best block changes (%s in cmd is replaced by block hash)</source> <translation type="unfinished"/> </message> <message> - <location line="+142"/> + <location line="+147"/> <source>Upgrade wallet to latest format</source> <translation type="unfinished"/> </message> <message> - <location line="-17"/> + <location line="-21"/> <source>Set key pool size to <n> (default: 100)</source> <translation type="unfinished"/> </message> @@ -2696,12 +2747,12 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+31"/> + <location line="+35"/> <source>Use OpenSSL (https) for JSON-RPC connections</source> <translation type="unfinished"/> </message> <message> - <location line="-22"/> + <location line="-26"/> <source>Server certificate file (default: server.cert)</source> <translation type="unfinished"/> </message> @@ -2711,37 +2762,37 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="-153"/> + <location line="-151"/> <source>Acceptable ciphers (default: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH)</source> <translation type="unfinished"/> </message> <message> - <location line="+166"/> + <location line="+165"/> <source>This help message</source> <translation type="unfinished"/> </message> <message> - <location line="+3"/> + <location line="+6"/> <source>Unable to bind to %s on this computer (bind returned error %d, %s)</source> <translation type="unfinished"/> </message> <message> - <location line="-86"/> + <location line="-91"/> <source>Connect through socks proxy</source> <translation type="unfinished"/> </message> <message> - <location line="-11"/> + <location line="-10"/> <source>Allow DNS lookups for -addnode, -seednode and -connect</source> <translation type="unfinished"/> </message> <message> - <location line="+56"/> + <location line="+55"/> <source>Loading addresses...</source> <translation type="unfinished"/> </message> <message> - <location line="-34"/> + <location line="-35"/> <source>Error loading wallet.dat: Wallet corrupted</source> <translation type="unfinished"/> </message> @@ -2751,22 +2802,22 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+87"/> + <location line="+93"/> <source>Wallet needed to be rewritten: restart Bitcoin to complete</source> <translation type="unfinished"/> </message> <message> - <location line="-89"/> + <location line="-95"/> <source>Error loading wallet.dat</source> <translation type="unfinished"/> </message> <message> - <location line="+29"/> + <location line="+28"/> <source>Invalid -proxy address: '%s'</source> <translation type="unfinished"/> </message> <message> - <location line="+49"/> + <location line="+56"/> <source>Unknown network specified in -onlynet: '%s'</source> <translation type="unfinished"/> </message> @@ -2776,7 +2827,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="-91"/> + <location line="-96"/> <source>Cannot resolve -bind address: '%s'</source> <translation type="unfinished"/> </message> @@ -2796,17 +2847,17 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="-4"/> + <location line="-6"/> <source>Insufficient funds</source> <translation type="unfinished"/> </message> <message> - <location line="+8"/> + <location line="+10"/> <source>Loading block index...</source> <translation type="unfinished"/> </message> <message> - <location line="-58"/> + <location line="-57"/> <source>Add a node to connect to and attempt to keep the connection open</source> <translation type="unfinished"/> </message> @@ -2816,52 +2867,47 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+67"/> + <location line="+64"/> <source>Fee per KB to add to transactions you send</source> <translation type="unfinished"/> </message> <message> - <location line="+17"/> + <location line="+19"/> <source>Loading wallet...</source> <translation type="unfinished"/> </message> <message> - <location line="-53"/> + <location line="-52"/> <source>Cannot downgrade wallet</source> <translation type="unfinished"/> </message> <message> - <location line="+1"/> - <source>Cannot initialize keypool</source> - <translation type="unfinished"/> - </message> - <message> <location line="+3"/> <source>Cannot write default address</source> <translation type="unfinished"/> </message> <message> - <location line="+63"/> + <location line="+64"/> <source>Rescanning...</source> <translation type="unfinished"/> </message> <message> - <location line="-55"/> + <location line="-57"/> <source>Done loading</source> <translation type="unfinished"/> </message> <message> - <location line="+79"/> + <location line="+82"/> <source>To use the %s option</source> <translation type="unfinished"/> </message> <message> - <location line="-71"/> + <location line="-74"/> <source>Error</source> <translation type="unfinished"/> </message> <message> - <location line="-33"/> + <location line="-31"/> <source>You must set rpcpassword=<password> in the configuration file: %s If the file does not exist, create it with owner-readable-only file permissions.</source> diff --git a/src/qt/locale/bitcoin_ca_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 <translation>\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.</translation> </message> <message> - <location filename="../aboutdialog.cpp" line="+17"/> + <location filename="../aboutdialog.cpp" line="+14"/> <source>Copyright</source> <translation>Copyright</translation> </message> <message> <location line="+0"/> - <source>2009-%1 The Bitcoin developers</source> - <translation>2009-%1 Els creadors de Bitcoin</translation> + <source>The Bitcoin developers</source> + <translation type="unfinished"/> </message> </context> <context> @@ -61,7 +61,7 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>&Nova adreça</translation> </message> <message> - <location filename="../addressbookpage.cpp" line="+59"/> + <location filename="../addressbookpage.cpp" line="+63"/> <source>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.</source> <translation>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.</translation> </message> @@ -91,7 +91,17 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>Esborrar l'adreça sel·leccionada</translation> </message> <message> - <location line="-14"/> + <location line="+27"/> + <source>Export the data in the current tab to a file</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+3"/> + <source>&Export</source> + <translation type="unfinished"/> + </message> + <message> + <location line="-44"/> <source>Verify a message to ensure it was signed with a specified Bitcoin address</source> <translation>Verificar un missatge per asegurar-se que ha estat signat amb una adreça Bitcoin específica</translation> </message> @@ -313,12 +323,12 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>Signar &missatge...</translation> </message> <message> - <location line="+299"/> + <location line="+280"/> <source>Synchronizing with network...</source> <translation>Sincronitzant amb la xarxa ...</translation> </message> <message> - <location line="-368"/> + <location line="-349"/> <source>&Overview</source> <translation>&Panorama general</translation> </message> @@ -393,7 +403,7 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>&Canviar contrasenya...</translation> </message> <message> - <location line="+304"/> + <location line="+285"/> <source>Importing blocks from disk...</source> <translation>Important blocs del disc..</translation> </message> @@ -403,12 +413,7 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>Re-indexant blocs al disc...</translation> </message> <message> - <location line="-300"/> - <source>&Export...</source> - <translation>&Exporta...</translation> - </message> - <message> - <location line="-66"/> + <location line="-347"/> <source>Send coins to a Bitcoin address</source> <translation>Enviar monedes a una adreça Bitcoin</translation> </message> @@ -418,12 +423,7 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>Modificar les opcions de configuració per bitcoin</translation> </message> <message> - <location line="+18"/> - <source>Export the data in the current tab to a file</source> - <translation>Exportar dades de la pestanya actual a un fitxer</translation> - </message> - <message> - <location line="-9"/> + <location line="+9"/> <source>Backup wallet to another location</source> <translation>Realitzar còpia de seguretat del moneder a un altre directori</translation> </message> @@ -433,7 +433,7 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>Canviar la constrasenya d'encriptació del moneder</translation> </message> <message> - <location line="+9"/> + <location line="+6"/> <source>&Debug window</source> <translation>&Finestra de debug</translation> </message> @@ -443,23 +443,23 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>Obrir la consola de diagnòstic i debugging</translation> </message> <message> - <location line="-7"/> + <location line="-4"/> <source>&Verify message...</source> <translation>&Verifica el missatge..</translation> </message> <message> - <location line="-163"/> - <location line="+541"/> + <location line="-165"/> + <location line="+530"/> <source>Bitcoin</source> <translation>Bitcoin</translation> </message> <message> - <location line="-541"/> + <location line="-530"/> <source>Wallet</source> <translation>Moneder</translation> </message> <message> - <location line="+99"/> + <location line="+101"/> <source>&Send</source> <translation>&Enviar</translation> </message> @@ -504,12 +504,12 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>Verificar els missatges per assegurar-te que han estat signades amb una adreça Bitcoin específica.</translation> </message> <message> - <location line="+31"/> + <location line="+28"/> <source>&File</source> <translation>&Arxiu</translation> </message> <message> - <location line="+8"/> + <location line="+7"/> <source>&Settings</source> <translation>&Configuració</translation> </message> @@ -524,12 +524,7 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>Barra d'eines de seccions</translation> </message> <message> - <location line="+8"/> - <source>Actions toolbar</source> - <translation>Barra d'eines d'accions</translation> - </message> - <message> - <location line="+13"/> + <location line="+17"/> <location line="+10"/> <source>[testnet]</source> <translation>[testnet]</translation> @@ -540,12 +535,17 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>Client Bitcoin</translation> </message> <message numerus="yes"> - <location line="+140"/> + <location line="+141"/> <source>%n active connection(s) to Bitcoin network</source> <translation><numerusform>%n connexió activa a la xarxa Bitcoin</numerusform><numerusform>%n connexions actives a la xarxa Bitcoin</numerusform></translation> </message> <message> - <location line="+39"/> + <location line="+22"/> + <source>No block source available...</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+12"/> <source>Processed %1 of %2 (estimated) blocks of transaction history.</source> <translation>Processat el %1 de %2 (estimat) dels blocs del històric de transaccions.</translation> </message> @@ -570,7 +570,7 @@ This product includes software developed by the OpenSSL Project for use in the O <translation><numerusform>%n setmana</numerusform><numerusform>%n setmanes</numerusform></translation> </message> <message> - <location line="+5"/> + <location line="+4"/> <source>%1 behind</source> <translation>%1 radera</translation> </message> @@ -585,7 +585,7 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>Les transaccions a partir d'això no seràn visibles.</translation> </message> <message> - <location line="+21"/> + <location line="+22"/> <source>Error</source> <translation>Error</translation> </message> @@ -600,22 +600,22 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>Informació</translation> </message> <message> - <location line="+68"/> + <location line="+70"/> <source>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?</source> <translation>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ó?</translation> </message> <message> - <location line="-138"/> + <location line="-140"/> <source>Up to date</source> <translation>Al dia</translation> </message> <message> - <location line="+32"/> + <location line="+31"/> <source>Catching up...</source> <translation>Posar-se al dia ...</translation> </message> <message> - <location line="+110"/> + <location line="+113"/> <source>Confirm transaction fee</source> <translation>Confirmar comisió de transacció</translation> </message> @@ -661,7 +661,7 @@ Address: %4 <translation>El moneder està <b>encriptat</b> i actualment <b>bloquejat</b></translation> </message> <message> - <location filename="../bitcoin.cpp" line="+104"/> + <location filename="../bitcoin.cpp" line="+111"/> <source>A fatal error occurred. Bitcoin can no longer continue safely and will quit.</source> <translation>Ha tingut lloc un error fatal. Bitcoin no pot continuar executant-se de manera segura i es tancará.</translation> </message> @@ -669,7 +669,7 @@ Address: %4 <context> <name>ClientModel</name> <message> - <location filename="../clientmodel.cpp" line="+98"/> + <location filename="../clientmodel.cpp" line="+104"/> <source>Network Alert</source> <translation>Alerta de xarxa</translation> </message> @@ -800,8 +800,8 @@ Address: %4 </message> <message> <location line="+6"/> - <source>Optional transaction fee per kB that helps make sure your transactions are processed quickly. Most transactions are 1 kB. Fee 0.01 recommended.</source> - <translation>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.</translation> + <source>Optional transaction fee per kB that helps make sure your transactions are processed quickly. Most transactions are 1 kB.</source> + <translation type="unfinished"/> </message> <message> <location line="+15"/> @@ -1050,7 +1050,7 @@ Address: %4 <translation>Total de transaccions encara sense confirmar, que encara no es content en el balanç actual</translation> </message> <message> - <location filename="../overviewpage.cpp" line="+115"/> + <location filename="../overviewpage.cpp" line="+116"/> <location line="+1"/> <source>out of sync</source> <translation>Fora de sincronia</translation> @@ -1637,6 +1637,19 @@ Address: %4 </message> </context> <context> + <name>SplashScreen</name> + <message> + <location filename="../splashscreen.cpp" line="+22"/> + <source>The Bitcoin developers</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>[testnet]</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>TransactionDesc</name> <message> <location filename="../transactiondesc.cpp" line="+20"/> @@ -2111,9 +2124,27 @@ Address: %4 </message> </context> <context> + <name>WalletModel</name> + <message> + <location filename="../walletmodel.cpp" line="+193"/> + <source>Send Coins</source> + <translation>Enviar monedes</translation> + </message> +</context> +<context> <name>WalletView</name> <message> - <location filename="../walletview.cpp" line="+247"/> + <location filename="../walletview.cpp" line="+42"/> + <source>&Export</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Export the data in the current tab to a file</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+193"/> <source>Backup Wallet</source> <translation>Realitzar còpia de seguretat del moneder</translation> </message> @@ -2146,37 +2177,37 @@ Address: %4 <context> <name>bitcoin-core</name> <message> - <location filename="../bitcoinstrings.cpp" line="+96"/> + <location filename="../bitcoinstrings.cpp" line="+94"/> <source>Bitcoin version</source> <translation>Versió de Bitcoin</translation> </message> <message> - <location line="+98"/> + <location line="+102"/> <source>Usage:</source> <translation>Ús:</translation> </message> <message> - <location line="-25"/> + <location line="-29"/> <source>Send command to -server or bitcoind</source> <translation>Enviar comanda a -servidor o bitcoind</translation> </message> <message> - <location line="-22"/> + <location line="-23"/> <source>List commands</source> <translation>Llista d'ordres</translation> </message> <message> - <location line="-10"/> + <location line="-12"/> <source>Get help for a command</source> <translation>Obtenir ajuda per a un ordre.</translation> </message> <message> - <location line="+21"/> + <location line="+24"/> <source>Options:</source> <translation>Opcions:</translation> </message> <message> - <location line="+23"/> + <location line="+24"/> <source>Specify configuration file (default: bitcoin.conf)</source> <translation>Especificat arxiu de configuració (per defecte: bitcoin.conf)</translation> </message> @@ -2186,27 +2217,17 @@ Address: %4 <translation>Especificar arxiu pid (per defecte: bitcoind.pid)</translation> </message> <message> - <location line="-48"/> - <source>Generate coins</source> - <translation>Generar monedes</translation> - </message> - <message> - <location line="-27"/> - <source>Don't generate coins</source> - <translation>No generar monedes</translation> - </message> - <message> - <location line="+74"/> + <location line="-1"/> <source>Specify data directory</source> <translation>Especificar directori de dades</translation> </message> <message> - <location line="-8"/> + <location line="-9"/> <source>Set database cache size in megabytes (default: 25)</source> <translation>Establir tamany de la memoria cau en megabytes (per defecte: 25)</translation> </message> <message> - <location line="-27"/> + <location line="-28"/> <source>Listen for connections on <port> (default: 8333 or testnet: 18333)</source> <translation>Escoltar connexions a <port> (per defecte: 8333 o testnet: 18333)</translation> </message> @@ -2221,7 +2242,7 @@ Address: %4 <translation>Connectar al node per obtenir les adreces de les connexions, i desconectar</translation> </message> <message> - <location line="+80"/> + <location line="+82"/> <source>Specify your own public address</source> <translation>Especificar la teva adreça pública</translation> </message> @@ -2231,22 +2252,22 @@ Address: %4 <translation>Límit per a desconectar connexions errònies (per defecte: 100)</translation> </message> <message> - <location line="-132"/> + <location line="-134"/> <source>Number of seconds to keep misbehaving peers from reconnecting (default: 86400)</source> <translation>Nombre de segons abans de reconectar amb connexions errònies (per defecte: 86400)</translation> </message> <message> - <location line="-32"/> + <location line="-29"/> <source>An error occurred while setting up the RPC port %u for listening on IPv4: %s</source> <translation>Ha sorgit un error al configurar el port RPC %u escoltant a IPv4: %s</translation> </message> <message> - <location line="+30"/> + <location line="+27"/> <source>Listen for JSON-RPC connections on <port> (default: 8332 or testnet: 18332)</source> <translation>Escoltar connexions JSON-RPC al port <port> (per defecte: 8332 o testnet:18332)</translation> </message> <message> - <location line="+36"/> + <location line="+37"/> <source>Accept command line and JSON-RPC commands</source> <translation>Acceptar línia d'ordres i ordres JSON-RPC </translation> </message> @@ -2256,17 +2277,17 @@ Address: %4 <translation>Executar en segon pla com a programa dimoni i acceptar ordres</translation> </message> <message> - <location line="+33"/> + <location line="+37"/> <source>Use the test network</source> <translation>Usar la xarxa de prova</translation> </message> <message> - <location line="-108"/> + <location line="-112"/> <source>Accept connections from outside (default: 1 if no -proxy or -connect)</source> <translation>Aceptar connexions d'afora (per defecte: 1 si no -proxy o -connect)</translation> </message> <message> - <location line="-82"/> + <location line="-80"/> <source>%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. </message> <message> <location line="+3"/> - <source>Error initializing database environment %s! To recover, BACKUP THAT DIRECTORY, then remove everything from it except for wallet.dat.</source> - <translation>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.</translation> - </message> - <message> - <location line="+3"/> <source>Error: The transaction was rejected! This might happen if some of the coins in your wallet were already spent, such as if you used a copy of wallet.dat and coins were spent in the copy but not marked as spent here.</source> <translation>Error: La transacció ha estat rebutjada. Això pot passar si alguna de les monedes del teu moneder ja s'han gastat, com si haguesis usat una copia de l'arxiu wallet.dat i s'haguessin gastat monedes de la copia però sense marcar com gastades en aquest.</translation> </message> @@ -2326,12 +2342,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Establir una mida màxima de transaccions d'alta prioritat/baixa comisió en bytes (per defecte: 27000)</translation> </message> <message> - <location line="+3"/> - <source>Set the number of script verification threads (1-16, 0=auto, default: 0)</source> - <translation>Establir el nombre d'execucions en paralel del script de verificació (1-16, 0=auto, per defecte: 0)</translation> - </message> - <message> - <location line="+2"/> + <location line="+6"/> <source>This is a pre-release test build - use at your own risk - do not use for mining or merchant applications</source> <translation>Aquesta és una versió de pre-llançament - utilitza-la sota la teva responsabilitat - No usar per a minería o aplicacions de compra-venda</translation> </message> @@ -2371,7 +2382,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Opcions de la creació de blocs:</translation> </message> <message> - <location line="+6"/> + <location line="+5"/> <source>Connect only to the specified node(s)</source> <translation>Connectar només al(s) node(s) especificats</translation> </message> @@ -2391,7 +2402,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Vols reconstruir la base de dades de blocs ara?</translation> </message> <message> - <location line="+3"/> + <location line="+2"/> <source>Error initializing block database</source> <translation>Error carregant la base de dades de blocs</translation> </message> @@ -2417,11 +2428,6 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. </message> <message> <location line="+1"/> - <source>Error: Transaction creation failed!</source> - <translation>Error: La ceació de la transacció ha fallat!</translation> - </message> - <message> - <location line="+1"/> <source>Error: Wallet locked, unable to create transaction!</source> <translation>Error: El moneder està blocat, no és possible crear la transacció!</translation> </message> @@ -2491,7 +2497,12 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Cerca punts de connexió usant rastreig de DNS (per defecte: 1 tret d'usar -connect)</translation> </message> <message> - <location line="+3"/> + <location line="+1"/> + <source>Generate coins (default: 0)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+2"/> <source>How many blocks to check at startup (default: 288, 0 = all)</source> <translation>Quants blocs s'han de confirmar a l'inici (per defecte: 288, 0 = tots)</translation> </message> @@ -2501,7 +2512,12 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Com verificar el bloc (0-4, per defecte 3)</translation> </message> <message> - <location line="+24"/> + <location line="+19"/> + <source>Not enough file descriptors available.</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+8"/> <source>Rebuild block chain index from current blk000??.dat files</source> <translation>Reconstruir l'índex de la cadena de blocs dels arxius actuals blk000??.dat</translation> </message> @@ -2511,7 +2527,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Estableix el nombre de fils per atendre trucades RPC (per defecte: 4)</translation> </message> <message> - <location line="+22"/> + <location line="+26"/> <source>Verifying blocks...</source> <translation>Verificant blocs...</translation> </message> @@ -2521,12 +2537,17 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Verificant moneder...</translation> </message> <message> - <location line="-62"/> + <location line="-69"/> <source>Imports blocks from external blk000??.dat file</source> <translation>Importa blocs de un fitxer blk000??.dat extern</translation> </message> <message> - <location line="+1"/> + <location line="-76"/> + <source>Set the number of script verification threads (up to 16, 0 = auto, <0 = leave that many cores free, default: 0)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+77"/> <source>Information</source> <translation>&Informació</translation> </message> @@ -2536,6 +2557,16 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Adreça -tor invàlida: '%s'</translation> </message> <message> + <location line="+1"/> + <source>Invalid amount for -minrelaytxfee=<amount>: '%s'</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Invalid amount for -mintxfee=<amount>: '%s'</source> + <translation type="unfinished"/> + </message> + <message> <location line="+8"/> <source>Maintain a full transaction index (default: 0)</source> <translation>Mantenir tot l'índex de transaccions (per defecte: 0)</translation> @@ -2551,7 +2582,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Mida màxima del buffer d'enviament per a cada connexió, <n>*1000 bytes (default: 5000)</translation> </message> <message> - <location line="+1"/> + <location line="+2"/> <source>Only accept block chain matching built-in checkpoints (default: 1)</source> <translation>Tan sols acceptar cadenes de blocs que coincideixin amb els punts de prova (per defecte: 1)</translation> </message> @@ -2611,6 +2642,11 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Reduir l'arxiu debug.log al iniciar el client (per defecte 1 quan no -debug)</translation> </message> <message> + <location line="+1"/> + <source>Signing transaction failed</source> + <translation type="unfinished"/> + </message> + <message> <location line="+2"/> <source>Specify connection timeout in milliseconds (default: 5000)</source> <translation>Especificar el temps limit per a un intent de connexió en milisegons (per defecte: 5000)</translation> @@ -2621,7 +2657,22 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Error de sistema:</translation> </message> <message> - <location line="+10"/> + <location line="+4"/> + <source>Transaction amount too small</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Transaction amounts must be positive</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Transaction too large</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+7"/> <source>Use UPnP to map the listening port (default: 0)</source> <translation>Utilitza UPnP per a mapejar els ports d'escolta (per defecte: 0)</translation> </message> @@ -2661,7 +2712,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>L'arxiu wallet.data és corrupte, el rescat de les dades ha fallat</translation> </message> <message> - <location line="-46"/> + <location line="-50"/> <source>Password for JSON-RPC connections</source> <translation>Contrasenya per a connexions JSON-RPC</translation> </message> @@ -2676,17 +2727,17 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Enviar ordre al node en execució a <ip> (per defecte: 127.0.0.1)</translation> </message> <message> - <location line="-119"/> + <location line="-120"/> <source>Execute command when the best block changes (%s in cmd is replaced by block hash)</source> <translation>Executar orde quan el millor bloc canviï (%s al cmd es reemplaça per un bloc de hash)</translation> </message> <message> - <location line="+142"/> + <location line="+147"/> <source>Upgrade wallet to latest format</source> <translation>Actualitzar moneder a l'últim format</translation> </message> <message> - <location line="-17"/> + <location line="-21"/> <source>Set key pool size to <n> (default: 100)</source> <translation>Establir límit de nombre de claus a <n> (per defecte: 100)</translation> </message> @@ -2696,12 +2747,12 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Re-escanejar cadena de blocs en cerca de transaccions de moneder perdudes</translation> </message> <message> - <location line="+31"/> + <location line="+35"/> <source>Use OpenSSL (https) for JSON-RPC connections</source> <translation>Utilitzar OpenSSL (https) per a connexions JSON-RPC</translation> </message> <message> - <location line="-22"/> + <location line="-26"/> <source>Server certificate file (default: server.cert)</source> <translation>Arxiu del certificat de servidor (per defecte: server.cert)</translation> </message> @@ -2711,37 +2762,37 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Clau privada del servidor (per defecte: server.pem)</translation> </message> <message> - <location line="-153"/> + <location line="-151"/> <source>Acceptable ciphers (default: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH)</source> <translation>Xifrats acceptats (per defecte: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH)</translation> </message> <message> - <location line="+166"/> + <location line="+165"/> <source>This help message</source> <translation>Aquest misatge d'ajuda</translation> </message> <message> - <location line="+3"/> + <location line="+6"/> <source>Unable to bind to %s on this computer (bind returned error %d, %s)</source> <translation>Impossible d'unir %s a aquest ordinador (s'ha retornat l'error %d, %s)</translation> </message> <message> - <location line="-86"/> + <location line="-91"/> <source>Connect through socks proxy</source> <translation>Connectar a través de socks proxy</translation> </message> <message> - <location line="-11"/> + <location line="-10"/> <source>Allow DNS lookups for -addnode, -seednode and -connect</source> <translation>Permetre consultes DNS per a -addnode, -seednode i -connect</translation> </message> <message> - <location line="+56"/> + <location line="+55"/> <source>Loading addresses...</source> <translation>Carregant adreces...</translation> </message> <message> - <location line="-34"/> + <location line="-35"/> <source>Error loading wallet.dat: Wallet corrupted</source> <translation>Error carregant wallet.dat: Moneder corrupte</translation> </message> @@ -2751,22 +2802,22 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Error carregant wallet.dat: El moneder requereix una versió de Bitcoin més moderna</translation> </message> <message> - <location line="+87"/> + <location line="+93"/> <source>Wallet needed to be rewritten: restart Bitcoin to complete</source> <translation>El moneder necesita ser re-escrit: re-inicia Bitcoin per a completar la tasca</translation> </message> <message> - <location line="-89"/> + <location line="-95"/> <source>Error loading wallet.dat</source> <translation>Error carregant wallet.dat</translation> </message> <message> - <location line="+29"/> + <location line="+28"/> <source>Invalid -proxy address: '%s'</source> <translation>Adreça -proxy invalida: '%s'</translation> </message> <message> - <location line="+49"/> + <location line="+56"/> <source>Unknown network specified in -onlynet: '%s'</source> <translation>Xarxa desconeguda especificada a -onlynet: '%s'</translation> </message> @@ -2776,7 +2827,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>S'ha demanat una versió desconeguda de -socks proxy: %i</translation> </message> <message> - <location line="-91"/> + <location line="-96"/> <source>Cannot resolve -bind address: '%s'</source> <translation>No es pot resoldre l'adreça -bind: '%s'</translation> </message> @@ -2796,17 +2847,17 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Quanitat invalida</translation> </message> <message> - <location line="-4"/> + <location line="-6"/> <source>Insufficient funds</source> <translation>Balanç insuficient</translation> </message> <message> - <location line="+8"/> + <location line="+10"/> <source>Loading block index...</source> <translation>Carregant índex de blocs...</translation> </message> <message> - <location line="-58"/> + <location line="-57"/> <source>Add a node to connect to and attempt to keep the connection open</source> <translation>Afegir un node per a connectar's-hi i intentar mantenir la connexió oberta</translation> </message> @@ -2816,52 +2867,47 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Impossible d'unir %s en aquest ordinador. Probablement Bitcoin ja estigui en execució.</translation> </message> <message> - <location line="+67"/> + <location line="+64"/> <source>Fee per KB to add to transactions you send</source> <translation>Comisió a afegir per cada KB de transaccions que enviïs</translation> </message> <message> - <location line="+17"/> + <location line="+19"/> <source>Loading wallet...</source> <translation>Carregant moneder...</translation> </message> <message> - <location line="-53"/> + <location line="-52"/> <source>Cannot downgrade wallet</source> <translation>No es pot reduir la versió del moneder</translation> </message> <message> - <location line="+1"/> - <source>Cannot initialize keypool</source> - <translation>No es pot inicialitzar el conjunt de claus</translation> - </message> - <message> <location line="+3"/> <source>Cannot write default address</source> <translation>No es pot escriure l'adreça per defecte</translation> </message> <message> - <location line="+63"/> + <location line="+64"/> <source>Rescanning...</source> <translation>Re-escanejant...</translation> </message> <message> - <location line="-55"/> + <location line="-57"/> <source>Done loading</source> <translation>Càrrega acabada</translation> </message> <message> - <location line="+79"/> + <location line="+82"/> <source>To use the %s option</source> <translation>Utilitza la opció %s</translation> </message> <message> - <location line="-71"/> + <location line="-74"/> <source>Error</source> <translation>Error</translation> </message> <message> - <location line="-33"/> + <location line="-31"/> <source>You must set rpcpassword=<password> in the configuration file: %s If the file does not exist, create it with owner-readable-only file permissions.</source> diff --git a/src/qt/locale/bitcoin_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.</translation> </message> <message> - <location filename="../aboutdialog.cpp" line="+17"/> + <location filename="../aboutdialog.cpp" line="+14"/> <source>Copyright</source> <translation>Copyright</translation> </message> <message> <location line="+0"/> - <source>2009-%1 The Bitcoin developers</source> - <translation>2009-%1 Vývojáři Bitcoinu</translation> + <source>The Bitcoin developers</source> + <translation>Vývojáři Bitcoinu</translation> </message> </context> <context> @@ -66,7 +66,7 @@ Tento produkt zahrnuje programy vyvinuté OpenSSL Projektem pro použití v Open <translation>Nová &adresa</translation> </message> <message> - <location filename="../addressbookpage.cpp" line="+59"/> + <location filename="../addressbookpage.cpp" line="+63"/> <source>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.</source> <translation>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.</translation> </message> @@ -96,7 +96,17 @@ Tento produkt zahrnuje programy vyvinuté OpenSSL Projektem pro použití v Open <translation>Smaž zvolenou adresu ze seznamu</translation> </message> <message> - <location line="-14"/> + <location line="+27"/> + <source>Export the data in the current tab to a file</source> + <translation>Exportuj data z tohoto panelu do souboru</translation> + </message> + <message> + <location line="+3"/> + <source>&Export</source> + <translation>&Export</translation> + </message> + <message> + <location line="-44"/> <source>Verify a message to ensure it was signed with a specified Bitcoin address</source> <translation>Ověř zprávu, aby ses ujistil, že byla podepsána danou Bitcoinovou adresou</translation> </message> @@ -318,12 +328,12 @@ Tento produkt zahrnuje programy vyvinuté OpenSSL Projektem pro použití v Open <translation>Po&depiš zprávu...</translation> </message> <message> - <location line="+299"/> + <location line="+280"/> <source>Synchronizing with network...</source> <translation>Synchronizuji se se sítí...</translation> </message> <message> - <location line="-368"/> + <location line="-349"/> <source>&Overview</source> <translation>&Přehled</translation> </message> @@ -398,7 +408,7 @@ Tento produkt zahrnuje programy vyvinuté OpenSSL Projektem pro použití v Open <translation>Změň &heslo...</translation> </message> <message> - <location line="+304"/> + <location line="+285"/> <source>Importing blocks from disk...</source> <translation>Importuji bloky z disku...</translation> </message> @@ -408,12 +418,7 @@ Tento produkt zahrnuje programy vyvinuté OpenSSL Projektem pro použití v Open <translation>Vytvářím nový index bloků na disku...</translation> </message> <message> - <location line="-300"/> - <source>&Export...</source> - <translation>&Export...</translation> - </message> - <message> - <location line="-66"/> + <location line="-347"/> <source>Send coins to a Bitcoin address</source> <translation>Pošli mince na Bitcoinovou adresu</translation> </message> @@ -423,12 +428,7 @@ Tento produkt zahrnuje programy vyvinuté OpenSSL Projektem pro použití v Open <translation>Uprav nastavení Bitcoinu</translation> </message> <message> - <location line="+18"/> - <source>Export the data in the current tab to a file</source> - <translation>Exportuj data z tohoto panelu do souboru</translation> - </message> - <message> - <location line="-9"/> + <location line="+9"/> <source>Backup wallet to another location</source> <translation>Zazálohuj peněženku na jiné místo</translation> </message> @@ -438,7 +438,7 @@ Tento produkt zahrnuje programy vyvinuté OpenSSL Projektem pro použití v Open <translation>Změň heslo k šifrování peněženky</translation> </message> <message> - <location line="+9"/> + <location line="+6"/> <source>&Debug window</source> <translation>&Ladicí okno</translation> </message> @@ -448,23 +448,23 @@ Tento produkt zahrnuje programy vyvinuté OpenSSL Projektem pro použití v Open <translation>Otevři ladicí a diagnostickou konzoli</translation> </message> <message> - <location line="-7"/> + <location line="-4"/> <source>&Verify message...</source> <translation>&Ověř zprávu...</translation> </message> <message> - <location line="-163"/> - <location line="+541"/> + <location line="-165"/> + <location line="+530"/> <source>Bitcoin</source> <translation>Bitcoin</translation> </message> <message> - <location line="-541"/> + <location line="-530"/> <source>Wallet</source> <translation>Peněženka</translation> </message> <message> - <location line="+99"/> + <location line="+101"/> <source>&Send</source> <translation>&Pošli</translation> </message> @@ -509,12 +509,12 @@ Tento produkt zahrnuje programy vyvinuté OpenSSL Projektem pro použití v Open <translation>Ověř zprávy, aby ses ujistil, že byly podepsány danými Bitcoinovými adresami</translation> </message> <message> - <location line="+31"/> + <location line="+28"/> <source>&File</source> <translation>&Soubor</translation> </message> <message> - <location line="+8"/> + <location line="+7"/> <source>&Settings</source> <translation>&Nastavení</translation> </message> @@ -529,12 +529,7 @@ Tento produkt zahrnuje programy vyvinuté OpenSSL Projektem pro použití v Open <translation>Panel s listy</translation> </message> <message> - <location line="+8"/> - <source>Actions toolbar</source> - <translation>Panel akcí</translation> - </message> - <message> - <location line="+13"/> + <location line="+17"/> <location line="+10"/> <source>[testnet]</source> <translation>[testnet]</translation> @@ -545,12 +540,17 @@ Tento produkt zahrnuje programy vyvinuté OpenSSL Projektem pro použití v Open <translation>Bitcoin klient</translation> </message> <message numerus="yes"> - <location line="+140"/> + <location line="+141"/> <source>%n active connection(s) to Bitcoin network</source> <translation><numerusform>%n aktivní spojení do Bitcoinové sítě</numerusform><numerusform>%n aktivní spojení do Bitcoinové sítě</numerusform><numerusform>%n aktivních spojení do Bitcoinové sítě</numerusform></translation> </message> <message> - <location line="+39"/> + <location line="+22"/> + <source>No block source available...</source> + <translation>Není dostupný žádný zdroj bloků...</translation> + </message> + <message> + <location line="+12"/> <source>Processed %1 of %2 (estimated) blocks of transaction history.</source> <translation>Zpracováno %1 z přibližně %2 bloků transakční historie.</translation> </message> @@ -575,7 +575,7 @@ Tento produkt zahrnuje programy vyvinuté OpenSSL Projektem pro použití v Open <translation><numerusform>týden</numerusform><numerusform>%n týdny</numerusform><numerusform>%n týdnů</numerusform></translation> </message> <message> - <location line="+5"/> + <location line="+4"/> <source>%1 behind</source> <translation>Stahuji ještě bloky transakcí za poslední %1</translation> </message> @@ -590,7 +590,7 @@ Tento produkt zahrnuje programy vyvinuté OpenSSL Projektem pro použití v Open <translation>Následné transakce ještě nebudou vidět.</translation> </message> <message> - <location line="+21"/> + <location line="+22"/> <source>Error</source> <translation>Chyba</translation> </message> @@ -605,22 +605,22 @@ Tento produkt zahrnuje programy vyvinuté OpenSSL Projektem pro použití v Open <translation>Informace</translation> </message> <message> - <location line="+68"/> + <location line="+70"/> <source>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?</source> <translation>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?</translation> </message> <message> - <location line="-138"/> + <location line="-140"/> <source>Up to date</source> <translation>Aktuální</translation> </message> <message> - <location line="+32"/> + <location line="+31"/> <source>Catching up...</source> <translation>Stahuji...</translation> </message> <message> - <location line="+110"/> + <location line="+113"/> <source>Confirm transaction fee</source> <translation>Potvrď transakční poplatek</translation> </message> @@ -670,7 +670,7 @@ Adresa: %4 <translation>Peněženka je <b>zašifrovaná</b> a momentálně <b>zamčená</b></translation> </message> <message> - <location filename="../bitcoin.cpp" line="+104"/> + <location filename="../bitcoin.cpp" line="+111"/> <source>A fatal error occurred. Bitcoin can no longer continue safely and will quit.</source> <translation>Stala se fatální chyba. Bitcoin nemůže bezpečně pokračovat v činnosti, a proto skončí.</translation> </message> @@ -678,7 +678,7 @@ Adresa: %4 <context> <name>ClientModel</name> <message> - <location filename="../clientmodel.cpp" line="+98"/> + <location filename="../clientmodel.cpp" line="+104"/> <source>Network Alert</source> <translation>Upozornění sítě</translation> </message> @@ -809,8 +809,8 @@ Adresa: %4 </message> <message> <location line="+6"/> - <source>Optional transaction fee per kB that helps make sure your transactions are processed quickly. Most transactions are 1 kB. Fee 0.01 recommended.</source> - <translation>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.</translation> + <source>Optional transaction fee per kB that helps make sure your transactions are processed quickly. Most transactions are 1 kB.</source> + <translation>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.</translation> </message> <message> <location line="+15"/> @@ -1059,7 +1059,7 @@ Adresa: %4 <translation>Celkem z transakcí, které ještě nejsou potvrzené a které se ještě nezapočítávají do celkového stavu účtu</translation> </message> <message> - <location filename="../overviewpage.cpp" line="+115"/> + <location filename="../overviewpage.cpp" line="+116"/> <location line="+1"/> <source>out of sync</source> <translation>nesynchronizováno</translation> @@ -1646,6 +1646,19 @@ Adresa: %4 </message> </context> <context> + <name>SplashScreen</name> + <message> + <location filename="../splashscreen.cpp" line="+22"/> + <source>The Bitcoin developers</source> + <translation>Vývojáři Bitcoinu</translation> + </message> + <message> + <location line="+1"/> + <source>[testnet]</source> + <translation>[testnet]</translation> + </message> +</context> +<context> <name>TransactionDesc</name> <message> <location filename="../transactiondesc.cpp" line="+20"/> @@ -2120,9 +2133,27 @@ Adresa: %4 </message> </context> <context> + <name>WalletModel</name> + <message> + <location filename="../walletmodel.cpp" line="+193"/> + <source>Send Coins</source> + <translation>Pošli mince</translation> + </message> +</context> +<context> <name>WalletView</name> <message> - <location filename="../walletview.cpp" line="+247"/> + <location filename="../walletview.cpp" line="+42"/> + <source>&Export</source> + <translation>&Export</translation> + </message> + <message> + <location line="+1"/> + <source>Export the data in the current tab to a file</source> + <translation>Exportuj data z tohoto panelu do souboru</translation> + </message> + <message> + <location line="+193"/> <source>Backup Wallet</source> <translation>Záloha peněženky</translation> </message> @@ -2155,37 +2186,37 @@ Adresa: %4 <context> <name>bitcoin-core</name> <message> - <location filename="../bitcoinstrings.cpp" line="+96"/> + <location filename="../bitcoinstrings.cpp" line="+94"/> <source>Bitcoin version</source> <translation>Verze Bitcoinu</translation> </message> <message> - <location line="+98"/> + <location line="+102"/> <source>Usage:</source> <translation>Užití:</translation> </message> <message> - <location line="-25"/> + <location line="-29"/> <source>Send command to -server or bitcoind</source> <translation>Poslat příkaz pro -server nebo bitcoind</translation> </message> <message> - <location line="-22"/> + <location line="-23"/> <source>List commands</source> <translation>Výpis příkazů</translation> </message> <message> - <location line="-10"/> + <location line="-12"/> <source>Get help for a command</source> <translation>Získat nápovědu pro příkaz</translation> </message> <message> - <location line="+21"/> + <location line="+24"/> <source>Options:</source> <translation>Možnosti:</translation> </message> <message> - <location line="+23"/> + <location line="+24"/> <source>Specify configuration file (default: bitcoin.conf)</source> <translation>Konfigurační soubor (výchozí: bitcoin.conf)</translation> </message> @@ -2195,27 +2226,17 @@ Adresa: %4 <translation>PID soubor (výchozí: bitcoind.pid)</translation> </message> <message> - <location line="-48"/> - <source>Generate coins</source> - <translation>Generovat mince</translation> - </message> - <message> - <location line="-27"/> - <source>Don't generate coins</source> - <translation>Negenerovat mince</translation> - </message> - <message> - <location line="+74"/> + <location line="-1"/> <source>Specify data directory</source> <translation>Adresář pro data</translation> </message> <message> - <location line="-8"/> + <location line="-9"/> <source>Set database cache size in megabytes (default: 25)</source> <translation>Nastavit velikost databázové vyrovnávací paměti v megabajtech (výchozí: 25)</translation> </message> <message> - <location line="-27"/> + <location line="-28"/> <source>Listen for connections on <port> (default: 8333 or testnet: 18333)</source> <translation>Čekat na spojení na <portu> (výchozí: 8333 nebo testnet: 18333)</translation> </message> @@ -2230,7 +2251,7 @@ Adresa: %4 <translation>Připojit se k uzlu, získat adresy jeho protějšků a odpojit se</translation> </message> <message> - <location line="+80"/> + <location line="+82"/> <source>Specify your own public address</source> <translation>Specifikuj svou veřejnou adresu</translation> </message> @@ -2240,22 +2261,22 @@ Adresa: %4 <translation>Práh pro odpojování zlobivých uzlů (výchozí: 100)</translation> </message> <message> - <location line="-132"/> + <location line="-134"/> <source>Number of seconds to keep misbehaving peers from reconnecting (default: 86400)</source> <translation>Doba ve vteřinách, po kterou se nebudou moci zlobivé uzly znovu připojit (výchozí: 86400)</translation> </message> <message> - <location line="-32"/> + <location line="-29"/> <source>An error occurred while setting up the RPC port %u for listening on IPv4: %s</source> <translation>Při nastavování naslouchacího RPC portu %i pro IPv4 nastala chyba: %s</translation> </message> <message> - <location line="+30"/> + <location line="+27"/> <source>Listen for JSON-RPC connections on <port> (default: 8332 or testnet: 18332)</source> <translation>Čekat na JSON RPC spojení na <portu> (výchozí: 8332 nebo testnet: 18332)</translation> </message> <message> - <location line="+36"/> + <location line="+37"/> <source>Accept command line and JSON-RPC commands</source> <translation>Akceptovat příkazy z příkazové řádky a přes JSON-RPC</translation> </message> @@ -2265,17 +2286,17 @@ Adresa: %4 <translation>Běžet na pozadí jako démon a akceptovat příkazy</translation> </message> <message> - <location line="+33"/> + <location line="+37"/> <source>Use the test network</source> <translation>Použít testovací síť (testnet)</translation> </message> <message> - <location line="-108"/> + <location line="-112"/> <source>Accept connections from outside (default: 1 if no -proxy or -connect)</source> <translation>Přijímat spojení zvenčí (výchozí: 1, pokud není zadáno -proxy nebo -connect)</translation> </message> <message> - <location line="-82"/> + <location line="-80"/> <source>%s, you must set a rpcpassword in the configuration file: %s It is recommended you use the following random password: @@ -2316,11 +2337,6 @@ například: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. </message> <message> <location line="+3"/> - <source>Error initializing database environment %s! To recover, BACKUP THAT DIRECTORY, then remove everything from it except for wallet.dat.</source> - <translation>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.</translation> - </message> - <message> - <location line="+3"/> <source>Error: The transaction was rejected! This might happen if some of the coins in your wallet were already spent, such as if you used a copy of wallet.dat and coins were spent in the copy but not marked as spent here.</source> <translation>Chyba: Transakce byla odmítnuta! Tohle může nastat, pokud nějaké mince z tvé peněženky už jednou byly utraceny, například pokud používáš kopii souboru wallet.dat a mince byly utraceny v druhé kopii, ale nebyly označeny jako utracené v této.</translation> </message> @@ -2345,12 +2361,7 @@ například: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Nastavit maximální velikost prioritních/nízkopoplatkových transakcí v bajtech (výchozí: 27000)</translation> </message> <message> - <location line="+3"/> - <source>Set the number of script verification threads (1-16, 0=auto, default: 0)</source> - <translation>Nastavení počtu vláken pro verifikaci skriptů (1-16, 0=automaticky, výchozí: 0)</translation> - </message> - <message> - <location line="+2"/> + <location line="+6"/> <source>This is a pre-release test build - use at your own risk - do not use for mining or merchant applications</source> <translation>Tohle je testovací verze – používej ji jen na vlastní riziko, ale rozhodně ji nepoužívej k těžbě nebo pro obchodní aplikace</translation> </message> @@ -2390,7 +2401,7 @@ například: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Možnosti vytvoření bloku:</translation> </message> <message> - <location line="+6"/> + <location line="+5"/> <source>Connect only to the specified node(s)</source> <translation>Připojit se pouze k zadanému uzlu (příp. zadaným uzlům)</translation> </message> @@ -2410,7 +2421,7 @@ například: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Chceš přestavět databázi bloků hned teď?</translation> </message> <message> - <location line="+3"/> + <location line="+2"/> <source>Error initializing block database</source> <translation>Chyba při zakládání databáze bloků</translation> </message> @@ -2436,11 +2447,6 @@ například: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. </message> <message> <location line="+1"/> - <source>Error: Transaction creation failed!</source> - <translation>Chyba: Vytvoření transakce selhalo!</translation> - </message> - <message> - <location line="+1"/> <source>Error: Wallet locked, unable to create transaction!</source> <translation>Chyba: Peněženka je zamčená, nemohu vytvořit transakci!</translation> </message> @@ -2510,7 +2516,12 @@ například: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Hledat uzly přes DNS (výchozí: 1, pokud není zadáno -connect)</translation> </message> <message> - <location line="+3"/> + <location line="+1"/> + <source>Generate coins (default: 0)</source> + <translation>Generovat mince (výchozí: 0)</translation> + </message> + <message> + <location line="+2"/> <source>How many blocks to check at startup (default: 288, 0 = all)</source> <translation>Kolik bloků při startu zkontrolovat (výchozí: 288, 0 = všechny)</translation> </message> @@ -2520,7 +2531,12 @@ například: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Jak moc důkladná má být verifikace bloků (0-4, výchozí: 3)</translation> </message> <message> - <location line="+24"/> + <location line="+19"/> + <source>Not enough file descriptors available.</source> + <translation>Je nedostatek deskriptorů souborů.</translation> + </message> + <message> + <location line="+8"/> <source>Rebuild block chain index from current blk000??.dat files</source> <translation>Znovu vytvořit index řetězce bloků z aktuálních blk000??.dat souborů</translation> </message> @@ -2530,7 +2546,7 @@ například: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Nastavení počtu vláken pro servisní RPC volání (výchozí: 4)</translation> </message> <message> - <location line="+22"/> + <location line="+26"/> <source>Verifying blocks...</source> <translation>Ověřuji bloky...</translation> </message> @@ -2540,12 +2556,17 @@ například: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Kontroluji peněženku...</translation> </message> <message> - <location line="-62"/> + <location line="-69"/> <source>Imports blocks from external blk000??.dat file</source> <translation>Importovat bloky z externího souboru blk000??.dat</translation> </message> <message> - <location line="+1"/> + <location line="-76"/> + <source>Set the number of script verification threads (up to 16, 0 = auto, <0 = leave that many cores free, default: 0)</source> + <translation>Nastavení počtu vláken pro verifikaci skriptů (max. 16, 0 = automaticky, <0 = nechat daný počet jader volný, výchozí: 0)</translation> + </message> + <message> + <location line="+77"/> <source>Information</source> <translation>Informace</translation> </message> @@ -2555,6 +2576,16 @@ například: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Neplatná -tor adresa: '%s'</translation> </message> <message> + <location line="+1"/> + <source>Invalid amount for -minrelaytxfee=<amount>: '%s'</source> + <translation>Neplatná částka pro -minrelaytxfee=<částka>: '%s'</translation> + </message> + <message> + <location line="+1"/> + <source>Invalid amount for -mintxfee=<amount>: '%s'</source> + <translation>Neplatná částka pro -mintxfee=<částka>: '%s'</translation> + </message> + <message> <location line="+8"/> <source>Maintain a full transaction index (default: 0)</source> <translation>Spravovat úplný index transakcí (výchozí: 0)</translation> @@ -2570,7 +2601,7 @@ například: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Maximální velikost odesílacího bufferu pro každé spojení, <n>*1000 bajtů (výchozí: 1000)</translation> </message> <message> - <location line="+1"/> + <location line="+2"/> <source>Only accept block chain matching built-in checkpoints (default: 1)</source> <translation>Uznávat pouze řetěz bloků, který odpovídá vnitřním kontrolním bodům (výchozí: 1)</translation> </message> @@ -2630,6 +2661,11 @@ například: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Při spuštění klienta zmenšit soubor debug.log (výchozí: 1, pokud není zadáno -debug)</translation> </message> <message> + <location line="+1"/> + <source>Signing transaction failed</source> + <translation>Podepisování transakce selhalo</translation> + </message> + <message> <location line="+2"/> <source>Specify connection timeout in milliseconds (default: 5000)</source> <translation>Zadej časový limit spojení v milisekundách (výchozí: 5000)</translation> @@ -2640,7 +2676,22 @@ například: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Systémová chyba: </translation> </message> <message> - <location line="+10"/> + <location line="+4"/> + <source>Transaction amount too small</source> + <translation>Částka v transakci je příliš malá</translation> + </message> + <message> + <location line="+1"/> + <source>Transaction amounts must be positive</source> + <translation>Částky v transakci musí být kladné</translation> + </message> + <message> + <location line="+1"/> + <source>Transaction too large</source> + <translation>Transace je příliš velká</translation> + </message> + <message> + <location line="+7"/> <source>Use UPnP to map the listening port (default: 0)</source> <translation>Použít UPnP k namapování naslouchacího portu (výchozí: 0)</translation> </message> @@ -2680,7 +2731,7 @@ například: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Soubor wallet.dat je poškozen, jeho záchrana se nezdařila</translation> </message> <message> - <location line="-46"/> + <location line="-50"/> <source>Password for JSON-RPC connections</source> <translation>Heslo pro JSON-RPC spojení</translation> </message> @@ -2695,17 +2746,17 @@ například: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Posílat příkazy uzlu běžícím na <ip> (výchozí: 127.0.0.1)</translation> </message> <message> - <location line="-119"/> + <location line="-120"/> <source>Execute command when the best block changes (%s in cmd is replaced by block hash)</source> <translation>Spustit příkaz, když se změní nejlepší blok (%s se v příkazu nahradí hashem bloku)</translation> </message> <message> - <location line="+142"/> + <location line="+147"/> <source>Upgrade wallet to latest format</source> <translation>Převést peněženku na nejnovější formát</translation> </message> <message> - <location line="-17"/> + <location line="-21"/> <source>Set key pool size to <n> (default: 100)</source> <translation>Nastavit zásobník klíčů na velikost <n> (výchozí: 100)</translation> </message> @@ -2715,12 +2766,12 @@ například: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Přeskenovat řetězec bloků na chybějící transakce tvé pěněženky</translation> </message> <message> - <location line="+31"/> + <location line="+35"/> <source>Use OpenSSL (https) for JSON-RPC connections</source> <translation>Použít OpenSSL (https) pro JSON-RPC spojení</translation> </message> <message> - <location line="-22"/> + <location line="-26"/> <source>Server certificate file (default: server.cert)</source> <translation>Soubor se serverovým certifikátem (výchozí: server.cert)</translation> </message> @@ -2730,37 +2781,37 @@ například: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Soubor se serverovým soukromým klíčem (výchozí: server.pem)</translation> </message> <message> - <location line="-153"/> + <location line="-151"/> <source>Acceptable ciphers (default: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH)</source> <translation>Akceptovatelné šifry (výchozí: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH)</translation> </message> <message> - <location line="+166"/> + <location line="+165"/> <source>This help message</source> <translation>Tato nápověda</translation> </message> <message> - <location line="+3"/> + <location line="+6"/> <source>Unable to bind to %s on this computer (bind returned error %d, %s)</source> <translation>Nedaří se mi připojit na %s na tomhle počítači (operace bind vrátila chybu %d, %s)</translation> </message> <message> - <location line="-86"/> + <location line="-91"/> <source>Connect through socks proxy</source> <translation>Připojit se přes socks proxy</translation> </message> <message> - <location line="-11"/> + <location line="-10"/> <source>Allow DNS lookups for -addnode, -seednode and -connect</source> <translation>Povolit DNS dotazy pro -addnode (přidání uzlu), -seednode a -connect (připojení)</translation> </message> <message> - <location line="+56"/> + <location line="+55"/> <source>Loading addresses...</source> <translation>Načítám adresy...</translation> </message> <message> - <location line="-34"/> + <location line="-35"/> <source>Error loading wallet.dat: Wallet corrupted</source> <translation>Chyba při načítání wallet.dat: peněženka je poškozená</translation> </message> @@ -2770,22 +2821,22 @@ například: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Chyba při načítání wallet.dat: peněženka vyžaduje novější verzi Bitcoinu</translation> </message> <message> - <location line="+87"/> + <location line="+93"/> <source>Wallet needed to be rewritten: restart Bitcoin to complete</source> <translation>Soubor s peněženkou potřeboval přepsat: restartuj Bitcoin, aby se operace dokončila</translation> </message> <message> - <location line="-89"/> + <location line="-95"/> <source>Error loading wallet.dat</source> <translation>Chyba při načítání wallet.dat</translation> </message> <message> - <location line="+29"/> + <location line="+28"/> <source>Invalid -proxy address: '%s'</source> <translation>Neplatná -proxy adresa: '%s'</translation> </message> <message> - <location line="+49"/> + <location line="+56"/> <source>Unknown network specified in -onlynet: '%s'</source> <translation>V -onlynet byla uvedena neznámá síť: '%s'</translation> </message> @@ -2795,7 +2846,7 @@ například: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>V -socks byla požadována neznámá verze proxy: %i</translation> </message> <message> - <location line="-91"/> + <location line="-96"/> <source>Cannot resolve -bind address: '%s'</source> <translation>Nemohu přeložit -bind adresu: '%s'</translation> </message> @@ -2815,17 +2866,17 @@ například: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Neplatná částka</translation> </message> <message> - <location line="-4"/> + <location line="-6"/> <source>Insufficient funds</source> <translation>Nedostatek prostředků</translation> </message> <message> - <location line="+8"/> + <location line="+10"/> <source>Loading block index...</source> <translation>Načítám index bloků...</translation> </message> <message> - <location line="-58"/> + <location line="-57"/> <source>Add a node to connect to and attempt to keep the connection open</source> <translation>Přidat uzel, ke kterému se připojit a snažit se spojení udržet</translation> </message> @@ -2835,52 +2886,47 @@ například: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Nedaří se mi připojit na %s na tomhle počítači. Bitcoin už pravděpodobně jednou běží.</translation> </message> <message> - <location line="+67"/> + <location line="+64"/> <source>Fee per KB to add to transactions you send</source> <translation>Poplatek za kB, který se přidá ke každé odeslané transakci</translation> </message> <message> - <location line="+17"/> + <location line="+19"/> <source>Loading wallet...</source> <translation>Načítám peněženku...</translation> </message> <message> - <location line="-53"/> + <location line="-52"/> <source>Cannot downgrade wallet</source> <translation>Nemohu převést peněženku do staršího formátu</translation> </message> <message> - <location line="+1"/> - <source>Cannot initialize keypool</source> - <translation>Nemohu inicializovat zásobník klíčů</translation> - </message> - <message> <location line="+3"/> <source>Cannot write default address</source> <translation>Nemohu napsat výchozí adresu</translation> </message> <message> - <location line="+63"/> + <location line="+64"/> <source>Rescanning...</source> <translation>Přeskenovávám...</translation> </message> <message> - <location line="-55"/> + <location line="-57"/> <source>Done loading</source> <translation>Načítání dokončeno</translation> </message> <message> - <location line="+79"/> + <location line="+82"/> <source>To use the %s option</source> <translation>K použití volby %s</translation> </message> <message> - <location line="-71"/> + <location line="-74"/> <source>Error</source> <translation>Chyba</translation> </message> <message> - <location line="-33"/> + <location line="-31"/> <source>You must set rpcpassword=<password> in the configuration file: %s If the file does not exist, create it with owner-readable-only file permissions.</source> diff --git a/src/qt/locale/bitcoin_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 <translation type="unfinished"/> </message> <message> - <location filename="../aboutdialog.cpp" line="+17"/> + <location filename="../aboutdialog.cpp" line="+14"/> <source>Copyright</source> <translation type="unfinished"/> </message> <message> <location line="+0"/> - <source>2009-%1 The Bitcoin developers</source> + <source>The Bitcoin developers</source> <translation type="unfinished"/> </message> </context> @@ -61,7 +61,7 @@ This product includes software developed by the OpenSSL Project for use in the O <translation type="unfinished"/> </message> <message> - <location filename="../addressbookpage.cpp" line="+59"/> + <location filename="../addressbookpage.cpp" line="+63"/> <source>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.</source> <translation type="unfinished"/> </message> @@ -91,7 +91,17 @@ This product includes software developed by the OpenSSL Project for use in the O <translation type="unfinished"/> </message> <message> - <location line="-14"/> + <location line="+27"/> + <source>Export the data in the current tab to a file</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+3"/> + <source>&Export</source> + <translation type="unfinished"/> + </message> + <message> + <location line="-44"/> <source>Verify a message to ensure it was signed with a specified Bitcoin address</source> <translation type="unfinished"/> </message> @@ -313,12 +323,12 @@ This product includes software developed by the OpenSSL Project for use in the O <translation type="unfinished"/> </message> <message> - <location line="+299"/> + <location line="+280"/> <source>Synchronizing with network...</source> <translation>Cysoni â'r rhwydwaith...</translation> </message> <message> - <location line="-368"/> + <location line="-349"/> <source>&Overview</source> <translation>&Trosolwg</translation> </message> @@ -393,7 +403,7 @@ This product includes software developed by the OpenSSL Project for use in the O <translation type="unfinished"/> </message> <message> - <location line="+304"/> + <location line="+285"/> <source>Importing blocks from disk...</source> <translation type="unfinished"/> </message> @@ -403,12 +413,7 @@ This product includes software developed by the OpenSSL Project for use in the O <translation type="unfinished"/> </message> <message> - <location line="-300"/> - <source>&Export...</source> - <translation>&Allforio...</translation> - </message> - <message> - <location line="-66"/> + <location line="-347"/> <source>Send coins to a Bitcoin address</source> <translation type="unfinished"/> </message> @@ -418,12 +423,7 @@ This product includes software developed by the OpenSSL Project for use in the O <translation type="unfinished"/> </message> <message> - <location line="+18"/> - <source>Export the data in the current tab to a file</source> - <translation type="unfinished"/> - </message> - <message> - <location line="-9"/> + <location line="+9"/> <source>Backup wallet to another location</source> <translation type="unfinished"/> </message> @@ -433,7 +433,7 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>Newid y cyfrinymadrodd a ddefnyddiwyd ar gyfer amgryptio'r waled</translation> </message> <message> - <location line="+9"/> + <location line="+6"/> <source>&Debug window</source> <translation type="unfinished"/> </message> @@ -443,23 +443,23 @@ This product includes software developed by the OpenSSL Project for use in the O <translation type="unfinished"/> </message> <message> - <location line="-7"/> + <location line="-4"/> <source>&Verify message...</source> <translation type="unfinished"/> </message> <message> - <location line="-163"/> - <location line="+541"/> + <location line="-165"/> + <location line="+530"/> <source>Bitcoin</source> <translation type="unfinished"/> </message> <message> - <location line="-541"/> + <location line="-530"/> <source>Wallet</source> <translation type="unfinished"/> </message> <message> - <location line="+99"/> + <location line="+101"/> <source>&Send</source> <translation type="unfinished"/> </message> @@ -504,12 +504,12 @@ This product includes software developed by the OpenSSL Project for use in the O <translation type="unfinished"/> </message> <message> - <location line="+31"/> + <location line="+28"/> <source>&File</source> <translation>&Ffeil</translation> </message> <message> - <location line="+8"/> + <location line="+7"/> <source>&Settings</source> <translation>&Gosodiadau</translation> </message> @@ -524,12 +524,7 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>Bar offer tabiau</translation> </message> <message> - <location line="+8"/> - <source>Actions toolbar</source> - <translation>Bar offer camau gweithredu</translation> - </message> - <message> - <location line="+13"/> + <location line="+17"/> <location line="+10"/> <source>[testnet]</source> <translation>[testnet]</translation> @@ -540,12 +535,17 @@ This product includes software developed by the OpenSSL Project for use in the O <translation type="unfinished"/> </message> <message numerus="yes"> - <location line="+140"/> + <location line="+141"/> <source>%n active connection(s) to Bitcoin network</source> <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation> </message> <message> - <location line="+39"/> + <location line="+22"/> + <source>No block source available...</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+12"/> <source>Processed %1 of %2 (estimated) blocks of transaction history.</source> <translation type="unfinished"/> </message> @@ -570,7 +570,7 @@ This product includes software developed by the OpenSSL Project for use in the O <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation> </message> <message> - <location line="+5"/> + <location line="+4"/> <source>%1 behind</source> <translation type="unfinished"/> </message> @@ -585,7 +585,7 @@ This product includes software developed by the OpenSSL Project for use in the O <translation type="unfinished"/> </message> <message> - <location line="+21"/> + <location line="+22"/> <source>Error</source> <translation type="unfinished"/> </message> @@ -600,22 +600,22 @@ This product includes software developed by the OpenSSL Project for use in the O <translation type="unfinished"/> </message> <message> - <location line="+68"/> + <location line="+70"/> <source>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?</source> <translation type="unfinished"/> </message> <message> - <location line="-138"/> + <location line="-140"/> <source>Up to date</source> <translation>Cyfamserol</translation> </message> <message> - <location line="+32"/> + <location line="+31"/> <source>Catching up...</source> <translation>Dal i fyny</translation> </message> <message> - <location line="+110"/> + <location line="+113"/> <source>Confirm transaction fee</source> <translation type="unfinished"/> </message> @@ -661,7 +661,7 @@ Address: %4 <translation>Mae'r waled <b>wedi'i amgryptio</b> ac <b>ar glo</b> ar hyn o bryd</translation> </message> <message> - <location filename="../bitcoin.cpp" line="+104"/> + <location filename="../bitcoin.cpp" line="+111"/> <source>A fatal error occurred. Bitcoin can no longer continue safely and will quit.</source> <translation type="unfinished"/> </message> @@ -669,7 +669,7 @@ Address: %4 <context> <name>ClientModel</name> <message> - <location filename="../clientmodel.cpp" line="+98"/> + <location filename="../clientmodel.cpp" line="+104"/> <source>Network Alert</source> <translation type="unfinished"/> </message> @@ -800,7 +800,7 @@ Address: %4 </message> <message> <location line="+6"/> - <source>Optional transaction fee per kB that helps make sure your transactions are processed quickly. Most transactions are 1 kB. Fee 0.01 recommended.</source> + <source>Optional transaction fee per kB that helps make sure your transactions are processed quickly. Most transactions are 1 kB.</source> <translation type="unfinished"/> </message> <message> @@ -1050,7 +1050,7 @@ Address: %4 <translation>Cyfanswm o drafodion sydd heb eu cadarnhau a heb eu cyfri tuag at y gweddill presennol</translation> </message> <message> - <location filename="../overviewpage.cpp" line="+115"/> + <location filename="../overviewpage.cpp" line="+116"/> <location line="+1"/> <source>out of sync</source> <translation type="unfinished"/> @@ -1637,6 +1637,19 @@ Address: %4 </message> </context> <context> + <name>SplashScreen</name> + <message> + <location filename="../splashscreen.cpp" line="+22"/> + <source>The Bitcoin developers</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>[testnet]</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>TransactionDesc</name> <message> <location filename="../transactiondesc.cpp" line="+20"/> @@ -2111,9 +2124,27 @@ Address: %4 </message> </context> <context> + <name>WalletModel</name> + <message> + <location filename="../walletmodel.cpp" line="+193"/> + <source>Send Coins</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>WalletView</name> <message> - <location filename="../walletview.cpp" line="+247"/> + <location filename="../walletview.cpp" line="+42"/> + <source>&Export</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Export the data in the current tab to a file</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+193"/> <source>Backup Wallet</source> <translation type="unfinished"/> </message> @@ -2146,37 +2177,37 @@ Address: %4 <context> <name>bitcoin-core</name> <message> - <location filename="../bitcoinstrings.cpp" line="+96"/> + <location filename="../bitcoinstrings.cpp" line="+94"/> <source>Bitcoin version</source> <translation type="unfinished"/> </message> <message> - <location line="+98"/> + <location line="+102"/> <source>Usage:</source> <translation type="unfinished"/> </message> <message> - <location line="-25"/> + <location line="-29"/> <source>Send command to -server or bitcoind</source> <translation type="unfinished"/> </message> <message> - <location line="-22"/> + <location line="-23"/> <source>List commands</source> <translation type="unfinished"/> </message> <message> - <location line="-10"/> + <location line="-12"/> <source>Get help for a command</source> <translation type="unfinished"/> </message> <message> - <location line="+21"/> + <location line="+24"/> <source>Options:</source> <translation type="unfinished"/> </message> <message> - <location line="+23"/> + <location line="+24"/> <source>Specify configuration file (default: bitcoin.conf)</source> <translation type="unfinished"/> </message> @@ -2186,27 +2217,17 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="-48"/> - <source>Generate coins</source> - <translation type="unfinished"/> - </message> - <message> - <location line="-27"/> - <source>Don't generate coins</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+74"/> + <location line="-1"/> <source>Specify data directory</source> <translation type="unfinished"/> </message> <message> - <location line="-8"/> + <location line="-9"/> <source>Set database cache size in megabytes (default: 25)</source> <translation type="unfinished"/> </message> <message> - <location line="-27"/> + <location line="-28"/> <source>Listen for connections on <port> (default: 8333 or testnet: 18333)</source> <translation type="unfinished"/> </message> @@ -2221,7 +2242,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+80"/> + <location line="+82"/> <source>Specify your own public address</source> <translation type="unfinished"/> </message> @@ -2231,22 +2252,22 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="-132"/> + <location line="-134"/> <source>Number of seconds to keep misbehaving peers from reconnecting (default: 86400)</source> <translation type="unfinished"/> </message> <message> - <location line="-32"/> + <location line="-29"/> <source>An error occurred while setting up the RPC port %u for listening on IPv4: %s</source> <translation type="unfinished"/> </message> <message> - <location line="+30"/> + <location line="+27"/> <source>Listen for JSON-RPC connections on <port> (default: 8332 or testnet: 18332)</source> <translation type="unfinished"/> </message> <message> - <location line="+36"/> + <location line="+37"/> <source>Accept command line and JSON-RPC commands</source> <translation type="unfinished"/> </message> @@ -2256,17 +2277,17 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+33"/> + <location line="+37"/> <source>Use the test network</source> <translation type="unfinished"/> </message> <message> - <location line="-108"/> + <location line="-112"/> <source>Accept connections from outside (default: 1 if no -proxy or -connect)</source> <translation type="unfinished"/> </message> <message> - <location line="-82"/> + <location line="-80"/> <source>%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. </message> <message> <location line="+3"/> - <source>Error initializing database environment %s! To recover, BACKUP THAT DIRECTORY, then remove everything from it except for wallet.dat.</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+3"/> <source>Error: The transaction was rejected! This might happen if some of the coins in your wallet were already spent, such as if you used a copy of wallet.dat and coins were spent in the copy but not marked as spent here.</source> <translation type="unfinished"/> </message> @@ -2326,12 +2342,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+3"/> - <source>Set the number of script verification threads (1-16, 0=auto, default: 0)</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+2"/> + <location line="+6"/> <source>This is a pre-release test build - use at your own risk - do not use for mining or merchant applications</source> <translation type="unfinished"/> </message> @@ -2371,7 +2382,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+6"/> + <location line="+5"/> <source>Connect only to the specified node(s)</source> <translation type="unfinished"/> </message> @@ -2391,7 +2402,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+3"/> + <location line="+2"/> <source>Error initializing block database</source> <translation type="unfinished"/> </message> @@ -2417,11 +2428,6 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. </message> <message> <location line="+1"/> - <source>Error: Transaction creation failed!</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+1"/> <source>Error: Wallet locked, unable to create transaction!</source> <translation type="unfinished"/> </message> @@ -2491,7 +2497,12 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+3"/> + <location line="+1"/> + <source>Generate coins (default: 0)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+2"/> <source>How many blocks to check at startup (default: 288, 0 = all)</source> <translation type="unfinished"/> </message> @@ -2501,7 +2512,12 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+24"/> + <location line="+19"/> + <source>Not enough file descriptors available.</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+8"/> <source>Rebuild block chain index from current blk000??.dat files</source> <translation type="unfinished"/> </message> @@ -2511,7 +2527,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+22"/> + <location line="+26"/> <source>Verifying blocks...</source> <translation type="unfinished"/> </message> @@ -2521,12 +2537,17 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="-62"/> + <location line="-69"/> <source>Imports blocks from external blk000??.dat file</source> <translation type="unfinished"/> </message> <message> - <location line="+1"/> + <location line="-76"/> + <source>Set the number of script verification threads (up to 16, 0 = auto, <0 = leave that many cores free, default: 0)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+77"/> <source>Information</source> <translation type="unfinished"/> </message> @@ -2536,6 +2557,16 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> + <location line="+1"/> + <source>Invalid amount for -minrelaytxfee=<amount>: '%s'</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Invalid amount for -mintxfee=<amount>: '%s'</source> + <translation type="unfinished"/> + </message> + <message> <location line="+8"/> <source>Maintain a full transaction index (default: 0)</source> <translation type="unfinished"/> @@ -2551,7 +2582,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+1"/> + <location line="+2"/> <source>Only accept block chain matching built-in checkpoints (default: 1)</source> <translation type="unfinished"/> </message> @@ -2611,6 +2642,11 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> + <location line="+1"/> + <source>Signing transaction failed</source> + <translation type="unfinished"/> + </message> + <message> <location line="+2"/> <source>Specify connection timeout in milliseconds (default: 5000)</source> <translation type="unfinished"/> @@ -2621,7 +2657,22 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+10"/> + <location line="+4"/> + <source>Transaction amount too small</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Transaction amounts must be positive</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Transaction too large</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+7"/> <source>Use UPnP to map the listening port (default: 0)</source> <translation type="unfinished"/> </message> @@ -2661,7 +2712,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="-46"/> + <location line="-50"/> <source>Password for JSON-RPC connections</source> <translation type="unfinished"/> </message> @@ -2676,17 +2727,17 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="-119"/> + <location line="-120"/> <source>Execute command when the best block changes (%s in cmd is replaced by block hash)</source> <translation type="unfinished"/> </message> <message> - <location line="+142"/> + <location line="+147"/> <source>Upgrade wallet to latest format</source> <translation type="unfinished"/> </message> <message> - <location line="-17"/> + <location line="-21"/> <source>Set key pool size to <n> (default: 100)</source> <translation type="unfinished"/> </message> @@ -2696,12 +2747,12 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+31"/> + <location line="+35"/> <source>Use OpenSSL (https) for JSON-RPC connections</source> <translation type="unfinished"/> </message> <message> - <location line="-22"/> + <location line="-26"/> <source>Server certificate file (default: server.cert)</source> <translation type="unfinished"/> </message> @@ -2711,37 +2762,37 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="-153"/> + <location line="-151"/> <source>Acceptable ciphers (default: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH)</source> <translation type="unfinished"/> </message> <message> - <location line="+166"/> + <location line="+165"/> <source>This help message</source> <translation type="unfinished"/> </message> <message> - <location line="+3"/> + <location line="+6"/> <source>Unable to bind to %s on this computer (bind returned error %d, %s)</source> <translation type="unfinished"/> </message> <message> - <location line="-86"/> + <location line="-91"/> <source>Connect through socks proxy</source> <translation type="unfinished"/> </message> <message> - <location line="-11"/> + <location line="-10"/> <source>Allow DNS lookups for -addnode, -seednode and -connect</source> <translation type="unfinished"/> </message> <message> - <location line="+56"/> + <location line="+55"/> <source>Loading addresses...</source> <translation type="unfinished"/> </message> <message> - <location line="-34"/> + <location line="-35"/> <source>Error loading wallet.dat: Wallet corrupted</source> <translation type="unfinished"/> </message> @@ -2751,22 +2802,22 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+87"/> + <location line="+93"/> <source>Wallet needed to be rewritten: restart Bitcoin to complete</source> <translation type="unfinished"/> </message> <message> - <location line="-89"/> + <location line="-95"/> <source>Error loading wallet.dat</source> <translation type="unfinished"/> </message> <message> - <location line="+29"/> + <location line="+28"/> <source>Invalid -proxy address: '%s'</source> <translation type="unfinished"/> </message> <message> - <location line="+49"/> + <location line="+56"/> <source>Unknown network specified in -onlynet: '%s'</source> <translation type="unfinished"/> </message> @@ -2776,7 +2827,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="-91"/> + <location line="-96"/> <source>Cannot resolve -bind address: '%s'</source> <translation type="unfinished"/> </message> @@ -2796,17 +2847,17 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="-4"/> + <location line="-6"/> <source>Insufficient funds</source> <translation type="unfinished"/> </message> <message> - <location line="+8"/> + <location line="+10"/> <source>Loading block index...</source> <translation type="unfinished"/> </message> <message> - <location line="-58"/> + <location line="-57"/> <source>Add a node to connect to and attempt to keep the connection open</source> <translation type="unfinished"/> </message> @@ -2816,52 +2867,47 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+67"/> + <location line="+64"/> <source>Fee per KB to add to transactions you send</source> <translation type="unfinished"/> </message> <message> - <location line="+17"/> + <location line="+19"/> <source>Loading wallet...</source> <translation type="unfinished"/> </message> <message> - <location line="-53"/> + <location line="-52"/> <source>Cannot downgrade wallet</source> <translation type="unfinished"/> </message> <message> - <location line="+1"/> - <source>Cannot initialize keypool</source> - <translation type="unfinished"/> - </message> - <message> <location line="+3"/> <source>Cannot write default address</source> <translation type="unfinished"/> </message> <message> - <location line="+63"/> + <location line="+64"/> <source>Rescanning...</source> <translation type="unfinished"/> </message> <message> - <location line="-55"/> + <location line="-57"/> <source>Done loading</source> <translation type="unfinished"/> </message> <message> - <location line="+79"/> + <location line="+82"/> <source>To use the %s option</source> <translation type="unfinished"/> </message> <message> - <location line="-71"/> + <location line="-74"/> <source>Error</source> <translation type="unfinished"/> </message> <message> - <location line="-33"/> + <location line="-31"/> <source>You must set rpcpassword=<password> in the configuration file: %s If the file does not exist, create it with owner-readable-only file permissions.</source> diff --git a/src/qt/locale/bitcoin_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.</translation> </message> <message> - <location filename="../aboutdialog.cpp" line="+17"/> + <location filename="../aboutdialog.cpp" line="+14"/> <source>Copyright</source> <translation>Copyright</translation> </message> <message> <location line="+0"/> - <source>2009-%1 The Bitcoin developers</source> - <translation>2009-%1 Bitcoin-udviklerne</translation> + <source>The Bitcoin developers</source> + <translation>Bitcoin-udviklerne</translation> </message> </context> <context> @@ -66,7 +66,7 @@ Produktet indeholder software som er udviklet af OpenSSL Project til brug i Open <translation>Ny adresse</translation> </message> <message> - <location filename="../addressbookpage.cpp" line="+59"/> + <location filename="../addressbookpage.cpp" line="+63"/> <source>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.</source> <translation>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.</translation> </message> @@ -96,7 +96,17 @@ Produktet indeholder software som er udviklet af OpenSSL Project til brug i Open <translation>Slet den markerede adresse fra listen</translation> </message> <message> - <location line="-14"/> + <location line="+27"/> + <source>Export the data in the current tab to a file</source> + <translation>Eksportér den aktuelle visning til en fil</translation> + </message> + <message> + <location line="+3"/> + <source>&Export</source> + <translation>Eksporter</translation> + </message> + <message> + <location line="-44"/> <source>Verify a message to ensure it was signed with a specified Bitcoin address</source> <translation>Efterprøv en besked for at sikre, at den er underskrevet med den angivne Bitcoin-adresse</translation> </message> @@ -318,12 +328,12 @@ Produktet indeholder software som er udviklet af OpenSSL Project til brug i Open <translation>Underskriv besked...</translation> </message> <message> - <location line="+299"/> + <location line="+280"/> <source>Synchronizing with network...</source> <translation>Synkroniserer med netværk...</translation> </message> <message> - <location line="-368"/> + <location line="-349"/> <source>&Overview</source> <translation>Oversigt</translation> </message> @@ -398,7 +408,7 @@ Produktet indeholder software som er udviklet af OpenSSL Project til brug i Open <translation>Skift adgangskode...</translation> </message> <message> - <location line="+304"/> + <location line="+285"/> <source>Importing blocks from disk...</source> <translation>Importerer blokke fra disken...</translation> </message> @@ -408,12 +418,7 @@ Produktet indeholder software som er udviklet af OpenSSL Project til brug i Open <translation>Genindekserer blokke på disken...</translation> </message> <message> - <location line="-300"/> - <source>&Export...</source> - <translation>Eksporter...</translation> - </message> - <message> - <location line="-66"/> + <location line="-347"/> <source>Send coins to a Bitcoin address</source> <translation>Send bitcoins til en Bitcoin-adresse</translation> </message> @@ -423,12 +428,7 @@ Produktet indeholder software som er udviklet af OpenSSL Project til brug i Open <translation>Rediger konfigurationsindstillinger af Bitcoin</translation> </message> <message> - <location line="+18"/> - <source>Export the data in the current tab to a file</source> - <translation>Eksporter den aktuelle visning til en fil</translation> - </message> - <message> - <location line="-9"/> + <location line="+9"/> <source>Backup wallet to another location</source> <translation>Lav sikkerhedskopi af tegnebogen til et andet sted</translation> </message> @@ -438,7 +438,7 @@ Produktet indeholder software som er udviklet af OpenSSL Project til brug i Open <translation>Skift adgangskode anvendt til tegnebogskryptering</translation> </message> <message> - <location line="+9"/> + <location line="+6"/> <source>&Debug window</source> <translation>Fejlsøgningsvindue</translation> </message> @@ -448,23 +448,23 @@ Produktet indeholder software som er udviklet af OpenSSL Project til brug i Open <translation>Åbn fejlsøgnings- og diagnosticeringskonsollen</translation> </message> <message> - <location line="-7"/> + <location line="-4"/> <source>&Verify message...</source> <translation>Efterprøv besked...</translation> </message> <message> - <location line="-163"/> - <location line="+541"/> + <location line="-165"/> + <location line="+530"/> <source>Bitcoin</source> <translation>Bitcoin</translation> </message> <message> - <location line="-541"/> + <location line="-530"/> <source>Wallet</source> <translation>Tegnebog</translation> </message> <message> - <location line="+99"/> + <location line="+101"/> <source>&Send</source> <translation>Send</translation> </message> @@ -509,12 +509,12 @@ Produktet indeholder software som er udviklet af OpenSSL Project til brug i Open <translation>Efterprøv beskeder for at sikre, at de er underskrevet med de(n) angivne Bitcoin-adresse(r)</translation> </message> <message> - <location line="+31"/> + <location line="+28"/> <source>&File</source> <translation>Fil</translation> </message> <message> - <location line="+8"/> + <location line="+7"/> <source>&Settings</source> <translation>Indstillinger</translation> </message> @@ -529,12 +529,7 @@ Produktet indeholder software som er udviklet af OpenSSL Project til brug i Open <translation>Faneværktøjslinje</translation> </message> <message> - <location line="+8"/> - <source>Actions toolbar</source> - <translation>Handlingsværktøjslinje</translation> - </message> - <message> - <location line="+13"/> + <location line="+17"/> <location line="+10"/> <source>[testnet]</source> <translation>[testnetværk]</translation> @@ -545,12 +540,17 @@ Produktet indeholder software som er udviklet af OpenSSL Project til brug i Open <translation>Bitcoin-klient</translation> </message> <message numerus="yes"> - <location line="+140"/> + <location line="+141"/> <source>%n active connection(s) to Bitcoin network</source> <translation><numerusform>%n aktiv(e) forbindelse(r) til Bitcoin-netværket</numerusform><numerusform>%n aktiv(e) forbindelse(r) til Bitcoin-netværket</numerusform></translation> </message> <message> - <location line="+39"/> + <location line="+22"/> + <source>No block source available...</source> + <translation>Ingen blokkilde tilgængelig...</translation> + </message> + <message> + <location line="+12"/> <source>Processed %1 of %2 (estimated) blocks of transaction history.</source> <translation>%1 ud af %2 (estimeret) blokke af transaktionshistorikken er blevet behandlet.</translation> </message> @@ -575,7 +575,7 @@ Produktet indeholder software som er udviklet af OpenSSL Project til brug i Open <translation><numerusform>%n uge(r)</numerusform><numerusform>%n uge(r)</numerusform></translation> </message> <message> - <location line="+5"/> + <location line="+4"/> <source>%1 behind</source> <translation>%1 bagefter</translation> </message> @@ -590,7 +590,7 @@ Produktet indeholder software som er udviklet af OpenSSL Project til brug i Open <translation>Transaktioner herefter vil endnu ikke være synlige.</translation> </message> <message> - <location line="+21"/> + <location line="+22"/> <source>Error</source> <translation>Fejl</translation> </message> @@ -605,22 +605,22 @@ Produktet indeholder software som er udviklet af OpenSSL Project til brug i Open <translation>Information</translation> </message> <message> - <location line="+68"/> + <location line="+70"/> <source>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?</source> <translation>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?</translation> </message> <message> - <location line="-138"/> + <location line="-140"/> <source>Up to date</source> <translation>Opdateret</translation> </message> <message> - <location line="+32"/> + <location line="+31"/> <source>Catching up...</source> <translation>Indhenter...</translation> </message> <message> - <location line="+110"/> + <location line="+113"/> <source>Confirm transaction fee</source> <translation>Bekræft transaktionsgebyr</translation> </message> @@ -670,7 +670,7 @@ Adresse: %4 <translation>Tegnebog er <b>krypteret</b> og i øjeblikket <b>låst</b></translation> </message> <message> - <location filename="../bitcoin.cpp" line="+104"/> + <location filename="../bitcoin.cpp" line="+111"/> <source>A fatal error occurred. Bitcoin can no longer continue safely and will quit.</source> <translation>Der opstod en fatal fejl. Bitcoin kan ikke længere fortsætte sikkert og vil afslutte.</translation> </message> @@ -678,7 +678,7 @@ Adresse: %4 <context> <name>ClientModel</name> <message> - <location filename="../clientmodel.cpp" line="+98"/> + <location filename="../clientmodel.cpp" line="+104"/> <source>Network Alert</source> <translation>Netværksadvarsel</translation> </message> @@ -809,8 +809,8 @@ Adresse: %4 </message> <message> <location line="+6"/> - <source>Optional transaction fee per kB that helps make sure your transactions are processed quickly. Most transactions are 1 kB. Fee 0.01 recommended.</source> - <translation>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.</translation> + <source>Optional transaction fee per kB that helps make sure your transactions are processed quickly. Most transactions are 1 kB.</source> + <translation>Valgfrit transaktionsgebyr pr. kB, der hjælper dine transaktioner med at blive behandlet hurtigt. De fleste transaktioner er på 1 kB.</translation> </message> <message> <location line="+15"/> @@ -1059,7 +1059,7 @@ Adresse: %4 <translation>Summen af transaktioner, der endnu ikke er bekræftet og endnu ikke er inkluderet i den nuværende saldo</translation> </message> <message> - <location filename="../overviewpage.cpp" line="+115"/> + <location filename="../overviewpage.cpp" line="+116"/> <location line="+1"/> <source>out of sync</source> <translation>ikke synkroniseret</translation> @@ -1646,6 +1646,19 @@ Adresse: %4 </message> </context> <context> + <name>SplashScreen</name> + <message> + <location filename="../splashscreen.cpp" line="+22"/> + <source>The Bitcoin developers</source> + <translation>Bitcoin-udviklerne</translation> + </message> + <message> + <location line="+1"/> + <source>[testnet]</source> + <translation>[testnet]</translation> + </message> +</context> +<context> <name>TransactionDesc</name> <message> <location filename="../transactiondesc.cpp" line="+20"/> @@ -2120,9 +2133,27 @@ Adresse: %4 </message> </context> <context> + <name>WalletModel</name> + <message> + <location filename="../walletmodel.cpp" line="+193"/> + <source>Send Coins</source> + <translation>Send bitcoins</translation> + </message> +</context> +<context> <name>WalletView</name> <message> - <location filename="../walletview.cpp" line="+247"/> + <location filename="../walletview.cpp" line="+42"/> + <source>&Export</source> + <translation>Eksporter</translation> + </message> + <message> + <location line="+1"/> + <source>Export the data in the current tab to a file</source> + <translation>Eksportér den aktuelle visning til en fil</translation> + </message> + <message> + <location line="+193"/> <source>Backup Wallet</source> <translation>Sikkerhedskopier tegnebog</translation> </message> @@ -2155,37 +2186,37 @@ Adresse: %4 <context> <name>bitcoin-core</name> <message> - <location filename="../bitcoinstrings.cpp" line="+96"/> + <location filename="../bitcoinstrings.cpp" line="+94"/> <source>Bitcoin version</source> <translation>Bitcoin-version</translation> </message> <message> - <location line="+98"/> + <location line="+102"/> <source>Usage:</source> <translation>Anvendelse:</translation> </message> <message> - <location line="-25"/> + <location line="-29"/> <source>Send command to -server or bitcoind</source> <translation>Send kommando til -server eller bitcoind</translation> </message> <message> - <location line="-22"/> + <location line="-23"/> <source>List commands</source> <translation>Liste over kommandoer</translation> </message> <message> - <location line="-10"/> + <location line="-12"/> <source>Get help for a command</source> <translation>Få hjælp til en kommando</translation> </message> <message> - <location line="+21"/> + <location line="+24"/> <source>Options:</source> <translation>Indstillinger:</translation> </message> <message> - <location line="+23"/> + <location line="+24"/> <source>Specify configuration file (default: bitcoin.conf)</source> <translation>Angiv konfigurationsfil (standard: bitcoin.conf)</translation> </message> @@ -2195,27 +2226,17 @@ Adresse: %4 <translation>Angiv pid-fil (default: bitcoind.pid)</translation> </message> <message> - <location line="-48"/> - <source>Generate coins</source> - <translation>Generer bitcoins</translation> - </message> - <message> - <location line="-27"/> - <source>Don't generate coins</source> - <translation>Generer ikke bitcoins</translation> - </message> - <message> - <location line="+74"/> + <location line="-1"/> <source>Specify data directory</source> <translation>Angiv datakatalog</translation> </message> <message> - <location line="-8"/> + <location line="-9"/> <source>Set database cache size in megabytes (default: 25)</source> <translation>Angiv databasecachestørrelse i megabytes (standard: 25)</translation> </message> <message> - <location line="-27"/> + <location line="-28"/> <source>Listen for connections on <port> (default: 8333 or testnet: 18333)</source> <translation>Lyt til forbindelser på <port> (standard: 8333 eller testnetværk: 18333)</translation> </message> @@ -2230,7 +2251,7 @@ Adresse: %4 <translation>Forbind til en knude for at modtage adresse, og afbryd</translation> </message> <message> - <location line="+80"/> + <location line="+82"/> <source>Specify your own public address</source> <translation>Angiv din egen offentlige adresse</translation> </message> @@ -2240,22 +2261,22 @@ Adresse: %4 <translation>Grænse for afbrydelse til dårlige forbindelser (standard: 100)</translation> </message> <message> - <location line="-132"/> + <location line="-134"/> <source>Number of seconds to keep misbehaving peers from reconnecting (default: 86400)</source> <translation>Antal sekunder dårlige forbindelser skal vente før reetablering (standard: 86400)</translation> </message> <message> - <location line="-32"/> + <location line="-29"/> <source>An error occurred while setting up the RPC port %u for listening on IPv4: %s</source> <translation>Der opstod en fejl ved angivelse af RPC-porten %u til at lytte på IPv4: %s</translation> </message> <message> - <location line="+30"/> + <location line="+27"/> <source>Listen for JSON-RPC connections on <port> (default: 8332 or testnet: 18332)</source> <translation>Lyt til JSON-RPC-forbindelser på <port> (standard: 8332 eller testnetværk: 18332)</translation> </message> <message> - <location line="+36"/> + <location line="+37"/> <source>Accept command line and JSON-RPC commands</source> <translation>Accepter kommandolinje- og JSON-RPC-kommandoer</translation> </message> @@ -2265,17 +2286,17 @@ Adresse: %4 <translation>Kør i baggrunden som en service, og accepter kommandoer</translation> </message> <message> - <location line="+33"/> + <location line="+37"/> <source>Use the test network</source> <translation>Brug testnetværket</translation> </message> <message> - <location line="-108"/> + <location line="-112"/> <source>Accept connections from outside (default: 1 if no -proxy or -connect)</source> <translation>Accepter forbindelser udefra (standard: 1 hvis hverken -proxy eller -connect)</translation> </message> <message> - <location line="-82"/> + <location line="-80"/> <source>%s, you must set a rpcpassword in the configuration file: %s It is recommended you use the following random password: @@ -2316,11 +2337,6 @@ f.eks.: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com </message> <message> <location line="+3"/> - <source>Error initializing database environment %s! To recover, BACKUP THAT DIRECTORY, then remove everything from it except for wallet.dat.</source> - <translation>Klargøring af databasemiljø %s mislykkedes! For at genskabe, SIKKERHEDSKOPIER KATALOGET, fjern dernæst alt med undtagelse af wallet.dat.</translation> - </message> - <message> - <location line="+3"/> <source>Error: The transaction was rejected! This might happen if some of the coins in your wallet were already spent, such as if you used a copy of wallet.dat and coins were spent in the copy but not marked as spent here.</source> <translation>Fejl: Transaktionen blev afvist. Dette kan ske, hvis nogle af dine bitcoins i din tegnebog allerede er brugt, som hvis du brugte en kopi af wallet.dat og dine bitcoins er blevet brugt i kopien, men ikke er markeret som brugt her.</translation> </message> @@ -2345,12 +2361,7 @@ f.eks.: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com <translation>Angiv maksimumstørrelse for høj prioritet/lavt gebyr-transaktioner i bytes (standard: 27000)</translation> </message> <message> - <location line="+3"/> - <source>Set the number of script verification threads (1-16, 0=auto, default: 0)</source> - <translation>Angiv nummeret af skriptefterprøvningstråde (1-16, 0=automatisk, standard: 0)</translation> - </message> - <message> - <location line="+2"/> + <location line="+6"/> <source>This is a pre-release test build - use at your own risk - do not use for mining or merchant applications</source> <translation>Dette er en foreløbig testudgivelse - brug på eget ansvar - brug ikke til udvinding eller handelsprogrammer</translation> </message> @@ -2390,7 +2401,7 @@ f.eks.: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com <translation>Blokoprettelsestilvalg:</translation> </message> <message> - <location line="+6"/> + <location line="+5"/> <source>Connect only to the specified node(s)</source> <translation>Tilslut kun til de(n) angivne knude(r)</translation> </message> @@ -2410,7 +2421,7 @@ f.eks.: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com <translation>Ønsker du at genbygge blokdatabasen nu?</translation> </message> <message> - <location line="+3"/> + <location line="+2"/> <source>Error initializing block database</source> <translation>Klargøring af blokdatabase mislykkedes</translation> </message> @@ -2436,11 +2447,6 @@ f.eks.: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com </message> <message> <location line="+1"/> - <source>Error: Transaction creation failed!</source> - <translation>Fejl: Transaktionsoprettelse mislykkedes!</translation> - </message> - <message> - <location line="+1"/> <source>Error: Wallet locked, unable to create transaction!</source> <translation>Fejl: Tegnebog låst, kan ikke oprette transaktion!</translation> </message> @@ -2510,7 +2516,12 @@ f.eks.: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com <translation>Find ligeværdige ved DNS-opslag (standard: 1 hvis ikke -connect)</translation> </message> <message> - <location line="+3"/> + <location line="+1"/> + <source>Generate coins (default: 0)</source> + <translation>Generer bitcoins (standard: 0)</translation> + </message> + <message> + <location line="+2"/> <source>How many blocks to check at startup (default: 288, 0 = all)</source> <translation>Antal blokke som tjekkes ved opstart (0=alle, standard: 288)</translation> </message> @@ -2520,7 +2531,12 @@ f.eks.: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com <translation>Grundighed af efterprøvning af blokke (0-4, standard: 3)</translation> </message> <message> - <location line="+24"/> + <location line="+19"/> + <source>Not enough file descriptors available.</source> + <translation>For få tilgængelige fildeskriptorer.</translation> + </message> + <message> + <location line="+8"/> <source>Rebuild block chain index from current blk000??.dat files</source> <translation>Genbyg blokkædeindeks fra nuværende blk000??.dat filer</translation> </message> @@ -2530,7 +2546,7 @@ f.eks.: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com <translation>Angiv antallet af tråde til at håndtere RPC-kald (standard: 4)</translation> </message> <message> - <location line="+22"/> + <location line="+26"/> <source>Verifying blocks...</source> <translation>Efterprøver blokke...</translation> </message> @@ -2540,12 +2556,17 @@ f.eks.: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com <translation>Efterprøver tegnebog...</translation> </message> <message> - <location line="-62"/> + <location line="-69"/> <source>Imports blocks from external blk000??.dat file</source> <translation>Importerer blokke fra ekstern blk000??.dat fil</translation> </message> <message> - <location line="+1"/> + <location line="-76"/> + <source>Set the number of script verification threads (up to 16, 0 = auto, <0 = leave that many cores free, default: 0)</source> + <translation>Angiv nummeret af skriptefterprøvningstråde (op til 16, 0 = automatisk, <0 = efterlad det antal kerner tilgængelige, standard: 0)</translation> + </message> + <message> + <location line="+77"/> <source>Information</source> <translation>Information</translation> </message> @@ -2555,6 +2576,16 @@ f.eks.: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com <translation>Ugyldig -tor adresse: '%s'</translation> </message> <message> + <location line="+1"/> + <source>Invalid amount for -minrelaytxfee=<amount>: '%s'</source> + <translation>Ugyldigt beløb til -minrelaytxfee=<beløb>:'%s'</translation> + </message> + <message> + <location line="+1"/> + <source>Invalid amount for -mintxfee=<amount>: '%s'</source> + <translation>Ugyldigt beløb til -mintxfee=<beløb>:'%s'</translation> + </message> + <message> <location line="+8"/> <source>Maintain a full transaction index (default: 0)</source> <translation>Vedligehold et komplet transaktionsindeks (standard: 0)</translation> @@ -2570,7 +2601,7 @@ f.eks.: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com <translation>Maksimum for afsendelsesbuffer pr. forbindelse, <n>*1000 bytes (standard: 1000)</translation> </message> <message> - <location line="+1"/> + <location line="+2"/> <source>Only accept block chain matching built-in checkpoints (default: 1)</source> <translation>Accepter kun blokkæde, som matcher indbyggede kontrolposter (standard: 1)</translation> </message> @@ -2630,6 +2661,11 @@ f.eks.: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com <translation>Formindsk debug.log filen ved klientopstart (standard: 1 hvis ikke -debug)</translation> </message> <message> + <location line="+1"/> + <source>Signing transaction failed</source> + <translation>Underskrift af transaktion mislykkedes</translation> + </message> + <message> <location line="+2"/> <source>Specify connection timeout in milliseconds (default: 5000)</source> <translation>Angiv tilslutningstimeout i millisekunder (standard: 5000)</translation> @@ -2640,7 +2676,22 @@ f.eks.: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com <translation>Systemfejl: </translation> </message> <message> - <location line="+10"/> + <location line="+4"/> + <source>Transaction amount too small</source> + <translation>Transaktionsbeløb er for lavt</translation> + </message> + <message> + <location line="+1"/> + <source>Transaction amounts must be positive</source> + <translation>Transaktionsbeløb skal være positive</translation> + </message> + <message> + <location line="+1"/> + <source>Transaction too large</source> + <translation>Transaktionen er for stor</translation> + </message> + <message> + <location line="+7"/> <source>Use UPnP to map the listening port (default: 0)</source> <translation>Forsøg at bruge UPnP til at konfigurere den lyttende port (standard: 0)</translation> </message> @@ -2680,7 +2731,7 @@ f.eks.: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com <translation>wallet.dat ødelagt, redning af data mislykkedes</translation> </message> <message> - <location line="-46"/> + <location line="-50"/> <source>Password for JSON-RPC connections</source> <translation>Adgangskode til JSON-RPC-forbindelser</translation> </message> @@ -2695,17 +2746,17 @@ f.eks.: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com <translation>Send kommandoer til knude, der kører på <ip> (standard: 127.0.0.1)</translation> </message> <message> - <location line="-119"/> + <location line="-120"/> <source>Execute command when the best block changes (%s in cmd is replaced by block hash)</source> <translation>Udfør kommando, når den bedste blok ændres (%s i kommandoen erstattes med blokhash)</translation> </message> <message> - <location line="+142"/> + <location line="+147"/> <source>Upgrade wallet to latest format</source> <translation>Opgrader tegnebog til seneste format</translation> </message> <message> - <location line="-17"/> + <location line="-21"/> <source>Set key pool size to <n> (default: 100)</source> <translation>Angiv nøglepoolstørrelse til <n> (standard: 100)</translation> </message> @@ -2715,12 +2766,12 @@ f.eks.: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com <translation>Gennemsøg blokkæden for manglende tegnebogstransaktioner</translation> </message> <message> - <location line="+31"/> + <location line="+35"/> <source>Use OpenSSL (https) for JSON-RPC connections</source> <translation>Brug OpenSSL (https) for JSON-RPC-forbindelser</translation> </message> <message> - <location line="-22"/> + <location line="-26"/> <source>Server certificate file (default: server.cert)</source> <translation>Servercertifikat-fil (standard: server.cert)</translation> </message> @@ -2730,37 +2781,37 @@ f.eks.: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com <translation>Serverens private nøgle (standard: server.pem)</translation> </message> <message> - <location line="-153"/> + <location line="-151"/> <source>Acceptable ciphers (default: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH)</source> <translation>Acceptable ciphers (standard: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH)</translation> </message> <message> - <location line="+166"/> + <location line="+165"/> <source>This help message</source> <translation>Denne hjælpebesked</translation> </message> <message> - <location line="+3"/> + <location line="+6"/> <source>Unable to bind to %s on this computer (bind returned error %d, %s)</source> <translation>Kunne ikke tildele %s på denne computer (bind returnerede fejl %d, %s)</translation> </message> <message> - <location line="-86"/> + <location line="-91"/> <source>Connect through socks proxy</source> <translation>Tilslut via SOCKS-proxy</translation> </message> <message> - <location line="-11"/> + <location line="-10"/> <source>Allow DNS lookups for -addnode, -seednode and -connect</source> <translation>Tillad DNS-opslag for -addnode, -seednode og -connect</translation> </message> <message> - <location line="+56"/> + <location line="+55"/> <source>Loading addresses...</source> <translation>Indlæser adresser...</translation> </message> <message> - <location line="-34"/> + <location line="-35"/> <source>Error loading wallet.dat: Wallet corrupted</source> <translation>Fejl ved indlæsning af wallet.dat: Tegnebog ødelagt</translation> </message> @@ -2770,22 +2821,22 @@ f.eks.: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com <translation>Fejl ved indlæsning af wallet.dat: Tegnebog kræver en nyere version af Bitcoin</translation> </message> <message> - <location line="+87"/> + <location line="+93"/> <source>Wallet needed to be rewritten: restart Bitcoin to complete</source> <translation>Det var nødvendigt at genskrive tegnebogen: genstart Bitcoin for at gennemføre</translation> </message> <message> - <location line="-89"/> + <location line="-95"/> <source>Error loading wallet.dat</source> <translation>Fejl ved indlæsning af wallet.dat</translation> </message> <message> - <location line="+29"/> + <location line="+28"/> <source>Invalid -proxy address: '%s'</source> <translation>Ugyldig -proxy adresse: '%s'</translation> </message> <message> - <location line="+49"/> + <location line="+56"/> <source>Unknown network specified in -onlynet: '%s'</source> <translation>Ukendt netværk anført i -onlynet: '%s'</translation> </message> @@ -2795,7 +2846,7 @@ f.eks.: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com <translation>Ukendt -socks proxy-version: %i</translation> </message> <message> - <location line="-91"/> + <location line="-96"/> <source>Cannot resolve -bind address: '%s'</source> <translation>Kan ikke finde -bind adressen: '%s'</translation> </message> @@ -2815,17 +2866,17 @@ f.eks.: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com <translation>Ugyldigt beløb</translation> </message> <message> - <location line="-4"/> + <location line="-6"/> <source>Insufficient funds</source> <translation>Manglende dækning</translation> </message> <message> - <location line="+8"/> + <location line="+10"/> <source>Loading block index...</source> <translation>Indlæser blokindeks...</translation> </message> <message> - <location line="-58"/> + <location line="-57"/> <source>Add a node to connect to and attempt to keep the connection open</source> <translation>Tilføj en knude til at forbinde til og forsøg at holde forbindelsen åben</translation> </message> @@ -2835,52 +2886,47 @@ f.eks.: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com <translation>Kunne ikke tildele %s på denne computer. Bitcoin kører sikkert allerede.</translation> </message> <message> - <location line="+67"/> + <location line="+64"/> <source>Fee per KB to add to transactions you send</source> <translation>Gebyr pr. kB, som skal tilføjes til transaktioner, du sender</translation> </message> <message> - <location line="+17"/> + <location line="+19"/> <source>Loading wallet...</source> <translation>Indlæser tegnebog...</translation> </message> <message> - <location line="-53"/> + <location line="-52"/> <source>Cannot downgrade wallet</source> <translation>Kan ikke nedgradere tegnebog</translation> </message> <message> - <location line="+1"/> - <source>Cannot initialize keypool</source> - <translation>Kan ikke påbegynde nøglepulje</translation> - </message> - <message> <location line="+3"/> <source>Cannot write default address</source> <translation>Kan ikke skrive standardadresse</translation> </message> <message> - <location line="+63"/> + <location line="+64"/> <source>Rescanning...</source> <translation>Genindlæser...</translation> </message> <message> - <location line="-55"/> + <location line="-57"/> <source>Done loading</source> <translation>Indlæsning gennemført</translation> </message> <message> - <location line="+79"/> + <location line="+82"/> <source>To use the %s option</source> <translation>For at bruge %s mulighed</translation> </message> <message> - <location line="-71"/> + <location line="-74"/> <source>Error</source> <translation>Fejl</translation> </message> <message> - <location line="-33"/> + <location line="-31"/> <source>You must set rpcpassword=<password> in the configuration file: %s If the file does not exist, create it with owner-readable-only file permissions.</source> diff --git a/src/qt/locale/bitcoin_de.ts b/src/qt/locale/bitcoin_de.ts index 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.</translation> </message> <message> - <location filename="../aboutdialog.cpp" line="+17"/> + <location filename="../aboutdialog.cpp" line="+14"/> <source>Copyright</source> <translation>Copyright</translation> </message> <message> <location line="+0"/> - <source>2009-%1 The Bitcoin developers</source> - <translation>2009-%1 Die Bitcoinentwickler</translation> + <source>The Bitcoin developers</source> + <translation>Die Bitcoinentwickler</translation> </message> </context> <context> @@ -66,7 +66,7 @@ Dieses Produkt enthält Software, die vom OpenSSL-Projekt zur Verwendung im Open <translation>&Neue Adresse</translation> </message> <message> - <location filename="../addressbookpage.cpp" line="+59"/> + <location filename="../addressbookpage.cpp" line="+63"/> <source>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.</source> <translation>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.</translation> </message> @@ -96,7 +96,17 @@ Dieses Produkt enthält Software, die vom OpenSSL-Projekt zur Verwendung im Open <translation>Die ausgewählte Adresse aus der Liste entfernen.</translation> </message> <message> - <location line="-14"/> + <location line="+27"/> + <source>Export the data in the current tab to a file</source> + <translation>Daten der aktuellen Ansicht in eine Datei exportieren</translation> + </message> + <message> + <location line="+3"/> + <source>&Export</source> + <translation>E&xportieren</translation> + </message> + <message> + <location line="-44"/> <source>Verify a message to ensure it was signed with a specified Bitcoin address</source> <translation>Eine Nachricht verifizieren, um sicherzustellen, dass diese mit einer angegebenen Bitcoin-Adresse signiert wurde</translation> </message> @@ -318,12 +328,12 @@ Dieses Produkt enthält Software, die vom OpenSSL-Projekt zur Verwendung im Open <translation>Nachricht s&ignieren...</translation> </message> <message> - <location line="+299"/> + <location line="+280"/> <source>Synchronizing with network...</source> <translation>Synchronisiere mit Netzwerk...</translation> </message> <message> - <location line="-368"/> + <location line="-349"/> <source>&Overview</source> <translation>&Übersicht</translation> </message> @@ -398,7 +408,7 @@ Dieses Produkt enthält Software, die vom OpenSSL-Projekt zur Verwendung im Open <translation>Passphrase &ändern...</translation> </message> <message> - <location line="+304"/> + <location line="+285"/> <source>Importing blocks from disk...</source> <translation>Importiere Blöcke von Laufwerk...</translation> </message> @@ -408,12 +418,7 @@ Dieses Produkt enthält Software, die vom OpenSSL-Projekt zur Verwendung im Open <translation>Reindiziere Blöcke auf Laufwerk...</translation> </message> <message> - <location line="-300"/> - <source>&Export...</source> - <translation>&Exportieren...</translation> - </message> - <message> - <location line="-66"/> + <location line="-347"/> <source>Send coins to a Bitcoin address</source> <translation>Bitcoins an eine Bitcoin-Adresse überweisen</translation> </message> @@ -423,12 +428,7 @@ Dieses Produkt enthält Software, die vom OpenSSL-Projekt zur Verwendung im Open <translation>Die Konfiguration des Clients bearbeiten</translation> </message> <message> - <location line="+18"/> - <source>Export the data in the current tab to a file</source> - <translation>Daten der aktuellen Ansicht in eine Datei exportieren</translation> - </message> - <message> - <location line="-9"/> + <location line="+9"/> <source>Backup wallet to another location</source> <translation>Eine Sicherungskopie der Brieftasche erstellen und abspeichern</translation> </message> @@ -438,7 +438,7 @@ Dieses Produkt enthält Software, die vom OpenSSL-Projekt zur Verwendung im Open <translation>Ändert die Passphrase, die für die Verschlüsselung der Brieftasche benutzt wird</translation> </message> <message> - <location line="+9"/> + <location line="+6"/> <source>&Debug window</source> <translation>&Debugfenster</translation> </message> @@ -448,23 +448,23 @@ Dieses Produkt enthält Software, die vom OpenSSL-Projekt zur Verwendung im Open <translation>Debugging- und Diagnosekonsole öffnen</translation> </message> <message> - <location line="-7"/> + <location line="-4"/> <source>&Verify message...</source> <translation>Nachricht &verifizieren...</translation> </message> <message> - <location line="-163"/> - <location line="+541"/> + <location line="-165"/> + <location line="+530"/> <source>Bitcoin</source> <translation>Bitcoin</translation> </message> <message> - <location line="-541"/> + <location line="-530"/> <source>Wallet</source> <translation>Brieftasche</translation> </message> <message> - <location line="+99"/> + <location line="+101"/> <source>&Send</source> <translation>Überweisen</translation> </message> @@ -509,12 +509,12 @@ Dieses Produkt enthält Software, die vom OpenSSL-Projekt zur Verwendung im Open <translation>Nachrichten verifizieren, um sicherzustellen, dass diese mit den angegebenen Bitcoin-Adressen signiert wurden</translation> </message> <message> - <location line="+31"/> + <location line="+28"/> <source>&File</source> <translation>&Datei</translation> </message> <message> - <location line="+8"/> + <location line="+7"/> <source>&Settings</source> <translation>&Einstellungen</translation> </message> @@ -529,12 +529,7 @@ Dieses Produkt enthält Software, die vom OpenSSL-Projekt zur Verwendung im Open <translation>Registerkartenleiste</translation> </message> <message> - <location line="+8"/> - <source>Actions toolbar</source> - <translation>Aktionssymbolleiste</translation> - </message> - <message> - <location line="+13"/> + <location line="+17"/> <location line="+10"/> <source>[testnet]</source> <translation>[Testnetz]</translation> @@ -545,12 +540,17 @@ Dieses Produkt enthält Software, die vom OpenSSL-Projekt zur Verwendung im Open <translation>Bitcoin-Client</translation> </message> <message numerus="yes"> - <location line="+140"/> + <location line="+141"/> <source>%n active connection(s) to Bitcoin network</source> <translation><numerusform>%n aktive Verbindung zum Bitcoin-Netzwerk</numerusform><numerusform>%n aktive Verbindungen zum Bitcoin-Netzwerk</numerusform></translation> </message> <message> - <location line="+39"/> + <location line="+22"/> + <source>No block source available...</source> + <translation>Keine Blockquelle verfügbar...</translation> + </message> + <message> + <location line="+12"/> <source>Processed %1 of %2 (estimated) blocks of transaction history.</source> <translation>%1 von (geschätzten) %2 Blöcken des Transaktionsverlaufs verarbeitet.</translation> </message> @@ -575,7 +575,7 @@ Dieses Produkt enthält Software, die vom OpenSSL-Projekt zur Verwendung im Open <translation><numerusform>%n Woche</numerusform><numerusform>%n Wochen</numerusform></translation> </message> <message> - <location line="+5"/> + <location line="+4"/> <source>%1 behind</source> <translation>%1 im Rückstand</translation> </message> @@ -590,7 +590,7 @@ Dieses Produkt enthält Software, die vom OpenSSL-Projekt zur Verwendung im Open <translation>Transaktionen hiernach werden noch nicht angezeigt.</translation> </message> <message> - <location line="+21"/> + <location line="+22"/> <source>Error</source> <translation>Fehler</translation> </message> @@ -605,22 +605,22 @@ Dieses Produkt enthält Software, die vom OpenSSL-Projekt zur Verwendung im Open <translation>Hinweis</translation> </message> <message> - <location line="+68"/> + <location line="+70"/> <source>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?</source> <translation>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?</translation> </message> <message> - <location line="-138"/> + <location line="-140"/> <source>Up to date</source> <translation>Auf aktuellem Stand</translation> </message> <message> - <location line="+32"/> + <location line="+31"/> <source>Catching up...</source> <translation>Hole auf...</translation> </message> <message> - <location line="+110"/> + <location line="+113"/> <source>Confirm transaction fee</source> <translation>Transaktionsgebühr bestätigen</translation> </message> @@ -669,7 +669,7 @@ Adresse: %4</translation> <translation>Brieftasche ist <b>verschlüsselt</b> und aktuell <b>gesperrt</b></translation> </message> <message> - <location filename="../bitcoin.cpp" line="+104"/> + <location filename="../bitcoin.cpp" line="+111"/> <source>A fatal error occurred. Bitcoin can no longer continue safely and will quit.</source> <translation>Ein schwerer Fehler ist aufgetreten. Bitcoin kann nicht stabil weiter ausgeführt werden und wird beendet.</translation> </message> @@ -677,7 +677,7 @@ Adresse: %4</translation> <context> <name>ClientModel</name> <message> - <location filename="../clientmodel.cpp" line="+98"/> + <location filename="../clientmodel.cpp" line="+104"/> <source>Network Alert</source> <translation>Netzwerkalarm</translation> </message> @@ -808,8 +808,8 @@ Adresse: %4</translation> </message> <message> <location line="+6"/> - <source>Optional transaction fee per kB that helps make sure your transactions are processed quickly. Most transactions are 1 kB. Fee 0.01 recommended.</source> - <translation>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.</translation> + <source>Optional transaction fee per kB that helps make sure your transactions are processed quickly. Most transactions are 1 kB.</source> + <translation>Optionale Transaktionsgebühr pro KB, die sicherstellt, dass Ihre Transaktionen schnell bearbeitet werden. Die meisten Transaktionen sind 1 kB groß.</translation> </message> <message> <location line="+15"/> @@ -1058,7 +1058,7 @@ Adresse: %4</translation> <translation>Betrag aus unbestätigten Transaktionen, der noch nicht im aktuellen Kontostand enthalten ist</translation> </message> <message> - <location filename="../overviewpage.cpp" line="+115"/> + <location filename="../overviewpage.cpp" line="+116"/> <location line="+1"/> <source>out of sync</source> <translation>nicht synchron</translation> @@ -1135,7 +1135,7 @@ Adresse: %4</translation> <message> <location filename="../forms/rpcconsole.ui" line="+46"/> <source>Client name</source> - <translation>Client Name</translation> + <translation>Clientname</translation> </message> <message> <location line="+10"/> @@ -1154,7 +1154,7 @@ Adresse: %4</translation> <message> <location line="-217"/> <source>Client version</source> - <translation>Client Version</translation> + <translation>Clientversion</translation> </message> <message> <location line="-45"/> @@ -1645,6 +1645,19 @@ Adresse: %4</translation> </message> </context> <context> + <name>SplashScreen</name> + <message> + <location filename="../splashscreen.cpp" line="+22"/> + <source>The Bitcoin developers</source> + <translation>Die Bitcoinentwickler</translation> + </message> + <message> + <location line="+1"/> + <source>[testnet]</source> + <translation>[Testnetz]</translation> + </message> +</context> +<context> <name>TransactionDesc</name> <message> <location filename="../transactiondesc.cpp" line="+20"/> @@ -2119,9 +2132,27 @@ Adresse: %4</translation> </message> </context> <context> + <name>WalletModel</name> + <message> + <location filename="../walletmodel.cpp" line="+193"/> + <source>Send Coins</source> + <translation>Bitcoins überweisen</translation> + </message> +</context> +<context> <name>WalletView</name> <message> - <location filename="../walletview.cpp" line="+247"/> + <location filename="../walletview.cpp" line="+42"/> + <source>&Export</source> + <translation>E&xportieren</translation> + </message> + <message> + <location line="+1"/> + <source>Export the data in the current tab to a file</source> + <translation>Daten der aktuellen Ansicht in eine Datei exportieren</translation> + </message> + <message> + <location line="+193"/> <source>Backup Wallet</source> <translation>Brieftasche sichern</translation> </message> @@ -2154,37 +2185,37 @@ Adresse: %4</translation> <context> <name>bitcoin-core</name> <message> - <location filename="../bitcoinstrings.cpp" line="+96"/> + <location filename="../bitcoinstrings.cpp" line="+94"/> <source>Bitcoin version</source> <translation>Bitcoin-Version</translation> </message> <message> - <location line="+98"/> + <location line="+102"/> <source>Usage:</source> <translation>Benutzung:</translation> </message> <message> - <location line="-25"/> + <location line="-29"/> <source>Send command to -server or bitcoind</source> <translation>Befehl an -server oder bitcoind senden</translation> </message> <message> - <location line="-22"/> + <location line="-23"/> <source>List commands</source> <translation>Befehle auflisten</translation> </message> <message> - <location line="-10"/> + <location line="-12"/> <source>Get help for a command</source> <translation>Hilfe zu einem Befehl erhalten</translation> </message> <message> - <location line="+21"/> + <location line="+24"/> <source>Options:</source> <translation>Optionen:</translation> </message> <message> - <location line="+23"/> + <location line="+24"/> <source>Specify configuration file (default: bitcoin.conf)</source> <translation>Konfigurationsdatei festlegen (Standard: bitcoin.conf)</translation> </message> @@ -2194,27 +2225,17 @@ Adresse: %4</translation> <translation>PID-Datei festlegen (Standard: bitcoind.pid)</translation> </message> <message> - <location line="-48"/> - <source>Generate coins</source> - <translation>Bitcoins generieren</translation> - </message> - <message> - <location line="-27"/> - <source>Don't generate coins</source> - <translation>Keine Bitcoins generieren</translation> - </message> - <message> - <location line="+74"/> + <location line="-1"/> <source>Specify data directory</source> <translation>Datenverzeichnis festlegen</translation> </message> <message> - <location line="-8"/> + <location line="-9"/> <source>Set database cache size in megabytes (default: 25)</source> <translation>Größe des Datenbankcaches in MB festlegen (Standard: 25)</translation> </message> <message> - <location line="-27"/> + <location line="-28"/> <source>Listen for connections on <port> (default: 8333 or testnet: 18333)</source> <translation><port> nach Verbindungen abhören (Standard: 8333 oder Testnetz: 18333)</translation> </message> @@ -2229,7 +2250,7 @@ Adresse: %4</translation> <translation>Mit dem Knoten verbinden um Adressen von Gegenstellen abzufragen, danach trennen</translation> </message> <message> - <location line="+80"/> + <location line="+82"/> <source>Specify your own public address</source> <translation>Die eigene öffentliche Adresse angeben</translation> </message> @@ -2239,22 +2260,22 @@ Adresse: %4</translation> <translation>Schwellenwert, um Verbindungen zu sich nicht konform verhaltenden Gegenstellen zu beenden (Standard: 100)</translation> </message> <message> - <location line="-132"/> + <location line="-134"/> <source>Number of seconds to keep misbehaving peers from reconnecting (default: 86400)</source> <translation>Anzahl Sekunden, während denen sich nicht konform verhaltenden Gegenstellen die Wiederverbindung verweigert wird (Standard: 86400)</translation> </message> <message> - <location line="-32"/> + <location line="-29"/> <source>An error occurred while setting up the RPC port %u for listening on IPv4: %s</source> <translation>Beim Einrichten des abzuhörenden RPC-Ports %u für IPv4 ist ein Fehler aufgetreten: %s</translation> </message> <message> - <location line="+30"/> + <location line="+27"/> <source>Listen for JSON-RPC connections on <port> (default: 8332 or testnet: 18332)</source> <translation><port> nach JSON-RPC-Verbindungen abhören (Standard: 8332 oder Testnetz: 18332)</translation> </message> <message> - <location line="+36"/> + <location line="+37"/> <source>Accept command line and JSON-RPC commands</source> <translation>Kommandozeilenbefehle und JSON-RPC-Befehle annehmen</translation> </message> @@ -2264,17 +2285,17 @@ Adresse: %4</translation> <translation>Als Hintergrunddienst starten und Befehle annehmen</translation> </message> <message> - <location line="+33"/> + <location line="+37"/> <source>Use the test network</source> <translation>Das Testnetz verwenden</translation> </message> <message> - <location line="-108"/> + <location line="-112"/> <source>Accept connections from outside (default: 1 if no -proxy or -connect)</source> <translation>Eingehende Verbindungen annehmen (Standard: 1, wenn nicht -proxy oder -connect)</translation> </message> <message> - <location line="-82"/> + <location line="-80"/> <source>%s, you must set a rpcpassword in the configuration file: %s It is recommended you use the following random password: @@ -2315,11 +2336,6 @@ zum Beispiel: alertnotify=echo %%s | mail -s \"Bitcoin Alert\" admin@f </message> <message> <location line="+3"/> - <source>Error initializing database environment %s! To recover, BACKUP THAT DIRECTORY, then remove everything from it except for wallet.dat.</source> - <translation>Fehler beim Initialisieren der Datenbankumgebung %s! Zur Wiederherstellung, sichern Sie dieses Verzeichnis und löschen darin dann alles, außer wallet.dat.</translation> - </message> - <message> - <location line="+3"/> <source>Error: The transaction was rejected! This might happen if some of the coins in your wallet were already spent, such as if you used a copy of wallet.dat and coins were spent in the copy but not marked as spent here.</source> <translation>Fehler: Die Transaktion wurde abgelehnt! Dies kann passieren, wenn einige Bitcoins aus Ihrer Brieftasche bereits ausgegeben wurden. Beispielsweise weil Sie eine Kopie Ihrer wallet.dat genutzt, die Bitcoins dort ausgegeben haben und dies daher in der derzeit aktiven Brieftasche nicht vermerkt ist.</translation> </message> @@ -2344,12 +2360,7 @@ zum Beispiel: alertnotify=echo %%s | mail -s \"Bitcoin Alert\" admin@f <translation>Maximale Größe von "high-priority/low-fee"-Transaktionen in Byte festlegen (Standard: 27000)</translation> </message> <message> - <location line="+3"/> - <source>Set the number of script verification threads (1-16, 0=auto, default: 0)</source> - <translation>Maximale Anzahl an Skript-Verifizierungs-Threads festlegen (1-16, 0 = automatisch, Standard: 0)</translation> - </message> - <message> - <location line="+2"/> + <location line="+6"/> <source>This is a pre-release test build - use at your own risk - do not use for mining or merchant applications</source> <translation>Dies ist eine Vorab-Testversion - Verwendung auf eigene Gefahr - nicht für Mining- oder Handelsanwendungen nutzen!</translation> </message> @@ -2389,7 +2400,7 @@ zum Beispiel: alertnotify=echo %%s | mail -s \"Bitcoin Alert\" admin@f <translation>Blockerzeugungsoptionen:</translation> </message> <message> - <location line="+6"/> + <location line="+5"/> <source>Connect only to the specified node(s)</source> <translation>Nur mit dem/den angegebenen Knoten verbinden</translation> </message> @@ -2409,7 +2420,7 @@ zum Beispiel: alertnotify=echo %%s | mail -s \"Bitcoin Alert\" admin@f <translation>Möchten Sie die Blockdatenbank nun neu aufbauen?</translation> </message> <message> - <location line="+3"/> + <location line="+2"/> <source>Error initializing block database</source> <translation>Fehler beim Initialisieren der Blockdatenbank</translation> </message> @@ -2435,11 +2446,6 @@ zum Beispiel: alertnotify=echo %%s | mail -s \"Bitcoin Alert\" admin@f </message> <message> <location line="+1"/> - <source>Error: Transaction creation failed!</source> - <translation>Fehler: Transaktionserstellung fehlgeschlagen!</translation> - </message> - <message> - <location line="+1"/> <source>Error: Wallet locked, unable to create transaction!</source> <translation>Fehler: Brieftasche gesperrt, Transaktion kann nicht erstellt werden!</translation> </message> @@ -2509,7 +2515,12 @@ zum Beispiel: alertnotify=echo %%s | mail -s \"Bitcoin Alert\" admin@f <translation>Gegenstellen via DNS-Namensauflösung finden (Standard: 1, außer bei -connect)</translation> </message> <message> - <location line="+3"/> + <location line="+1"/> + <source>Generate coins (default: 0)</source> + <translation>Bitcoins generieren (Standard: 0)</translation> + </message> + <message> + <location line="+2"/> <source>How many blocks to check at startup (default: 288, 0 = all)</source> <translation>Wieviele Blöcke sollen beim Starten geprüft werden (Standard: 288, 0 = alle)</translation> </message> @@ -2519,7 +2530,12 @@ zum Beispiel: alertnotify=echo %%s | mail -s \"Bitcoin Alert\" admin@f <translation>Wie gründlich soll die Blockprüfung sein (0-4, Standard: 3)</translation> </message> <message> - <location line="+24"/> + <location line="+19"/> + <source>Not enough file descriptors available.</source> + <translation>Nicht genügend File-Deskriptoren verfügbar.</translation> + </message> + <message> + <location line="+8"/> <source>Rebuild block chain index from current blk000??.dat files</source> <translation>Blockkettenindex aus aktuellen Dateien blk000??.dat wiederaufbauen</translation> </message> @@ -2529,7 +2545,7 @@ zum Beispiel: alertnotify=echo %%s | mail -s \"Bitcoin Alert\" admin@f <translation>Maximale Anzahl an Threads zur Verarbeitung von RPC-Anfragen festlegen (Standard: 4)</translation> </message> <message> - <location line="+22"/> + <location line="+26"/> <source>Verifying blocks...</source> <translation>Verifiziere Blöcke...</translation> </message> @@ -2539,12 +2555,17 @@ zum Beispiel: alertnotify=echo %%s | mail -s \"Bitcoin Alert\" admin@f <translation>Verifiziere Brieftasche...</translation> </message> <message> - <location line="-62"/> + <location line="-69"/> <source>Imports blocks from external blk000??.dat file</source> <translation>Blöcke aus externer Datei blk000??.dat importieren</translation> </message> <message> - <location line="+1"/> + <location line="-76"/> + <source>Set the number of script verification threads (up to 16, 0 = auto, <0 = leave that many cores free, default: 0)</source> + <translation>Maximale Anzahl an Skript-Verifizierungs-Threads festlegen (bis zu 16, 0 = automatisch, <0 = soviele Kerne frei lassen, Standard: 0)</translation> + </message> + <message> + <location line="+77"/> <source>Information</source> <translation>Hinweis</translation> </message> @@ -2554,6 +2575,16 @@ zum Beispiel: alertnotify=echo %%s | mail -s \"Bitcoin Alert\" admin@f <translation>Ungültige Adresse in -tor: '%s'</translation> </message> <message> + <location line="+1"/> + <source>Invalid amount for -minrelaytxfee=<amount>: '%s'</source> + <translation>Ungültiger Betrag für -minrelaytxfee=<amount>: '%s'</translation> + </message> + <message> + <location line="+1"/> + <source>Invalid amount for -mintxfee=<amount>: '%s'</source> + <translation>Ungültiger Betrag für -mintxfee=<amount>: '%s'</translation> + </message> + <message> <location line="+8"/> <source>Maintain a full transaction index (default: 0)</source> <translation>Einen vollständigen Transaktionsindex pflegen (Standard: 0)</translation> @@ -2569,7 +2600,7 @@ zum Beispiel: alertnotify=echo %%s | mail -s \"Bitcoin Alert\" admin@f <translation>Maximale Größe, <n> * 1000 Byte, des Sendepuffers pro Verbindung (Standard: 1000)</translation> </message> <message> - <location line="+1"/> + <location line="+2"/> <source>Only accept block chain matching built-in checkpoints (default: 1)</source> <translation>Blockkette nur akzeptieren, wenn sie mit den integrierten Prüfpunkten übereinstimmt (Standard: 1)</translation> </message> @@ -2629,6 +2660,11 @@ zum Beispiel: alertnotify=echo %%s | mail -s \"Bitcoin Alert\" admin@f <translation>Verkleinere Datei debug.log beim Start des Clients (Standard: 1, wenn kein -debug)</translation> </message> <message> + <location line="+1"/> + <source>Signing transaction failed</source> + <translation>Signierung der Transaktion fehlgeschlagen</translation> + </message> + <message> <location line="+2"/> <source>Specify connection timeout in milliseconds (default: 5000)</source> <translation>Verbindungstimeout in Millisekunden festlegen (Standard: 5000)</translation> @@ -2639,7 +2675,22 @@ zum Beispiel: alertnotify=echo %%s | mail -s \"Bitcoin Alert\" admin@f <translation>Systemfehler: </translation> </message> <message> - <location line="+10"/> + <location line="+4"/> + <source>Transaction amount too small</source> + <translation>Transaktionsbetrag zu gering</translation> + </message> + <message> + <location line="+1"/> + <source>Transaction amounts must be positive</source> + <translation>Transaktionsbeträge müssen positiv sein</translation> + </message> + <message> + <location line="+1"/> + <source>Transaction too large</source> + <translation>Transaktion zu groß</translation> + </message> + <message> + <location line="+7"/> <source>Use UPnP to map the listening port (default: 0)</source> <translation>UPnP verwenden, um die Portweiterleitung einzurichten (Standard: 0)</translation> </message> @@ -2671,7 +2722,7 @@ zum Beispiel: alertnotify=echo %%s | mail -s \"Bitcoin Alert\" admin@f <message> <location line="+1"/> <source>You need to rebuild the databases using -reindex to change -txindex</source> - <translation>Sie müssen die Datenbanken mit Hilfe von -reindex neu aufbauen, um -txindex verändern zu können.</translation> + <translation>Sie müssen die Datenbank mit Hilfe von -reindex neu aufbauen, um -txindex zu verändern.</translation> </message> <message> <location line="+1"/> @@ -2679,7 +2730,7 @@ zum Beispiel: alertnotify=echo %%s | mail -s \"Bitcoin Alert\" admin@f <translation>wallet.dat beschädigt, Rettung fehlgeschlagen</translation> </message> <message> - <location line="-46"/> + <location line="-50"/> <source>Password for JSON-RPC connections</source> <translation>Passwort für JSON-RPC-Verbindungen</translation> </message> @@ -2694,17 +2745,17 @@ zum Beispiel: alertnotify=echo %%s | mail -s \"Bitcoin Alert\" admin@f <translation>Sende Befehle an Knoten <ip> (Standard: 127.0.0.1)</translation> </message> <message> - <location line="-119"/> + <location line="-120"/> <source>Execute command when the best block changes (%s in cmd is replaced by block hash)</source> <translation>Kommando ausführen wenn der beste Block wechselt (%s im Kommando wird durch den Hash des Blocks ersetzt)</translation> </message> <message> - <location line="+142"/> + <location line="+147"/> <source>Upgrade wallet to latest format</source> <translation>Brieftasche auf das neueste Format aktualisieren</translation> </message> <message> - <location line="-17"/> + <location line="-21"/> <source>Set key pool size to <n> (default: 100)</source> <translation>Größe des Schlüsselpools festlegen auf <n> (Standard: 100)</translation> </message> @@ -2714,12 +2765,12 @@ zum Beispiel: alertnotify=echo %%s | mail -s \"Bitcoin Alert\" admin@f <translation>Blockkette erneut nach fehlenden Transaktionen der Brieftasche durchsuchen</translation> </message> <message> - <location line="+31"/> + <location line="+35"/> <source>Use OpenSSL (https) for JSON-RPC connections</source> <translation>OpenSSL (https) für JSON-RPC-Verbindungen verwenden</translation> </message> <message> - <location line="-22"/> + <location line="-26"/> <source>Server certificate file (default: server.cert)</source> <translation>Serverzertifikat (Standard: server.cert)</translation> </message> @@ -2729,37 +2780,37 @@ zum Beispiel: alertnotify=echo %%s | mail -s \"Bitcoin Alert\" admin@f <translation>Privater Serverschlüssel (Standard: server.pem)</translation> </message> <message> - <location line="-153"/> + <location line="-151"/> <source>Acceptable ciphers (default: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH)</source> <translation>Akzeptierte Chiffren (Standard: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH)</translation> </message> <message> - <location line="+166"/> + <location line="+165"/> <source>This help message</source> <translation>Dieser Hilfetext</translation> </message> <message> - <location line="+3"/> + <location line="+6"/> <source>Unable to bind to %s on this computer (bind returned error %d, %s)</source> <translation>Kann auf diesem Computer nicht an %s binden (von bind zurückgegebener Fehler %d, %s)</translation> </message> <message> - <location line="-86"/> + <location line="-91"/> <source>Connect through socks proxy</source> <translation>Verbindung über SOCKS-Proxy herstellen</translation> </message> <message> - <location line="-11"/> + <location line="-10"/> <source>Allow DNS lookups for -addnode, -seednode and -connect</source> <translation>Erlaube DNS-Namensauflösung für -addnode, -seednode und -connect</translation> </message> <message> - <location line="+56"/> + <location line="+55"/> <source>Loading addresses...</source> <translation>Lade Adressen...</translation> </message> <message> - <location line="-34"/> + <location line="-35"/> <source>Error loading wallet.dat: Wallet corrupted</source> <translation>Fehler beim Laden von wallet.dat: Brieftasche beschädigt</translation> </message> @@ -2769,22 +2820,22 @@ zum Beispiel: alertnotify=echo %%s | mail -s \"Bitcoin Alert\" admin@f <translation>Fehler beim Laden von wallet.dat: Brieftasche benötigt neuere Version von Bitcoin</translation> </message> <message> - <location line="+87"/> + <location line="+93"/> <source>Wallet needed to be rewritten: restart Bitcoin to complete</source> <translation>Brieftasche musste neu geschrieben werden: Starten Sie Bitcoin zur Fertigstellung neu</translation> </message> <message> - <location line="-89"/> + <location line="-95"/> <source>Error loading wallet.dat</source> <translation>Fehler beim Laden von wallet.dat (Brieftasche)</translation> </message> <message> - <location line="+29"/> + <location line="+28"/> <source>Invalid -proxy address: '%s'</source> <translation>Ungültige Adresse in -proxy: '%s'</translation> </message> <message> - <location line="+49"/> + <location line="+56"/> <source>Unknown network specified in -onlynet: '%s'</source> <translation>Unbekannter Netztyp in -onlynet angegeben: '%s'</translation> </message> @@ -2794,7 +2845,7 @@ zum Beispiel: alertnotify=echo %%s | mail -s \"Bitcoin Alert\" admin@f <translation>Unbekannte Proxyversion in -socks angefordert: %i</translation> </message> <message> - <location line="-91"/> + <location line="-96"/> <source>Cannot resolve -bind address: '%s'</source> <translation>Kann Adresse in -bind nicht auflösen: '%s'</translation> </message> @@ -2806,25 +2857,25 @@ zum Beispiel: alertnotify=echo %%s | mail -s \"Bitcoin Alert\" admin@f <message> <location line="+44"/> <source>Invalid amount for -paytxfee=<amount>: '%s'</source> - <translation>Falscher Betrag für -paytxfee=<Betrag>: '%s'</translation> + <translation>Ungültiger Betrag für -paytxfee=<amount>: '%s'</translation> </message> <message> <location line="+1"/> <source>Invalid amount</source> - <translation>Ungültige Angabe</translation> + <translation>Ungültiger Betrag</translation> </message> <message> - <location line="-4"/> + <location line="-6"/> <source>Insufficient funds</source> <translation>Unzureichender Kontostand</translation> </message> <message> - <location line="+8"/> + <location line="+10"/> <source>Loading block index...</source> <translation>Lade Blockindex...</translation> </message> <message> - <location line="-58"/> + <location line="-57"/> <source>Add a node to connect to and attempt to keep the connection open</source> <translation>Mit dem Knoten verbinden und versuchen die Verbindung aufrecht zu halten</translation> </message> @@ -2834,52 +2885,47 @@ zum Beispiel: alertnotify=echo %%s | mail -s \"Bitcoin Alert\" admin@f <translation>Kann auf diesem Computer nicht an %s binden. Evtl. wurde Bitcoin bereits gestartet.</translation> </message> <message> - <location line="+67"/> + <location line="+64"/> <source>Fee per KB to add to transactions you send</source> <translation>Gebühr pro KB, die gesendeten Transaktionen hinzugefügt wird</translation> </message> <message> - <location line="+17"/> + <location line="+19"/> <source>Loading wallet...</source> <translation>Lade Brieftasche...</translation> </message> <message> - <location line="-53"/> + <location line="-52"/> <source>Cannot downgrade wallet</source> <translation>Brieftasche kann nicht auf eine ältere Version herabgestuft werden</translation> </message> <message> - <location line="+1"/> - <source>Cannot initialize keypool</source> - <translation>Schlüsselpool kann nicht initialisiert werden</translation> - </message> - <message> <location line="+3"/> <source>Cannot write default address</source> <translation>Standardadresse kann nicht geschrieben werden</translation> </message> <message> - <location line="+63"/> + <location line="+64"/> <source>Rescanning...</source> <translation>Durchsuche erneut...</translation> </message> <message> - <location line="-55"/> + <location line="-57"/> <source>Done loading</source> <translation>Laden abgeschlossen</translation> </message> <message> - <location line="+79"/> + <location line="+82"/> <source>To use the %s option</source> <translation>Zur Nutzung der %s Option</translation> </message> <message> - <location line="-71"/> + <location line="-74"/> <source>Error</source> <translation>Fehler</translation> </message> <message> - <location line="-33"/> + <location line="-31"/> <source>You must set rpcpassword=<password> in the configuration file: %s If the file does not exist, create it with owner-readable-only file permissions.</source> diff --git a/src/qt/locale/bitcoin_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.</source> - <translation type="unfinished"/> + <translation> +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.</translation> </message> <message> - <location filename="../aboutdialog.cpp" line="+17"/> + <location filename="../aboutdialog.cpp" line="+14"/> <source>Copyright</source> - <translation type="unfinished"/> + <translation>Πνευματική ιδιοκτησία </translation> </message> <message> <location line="+0"/> - <source>2009-%1 The Bitcoin developers</source> - <translation type="unfinished"/> + <source>The Bitcoin developers</source> + <translation>Οι Bitcoin προγραμματιστές </translation> </message> </context> <context> @@ -61,7 +66,7 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>&Νέα διεύθυνση</translation> </message> <message> - <location filename="../addressbookpage.cpp" line="+59"/> + <location filename="../addressbookpage.cpp" line="+63"/> <source>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.</source> <translation>Αυτές είναι οι Bitcoin διευθύνσεις σας για να λαμβάνετε πληρωμές. Δίνοντας μία ξεχωριστή διεύθυνση σε κάθε αποστολέα, θα μπορείτε να ελέγχετε ποιος σας πληρώνει.</translation> </message> @@ -88,17 +93,27 @@ This product includes software developed by the OpenSSL Project for use in the O <message> <location line="+25"/> <source>Delete the currently selected address from the list</source> - <translation type="unfinished"/> + <translation>Αντιγραφη της επιλεγμενης διεύθυνσης στο πρόχειρο του συστηματος</translation> </message> <message> - <location line="-14"/> + <location line="+27"/> + <source>Export the data in the current tab to a file</source> + <translation>Εξαγωγή δεδομένων καρτέλας σε αρχείο</translation> + </message> + <message> + <location line="+3"/> + <source>&Export</source> + <translation>&Εξαγωγή</translation> + </message> + <message> + <location line="-44"/> <source>Verify a message to ensure it was signed with a specified Bitcoin address</source> - <translation type="unfinished"/> + <translation>Υπογράψτε ένα μήνυμα για ν' αποδείξετε πως ανήκει μια συγκεκριμένη διεύθυνση Bitcoin</translation> </message> <message> <location line="+3"/> <source>&Verify Message</source> - <translation type="unfinished"/> + <translation>&Επιβεβαίωση μηνύματος</translation> </message> <message> <location line="+14"/> @@ -108,7 +123,7 @@ This product includes software developed by the OpenSSL Project for use in the O <message> <location filename="../addressbookpage.cpp" line="-5"/> <source>These are your Bitcoin addresses for sending payments. Always check the amount and the receiving address before sending coins.</source> - <translation type="unfinished"/> + <translation>Αυτές είναι οι Bitcoin διευθύνσεις σας για να λαμβάνετε πληρωμές. Δίνοντας μία ξεχωριστή διεύθυνση σε κάθε αποστολέα, θα μπορείτε να ελέγχετε ποιος σας πληρώνει.</translation> </message> <message> <location line="+13"/> @@ -123,7 +138,7 @@ This product includes software developed by the OpenSSL Project for use in the O <message> <location line="+1"/> <source>Send &Coins</source> - <translation type="unfinished"/> + <translation>Αποστολή νομισμάτων</translation> </message> <message> <location line="+260"/> @@ -169,7 +184,7 @@ This product includes software developed by the OpenSSL Project for use in the O <message> <location filename="../forms/askpassphrasedialog.ui" line="+26"/> <source>Passphrase Dialog</source> - <translation type="unfinished"/> + <translation>Φράση πρόσβασης </translation> </message> <message> <location line="+21"/> @@ -234,23 +249,24 @@ This product includes software developed by the OpenSSL Project for use in the O <message> <location line="+1"/> <source>Warning: If you encrypt your wallet and lose your passphrase, you will <b>LOSE ALL OF YOUR BITCOINS</b>!</source> - <translation type="unfinished"/> + <translation>Προσοχη: Εαν κρυπτογραφησεις το πορτοφολι σου και χάσεις τον κωδικο σου θα χάσεις <b> ΟΛΑ ΣΟΥ ΤΑ BITCOINS</b>! +Είσαι σίγουρος ότι θέλεις να κρυπτογραφησεις το πορτοφολι;</translation> </message> <message> <location line="+0"/> <source>Are you sure you wish to encrypt your wallet?</source> - <translation type="unfinished"/> + <translation>Είστε σίγουροι ότι θέλετε να κρυπτογραφήσετε το πορτοφόλι σας;</translation> </message> <message> <location line="+15"/> <source>IMPORTANT: Any previous backups you have made of your wallet file should be replaced with the newly generated, encrypted wallet file. For security reasons, previous backups of the unencrypted wallet file will become useless as soon as you start using the new, encrypted wallet.</source> - <translation type="unfinished"/> + <translation>ΣΗΜΑΝΤΙΚΟ: Τα προηγούμενα αντίγραφα ασφαλείας που έχετε κάνει από το αρχείο του πορτοφόλιου σας θα πρέπει να αντικατασταθουν με το νέο που δημιουργείται, κρυπτογραφημένο αρχείο πορτοφόλιου. Για λόγους ασφαλείας, τα προηγούμενα αντίγραφα ασφαλείας του μη κρυπτογραφημένου αρχείου πορτοφόλιου θα καταστουν άχρηστα μόλις αρχίσετε να χρησιμοποιείτε το νέο κρυπτογραφημένο πορτοφόλι. </translation> </message> <message> <location line="+100"/> <location line="+24"/> <source>Warning: The Caps Lock key is on!</source> - <translation type="unfinished"/> + <translation>Προσοχη: το πλήκτρο Caps Lock είναι ενεργο.</translation> </message> <message> <location line="-130"/> @@ -302,7 +318,7 @@ This product includes software developed by the OpenSSL Project for use in the O <message> <location line="+14"/> <source>Wallet passphrase was successfully changed.</source> - <translation type="unfinished"/> + <translation>Ο κωδικος του πορτοφολιού άλλαξε με επιτυχία.</translation> </message> </context> <context> @@ -313,12 +329,12 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>Υπογραφή &Μηνύματος...</translation> </message> <message> - <location line="+299"/> + <location line="+280"/> <source>Synchronizing with network...</source> <translation>Συγχρονισμός με το δίκτυο...</translation> </message> <message> - <location line="-368"/> + <location line="-349"/> <source>&Overview</source> <translation>&Επισκόπηση</translation> </message> @@ -393,37 +409,27 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>&Άλλαξε κωδικο πρόσβασης</translation> </message> <message> - <location line="+304"/> + <location line="+285"/> <source>Importing blocks from disk...</source> - <translation type="unfinished"/> + <translation>Εισαγωγή μπλοκ από τον σκληρο δίσκο ... </translation> </message> <message> <location line="+3"/> <source>Reindexing blocks on disk...</source> - <translation type="unfinished"/> - </message> - <message> - <location line="-300"/> - <source>&Export...</source> - <translation>&Εξαγωγή</translation> + <translation>Φόρτωση ευρετηρίου μπλοκ στον σκληρο δισκο...</translation> </message> <message> - <location line="-66"/> + <location line="-347"/> <source>Send coins to a Bitcoin address</source> - <translation type="unfinished"/> + <translation>Στείλε νομισματα σε μια διεύθυνση bitcoin</translation> </message> <message> <location line="+49"/> <source>Modify configuration options for Bitcoin</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+18"/> - <source>Export the data in the current tab to a file</source> - <translation>Εξαγωγή δεδομένων καρτέλας σε αρχείο</translation> + <translation>Επεργασία ρυθμισεων επιλογών για το Bitcoin</translation> </message> <message> - <location line="-9"/> + <location line="+9"/> <source>Backup wallet to another location</source> <translation>Δημιουργία αντιγράφου ασφαλείας πορτοφολιού σε άλλη τοποθεσία</translation> </message> @@ -433,7 +439,7 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>Αλλαγή του κωδικού κρυπτογράφησης του πορτοφολιού</translation> </message> <message> - <location line="+9"/> + <location line="+6"/> <source>&Debug window</source> <translation>&Παράθυρο αποσφαλμάτωσης</translation> </message> @@ -443,35 +449,35 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>Άνοιγμα κονσόλας αποσφαλμάτωσης και διαγνωστικών</translation> </message> <message> - <location line="-7"/> + <location line="-4"/> <source>&Verify message...</source> - <translation type="unfinished"/> + <translation>&Επιβεβαίωση μηνύματος</translation> </message> <message> - <location line="-163"/> - <location line="+541"/> + <location line="-165"/> + <location line="+530"/> <source>Bitcoin</source> <translation>Bitcoin</translation> </message> <message> - <location line="-541"/> + <location line="-530"/> <source>Wallet</source> <translation>Πορτοφόλι</translation> </message> <message> - <location line="+99"/> + <location line="+101"/> <source>&Send</source> - <translation type="unfinished"/> + <translation>&Αποστολή</translation> </message> <message> <location line="+7"/> <source>&Receive</source> - <translation type="unfinished"/> + <translation>&Παραλαβή </translation> </message> <message> <location line="+14"/> <source>&Addresses</source> - <translation type="unfinished"/> + <translation>&Διεύθυνσεις</translation> </message> <message> <location line="+22"/> @@ -486,30 +492,30 @@ This product includes software developed by the OpenSSL Project for use in the O <message> <location line="+1"/> <source>Show or hide the main Window</source> - <translation type="unfinished"/> + <translation>Εμφάνιση ή αποκρύψη του κεντρικου παράθυρου </translation> </message> <message> <location line="+3"/> <source>Encrypt the private keys that belong to your wallet</source> - <translation type="unfinished"/> + <translation>Κρυπτογραφήστε τα ιδιωτικά κλειδιά που ανήκουν στο πορτοφόλι σας </translation> </message> <message> <location line="+7"/> <source>Sign messages with your Bitcoin addresses to prove you own them</source> - <translation type="unfinished"/> + <translation>Υπογράψτε ένα μήνυμα για να βεβαιώσετε πως είστε ο κάτοχος αυτής της διεύθυνσης</translation> </message> <message> <location line="+2"/> <source>Verify messages to ensure they were signed with specified Bitcoin addresses</source> - <translation type="unfinished"/> + <translation>Υπογράψτε ένα μήνυμα για ν' αποδείξετε πως ανήκει μια συγκεκριμένη διεύθυνση Bitcoin</translation> </message> <message> - <location line="+31"/> + <location line="+28"/> <source>&File</source> <translation>&Αρχείο</translation> </message> <message> - <location line="+8"/> + <location line="+7"/> <source>&Settings</source> <translation>&Ρυθμίσεις</translation> </message> @@ -524,12 +530,7 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>Εργαλειοθήκη καρτελών</translation> </message> <message> - <location line="+8"/> - <source>Actions toolbar</source> - <translation>Εργαλειοθήκη ενεργειών</translation> - </message> - <message> - <location line="+13"/> + <location line="+17"/> <location line="+10"/> <source>[testnet]</source> <translation>[testnet]</translation> @@ -540,82 +541,89 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>Πελάτης Bitcoin</translation> </message> <message numerus="yes"> - <location line="+140"/> + <location line="+141"/> <source>%n active connection(s) to Bitcoin network</source> <translation><numerusform>%n ενεργή σύνδεση στο δίκτυο Bitcoin</numerusform><numerusform>%n ενεργές συνδέσεις στο δίκτυο Βitcoin</numerusform></translation> </message> <message> - <location line="+39"/> + <location line="+22"/> + <source>No block source available...</source> + <translation>Η πηγή του μπλοκ δεν ειναι διαθέσιμη... </translation> + </message> + <message> + <location line="+12"/> <source>Processed %1 of %2 (estimated) blocks of transaction history.</source> - <translation type="unfinished"/> + <translation>Μεταποιημένα %1 απο % 2 (κατ 'εκτίμηση) μπλοκ της ιστορίας της συναλλαγής. </translation> </message> <message> <location line="+4"/> <source>Processed %1 blocks of transaction history.</source> - <translation type="unfinished"/> + <translation>Έγινε λήψη %1 μπλοκ ιστορικού συναλλαγών</translation> </message> <message numerus="yes"> <location line="+20"/> <source>%n hour(s)</source> - <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation> + <translation><numerusform>%n ώρες </numerusform><numerusform>%n ώρες </numerusform></translation> </message> <message numerus="yes"> <location line="+4"/> <source>%n day(s)</source> - <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation> + <translation><numerusform>%n ημέρες </numerusform><numerusform>%n ημέρες </numerusform></translation> </message> <message numerus="yes"> <location line="+4"/> <source>%n week(s)</source> - <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation> + <translation><numerusform>%n εβδομαδες</numerusform><numerusform>%n εβδομαδες</numerusform></translation> </message> <message> - <location line="+5"/> + <location line="+4"/> <source>%1 behind</source> - <translation type="unfinished"/> + <translation>%1 πίσω</translation> </message> <message> <location line="+14"/> <source>Last received block was generated %1 ago.</source> - <translation type="unfinished"/> + <translation>Το τελευταίο μπλοκ που ελήφθη δημιουργήθηκε %1 πριν.</translation> </message> <message> <location line="+2"/> <source>Transactions after this will not yet be visible.</source> - <translation type="unfinished"/> + <translation>Οι συναλλαγές μετά από αυτό δεν θα είναι ακόμη ορατες.</translation> </message> <message> - <location line="+21"/> + <location line="+22"/> <source>Error</source> <translation>Σφάλμα</translation> </message> <message> <location line="+3"/> <source>Warning</source> - <translation type="unfinished"/> + <translation>Προειδοποίηση</translation> </message> <message> <location line="+3"/> <source>Information</source> - <translation type="unfinished"/> + <translation>Πληροφορία</translation> </message> <message> - <location line="+68"/> + <location line="+70"/> <source>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?</source> - <translation type="unfinished"/> + <translation>Η συναλλαγή ξεπερνάει το όριο. +Μπορεί να ολοκληρωθεί με μια αμοιβή των %1, η οποία αποδίδεται στους κόμβους που επεξεργάζονται τις συναλλαγές και βοηθούν στην υποστήριξη του δικτύου. +Θέλετε να συνεχίσετε;</translation> </message> <message> - <location line="-138"/> + <location line="-140"/> <source>Up to date</source> <translation>Ενημερωμένο</translation> </message> <message> - <location line="+32"/> + <location line="+31"/> <source>Catching up...</source> <translation>Ενημέρωση...</translation> </message> <message> - <location line="+110"/> + <location line="+113"/> <source>Confirm transaction fee</source> <translation>Επιβεβαίωση αμοιβής συναλλαγής</translation> </message> @@ -646,13 +654,13 @@ Address: %4 <location line="+33"/> <location line="+23"/> <source>URI handling</source> - <translation type="unfinished"/> + <translation>Χειρισμός URI</translation> </message> <message> <location line="-23"/> <location line="+23"/> <source>URI can not be parsed! This can be caused by an invalid Bitcoin address or malformed URI parameters.</source> - <translation type="unfinished"/> + <translation>Το URI δεν μπορεί να αναλυθεί! Αυτό μπορεί να προκληθεί από μια μη έγκυρη διεύθυνση Bitcoin ή ακατάλληλη παραμέτρο URI.</translation> </message> <message> <location line="+17"/> @@ -665,17 +673,17 @@ Address: %4 <translation>Το πορτοφόλι είναι <b>κρυπτογραφημένο</b> και <b>κλειδωμένο</b></translation> </message> <message> - <location filename="../bitcoin.cpp" line="+104"/> + <location filename="../bitcoin.cpp" line="+111"/> <source>A fatal error occurred. Bitcoin can no longer continue safely and will quit.</source> - <translation type="unfinished"/> + <translation>Παρουσιάστηκε ανεπανόρθωτο σφάλμα. Το Bitcoin δεν μπορεί πλέον να συνεχίσει με ασφάλεια και θα τερματισθει.</translation> </message> </context> <context> <name>ClientModel</name> <message> - <location filename="../clientmodel.cpp" line="+98"/> + <location filename="../clientmodel.cpp" line="+104"/> <source>Network Alert</source> - <translation type="unfinished"/> + <translation>Ειδοποίηση Δικτύου</translation> </message> </context> <context> @@ -733,7 +741,7 @@ Address: %4 <message> <location line="-5"/> <source>The entered address "%1" is not a valid Bitcoin address.</source> - <translation type="unfinished"/> + <translation>Η διεύθυνση "%1" δεν είναι έγκυρη Bitcoin διεύθυνση.</translation> </message> <message> <location line="+10"/> @@ -752,7 +760,7 @@ Address: %4 <location filename="../guiutil.cpp" line="+424"/> <location line="+12"/> <source>Bitcoin-Qt</source> - <translation type="unfinished"/> + <translation>bitcoin-qt</translation> </message> <message> <location line="-12"/> @@ -804,8 +812,8 @@ Address: %4 </message> <message> <location line="+6"/> - <source>Optional transaction fee per kB that helps make sure your transactions are processed quickly. Most transactions are 1 kB. Fee 0.01 recommended.</source> - <translation>Η προαιρετική αμοιβή για κάθε kB επισπεύδει την επεξεργασία των συναλλαγών σας. Οι περισσότερες συναλλαγές είναι 1 kB. Προτείνεται αμοιβή 0.01.</translation> + <source>Optional transaction fee per kB that helps make sure your transactions are processed quickly. Most transactions are 1 kB.</source> + <translation>Η προαιρετική αμοιβή για κάθε kB επισπεύδει την επεξεργασία των συναλλαγών σας. Οι περισσότερες συναλλαγές είναι 1 kB. </translation> </message> <message> <location line="+15"/> @@ -820,17 +828,17 @@ Address: %4 <message> <location line="+3"/> <source>&Start Bitcoin on system login</source> - <translation type="unfinished"/> + <translation>&Έναρξη του Βιtcoin κατά την εκκίνηση του συστήματος</translation> </message> <message> <location line="+35"/> <source>Reset all client options to default.</source> - <translation type="unfinished"/> + <translation>Επαναφορα όλων των επιλογων του πελάτη σε default.</translation> </message> <message> <location line="+3"/> <source>&Reset Options</source> - <translation type="unfinished"/> + <translation>Επαναφορα ρυθμίσεων</translation> </message> <message> <location line="+13"/> @@ -850,7 +858,7 @@ Address: %4 <message> <location line="+7"/> <source>Connect to the Bitcoin network through a SOCKS proxy (e.g. when connecting through Tor).</source> - <translation type="unfinished"/> + <translation>Σύνδεση στο Bitcoin δίκτυο μέσω διαμεσολαβητή SOCKS4 (π.χ. για σύνδεση μέσω Tor)</translation> </message> <message> <location line="+3"/> @@ -860,7 +868,7 @@ Address: %4 <message> <location line="+9"/> <source>Proxy &IP:</source> - <translation type="unfinished"/> + <translation>&IP διαμεσολαβητή:</translation> </message> <message> <location line="+19"/> @@ -870,7 +878,7 @@ Address: %4 <message> <location line="+7"/> <source>&Port:</source> - <translation type="unfinished"/> + <translation>&Θύρα:</translation> </message> <message> <location line="+19"/> @@ -885,7 +893,7 @@ Address: %4 <message> <location line="+13"/> <source>SOCKS version of the proxy (e.g. 5)</source> - <translation type="unfinished"/> + <translation>SOCKS εκδοση του διαμεσολαβητη (e.g. 5)</translation> </message> <message> <location line="+36"/> @@ -895,7 +903,7 @@ Address: %4 <message> <location line="+6"/> <source>Show only a tray icon after minimizing the window.</source> - <translation type="unfinished"/> + <translation>Εμφάνιση μόνο εικονιδίου στην περιοχή ειδοποιήσεων κατά την ελαχιστοποίηση</translation> </message> <message> <location line="+3"/> @@ -910,17 +918,17 @@ Address: %4 <message> <location line="+3"/> <source>M&inimize on close</source> - <translation type="unfinished"/> + <translation>Ε&λαχιστοποίηση κατά το κλείσιμο</translation> </message> <message> <location line="+21"/> <source>&Display</source> - <translation type="unfinished"/> + <translation>%Απεικόνιση</translation> </message> <message> <location line="+8"/> <source>User Interface &language:</source> - <translation type="unfinished"/> + <translation>Γλώσσα περιβάλλοντος εργασίας: </translation> </message> <message> <location line="+13"/> @@ -930,7 +938,7 @@ Address: %4 <message> <location line="+11"/> <source>&Unit to show amounts in:</source> - <translation type="unfinished"/> + <translation>&Μονάδα μέτρησης:</translation> </message> <message> <location line="+13"/> @@ -945,37 +953,37 @@ Address: %4 <message> <location line="+3"/> <source>&Display addresses in transaction list</source> - <translation type="unfinished"/> + <translation>Εμφάνιση διευθύνσεων στη λίστα συναλλαγών</translation> </message> <message> <location line="+71"/> <source>&OK</source> - <translation type="unfinished"/> + <translation>&ΟΚ</translation> </message> <message> <location line="+7"/> <source>&Cancel</source> - <translation type="unfinished"/> + <translation>&Ακύρωση</translation> </message> <message> <location line="+10"/> <source>&Apply</source> - <translation type="unfinished"/> + <translation>&Εφαρμογή</translation> </message> <message> <location filename="../optionsdialog.cpp" line="+53"/> <source>default</source> - <translation type="unfinished"/> + <translation>προεπιλογή</translation> </message> <message> <location line="+130"/> <source>Confirm options reset</source> - <translation type="unfinished"/> + <translation>Επιβεβαιώση των επιλογων επαναφοράς </translation> </message> <message> <location line="+1"/> <source>Some settings may require a client restart to take effect.</source> - <translation type="unfinished"/> + <translation>Για ορισμένες ρυθμίσεις πρεπει η επανεκκίνηση να τεθεί σε ισχύ.</translation> </message> <message> <location line="+0"/> @@ -1011,7 +1019,7 @@ Address: %4 <location line="+50"/> <location line="+166"/> <source>The displayed information may be out of date. Your wallet automatically synchronizes with the Bitcoin network after a connection is established, but this process has not completed yet.</source> - <translation type="unfinished"/> + <translation>Οι πληροφορίες που εμφανίζονται μπορεί να είναι ξεπερασμένες. Το πορτοφόλι σας συγχρονίζεται αυτόματα με το δίκτυο Bitcoin μετά από μια σύνδεση, αλλά αυτή η διαδικασία δεν έχει ακόμη ολοκληρωθεί. </translation> </message> <message> <location line="-124"/> @@ -1031,12 +1039,12 @@ Address: %4 <message> <location line="+107"/> <source>Immature:</source> - <translation type="unfinished"/> + <translation>Ανώριμος</translation> </message> <message> <location line="+13"/> <source>Mined balance that has not yet matured</source> - <translation type="unfinished"/> + <translation>Εξορυγμενο υπόλοιπο που δεν έχει ακόμα ωριμάσει </translation> </message> <message> <location line="+46"/> @@ -1054,7 +1062,7 @@ Address: %4 <translation>Το άθροισμα των συναλλαγών που δεν έχουν ακόμα επιβεβαιωθεί και δεν προσμετρώνται στο τρέχον υπόλοιπό σας</translation> </message> <message> - <location filename="../overviewpage.cpp" line="+115"/> + <location filename="../overviewpage.cpp" line="+116"/> <location line="+1"/> <source>out of sync</source> <translation>εκτός συγχρονισμού</translation> @@ -1065,7 +1073,7 @@ Address: %4 <message> <location filename="../paymentserver.cpp" line="+107"/> <source>Cannot start bitcoin: click-to-pay handler</source> - <translation type="unfinished"/> + <translation>Δεν είναι δυνατή η εκκίνηση του Bitcoin: click-to-pay handler</translation> </message> </context> <context> @@ -1073,7 +1081,7 @@ Address: %4 <message> <location filename="../forms/qrcodedialog.ui" line="+14"/> <source>QR Code Dialog</source> - <translation type="unfinished"/> + <translation>Κώδικας QR</translation> </message> <message> <location line="+59"/> @@ -1108,7 +1116,7 @@ Address: %4 <message> <location line="+40"/> <source>The entered amount is invalid, please check.</source> - <translation type="unfinished"/> + <translation>Το αναγραφόμενο ποσό δεν είναι έγκυρο, παρακαλούμε να το ελέγξετε.</translation> </message> <message> <location line="+23"/> @@ -1145,7 +1153,7 @@ Address: %4 <location line="+23"/> <location filename="../rpcconsole.cpp" line="+339"/> <source>N/A</source> - <translation type="unfinished"/> + <translation>Μη διαθέσιμο</translation> </message> <message> <location line="-217"/> @@ -1160,12 +1168,12 @@ Address: %4 <message> <location line="+68"/> <source>Using OpenSSL version</source> - <translation type="unfinished"/> + <translation>Χρησιμοποιηση της OpenSSL εκδοσης</translation> </message> <message> <location line="+49"/> <source>Startup time</source> - <translation type="unfinished"/> + <translation>Χρόνος εκκίνησης</translation> </message> <message> <location line="+29"/> @@ -1180,12 +1188,12 @@ Address: %4 <message> <location line="+23"/> <source>On testnet</source> - <translation type="unfinished"/> + <translation>Στο testnet</translation> </message> <message> <location line="+23"/> <source>Block chain</source> - <translation type="unfinished"/> + <translation>αλυσίδα εμποδισμού</translation> </message> <message> <location line="+7"/> @@ -1215,12 +1223,12 @@ Address: %4 <message> <location line="+7"/> <source>Show the Bitcoin-Qt help message to get a list with possible Bitcoin command-line options.</source> - <translation type="unfinished"/> + <translation>Εμφανιση του Bitcoin-Qt μήνυματος βοήθειας για να πάρετε μια λίστα με τις πιθανές επιλογές Bitcoin γραμμής εντολών.</translation> </message> <message> <location line="+3"/> <source>&Show</source> - <translation type="unfinished"/> + <translation>&Εμφάνιση</translation> </message> <message> <location line="+24"/> @@ -1235,22 +1243,22 @@ Address: %4 <message> <location line="-104"/> <source>Bitcoin - Debug window</source> - <translation type="unfinished"/> + <translation>Bitcoin - Παράθυρο αποσφαλμάτωσης</translation> </message> <message> <location line="+25"/> <source>Bitcoin Core</source> - <translation type="unfinished"/> + <translation>Bitcoin Core</translation> </message> <message> <location line="+279"/> <source>Debug log file</source> - <translation type="unfinished"/> + <translation>Αρχείο καταγραφής εντοπισμού σφαλμάτων </translation> </message> <message> <location line="+7"/> <source>Open the Bitcoin debug log file from the current data directory. This can take a few seconds for large log files.</source> - <translation type="unfinished"/> + <translation>Ανοίξτε το αρχείο καταγραφής εντοπισμού σφαλμάτων από τον τρέχοντα κατάλογο δεδομένων. Αυτό μπορεί να πάρει μερικά δευτερόλεπτα για τα μεγάλα αρχεία καταγραφής. </translation> </message> <message> <location line="+102"/> @@ -1260,17 +1268,17 @@ Address: %4 <message> <location filename="../rpcconsole.cpp" line="-30"/> <source>Welcome to the Bitcoin RPC console.</source> - <translation type="unfinished"/> + <translation>Καλώς ήρθατε στην Bitcoin RPC κονσόλα.</translation> </message> <message> <location line="+1"/> <source>Use up and down arrows to navigate history, and <b>Ctrl-L</b> to clear screen.</source> - <translation type="unfinished"/> + <translation>Χρησιμοποιήστε το πάνω και κάτω βέλος για να περιηγηθείτε στο ιστορικο, και <b>Ctrl-L</b> για εκκαθαριση οθονης.</translation> </message> <message> <location line="+1"/> <source>Type <b>help</b> for an overview of available commands.</source> - <translation type="unfinished"/> + <translation>Γράψτε <b>βοήθεια</b> για μια επισκόπηση των διαθέσιμων εντολών</translation> </message> </context> <context> @@ -1295,7 +1303,7 @@ Address: %4 <message> <location line="+3"/> <source>Add &Recipient</source> - <translation type="unfinished"/> + <translation>&Προσθήκη αποδέκτη</translation> </message> <message> <location line="+20"/> @@ -1305,7 +1313,7 @@ Address: %4 <message> <location line="+3"/> <source>Clear &All</source> - <translation type="unfinished"/> + <translation>Καθαρισμός &Όλων</translation> </message> <message> <location line="+22"/> @@ -1325,7 +1333,7 @@ Address: %4 <message> <location line="+3"/> <source>S&end</source> - <translation type="unfinished"/> + <translation>Αποστολη</translation> </message> <message> <location filename="../sendcoinsdialog.cpp" line="-59"/> @@ -1350,7 +1358,7 @@ Address: %4 <message> <location line="+23"/> <source>The recipient address is not valid, please recheck.</source> - <translation type="unfinished"/> + <translation>Η διεύθυνση του αποδέκτη δεν είναι σωστή. Παρακαλώ ελέγξτε ξανά.</translation> </message> <message> <location line="+5"/> @@ -1365,17 +1373,17 @@ Address: %4 <message> <location line="+5"/> <source>The total exceeds your balance when the %1 transaction fee is included.</source> - <translation type="unfinished"/> + <translation>Το σύνολο υπερβαίνει το υπόλοιπό σας όταν συμπεριληφθεί και η αμοιβή %1</translation> </message> <message> <location line="+6"/> <source>Duplicate address found, can only send to each address once per send operation.</source> - <translation type="unfinished"/> + <translation>Βρέθηκε η ίδια διεύθυνση δύο φορές. Επιτρέπεται μία μόνο εγγραφή για κάθε διεύθυνση, σε κάθε διαδικασία αποστολής.</translation> </message> <message> <location line="+5"/> <source>Error: Transaction creation failed!</source> - <translation type="unfinished"/> + <translation>Σφάλμα: Η δημιουργία της συναλλαγής απέτυχε</translation> </message> <message> <location line="+5"/> @@ -1403,7 +1411,7 @@ Address: %4 <message> <location line="+34"/> <source>The address to send the payment to (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source> - <translation type="unfinished"/> + <translation>Διεύθυνση αποστολής της πληρωμής (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation> </message> <message> <location line="+60"/> @@ -1452,7 +1460,7 @@ Address: %4 <message> <location filename="../forms/signverifymessagedialog.ui" line="+14"/> <source>Signatures - Sign / Verify a Message</source> - <translation type="unfinished"/> + <translation>Υπογραφές - Είσοδος / Επαλήθευση μήνυματος </translation> </message> <message> <location line="+13"/> @@ -1504,7 +1512,7 @@ Address: %4 <message> <location line="+27"/> <source>Copy the current signature to the system clipboard</source> - <translation type="unfinished"/> + <translation>Αντέγραφη της επιλεγμενης διεύθυνσης στο πρόχειρο του συστηματος</translation> </message> <message> <location line="+21"/> @@ -1514,28 +1522,28 @@ Address: %4 <message> <location line="+3"/> <source>Sign &Message</source> - <translation type="unfinished"/> + <translation>Υπογραφη μήνυματος</translation> </message> <message> <location line="+14"/> <source>Reset all sign message fields</source> - <translation type="unfinished"/> + <translation>Επαναφορά όλων των πεδίων μήνυματος</translation> </message> <message> <location line="+3"/> <location line="+146"/> <source>Clear &All</source> - <translation type="unfinished"/> + <translation>Καθαρισμός &Όλων</translation> </message> <message> <location line="-87"/> <source>&Verify Message</source> - <translation type="unfinished"/> + <translation>&Επιβεβαίωση μηνύματος</translation> </message> <message> <location line="+6"/> <source>Enter the signing address, message (ensure you copy line breaks, spaces, tabs, etc. exactly) and signature below to verify the message. Be careful not to read more into the signature than what is in the signed message itself, to avoid being tricked by a man-in-the-middle attack.</source> - <translation type="unfinished"/> + <translation>Πληκτρολογήστε την υπογραφή διεύθυνσης, μήνυμα (βεβαιωθείτε ότι έχετε αντιγράψει τις αλλαγές γραμμής, κενά, tabs, κ.λπ. ακριβώς) και την υπογραφή παρακάτω, για να ελέγξει το μήνυμα. Να είστε προσεκτικοί για να μην διαβάσετε περισσότερα στην υπογραφή ό, τι είναι στην υπογραφή ίδιο το μήνυμα , για να μην εξαπατηθούν από έναν άνθρωπο -in - the-middle επίθεση.</translation> </message> <message> <location line="+21"/> @@ -1545,17 +1553,17 @@ Address: %4 <message> <location line="+40"/> <source>Verify the message to ensure it was signed with the specified Bitcoin address</source> - <translation type="unfinished"/> + <translation>Υπογράψτε ένα μήνυμα για ν' αποδείξετε πως υπογραφθηκε απο μια συγκεκριμένη διεύθυνση Bitcoin</translation> </message> <message> <location line="+3"/> <source>Verify &Message</source> - <translation type="unfinished"/> + <translation>Επιβεβαίωση μηνύματος</translation> </message> <message> <location line="+14"/> <source>Reset all verify message fields</source> - <translation type="unfinished"/> + <translation>Επαναφορά όλων επαλήθευμενων πεδίων μήνυματος </translation> </message> <message> <location filename="../signverifymessagedialog.cpp" line="+27"/> @@ -1566,18 +1574,18 @@ Address: %4 <message> <location line="-2"/> <source>Click "Sign Message" to generate signature</source> - <translation type="unfinished"/> + <translation>Κάντε κλικ στο "Υπογραφή Μηνύματος" για να λάβετε την υπογραφή</translation> </message> <message> <location line="+3"/> <source>Enter Bitcoin signature</source> - <translation type="unfinished"/> + <translation>Εισαγωγή υπογραφής Bitcoin</translation> </message> <message> <location line="+82"/> <location line="+81"/> <source>The entered address is invalid.</source> - <translation type="unfinished"/> + <translation>Η διεύθυνση που εισήχθη είναι λάθος.</translation> </message> <message> <location line="-81"/> @@ -1585,59 +1593,72 @@ Address: %4 <location line="+73"/> <location line="+8"/> <source>Please check the address and try again.</source> - <translation type="unfinished"/> + <translation>Παρακαλούμε ελέγξτε την διεύθυνση και δοκιμάστε ξανά.</translation> </message> <message> <location line="-81"/> <location line="+81"/> <source>The entered address does not refer to a key.</source> - <translation type="unfinished"/> + <translation>Η διεύθυνση που έχει εισαχθεί δεν αναφέρεται σε ένα πλήκτρο.</translation> </message> <message> <location line="-73"/> <source>Wallet unlock was cancelled.</source> - <translation type="unfinished"/> + <translation>το ξεκλείδωμα του πορτοφολιού απέτυχε</translation> </message> <message> <location line="+8"/> <source>Private key for the entered address is not available.</source> - <translation type="unfinished"/> + <translation>Το προσωπικό κλειδί εισαγμενης διευθυνσης δεν είναι διαθέσιμο.</translation> </message> <message> <location line="+12"/> <source>Message signing failed.</source> - <translation type="unfinished"/> + <translation>Η υπογραφή του μηνύματος απέτυχε.</translation> </message> <message> <location line="+5"/> <source>Message signed.</source> - <translation type="unfinished"/> + <translation>Μήνυμα υπεγράφη.</translation> </message> <message> <location line="+59"/> <source>The signature could not be decoded.</source> - <translation type="unfinished"/> + <translation>Η υπογραφή δεν μπόρεσε να αποκρυπτογραφηθεί.</translation> </message> <message> <location line="+0"/> <location line="+13"/> <source>Please check the signature and try again.</source> - <translation type="unfinished"/> + <translation>Παρακαλούμε ελέγξτε την υπογραφή και δοκιμάστε ξανά.</translation> </message> <message> <location line="+0"/> <source>The signature did not match the message digest.</source> - <translation type="unfinished"/> + <translation>Η υπογραφή δεν ταιριάζει με το μήνυμα. </translation> </message> <message> <location line="+7"/> <source>Message verification failed.</source> - <translation type="unfinished"/> + <translation>Η επιβεβαίωση του μηνύματος απέτυχε</translation> </message> <message> <location line="+5"/> <source>Message verified.</source> - <translation type="unfinished"/> + <translation>Μήνυμα επιβεβαιώθηκε.</translation> + </message> +</context> +<context> + <name>SplashScreen</name> + <message> + <location filename="../splashscreen.cpp" line="+22"/> + <source>The Bitcoin developers</source> + <translation>Οι Bitcoin προγραμματιστές </translation> + </message> + <message> + <location line="+1"/> + <source>[testnet]</source> + <translation>[testnet]</translation> </message> </context> <context> @@ -1650,7 +1671,7 @@ Address: %4 <message> <location line="+6"/> <source>%1/offline</source> - <translation type="unfinished"/> + <translation>%1/χωρίς σύνδεση;</translation> </message> <message> <location line="+2"/> @@ -1670,7 +1691,7 @@ Address: %4 <message numerus="yes"> <location line="+7"/> <source>, broadcast through %n node(s)</source> - <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation> + <translation><numerusform>, έχει μεταδοθεί μέσω %n κόμβων</numerusform><numerusform>, έχει μεταδοθεί μέσω %n κόμβων</numerusform></translation> </message> <message> <location line="+4"/> @@ -1680,12 +1701,12 @@ Address: %4 <message> <location line="+7"/> <source>Source</source> - <translation type="unfinished"/> + <translation>Πηγή</translation> </message> <message> <location line="+0"/> <source>Generated</source> - <translation type="unfinished"/> + <translation>Δημιουργία </translation> </message> <message> <location line="+5"/> @@ -1704,7 +1725,7 @@ Address: %4 <location line="-77"/> <location line="+2"/> <source>own address</source> - <translation type="unfinished"/> + <translation> δική σας διεύθυνση </translation> </message> <message> <location line="-2"/> @@ -1718,17 +1739,17 @@ Address: %4 <location line="+17"/> <location line="+30"/> <source>Credit</source> - <translation type="unfinished"/> + <translation>Πίστωση </translation> </message> <message numerus="yes"> <location line="-102"/> <source>matures in %n more block(s)</source> - <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation> + <translation><numerusform>ωρίμανση σε %n επιπλέον μπλοκ</numerusform><numerusform>ωρίμανση σε %n επιπλέον μπλοκ</numerusform></translation> </message> <message> <location line="+2"/> <source>not accepted</source> - <translation type="unfinished"/> + <translation>μη αποδεκτό</translation> </message> <message> <location line="+44"/> @@ -1736,17 +1757,17 @@ Address: %4 <location line="+15"/> <location line="+30"/> <source>Debit</source> - <translation type="unfinished"/> + <translation>Debit</translation> </message> <message> <location line="-39"/> <source>Transaction fee</source> - <translation type="unfinished"/> + <translation>Τέλος συναλλαγής </translation> </message> <message> <location line="+16"/> <source>Net amount</source> - <translation type="unfinished"/> + <translation>Καθαρό ποσό</translation> </message> <message> <location line="+6"/> @@ -1756,32 +1777,32 @@ Address: %4 <message> <location line="+2"/> <source>Comment</source> - <translation type="unfinished"/> + <translation>Σχόλιο:</translation> </message> <message> <location line="+2"/> <source>Transaction ID</source> - <translation type="unfinished"/> + <translation>ID Συναλλαγής:</translation> </message> <message> <location line="+3"/> <source>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.</source> - <translation type="unfinished"/> + <translation>Πρέπει να περιμένετε 120 μπλοκ πριν μπορέσετε να χρησιμοποιήσετε τα νομίσματα που έχετε δημιουργήσει. Το μπλοκ που δημιουργήσατε μεταδόθηκε στο δίκτυο για να συμπεριληφθεί στην αλυσίδα των μπλοκ. Αν δεν μπει σε αυτή θα μετατραπεί σε "μη αποδεκτό" και δε θα μπορεί να καταναλωθεί. Αυτό συμβαίνει σπάνια όταν κάποιος άλλος κόμβος δημιουργήσει ένα μπλοκ λίγα δευτερόλεπτα πριν από εσάς.</translation> </message> <message> <location line="+7"/> <source>Debug information</source> - <translation type="unfinished"/> + <translation>Πληροφορίες αποσφαλμάτωσης</translation> </message> <message> <location line="+8"/> <source>Transaction</source> - <translation type="unfinished"/> + <translation>Συναλλαγή</translation> </message> <message> <location line="+3"/> <source>Inputs</source> - <translation type="unfinished"/> + <translation>εισροές </translation> </message> <message> <location line="+23"/> @@ -1791,12 +1812,12 @@ Address: %4 <message> <location line="+1"/> <source>true</source> - <translation type="unfinished"/> + <translation>αληθής</translation> </message> <message> <location line="+0"/> <source>false</source> - <translation type="unfinished"/> + <translation>αναληθής </translation> </message> <message> <location line="-209"/> @@ -1806,7 +1827,7 @@ Address: %4 <message numerus="yes"> <location line="-35"/> <source>Open for %n more block(s)</source> - <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation> + <translation><numerusform>Ανοιχτό για %n μπλοκ</numerusform><numerusform>Ανοιχτό για %n μπλοκ</numerusform></translation> </message> <message> <location line="+70"/> @@ -1852,7 +1873,7 @@ Address: %4 <message numerus="yes"> <location line="+57"/> <source>Open for %n more block(s)</source> - <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation> + <translation><numerusform>Ανοιχτό για %n μπλοκ</numerusform><numerusform>Ανοιχτό για %n μπλοκ</numerusform></translation> </message> <message> <location line="+3"/> @@ -1877,7 +1898,7 @@ Address: %4 <message numerus="yes"> <location line="+8"/> <source>Mined balance will be available when it matures in %n more block(s)</source> - <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation> + <translation><numerusform>Το υπόλοιπο από την εξόρυξη θα είναι διαθέσιμο μετά από %n μπλοκ</numerusform><numerusform>Το υπόλοιπο από την εξόρυξη θα είναι διαθέσιμο μετά από %n μπλοκ</numerusform></translation> </message> <message> <location line="+5"/> @@ -2036,7 +2057,7 @@ Address: %4 <message> <location line="+1"/> <source>Copy transaction ID</source> - <translation type="unfinished"/> + <translation>Αντιγραφη του ID Συναλλαγής</translation> </message> <message> <location line="+1"/> @@ -2115,72 +2136,90 @@ Address: %4 </message> </context> <context> + <name>WalletModel</name> + <message> + <location filename="../walletmodel.cpp" line="+193"/> + <source>Send Coins</source> + <translation>Αποστολή νομισμάτων</translation> + </message> +</context> +<context> <name>WalletView</name> <message> - <location filename="../walletview.cpp" line="+247"/> + <location filename="../walletview.cpp" line="+42"/> + <source>&Export</source> + <translation>&Εξαγωγή</translation> + </message> + <message> + <location line="+1"/> + <source>Export the data in the current tab to a file</source> + <translation>Εξαγωγή δεδομένων καρτέλας σε αρχείο</translation> + </message> + <message> + <location line="+193"/> <source>Backup Wallet</source> - <translation type="unfinished"/> + <translation>Αντίγραφο ασφαλείας του πορτοφολιού</translation> </message> <message> <location line="+0"/> <source>Wallet Data (*.dat)</source> - <translation type="unfinished"/> + <translation>Αρχεία δεδομένων πορτοφολιού (*.dat)</translation> </message> <message> <location line="+3"/> <source>Backup Failed</source> - <translation type="unfinished"/> + <translation>Αποτυχία κατά τη δημιουργία αντιγράφου</translation> </message> <message> <location line="+0"/> <source>There was an error trying to save the wallet data to the new location.</source> - <translation type="unfinished"/> + <translation>Παρουσιάστηκε σφάλμα κατά την αποθήκευση των δεδομένων πορτοφολιού στη νέα τοποθεσία.</translation> </message> <message> <location line="+4"/> <source>Backup Successful</source> - <translation type="unfinished"/> + <translation>Η δημιουργια αντιγραφου ασφαλειας πετυχε</translation> </message> <message> <location line="+0"/> <source>The wallet data was successfully saved to the new location.</source> - <translation type="unfinished"/> + <translation>Τα δεδομένα πορτοφόλιου αποθηκεύτηκαν με επιτυχία στη νέα θέση. </translation> </message> </context> <context> <name>bitcoin-core</name> <message> - <location filename="../bitcoinstrings.cpp" line="+96"/> + <location filename="../bitcoinstrings.cpp" line="+94"/> <source>Bitcoin version</source> <translation>Έκδοση Bitcoin</translation> </message> <message> - <location line="+98"/> + <location line="+102"/> <source>Usage:</source> <translation>Χρήση:</translation> </message> <message> - <location line="-25"/> + <location line="-29"/> <source>Send command to -server or bitcoind</source> <translation>Αποστολή εντολής στον εξυπηρετητή ή στο bitcoind</translation> </message> <message> - <location line="-22"/> + <location line="-23"/> <source>List commands</source> <translation>Λίστα εντολών</translation> </message> <message> - <location line="-10"/> + <location line="-12"/> <source>Get help for a command</source> <translation>Επεξήγηση εντολής</translation> </message> <message> - <location line="+21"/> + <location line="+24"/> <source>Options:</source> <translation>Επιλογές:</translation> </message> <message> - <location line="+23"/> + <location line="+24"/> <source>Specify configuration file (default: bitcoin.conf)</source> <translation>Ορίστε αρχείο ρυθμίσεων (προεπιλογή: bitcoin.conf)</translation> </message> @@ -2190,27 +2229,17 @@ Address: %4 <translation>Ορίστε αρχείο pid (προεπιλογή: bitcoind.pid)</translation> </message> <message> - <location line="-48"/> - <source>Generate coins</source> - <translation>Δημιουργία νομισμάτων</translation> - </message> - <message> - <location line="-27"/> - <source>Don't generate coins</source> - <translation>Άρνηση δημιουργίας νομισμάτων</translation> - </message> - <message> - <location line="+74"/> + <location line="-1"/> <source>Specify data directory</source> <translation>Ορισμός φακέλου δεδομένων</translation> </message> <message> - <location line="-8"/> + <location line="-9"/> <source>Set database cache size in megabytes (default: 25)</source> <translation>Όρισε το μέγεθος της βάσης προσωρινής αποθήκευσης σε megabytes(προεπιλογή:25)</translation> </message> <message> - <location line="-27"/> + <location line="-28"/> <source>Listen for connections on <port> (default: 8333 or testnet: 18333)</source> <translation>Εισερχόμενες συνδέσεις στη θύρα <port> (προεπιλογή: 8333 ή στο testnet: 18333)</translation> </message> @@ -2222,12 +2251,12 @@ Address: %4 <message> <location line="-48"/> <source>Connect to a node to retrieve peer addresses, and disconnect</source> - <translation type="unfinished"/> + <translation>Σύνδεση σε έναν κόμβο για την ανάκτηση διευθύνσεων από ομοτίμους, και αποσυνδέσh</translation> </message> <message> - <location line="+80"/> + <location line="+82"/> <source>Specify your own public address</source> - <translation type="unfinished"/> + <translation>Διευκρινίστε τη δικιά σας δημόσια διεύθυνση.</translation> </message> <message> <location line="+3"/> @@ -2235,22 +2264,22 @@ Address: %4 <translation>Όριο αποσύνδεσης προβληματικών peers (προεπιλογή: 100)</translation> </message> <message> - <location line="-132"/> + <location line="-134"/> <source>Number of seconds to keep misbehaving peers from reconnecting (default: 86400)</source> <translation>Δευτερόλεπτα πριν επιτραπεί ξανά η σύνδεση των προβληματικών peers (προεπιλογή: 86400)</translation> </message> <message> - <location line="-32"/> + <location line="-29"/> <source>An error occurred while setting up the RPC port %u for listening on IPv4: %s</source> - <translation type="unfinished"/> + <translation>Ένα σφάλμα συνέβη καθώς προετοιμαζόταν η πόρτα RPC %u για αναμονή IPv4: %s</translation> </message> <message> - <location line="+30"/> + <location line="+27"/> <source>Listen for JSON-RPC connections on <port> (default: 8332 or testnet: 18332)</source> <translation>Εισερχόμενες συνδέσεις JSON-RPC στη θύρα <port> (προεπιλογή: 8332 or testnet: 18332)</translation> </message> <message> - <location line="+36"/> + <location line="+37"/> <source>Accept command line and JSON-RPC commands</source> <translation>Αποδοχή εντολών κονσόλας και JSON-RPC</translation> </message> @@ -2260,17 +2289,17 @@ Address: %4 <translation>Εκτέλεση στο παρασκήνιο κι αποδοχή εντολών</translation> </message> <message> - <location line="+33"/> + <location line="+37"/> <source>Use the test network</source> <translation>Χρήση του δοκιμαστικού δικτύου</translation> </message> <message> - <location line="-108"/> + <location line="-112"/> <source>Accept connections from outside (default: 1 if no -proxy or -connect)</source> - <translation type="unfinished"/> + <translation>Να δέχεσαι συνδέσεις από έξω(προεπιλογή:1)</translation> </message> <message> - <location line="-82"/> + <location line="-80"/> <source>%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 </source> - <translation type="unfinished"/> + <translation>%s, you must set a rpcpassword in the configuration file: +%s +It is recommended you use the following random password: +rpcuser=bitcoinrpc +rpcpassword=%s +(you do not need to remember this password) +The username and password MUST NOT be the same. +If the file does not exist, create it with owner-readable-only file permissions. +It is also recommended to set alertnotify so you are notified of problems; +for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com +</translation> </message> <message> <location line="+17"/> <source>An error occurred while setting up the RPC port %u for listening on IPv6, falling back to IPv4: %s</source> - <translation type="unfinished"/> + <translation>Ένα σφάλμα συνέβη καθώς προετοιμαζόταν η υποδοχη RPC %u για αναμονη του IPv6, επεσε πισω στο IPv4:%s</translation> </message> <message> <location line="+3"/> <source>Bind to given address and always listen on it. Use [host]:port notation for IPv6</source> - <translation type="unfinished"/> + <translation>Αποθηκευση σε συγκεκριμένη διεύθυνση. Χρησιμοποιήστε τα πλήκτρα [Host] : συμβολισμός θύρα για IPv6</translation> </message> <message> <location line="+3"/> <source>Cannot obtain a lock on data directory %s. Bitcoin is probably already running.</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+3"/> - <source>Error initializing database environment %s! To recover, BACKUP THAT DIRECTORY, then remove everything from it except for wallet.dat.</source> - <translation type="unfinished"/> + <translation>Αδυναμία κλειδώματος του φακέλου δεδομένων %s. Πιθανώς το Bitcoin να είναι ήδη ενεργό.</translation> </message> <message> <location line="+3"/> <source>Error: The transaction was rejected! This might happen if some of the coins in your wallet were already spent, such as if you used a copy of wallet.dat and coins were spent in the copy but not marked as spent here.</source> - <translation type="unfinished"/> + <translation>Σφάλμα: Η συναλλαγή απορρίφθηκε. +Αυτό ίσως οφείλεται στο ότι τα νομίσματά σας έχουν ήδη ξοδευτεί, π.χ. με την αντιγραφή του wallet.dat σε άλλο σύστημα και την χρήση τους εκεί, χωρίς η συναλλαγή να έχει καταγραφεί στο παρόν σύστημα.</translation> </message> <message> <location line="+4"/> <source>Error: This transaction requires a transaction fee of at least %s because of its amount, complexity, or use of recently received funds!</source> - <translation type="unfinished"/> + <translation>Σφάλμα: Αυτή η συναλλαγή απαιτεί αμοιβή συναλλαγής τουλάχιστον %s λόγω του μεγέθους, πολυπλοκότητας ή της χρήσης πρόσφατης παραλαβής κεφαλαίου</translation> </message> <message> <location line="+3"/> <source>Execute command when a relevant alert is received (%s in cmd is replaced by message)</source> - <translation type="unfinished"/> + <translation>Εκτέλεση της εντολής όταν το καλύτερο μπλοκ αλλάξει(%s στην εντολή αντικαθίσταται από το hash του μπλοκ)</translation> </message> <message> <location line="+3"/> <source>Execute command when a wallet transaction changes (%s in cmd is replaced by TxID)</source> - <translation type="unfinished"/> + <translation>Εκτέλεσε την εντολή όταν το καλύτερο μπλοκ αλλάξει(%s στην εντολή αντικαθίσταται από το hash του μπλοκ)</translation> </message> <message> <location line="+11"/> <source>Set maximum size of high-priority/low-fee transactions in bytes (default: 27000)</source> - <translation type="unfinished"/> + <translation>Ορίστε το μέγιστο μέγεθος των high-priority/low-fee συναλλαγων σε bytes (προεπιλογή: 27000)</translation> </message> <message> - <location line="+3"/> - <source>Set the number of script verification threads (1-16, 0=auto, default: 0)</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+2"/> + <location line="+6"/> <source>This is a pre-release test build - use at your own risk - do not use for mining or merchant applications</source> - <translation type="unfinished"/> + <translation>Αυτό είναι ένα προ-τεστ κυκλοφορίας - χρησιμοποιήστε το με δική σας ευθύνη - δεν χρησιμοποιείτε για εξόρυξη ή για αλλες εφαρμογές</translation> </message> <message> <location line="+5"/> <source>Warning: -paytxfee is set very high! This is the transaction fee you will pay if you send a transaction.</source> - <translation type="unfinished"/> + <translation>Προειδοποίηση: Η παράμετρος -paytxfee είναι πολύ υψηλή. Πρόκειται για την αμοιβή που θα πληρώνετε για κάθε συναλλαγή που θα στέλνετε.</translation> </message> <message> <location line="+3"/> <source>Warning: Displayed transactions may not be correct! You may need to upgrade, or other nodes may need to upgrade.</source> - <translation type="unfinished"/> + <translation>Προειδοποίηση: Εμφανίσεις συναλλαγων δεν μπορεί να είναι σωστες! Μπορεί να χρειαστεί να αναβαθμίσετε, ή άλλοι κόμβοι μπορεί να χρειαστεί να αναβαθμίστουν. </translation> </message> <message> <location line="+3"/> <source>Warning: Please check that your computer's date and time are correct! If your clock is wrong Bitcoin will not work properly.</source> - <translation type="unfinished"/> + <translation>Προειδοποίηση: Παρακαλώ βεβαιωθείτε πως η ημερομηνία κι ώρα του συστήματός σας είναι σωστές. Αν το ρολόι του υπολογιστή σας πάει λάθος, ενδέχεται να μη λειτουργεί σωστά το Bitcoin.</translation> </message> <message> <location line="+3"/> <source>Warning: error reading wallet.dat! All keys read correctly, but transaction data or address book entries might be missing or incorrect.</source> - <translation type="unfinished"/> + <translation>Προειδοποίηση : Σφάλμα wallet.dat κατα την ανάγνωση ! Όλα τα κλειδιά αναγνωρισθηκαν σωστά, αλλά τα δεδομένα των συναλλαγών ή καταχωρήσεις στο βιβλίο διευθύνσεων μπορεί να είναι ελλιπείς ή λανθασμένα. </translation> </message> <message> <location line="+3"/> <source>Warning: wallet.dat corrupt, data salvaged! Original wallet.dat saved as wallet.{timestamp}.bak in %s; if your balance or transactions are incorrect you should restore from a backup.</source> - <translation type="unfinished"/> + <translation>Προειδοποίηση : το αρχειο wallet.dat ειναι διεφθαρμένο, τα δεδομένα σώζονται ! Original wallet.dat αποθηκεύονται ως πορτοφόλι { timestamp } bak στο % s ? . . Αν το υπόλοιπο του ή τις συναλλαγές σας, είναι λάθος θα πρέπει να επαναφέρετε από ένα αντίγραφο ασφαλείας</translation> </message> <message> <location line="+14"/> <source>Attempt to recover private keys from a corrupt wallet.dat</source> - <translation type="unfinished"/> + <translation>Προσπάθεια για ανακτησει ιδιωτικων κλειδιων από ενα διεφθαρμένο αρχειο wallet.dat </translation> </message> <message> <location line="+2"/> <source>Block creation options:</source> - <translation type="unfinished"/> + <translation>Αποκλεισμός επιλογων δημιουργίας: </translation> </message> <message> - <location line="+6"/> + <location line="+5"/> <source>Connect only to the specified node(s)</source> <translation>Σύνδεση μόνο με ορισμένους κόμβους</translation> </message> <message> <location line="+3"/> <source>Corrupted block database detected</source> - <translation type="unfinished"/> + <translation>Εντοπισθηκε διεφθαρμενη βαση δεδομενων των μπλοκ</translation> </message> <message> <location line="+1"/> <source>Discover own IP address (default: 1 when listening and no -externalip)</source> - <translation type="unfinished"/> + <translation>Ανακαλύψτε την δικη σας IP διεύθυνση (προεπιλογή: 1 όταν ακούει και δεν - externalip) </translation> </message> <message> <location line="+1"/> <source>Do you want to rebuild the block database now?</source> - <translation type="unfinished"/> + <translation>Θελετε να δημιουργηθει τωρα η βαση δεδομενων του μπλοκ? </translation> </message> <message> - <location line="+3"/> + <location line="+2"/> <source>Error initializing block database</source> - <translation type="unfinished"/> + <translation>Σφάλμα κατά την ενεργοποίηση της βάσης δεδομένων μπλοκ</translation> </message> <message> <location line="+1"/> <source>Error initializing wallet database environment %s!</source> - <translation type="unfinished"/> + <translation>Σφάλμα κατά την ενεργοποίηση της βάσης δεδομένων πορτοφόλιου %s!</translation> </message> <message> <location line="+1"/> <source>Error loading block database</source> - <translation type="unfinished"/> + <translation>Σφάλμα φορτωσης της βασης δεδομενων των μπλοκ</translation> </message> <message> <location line="+4"/> <source>Error opening block database</source> - <translation type="unfinished"/> + <translation>Σφάλμα φορτωσης της βασης δεδομενων των μπλοκ</translation> </message> <message> <location line="+2"/> <source>Error: Disk space is low!</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+1"/> - <source>Error: Transaction creation failed!</source> - <translation type="unfinished"/> + <translation>Προειδοποίηση: Χαμηλός χώρος στο δίσκο </translation> </message> <message> <location line="+1"/> <source>Error: Wallet locked, unable to create transaction!</source> - <translation type="unfinished"/> + <translation>Σφάλμα: το πορτοφόλι είναι κλειδωμένο, δεν μπορεί να δημιουργηθεί συναλλαγή</translation> </message> <message> <location line="+1"/> @@ -2437,142 +2462,167 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <message> <location line="+1"/> <source>Failed to listen on any port. Use -listen=0 if you want this.</source> - <translation type="unfinished"/> + <translation>ταλαιπωρηθειτε για να ακούσετε σε οποιαδήποτε θύρα. Χρήση - ακούστε = 0 , αν θέλετε αυτό.</translation> </message> <message> <location line="+1"/> <source>Failed to read block info</source> - <translation type="unfinished"/> + <translation>Αποτυχία αναγνωσης των block πληροφοριων</translation> </message> <message> <location line="+1"/> <source>Failed to read block</source> - <translation type="unfinished"/> + <translation>Η αναγνωση του μπλοκ απετυχε</translation> </message> <message> <location line="+1"/> <source>Failed to sync block index</source> - <translation type="unfinished"/> + <translation>Ο συγχρονισμος του μπλοκ ευρετηριου απετυχε</translation> </message> <message> <location line="+1"/> <source>Failed to write block index</source> - <translation type="unfinished"/> + <translation>Η δημιουργια του μπλοκ ευρετηριου απετυχε</translation> </message> <message> <location line="+1"/> <source>Failed to write block info</source> - <translation type="unfinished"/> + <translation>Η δημιουργια των μπλοκ πληροφοριων απετυχε</translation> </message> <message> <location line="+1"/> <source>Failed to write block</source> - <translation type="unfinished"/> + <translation>Η δημιουργια του μπλοκ απετυχε</translation> </message> <message> <location line="+1"/> <source>Failed to write file info</source> - <translation type="unfinished"/> + <translation>Αδυναμία εγγραφής πληροφοριων αρχειου</translation> </message> <message> <location line="+1"/> <source>Failed to write to coin database</source> - <translation type="unfinished"/> + <translation>Αποτυχία εγγραφής στη βάση δεδομένων νομίσματος</translation> </message> <message> <location line="+1"/> <source>Failed to write transaction index</source> - <translation type="unfinished"/> + <translation>Αποτυχία εγγραφής δείκτη συναλλαγών </translation> </message> <message> <location line="+1"/> <source>Failed to write undo data</source> - <translation type="unfinished"/> + <translation>Αποτυχία εγγραφής αναίρεσης δεδομένων </translation> </message> <message> <location line="+2"/> <source>Find peers using DNS lookup (default: 1 unless -connect)</source> - <translation type="unfinished"/> + <translation>Βρες ομότιμους υπολογιστές χρησιμοποιώντας αναζήτηση DNS(προεπιλογή:1)</translation> </message> <message> - <location line="+3"/> + <location line="+1"/> + <source>Generate coins (default: 0)</source> + <translation>Δημιουργία νομισμάτων (προκαθορισμος: 0)</translation> + </message> + <message> + <location line="+2"/> <source>How many blocks to check at startup (default: 288, 0 = all)</source> - <translation type="unfinished"/> + <translation>Πόσα μπλοκ να ελέγχθουν κατά την εκκίνηση (προεπιλογή:288,0=όλα)</translation> </message> <message> <location line="+1"/> <source>How thorough the block verification is (0-4, default: 3)</source> - <translation type="unfinished"/> + <translation>Πόσο εξονυχιστική να είναι η επιβεβαίωση του μπλοκ(0-4, προεπιλογή:3)</translation> </message> <message> - <location line="+24"/> + <location line="+19"/> + <source>Not enough file descriptors available.</source> + <translation>Δεν ειναι αρκετες περιγραφες αρχείων διαθέσιμες.</translation> + </message> + <message> + <location line="+8"/> <source>Rebuild block chain index from current blk000??.dat files</source> - <translation type="unfinished"/> + <translation>Εισαγωγή μπλοκ από εξωτερικό αρχείο blk000?.dat</translation> </message> <message> <location line="+16"/> <source>Set the number of threads to service RPC calls (default: 4)</source> - <translation type="unfinished"/> + <translation>Ορίσμος του αριθμόυ θεματων στην υπηρεσία κλήσεων RPC (προεπιλογή: 4) </translation> </message> <message> - <location line="+22"/> + <location line="+26"/> <source>Verifying blocks...</source> - <translation type="unfinished"/> + <translation>Επαλήθευση των μπλοκ... </translation> </message> <message> <location line="+1"/> <source>Verifying wallet...</source> - <translation type="unfinished"/> + <translation>Επαλήθευση πορτοφολιου... </translation> </message> <message> - <location line="-62"/> + <location line="-69"/> <source>Imports blocks from external blk000??.dat file</source> - <translation type="unfinished"/> + <translation>Εισαγωγή μπλοκ από εξωτερικό αρχείο blk000?.dat</translation> </message> <message> - <location line="+1"/> + <location line="-76"/> + <source>Set the number of script verification threads (up to 16, 0 = auto, <0 = leave that many cores free, default: 0)</source> + <translation>Ορίσμος του αριθμό των νημάτων ελέγχου σεναρίου (μέχρι 16, 0 = auto, <0 = αφήνουν τους πολλους πυρήνες δωρεάν, default: 0)</translation> + </message> + <message> + <location line="+77"/> <source>Information</source> - <translation type="unfinished"/> + <translation>Πληροφορία</translation> </message> <message> <location line="+3"/> <source>Invalid -tor address: '%s'</source> - <translation type="unfinished"/> + <translation>Δεν είναι έγκυρη η διεύθυνση διαμεσολαβητή: '%s'</translation> + </message> + <message> + <location line="+1"/> + <source>Invalid amount for -minrelaytxfee=<amount>: '%s'</source> + <translation>Μη έγκυρο ποσό για την παράμετρο -paytxfee=<amount>: '%s'</translation> + </message> + <message> + <location line="+1"/> + <source>Invalid amount for -mintxfee=<amount>: '%s'</source> + <translation>Μη έγκυρο ποσό για την παράμετρο -paytxfee=<amount>: '%s'</translation> </message> <message> <location line="+8"/> <source>Maintain a full transaction index (default: 0)</source> - <translation type="unfinished"/> + <translation>Διατηρήση ένος πλήρες ευρετήριου συναλλαγών (προεπιλογή: 0) </translation> </message> <message> <location line="+2"/> <source>Maximum per-connection receive buffer, <n>*1000 bytes (default: 5000)</source> - <translation type="unfinished"/> + <translation>Μέγιστος buffer λήψης ανά σύνδεση, <n>*1000 bytes (προεπιλογή: 5000)</translation> </message> <message> <location line="+1"/> <source>Maximum per-connection send buffer, <n>*1000 bytes (default: 1000)</source> - <translation type="unfinished"/> + <translation>Μέγιστος buffer αποστολής ανά σύνδεση, <n>*1000 bytes (προεπιλογή: 1000)</translation> </message> <message> - <location line="+1"/> + <location line="+2"/> <source>Only accept block chain matching built-in checkpoints (default: 1)</source> - <translation type="unfinished"/> + <translation>Μονο αποδοχη αλυσίδας μπλοκ που ταιριάζει με τα ενσωματωμένα σημεία ελέγχου (προεπιλογή: 1) </translation> </message> <message> <location line="+1"/> <source>Only connect to nodes in network <net> (IPv4, IPv6 or Tor)</source> - <translation type="unfinished"/> + <translation> Συνδέση μόνο σε κόμβους του δικτύου <net> (IPv4, IPv6 ή Tor) </translation> </message> <message> <location line="+2"/> <source>Output extra debugging information. Implies all other -debug* options</source> - <translation type="unfinished"/> + <translation>Έξοδος επιπλέον πληροφοριών εντοπισμού σφαλμάτων</translation> </message> <message> <location line="+1"/> <source>Output extra network debugging information</source> - <translation type="unfinished"/> + <translation>Έξοδος επιπλέον πληροφοριών εντοπισμού σφαλμάτων</translation> </message> <message> <location line="+2"/> @@ -2582,12 +2632,12 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <message> <location line="+5"/> <source>SSL options: (see the Bitcoin Wiki for SSL setup instructions)</source> - <translation type="unfinished"/> + <translation>Ρυθμίσεις SSL: (ανατρέξτε στο Bitcoin Wiki για οδηγίες ρυθμίσεων SSL)</translation> </message> <message> <location line="+1"/> <source>Select the version of socks proxy to use (4-5, default: 5)</source> - <translation type="unfinished"/> + <translation>Επιλέξτε την έκδοση του διαμεσολαβητη για να χρησιμοποιήσετε (4-5 , προεπιλογή: 5)</translation> </message> <message> <location line="+3"/> @@ -2602,17 +2652,22 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <message> <location line="+5"/> <source>Set maximum block size in bytes (default: 250000)</source> - <translation type="unfinished"/> + <translation>Ορίσμος του μέγιστου μέγεθος block σε bytes (προεπιλογή: 250000)</translation> </message> <message> <location line="+1"/> <source>Set minimum block size in bytes (default: 0)</source> - <translation type="unfinished"/> + <translation>Ορίστε το μέγιστο μέγεθος block σε bytes (προεπιλογή: 0)</translation> </message> <message> <location line="+2"/> <source>Shrink debug.log file on client startup (default: 1 when no -debug)</source> - <translation type="unfinished"/> + <translation>Συρρίκνωση του αρχείο debug.log κατα την εκκίνηση του πελάτη (προεπιλογή: 1 όταν δεν-debug)</translation> + </message> + <message> + <location line="+1"/> + <source>Signing transaction failed</source> + <translation>Η υπογραφή συναλλαγής απέτυχε </translation> </message> <message> <location line="+2"/> @@ -2625,19 +2680,34 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Λάθος Συστήματος:</translation> </message> <message> - <location line="+10"/> + <location line="+4"/> + <source>Transaction amount too small</source> + <translation>Το ποσό της συναλλαγής είναι πολύ μικρο </translation> + </message> + <message> + <location line="+1"/> + <source>Transaction amounts must be positive</source> + <translation>Τα ποσά των συναλλαγών πρέπει να είναι θετικα</translation> + </message> + <message> + <location line="+1"/> + <source>Transaction too large</source> + <translation>Η συναλλαγή ειναι πολύ μεγάλη </translation> + </message> + <message> + <location line="+7"/> <source>Use UPnP to map the listening port (default: 0)</source> - <translation type="unfinished"/> + <translation>Χρησιμοποίηση του UPnP για την χρήση της πόρτας αναμονής (προεπιλογή:0)</translation> </message> <message> <location line="+1"/> <source>Use UPnP to map the listening port (default: 1 when listening)</source> - <translation type="unfinished"/> + <translation>Χρησιμοποίηση του UPnP για την χρήση της πόρτας αναμονής (προεπιλογή:1)</translation> </message> <message> <location line="+1"/> <source>Use proxy to reach tor hidden services (default: same as -proxy)</source> - <translation type="unfinished"/> + <translation>Χρήση διακομιστή μεσολάβησης για την επίτευξη των Tor κρυμμένων υπηρεσιων (προεπιλογή: ίδιο με το-proxy) </translation> </message> <message> <location line="+2"/> @@ -2647,25 +2717,25 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <message> <location line="+4"/> <source>Warning</source> - <translation type="unfinished"/> + <translation>Προειδοποίηση</translation> </message> <message> <location line="+1"/> <source>Warning: This version is obsolete, upgrade required!</source> - <translation type="unfinished"/> + <translation>Προειδοποίηση: Αυτή η έκδοση είναι ξεπερασμένη, απαιτείται αναβάθμιση </translation> </message> <message> <location line="+1"/> <source>You need to rebuild the databases using -reindex to change -txindex</source> - <translation type="unfinished"/> + <translation>Θα πρέπει να ξαναχτίστουν οι βάσεις δεδομένων που χρησιμοποιούντε-Αναδημιουργία αλλάγων-txindex </translation> </message> <message> <location line="+1"/> <source>wallet.dat corrupt, salvage failed</source> - <translation type="unfinished"/> + <translation>Το αρχειο wallet.dat ειναι διεφθαρμένο, η διάσωση απέτυχε</translation> </message> <message> - <location line="-46"/> + <location line="-50"/> <source>Password for JSON-RPC connections</source> <translation>Κωδικός για τις συνδέσεις JSON-RPC</translation> </message> @@ -2680,17 +2750,17 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Αποστολή εντολών στον κόμβο <ip> (προεπιλογή: 127.0.0.1)</translation> </message> <message> - <location line="-119"/> + <location line="-120"/> <source>Execute command when the best block changes (%s in cmd is replaced by block hash)</source> <translation>Εκτέλεσε την εντολή όταν το καλύτερο μπλοκ αλλάξει(%s στην εντολή αντικαθίσταται από το hash του μπλοκ)</translation> </message> <message> - <location line="+142"/> + <location line="+147"/> <source>Upgrade wallet to latest format</source> <translation>Αναβάθμισε το πορτοφόλι στην τελευταία έκδοση</translation> </message> <message> - <location line="-17"/> + <location line="-21"/> <source>Set key pool size to <n> (default: 100)</source> <translation>Όριο πλήθους κλειδιών pool <n> (προεπιλογή: 100)</translation> </message> @@ -2700,12 +2770,12 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Επανέλεγχος της αλυσίδας μπλοκ για απούσες συναλλαγές</translation> </message> <message> - <location line="+31"/> + <location line="+35"/> <source>Use OpenSSL (https) for JSON-RPC connections</source> <translation>Χρήση του OpenSSL (https) για συνδέσεις JSON-RPC</translation> </message> <message> - <location line="-22"/> + <location line="-26"/> <source>Server certificate file (default: server.cert)</source> <translation>Αρχείο πιστοποιητικού του διακομιστή (προεπιλογή: server.cert)</translation> </message> @@ -2715,37 +2785,37 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Προσωπικό κλειδί του διακομιστή (προεπιλογή: server.pem)</translation> </message> <message> - <location line="-153"/> + <location line="-151"/> <source>Acceptable ciphers (default: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH)</source> <translation>Αποδεκτά κρυπτογραφήματα (προεπιλογή: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH)</translation> </message> <message> - <location line="+166"/> + <location line="+165"/> <source>This help message</source> <translation>Αυτό το κείμενο βοήθειας</translation> </message> <message> - <location line="+3"/> + <location line="+6"/> <source>Unable to bind to %s on this computer (bind returned error %d, %s)</source> - <translation type="unfinished"/> + <translation>Αδύνατη η σύνδεση με τη θύρα %s αυτού του υπολογιστή (bind returned error %d, %s) </translation> </message> <message> - <location line="-86"/> + <location line="-91"/> <source>Connect through socks proxy</source> <translation>Σύνδεση μέσω διαμεσολαβητή socks</translation> </message> <message> - <location line="-11"/> + <location line="-10"/> <source>Allow DNS lookups for -addnode, -seednode and -connect</source> - <translation type="unfinished"/> + <translation>Να επιτρέπονται οι έλεγχοι DNS για προσθήκη και σύνδεση κόμβων</translation> </message> <message> - <location line="+56"/> + <location line="+55"/> <source>Loading addresses...</source> <translation>Φόρτωση διευθύνσεων...</translation> </message> <message> - <location line="-34"/> + <location line="-35"/> <source>Error loading wallet.dat: Wallet corrupted</source> <translation>Σφάλμα φόρτωσης wallet.dat: Κατεστραμμένο Πορτοφόλι</translation> </message> @@ -2755,44 +2825,44 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Σφάλμα φόρτωσης wallet.dat: Το Πορτοφόλι απαιτεί μια νεότερη έκδοση του Bitcoin</translation> </message> <message> - <location line="+87"/> + <location line="+93"/> <source>Wallet needed to be rewritten: restart Bitcoin to complete</source> <translation>Απαιτείται η επανεγγραφή του Πορτοφολιού, η οποία θα ολοκληρωθεί στην επανεκκίνηση του Bitcoin</translation> </message> <message> - <location line="-89"/> + <location line="-95"/> <source>Error loading wallet.dat</source> <translation>Σφάλμα φόρτωσης αρχείου wallet.dat</translation> </message> <message> - <location line="+29"/> + <location line="+28"/> <source>Invalid -proxy address: '%s'</source> <translation>Δεν είναι έγκυρη η διεύθυνση διαμεσολαβητή: '%s'</translation> </message> <message> - <location line="+49"/> + <location line="+56"/> <source>Unknown network specified in -onlynet: '%s'</source> - <translation type="unfinished"/> + <translation>Άγνωστo δίκτυο ορίζεται σε onlynet: '%s'</translation> </message> <message> <location line="-1"/> <source>Unknown -socks proxy version requested: %i</source> - <translation type="unfinished"/> + <translation>Άγνωστo δίκτυο ορίζεται: %i</translation> </message> <message> - <location line="-91"/> + <location line="-96"/> <source>Cannot resolve -bind address: '%s'</source> - <translation type="unfinished"/> + <translation>Δεν μπορώ να γράψω την προεπιλεγμένη διεύθυνση: '%s'</translation> </message> <message> <location line="+1"/> <source>Cannot resolve -externalip address: '%s'</source> - <translation type="unfinished"/> + <translation>Δεν μπορώ να γράψω την προεπιλεγμένη διεύθυνση: '%s'</translation> </message> <message> <location line="+44"/> <source>Invalid amount for -paytxfee=<amount>: '%s'</source> - <translation type="unfinished"/> + <translation>Μη έγκυρο ποσό για την παράμετρο -paytxfee=<amount>: '%s'</translation> </message> <message> <location line="+1"/> @@ -2800,72 +2870,67 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Λάθος ποσότητα</translation> </message> <message> - <location line="-4"/> + <location line="-6"/> <source>Insufficient funds</source> <translation>Ανεπαρκές κεφάλαιο</translation> </message> <message> - <location line="+8"/> + <location line="+10"/> <source>Loading block index...</source> <translation>Φόρτωση ευρετηρίου μπλοκ...</translation> </message> <message> - <location line="-58"/> + <location line="-57"/> <source>Add a node to connect to and attempt to keep the connection open</source> <translation>Προσέθεσε ένα κόμβο για σύνδεση και προσπάθησε να κρατήσεις την σύνδεση ανοιχτή</translation> </message> <message> <location line="-25"/> <source>Unable to bind to %s on this computer. Bitcoin is probably already running.</source> - <translation type="unfinished"/> + <translation>Αδύνατη η σύνδεση με τη θύρα %s αυτού του υπολογιστή. Το Bitcoin είναι πιθανώς ήδη ενεργό.</translation> </message> <message> - <location line="+67"/> + <location line="+64"/> <source>Fee per KB to add to transactions you send</source> <translation>Αμοιβή ανά KB που θα προστίθεται στις συναλλαγές που στέλνεις</translation> </message> <message> - <location line="+17"/> + <location line="+19"/> <source>Loading wallet...</source> <translation>Φόρτωση πορτοφολιού...</translation> </message> <message> - <location line="-53"/> + <location line="-52"/> <source>Cannot downgrade wallet</source> <translation>Δεν μπορώ να υποβαθμίσω το πορτοφόλι</translation> </message> <message> - <location line="+1"/> - <source>Cannot initialize keypool</source> - <translation>Δεν μπορώ αν αρχικοποιήσω την λίστα κλειδιών</translation> - </message> - <message> <location line="+3"/> <source>Cannot write default address</source> <translation>Δεν μπορώ να γράψω την προεπιλεγμένη διεύθυνση</translation> </message> <message> - <location line="+63"/> + <location line="+64"/> <source>Rescanning...</source> <translation>Ανίχνευση...</translation> </message> <message> - <location line="-55"/> + <location line="-57"/> <source>Done loading</source> <translation>Η φόρτωση ολοκληρώθηκε</translation> </message> <message> - <location line="+79"/> + <location line="+82"/> <source>To use the %s option</source> <translation>Χρήση της %s επιλογής</translation> </message> <message> - <location line="-71"/> + <location line="-74"/> <source>Error</source> <translation>Σφάλμα</translation> </message> <message> - <location line="-33"/> + <location line="-31"/> <source>You must set rpcpassword=<password> in the configuration file: %s If the file does not exist, create it with owner-readable-only file permissions.</source> diff --git a/src/qt/locale/bitcoin_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 <context> <name>BitcoinGUI</name> <message> - <location filename="../bitcoingui.cpp" line="+232"/> + <location filename="../bitcoingui.cpp" line="+233"/> <source>Sign &message...</source> <translation>Sign &message...</translation> </message> <message> - <location line="+279"/> + <location line="+280"/> <source>Synchronizing with network...</source> <translation>Synchronizing with network...</translation> </message> <message> - <location line="-348"/> + <location line="-349"/> <source>&Overview</source> <translation>&Overview</translation> </message> @@ -410,7 +410,7 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>&Change Passphrase...</translation> </message> <message> - <location line="+284"/> + <location line="+285"/> <source>Importing blocks from disk...</source> <translation>Importing blocks from disk...</translation> </message> @@ -420,7 +420,7 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>Reindexing blocks on disk...</translation> </message> <message> - <location line="-346"/> + <location line="-347"/> <source>Send coins to a Bitcoin address</source> <translation>Send coins to a Bitcoin address</translation> </message> @@ -455,18 +455,18 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>&Verify message...</translation> </message> <message> - <location line="-164"/> - <location line="+528"/> + <location line="-165"/> + <location line="+530"/> <source>Bitcoin</source> <translation>Bitcoin</translation> </message> <message> - <location line="-528"/> + <location line="-530"/> <source>Wallet</source> <translation>Wallet</translation> </message> <message> - <location line="+100"/> + <location line="+101"/> <source>&Send</source> <translation>&Send</translation> </message> @@ -542,7 +542,7 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>Bitcoin client</translation> </message> <message numerus="yes"> - <location line="+140"/> + <location line="+141"/> <source>%n active connection(s) to Bitcoin network</source> <translation> <numerusform>%n active connection to Bitcoin network</numerusform> @@ -684,7 +684,7 @@ Address: %4 <translation>Wallet is <b>encrypted</b> and currently <b>locked</b></translation> </message> <message> - <location filename="../bitcoin.cpp" line="+107"/> + <location filename="../bitcoin.cpp" line="+111"/> <source>A fatal error occurred. Bitcoin can no longer continue safely and will quit.</source> <translation>A fatal error occurred. Bitcoin can no longer continue safely and will quit.</translation> </message> @@ -823,8 +823,8 @@ Address: %4 </message> <message> <location line="+6"/> - <source>Optional transaction fee per kB that helps make sure your transactions are processed quickly. Most transactions are 1 kB. Fee 0.01 recommended.</source> - <translation>Optional transaction fee per kB that helps make sure your transactions are processed quickly. Most transactions are 1 kB. Fee 0.01 recommended.</translation> + <source>Optional transaction fee per kB that helps make sure your transactions are processed quickly. Most transactions are 1 kB.</source> + <translation>Optional transaction fee per kB that helps make sure your transactions are processed quickly. Most transactions are 1 kB.</translation> </message> <message> <location line="+15"/> @@ -2162,14 +2162,27 @@ Address: %4 </message> </context> <context> + <name>WalletModel</name> + <message> + <location filename="../walletmodel.cpp" line="+193"/> + <source>Send Coins</source> + <translation>Send Coins</translation> + </message> +</context> +<context> <name>WalletView</name> <message> - <location filename="../walletview.cpp" line="+43"/> + <location filename="../walletview.cpp" line="+42"/> + <source>&Export</source> + <translation>&Export</translation> + </message> + <message> + <location line="+1"/> <source>Export the data in the current tab to a file</source> <translation>Export the data in the current tab to a file</translation> </message> <message> - <location line="+198"/> + <location line="+193"/> <source>Backup Wallet</source> <translation>Backup Wallet</translation> </message> @@ -2202,37 +2215,37 @@ Address: %4 <context> <name>bitcoin-core</name> <message> - <location filename="../bitcoinstrings.cpp" line="+96"/> + <location filename="../bitcoinstrings.cpp" line="+94"/> <source>Bitcoin version</source> <translation>Bitcoin version</translation> </message> <message> - <location line="+98"/> + <location line="+102"/> <source>Usage:</source> <translation>Usage:</translation> </message> <message> - <location line="-25"/> + <location line="-29"/> <source>Send command to -server or bitcoind</source> <translation>Send command to -server or bitcoind</translation> </message> <message> - <location line="-22"/> + <location line="-23"/> <source>List commands</source> <translation>List commands</translation> </message> <message> - <location line="-10"/> + <location line="-12"/> <source>Get help for a command</source> <translation>Get help for a command</translation> </message> <message> - <location line="+21"/> + <location line="+24"/> <source>Options:</source> <translation>Options:</translation> </message> <message> - <location line="+23"/> + <location line="+24"/> <source>Specify configuration file (default: bitcoin.conf)</source> <translation>Specify configuration file (default: bitcoin.conf)</translation> </message> @@ -2242,27 +2255,17 @@ Address: %4 <translation>Specify pid file (default: bitcoind.pid)</translation> </message> <message> - <location line="-48"/> - <source>Generate coins</source> - <translation>Generate coins</translation> - </message> - <message> - <location line="-27"/> - <source>Don't generate coins</source> - <translation>Don't generate coins</translation> - </message> - <message> - <location line="+74"/> + <location line="-1"/> <source>Specify data directory</source> <translation>Specify data directory</translation> </message> <message> - <location line="-8"/> + <location line="-9"/> <source>Set database cache size in megabytes (default: 25)</source> <translation>Set database cache size in megabytes (default: 25)</translation> </message> <message> - <location line="-27"/> + <location line="-28"/> <source>Listen for connections on <port> (default: 8333 or testnet: 18333)</source> <translation>Listen for connections on <port> (default: 8333 or testnet: 18333)</translation> </message> @@ -2277,7 +2280,7 @@ Address: %4 <translation>Connect to a node to retrieve peer addresses, and disconnect</translation> </message> <message> - <location line="+80"/> + <location line="+82"/> <source>Specify your own public address</source> <translation>Specify your own public address</translation> </message> @@ -2287,22 +2290,22 @@ Address: %4 <translation>Threshold for disconnecting misbehaving peers (default: 100)</translation> </message> <message> - <location line="-132"/> + <location line="-134"/> <source>Number of seconds to keep misbehaving peers from reconnecting (default: 86400)</source> <translation>Number of seconds to keep misbehaving peers from reconnecting (default: 86400)</translation> </message> <message> - <location line="-32"/> + <location line="-29"/> <source>An error occurred while setting up the RPC port %u for listening on IPv4: %s</source> <translation>An error occurred while setting up the RPC port %u for listening on IPv4: %s</translation> </message> <message> - <location line="+30"/> + <location line="+27"/> <source>Listen for JSON-RPC connections on <port> (default: 8332 or testnet: 18332)</source> <translation>Listen for JSON-RPC connections on <port> (default: 8332 or testnet: 18332)</translation> </message> <message> - <location line="+36"/> + <location line="+37"/> <source>Accept command line and JSON-RPC commands</source> <translation>Accept command line and JSON-RPC commands</translation> </message> @@ -2312,17 +2315,17 @@ Address: %4 <translation>Run in the background as a daemon and accept commands</translation> </message> <message> - <location line="+33"/> + <location line="+37"/> <source>Use the test network</source> <translation>Use the test network</translation> </message> <message> - <location line="-108"/> + <location line="-112"/> <source>Accept connections from outside (default: 1 if no -proxy or -connect)</source> <translation>Accept connections from outside (default: 1 if no -proxy or -connect)</translation> </message> <message> - <location line="-82"/> + <location line="-80"/> <source>%s, you must set a rpcpassword in the configuration file: %s It is recommended you use the following random password: @@ -2363,11 +2366,6 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. </message> <message> <location line="+3"/> - <source>Error initializing database environment %s! To recover, BACKUP THAT DIRECTORY, then remove everything from it except for wallet.dat.</source> - <translation>Error initializing database environment %s! To recover, BACKUP THAT DIRECTORY, then remove everything from it except for wallet.dat.</translation> - </message> - <message> - <location line="+3"/> <source>Error: The transaction was rejected! This might happen if some of the coins in your wallet were already spent, such as if you used a copy of wallet.dat and coins were spent in the copy but not marked as spent here.</source> <translation>Error: The transaction was rejected! This might happen if some of the coins in your wallet were already spent, such as if you used a copy of wallet.dat and coins were spent in the copy but not marked as spent here.</translation> </message> @@ -2392,12 +2390,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Set maximum size of high-priority/low-fee transactions in bytes (default: 27000)</translation> </message> <message> - <location line="+3"/> - <source>Set the number of script verification threads (1-16, 0=auto, default: 0)</source> - <translation>Set the number of script verification threads (1-16, 0=auto, default: 0)</translation> - </message> - <message> - <location line="+2"/> + <location line="+6"/> <source>This is a pre-release test build - use at your own risk - do not use for mining or merchant applications</source> <translation>This is a pre-release test build - use at your own risk - do not use for mining or merchant applications</translation> </message> @@ -2437,7 +2430,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Block creation options:</translation> </message> <message> - <location line="+6"/> + <location line="+5"/> <source>Connect only to the specified node(s)</source> <translation>Connect only to the specified node(s)</translation> </message> @@ -2457,7 +2450,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Do you want to rebuild the block database now?</translation> </message> <message> - <location line="+3"/> + <location line="+2"/> <source>Error initializing block database</source> <translation>Error initializing block database</translation> </message> @@ -2483,11 +2476,6 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. </message> <message> <location line="+1"/> - <source>Error: Transaction creation failed!</source> - <translation>Error: Transaction creation failed!</translation> - </message> - <message> - <location line="+1"/> <source>Error: Wallet locked, unable to create transaction!</source> <translation>Error: Wallet locked, unable to create transaction!</translation> </message> @@ -2557,7 +2545,12 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Find peers using DNS lookup (default: 1 unless -connect)</translation> </message> <message> - <location line="+3"/> + <location line="+1"/> + <source>Generate coins (default: 0)</source> + <translation>Generate coins (default: 0)</translation> + </message> + <message> + <location line="+2"/> <source>How many blocks to check at startup (default: 288, 0 = all)</source> <translation>How many blocks to check at startup (default: 288, 0 = all)</translation> </message> @@ -2567,7 +2560,12 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>How thorough the block verification is (0-4, default: 3)</translation> </message> <message> - <location line="+24"/> + <location line="+19"/> + <source>Not enough file descriptors available.</source> + <translation>Not enough file descriptors available.</translation> + </message> + <message> + <location line="+8"/> <source>Rebuild block chain index from current blk000??.dat files</source> <translation>Rebuild block chain index from current blk000??.dat files</translation> </message> @@ -2577,7 +2575,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Set the number of threads to service RPC calls (default: 4)</translation> </message> <message> - <location line="+22"/> + <location line="+26"/> <source>Verifying blocks...</source> <translation>Verifying blocks...</translation> </message> @@ -2587,12 +2585,17 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Verifying wallet...</translation> </message> <message> - <location line="-62"/> + <location line="-69"/> <source>Imports blocks from external blk000??.dat file</source> <translation>Imports blocks from external blk000??.dat file</translation> </message> <message> - <location line="+1"/> + <location line="-76"/> + <source>Set the number of script verification threads (up to 16, 0 = auto, <0 = leave that many cores free, default: 0)</source> + <translation>Set the number of script verification threads (up to 16, 0 = auto, <0 = leave that many cores free, default: 0)</translation> + </message> + <message> + <location line="+77"/> <source>Information</source> <translation>Information</translation> </message> @@ -2602,6 +2605,16 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Invalid -tor address: '%s'</translation> </message> <message> + <location line="+1"/> + <source>Invalid amount for -minrelaytxfee=<amount>: '%s'</source> + <translation>Invalid amount for -minrelaytxfee=<amount>: '%s'</translation> + </message> + <message> + <location line="+1"/> + <source>Invalid amount for -mintxfee=<amount>: '%s'</source> + <translation>Invalid amount for -mintxfee=<amount>: '%s'</translation> + </message> + <message> <location line="+8"/> <source>Maintain a full transaction index (default: 0)</source> <translation>Maintain a full transaction index (default: 0)</translation> @@ -2617,7 +2630,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Maximum per-connection send buffer, <n>*1000 bytes (default: 1000)</translation> </message> <message> - <location line="+1"/> + <location line="+2"/> <source>Only accept block chain matching built-in checkpoints (default: 1)</source> <translation>Only accept block chain matching built-in checkpoints (default: 1)</translation> </message> @@ -2677,6 +2690,11 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Shrink debug.log file on client startup (default: 1 when no -debug)</translation> </message> <message> + <location line="+1"/> + <source>Signing transaction failed</source> + <translation>Signing transaction failed</translation> + </message> + <message> <location line="+2"/> <source>Specify connection timeout in milliseconds (default: 5000)</source> <translation>Specify connection timeout in milliseconds (default: 5000)</translation> @@ -2687,7 +2705,22 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>System error: </translation> </message> <message> - <location line="+10"/> + <location line="+4"/> + <source>Transaction amount too small</source> + <translation>Transaction amount too small</translation> + </message> + <message> + <location line="+1"/> + <source>Transaction amounts must be positive</source> + <translation>Transaction amounts must be positive</translation> + </message> + <message> + <location line="+1"/> + <source>Transaction too large</source> + <translation>Transaction too large</translation> + </message> + <message> + <location line="+7"/> <source>Use UPnP to map the listening port (default: 0)</source> <translation>Use UPnP to map the listening port (default: 0)</translation> </message> @@ -2727,7 +2760,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>wallet.dat corrupt, salvage failed</translation> </message> <message> - <location line="-46"/> + <location line="-50"/> <source>Password for JSON-RPC connections</source> <translation>Password for JSON-RPC connections</translation> </message> @@ -2742,17 +2775,17 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Send commands to node running on <ip> (default: 127.0.0.1)</translation> </message> <message> - <location line="-119"/> + <location line="-120"/> <source>Execute command when the best block changes (%s in cmd is replaced by block hash)</source> <translation>Execute command when the best block changes (%s in cmd is replaced by block hash)</translation> </message> <message> - <location line="+142"/> + <location line="+147"/> <source>Upgrade wallet to latest format</source> <translation>Upgrade wallet to latest format</translation> </message> <message> - <location line="-17"/> + <location line="-21"/> <source>Set key pool size to <n> (default: 100)</source> <translation>Set key pool size to <n> (default: 100)</translation> </message> @@ -2762,12 +2795,12 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Rescan the block chain for missing wallet transactions</translation> </message> <message> - <location line="+31"/> + <location line="+35"/> <source>Use OpenSSL (https) for JSON-RPC connections</source> <translation>Use OpenSSL (https) for JSON-RPC connections</translation> </message> <message> - <location line="-22"/> + <location line="-26"/> <source>Server certificate file (default: server.cert)</source> <translation>Server certificate file (default: server.cert)</translation> </message> @@ -2777,37 +2810,37 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Server private key (default: server.pem)</translation> </message> <message> - <location line="-153"/> + <location line="-151"/> <source>Acceptable ciphers (default: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH)</source> <translation>Acceptable ciphers (default: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH)</translation> </message> <message> - <location line="+166"/> + <location line="+165"/> <source>This help message</source> <translation>This help message</translation> </message> <message> - <location line="+3"/> + <location line="+6"/> <source>Unable to bind to %s on this computer (bind returned error %d, %s)</source> <translation>Unable to bind to %s on this computer (bind returned error %d, %s)</translation> </message> <message> - <location line="-86"/> + <location line="-91"/> <source>Connect through socks proxy</source> <translation>Connect through socks proxy</translation> </message> <message> - <location line="-11"/> + <location line="-10"/> <source>Allow DNS lookups for -addnode, -seednode and -connect</source> <translation>Allow DNS lookups for -addnode, -seednode and -connect</translation> </message> <message> - <location line="+56"/> + <location line="+55"/> <source>Loading addresses...</source> <translation>Loading addresses...</translation> </message> <message> - <location line="-34"/> + <location line="-35"/> <source>Error loading wallet.dat: Wallet corrupted</source> <translation>Error loading wallet.dat: Wallet corrupted</translation> </message> @@ -2817,22 +2850,22 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Error loading wallet.dat: Wallet requires newer version of Bitcoin</translation> </message> <message> - <location line="+87"/> + <location line="+93"/> <source>Wallet needed to be rewritten: restart Bitcoin to complete</source> <translation>Wallet needed to be rewritten: restart Bitcoin to complete</translation> </message> <message> - <location line="-89"/> + <location line="-95"/> <source>Error loading wallet.dat</source> <translation>Error loading wallet.dat</translation> </message> <message> - <location line="+29"/> + <location line="+28"/> <source>Invalid -proxy address: '%s'</source> <translation>Invalid -proxy address: '%s'</translation> </message> <message> - <location line="+49"/> + <location line="+56"/> <source>Unknown network specified in -onlynet: '%s'</source> <translation>Unknown network specified in -onlynet: '%s'</translation> </message> @@ -2842,7 +2875,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Unknown -socks proxy version requested: %i</translation> </message> <message> - <location line="-91"/> + <location line="-96"/> <source>Cannot resolve -bind address: '%s'</source> <translation>Cannot resolve -bind address: '%s'</translation> </message> @@ -2862,17 +2895,17 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Invalid amount</translation> </message> <message> - <location line="-4"/> + <location line="-6"/> <source>Insufficient funds</source> <translation>Insufficient funds</translation> </message> <message> - <location line="+8"/> + <location line="+10"/> <source>Loading block index...</source> <translation>Loading block index...</translation> </message> <message> - <location line="-58"/> + <location line="-57"/> <source>Add a node to connect to and attempt to keep the connection open</source> <translation>Add a node to connect to and attempt to keep the connection open</translation> </message> @@ -2882,52 +2915,47 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Unable to bind to %s on this computer. Bitcoin is probably already running.</translation> </message> <message> - <location line="+67"/> + <location line="+64"/> <source>Fee per KB to add to transactions you send</source> <translation>Fee per KB to add to transactions you send</translation> </message> <message> - <location line="+17"/> + <location line="+19"/> <source>Loading wallet...</source> <translation>Loading wallet...</translation> </message> <message> - <location line="-53"/> + <location line="-52"/> <source>Cannot downgrade wallet</source> <translation>Cannot downgrade wallet</translation> </message> <message> - <location line="+1"/> - <source>Cannot initialize keypool</source> - <translation>Cannot initialize keypool</translation> - </message> - <message> <location line="+3"/> <source>Cannot write default address</source> <translation>Cannot write default address</translation> </message> <message> - <location line="+63"/> + <location line="+64"/> <source>Rescanning...</source> <translation>Rescanning...</translation> </message> <message> - <location line="-55"/> + <location line="-57"/> <source>Done loading</source> <translation>Done loading</translation> </message> <message> - <location line="+79"/> + <location line="+82"/> <source>To use the %s option</source> <translation>To use the %s option</translation> </message> <message> - <location line="-71"/> + <location line="-74"/> <source>Error</source> <translation>Error</translation> </message> <message> - <location line="-33"/> + <location line="-31"/> <source>You must set rpcpassword=<password> in the configuration file: %s If the file does not exist, create it with owner-readable-only file permissions.</source> diff --git a/src/qt/locale/bitcoin_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 <translation type="unfinished"/> </message> <message> - <location filename="../aboutdialog.cpp" line="+17"/> + <location filename="../aboutdialog.cpp" line="+14"/> <source>Copyright</source> <translation type="unfinished"/> </message> <message> <location line="+0"/> - <source>2009-%1 The Bitcoin developers</source> + <source>The Bitcoin developers</source> <translation type="unfinished"/> </message> </context> @@ -61,7 +61,7 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>&Nova Adreso</translation> </message> <message> - <location filename="../addressbookpage.cpp" line="+59"/> + <location filename="../addressbookpage.cpp" line="+63"/> <source>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.</source> <translation type="unfinished"/> </message> @@ -91,7 +91,17 @@ This product includes software developed by the OpenSSL Project for use in the O <translation type="unfinished"/> </message> <message> - <location line="-14"/> + <location line="+27"/> + <source>Export the data in the current tab to a file</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+3"/> + <source>&Export</source> + <translation type="unfinished"/> + </message> + <message> + <location line="-44"/> <source>Verify a message to ensure it was signed with a specified Bitcoin address</source> <translation type="unfinished"/> </message> @@ -313,12 +323,12 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>Subskribu &mesaĝon...</translation> </message> <message> - <location line="+299"/> + <location line="+280"/> <source>Synchronizing with network...</source> <translation>Sinkronigante kun reto...</translation> </message> <message> - <location line="-368"/> + <location line="-349"/> <source>&Overview</source> <translation>&Superrigardo</translation> </message> @@ -393,7 +403,7 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>&Anstataŭigu pasfrazon...</translation> </message> <message> - <location line="+304"/> + <location line="+285"/> <source>Importing blocks from disk...</source> <translation type="unfinished"/> </message> @@ -403,12 +413,7 @@ This product includes software developed by the OpenSSL Project for use in the O <translation type="unfinished"/> </message> <message> - <location line="-300"/> - <source>&Export...</source> - <translation>&Eksportu...</translation> - </message> - <message> - <location line="-66"/> + <location line="-347"/> <source>Send coins to a Bitcoin address</source> <translation type="unfinished"/> </message> @@ -418,12 +423,7 @@ This product includes software developed by the OpenSSL Project for use in the O <translation type="unfinished"/> </message> <message> - <location line="+18"/> - <source>Export the data in the current tab to a file</source> - <translation type="unfinished"/> - </message> - <message> - <location line="-9"/> + <location line="+9"/> <source>Backup wallet to another location</source> <translation type="unfinished"/> </message> @@ -433,7 +433,7 @@ This product includes software developed by the OpenSSL Project for use in the O <translation type="unfinished"/> </message> <message> - <location line="+9"/> + <location line="+6"/> <source>&Debug window</source> <translation type="unfinished"/> </message> @@ -443,23 +443,23 @@ This product includes software developed by the OpenSSL Project for use in the O <translation type="unfinished"/> </message> <message> - <location line="-7"/> + <location line="-4"/> <source>&Verify message...</source> <translation>&Kontrolu mesaĝon...</translation> </message> <message> - <location line="-163"/> - <location line="+541"/> + <location line="-165"/> + <location line="+530"/> <source>Bitcoin</source> <translation type="unfinished"/> </message> <message> - <location line="-541"/> + <location line="-530"/> <source>Wallet</source> <translation>Monujo</translation> </message> <message> - <location line="+99"/> + <location line="+101"/> <source>&Send</source> <translation type="unfinished"/> </message> @@ -504,12 +504,12 @@ This product includes software developed by the OpenSSL Project for use in the O <translation type="unfinished"/> </message> <message> - <location line="+31"/> + <location line="+28"/> <source>&File</source> <translation>&Dosiero</translation> </message> <message> - <location line="+8"/> + <location line="+7"/> <source>&Settings</source> <translation>&Agordoj</translation> </message> @@ -524,12 +524,7 @@ This product includes software developed by the OpenSSL Project for use in the O <translation type="unfinished"/> </message> <message> - <location line="+8"/> - <source>Actions toolbar</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+13"/> + <location line="+17"/> <location line="+10"/> <source>[testnet]</source> <translation type="unfinished"/> @@ -540,12 +535,17 @@ This product includes software developed by the OpenSSL Project for use in the O <translation type="unfinished"/> </message> <message numerus="yes"> - <location line="+140"/> + <location line="+141"/> <source>%n active connection(s) to Bitcoin network</source> <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation> </message> <message> - <location line="+39"/> + <location line="+22"/> + <source>No block source available...</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+12"/> <source>Processed %1 of %2 (estimated) blocks of transaction history.</source> <translation type="unfinished"/> </message> @@ -570,7 +570,7 @@ This product includes software developed by the OpenSSL Project for use in the O <translation><numerusform>%n semajno</numerusform><numerusform>%n semajnoj</numerusform></translation> </message> <message> - <location line="+5"/> + <location line="+4"/> <source>%1 behind</source> <translation type="unfinished"/> </message> @@ -585,7 +585,7 @@ This product includes software developed by the OpenSSL Project for use in the O <translation type="unfinished"/> </message> <message> - <location line="+21"/> + <location line="+22"/> <source>Error</source> <translation>Eraro</translation> </message> @@ -600,22 +600,22 @@ This product includes software developed by the OpenSSL Project for use in the O <translation type="unfinished"/> </message> <message> - <location line="+68"/> + <location line="+70"/> <source>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?</source> <translation type="unfinished"/> </message> <message> - <location line="-138"/> + <location line="-140"/> <source>Up to date</source> <translation>Ĝisdata</translation> </message> <message> - <location line="+32"/> + <location line="+31"/> <source>Catching up...</source> <translation>Ĝisdatigante...</translation> </message> <message> - <location line="+110"/> + <location line="+113"/> <source>Confirm transaction fee</source> <translation type="unfinished"/> </message> @@ -661,7 +661,7 @@ Address: %4 <translation>Monujo estas <b>ĉifrita</b> kaj nun <b>ŝlosita</b></translation> </message> <message> - <location filename="../bitcoin.cpp" line="+104"/> + <location filename="../bitcoin.cpp" line="+111"/> <source>A fatal error occurred. Bitcoin can no longer continue safely and will quit.</source> <translation type="unfinished"/> </message> @@ -669,7 +669,7 @@ Address: %4 <context> <name>ClientModel</name> <message> - <location filename="../clientmodel.cpp" line="+98"/> + <location filename="../clientmodel.cpp" line="+104"/> <source>Network Alert</source> <translation>Reta Averto</translation> </message> @@ -800,7 +800,7 @@ Address: %4 </message> <message> <location line="+6"/> - <source>Optional transaction fee per kB that helps make sure your transactions are processed quickly. Most transactions are 1 kB. Fee 0.01 recommended.</source> + <source>Optional transaction fee per kB that helps make sure your transactions are processed quickly. Most transactions are 1 kB.</source> <translation type="unfinished"/> </message> <message> @@ -1050,7 +1050,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location filename="../overviewpage.cpp" line="+115"/> + <location filename="../overviewpage.cpp" line="+116"/> <location line="+1"/> <source>out of sync</source> <translation type="unfinished"/> @@ -1637,6 +1637,19 @@ Address: %4 </message> </context> <context> + <name>SplashScreen</name> + <message> + <location filename="../splashscreen.cpp" line="+22"/> + <source>The Bitcoin developers</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>[testnet]</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>TransactionDesc</name> <message> <location filename="../transactiondesc.cpp" line="+20"/> @@ -2111,9 +2124,27 @@ Address: %4 </message> </context> <context> + <name>WalletModel</name> + <message> + <location filename="../walletmodel.cpp" line="+193"/> + <source>Send Coins</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>WalletView</name> <message> - <location filename="../walletview.cpp" line="+247"/> + <location filename="../walletview.cpp" line="+42"/> + <source>&Export</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Export the data in the current tab to a file</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+193"/> <source>Backup Wallet</source> <translation type="unfinished"/> </message> @@ -2146,37 +2177,37 @@ Address: %4 <context> <name>bitcoin-core</name> <message> - <location filename="../bitcoinstrings.cpp" line="+96"/> + <location filename="../bitcoinstrings.cpp" line="+94"/> <source>Bitcoin version</source> <translation>Bitcoin-a versio</translation> </message> <message> - <location line="+98"/> + <location line="+102"/> <source>Usage:</source> <translation type="unfinished"/> </message> <message> - <location line="-25"/> + <location line="-29"/> <source>Send command to -server or bitcoind</source> <translation type="unfinished"/> </message> <message> - <location line="-22"/> + <location line="-23"/> <source>List commands</source> <translation>Listigu instrukciojn</translation> </message> <message> - <location line="-10"/> + <location line="-12"/> <source>Get help for a command</source> <translation type="unfinished"/> </message> <message> - <location line="+21"/> + <location line="+24"/> <source>Options:</source> <translation>Opcioj:</translation> </message> <message> - <location line="+23"/> + <location line="+24"/> <source>Specify configuration file (default: bitcoin.conf)</source> <translation type="unfinished"/> </message> @@ -2186,27 +2217,17 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="-48"/> - <source>Generate coins</source> - <translation>Generu monerojn</translation> - </message> - <message> - <location line="-27"/> - <source>Don't generate coins</source> - <translation>Ne generu monerojn</translation> - </message> - <message> - <location line="+74"/> + <location line="-1"/> <source>Specify data directory</source> <translation type="unfinished"/> </message> <message> - <location line="-8"/> + <location line="-9"/> <source>Set database cache size in megabytes (default: 25)</source> <translation type="unfinished"/> </message> <message> - <location line="-27"/> + <location line="-28"/> <source>Listen for connections on <port> (default: 8333 or testnet: 18333)</source> <translation type="unfinished"/> </message> @@ -2221,7 +2242,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+80"/> + <location line="+82"/> <source>Specify your own public address</source> <translation type="unfinished"/> </message> @@ -2231,22 +2252,22 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="-132"/> + <location line="-134"/> <source>Number of seconds to keep misbehaving peers from reconnecting (default: 86400)</source> <translation type="unfinished"/> </message> <message> - <location line="-32"/> + <location line="-29"/> <source>An error occurred while setting up the RPC port %u for listening on IPv4: %s</source> <translation type="unfinished"/> </message> <message> - <location line="+30"/> + <location line="+27"/> <source>Listen for JSON-RPC connections on <port> (default: 8332 or testnet: 18332)</source> <translation type="unfinished"/> </message> <message> - <location line="+36"/> + <location line="+37"/> <source>Accept command line and JSON-RPC commands</source> <translation type="unfinished"/> </message> @@ -2256,17 +2277,17 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+33"/> + <location line="+37"/> <source>Use the test network</source> <translation type="unfinished"/> </message> <message> - <location line="-108"/> + <location line="-112"/> <source>Accept connections from outside (default: 1 if no -proxy or -connect)</source> <translation type="unfinished"/> </message> <message> - <location line="-82"/> + <location line="-80"/> <source>%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. </message> <message> <location line="+3"/> - <source>Error initializing database environment %s! To recover, BACKUP THAT DIRECTORY, then remove everything from it except for wallet.dat.</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+3"/> <source>Error: The transaction was rejected! This might happen if some of the coins in your wallet were already spent, such as if you used a copy of wallet.dat and coins were spent in the copy but not marked as spent here.</source> <translation type="unfinished"/> </message> @@ -2326,12 +2342,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+3"/> - <source>Set the number of script verification threads (1-16, 0=auto, default: 0)</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+2"/> + <location line="+6"/> <source>This is a pre-release test build - use at your own risk - do not use for mining or merchant applications</source> <translation type="unfinished"/> </message> @@ -2371,7 +2382,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+6"/> + <location line="+5"/> <source>Connect only to the specified node(s)</source> <translation type="unfinished"/> </message> @@ -2391,7 +2402,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+3"/> + <location line="+2"/> <source>Error initializing block database</source> <translation type="unfinished"/> </message> @@ -2417,11 +2428,6 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. </message> <message> <location line="+1"/> - <source>Error: Transaction creation failed!</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+1"/> <source>Error: Wallet locked, unable to create transaction!</source> <translation type="unfinished"/> </message> @@ -2491,7 +2497,12 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+3"/> + <location line="+1"/> + <source>Generate coins (default: 0)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+2"/> <source>How many blocks to check at startup (default: 288, 0 = all)</source> <translation type="unfinished"/> </message> @@ -2501,7 +2512,12 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+24"/> + <location line="+19"/> + <source>Not enough file descriptors available.</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+8"/> <source>Rebuild block chain index from current blk000??.dat files</source> <translation type="unfinished"/> </message> @@ -2511,7 +2527,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+22"/> + <location line="+26"/> <source>Verifying blocks...</source> <translation type="unfinished"/> </message> @@ -2521,12 +2537,17 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="-62"/> + <location line="-69"/> <source>Imports blocks from external blk000??.dat file</source> <translation type="unfinished"/> </message> <message> - <location line="+1"/> + <location line="-76"/> + <source>Set the number of script verification threads (up to 16, 0 = auto, <0 = leave that many cores free, default: 0)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+77"/> <source>Information</source> <translation type="unfinished"/> </message> @@ -2536,6 +2557,16 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> + <location line="+1"/> + <source>Invalid amount for -minrelaytxfee=<amount>: '%s'</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Invalid amount for -mintxfee=<amount>: '%s'</source> + <translation type="unfinished"/> + </message> + <message> <location line="+8"/> <source>Maintain a full transaction index (default: 0)</source> <translation type="unfinished"/> @@ -2551,7 +2582,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+1"/> + <location line="+2"/> <source>Only accept block chain matching built-in checkpoints (default: 1)</source> <translation type="unfinished"/> </message> @@ -2611,6 +2642,11 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> + <location line="+1"/> + <source>Signing transaction failed</source> + <translation type="unfinished"/> + </message> + <message> <location line="+2"/> <source>Specify connection timeout in milliseconds (default: 5000)</source> <translation type="unfinished"/> @@ -2621,7 +2657,22 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+10"/> + <location line="+4"/> + <source>Transaction amount too small</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Transaction amounts must be positive</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Transaction too large</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+7"/> <source>Use UPnP to map the listening port (default: 0)</source> <translation type="unfinished"/> </message> @@ -2661,7 +2712,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="-46"/> + <location line="-50"/> <source>Password for JSON-RPC connections</source> <translation type="unfinished"/> </message> @@ -2676,17 +2727,17 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="-119"/> + <location line="-120"/> <source>Execute command when the best block changes (%s in cmd is replaced by block hash)</source> <translation type="unfinished"/> </message> <message> - <location line="+142"/> + <location line="+147"/> <source>Upgrade wallet to latest format</source> <translation type="unfinished"/> </message> <message> - <location line="-17"/> + <location line="-21"/> <source>Set key pool size to <n> (default: 100)</source> <translation type="unfinished"/> </message> @@ -2696,12 +2747,12 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+31"/> + <location line="+35"/> <source>Use OpenSSL (https) for JSON-RPC connections</source> <translation type="unfinished"/> </message> <message> - <location line="-22"/> + <location line="-26"/> <source>Server certificate file (default: server.cert)</source> <translation type="unfinished"/> </message> @@ -2711,37 +2762,37 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="-153"/> + <location line="-151"/> <source>Acceptable ciphers (default: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH)</source> <translation type="unfinished"/> </message> <message> - <location line="+166"/> + <location line="+165"/> <source>This help message</source> <translation type="unfinished"/> </message> <message> - <location line="+3"/> + <location line="+6"/> <source>Unable to bind to %s on this computer (bind returned error %d, %s)</source> <translation type="unfinished"/> </message> <message> - <location line="-86"/> + <location line="-91"/> <source>Connect through socks proxy</source> <translation type="unfinished"/> </message> <message> - <location line="-11"/> + <location line="-10"/> <source>Allow DNS lookups for -addnode, -seednode and -connect</source> <translation type="unfinished"/> </message> <message> - <location line="+56"/> + <location line="+55"/> <source>Loading addresses...</source> <translation>Ŝarĝante adresojn...</translation> </message> <message> - <location line="-34"/> + <location line="-35"/> <source>Error loading wallet.dat: Wallet corrupted</source> <translation type="unfinished"/> </message> @@ -2751,22 +2802,22 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+87"/> + <location line="+93"/> <source>Wallet needed to be rewritten: restart Bitcoin to complete</source> <translation type="unfinished"/> </message> <message> - <location line="-89"/> + <location line="-95"/> <source>Error loading wallet.dat</source> <translation type="unfinished"/> </message> <message> - <location line="+29"/> + <location line="+28"/> <source>Invalid -proxy address: '%s'</source> <translation type="unfinished"/> </message> <message> - <location line="+49"/> + <location line="+56"/> <source>Unknown network specified in -onlynet: '%s'</source> <translation type="unfinished"/> </message> @@ -2776,7 +2827,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="-91"/> + <location line="-96"/> <source>Cannot resolve -bind address: '%s'</source> <translation type="unfinished"/> </message> @@ -2796,17 +2847,17 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="-4"/> + <location line="-6"/> <source>Insufficient funds</source> <translation type="unfinished"/> </message> <message> - <location line="+8"/> + <location line="+10"/> <source>Loading block index...</source> <translation>Ŝarĝante blok-indekson...</translation> </message> <message> - <location line="-58"/> + <location line="-57"/> <source>Add a node to connect to and attempt to keep the connection open</source> <translation type="unfinished"/> </message> @@ -2816,52 +2867,47 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+67"/> + <location line="+64"/> <source>Fee per KB to add to transactions you send</source> <translation type="unfinished"/> </message> <message> - <location line="+17"/> + <location line="+19"/> <source>Loading wallet...</source> <translation>Ŝarĝante monujon...</translation> </message> <message> - <location line="-53"/> + <location line="-52"/> <source>Cannot downgrade wallet</source> <translation type="unfinished"/> </message> <message> - <location line="+1"/> - <source>Cannot initialize keypool</source> - <translation type="unfinished"/> - </message> - <message> <location line="+3"/> <source>Cannot write default address</source> <translation type="unfinished"/> </message> <message> - <location line="+63"/> + <location line="+64"/> <source>Rescanning...</source> <translation type="unfinished"/> </message> <message> - <location line="-55"/> + <location line="-57"/> <source>Done loading</source> <translation>Ŝarĝado finitas</translation> </message> <message> - <location line="+79"/> + <location line="+82"/> <source>To use the %s option</source> <translation>Por uzi la opcion %s</translation> </message> <message> - <location line="-71"/> + <location line="-74"/> <source>Error</source> <translation>Eraro</translation> </message> <message> - <location line="-33"/> + <location line="-31"/> <source>You must set rpcpassword=<password> in the configuration file: %s If the file does not exist, create it with owner-readable-only file permissions.</source> diff --git a/src/qt/locale/bitcoin_es.ts b/src/qt/locale/bitcoin_es.ts index 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.</translation> </message> <message> - <location filename="../aboutdialog.cpp" line="+17"/> + <location filename="../aboutdialog.cpp" line="+14"/> <source>Copyright</source> <translation>Copyright</translation> </message> <message> <location line="+0"/> - <source>2009-%1 The Bitcoin developers</source> - <translation>2009-%1 Los desarrolladores de Bitcoin</translation> + <source>The Bitcoin developers</source> + <translation>Los programadores Bitcoin</translation> </message> </context> <context> @@ -69,9 +69,9 @@ Eric Young (eay@cryptsoft.com) y el software UPnP escrito por Thomas Bernard.</t <translation>&Añadir dirección</translation> </message> <message> - <location filename="../addressbookpage.cpp" line="+59"/> + <location filename="../addressbookpage.cpp" line="+63"/> <source>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.</source> - <translation>Estas son tus direcciones Bitcoin para recibir pagos. Puedes utilizar una diferente por cada persona emisora para saber quién te está pagando.</translation> + <translation>Estas son sus direcciones Bitcoin para recibir pagos. Puede utilizar una diferente por cada persona emisora para saber quién le está pagando.</translation> </message> <message> <location filename="../forms/addressbookpage.ui" line="+14"/> @@ -99,7 +99,17 @@ Eric Young (eay@cryptsoft.com) y el software UPnP escrito por Thomas Bernard.</t <translation>Borrar de la lista la dirección seleccionada</translation> </message> <message> - <location line="-14"/> + <location line="+27"/> + <source>Export the data in the current tab to a file</source> + <translation>Exportar a un archivo los datos de esta pestaña</translation> + </message> + <message> + <location line="+3"/> + <source>&Export</source> + <translation>&Exportar</translation> + </message> + <message> + <location line="-44"/> <source>Verify a message to ensure it was signed with a specified Bitcoin address</source> <translation>Verificar un mensaje para comprobar que fue firmado con la dirección Bitcoin indicada</translation> </message> @@ -182,7 +192,7 @@ Eric Young (eay@cryptsoft.com) y el software UPnP escrito por Thomas Bernard.</t <message> <location line="+21"/> <source>Enter passphrase</source> - <translation>Introducir contraseña </translation> + <translation>Introducir contraseña</translation> </message> <message> <location line="+14"/> @@ -252,7 +262,7 @@ Eric Young (eay@cryptsoft.com) y el software UPnP escrito por Thomas Bernard.</t <message> <location line="+15"/> <source>IMPORTANT: Any previous backups you have made of your wallet file should be replaced with the newly generated, encrypted wallet file. For security reasons, previous backups of the unencrypted wallet file will become useless as soon as you start using the new, encrypted wallet.</source> - <translation>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.</translation> + <translation>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.</translation> </message> <message> <location line="+100"/> @@ -321,12 +331,12 @@ Eric Young (eay@cryptsoft.com) y el software UPnP escrito por Thomas Bernard.</t <translation>Firmar &mensaje...</translation> </message> <message> - <location line="+299"/> + <location line="+280"/> <source>Synchronizing with network...</source> <translation>Sincronizando con la red…</translation> </message> <message> - <location line="-368"/> + <location line="-349"/> <source>&Overview</source> <translation>&Vista general</translation> </message> @@ -401,7 +411,7 @@ Eric Young (eay@cryptsoft.com) y el software UPnP escrito por Thomas Bernard.</t <translation>&Cambiar la contraseña…</translation> </message> <message> - <location line="+304"/> + <location line="+285"/> <source>Importing blocks from disk...</source> <translation>Importando bloques de disco...</translation> </message> @@ -411,12 +421,7 @@ Eric Young (eay@cryptsoft.com) y el software UPnP escrito por Thomas Bernard.</t <translation>Reindexando bloques en disco...</translation> </message> <message> - <location line="-300"/> - <source>&Export...</source> - <translation>&Exportar…</translation> - </message> - <message> - <location line="-66"/> + <location line="-347"/> <source>Send coins to a Bitcoin address</source> <translation>Enviar monedas a una dirección Bitcoin</translation> </message> @@ -426,12 +431,7 @@ Eric Young (eay@cryptsoft.com) y el software UPnP escrito por Thomas Bernard.</t <translation>Modificar las opciones de configuración de Bitcoin</translation> </message> <message> - <location line="+18"/> - <source>Export the data in the current tab to a file</source> - <translation>Exportar a un archivo los datos de esta pestaña</translation> - </message> - <message> - <location line="-9"/> + <location line="+9"/> <source>Backup wallet to another location</source> <translation>Copia de seguridad del monedero en otra ubicación</translation> </message> @@ -441,7 +441,7 @@ Eric Young (eay@cryptsoft.com) y el software UPnP escrito por Thomas Bernard.</t <translation>Cambiar la contraseña utilizada para el cifrado del monedero</translation> </message> <message> - <location line="+9"/> + <location line="+6"/> <source>&Debug window</source> <translation>Ventana de &depuración</translation> </message> @@ -451,23 +451,23 @@ Eric Young (eay@cryptsoft.com) y el software UPnP escrito por Thomas Bernard.</t <translation>Abrir la consola de depuración y diagnóstico</translation> </message> <message> - <location line="-7"/> + <location line="-4"/> <source>&Verify message...</source> <translation>&Verificar mensaje...</translation> </message> <message> - <location line="-163"/> - <location line="+541"/> + <location line="-165"/> + <location line="+530"/> <source>Bitcoin</source> <translation>Bitcoin</translation> </message> <message> - <location line="-541"/> + <location line="-530"/> <source>Wallet</source> <translation>Monedero</translation> </message> <message> - <location line="+99"/> + <location line="+101"/> <source>&Send</source> <translation>&Enviar</translation> </message> @@ -504,7 +504,7 @@ Eric Young (eay@cryptsoft.com) y el software UPnP escrito por Thomas Bernard.</t <message> <location line="+7"/> <source>Sign messages with your Bitcoin addresses to prove you own them</source> - <translation>Firmar mensajes con sus direcciones Bitcoin para probar la propiedad</translation> + <translation>Firmar mensajes con sus direcciones Bitcoin para demostrar la propiedad</translation> </message> <message> <location line="+2"/> @@ -512,12 +512,12 @@ Eric Young (eay@cryptsoft.com) y el software UPnP escrito por Thomas Bernard.</t <translation>Verificar mensajes comprobando que están firmados con direcciones Bitcoin concretas</translation> </message> <message> - <location line="+31"/> + <location line="+28"/> <source>&File</source> <translation>&Archivo</translation> </message> <message> - <location line="+8"/> + <location line="+7"/> <source>&Settings</source> <translation>&Configuración</translation> </message> @@ -532,12 +532,7 @@ Eric Young (eay@cryptsoft.com) y el software UPnP escrito por Thomas Bernard.</t <translation>Barra de pestañas</translation> </message> <message> - <location line="+8"/> - <source>Actions toolbar</source> - <translation>Barra de acciones</translation> - </message> - <message> - <location line="+13"/> + <location line="+17"/> <location line="+10"/> <source>[testnet]</source> <translation>[testnet]</translation> @@ -548,14 +543,19 @@ Eric Young (eay@cryptsoft.com) y el software UPnP escrito por Thomas Bernard.</t <translation>Cliente Bitcoin</translation> </message> <message numerus="yes"> - <location line="+140"/> + <location line="+141"/> <source>%n active connection(s) to Bitcoin network</source> <translation><numerusform>%n conexión activa hacia la red Bitcoin</numerusform><numerusform>%n conexiones activas hacia la red Bitcoin</numerusform></translation> </message> <message> - <location line="+39"/> + <location line="+22"/> + <source>No block source available...</source> + <translation>Ninguna fuente de bloques disponible ...</translation> + </message> + <message> + <location line="+12"/> <source>Processed %1 of %2 (estimated) blocks of transaction history.</source> - <translation>Se han procesado %1 de %2 (estimación) bloques de historia de transacción.</translation> + <translation>Se han procesado %1 de %2 bloques (estimados) del historial de transacciones.</translation> </message> <message> <location line="+4"/> @@ -578,9 +578,9 @@ Eric Young (eay@cryptsoft.com) y el software UPnP escrito por Thomas Bernard.</t <translation><numerusform>%n semana</numerusform><numerusform>%n semanas</numerusform></translation> </message> <message> - <location line="+5"/> + <location line="+4"/> <source>%1 behind</source> - <translation>%1 detrás</translation> + <translation>%1 atrás</translation> </message> <message> <location line="+14"/> @@ -590,10 +590,10 @@ Eric Young (eay@cryptsoft.com) y el software UPnP escrito por Thomas Bernard.</t <message> <location line="+2"/> <source>Transactions after this will not yet be visible.</source> - <translation>Las transacciones que vengan después de esta todavía no serán visibles.</translation> + <translation>Las transacciones posteriores a esta aún no están visibles.</translation> </message> <message> - <location line="+21"/> + <location line="+22"/> <source>Error</source> <translation>Error</translation> </message> @@ -608,22 +608,22 @@ Eric Young (eay@cryptsoft.com) y el software UPnP escrito por Thomas Bernard.</t <translation>Información</translation> </message> <message> - <location line="+68"/> + <location line="+70"/> <source>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?</source> <translation>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?</translation> </message> <message> - <location line="-138"/> + <location line="-140"/> <source>Up to date</source> <translation>Actualizado</translation> </message> <message> - <location line="+32"/> + <location line="+31"/> <source>Catching up...</source> - <translation>Recuperando...</translation> + <translation>Actualizando...</translation> </message> <message> - <location line="+110"/> + <location line="+113"/> <source>Confirm transaction fee</source> <translation>Confirme la tarifa de la transacción</translation> </message> @@ -673,7 +673,7 @@ Dirección: %4 <translation>El monedero está <b>cifrado</b> y actualmente <b>bloqueado</b></translation> </message> <message> - <location filename="../bitcoin.cpp" line="+104"/> + <location filename="../bitcoin.cpp" line="+111"/> <source>A fatal error occurred. Bitcoin can no longer continue safely and will quit.</source> <translation>Ha ocurrido un error crítico. Bitcoin ya no puede continuar con seguridad y se cerrará.</translation> </message> @@ -681,7 +681,7 @@ Dirección: %4 <context> <name>ClientModel</name> <message> - <location filename="../clientmodel.cpp" line="+98"/> + <location filename="../clientmodel.cpp" line="+104"/> <source>Network Alert</source> <translation>Alerta de red</translation> </message> @@ -812,8 +812,8 @@ Dirección: %4 </message> <message> <location line="+6"/> - <source>Optional transaction fee per kB that helps make sure your transactions are processed quickly. Most transactions are 1 kB. Fee 0.01 recommended.</source> - <translation>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.</translation> + <source>Optional transaction fee per kB that helps make sure your transactions are processed quickly. Most transactions are 1 kB.</source> + <translation>Tarifa de transacción opcional por kB que ayuda a asegurar que sus transacciones sean procesadas rápidamente. La mayoría de transacciones son de 1kB.</translation> </message> <message> <location line="+15"/> @@ -1054,7 +1054,7 @@ Dirección: %4 <message> <location line="-101"/> <source>Your current balance</source> - <translation>Saldo actual</translation> + <translation>Su saldo actual</translation> </message> <message> <location line="+29"/> @@ -1062,7 +1062,7 @@ Dirección: %4 <translation>Total de las transacciones que faltan por confirmar y que no contribuyen al saldo actual</translation> </message> <message> - <location filename="../overviewpage.cpp" line="+115"/> + <location filename="../overviewpage.cpp" line="+116"/> <location line="+1"/> <source>out of sync</source> <translation>desincronizado</translation> @@ -1649,6 +1649,19 @@ Dirección: %4 </message> </context> <context> + <name>SplashScreen</name> + <message> + <location filename="../splashscreen.cpp" line="+22"/> + <source>The Bitcoin developers</source> + <translation>Los programadores Bitcoin</translation> + </message> + <message> + <location line="+1"/> + <source>[testnet]</source> + <translation>[testnet]</translation> + </message> +</context> +<context> <name>TransactionDesc</name> <message> <location filename="../transactiondesc.cpp" line="+20"/> @@ -2123,9 +2136,27 @@ Dirección: %4 </message> </context> <context> + <name>WalletModel</name> + <message> + <location filename="../walletmodel.cpp" line="+193"/> + <source>Send Coins</source> + <translation>Enviar monedas</translation> + </message> +</context> +<context> <name>WalletView</name> <message> - <location filename="../walletview.cpp" line="+247"/> + <location filename="../walletview.cpp" line="+42"/> + <source>&Export</source> + <translation>&Exportar</translation> + </message> + <message> + <location line="+1"/> + <source>Export the data in the current tab to a file</source> + <translation>Exportar a un archivo los datos de esta pestaña</translation> + </message> + <message> + <location line="+193"/> <source>Backup Wallet</source> <translation>Respaldo de monedero</translation> </message> @@ -2158,40 +2189,40 @@ Dirección: %4 <context> <name>bitcoin-core</name> <message> - <location filename="../bitcoinstrings.cpp" line="+96"/> + <location filename="../bitcoinstrings.cpp" line="+94"/> <source>Bitcoin version</source> <translation>Versión de Bitcoin</translation> </message> <message> - <location line="+98"/> + <location line="+102"/> <source>Usage:</source> <translation>Uso:</translation> </message> <message> - <location line="-25"/> + <location line="-29"/> <source>Send command to -server or bitcoind</source> <translation>Envíar comando a -server o bitcoind</translation> </message> <message> - <location line="-22"/> + <location line="-23"/> <source>List commands</source> <translation>Muestra comandos </translation> </message> <message> - <location line="-10"/> + <location line="-12"/> <source>Get help for a command</source> <translation>Recibir ayuda para un comando </translation> </message> <message> - <location line="+21"/> + <location line="+24"/> <source>Options:</source> <translation>Opciones: </translation> </message> <message> - <location line="+23"/> + <location line="+24"/> <source>Specify configuration file (default: bitcoin.conf)</source> <translation>Especificar archivo de configuración (predeterminado: bitcoin.conf) </translation> @@ -2203,27 +2234,17 @@ Dirección: %4 </translation> </message> <message> - <location line="-48"/> - <source>Generate coins</source> - <translation>Generar monedas</translation> - </message> - <message> - <location line="-27"/> - <source>Don't generate coins</source> - <translation>No generar monedas</translation> - </message> - <message> - <location line="+74"/> + <location line="-1"/> <source>Specify data directory</source> <translation>Especificar directorio para los datos</translation> </message> <message> - <location line="-8"/> + <location line="-9"/> <source>Set database cache size in megabytes (default: 25)</source> <translation>Establecer el tamaño de caché de la base de datos en megabytes (predeterminado: 25)</translation> </message> <message> - <location line="-27"/> + <location line="-28"/> <source>Listen for connections on <port> (default: 8333 or testnet: 18333)</source> <translation>Escuchar conexiones en <puerto> (predeterminado: 8333 o testnet: 18333)</translation> </message> @@ -2238,7 +2259,7 @@ Dirección: %4 <translation>Conectar a un nodo para obtener direcciones de pares y desconectar</translation> </message> <message> - <location line="+80"/> + <location line="+82"/> <source>Specify your own public address</source> <translation>Especifique su propia dirección pública</translation> </message> @@ -2248,22 +2269,22 @@ Dirección: %4 <translation>Umbral para la desconexión de pares con mal comportamiento (predeterminado: 100)</translation> </message> <message> - <location line="-132"/> + <location line="-134"/> <source>Number of seconds to keep misbehaving peers from reconnecting (default: 86400)</source> <translation>Número de segundos en que se evita la reconexión de pares con mal comportamiento (predeterminado: 86400)</translation> </message> <message> - <location line="-32"/> + <location line="-29"/> <source>An error occurred while setting up the RPC port %u for listening on IPv4: %s</source> <translation>Ha ocurrido un error al configurar el puerto RPC %u para escucha en IPv4: %s</translation> </message> <message> - <location line="+30"/> + <location line="+27"/> <source>Listen for JSON-RPC connections on <port> (default: 8332 or testnet: 18332)</source> <translation>Escuchar conexiones JSON-RPC en <puerto> (predeterminado: 8332 o testnet:18332)</translation> </message> <message> - <location line="+36"/> + <location line="+37"/> <source>Accept command line and JSON-RPC commands</source> <translation>Aceptar comandos consola y JSON-RPC </translation> @@ -2275,18 +2296,18 @@ Dirección: %4 </translation> </message> <message> - <location line="+33"/> + <location line="+37"/> <source>Use the test network</source> <translation>Usar la red de pruebas </translation> </message> <message> - <location line="-108"/> + <location line="-112"/> <source>Accept connections from outside (default: 1 if no -proxy or -connect)</source> <translation>Aceptar conexiones desde el exterior (predeterminado: 1 si no -proxy o -connect)</translation> </message> <message> - <location line="-82"/> + <location line="-80"/> <source>%s, you must set a rpcpassword in the configuration file: %s It is recommended you use the following random password: @@ -2327,11 +2348,6 @@ Por ejemplo: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. </message> <message> <location line="+3"/> - <source>Error initializing database environment %s! To recover, BACKUP THAT DIRECTORY, then remove everything from it except for wallet.dat.</source> - <translation>¡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.</translation> - </message> - <message> - <location line="+3"/> <source>Error: The transaction was rejected! This might happen if some of the coins in your wallet were already spent, such as if you used a copy of wallet.dat and coins were spent in the copy but not marked as spent here.</source> <translation>¡Error: se ha rechazado la transacción! Esto puede ocurrir si ya se han gastado algunas de las monedas del monedero, como ocurriría si hubiera hecho una copia de wallet.dat y se hubieran gastado monedas a partir de la copia, con lo que no se habrían marcado aquí como gastadas.</translation> </message> @@ -2356,12 +2372,7 @@ Por ejemplo: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Establecer el tamaño máximo de las transacciones de alta prioridad/comisión baja en bytes (predeterminado:27000)</translation> </message> <message> - <location line="+3"/> - <source>Set the number of script verification threads (1-16, 0=auto, default: 0)</source> - <translation>Establecer el número de hilos para la verificación de scripts (1-16, 0=automático, predeterminado: 0)</translation> - </message> - <message> - <location line="+2"/> + <location line="+6"/> <source>This is a pre-release test build - use at your own risk - do not use for mining or merchant applications</source> <translation>Esta es una versión de pre-prueba - utilícela bajo su propio riesgo. No la utilice para usos comerciales o de minería.</translation> </message> @@ -2388,7 +2399,7 @@ Por ejemplo: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <message> <location line="+3"/> <source>Warning: wallet.dat corrupt, data salvaged! Original wallet.dat saved as wallet.{timestamp}.bak in %s; if your balance or transactions are incorrect you should restore from a backup.</source> - <translation>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.</translation> + <translation>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.</translation> </message> <message> <location line="+14"/> @@ -2401,7 +2412,7 @@ Por ejemplo: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Opciones de creación de bloques:</translation> </message> <message> - <location line="+6"/> + <location line="+5"/> <source>Connect only to the specified node(s)</source> <translation>Conectar sólo a los nodos (o nodo) especificados</translation> </message> @@ -2421,7 +2432,7 @@ Por ejemplo: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>¿Quieres reconstruir la base de datos de bloques ahora?</translation> </message> <message> - <location line="+3"/> + <location line="+2"/> <source>Error initializing block database</source> <translation>Error al inicializar la base de datos de bloques</translation> </message> @@ -2447,11 +2458,6 @@ Por ejemplo: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. </message> <message> <location line="+1"/> - <source>Error: Transaction creation failed!</source> - <translation>Error: ¡Ha fallado la creación de la transacción!</translation> - </message> - <message> - <location line="+1"/> <source>Error: Wallet locked, unable to create transaction!</source> <translation>Error: ¡El monedero está bloqueado; no se puede crear la transacción!</translation> </message> @@ -2521,7 +2527,12 @@ Por ejemplo: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Encontrar pares mediante búsqueda de DNS (predeterminado: 1 salvo con -connect)</translation> </message> <message> - <location line="+3"/> + <location line="+1"/> + <source>Generate coins (default: 0)</source> + <translation>Generar monedas (por defecto: 0)</translation> + </message> + <message> + <location line="+2"/> <source>How many blocks to check at startup (default: 288, 0 = all)</source> <translation>Cuántos bloques comprobar al iniciar (predeterminado: 288, 0 = todos)</translation> </message> @@ -2531,7 +2542,12 @@ Por ejemplo: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Como es de exhaustiva la verificación de bloques (0-4, por defecto 3)</translation> </message> <message> - <location line="+24"/> + <location line="+19"/> + <source>Not enough file descriptors available.</source> + <translation>No hay suficientes descriptores de archivo disponibles. </translation> + </message> + <message> + <location line="+8"/> <source>Rebuild block chain index from current blk000??.dat files</source> <translation>Reconstruir el índice de la cadena de bloques a partir de los archivos blk000??.dat actuales</translation> </message> @@ -2541,7 +2557,7 @@ Por ejemplo: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Establecer el número de hilos para atender las llamadas RPC (predeterminado: 4)</translation> </message> <message> - <location line="+22"/> + <location line="+26"/> <source>Verifying blocks...</source> <translation>Verificando bloques...</translation> </message> @@ -2551,12 +2567,17 @@ Por ejemplo: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Verificando monedero...</translation> </message> <message> - <location line="-62"/> + <location line="-69"/> <source>Imports blocks from external blk000??.dat file</source> <translation>Importa los bloques desde un archivo blk000??.dat externo</translation> </message> <message> - <location line="+1"/> + <location line="-76"/> + <source>Set the number of script verification threads (up to 16, 0 = auto, <0 = leave that many cores free, default: 0)</source> + <translation>Configura el número de hilos para el script de verificación (hasta 16, 0 = auto, <0 = leave that many cores free, por fecto: 0)</translation> + </message> + <message> + <location line="+77"/> <source>Information</source> <translation>Información</translation> </message> @@ -2566,6 +2587,16 @@ Por ejemplo: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Dirección -tor inválida: '%s'</translation> </message> <message> + <location line="+1"/> + <source>Invalid amount for -minrelaytxfee=<amount>: '%s'</source> + <translation>Inválido por el monto -minrelaytxfee=<amount>: '%s'</translation> + </message> + <message> + <location line="+1"/> + <source>Invalid amount for -mintxfee=<amount>: '%s'</source> + <translation>Inválido por el monto -mintxfee=<amount>: '%s'</translation> + </message> + <message> <location line="+8"/> <source>Maintain a full transaction index (default: 0)</source> <translation>Mantener índice de transacciones completo (predeterminado: 0)</translation> @@ -2581,7 +2612,7 @@ Por ejemplo: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Búfer de recepción máximo por conexión, , <n>*1000 bytes (predeterminado: 1000)</translation> </message> <message> - <location line="+1"/> + <location line="+2"/> <source>Only accept block chain matching built-in checkpoints (default: 1)</source> <translation>Aceptar solamente cadena de bloques que concuerde con los puntos de control internos (predeterminado: 1)</translation> </message> @@ -2641,6 +2672,11 @@ Por ejemplo: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Reducir el archivo debug.log al iniciar el cliente (predeterminado: 1 sin -debug)</translation> </message> <message> + <location line="+1"/> + <source>Signing transaction failed</source> + <translation>Transacción falló</translation> + </message> + <message> <location line="+2"/> <source>Specify connection timeout in milliseconds (default: 5000)</source> <translation>Especificar el tiempo máximo de conexión en milisegundos (predeterminado: 5000)</translation> @@ -2651,7 +2687,22 @@ Por ejemplo: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Error de sistema: </translation> </message> <message> - <location line="+10"/> + <location line="+4"/> + <source>Transaction amount too small</source> + <translation>Monto de la transacción muy pequeño</translation> + </message> + <message> + <location line="+1"/> + <source>Transaction amounts must be positive</source> + <translation>Montos de transacciones deben ser positivos</translation> + </message> + <message> + <location line="+1"/> + <source>Transaction too large</source> + <translation>Transacción demasiado grande</translation> + </message> + <message> + <location line="+7"/> <source>Use UPnP to map the listening port (default: 0)</source> <translation>Usar UPnP para asignar el puerto de escucha (predeterminado: 0)</translation> </message> @@ -2692,7 +2743,7 @@ Por ejemplo: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>wallet.dat corrupto. Ha fallado la recuperación.</translation> </message> <message> - <location line="-46"/> + <location line="-50"/> <source>Password for JSON-RPC connections</source> <translation>Contraseña para las conexiones JSON-RPC </translation> @@ -2710,17 +2761,17 @@ Por ejemplo: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. </translation> </message> <message> - <location line="-119"/> + <location line="-120"/> <source>Execute command when the best block changes (%s in cmd is replaced by block hash)</source> <translation>Ejecutar un comando cuando cambia el mejor bloque (%s en cmd se sustituye por el hash de bloque)</translation> </message> <message> - <location line="+142"/> + <location line="+147"/> <source>Upgrade wallet to latest format</source> <translation>Actualizar el monedero al último formato</translation> </message> <message> - <location line="-17"/> + <location line="-21"/> <source>Set key pool size to <n> (default: 100)</source> <translation>Ajustar el número de claves en reserva <n> (predeterminado: 100) </translation> @@ -2731,13 +2782,13 @@ Por ejemplo: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Volver a examinar la cadena de bloques en busca de transacciones del monedero perdidas</translation> </message> <message> - <location line="+31"/> + <location line="+35"/> <source>Use OpenSSL (https) for JSON-RPC connections</source> <translation>Usar OpenSSL (https) para las conexiones JSON-RPC </translation> </message> <message> - <location line="-22"/> + <location line="-26"/> <source>Server certificate file (default: server.cert)</source> <translation>Certificado del servidor (predeterminado: server.cert) </translation> @@ -2749,39 +2800,39 @@ Por ejemplo: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. </translation> </message> <message> - <location line="-153"/> + <location line="-151"/> <source>Acceptable ciphers (default: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH)</source> <translation>Cifrados aceptados (predeterminado: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH) </translation> </message> <message> - <location line="+166"/> + <location line="+165"/> <source>This help message</source> <translation>Este mensaje de ayuda </translation> </message> <message> - <location line="+3"/> + <location line="+6"/> <source>Unable to bind to %s on this computer (bind returned error %d, %s)</source> <translation>No es posible conectar con %s en este sistema (bind ha dado el error %d, %s)</translation> </message> <message> - <location line="-86"/> + <location line="-91"/> <source>Connect through socks proxy</source> <translation>Conectar mediante proxy socks</translation> </message> <message> - <location line="-11"/> + <location line="-10"/> <source>Allow DNS lookups for -addnode, -seednode and -connect</source> <translation>Permitir búsquedas DNS para -addnode, -seednode y -connect</translation> </message> <message> - <location line="+56"/> + <location line="+55"/> <source>Loading addresses...</source> <translation>Cargando direcciones...</translation> </message> <message> - <location line="-34"/> + <location line="-35"/> <source>Error loading wallet.dat: Wallet corrupted</source> <translation>Error al cargar wallet.dat: el monedero está dañado</translation> </message> @@ -2791,22 +2842,22 @@ Por ejemplo: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Error al cargar wallet.dat: El monedero requiere una versión más reciente de Bitcoin</translation> </message> <message> - <location line="+87"/> + <location line="+93"/> <source>Wallet needed to be rewritten: restart Bitcoin to complete</source> <translation>El monedero ha necesitado ser reescrito. Reinicie Bitcoin para completar el proceso</translation> </message> <message> - <location line="-89"/> + <location line="-95"/> <source>Error loading wallet.dat</source> <translation>Error al cargar wallet.dat</translation> </message> <message> - <location line="+29"/> + <location line="+28"/> <source>Invalid -proxy address: '%s'</source> <translation>Dirección -proxy inválida: '%s'</translation> </message> <message> - <location line="+49"/> + <location line="+56"/> <source>Unknown network specified in -onlynet: '%s'</source> <translation>La red especificada en -onlynet '%s' es desconocida</translation> </message> @@ -2816,7 +2867,7 @@ Por ejemplo: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Solicitada versión de proxy -socks desconocida: %i</translation> </message> <message> - <location line="-91"/> + <location line="-96"/> <source>Cannot resolve -bind address: '%s'</source> <translation>No se puede resolver la dirección de -bind: '%s'</translation> </message> @@ -2836,17 +2887,17 @@ Por ejemplo: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Cuantía no válida</translation> </message> <message> - <location line="-4"/> + <location line="-6"/> <source>Insufficient funds</source> <translation>Fondos insuficientes</translation> </message> <message> - <location line="+8"/> + <location line="+10"/> <source>Loading block index...</source> <translation>Cargando el índice de bloques...</translation> </message> <message> - <location line="-58"/> + <location line="-57"/> <source>Add a node to connect to and attempt to keep the connection open</source> <translation>Añadir un nodo al que conectarse y tratar de mantener la conexión abierta</translation> </message> @@ -2856,52 +2907,47 @@ Por ejemplo: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>No es posible conectar con %s en este sistema. Probablemente Bitcoin ya está ejecutándose.</translation> </message> <message> - <location line="+67"/> + <location line="+64"/> <source>Fee per KB to add to transactions you send</source> <translation>Tarifa por KB que añadir a las transacciones que envíe</translation> </message> <message> - <location line="+17"/> + <location line="+19"/> <source>Loading wallet...</source> <translation>Cargando monedero...</translation> </message> <message> - <location line="-53"/> + <location line="-52"/> <source>Cannot downgrade wallet</source> <translation>No se puede rebajar el monedero</translation> </message> <message> - <location line="+1"/> - <source>Cannot initialize keypool</source> - <translation>No se puede inicializar la reserva de claves</translation> - </message> - <message> <location line="+3"/> <source>Cannot write default address</source> <translation>No se puede escribir la dirección predeterminada</translation> </message> <message> - <location line="+63"/> + <location line="+64"/> <source>Rescanning...</source> - <translation>Rescaneando...</translation> + <translation>Reexplorando...</translation> </message> <message> - <location line="-55"/> + <location line="-57"/> <source>Done loading</source> <translation>Generado pero no aceptado</translation> </message> <message> - <location line="+79"/> + <location line="+82"/> <source>To use the %s option</source> <translation>Para utilizar la opción %s</translation> </message> <message> - <location line="-71"/> + <location line="-74"/> <source>Error</source> <translation>Error</translation> </message> <message> - <location line="-33"/> + <location line="-31"/> <source>You must set rpcpassword=<password> in the configuration file: %s If the file does not exist, create it with owner-readable-only file permissions.</source> diff --git a/src/qt/locale/bitcoin_es_CL.ts b/src/qt/locale/bitcoin_es_CL.ts index 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.</translation> </message> <message> - <location filename="../aboutdialog.cpp" line="+17"/> + <location filename="../aboutdialog.cpp" line="+14"/> <source>Copyright</source> <translation type="unfinished"/> </message> <message> <location line="+0"/> - <source>2009-%1 The Bitcoin developers</source> + <source>The Bitcoin developers</source> <translation type="unfinished"/> </message> </context> @@ -69,7 +69,7 @@ Eric Young (eay@cryptsoft.com) y UPnP software escrito por Thomas Bernard.</tran <translation>&Nueva dirección</translation> </message> <message> - <location filename="../addressbookpage.cpp" line="+59"/> + <location filename="../addressbookpage.cpp" line="+63"/> <source>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.</source> <translation>Estas son tus direcciones Bitcoin para recibir pagos. Puedes utilizar una diferente por cada persona emisora para saber quien te está pagando.</translation> </message> @@ -99,7 +99,17 @@ Eric Young (eay@cryptsoft.com) y UPnP software escrito por Thomas Bernard.</tran <translation type="unfinished"/> </message> <message> - <location line="-14"/> + <location line="+27"/> + <source>Export the data in the current tab to a file</source> + <translation>Exportar los datos de la pestaña actual a un archivo</translation> + </message> + <message> + <location line="+3"/> + <source>&Export</source> + <translation type="unfinished"/> + </message> + <message> + <location line="-44"/> <source>Verify a message to ensure it was signed with a specified Bitcoin address</source> <translation type="unfinished"/> </message> @@ -321,12 +331,12 @@ Eric Young (eay@cryptsoft.com) y UPnP software escrito por Thomas Bernard.</tran <translation>Firmar &Mensaje...</translation> </message> <message> - <location line="+299"/> + <location line="+280"/> <source>Synchronizing with network...</source> <translation>Sincronizando con la red...</translation> </message> <message> - <location line="-368"/> + <location line="-349"/> <source>&Overview</source> <translation>&Vista general</translation> </message> @@ -401,7 +411,7 @@ Eric Young (eay@cryptsoft.com) y UPnP software escrito por Thomas Bernard.</tran <translation>&Cambiar la contraseña...</translation> </message> <message> - <location line="+304"/> + <location line="+285"/> <source>Importing blocks from disk...</source> <translation type="unfinished"/> </message> @@ -411,12 +421,7 @@ Eric Young (eay@cryptsoft.com) y UPnP software escrito por Thomas Bernard.</tran <translation type="unfinished"/> </message> <message> - <location line="-300"/> - <source>&Export...</source> - <translation>&Exportar...</translation> - </message> - <message> - <location line="-66"/> + <location line="-347"/> <source>Send coins to a Bitcoin address</source> <translation>Enviar monedas a una dirección bitcoin</translation> </message> @@ -426,12 +431,7 @@ Eric Young (eay@cryptsoft.com) y UPnP software escrito por Thomas Bernard.</tran <translation>Modifica las opciones de configuración de bitcoin</translation> </message> <message> - <location line="+18"/> - <source>Export the data in the current tab to a file</source> - <translation>Exportar los datos de la pestaña actual a un archivo</translation> - </message> - <message> - <location line="-9"/> + <location line="+9"/> <source>Backup wallet to another location</source> <translation>Respaldar billetera en otra ubicación</translation> </message> @@ -441,7 +441,7 @@ Eric Young (eay@cryptsoft.com) y UPnP software escrito por Thomas Bernard.</tran <translation>Cambiar la contraseña utilizada para la codificación de la billetera</translation> </message> <message> - <location line="+9"/> + <location line="+6"/> <source>&Debug window</source> <translation type="unfinished"/> </message> @@ -451,23 +451,23 @@ Eric Young (eay@cryptsoft.com) y UPnP software escrito por Thomas Bernard.</tran <translation type="unfinished"/> </message> <message> - <location line="-7"/> + <location line="-4"/> <source>&Verify message...</source> <translation type="unfinished"/> </message> <message> - <location line="-163"/> - <location line="+541"/> + <location line="-165"/> + <location line="+530"/> <source>Bitcoin</source> <translation>Bitcoin</translation> </message> <message> - <location line="-541"/> + <location line="-530"/> <source>Wallet</source> <translation>Cartera</translation> </message> <message> - <location line="+99"/> + <location line="+101"/> <source>&Send</source> <translation type="unfinished"/> </message> @@ -512,12 +512,12 @@ Eric Young (eay@cryptsoft.com) y UPnP software escrito por Thomas Bernard.</tran <translation type="unfinished"/> </message> <message> - <location line="+31"/> + <location line="+28"/> <source>&File</source> <translation>&Archivo</translation> </message> <message> - <location line="+8"/> + <location line="+7"/> <source>&Settings</source> <translation>&Configuración</translation> </message> @@ -532,12 +532,7 @@ Eric Young (eay@cryptsoft.com) y UPnP software escrito por Thomas Bernard.</tran <translation>Barra de pestañas</translation> </message> <message> - <location line="+8"/> - <source>Actions toolbar</source> - <translation>Barra de acciónes</translation> - </message> - <message> - <location line="+13"/> + <location line="+17"/> <location line="+10"/> <source>[testnet]</source> <translation>[red-de-pruebas]</translation> @@ -548,12 +543,17 @@ Eric Young (eay@cryptsoft.com) y UPnP software escrito por Thomas Bernard.</tran <translation>Cliente Bitcoin</translation> </message> <message numerus="yes"> - <location line="+140"/> + <location line="+141"/> <source>%n active connection(s) to Bitcoin network</source> <translation><numerusform>%n conexión activa hacia la red Bitcoin</numerusform><numerusform>%n conexiones activas hacia la red Bitcoin</numerusform></translation> </message> <message> - <location line="+39"/> + <location line="+22"/> + <source>No block source available...</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+12"/> <source>Processed %1 of %2 (estimated) blocks of transaction history.</source> <translation type="unfinished"/> </message> @@ -578,7 +578,7 @@ Eric Young (eay@cryptsoft.com) y UPnP software escrito por Thomas Bernard.</tran <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation> </message> <message> - <location line="+5"/> + <location line="+4"/> <source>%1 behind</source> <translation type="unfinished"/> </message> @@ -593,7 +593,7 @@ Eric Young (eay@cryptsoft.com) y UPnP software escrito por Thomas Bernard.</tran <translation type="unfinished"/> </message> <message> - <location line="+21"/> + <location line="+22"/> <source>Error</source> <translation type="unfinished"/> </message> @@ -608,22 +608,22 @@ Eric Young (eay@cryptsoft.com) y UPnP software escrito por Thomas Bernard.</tran <translation type="unfinished"/> </message> <message> - <location line="+68"/> + <location line="+70"/> <source>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?</source> <translation type="unfinished"/> </message> <message> - <location line="-138"/> + <location line="-140"/> <source>Up to date</source> <translation>Actualizado</translation> </message> <message> - <location line="+32"/> + <location line="+31"/> <source>Catching up...</source> <translation>Recuperando...</translation> </message> <message> - <location line="+110"/> + <location line="+113"/> <source>Confirm transaction fee</source> <translation type="unfinished"/> </message> @@ -672,7 +672,7 @@ Dirección: %4</translation> <translation>La billetera esta <b>codificada</b> y actualmente <b>bloqueda</b></translation> </message> <message> - <location filename="../bitcoin.cpp" line="+104"/> + <location filename="../bitcoin.cpp" line="+111"/> <source>A fatal error occurred. Bitcoin can no longer continue safely and will quit.</source> <translation type="unfinished"/> </message> @@ -680,7 +680,7 @@ Dirección: %4</translation> <context> <name>ClientModel</name> <message> - <location filename="../clientmodel.cpp" line="+98"/> + <location filename="../clientmodel.cpp" line="+104"/> <source>Network Alert</source> <translation type="unfinished"/> </message> @@ -812,8 +812,8 @@ Dirección: %4</translation> </message> <message> <location line="+6"/> - <source>Optional transaction fee per kB that helps make sure your transactions are processed quickly. Most transactions are 1 kB. Fee 0.01 recommended.</source> - <translation>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 </translation> + <source>Optional transaction fee per kB that helps make sure your transactions are processed quickly. Most transactions are 1 kB.</source> + <translation type="unfinished"/> </message> <message> <location line="+15"/> @@ -1062,7 +1062,7 @@ Dirección: %4</translation> <translation>Total de transacciones que no han sido confirmadas aun, y que no cuentan para el saldo actual.</translation> </message> <message> - <location filename="../overviewpage.cpp" line="+115"/> + <location filename="../overviewpage.cpp" line="+116"/> <location line="+1"/> <source>out of sync</source> <translation type="unfinished"/> @@ -1649,6 +1649,19 @@ Dirección: %4</translation> </message> </context> <context> + <name>SplashScreen</name> + <message> + <location filename="../splashscreen.cpp" line="+22"/> + <source>The Bitcoin developers</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>[testnet]</source> + <translation>[red-de-pruebas]</translation> + </message> +</context> +<context> <name>TransactionDesc</name> <message> <location filename="../transactiondesc.cpp" line="+20"/> @@ -2123,9 +2136,27 @@ Dirección: %4</translation> </message> </context> <context> + <name>WalletModel</name> + <message> + <location filename="../walletmodel.cpp" line="+193"/> + <source>Send Coins</source> + <translation>Enviar monedas</translation> + </message> +</context> +<context> <name>WalletView</name> <message> - <location filename="../walletview.cpp" line="+247"/> + <location filename="../walletview.cpp" line="+42"/> + <source>&Export</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Export the data in the current tab to a file</source> + <translation>Exportar los datos de la pestaña actual a un archivo</translation> + </message> + <message> + <location line="+193"/> <source>Backup Wallet</source> <translation type="unfinished"/> </message> @@ -2158,41 +2189,41 @@ Dirección: %4</translation> <context> <name>bitcoin-core</name> <message> - <location filename="../bitcoinstrings.cpp" line="+96"/> + <location filename="../bitcoinstrings.cpp" line="+94"/> <source>Bitcoin version</source> <translation>Versión Bitcoin</translation> </message> <message> - <location line="+98"/> + <location line="+102"/> <source>Usage:</source> <translation>Uso:</translation> </message> <message> - <location line="-25"/> + <location line="-29"/> <source>Send command to -server or bitcoind</source> <translation>Envia comando a bitcoin lanzado con -server u bitcoind </translation> </message> <message> - <location line="-22"/> + <location line="-23"/> <source>List commands</source> <translation>Muestra comandos </translation> </message> <message> - <location line="-10"/> + <location line="-12"/> <source>Get help for a command</source> <translation>Recibir ayuda para un comando </translation> </message> <message> - <location line="+21"/> + <location line="+24"/> <source>Options:</source> <translation>Opciones: </translation> </message> <message> - <location line="+23"/> + <location line="+24"/> <source>Specify configuration file (default: bitcoin.conf)</source> <translation>Especifica archivo de configuración (predeterminado: bitcoin.conf) </translation> @@ -2204,30 +2235,18 @@ Dirección: %4</translation> </translation> </message> <message> - <location line="-48"/> - <source>Generate coins</source> - <translation>Genera monedas -</translation> - </message> - <message> - <location line="-27"/> - <source>Don't generate coins</source> - <translation>No generar monedas -</translation> - </message> - <message> - <location line="+74"/> + <location line="-1"/> <source>Specify data directory</source> <translation>Especifica directorio para los datos </translation> </message> <message> - <location line="-8"/> + <location line="-9"/> <source>Set database cache size in megabytes (default: 25)</source> <translation type="unfinished"/> </message> <message> - <location line="-27"/> + <location line="-28"/> <source>Listen for connections on <port> (default: 8333 or testnet: 18333)</source> <translation>Escuchar por conecciones en <puerto> (Por defecto: 8333 o red de prueba: 18333)</translation> </message> @@ -2242,7 +2261,7 @@ Dirección: %4</translation> <translation type="unfinished"/> </message> <message> - <location line="+80"/> + <location line="+82"/> <source>Specify your own public address</source> <translation type="unfinished"/> </message> @@ -2252,22 +2271,22 @@ Dirección: %4</translation> <translation>Umbral de desconección de clientes con mal comportamiento (por defecto: 100)</translation> </message> <message> - <location line="-132"/> + <location line="-134"/> <source>Number of seconds to keep misbehaving peers from reconnecting (default: 86400)</source> <translation type="unfinished"/> </message> <message> - <location line="-32"/> + <location line="-29"/> <source>An error occurred while setting up the RPC port %u for listening on IPv4: %s</source> <translation type="unfinished"/> </message> <message> - <location line="+30"/> + <location line="+27"/> <source>Listen for JSON-RPC connections on <port> (default: 8332 or testnet: 18332)</source> <translation>Escucha conexiones JSON-RPC en el puerto <port> (predeterminado: 8332 or testnet: 18332)</translation> </message> <message> - <location line="+36"/> + <location line="+37"/> <source>Accept command line and JSON-RPC commands</source> <translation>Aceptar comandos consola y JSON-RPC </translation> @@ -2279,18 +2298,18 @@ Dirección: %4</translation> </translation> </message> <message> - <location line="+33"/> + <location line="+37"/> <source>Use the test network</source> <translation>Usa la red de pruebas </translation> </message> <message> - <location line="-108"/> + <location line="-112"/> <source>Accept connections from outside (default: 1 if no -proxy or -connect)</source> <translation type="unfinished"/> </message> <message> - <location line="-82"/> + <location line="-80"/> <source>%s, you must set a rpcpassword in the configuration file: %s It is recommended you use the following random password: @@ -2321,11 +2340,6 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. </message> <message> <location line="+3"/> - <source>Error initializing database environment %s! To recover, BACKUP THAT DIRECTORY, then remove everything from it except for wallet.dat.</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+3"/> <source>Error: The transaction was rejected! This might happen if some of the coins in your wallet were already spent, such as if you used a copy of wallet.dat and coins were spent in the copy but not marked as spent here.</source> <translation type="unfinished"/> </message> @@ -2350,12 +2364,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+3"/> - <source>Set the number of script verification threads (1-16, 0=auto, default: 0)</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+2"/> + <location line="+6"/> <source>This is a pre-release test build - use at your own risk - do not use for mining or merchant applications</source> <translation type="unfinished"/> </message> @@ -2395,7 +2404,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+6"/> + <location line="+5"/> <source>Connect only to the specified node(s)</source> <translation>Conecta solo al nodo especificado </translation> @@ -2416,7 +2425,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+3"/> + <location line="+2"/> <source>Error initializing block database</source> <translation type="unfinished"/> </message> @@ -2442,11 +2451,6 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. </message> <message> <location line="+1"/> - <source>Error: Transaction creation failed!</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+1"/> <source>Error: Wallet locked, unable to create transaction!</source> <translation type="unfinished"/> </message> @@ -2516,7 +2520,12 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+3"/> + <location line="+1"/> + <source>Generate coins (default: 0)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+2"/> <source>How many blocks to check at startup (default: 288, 0 = all)</source> <translation type="unfinished"/> </message> @@ -2526,7 +2535,12 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+24"/> + <location line="+19"/> + <source>Not enough file descriptors available.</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+8"/> <source>Rebuild block chain index from current blk000??.dat files</source> <translation type="unfinished"/> </message> @@ -2536,7 +2550,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+22"/> + <location line="+26"/> <source>Verifying blocks...</source> <translation type="unfinished"/> </message> @@ -2546,12 +2560,17 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="-62"/> + <location line="-69"/> <source>Imports blocks from external blk000??.dat file</source> <translation type="unfinished"/> </message> <message> - <location line="+1"/> + <location line="-76"/> + <source>Set the number of script verification threads (up to 16, 0 = auto, <0 = leave that many cores free, default: 0)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+77"/> <source>Information</source> <translation type="unfinished"/> </message> @@ -2561,6 +2580,16 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Dirección -tor invalida: '%s'</translation> </message> <message> + <location line="+1"/> + <source>Invalid amount for -minrelaytxfee=<amount>: '%s'</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Invalid amount for -mintxfee=<amount>: '%s'</source> + <translation type="unfinished"/> + </message> + <message> <location line="+8"/> <source>Maintain a full transaction index (default: 0)</source> <translation type="unfinished"/> @@ -2576,7 +2605,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+1"/> + <location line="+2"/> <source>Only accept block chain matching built-in checkpoints (default: 1)</source> <translation type="unfinished"/> </message> @@ -2636,6 +2665,11 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> + <location line="+1"/> + <source>Signing transaction failed</source> + <translation type="unfinished"/> + </message> + <message> <location line="+2"/> <source>Specify connection timeout in milliseconds (default: 5000)</source> <translation>Especifica tiempo de espera para conexion en milisegundos (predeterminado: 5000)</translation> @@ -2646,7 +2680,22 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+10"/> + <location line="+4"/> + <source>Transaction amount too small</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Transaction amounts must be positive</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Transaction too large</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+7"/> <source>Use UPnP to map the listening port (default: 0)</source> <translation>Intenta usar UPnP para mapear el puerto de escucha (default: 0)</translation> </message> @@ -2687,7 +2736,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="-46"/> + <location line="-50"/> <source>Password for JSON-RPC connections</source> <translation>Contraseña para las conexiones JSON-RPC </translation> @@ -2705,17 +2754,17 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. </translation> </message> <message> - <location line="-119"/> + <location line="-120"/> <source>Execute command when the best block changes (%s in cmd is replaced by block hash)</source> <translation type="unfinished"/> </message> <message> - <location line="+142"/> + <location line="+147"/> <source>Upgrade wallet to latest format</source> <translation>Actualizar billetera al formato actual</translation> </message> <message> - <location line="-17"/> + <location line="-21"/> <source>Set key pool size to <n> (default: 100)</source> <translation>Ajusta el numero de claves en reserva <n> (predeterminado: 100) </translation> @@ -2727,13 +2776,13 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. </translation> </message> <message> - <location line="+31"/> + <location line="+35"/> <source>Use OpenSSL (https) for JSON-RPC connections</source> <translation>Usa OpenSSL (https) para las conexiones JSON-RPC </translation> </message> <message> - <location line="-22"/> + <location line="-26"/> <source>Server certificate file (default: server.cert)</source> <translation>Certificado del servidor (Predeterminado: server.cert) </translation> @@ -2745,40 +2794,40 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. </translation> </message> <message> - <location line="-153"/> + <location line="-151"/> <source>Acceptable ciphers (default: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH)</source> <translation>Cifrados aceptados (Predeterminado: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH) </translation> </message> <message> - <location line="+166"/> + <location line="+165"/> <source>This help message</source> <translation>Este mensaje de ayuda </translation> </message> <message> - <location line="+3"/> + <location line="+6"/> <source>Unable to bind to %s on this computer (bind returned error %d, %s)</source> <translation>No es posible escuchar en el %s en este ordenador (bind returned error %d, %s)</translation> </message> <message> - <location line="-86"/> + <location line="-91"/> <source>Connect through socks proxy</source> <translation>Conecta mediante proxy socks</translation> </message> <message> - <location line="-11"/> + <location line="-10"/> <source>Allow DNS lookups for -addnode, -seednode and -connect</source> <translation>Permite búsqueda DNS para addnode y connect </translation> </message> <message> - <location line="+56"/> + <location line="+55"/> <source>Loading addresses...</source> <translation>Cargando direcciónes...</translation> </message> <message> - <location line="-34"/> + <location line="-35"/> <source>Error loading wallet.dat: Wallet corrupted</source> <translation>Error cargando wallet.dat: Billetera corrupta</translation> </message> @@ -2788,22 +2837,22 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Error cargando wallet.dat: Billetera necesita una vercion reciente de Bitcoin</translation> </message> <message> - <location line="+87"/> + <location line="+93"/> <source>Wallet needed to be rewritten: restart Bitcoin to complete</source> <translation>La billetera necesita ser reescrita: reinicie Bitcoin para completar</translation> </message> <message> - <location line="-89"/> + <location line="-95"/> <source>Error loading wallet.dat</source> <translation>Error cargando wallet.dat</translation> </message> <message> - <location line="+29"/> + <location line="+28"/> <source>Invalid -proxy address: '%s'</source> <translation>Dirección -proxy invalida: '%s'</translation> </message> <message> - <location line="+49"/> + <location line="+56"/> <source>Unknown network specified in -onlynet: '%s'</source> <translation type="unfinished"/> </message> @@ -2813,7 +2862,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="-91"/> + <location line="-96"/> <source>Cannot resolve -bind address: '%s'</source> <translation type="unfinished"/> </message> @@ -2833,17 +2882,17 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Cantidad inválida</translation> </message> <message> - <location line="-4"/> + <location line="-6"/> <source>Insufficient funds</source> <translation>Fondos insuficientes</translation> </message> <message> - <location line="+8"/> + <location line="+10"/> <source>Loading block index...</source> <translation>Cargando el index de bloques...</translation> </message> <message> - <location line="-58"/> + <location line="-57"/> <source>Add a node to connect to and attempt to keep the connection open</source> <translation>Agrega un nodo para conectarse and attempt to keep the connection open</translation> </message> @@ -2853,52 +2902,47 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>No es posible escuchar en el %s en este ordenador. Probablemente Bitcoin ya se está ejecutando.</translation> </message> <message> - <location line="+67"/> + <location line="+64"/> <source>Fee per KB to add to transactions you send</source> <translation>Comisión por kB para adicionarla a las transacciones enviadas</translation> </message> <message> - <location line="+17"/> + <location line="+19"/> <source>Loading wallet...</source> <translation>Cargando cartera...</translation> </message> <message> - <location line="-53"/> + <location line="-52"/> <source>Cannot downgrade wallet</source> <translation type="unfinished"/> </message> <message> - <location line="+1"/> - <source>Cannot initialize keypool</source> - <translation type="unfinished"/> - </message> - <message> <location line="+3"/> <source>Cannot write default address</source> <translation type="unfinished"/> </message> <message> - <location line="+63"/> + <location line="+64"/> <source>Rescanning...</source> <translation>Rescaneando...</translation> </message> <message> - <location line="-55"/> + <location line="-57"/> <source>Done loading</source> <translation>Carga completa</translation> </message> <message> - <location line="+79"/> + <location line="+82"/> <source>To use the %s option</source> <translation type="unfinished"/> </message> <message> - <location line="-71"/> + <location line="-74"/> <source>Error</source> <translation>Error</translation> </message> <message> - <location line="-33"/> + <location line="-31"/> <source>You must set rpcpassword=<password> in the configuration file: %s If the file does not exist, create it with owner-readable-only file permissions.</source> diff --git a/src/qt/locale/bitcoin_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.</translation> </message> <message> - <location filename="../aboutdialog.cpp" line="+17"/> + <location filename="../aboutdialog.cpp" line="+14"/> <source>Copyright</source> <translation>Autoriõigus</translation> </message> <message> <location line="+0"/> - <source>2009-%1 The Bitcoin developers</source> - <translation>2009-%1 Bitcoini arendajad</translation> + <source>The Bitcoin developers</source> + <translation type="unfinished"/> </message> </context> <context> @@ -66,7 +66,7 @@ Toode sisaldab OpenSSL Projekti all toodetud tarkvara, mis on kasutamiseks OpenS <translation>&Uus aadress</translation> </message> <message> - <location filename="../addressbookpage.cpp" line="+59"/> + <location filename="../addressbookpage.cpp" line="+63"/> <source>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.</source> <translation>Maksete saamiseks kasutatavad Bitcoini aadressid. Maksjate paremaks jälgimiseks võib igaühele anda erineva.</translation> </message> @@ -96,7 +96,17 @@ Toode sisaldab OpenSSL Projekti all toodetud tarkvara, mis on kasutamiseks OpenS <translation>Kustuta märgistatud aadress loetelust</translation> </message> <message> - <location line="-14"/> + <location line="+27"/> + <source>Export the data in the current tab to a file</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+3"/> + <source>&Export</source> + <translation type="unfinished"/> + </message> + <message> + <location line="-44"/> <source>Verify a message to ensure it was signed with a specified Bitcoin address</source> <translation>Kinnita sõnum tõestamaks selle allkirjastatust määratud Bitcoini aadressiga.</translation> </message> @@ -318,12 +328,12 @@ Toode sisaldab OpenSSL Projekti all toodetud tarkvara, mis on kasutamiseks OpenS <translation>Signeeri &sõnum</translation> </message> <message> - <location line="+299"/> + <location line="+280"/> <source>Synchronizing with network...</source> <translation>Võrgusünkimine...</translation> </message> <message> - <location line="-368"/> + <location line="-349"/> <source>&Overview</source> <translation>&Ülevaade</translation> </message> @@ -398,7 +408,7 @@ Toode sisaldab OpenSSL Projekti all toodetud tarkvara, mis on kasutamiseks OpenS <translation>&Salafraasi muutmine</translation> </message> <message> - <location line="+304"/> + <location line="+285"/> <source>Importing blocks from disk...</source> <translation>Impordi blokid kettalt...</translation> </message> @@ -408,12 +418,7 @@ Toode sisaldab OpenSSL Projekti all toodetud tarkvara, mis on kasutamiseks OpenS <translation>Kettal olevate blokkide re-indekseerimine...</translation> </message> <message> - <location line="-300"/> - <source>&Export...</source> - <translation>&Ekspordi...</translation> - </message> - <message> - <location line="-66"/> + <location line="-347"/> <source>Send coins to a Bitcoin address</source> <translation>Saada münte Bitcoini aadressile</translation> </message> @@ -423,12 +428,7 @@ Toode sisaldab OpenSSL Projekti all toodetud tarkvara, mis on kasutamiseks OpenS <translation>Muuda Bitcoini seadeid</translation> </message> <message> - <location line="+18"/> - <source>Export the data in the current tab to a file</source> - <translation>Ekspordi kuvatava vahelehe sisu faili</translation> - </message> - <message> - <location line="-9"/> + <location line="+9"/> <source>Backup wallet to another location</source> <translation>Varunda rahakott teise asukohta</translation> </message> @@ -438,7 +438,7 @@ Toode sisaldab OpenSSL Projekti all toodetud tarkvara, mis on kasutamiseks OpenS <translation>Rahakoti krüpteerimise salafraasi muutmine</translation> </message> <message> - <location line="+9"/> + <location line="+6"/> <source>&Debug window</source> <translation>&Debugimise aken</translation> </message> @@ -448,23 +448,23 @@ Toode sisaldab OpenSSL Projekti all toodetud tarkvara, mis on kasutamiseks OpenS <translation>Ava debugimise ja diagnostika konsool</translation> </message> <message> - <location line="-7"/> + <location line="-4"/> <source>&Verify message...</source> <translation>&Kontrolli sõnumit...</translation> </message> <message> - <location line="-163"/> - <location line="+541"/> + <location line="-165"/> + <location line="+530"/> <source>Bitcoin</source> <translation>Bitcoin</translation> </message> <message> - <location line="-541"/> + <location line="-530"/> <source>Wallet</source> <translation>Rahakott</translation> </message> <message> - <location line="+99"/> + <location line="+101"/> <source>&Send</source> <translation>&Saada</translation> </message> @@ -509,12 +509,12 @@ Toode sisaldab OpenSSL Projekti all toodetud tarkvara, mis on kasutamiseks OpenS <translation>Kinnita sõnumid kindlustamaks et need allkirjastati määratud Bitcoini aadressiga</translation> </message> <message> - <location line="+31"/> + <location line="+28"/> <source>&File</source> <translation>&Fail</translation> </message> <message> - <location line="+8"/> + <location line="+7"/> <source>&Settings</source> <translation>&Seaded</translation> </message> @@ -529,12 +529,7 @@ Toode sisaldab OpenSSL Projekti all toodetud tarkvara, mis on kasutamiseks OpenS <translation>Vahelehe tööriistariba</translation> </message> <message> - <location line="+8"/> - <source>Actions toolbar</source> - <translation>Tegevuste tööriistariba</translation> - </message> - <message> - <location line="+13"/> + <location line="+17"/> <location line="+10"/> <source>[testnet]</source> <translation>[testnet]</translation> @@ -545,12 +540,17 @@ Toode sisaldab OpenSSL Projekti all toodetud tarkvara, mis on kasutamiseks OpenS <translation>Bitcoini klient</translation> </message> <message numerus="yes"> - <location line="+140"/> + <location line="+141"/> <source>%n active connection(s) to Bitcoin network</source> <translation><numerusform>%n aktiivne ühendus Bitcoini võrku</numerusform><numerusform>%n aktiivset ühendust Bitcoini võrku</numerusform></translation> </message> <message> - <location line="+39"/> + <location line="+22"/> + <source>No block source available...</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+12"/> <source>Processed %1 of %2 (estimated) blocks of transaction history.</source> <translation>Protsessitud %1 (arvutuslikult) tehingu ajaloo blokki %2-st.</translation> </message> @@ -575,7 +575,7 @@ Toode sisaldab OpenSSL Projekti all toodetud tarkvara, mis on kasutamiseks OpenS <translation><numerusform>%n nädal</numerusform><numerusform>%n nädalat</numerusform></translation> </message> <message> - <location line="+5"/> + <location line="+4"/> <source>%1 behind</source> <translation>%1 maas</translation> </message> @@ -590,7 +590,7 @@ Toode sisaldab OpenSSL Projekti all toodetud tarkvara, mis on kasutamiseks OpenS <translation>Peale seda ei ole tehingud veel nähtavad.</translation> </message> <message> - <location line="+21"/> + <location line="+22"/> <source>Error</source> <translation>Tõrge</translation> </message> @@ -605,22 +605,22 @@ Toode sisaldab OpenSSL Projekti all toodetud tarkvara, mis on kasutamiseks OpenS <translation>Informatsioon</translation> </message> <message> - <location line="+68"/> + <location line="+70"/> <source>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?</source> <translation>See tehing ületab mahupiirangu. Saatmine on võimalik %1, node'idele ning võrgustiku toetuseks, makstava lisatasu eest. Kas nõustud lisatasuga?</translation> </message> <message> - <location line="-138"/> + <location line="-140"/> <source>Up to date</source> <translation>Ajakohane</translation> </message> <message> - <location line="+32"/> + <location line="+31"/> <source>Catching up...</source> <translation>Jõuan...</translation> </message> <message> - <location line="+110"/> + <location line="+113"/> <source>Confirm transaction fee</source> <translation>Kinnita tehingu tasu</translation> </message> @@ -669,7 +669,7 @@ Aadress: %4⏎</translation> <translation>Rahakott on <b>krüpteeritud</b> ning hetkel <b>suletud</b></translation> </message> <message> - <location filename="../bitcoin.cpp" line="+104"/> + <location filename="../bitcoin.cpp" line="+111"/> <source>A fatal error occurred. Bitcoin can no longer continue safely and will quit.</source> <translation>Ilmnes kriitiline tõrge. Bitcoin suletakse turvakaalutluste tõttu.</translation> </message> @@ -677,7 +677,7 @@ Aadress: %4⏎</translation> <context> <name>ClientModel</name> <message> - <location filename="../clientmodel.cpp" line="+98"/> + <location filename="../clientmodel.cpp" line="+104"/> <source>Network Alert</source> <translation>Võrgu Häire</translation> </message> @@ -808,8 +808,8 @@ Aadress: %4⏎</translation> </message> <message> <location line="+6"/> - <source>Optional transaction fee per kB that helps make sure your transactions are processed quickly. Most transactions are 1 kB. Fee 0.01 recommended.</source> - <translation>Valikuline tehingu lisatasu kB kohta aitab protsessi kiirendada. Enamik tehinguid on 1 kB suured. Soovitatav lisatasu: 0,01</translation> + <source>Optional transaction fee per kB that helps make sure your transactions are processed quickly. Most transactions are 1 kB.</source> + <translation type="unfinished"/> </message> <message> <location line="+15"/> @@ -1058,7 +1058,7 @@ Aadress: %4⏎</translation> <translation>Kinnitamata tehingud kokku. Ei kajastu hetke jäägis</translation> </message> <message> - <location filename="../overviewpage.cpp" line="+115"/> + <location filename="../overviewpage.cpp" line="+116"/> <location line="+1"/> <source>out of sync</source> <translation>sünkimata</translation> @@ -1645,6 +1645,19 @@ Aadress: %4⏎</translation> </message> </context> <context> + <name>SplashScreen</name> + <message> + <location filename="../splashscreen.cpp" line="+22"/> + <source>The Bitcoin developers</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>[testnet]</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>TransactionDesc</name> <message> <location filename="../transactiondesc.cpp" line="+20"/> @@ -2119,9 +2132,27 @@ Aadress: %4⏎</translation> </message> </context> <context> + <name>WalletModel</name> + <message> + <location filename="../walletmodel.cpp" line="+193"/> + <source>Send Coins</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>WalletView</name> <message> - <location filename="../walletview.cpp" line="+247"/> + <location filename="../walletview.cpp" line="+42"/> + <source>&Export</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Export the data in the current tab to a file</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+193"/> <source>Backup Wallet</source> <translation>Varundatud Rahakott</translation> </message> @@ -2154,37 +2185,37 @@ Aadress: %4⏎</translation> <context> <name>bitcoin-core</name> <message> - <location filename="../bitcoinstrings.cpp" line="+96"/> + <location filename="../bitcoinstrings.cpp" line="+94"/> <source>Bitcoin version</source> <translation>Bitcoini versioon</translation> </message> <message> - <location line="+98"/> + <location line="+102"/> <source>Usage:</source> <translation>Kasutus:</translation> </message> <message> - <location line="-25"/> + <location line="-29"/> <source>Send command to -server or bitcoind</source> <translation>Saada käsklus -serverile või bitcoindile</translation> </message> <message> - <location line="-22"/> + <location line="-23"/> <source>List commands</source> <translation>Käskluste loetelu</translation> </message> <message> - <location line="-10"/> + <location line="-12"/> <source>Get help for a command</source> <translation>Käskluste abiinfo</translation> </message> <message> - <location line="+21"/> + <location line="+24"/> <source>Options:</source> <translation>Valikud:</translation> </message> <message> - <location line="+23"/> + <location line="+24"/> <source>Specify configuration file (default: bitcoin.conf)</source> <translation>Täpsusta sätete fail (vaikimisi: bitcoin.conf)</translation> </message> @@ -2194,27 +2225,17 @@ Aadress: %4⏎</translation> <translation>Täpsusta PID fail (vaikimisi: bitcoin.pid)</translation> </message> <message> - <location line="-48"/> - <source>Generate coins</source> - <translation>Müntide genereerimine</translation> - </message> - <message> - <location line="-27"/> - <source>Don't generate coins</source> - <translation>Ära genereeri münte</translation> - </message> - <message> - <location line="+74"/> + <location line="-1"/> <source>Specify data directory</source> <translation>Täpsusta andmekataloog</translation> </message> <message> - <location line="-8"/> + <location line="-9"/> <source>Set database cache size in megabytes (default: 25)</source> <translation>Sea andmebaasi vahemälu suurus MB (vaikeväärtus: 25)</translation> </message> <message> - <location line="-27"/> + <location line="-28"/> <source>Listen for connections on <port> (default: 8333 or testnet: 18333)</source> <translation>Kuula ühendusi pordil <port> (vaikeväärtus: 8333 või testnet: 18333)</translation> </message> @@ -2229,7 +2250,7 @@ Aadress: %4⏎</translation> <translation>Peeri aadressi saamiseks ühendu korraks node'iga</translation> </message> <message> - <location line="+80"/> + <location line="+82"/> <source>Specify your own public address</source> <translation>Täpsusta enda avalik aadress</translation> </message> @@ -2239,22 +2260,22 @@ Aadress: %4⏎</translation> <translation>Ulakate peeride valulävi (vaikeväärtus: 100)</translation> </message> <message> - <location line="-132"/> + <location line="-134"/> <source>Number of seconds to keep misbehaving peers from reconnecting (default: 86400)</source> <translation>Mitme sekundi pärast ulakad peerid tagasi võivad tulla (vaikeväärtus: 86400)</translation> </message> <message> - <location line="-32"/> + <location line="-29"/> <source>An error occurred while setting up the RPC port %u for listening on IPv4: %s</source> <translation>RPC pordi %u kuulamiseks seadistamisel ilmnes viga IPv4'l: %s</translation> </message> <message> - <location line="+30"/> + <location line="+27"/> <source>Listen for JSON-RPC connections on <port> (default: 8332 or testnet: 18332)</source> <translation>Kuula JSON-RPC ühendusel seda porti <port> (vaikeväärtus: 8332 või testnet: 18332)</translation> </message> <message> - <location line="+36"/> + <location line="+37"/> <source>Accept command line and JSON-RPC commands</source> <translation>Luba käsurea ning JSON-RPC käsklusi</translation> </message> @@ -2264,17 +2285,17 @@ Aadress: %4⏎</translation> <translation>Tööta taustal ning aktsepteeri käsklusi</translation> </message> <message> - <location line="+33"/> + <location line="+37"/> <source>Use the test network</source> <translation>Testvõrgu kasutamine</translation> </message> <message> - <location line="-108"/> + <location line="-112"/> <source>Accept connections from outside (default: 1 if no -proxy or -connect)</source> <translation>Luba välisühendusi (vaikeväärtus: 1 kui puudub -proxy või -connect)</translation> </message> <message> - <location line="-82"/> + <location line="-80"/> <source>%s, you must set a rpcpassword in the configuration file: %s It is recommended you use the following random password: @@ -2315,11 +2336,6 @@ nt: alertnotify=echo %%s | email -s "Bitcoin Alert" admin@foo.com </message> <message> <location line="+3"/> - <source>Error initializing database environment %s! To recover, BACKUP THAT DIRECTORY, then remove everything from it except for wallet.dat.</source> - <translation>Tõrge andmebaasi keskkonna käivitamisel %s! Taastumiseks VARUNDA SEE KAUST, seejärel kustuta kogu sisu peale wallet.dat faili.</translation> - </message> - <message> - <location line="+3"/> <source>Error: The transaction was rejected! This might happen if some of the coins in your wallet were already spent, such as if you used a copy of wallet.dat and coins were spent in the copy but not marked as spent here.</source> <translation>Tõrge: Tehingust keelduti! Põhjuseks võib olla juba kulutatud mündid, nt kui wallet.dat fail koopias kulutatid mündid, kuid ei märgitud neid siin vastavalt.</translation> </message> @@ -2344,12 +2360,7 @@ nt: alertnotify=echo %%s | email -s "Bitcoin Alert" admin@foo.com <translation>Sea "kõrge tähtsusega"/"madala tehingu lisatasuga" tehingute maksimumsuurus baitides (vaikeväärtus: 27000)</translation> </message> <message> - <location line="+3"/> - <source>Set the number of script verification threads (1-16, 0=auto, default: 0)</source> - <translation>Määra skripti kontrolli tegumite arv (1-16, 0=auto, vaikeväärtus: 0)</translation> - </message> - <message> - <location line="+2"/> + <location line="+6"/> <source>This is a pre-release test build - use at your own risk - do not use for mining or merchant applications</source> <translation>See on test-versioon - kasutamine omal riisikol - ära kasuta mining'uks ega kaupmeeste programmides</translation> </message> @@ -2389,7 +2400,7 @@ nt: alertnotify=echo %%s | email -s "Bitcoin Alert" admin@foo.com <translation>Blokeeri loomise valikud:</translation> </message> <message> - <location line="+6"/> + <location line="+5"/> <source>Connect only to the specified node(s)</source> <translation>Ühendu ainult määratud node'i(de)ga</translation> </message> @@ -2409,7 +2420,7 @@ nt: alertnotify=echo %%s | email -s "Bitcoin Alert" admin@foo.com <translation>Kas soovid bloki andmebaasi taastada?</translation> </message> <message> - <location line="+3"/> + <location line="+2"/> <source>Error initializing block database</source> <translation>Tõrge bloki andmebaasi käivitamisel</translation> </message> @@ -2435,11 +2446,6 @@ nt: alertnotify=echo %%s | email -s "Bitcoin Alert" admin@foo.com </message> <message> <location line="+1"/> - <source>Error: Transaction creation failed!</source> - <translation>Tõrge: Tehingu loomine ebaõnnestus!</translation> - </message> - <message> - <location line="+1"/> <source>Error: Wallet locked, unable to create transaction!</source> <translation>Tõrge: Rahakott on lukus, tehingu loomine ei ole võimalik!</translation> </message> @@ -2509,7 +2515,12 @@ nt: alertnotify=echo %%s | email -s "Bitcoin Alert" admin@foo.com <translation>Otsi DNS'i lookup'i kastavaid peere (vaikeväärtus: 1, kui mitte -connect)</translation> </message> <message> - <location line="+3"/> + <location line="+1"/> + <source>Generate coins (default: 0)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+2"/> <source>How many blocks to check at startup (default: 288, 0 = all)</source> <translation>Käivitamisel kontrollitavate blokkide arv (vaikeväärtus: 288, 0=kõik)</translation> </message> @@ -2519,7 +2530,12 @@ nt: alertnotify=echo %%s | email -s "Bitcoin Alert" admin@foo.com <translation>Blokkide kontrollimise põhjalikkus (0-4, vaikeväärtus: 3)</translation> </message> <message> - <location line="+24"/> + <location line="+19"/> + <source>Not enough file descriptors available.</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+8"/> <source>Rebuild block chain index from current blk000??.dat files</source> <translation>Taasta bloki jada indeks blk000??.dat failist</translation> </message> @@ -2529,7 +2545,7 @@ nt: alertnotify=echo %%s | email -s "Bitcoin Alert" admin@foo.com <translation>Määra RPC kõnede haldurite arv (vaikeväärtus: 4)</translation> </message> <message> - <location line="+22"/> + <location line="+26"/> <source>Verifying blocks...</source> <translation>Kontrollin blokke...</translation> </message> @@ -2539,12 +2555,17 @@ nt: alertnotify=echo %%s | email -s "Bitcoin Alert" admin@foo.com <translation>Kontrollin rahakotti...</translation> </message> <message> - <location line="-62"/> + <location line="-69"/> <source>Imports blocks from external blk000??.dat file</source> <translation>Impordi blokid välisest blk000??.dat failist</translation> </message> <message> - <location line="+1"/> + <location line="-76"/> + <source>Set the number of script verification threads (up to 16, 0 = auto, <0 = leave that many cores free, default: 0)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+77"/> <source>Information</source> <translation>Informatsioon</translation> </message> @@ -2554,6 +2575,16 @@ nt: alertnotify=echo %%s | email -s "Bitcoin Alert" admin@foo.com <translation>Vigane -tor aadress: '%s'</translation> </message> <message> + <location line="+1"/> + <source>Invalid amount for -minrelaytxfee=<amount>: '%s'</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Invalid amount for -mintxfee=<amount>: '%s'</source> + <translation type="unfinished"/> + </message> + <message> <location line="+8"/> <source>Maintain a full transaction index (default: 0)</source> <translation>Säilita kogu tehingu indeks (vaikeväärtus: 0)</translation> @@ -2569,7 +2600,7 @@ nt: alertnotify=echo %%s | email -s "Bitcoin Alert" admin@foo.com <translation>Maksimaalne saatmise puhver -connection kohta , <n>*1000 baiti (vaikeväärtus: 1000)</translation> </message> <message> - <location line="+1"/> + <location line="+2"/> <source>Only accept block chain matching built-in checkpoints (default: 1)</source> <translation>Tunnusta ainult sisseehitatud turvapunktidele vastavaid bloki jadu (vaikeväärtus: 1)</translation> </message> @@ -2629,6 +2660,11 @@ nt: alertnotify=echo %%s | email -s "Bitcoin Alert" admin@foo.com <translation>Kahanda programmi käivitamisel debug.log faili (vaikeväärtus: 1, kui ei ole -debug)</translation> </message> <message> + <location line="+1"/> + <source>Signing transaction failed</source> + <translation type="unfinished"/> + </message> + <message> <location line="+2"/> <source>Specify connection timeout in milliseconds (default: 5000)</source> <translation>Sea ühenduse timeout millisekundites (vaikeväärtus: 5000)</translation> @@ -2639,7 +2675,22 @@ nt: alertnotify=echo %%s | email -s "Bitcoin Alert" admin@foo.com <translation>Süsteemi tõrge:</translation> </message> <message> - <location line="+10"/> + <location line="+4"/> + <source>Transaction amount too small</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Transaction amounts must be positive</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Transaction too large</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+7"/> <source>Use UPnP to map the listening port (default: 0)</source> <translation>Kasuta kuulatava pordi määramiseks UPnP ühendust (vaikeväärtus: 0)</translation> </message> @@ -2679,7 +2730,7 @@ nt: alertnotify=echo %%s | email -s "Bitcoin Alert" admin@foo.com <translation>wallet.dat fail on katki, päästmine ebaõnnestus</translation> </message> <message> - <location line="-46"/> + <location line="-50"/> <source>Password for JSON-RPC connections</source> <translation>JSON-RPC ühenduste salasõna</translation> </message> @@ -2694,17 +2745,17 @@ nt: alertnotify=echo %%s | email -s "Bitcoin Alert" admin@foo.com <translation>Saada käsklusi node'ile IP'ga <ip> (vaikeväärtus: 127.0.0.1)</translation> </message> <message> - <location line="-119"/> + <location line="-120"/> <source>Execute command when the best block changes (%s in cmd is replaced by block hash)</source> <translation>Käivita käsklus, kui parim plokk muutub (käskluse %s asendatakse ploki hash'iga)</translation> </message> <message> - <location line="+142"/> + <location line="+147"/> <source>Upgrade wallet to latest format</source> <translation>Uuenda rahakott uusimasse vormingusse</translation> </message> <message> - <location line="-17"/> + <location line="-21"/> <source>Set key pool size to <n> (default: 100)</source> <translation>Sea võtmete hulgaks <n> (vaikeväärtus: 100)</translation> </message> @@ -2714,12 +2765,12 @@ nt: alertnotify=echo %%s | email -s "Bitcoin Alert" admin@foo.com <translation>Otsi ploki jadast rahakoti kadunud tehinguid</translation> </message> <message> - <location line="+31"/> + <location line="+35"/> <source>Use OpenSSL (https) for JSON-RPC connections</source> <translation>Kasuta JSON-RPC ühenduste jaoks OpenSSL'i (https)</translation> </message> <message> - <location line="-22"/> + <location line="-26"/> <source>Server certificate file (default: server.cert)</source> <translation>Serveri sertifikaadifail (vaikeväärtus: server.cert)</translation> </message> @@ -2729,37 +2780,37 @@ nt: alertnotify=echo %%s | email -s "Bitcoin Alert" admin@foo.com <translation>Serveri privaatvõti (vaikeväärtus: server.pem)</translation> </message> <message> - <location line="-153"/> + <location line="-151"/> <source>Acceptable ciphers (default: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH)</source> <translation>Lubatud šiffrid (vaikeväärtus: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH)</translation> </message> <message> - <location line="+166"/> + <location line="+165"/> <source>This help message</source> <translation>Käesolev abitekst</translation> </message> <message> - <location line="+3"/> + <location line="+6"/> <source>Unable to bind to %s on this computer (bind returned error %d, %s)</source> <translation>Selle arvutiga ei ole võimalik siduda %s külge (katse nurjus %d, %s tõttu)</translation> </message> <message> - <location line="-86"/> + <location line="-91"/> <source>Connect through socks proxy</source> <translation>Ühendu läbi turva proxi</translation> </message> <message> - <location line="-11"/> + <location line="-10"/> <source>Allow DNS lookups for -addnode, -seednode and -connect</source> <translation>-addnode, -seednode ja -connect tohivad kasutada DNS lookup'i</translation> </message> <message> - <location line="+56"/> + <location line="+55"/> <source>Loading addresses...</source> <translation>Aadresside laadimine...</translation> </message> <message> - <location line="-34"/> + <location line="-35"/> <source>Error loading wallet.dat: Wallet corrupted</source> <translation>Viga wallet.dat käivitamisel. Vigane rahakkott</translation> </message> @@ -2769,22 +2820,22 @@ nt: alertnotify=echo %%s | email -s "Bitcoin Alert" admin@foo.com <translation>Viga wallet.dat käivitamisel: Rahakott nõuab Bitcoini uusimat versiooni</translation> </message> <message> - <location line="+87"/> + <location line="+93"/> <source>Wallet needed to be rewritten: restart Bitcoin to complete</source> <translation>Rahakott tuli ümberkirjutada: toimingu lõpetamiseks taaskäivita Bitcoin</translation> </message> <message> - <location line="-89"/> + <location line="-95"/> <source>Error loading wallet.dat</source> <translation>Viga wallet.dat käivitamisel</translation> </message> <message> - <location line="+29"/> + <location line="+28"/> <source>Invalid -proxy address: '%s'</source> <translation>Vigane -proxi aadress: '%s'</translation> </message> <message> - <location line="+49"/> + <location line="+56"/> <source>Unknown network specified in -onlynet: '%s'</source> <translation>Kirjeldatud tundmatu võrgustik -onlynet'is: '%s'</translation> </message> @@ -2794,7 +2845,7 @@ nt: alertnotify=echo %%s | email -s "Bitcoin Alert" admin@foo.com <translation>Küsitud tundmatu -socks proxi versioon: %i</translation> </message> <message> - <location line="-91"/> + <location line="-96"/> <source>Cannot resolve -bind address: '%s'</source> <translation>Tundmatu -bind aadress: '%s'</translation> </message> @@ -2814,17 +2865,17 @@ nt: alertnotify=echo %%s | email -s "Bitcoin Alert" admin@foo.com <translation>Kehtetu summa</translation> </message> <message> - <location line="-4"/> + <location line="-6"/> <source>Insufficient funds</source> <translation>Liiga suur summa</translation> </message> <message> - <location line="+8"/> + <location line="+10"/> <source>Loading block index...</source> <translation>Klotside indeksi laadimine...</translation> </message> <message> - <location line="-58"/> + <location line="-57"/> <source>Add a node to connect to and attempt to keep the connection open</source> <translation>Lisa node ning hoia ühendus avatud</translation> </message> @@ -2834,52 +2885,47 @@ nt: alertnotify=echo %%s | email -s "Bitcoin Alert" admin@foo.com <translation>%s'ga ei ole võimalik sellest arvutist siduda. Bitcoin juba töötab.</translation> </message> <message> - <location line="+67"/> + <location line="+64"/> <source>Fee per KB to add to transactions you send</source> <translation>Minu saadetavate tehingute lisatasu KB kohta</translation> </message> <message> - <location line="+17"/> + <location line="+19"/> <source>Loading wallet...</source> <translation>Rahakoti laadimine...</translation> </message> <message> - <location line="-53"/> + <location line="-52"/> <source>Cannot downgrade wallet</source> <translation>Rahakoti vanandamine ebaõnnestus</translation> </message> <message> - <location line="+1"/> - <source>Cannot initialize keypool</source> - <translation>Tõrge võtmehulga algatamisel</translation> - </message> - <message> <location line="+3"/> <source>Cannot write default address</source> <translation>Tõrge vaikimisi aadressi kirjutamisel</translation> </message> <message> - <location line="+63"/> + <location line="+64"/> <source>Rescanning...</source> <translation>Üleskaneerimine...</translation> </message> <message> - <location line="-55"/> + <location line="-57"/> <source>Done loading</source> <translation>Laetud</translation> </message> <message> - <location line="+79"/> + <location line="+82"/> <source>To use the %s option</source> <translation>%s valiku kasutamine</translation> </message> <message> - <location line="-71"/> + <location line="-74"/> <source>Error</source> <translation>Tõrge</translation> </message> <message> - <location line="-33"/> + <location line="-31"/> <source>You must set rpcpassword=<password> in the configuration file: %s If the file does not exist, create it with owner-readable-only file permissions.</source> diff --git a/src/qt/locale/bitcoin_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 <translation type="unfinished"/> </message> <message> - <location filename="../aboutdialog.cpp" line="+17"/> + <location filename="../aboutdialog.cpp" line="+14"/> <source>Copyright</source> <translation type="unfinished"/> </message> <message> <location line="+0"/> - <source>2009-%1 The Bitcoin developers</source> + <source>The Bitcoin developers</source> <translation type="unfinished"/> </message> </context> @@ -61,7 +61,7 @@ This product includes software developed by the OpenSSL Project for use in the O <translation type="unfinished"/> </message> <message> - <location filename="../addressbookpage.cpp" line="+59"/> + <location filename="../addressbookpage.cpp" line="+63"/> <source>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.</source> <translation type="unfinished"/> </message> @@ -73,7 +73,7 @@ This product includes software developed by the OpenSSL Project for use in the O <message> <location line="+11"/> <source>Show &QR Code</source> - <translation type="unfinished"/> + <translation>Erakutsi &QR kodea</translation> </message> <message> <location line="+11"/> @@ -91,7 +91,17 @@ This product includes software developed by the OpenSSL Project for use in the O <translation type="unfinished"/> </message> <message> - <location line="-14"/> + <location line="+27"/> + <source>Export the data in the current tab to a file</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+3"/> + <source>&Export</source> + <translation type="unfinished"/> + </message> + <message> + <location line="-44"/> <source>Verify a message to ensure it was signed with a specified Bitcoin address</source> <translation type="unfinished"/> </message> @@ -313,12 +323,12 @@ This product includes software developed by the OpenSSL Project for use in the O <translation type="unfinished"/> </message> <message> - <location line="+299"/> + <location line="+280"/> <source>Synchronizing with network...</source> <translation>Sarearekin sinkronizatzen...</translation> </message> <message> - <location line="-368"/> + <location line="-349"/> <source>&Overview</source> <translation>&Gainbegiratu</translation> </message> @@ -350,7 +360,7 @@ This product includes software developed by the OpenSSL Project for use in the O <message> <location line="+31"/> <source>E&xit</source> - <translation type="unfinished"/> + <translation>Irten</translation> </message> <message> <location line="+1"/> @@ -365,12 +375,12 @@ This product includes software developed by the OpenSSL Project for use in the O <message> <location line="+2"/> <source>About &Qt</source> - <translation type="unfinished"/> + <translation>&Qt-ari buruz</translation> </message> <message> <location line="+1"/> <source>Show information about Qt</source> - <translation type="unfinished"/> + <translation>Erakutsi Bitcoin-i buruzko informazioa</translation> </message> <message> <location line="+2"/> @@ -393,7 +403,7 @@ This product includes software developed by the OpenSSL Project for use in the O <translation type="unfinished"/> </message> <message> - <location line="+304"/> + <location line="+285"/> <source>Importing blocks from disk...</source> <translation type="unfinished"/> </message> @@ -403,12 +413,7 @@ This product includes software developed by the OpenSSL Project for use in the O <translation type="unfinished"/> </message> <message> - <location line="-300"/> - <source>&Export...</source> - <translation>&Esportatu...</translation> - </message> - <message> - <location line="-66"/> + <location line="-347"/> <source>Send coins to a Bitcoin address</source> <translation type="unfinished"/> </message> @@ -418,12 +423,7 @@ This product includes software developed by the OpenSSL Project for use in the O <translation type="unfinished"/> </message> <message> - <location line="+18"/> - <source>Export the data in the current tab to a file</source> - <translation type="unfinished"/> - </message> - <message> - <location line="-9"/> + <location line="+9"/> <source>Backup wallet to another location</source> <translation type="unfinished"/> </message> @@ -433,7 +433,7 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>Aldatu zorroa enkriptatzeko erabilitako pasahitza</translation> </message> <message> - <location line="+9"/> + <location line="+6"/> <source>&Debug window</source> <translation type="unfinished"/> </message> @@ -443,23 +443,23 @@ This product includes software developed by the OpenSSL Project for use in the O <translation type="unfinished"/> </message> <message> - <location line="-7"/> + <location line="-4"/> <source>&Verify message...</source> <translation type="unfinished"/> </message> <message> - <location line="-163"/> - <location line="+541"/> + <location line="-165"/> + <location line="+530"/> <source>Bitcoin</source> <translation type="unfinished"/> </message> <message> - <location line="-541"/> + <location line="-530"/> <source>Wallet</source> <translation type="unfinished"/> </message> <message> - <location line="+99"/> + <location line="+101"/> <source>&Send</source> <translation type="unfinished"/> </message> @@ -504,12 +504,12 @@ This product includes software developed by the OpenSSL Project for use in the O <translation type="unfinished"/> </message> <message> - <location line="+31"/> + <location line="+28"/> <source>&File</source> <translation>&Artxiboa</translation> </message> <message> - <location line="+8"/> + <location line="+7"/> <source>&Settings</source> <translation>&Ezarpenak</translation> </message> @@ -524,12 +524,7 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>Fitxen tresna-barra</translation> </message> <message> - <location line="+8"/> - <source>Actions toolbar</source> - <translation>Ekintzak tresna-barra</translation> - </message> - <message> - <location line="+13"/> + <location line="+17"/> <location line="+10"/> <source>[testnet]</source> <translation>[testnet]</translation> @@ -540,12 +535,17 @@ This product includes software developed by the OpenSSL Project for use in the O <translation type="unfinished"/> </message> <message numerus="yes"> - <location line="+140"/> + <location line="+141"/> <source>%n active connection(s) to Bitcoin network</source> - <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation> + <translation><numerusform>Konexio aktibo %n Bitcoin-en sarera</numerusform><numerusform>%n konexio aktibo Bitcoin-en sarera</numerusform></translation> </message> <message> - <location line="+39"/> + <location line="+22"/> + <source>No block source available...</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+12"/> <source>Processed %1 of %2 (estimated) blocks of transaction history.</source> <translation type="unfinished"/> </message> @@ -570,7 +570,7 @@ This product includes software developed by the OpenSSL Project for use in the O <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation> </message> <message> - <location line="+5"/> + <location line="+4"/> <source>%1 behind</source> <translation type="unfinished"/> </message> @@ -585,7 +585,7 @@ This product includes software developed by the OpenSSL Project for use in the O <translation type="unfinished"/> </message> <message> - <location line="+21"/> + <location line="+22"/> <source>Error</source> <translation type="unfinished"/> </message> @@ -600,22 +600,22 @@ This product includes software developed by the OpenSSL Project for use in the O <translation type="unfinished"/> </message> <message> - <location line="+68"/> + <location line="+70"/> <source>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?</source> <translation type="unfinished"/> </message> <message> - <location line="-138"/> + <location line="-140"/> <source>Up to date</source> <translation>Egunean</translation> </message> <message> - <location line="+32"/> + <location line="+31"/> <source>Catching up...</source> <translation>Eguneratzen...</translation> </message> <message> - <location line="+110"/> + <location line="+113"/> <source>Confirm transaction fee</source> <translation type="unfinished"/> </message> @@ -661,7 +661,7 @@ Address: %4 <translation>Zorroa <b>enkriptatuta</b> eta <b>blokeatuta</b> dago une honetan</translation> </message> <message> - <location filename="../bitcoin.cpp" line="+104"/> + <location filename="../bitcoin.cpp" line="+111"/> <source>A fatal error occurred. Bitcoin can no longer continue safely and will quit.</source> <translation type="unfinished"/> </message> @@ -669,7 +669,7 @@ Address: %4 <context> <name>ClientModel</name> <message> - <location filename="../clientmodel.cpp" line="+98"/> + <location filename="../clientmodel.cpp" line="+104"/> <source>Network Alert</source> <translation type="unfinished"/> </message> @@ -800,7 +800,7 @@ Address: %4 </message> <message> <location line="+6"/> - <source>Optional transaction fee per kB that helps make sure your transactions are processed quickly. Most transactions are 1 kB. Fee 0.01 recommended.</source> + <source>Optional transaction fee per kB that helps make sure your transactions are processed quickly. Most transactions are 1 kB.</source> <translation type="unfinished"/> </message> <message> @@ -1050,7 +1050,7 @@ Address: %4 <translation>Oraindik konfirmatu gabe daudenez, uneko saldoab kontatu gabe dagoen transakzio kopurua</translation> </message> <message> - <location filename="../overviewpage.cpp" line="+115"/> + <location filename="../overviewpage.cpp" line="+116"/> <location line="+1"/> <source>out of sync</source> <translation type="unfinished"/> @@ -1079,22 +1079,22 @@ Address: %4 <message> <location line="+56"/> <source>Amount:</source> - <translation type="unfinished"/> + <translation>Kopurua</translation> </message> <message> <location line="-44"/> <source>Label:</source> - <translation type="unfinished"/> + <translation>&Etiketa:</translation> </message> <message> <location line="+19"/> <source>Message:</source> - <translation type="unfinished"/> + <translation>Mezua</translation> </message> <message> <location line="+71"/> <source>&Save As...</source> - <translation type="unfinished"/> + <translation>Gorde honela...</translation> </message> <message> <location filename="../qrcodedialog.cpp" line="+62"/> @@ -1637,6 +1637,19 @@ Address: %4 </message> </context> <context> + <name>SplashScreen</name> + <message> + <location filename="../splashscreen.cpp" line="+22"/> + <source>The Bitcoin developers</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>[testnet]</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>TransactionDesc</name> <message> <location filename="../transactiondesc.cpp" line="+20"/> @@ -2047,7 +2060,7 @@ Address: %4 <message> <location line="+139"/> <source>Export Transaction Data</source> - <translation type="unfinished"/> + <translation>Transakzioaren xehetasunak</translation> </message> <message> <location line="+1"/> @@ -2111,9 +2124,27 @@ Address: %4 </message> </context> <context> + <name>WalletModel</name> + <message> + <location filename="../walletmodel.cpp" line="+193"/> + <source>Send Coins</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>WalletView</name> <message> - <location filename="../walletview.cpp" line="+247"/> + <location filename="../walletview.cpp" line="+42"/> + <source>&Export</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Export the data in the current tab to a file</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+193"/> <source>Backup Wallet</source> <translation type="unfinished"/> </message> @@ -2146,67 +2177,57 @@ Address: %4 <context> <name>bitcoin-core</name> <message> - <location filename="../bitcoinstrings.cpp" line="+96"/> + <location filename="../bitcoinstrings.cpp" line="+94"/> <source>Bitcoin version</source> - <translation type="unfinished"/> + <translation>Botcoin bertsioa</translation> </message> <message> - <location line="+98"/> + <location line="+102"/> <source>Usage:</source> <translation type="unfinished"/> </message> <message> - <location line="-25"/> + <location line="-29"/> <source>Send command to -server or bitcoind</source> <translation type="unfinished"/> </message> <message> - <location line="-22"/> + <location line="-23"/> <source>List commands</source> - <translation type="unfinished"/> + <translation>Komandoen lista</translation> </message> <message> - <location line="-10"/> + <location line="-12"/> <source>Get help for a command</source> - <translation type="unfinished"/> + <translation>Laguntza komando batean</translation> </message> <message> - <location line="+21"/> + <location line="+24"/> <source>Options:</source> - <translation type="unfinished"/> + <translation>Aukerak</translation> </message> <message> - <location line="+23"/> + <location line="+24"/> <source>Specify configuration file (default: bitcoin.conf)</source> - <translation type="unfinished"/> + <translation>Ezarpen fitxategia aukeratu (berezkoa: bitcoin.conf)</translation> </message> <message> <location line="+3"/> <source>Specify pid file (default: bitcoind.pid)</source> - <translation type="unfinished"/> - </message> - <message> - <location line="-48"/> - <source>Generate coins</source> - <translation type="unfinished"/> - </message> - <message> - <location line="-27"/> - <source>Don't generate coins</source> - <translation type="unfinished"/> + <translation>pid fitxategia aukeratu (berezkoa: bitcoind.pid)</translation> </message> <message> - <location line="+74"/> + <location line="-1"/> <source>Specify data directory</source> <translation type="unfinished"/> </message> <message> - <location line="-8"/> + <location line="-9"/> <source>Set database cache size in megabytes (default: 25)</source> <translation type="unfinished"/> </message> <message> - <location line="-27"/> + <location line="-28"/> <source>Listen for connections on <port> (default: 8333 or testnet: 18333)</source> <translation type="unfinished"/> </message> @@ -2221,7 +2242,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+80"/> + <location line="+82"/> <source>Specify your own public address</source> <translation type="unfinished"/> </message> @@ -2231,22 +2252,22 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="-132"/> + <location line="-134"/> <source>Number of seconds to keep misbehaving peers from reconnecting (default: 86400)</source> <translation type="unfinished"/> </message> <message> - <location line="-32"/> + <location line="-29"/> <source>An error occurred while setting up the RPC port %u for listening on IPv4: %s</source> <translation type="unfinished"/> </message> <message> - <location line="+30"/> + <location line="+27"/> <source>Listen for JSON-RPC connections on <port> (default: 8332 or testnet: 18332)</source> <translation type="unfinished"/> </message> <message> - <location line="+36"/> + <location line="+37"/> <source>Accept command line and JSON-RPC commands</source> <translation type="unfinished"/> </message> @@ -2256,17 +2277,17 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+33"/> + <location line="+37"/> <source>Use the test network</source> <translation type="unfinished"/> </message> <message> - <location line="-108"/> + <location line="-112"/> <source>Accept connections from outside (default: 1 if no -proxy or -connect)</source> <translation type="unfinished"/> </message> <message> - <location line="-82"/> + <location line="-80"/> <source>%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. </message> <message> <location line="+3"/> - <source>Error initializing database environment %s! To recover, BACKUP THAT DIRECTORY, then remove everything from it except for wallet.dat.</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+3"/> <source>Error: The transaction was rejected! This might happen if some of the coins in your wallet were already spent, such as if you used a copy of wallet.dat and coins were spent in the copy but not marked as spent here.</source> <translation type="unfinished"/> </message> @@ -2326,12 +2342,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+3"/> - <source>Set the number of script verification threads (1-16, 0=auto, default: 0)</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+2"/> + <location line="+6"/> <source>This is a pre-release test build - use at your own risk - do not use for mining or merchant applications</source> <translation type="unfinished"/> </message> @@ -2371,7 +2382,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+6"/> + <location line="+5"/> <source>Connect only to the specified node(s)</source> <translation type="unfinished"/> </message> @@ -2391,7 +2402,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+3"/> + <location line="+2"/> <source>Error initializing block database</source> <translation type="unfinished"/> </message> @@ -2417,11 +2428,6 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. </message> <message> <location line="+1"/> - <source>Error: Transaction creation failed!</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+1"/> <source>Error: Wallet locked, unable to create transaction!</source> <translation type="unfinished"/> </message> @@ -2491,7 +2497,12 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+3"/> + <location line="+1"/> + <source>Generate coins (default: 0)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+2"/> <source>How many blocks to check at startup (default: 288, 0 = all)</source> <translation type="unfinished"/> </message> @@ -2501,7 +2512,12 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+24"/> + <location line="+19"/> + <source>Not enough file descriptors available.</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+8"/> <source>Rebuild block chain index from current blk000??.dat files</source> <translation type="unfinished"/> </message> @@ -2511,7 +2527,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+22"/> + <location line="+26"/> <source>Verifying blocks...</source> <translation type="unfinished"/> </message> @@ -2521,12 +2537,17 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="-62"/> + <location line="-69"/> <source>Imports blocks from external blk000??.dat file</source> <translation type="unfinished"/> </message> <message> - <location line="+1"/> + <location line="-76"/> + <source>Set the number of script verification threads (up to 16, 0 = auto, <0 = leave that many cores free, default: 0)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+77"/> <source>Information</source> <translation type="unfinished"/> </message> @@ -2536,6 +2557,16 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> + <location line="+1"/> + <source>Invalid amount for -minrelaytxfee=<amount>: '%s'</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Invalid amount for -mintxfee=<amount>: '%s'</source> + <translation type="unfinished"/> + </message> + <message> <location line="+8"/> <source>Maintain a full transaction index (default: 0)</source> <translation type="unfinished"/> @@ -2551,7 +2582,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+1"/> + <location line="+2"/> <source>Only accept block chain matching built-in checkpoints (default: 1)</source> <translation type="unfinished"/> </message> @@ -2611,6 +2642,11 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> + <location line="+1"/> + <source>Signing transaction failed</source> + <translation type="unfinished"/> + </message> + <message> <location line="+2"/> <source>Specify connection timeout in milliseconds (default: 5000)</source> <translation type="unfinished"/> @@ -2621,7 +2657,22 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+10"/> + <location line="+4"/> + <source>Transaction amount too small</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Transaction amounts must be positive</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Transaction too large</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+7"/> <source>Use UPnP to map the listening port (default: 0)</source> <translation type="unfinished"/> </message> @@ -2661,7 +2712,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="-46"/> + <location line="-50"/> <source>Password for JSON-RPC connections</source> <translation type="unfinished"/> </message> @@ -2676,17 +2727,17 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="-119"/> + <location line="-120"/> <source>Execute command when the best block changes (%s in cmd is replaced by block hash)</source> <translation type="unfinished"/> </message> <message> - <location line="+142"/> + <location line="+147"/> <source>Upgrade wallet to latest format</source> <translation type="unfinished"/> </message> <message> - <location line="-17"/> + <location line="-21"/> <source>Set key pool size to <n> (default: 100)</source> <translation type="unfinished"/> </message> @@ -2696,12 +2747,12 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+31"/> + <location line="+35"/> <source>Use OpenSSL (https) for JSON-RPC connections</source> <translation type="unfinished"/> </message> <message> - <location line="-22"/> + <location line="-26"/> <source>Server certificate file (default: server.cert)</source> <translation type="unfinished"/> </message> @@ -2711,37 +2762,37 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="-153"/> + <location line="-151"/> <source>Acceptable ciphers (default: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH)</source> <translation type="unfinished"/> </message> <message> - <location line="+166"/> + <location line="+165"/> <source>This help message</source> - <translation type="unfinished"/> + <translation>Laguntza mezu hau</translation> </message> <message> - <location line="+3"/> + <location line="+6"/> <source>Unable to bind to %s on this computer (bind returned error %d, %s)</source> <translation type="unfinished"/> </message> <message> - <location line="-86"/> + <location line="-91"/> <source>Connect through socks proxy</source> <translation type="unfinished"/> </message> <message> - <location line="-11"/> + <location line="-10"/> <source>Allow DNS lookups for -addnode, -seednode and -connect</source> <translation type="unfinished"/> </message> <message> - <location line="+56"/> + <location line="+55"/> <source>Loading addresses...</source> <translation type="unfinished"/> </message> <message> - <location line="-34"/> + <location line="-35"/> <source>Error loading wallet.dat: Wallet corrupted</source> <translation type="unfinished"/> </message> @@ -2751,22 +2802,22 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+87"/> + <location line="+93"/> <source>Wallet needed to be rewritten: restart Bitcoin to complete</source> <translation type="unfinished"/> </message> <message> - <location line="-89"/> + <location line="-95"/> <source>Error loading wallet.dat</source> <translation type="unfinished"/> </message> <message> - <location line="+29"/> + <location line="+28"/> <source>Invalid -proxy address: '%s'</source> <translation type="unfinished"/> </message> <message> - <location line="+49"/> + <location line="+56"/> <source>Unknown network specified in -onlynet: '%s'</source> <translation type="unfinished"/> </message> @@ -2776,7 +2827,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="-91"/> + <location line="-96"/> <source>Cannot resolve -bind address: '%s'</source> <translation type="unfinished"/> </message> @@ -2796,17 +2847,17 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="-4"/> + <location line="-6"/> <source>Insufficient funds</source> <translation type="unfinished"/> </message> <message> - <location line="+8"/> + <location line="+10"/> <source>Loading block index...</source> <translation type="unfinished"/> </message> <message> - <location line="-58"/> + <location line="-57"/> <source>Add a node to connect to and attempt to keep the connection open</source> <translation type="unfinished"/> </message> @@ -2816,52 +2867,47 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+67"/> + <location line="+64"/> <source>Fee per KB to add to transactions you send</source> <translation type="unfinished"/> </message> <message> - <location line="+17"/> + <location line="+19"/> <source>Loading wallet...</source> <translation type="unfinished"/> </message> <message> - <location line="-53"/> + <location line="-52"/> <source>Cannot downgrade wallet</source> <translation type="unfinished"/> </message> <message> - <location line="+1"/> - <source>Cannot initialize keypool</source> - <translation type="unfinished"/> - </message> - <message> <location line="+3"/> <source>Cannot write default address</source> <translation type="unfinished"/> </message> <message> - <location line="+63"/> + <location line="+64"/> <source>Rescanning...</source> - <translation type="unfinished"/> + <translation>Birbilatzen...</translation> </message> <message> - <location line="-55"/> + <location line="-57"/> <source>Done loading</source> - <translation type="unfinished"/> + <translation>Zamaketa amaitua</translation> </message> <message> - <location line="+79"/> + <location line="+82"/> <source>To use the %s option</source> <translation type="unfinished"/> </message> <message> - <location line="-71"/> + <location line="-74"/> <source>Error</source> <translation type="unfinished"/> </message> <message> - <location line="-33"/> + <location line="-31"/> <source>You must set rpcpassword=<password> in the configuration file: %s If the file does not exist, create it with owner-readable-only file permissions.</source> diff --git a/src/qt/locale/bitcoin_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 <translation>⏎ ⏎ این نسخه نرم افزار آزمایشی است⏎ ⏎ نرم افزار تحت لیسانس MIT/X11 منتشر شده است. به فایل coping یا آدرس http://www.opensource.org/licenses/mit-license.php. مراجعه شود⏎ ⏎ این محصول شامل نرم افزاری است که با OpenSSL برای استفاده از OpenSSL Toolkit (http://www.openssl.org/) و نرم افزار نوشته شده توسط اریک یانگ (eay@cryptsoft.com ) و UPnP توسط توماس برنارد طراحی شده است.</translation> </message> <message> - <location filename="../aboutdialog.cpp" line="+17"/> + <location filename="../aboutdialog.cpp" line="+14"/> <source>Copyright</source> <translation type="unfinished"/> </message> <message> <location line="+0"/> - <source>2009-%1 The Bitcoin developers</source> + <source>The Bitcoin developers</source> <translation type="unfinished"/> </message> </context> @@ -61,7 +61,7 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>آدرس جدید</translation> </message> <message> - <location filename="../addressbookpage.cpp" line="+59"/> + <location filename="../addressbookpage.cpp" line="+63"/> <source>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.</source> <translation>این آدرسها، آدرسهای bitcoin شما برای دریافت وجوه هستند. شما ممکن است آدرسهای متفاوت را به هر گیرنده اختصاص دهید که بتوانید مواردی که پرداخت می کنید را پیگیری نمایید</translation> </message> @@ -91,7 +91,17 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>آدرس انتخاب شده در سیستم تخته رسم گیره دا حذف</translation> </message> <message> - <location line="-14"/> + <location line="+27"/> + <source>Export the data in the current tab to a file</source> + <translation>داده ها نوارِ جاری را به فایل انتقال دهید</translation> + </message> + <message> + <location line="+3"/> + <source>&Export</source> + <translation type="unfinished"/> + </message> + <message> + <location line="-44"/> <source>Verify a message to ensure it was signed with a specified Bitcoin address</source> <translation>یک پیام را برای حصول اطمینان از ورود به سیستم با آدرس bitcoin مشخص، شناسایی کنید</translation> </message> @@ -314,12 +324,12 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>امضا و پیام</translation> </message> <message> - <location line="+299"/> + <location line="+280"/> <source>Synchronizing with network...</source> <translation>همگام سازی با شبکه ...</translation> </message> <message> - <location line="-368"/> + <location line="-349"/> <source>&Overview</source> <translation>بررسی اجمالی</translation> </message> @@ -394,7 +404,7 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>تغییر Passphrase</translation> </message> <message> - <location line="+304"/> + <location line="+285"/> <source>Importing blocks from disk...</source> <translation type="unfinished"/> </message> @@ -404,12 +414,7 @@ This product includes software developed by the OpenSSL Project for use in the O <translation type="unfinished"/> </message> <message> - <location line="-300"/> - <source>&Export...</source> - <translation>&;صادرات</translation> - </message> - <message> - <location line="-66"/> + <location line="-347"/> <source>Send coins to a Bitcoin address</source> <translation>سکه ها را به آدرس bitocin ارسال کن</translation> </message> @@ -419,12 +424,7 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>انتخابهای پیکربندی را برای bitcoin اصلاح کن</translation> </message> <message> - <location line="+18"/> - <source>Export the data in the current tab to a file</source> - <translation>داده ها نوارِ جاری را به فایل انتقال دهید</translation> - </message> - <message> - <location line="-9"/> + <location line="+9"/> <source>Backup wallet to another location</source> <translation>نسخه پیشتیبان wallet را به محل دیگر انتقال دهید</translation> </message> @@ -434,7 +434,7 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>عبارت عبور رمز گشایی پنجره تغییر کنید</translation> </message> <message> - <location line="+9"/> + <location line="+6"/> <source>&Debug window</source> <translation>اشکال زدایی از صفحه</translation> </message> @@ -444,23 +444,23 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>کنسول اشکال زدایی و تشخیص را باز کنید</translation> </message> <message> - <location line="-7"/> + <location line="-4"/> <source>&Verify message...</source> <translation>بازبینی پیام</translation> </message> <message> - <location line="-163"/> - <location line="+541"/> + <location line="-165"/> + <location line="+530"/> <source>Bitcoin</source> <translation>یت کویین </translation> </message> <message> - <location line="-541"/> + <location line="-530"/> <source>Wallet</source> <translation>wallet</translation> </message> <message> - <location line="+99"/> + <location line="+101"/> <source>&Send</source> <translation type="unfinished"/> </message> @@ -505,12 +505,12 @@ This product includes software developed by the OpenSSL Project for use in the O <translation type="unfinished"/> </message> <message> - <location line="+31"/> + <location line="+28"/> <source>&File</source> <translation>فایل</translation> </message> <message> - <location line="+8"/> + <location line="+7"/> <source>&Settings</source> <translation>تنظیمات</translation> </message> @@ -525,12 +525,7 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>نوار ابزار زبانه ها</translation> </message> <message> - <location line="+8"/> - <source>Actions toolbar</source> - <translation>نوار ابزار عملیت</translation> - </message> - <message> - <location line="+13"/> + <location line="+17"/> <location line="+10"/> <source>[testnet]</source> <translation>آزمایش شبکه</translation> @@ -541,12 +536,17 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>مشتری Bitcoin</translation> </message> <message numerus="yes"> - <location line="+140"/> + <location line="+141"/> <source>%n active connection(s) to Bitcoin network</source> <translation><numerusform>در صد ارتباطات فعال بیتکویین با شبکه %n</numerusform></translation> </message> <message> - <location line="+39"/> + <location line="+22"/> + <source>No block source available...</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+12"/> <source>Processed %1 of %2 (estimated) blocks of transaction history.</source> <translation type="unfinished"/> </message> @@ -571,7 +571,7 @@ This product includes software developed by the OpenSSL Project for use in the O <translation type="unfinished"><numerusform></numerusform></translation> </message> <message> - <location line="+5"/> + <location line="+4"/> <source>%1 behind</source> <translation type="unfinished"/> </message> @@ -586,7 +586,7 @@ This product includes software developed by the OpenSSL Project for use in the O <translation type="unfinished"/> </message> <message> - <location line="+21"/> + <location line="+22"/> <source>Error</source> <translation type="unfinished"/> </message> @@ -601,22 +601,22 @@ This product includes software developed by the OpenSSL Project for use in the O <translation type="unfinished"/> </message> <message> - <location line="+68"/> + <location line="+70"/> <source>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?</source> <translation type="unfinished"/> </message> <message> - <location line="-138"/> + <location line="-140"/> <source>Up to date</source> <translation>تا تاریخ</translation> </message> <message> - <location line="+32"/> + <location line="+31"/> <source>Catching up...</source> <translation>ابتلا به بالا</translation> </message> <message> - <location line="+110"/> + <location line="+113"/> <source>Confirm transaction fee</source> <translation>هزینه تراکنش را تایید کنید</translation> </message> @@ -665,7 +665,7 @@ Address: %4 <translation>زمایش شبکه</translation> </message> <message> - <location filename="../bitcoin.cpp" line="+104"/> + <location filename="../bitcoin.cpp" line="+111"/> <source>A fatal error occurred. Bitcoin can no longer continue safely and will quit.</source> <translation>خطا روی داده است. Bitcoin نمی تواند بدون مشکل ادامه دهد و باید بسته شود</translation> </message> @@ -673,7 +673,7 @@ Address: %4 <context> <name>ClientModel</name> <message> - <location filename="../clientmodel.cpp" line="+98"/> + <location filename="../clientmodel.cpp" line="+104"/> <source>Network Alert</source> <translation>پیام شبکه</translation> </message> @@ -804,8 +804,8 @@ Address: %4 </message> <message> <location line="+6"/> - <source>Optional transaction fee per kB that helps make sure your transactions are processed quickly. Most transactions are 1 kB. Fee 0.01 recommended.</source> - <translation>نرخ اختیاری تراکنش هر کیلوبایت که به شما کمک میکند اطمینان پیدا کنید که تراکنشها به سرعت پردازش میشوند. بیشتر تراکنشها ۱ کیلوبایت هستند. نرخ 0.01 پیشنهاد میشود.</translation> + <source>Optional transaction fee per kB that helps make sure your transactions are processed quickly. Most transactions are 1 kB.</source> + <translation type="unfinished"/> </message> <message> <location line="+15"/> @@ -1054,7 +1054,7 @@ Address: %4 <translation>تعداد معاملات که تایید شده ولی هنوز در تزار جاری شما بر شمار نرفته است</translation> </message> <message> - <location filename="../overviewpage.cpp" line="+115"/> + <location filename="../overviewpage.cpp" line="+116"/> <location line="+1"/> <source>out of sync</source> <translation>روزآمد نشده</translation> @@ -1641,6 +1641,19 @@ Address: %4 </message> </context> <context> + <name>SplashScreen</name> + <message> + <location filename="../splashscreen.cpp" line="+22"/> + <source>The Bitcoin developers</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>[testnet]</source> + <translation>آزمایش شبکه</translation> + </message> +</context> +<context> <name>TransactionDesc</name> <message> <location filename="../transactiondesc.cpp" line="+20"/> @@ -2118,9 +2131,27 @@ Address: %4 </message> </context> <context> + <name>WalletModel</name> + <message> + <location filename="../walletmodel.cpp" line="+193"/> + <source>Send Coins</source> + <translation>ارسال سکه ها</translation> + </message> +</context> +<context> <name>WalletView</name> <message> - <location filename="../walletview.cpp" line="+247"/> + <location filename="../walletview.cpp" line="+42"/> + <source>&Export</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Export the data in the current tab to a file</source> + <translation>داده ها نوارِ جاری را به فایل انتقال دهید</translation> + </message> + <message> + <location line="+193"/> <source>Backup Wallet</source> <translation type="unfinished"/> </message> @@ -2153,37 +2184,37 @@ Address: %4 <context> <name>bitcoin-core</name> <message> - <location filename="../bitcoinstrings.cpp" line="+96"/> + <location filename="../bitcoinstrings.cpp" line="+94"/> <source>Bitcoin version</source> <translation>سخه بیتکویین</translation> </message> <message> - <location line="+98"/> + <location line="+102"/> <source>Usage:</source> <translation>ستفاده :</translation> </message> <message> - <location line="-25"/> + <location line="-29"/> <source>Send command to -server or bitcoind</source> <translation>ارسال فرمان به سرور یا باتکویین</translation> </message> <message> - <location line="-22"/> + <location line="-23"/> <source>List commands</source> <translation>لیست فومان ها</translation> </message> <message> - <location line="-10"/> + <location line="-12"/> <source>Get help for a command</source> <translation>کمک برای فرمان </translation> </message> <message> - <location line="+21"/> + <location line="+24"/> <source>Options:</source> <translation>تنظیمات</translation> </message> <message> - <location line="+23"/> + <location line="+24"/> <source>Specify configuration file (default: bitcoin.conf)</source> <translation>(: bitcoin.confپیش فرض: )فایل تنظیمی خاص </translation> </message> @@ -2193,27 +2224,17 @@ Address: %4 <translation>(bitcoind.pidپیش فرض : ) فایل پید خاص</translation> </message> <message> - <location line="-48"/> - <source>Generate coins</source> - <translation>سکه های تولید شده</translation> - </message> - <message> - <location line="-27"/> - <source>Don't generate coins</source> - <translation>تولید سکه ها</translation> - </message> - <message> - <location line="+74"/> + <location line="-1"/> <source>Specify data directory</source> <translation>دایرکتور اطلاعاتی خاص</translation> </message> <message> - <location line="-8"/> + <location line="-9"/> <source>Set database cache size in megabytes (default: 25)</source> <translation>سایز کَش بانک داده را بر حسب مگابایت تنظیم کنید (پیش فرض:25)</translation> </message> <message> - <location line="-27"/> + <location line="-28"/> <source>Listen for connections on <port> (default: 8333 or testnet: 18333)</source> <translation>برای اتصالات به <port> (پیشفرض: 8333 یا تستنت: 18333) گوش کنید</translation> </message> @@ -2228,7 +2249,7 @@ Address: %4 <translation>اتصال به گره برای دریافت آدرسهای قرینه و قطع اتصال</translation> </message> <message> - <location line="+80"/> + <location line="+82"/> <source>Specify your own public address</source> <translation>آدرس عمومی خود را ذکر کنید</translation> </message> @@ -2238,22 +2259,22 @@ Address: %4 <translation>آستانه برای قطع ارتباط با همکاران بدرفتار (پیشفرض: 100)</translation> </message> <message> - <location line="-132"/> + <location line="-134"/> <source>Number of seconds to keep misbehaving peers from reconnecting (default: 86400)</source> <translation>مدت زمان به ثانیه برای جلوگیری از همکاران بدرفتار برای اتصال دوباره (پیشفرض: 86400)</translation> </message> <message> - <location line="-32"/> + <location line="-29"/> <source>An error occurred while setting up the RPC port %u for listening on IPv4: %s</source> <translation>در زمان تنظیم درگاه RPX %u در فهرست کردن %s اشکالی رخ داده است</translation> </message> <message> - <location line="+30"/> + <location line="+27"/> <source>Listen for JSON-RPC connections on <port> (default: 8332 or testnet: 18332)</source> <translation>( 8332پیش فرض :) &lt;poort&gt; JSON-RPC شنوایی برای ارتباطات</translation> </message> <message> - <location line="+36"/> + <location line="+37"/> <source>Accept command line and JSON-RPC commands</source> <translation>JSON-RPC قابل فرمانها و</translation> </message> @@ -2263,17 +2284,17 @@ Address: %4 <translation>اجرای در پس زمینه به عنوان شبح و قبول فرمان ها</translation> </message> <message> - <location line="+33"/> + <location line="+37"/> <source>Use the test network</source> <translation>استفاده شبکه آزمایش</translation> </message> <message> - <location line="-108"/> + <location line="-112"/> <source>Accept connections from outside (default: 1 if no -proxy or -connect)</source> <translation>پذیرش اتصالات از بیرون (پیش فرض:1 بدون پراکسی یا اتصال)</translation> </message> <message> - <location line="-82"/> + <location line="-80"/> <source>%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. </message> <message> <location line="+3"/> - <source>Error initializing database environment %s! To recover, BACKUP THAT DIRECTORY, then remove everything from it except for wallet.dat.</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+3"/> <source>Error: The transaction was rejected! This might happen if some of the coins in your wallet were already spent, such as if you used a copy of wallet.dat and coins were spent in the copy but not marked as spent here.</source> <translation type="unfinished"/> </message> @@ -2333,12 +2349,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>حجم حداکثر تراکنشهای با/کم اهمیت را به بایت تنظیم کنید (پیش فرض:27000)</translation> </message> <message> - <location line="+3"/> - <source>Set the number of script verification threads (1-16, 0=auto, default: 0)</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+2"/> + <location line="+6"/> <source>This is a pre-release test build - use at your own risk - do not use for mining or merchant applications</source> <translation type="unfinished"/> </message> @@ -2378,7 +2389,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>بستن گزینه ایجاد</translation> </message> <message> - <location line="+6"/> + <location line="+5"/> <source>Connect only to the specified node(s)</source> <translation>تنها در گره (های) مشخص شده متصل شوید</translation> </message> @@ -2398,7 +2409,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+3"/> + <location line="+2"/> <source>Error initializing block database</source> <translation type="unfinished"/> </message> @@ -2424,11 +2435,6 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. </message> <message> <location line="+1"/> - <source>Error: Transaction creation failed!</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+1"/> <source>Error: Wallet locked, unable to create transaction!</source> <translation type="unfinished"/> </message> @@ -2498,7 +2504,12 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>قرینه ها را برای جستجوی DNS بیاب (پیش فرض: 1 مگر در زمان اتصال)</translation> </message> <message> - <location line="+3"/> + <location line="+1"/> + <source>Generate coins (default: 0)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+2"/> <source>How many blocks to check at startup (default: 288, 0 = all)</source> <translation type="unfinished"/> </message> @@ -2508,7 +2519,12 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+24"/> + <location line="+19"/> + <source>Not enough file descriptors available.</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+8"/> <source>Rebuild block chain index from current blk000??.dat files</source> <translation type="unfinished"/> </message> @@ -2518,7 +2534,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+22"/> + <location line="+26"/> <source>Verifying blocks...</source> <translation type="unfinished"/> </message> @@ -2528,12 +2544,17 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="-62"/> + <location line="-69"/> <source>Imports blocks from external blk000??.dat file</source> <translation type="unfinished"/> </message> <message> - <location line="+1"/> + <location line="-76"/> + <source>Set the number of script verification threads (up to 16, 0 = auto, <0 = leave that many cores free, default: 0)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+77"/> <source>Information</source> <translation type="unfinished"/> </message> @@ -2543,6 +2564,16 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>آدرس نرم افزار تور غلط است %s</translation> </message> <message> + <location line="+1"/> + <source>Invalid amount for -minrelaytxfee=<amount>: '%s'</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Invalid amount for -mintxfee=<amount>: '%s'</source> + <translation type="unfinished"/> + </message> + <message> <location line="+8"/> <source>Maintain a full transaction index (default: 0)</source> <translation type="unfinished"/> @@ -2558,7 +2589,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>حداکثر بافر دریافت شده بر اساس اتصال <n>* 1000 بایت (پیش فرض:1000)</translation> </message> <message> - <location line="+1"/> + <location line="+2"/> <source>Only accept block chain matching built-in checkpoints (default: 1)</source> <translation type="unfinished"/> </message> @@ -2618,6 +2649,11 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>فایل debug.log را در startup مشتری کوچک کن (پیش فرض:1 اگر اشکال زدایی روی نداد)</translation> </message> <message> + <location line="+1"/> + <source>Signing transaction failed</source> + <translation type="unfinished"/> + </message> + <message> <location line="+2"/> <source>Specify connection timeout in milliseconds (default: 5000)</source> <translation>(میلی ثانیه )فاصله ارتباط خاص</translation> @@ -2628,7 +2664,22 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+10"/> + <location line="+4"/> + <source>Transaction amount too small</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Transaction amounts must be positive</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Transaction too large</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+7"/> <source>Use UPnP to map the listening port (default: 0)</source> <translation>از UPnP برای شناسایی درگاه شنیداری استفاده کنید (پیش فرض:0)</translation> </message> @@ -2668,7 +2719,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="-46"/> + <location line="-50"/> <source>Password for JSON-RPC connections</source> <translation>JSON-RPC عبارت عبور برای ارتباطات</translation> </message> @@ -2683,17 +2734,17 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>(127.0.0.1پیش فرض: ) &lt;ip&gt; دادن فرمانها برای استفاده گره ها روی</translation> </message> <message> - <location line="-119"/> + <location line="-120"/> <source>Execute command when the best block changes (%s in cmd is replaced by block hash)</source> <translation>زمانی که بهترین بلاک تغییر کرد، دستور را اجرا کن (%s در cmd با block hash جایگزین شده است)</translation> </message> <message> - <location line="+142"/> + <location line="+147"/> <source>Upgrade wallet to latest format</source> <translation>wallet را به جدیدترین فرمت روزآمد کنید</translation> </message> <message> - <location line="-17"/> + <location line="-21"/> <source>Set key pool size to <n> (default: 100)</source> <translation> (100پیش فرض:)&lt;n&gt; گذاشتن اندازه کلید روی </translation> </message> @@ -2703,12 +2754,12 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>اسکان مجدد زنجیر بلوکها برای گم والت معامله</translation> </message> <message> - <location line="+31"/> + <location line="+35"/> <source>Use OpenSSL (https) for JSON-RPC connections</source> <translation>JSON-RPCبرای ارتباطات استفاده کنید OpenSSL (https)</translation> </message> <message> - <location line="-22"/> + <location line="-26"/> <source>Server certificate file (default: server.cert)</source> <translation> (server.certپیش فرض: )گواهی نامه سرور</translation> </message> @@ -2718,37 +2769,37 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>(server.pemپیش فرض: ) کلید خصوصی سرور</translation> </message> <message> - <location line="-153"/> + <location line="-151"/> <source>Acceptable ciphers (default: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH)</source> <translation>رمز های قابل قبول( TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH)</translation> </message> <message> - <location line="+166"/> + <location line="+165"/> <source>This help message</source> <translation>پیام کمکی</translation> </message> <message> - <location line="+3"/> + <location line="+6"/> <source>Unable to bind to %s on this computer (bind returned error %d, %s)</source> <translation>امکان اتصال به %s از این رایانه وجود ندارد ( bind returned error %d, %s)</translation> </message> <message> - <location line="-86"/> + <location line="-91"/> <source>Connect through socks proxy</source> <translation>اتصال از طریق پراکسی ساکس</translation> </message> <message> - <location line="-11"/> + <location line="-10"/> <source>Allow DNS lookups for -addnode, -seednode and -connect</source> <translation>به DNS اجازه بده تا برای addnode ، seednode و اتصال جستجو کند</translation> </message> <message> - <location line="+56"/> + <location line="+55"/> <source>Loading addresses...</source> <translation>بار گیری آدرس ها</translation> </message> <message> - <location line="-34"/> + <location line="-35"/> <source>Error loading wallet.dat: Wallet corrupted</source> <translation>خطا در بارگیری wallet.dat: کیف پول خراب شده است</translation> </message> @@ -2758,22 +2809,22 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>خطا در بارگیری wallet.dat: کیف پول به ویرایش جدیدتری از Biticon نیاز دارد</translation> </message> <message> - <location line="+87"/> + <location line="+93"/> <source>Wallet needed to be rewritten: restart Bitcoin to complete</source> <translation>سلام</translation> </message> <message> - <location line="-89"/> + <location line="-95"/> <source>Error loading wallet.dat</source> <translation>خطا در بارگیری wallet.dat</translation> </message> <message> - <location line="+29"/> + <location line="+28"/> <source>Invalid -proxy address: '%s'</source> <translation>آدرس پراکسی اشتباه %s</translation> </message> <message> - <location line="+49"/> + <location line="+56"/> <source>Unknown network specified in -onlynet: '%s'</source> <translation>شبکه مشخص شده غیرقابل شناسایی در onlynet: '%s'</translation> </message> @@ -2783,7 +2834,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>نسخه پراکسی ساکس غیرقابل شناسایی درخواست شده است: %i</translation> </message> <message> - <location line="-91"/> + <location line="-96"/> <source>Cannot resolve -bind address: '%s'</source> <translation>آدرس قابل اتصال- شناسایی نیست %s</translation> </message> @@ -2803,17 +2854,17 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>میزان وجه اشتباه</translation> </message> <message> - <location line="-4"/> + <location line="-6"/> <source>Insufficient funds</source> <translation>بود جه نا کافی </translation> </message> <message> - <location line="+8"/> + <location line="+10"/> <source>Loading block index...</source> <translation>بار گیری شاخص بلوک</translation> </message> <message> - <location line="-58"/> + <location line="-57"/> <source>Add a node to connect to and attempt to keep the connection open</source> <translation>به اتصال یک گره اضافه کنید و اتصال را باز نگاه دارید</translation> </message> @@ -2823,52 +2874,47 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>اتصال به %s از این رایانه امکان پذیر نیست. Bitcoin احتمالا در حال اجراست.</translation> </message> <message> - <location line="+67"/> + <location line="+64"/> <source>Fee per KB to add to transactions you send</source> <translation>پر داجت برای هر کیلو بیت برای اضافه به معامله ارسال</translation> </message> <message> - <location line="+17"/> + <location line="+19"/> <source>Loading wallet...</source> <translation>بار گیری والت</translation> </message> <message> - <location line="-53"/> + <location line="-52"/> <source>Cannot downgrade wallet</source> <translation>امکان تنزل نسخه در wallet وجود ندارد</translation> </message> <message> - <location line="+1"/> - <source>Cannot initialize keypool</source> - <translation>امکان مقداردهی اولیه برای key pool وجود ندارد</translation> - </message> - <message> <location line="+3"/> <source>Cannot write default address</source> <translation>آدرس پیش فرض قابل ذخیره نیست</translation> </message> <message> - <location line="+63"/> + <location line="+64"/> <source>Rescanning...</source> <translation>اسکان مجدد</translation> </message> <message> - <location line="-55"/> + <location line="-57"/> <source>Done loading</source> <translation>بار گیری انجام شده است</translation> </message> <message> - <location line="+79"/> + <location line="+82"/> <source>To use the %s option</source> <translation>برای استفاده از %s از انتخابات</translation> </message> <message> - <location line="-71"/> + <location line="-74"/> <source>Error</source> <translation>خطا</translation> </message> <message> - <location line="-33"/> + <location line="-31"/> <source>You must set rpcpassword=<password> in the configuration file: %s If the file does not exist, create it with owner-readable-only file permissions.</source> diff --git a/src/qt/locale/bitcoin_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 <translation type="unfinished"/> </message> <message> - <location filename="../aboutdialog.cpp" line="+17"/> + <location filename="../aboutdialog.cpp" line="+14"/> <source>Copyright</source> <translation type="unfinished"/> </message> <message> <location line="+0"/> - <source>2009-%1 The Bitcoin developers</source> + <source>The Bitcoin developers</source> <translation type="unfinished"/> </message> </context> @@ -61,7 +61,7 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>و آدرس جدید</translation> </message> <message> - <location filename="../addressbookpage.cpp" line="+59"/> + <location filename="../addressbookpage.cpp" line="+63"/> <source>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.</source> <translation type="unfinished"/> </message> @@ -91,7 +91,17 @@ This product includes software developed by the OpenSSL Project for use in the O <translation type="unfinished"/> </message> <message> - <location line="-14"/> + <location line="+27"/> + <source>Export the data in the current tab to a file</source> + <translation>صدور داده نوار جاری به یک فایل</translation> + </message> + <message> + <location line="+3"/> + <source>&Export</source> + <translation type="unfinished"/> + </message> + <message> + <location line="-44"/> <source>Verify a message to ensure it was signed with a specified Bitcoin address</source> <translation type="unfinished"/> </message> @@ -313,12 +323,12 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>امضا و پیام</translation> </message> <message> - <location line="+299"/> + <location line="+280"/> <source>Synchronizing with network...</source> <translation>به روز رسانی با شبکه...</translation> </message> <message> - <location line="-368"/> + <location line="-349"/> <source>&Overview</source> <translation>و بازبینی</translation> </message> @@ -393,7 +403,7 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>تغییر رمز/پَس فرِیز</translation> </message> <message> - <location line="+304"/> + <location line="+285"/> <source>Importing blocks from disk...</source> <translation type="unfinished"/> </message> @@ -403,12 +413,7 @@ This product includes software developed by the OpenSSL Project for use in the O <translation type="unfinished"/> </message> <message> - <location line="-300"/> - <source>&Export...</source> - <translation>و صدور</translation> - </message> - <message> - <location line="-66"/> + <location line="-347"/> <source>Send coins to a Bitcoin address</source> <translation type="unfinished"/> </message> @@ -418,12 +423,7 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>اصلاح انتخابها برای پیکربندی Bitcoin</translation> </message> <message> - <location line="+18"/> - <source>Export the data in the current tab to a file</source> - <translation>صدور داده نوار جاری به یک فایل</translation> - </message> - <message> - <location line="-9"/> + <location line="+9"/> <source>Backup wallet to another location</source> <translation>گرفتن نسخه پیشتیبان در آدرسی دیگر</translation> </message> @@ -433,7 +433,7 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>رمز مربوط به رمزگذاریِ wallet را تغییر دهید</translation> </message> <message> - <location line="+9"/> + <location line="+6"/> <source>&Debug window</source> <translation type="unfinished"/> </message> @@ -443,23 +443,23 @@ This product includes software developed by the OpenSSL Project for use in the O <translation type="unfinished"/> </message> <message> - <location line="-7"/> + <location line="-4"/> <source>&Verify message...</source> <translation type="unfinished"/> </message> <message> - <location line="-163"/> - <location line="+541"/> + <location line="-165"/> + <location line="+530"/> <source>Bitcoin</source> <translation>bitcoin</translation> </message> <message> - <location line="-541"/> + <location line="-530"/> <source>Wallet</source> <translation>کیف پول</translation> </message> <message> - <location line="+99"/> + <location line="+101"/> <source>&Send</source> <translation type="unfinished"/> </message> @@ -504,12 +504,12 @@ This product includes software developed by the OpenSSL Project for use in the O <translation type="unfinished"/> </message> <message> - <location line="+31"/> + <location line="+28"/> <source>&File</source> <translation>و فایل</translation> </message> <message> - <location line="+8"/> + <location line="+7"/> <source>&Settings</source> <translation>و تنظیمات</translation> </message> @@ -524,12 +524,7 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>نوار ابزار</translation> </message> <message> - <location line="+8"/> - <source>Actions toolbar</source> - <translation>نوار عملیات</translation> - </message> - <message> - <location line="+13"/> + <location line="+17"/> <location line="+10"/> <source>[testnet]</source> <translation>[testnet]</translation> @@ -540,13 +535,18 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>مشتری bitcoin</translation> </message> <message numerus="yes"> - <location line="+140"/> + <location line="+141"/> <source>%n active connection(s) to Bitcoin network</source> <translation><numerusform>%n ارتباط فعال به شبکه Bitcoin %n ارتباط فعال به شبکه Bitcoin</numerusform></translation> </message> <message> - <location line="+39"/> + <location line="+22"/> + <source>No block source available...</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+12"/> <source>Processed %1 of %2 (estimated) blocks of transaction history.</source> <translation type="unfinished"/> </message> @@ -571,7 +571,7 @@ This product includes software developed by the OpenSSL Project for use in the O <translation type="unfinished"><numerusform></numerusform></translation> </message> <message> - <location line="+5"/> + <location line="+4"/> <source>%1 behind</source> <translation type="unfinished"/> </message> @@ -586,7 +586,7 @@ This product includes software developed by the OpenSSL Project for use in the O <translation type="unfinished"/> </message> <message> - <location line="+21"/> + <location line="+22"/> <source>Error</source> <translation type="unfinished"/> </message> @@ -601,22 +601,22 @@ This product includes software developed by the OpenSSL Project for use in the O <translation type="unfinished"/> </message> <message> - <location line="+68"/> + <location line="+70"/> <source>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?</source> <translation type="unfinished"/> </message> <message> - <location line="-138"/> + <location line="-140"/> <source>Up to date</source> <translation>روزآمد</translation> </message> <message> - <location line="+32"/> + <location line="+31"/> <source>Catching up...</source> <translation>در حال روزآمد سازی..</translation> </message> <message> - <location line="+110"/> + <location line="+113"/> <source>Confirm transaction fee</source> <translation type="unfinished"/> </message> @@ -663,7 +663,7 @@ Address: %4 <translation>wallet رمزگذاری شد و در حال حاضر قفل است</translation> </message> <message> - <location filename="../bitcoin.cpp" line="+104"/> + <location filename="../bitcoin.cpp" line="+111"/> <source>A fatal error occurred. Bitcoin can no longer continue safely and will quit.</source> <translation type="unfinished"/> </message> @@ -671,7 +671,7 @@ Address: %4 <context> <name>ClientModel</name> <message> - <location filename="../clientmodel.cpp" line="+98"/> + <location filename="../clientmodel.cpp" line="+104"/> <source>Network Alert</source> <translation>هشدار شبکه</translation> </message> @@ -802,7 +802,7 @@ Address: %4 </message> <message> <location line="+6"/> - <source>Optional transaction fee per kB that helps make sure your transactions are processed quickly. Most transactions are 1 kB. Fee 0.01 recommended.</source> + <source>Optional transaction fee per kB that helps make sure your transactions are processed quickly. Most transactions are 1 kB.</source> <translation type="unfinished"/> </message> <message> @@ -1052,7 +1052,7 @@ Address: %4 <translation>تعداد تراکنشهایی که نیاز به تایید دارند و هنوز در مانده حساب جاری شما به حساب نیامده اند</translation> </message> <message> - <location filename="../overviewpage.cpp" line="+115"/> + <location filename="../overviewpage.cpp" line="+116"/> <location line="+1"/> <source>out of sync</source> <translation>خارج از روزآمد سازی</translation> @@ -1640,6 +1640,19 @@ Address: %4 </message> </context> <context> + <name>SplashScreen</name> + <message> + <location filename="../splashscreen.cpp" line="+22"/> + <source>The Bitcoin developers</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>[testnet]</source> + <translation>[testnet]</translation> + </message> +</context> +<context> <name>TransactionDesc</name> <message> <location filename="../transactiondesc.cpp" line="+20"/> @@ -2114,9 +2127,27 @@ Address: %4 </message> </context> <context> + <name>WalletModel</name> + <message> + <location filename="../walletmodel.cpp" line="+193"/> + <source>Send Coins</source> + <translation>سکه های ارسالی</translation> + </message> +</context> +<context> <name>WalletView</name> <message> - <location filename="../walletview.cpp" line="+247"/> + <location filename="../walletview.cpp" line="+42"/> + <source>&Export</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Export the data in the current tab to a file</source> + <translation>صدور داده نوار جاری به یک فایل</translation> + </message> + <message> + <location line="+193"/> <source>Backup Wallet</source> <translation type="unfinished"/> </message> @@ -2149,37 +2180,37 @@ Address: %4 <context> <name>bitcoin-core</name> <message> - <location filename="../bitcoinstrings.cpp" line="+96"/> + <location filename="../bitcoinstrings.cpp" line="+94"/> <source>Bitcoin version</source> <translation>نسخه bitcoin</translation> </message> <message> - <location line="+98"/> + <location line="+102"/> <source>Usage:</source> <translation>میزان استفاده:</translation> </message> <message> - <location line="-25"/> + <location line="-29"/> <source>Send command to -server or bitcoind</source> <translation>ارسال دستور به سرور یا bitcoined</translation> </message> <message> - <location line="-22"/> + <location line="-23"/> <source>List commands</source> <translation>فهرست دستورها</translation> </message> <message> - <location line="-10"/> + <location line="-12"/> <source>Get help for a command</source> <translation>درخواست کمک برای یک دستور</translation> </message> <message> - <location line="+21"/> + <location line="+24"/> <source>Options:</source> <translation>انتخابها:</translation> </message> <message> - <location line="+23"/> + <location line="+24"/> <source>Specify configuration file (default: bitcoin.conf)</source> <translation>فایل پیکربندیِ را مشخص کنید (پیش فرض: bitcoin.conf)</translation> </message> @@ -2189,27 +2220,17 @@ Address: %4 <translation>فایل pid را مشخص کنید (پیش فرض: bitcoind.pid)</translation> </message> <message> - <location line="-48"/> - <source>Generate coins</source> - <translation>سکه ها را تولید کن</translation> - </message> - <message> - <location line="-27"/> - <source>Don't generate coins</source> - <translation>سکه ها را تولید نکن</translation> - </message> - <message> - <location line="+74"/> + <location line="-1"/> <source>Specify data directory</source> <translation>دایرکتوری داده را مشخص کن</translation> </message> <message> - <location line="-8"/> + <location line="-9"/> <source>Set database cache size in megabytes (default: 25)</source> <translation>حافظه بانک داده را به مگابایت تنظیم کنید (پیش فرض: 25)</translation> </message> <message> - <location line="-27"/> + <location line="-28"/> <source>Listen for connections on <port> (default: 8333 or testnet: 18333)</source> <translation>ارتباطات را در <PORT> بشنوید (پیش فرض: 8333 or testnet: 18333)</translation> </message> @@ -2224,7 +2245,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+80"/> + <location line="+82"/> <source>Specify your own public address</source> <translation type="unfinished"/> </message> @@ -2234,22 +2255,22 @@ Address: %4 <translation>آستانه قطع برای قرینه سازی اشتباه (پیش فرض:100)</translation> </message> <message> - <location line="-132"/> + <location line="-134"/> <source>Number of seconds to keep misbehaving peers from reconnecting (default: 86400)</source> <translation>تعداد ثانیه ها برای اتصال دوباره قرینه های اشتباه (پیش فرض:86400)</translation> </message> <message> - <location line="-32"/> + <location line="-29"/> <source>An error occurred while setting up the RPC port %u for listening on IPv4: %s</source> <translation type="unfinished"/> </message> <message> - <location line="+30"/> + <location line="+27"/> <source>Listen for JSON-RPC connections on <port> (default: 8332 or testnet: 18332)</source> <translation>ارتباطاتِ JSON-RPC را در <port> گوش کنید (پیش فرض:8332)</translation> </message> <message> - <location line="+36"/> + <location line="+37"/> <source>Accept command line and JSON-RPC commands</source> <translation>command line و JSON-RPC commands را قبول کنید</translation> </message> @@ -2259,17 +2280,17 @@ Address: %4 <translation>به عنوان daemon بک گراند را اجرا کنید و دستورات را قبول نمایید</translation> </message> <message> - <location line="+33"/> + <location line="+37"/> <source>Use the test network</source> <translation>از تستِ شبکه استفاده نمایید</translation> </message> <message> - <location line="-108"/> + <location line="-112"/> <source>Accept connections from outside (default: 1 if no -proxy or -connect)</source> <translation type="unfinished"/> </message> <message> - <location line="-82"/> + <location line="-80"/> <source>%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. </message> <message> <location line="+3"/> - <source>Error initializing database environment %s! To recover, BACKUP THAT DIRECTORY, then remove everything from it except for wallet.dat.</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+3"/> <source>Error: The transaction was rejected! This might happen if some of the coins in your wallet were already spent, such as if you used a copy of wallet.dat and coins were spent in the copy but not marked as spent here.</source> <translation type="unfinished"/> </message> @@ -2329,12 +2345,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+3"/> - <source>Set the number of script verification threads (1-16, 0=auto, default: 0)</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+2"/> + <location line="+6"/> <source>This is a pre-release test build - use at your own risk - do not use for mining or merchant applications</source> <translation type="unfinished"/> </message> @@ -2374,7 +2385,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+6"/> + <location line="+5"/> <source>Connect only to the specified node(s)</source> <translation type="unfinished"/> </message> @@ -2394,7 +2405,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+3"/> + <location line="+2"/> <source>Error initializing block database</source> <translation type="unfinished"/> </message> @@ -2420,11 +2431,6 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. </message> <message> <location line="+1"/> - <source>Error: Transaction creation failed!</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+1"/> <source>Error: Wallet locked, unable to create transaction!</source> <translation type="unfinished"/> </message> @@ -2494,7 +2500,12 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+3"/> + <location line="+1"/> + <source>Generate coins (default: 0)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+2"/> <source>How many blocks to check at startup (default: 288, 0 = all)</source> <translation type="unfinished"/> </message> @@ -2504,7 +2515,12 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+24"/> + <location line="+19"/> + <source>Not enough file descriptors available.</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+8"/> <source>Rebuild block chain index from current blk000??.dat files</source> <translation type="unfinished"/> </message> @@ -2514,7 +2530,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+22"/> + <location line="+26"/> <source>Verifying blocks...</source> <translation type="unfinished"/> </message> @@ -2524,12 +2540,17 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="-62"/> + <location line="-69"/> <source>Imports blocks from external blk000??.dat file</source> <translation type="unfinished"/> </message> <message> - <location line="+1"/> + <location line="-76"/> + <source>Set the number of script verification threads (up to 16, 0 = auto, <0 = leave that many cores free, default: 0)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+77"/> <source>Information</source> <translation type="unfinished"/> </message> @@ -2539,6 +2560,16 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> + <location line="+1"/> + <source>Invalid amount for -minrelaytxfee=<amount>: '%s'</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Invalid amount for -mintxfee=<amount>: '%s'</source> + <translation type="unfinished"/> + </message> + <message> <location line="+8"/> <source>Maintain a full transaction index (default: 0)</source> <translation type="unfinished"/> @@ -2554,7 +2585,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+1"/> + <location line="+2"/> <source>Only accept block chain matching built-in checkpoints (default: 1)</source> <translation type="unfinished"/> </message> @@ -2614,6 +2645,11 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> + <location line="+1"/> + <source>Signing transaction failed</source> + <translation type="unfinished"/> + </message> + <message> <location line="+2"/> <source>Specify connection timeout in milliseconds (default: 5000)</source> <translation>تعیین مدت زمان وقفه (time out) به هزارم ثانیه</translation> @@ -2624,7 +2660,22 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+10"/> + <location line="+4"/> + <source>Transaction amount too small</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Transaction amounts must be positive</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Transaction too large</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+7"/> <source>Use UPnP to map the listening port (default: 0)</source> <translation type="unfinished"/> </message> @@ -2664,7 +2715,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="-46"/> + <location line="-50"/> <source>Password for JSON-RPC connections</source> <translation>رمز برای ارتباطاتِ JSON-RPC</translation> </message> @@ -2679,17 +2730,17 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>دستورات را به گره اجرا شده در<ip> ارسال کنید (پیش فرض:127.0.0.1)</translation> </message> <message> - <location line="-119"/> + <location line="-120"/> <source>Execute command when the best block changes (%s in cmd is replaced by block hash)</source> <translation>دستور را وقتی بهترین بلاک تغییر کرد اجرا کن (%s در دستور توسط block hash جایگزین شده است)</translation> </message> <message> - <location line="+142"/> + <location line="+147"/> <source>Upgrade wallet to latest format</source> <translation>wallet را به جدیدترین نسخه روزآمد کنید</translation> </message> <message> - <location line="-17"/> + <location line="-21"/> <source>Set key pool size to <n> (default: 100)</source> <translation>حجم key pool را به اندازه <n> تنظیم کنید (پیش فرض:100)</translation> </message> @@ -2699,12 +2750,12 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>زنجیره بلاک را برای تراکنش جا افتاده در WALLET دوباره اسکن کنید</translation> </message> <message> - <location line="+31"/> + <location line="+35"/> <source>Use OpenSSL (https) for JSON-RPC connections</source> <translation>برای ارتباطاتِ JSON-RPC از OpenSSL (https) استفاده کنید</translation> </message> <message> - <location line="-22"/> + <location line="-26"/> <source>Server certificate file (default: server.cert)</source> <translation>فایل certificate سرور (پیش فرض server.cert)</translation> </message> @@ -2714,37 +2765,37 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>رمز اختصاصی سرور (پیش فرض: server.pem)</translation> </message> <message> - <location line="-153"/> + <location line="-151"/> <source>Acceptable ciphers (default: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH)</source> <translation>ciphers قابل قبول (پیش فرض: default: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH)</translation> </message> <message> - <location line="+166"/> + <location line="+165"/> <source>This help message</source> <translation>این پیام راهنما</translation> </message> <message> - <location line="+3"/> + <location line="+6"/> <source>Unable to bind to %s on this computer (bind returned error %d, %s)</source> <translation type="unfinished"/> </message> <message> - <location line="-86"/> + <location line="-91"/> <source>Connect through socks proxy</source> <translation type="unfinished"/> </message> <message> - <location line="-11"/> + <location line="-10"/> <source>Allow DNS lookups for -addnode, -seednode and -connect</source> <translation type="unfinished"/> </message> <message> - <location line="+56"/> + <location line="+55"/> <source>Loading addresses...</source> <translation>لود شدن آدرسها..</translation> </message> <message> - <location line="-34"/> + <location line="-35"/> <source>Error loading wallet.dat: Wallet corrupted</source> <translation>خطا در هنگام لود شدن wallet.dat: Wallet corrupted</translation> </message> @@ -2754,22 +2805,22 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>خطا در هنگام لود شدن wallet.dat. به نسخه جدید Bitocin برای wallet نیاز است.</translation> </message> <message> - <location line="+87"/> + <location line="+93"/> <source>Wallet needed to be rewritten: restart Bitcoin to complete</source> <translation>wallet نیاز به بازنویسی دارد. Bitcoin را برای تکمیل عملیات دوباره اجرا کنید.</translation> </message> <message> - <location line="-89"/> + <location line="-95"/> <source>Error loading wallet.dat</source> <translation>خطا در هنگام لود شدن wallet.dat</translation> </message> <message> - <location line="+29"/> + <location line="+28"/> <source>Invalid -proxy address: '%s'</source> <translation type="unfinished"/> </message> <message> - <location line="+49"/> + <location line="+56"/> <source>Unknown network specified in -onlynet: '%s'</source> <translation type="unfinished"/> </message> @@ -2779,7 +2830,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="-91"/> + <location line="-96"/> <source>Cannot resolve -bind address: '%s'</source> <translation type="unfinished"/> </message> @@ -2799,17 +2850,17 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>میزان اشتباه است</translation> </message> <message> - <location line="-4"/> + <location line="-6"/> <source>Insufficient funds</source> <translation>وجوه ناکافی</translation> </message> <message> - <location line="+8"/> + <location line="+10"/> <source>Loading block index...</source> <translation>لود شدن نمایه بلاکها..</translation> </message> <message> - <location line="-58"/> + <location line="-57"/> <source>Add a node to connect to and attempt to keep the connection open</source> <translation>یک گره برای اتصال اضافه کنید و تلاش کنید تا اتصال را باز نگاه دارید</translation> </message> @@ -2819,52 +2870,47 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+67"/> + <location line="+64"/> <source>Fee per KB to add to transactions you send</source> <translation>هزینه بر اساس کیلو بایت برای اضافه شدن به تراکنشی که ارسال کرده اید</translation> </message> <message> - <location line="+17"/> + <location line="+19"/> <source>Loading wallet...</source> <translation>wallet در حال لود شدن است...</translation> </message> <message> - <location line="-53"/> + <location line="-52"/> <source>Cannot downgrade wallet</source> <translation>قابلیت برگشت به نسخه قبلی برای wallet امکان پذیر نیست</translation> </message> <message> - <location line="+1"/> - <source>Cannot initialize keypool</source> - <translation>initialize keypool امکان پذیر نیست</translation> - </message> - <message> <location line="+3"/> <source>Cannot write default address</source> <translation>آدرس پیش فرض قابل ذخیره نیست</translation> </message> <message> - <location line="+63"/> + <location line="+64"/> <source>Rescanning...</source> <translation>اسکنِ دوباره...</translation> </message> <message> - <location line="-55"/> + <location line="-57"/> <source>Done loading</source> <translation>اتمام لود شدن</translation> </message> <message> - <location line="+79"/> + <location line="+82"/> <source>To use the %s option</source> <translation>برای استفاده از %s از اختیارات</translation> </message> <message> - <location line="-71"/> + <location line="-74"/> <source>Error</source> <translation>خطا</translation> </message> <message> - <location line="-33"/> + <location line="-31"/> <source>You must set rpcpassword=<password> in the configuration file: %s If the file does not exist, create it with owner-readable-only file permissions.</source> diff --git a/src/qt/locale/bitcoin_fi.ts b/src/qt/locale/bitcoin_fi.ts index 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 </translation> </message> <message> - <location filename="../aboutdialog.cpp" line="+17"/> + <location filename="../aboutdialog.cpp" line="+14"/> <source>Copyright</source> <translation>Tekijänoikeus</translation> </message> <message> <location line="+0"/> - <source>2009-%1 The Bitcoin developers</source> - <translation>2009-%1 Bittirahan kehittäjät</translation> + <source>The Bitcoin developers</source> + <translation type="unfinished"/> </message> </context> <context> @@ -67,7 +67,7 @@ Tämä ohjelma sisältää OpenSSL projektin OpenSSL työkalupakin (http://www.o <translation>&Uusi Osoite</translation> </message> <message> - <location filename="../addressbookpage.cpp" line="+59"/> + <location filename="../addressbookpage.cpp" line="+63"/> <source>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.</source> <translation>Nämä ovat Bitcoin-osoitteesi joihin voit vastaanottaa maksuja. Voit haluta antaa jokaiselle maksajalle omansa, että pystyt seuraamaan keneltä maksut tulevat.</translation> </message> @@ -97,7 +97,17 @@ Tämä ohjelma sisältää OpenSSL projektin OpenSSL työkalupakin (http://www.o <translation>Poista valittu osoite listalta</translation> </message> <message> - <location line="-14"/> + <location line="+27"/> + <source>Export the data in the current tab to a file</source> + <translation>Vie auki olevan välilehden tiedot tiedostoon</translation> + </message> + <message> + <location line="+3"/> + <source>&Export</source> + <translation type="unfinished"/> + </message> + <message> + <location line="-44"/> <source>Verify a message to ensure it was signed with a specified Bitcoin address</source> <translation>Tarkista viestin allekirjoitus varmistaaksesi, että se allekirjoitettiin tietyllä Bitcoin-osoitteella</translation> </message> @@ -319,12 +329,12 @@ Tämä ohjelma sisältää OpenSSL projektin OpenSSL työkalupakin (http://www.o <translation>&Allekirjoita viesti...</translation> </message> <message> - <location line="+299"/> + <location line="+280"/> <source>Synchronizing with network...</source> <translation>Synkronoidaan verkon kanssa...</translation> </message> <message> - <location line="-368"/> + <location line="-349"/> <source>&Overview</source> <translation>&Yleisnäkymä</translation> </message> @@ -399,7 +409,7 @@ Tämä ohjelma sisältää OpenSSL projektin OpenSSL työkalupakin (http://www.o <translation>&Vaihda Tunnuslause...</translation> </message> <message> - <location line="+304"/> + <location line="+285"/> <source>Importing blocks from disk...</source> <translation>Tuodaan lohkoja levyltä</translation> </message> @@ -409,12 +419,7 @@ Tämä ohjelma sisältää OpenSSL projektin OpenSSL työkalupakin (http://www.o <translation>Ladataan lohkoindeksiä...</translation> </message> <message> - <location line="-300"/> - <source>&Export...</source> - <translation>&Vie...</translation> - </message> - <message> - <location line="-66"/> + <location line="-347"/> <source>Send coins to a Bitcoin address</source> <translation>Lähetä kolikoita Bitcoin-osoitteeseen</translation> </message> @@ -424,12 +429,7 @@ Tämä ohjelma sisältää OpenSSL projektin OpenSSL työkalupakin (http://www.o <translation>Muuta Bitcoinin konfiguraatioasetuksia</translation> </message> <message> - <location line="+18"/> - <source>Export the data in the current tab to a file</source> - <translation>Vie auki olevan välilehden tiedot tiedostoon</translation> - </message> - <message> - <location line="-9"/> + <location line="+9"/> <source>Backup wallet to another location</source> <translation>Varmuuskopioi lompakko toiseen sijaintiin</translation> </message> @@ -439,7 +439,7 @@ Tämä ohjelma sisältää OpenSSL projektin OpenSSL työkalupakin (http://www.o <translation>Vaihda lompakon salaukseen käytettävä tunnuslause</translation> </message> <message> - <location line="+9"/> + <location line="+6"/> <source>&Debug window</source> <translation>&Testausikkuna</translation> </message> @@ -449,23 +449,23 @@ Tämä ohjelma sisältää OpenSSL projektin OpenSSL työkalupakin (http://www.o <translation>Avaa debuggaus- ja diagnostiikkakonsoli</translation> </message> <message> - <location line="-7"/> + <location line="-4"/> <source>&Verify message...</source> <translation>Varmista &viesti...</translation> </message> <message> - <location line="-163"/> - <location line="+541"/> + <location line="-165"/> + <location line="+530"/> <source>Bitcoin</source> <translation>Bitcoin</translation> </message> <message> - <location line="-541"/> + <location line="-530"/> <source>Wallet</source> <translation>Lompakko</translation> </message> <message> - <location line="+99"/> + <location line="+101"/> <source>&Send</source> <translation>&Lähetä</translation> </message> @@ -510,12 +510,12 @@ Tämä ohjelma sisältää OpenSSL projektin OpenSSL työkalupakin (http://www.o <translation>Varmista, että viestisi on allekirjoitettu määritetyllä Bitcoin -osoitteella</translation> </message> <message> - <location line="+31"/> + <location line="+28"/> <source>&File</source> <translation>&Tiedosto</translation> </message> <message> - <location line="+8"/> + <location line="+7"/> <source>&Settings</source> <translation>&Asetukset</translation> </message> @@ -530,12 +530,7 @@ Tämä ohjelma sisältää OpenSSL projektin OpenSSL työkalupakin (http://www.o <translation>Välilehtipalkki</translation> </message> <message> - <location line="+8"/> - <source>Actions toolbar</source> - <translation>Toimintopalkki</translation> - </message> - <message> - <location line="+13"/> + <location line="+17"/> <location line="+10"/> <source>[testnet]</source> <translation>[testnet]</translation> @@ -546,12 +541,17 @@ Tämä ohjelma sisältää OpenSSL projektin OpenSSL työkalupakin (http://www.o <translation>Bitcoin-asiakas</translation> </message> <message numerus="yes"> - <location line="+140"/> + <location line="+141"/> <source>%n active connection(s) to Bitcoin network</source> <translation><numerusform>%n aktiivinen yhteys Bitcoin-verkkoon</numerusform><numerusform>%n aktiivista yhteyttä Bitcoin-verkkoon</numerusform></translation> </message> <message> - <location line="+39"/> + <location line="+22"/> + <source>No block source available...</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+12"/> <source>Processed %1 of %2 (estimated) blocks of transaction history.</source> <translation type="unfinished"/> </message> @@ -576,7 +576,7 @@ Tämä ohjelma sisältää OpenSSL projektin OpenSSL työkalupakin (http://www.o <translation><numerusform>%n viikko</numerusform><numerusform>%n viikkoa</numerusform></translation> </message> <message> - <location line="+5"/> + <location line="+4"/> <source>%1 behind</source> <translation type="unfinished"/> </message> @@ -591,7 +591,7 @@ Tämä ohjelma sisältää OpenSSL projektin OpenSSL työkalupakin (http://www.o <translation type="unfinished"/> </message> <message> - <location line="+21"/> + <location line="+22"/> <source>Error</source> <translation>Virhe</translation> </message> @@ -606,22 +606,22 @@ Tämä ohjelma sisältää OpenSSL projektin OpenSSL työkalupakin (http://www.o <translation>Tietoa</translation> </message> <message> - <location line="+68"/> + <location line="+70"/> <source>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?</source> <translation type="unfinished"/> </message> <message> - <location line="-138"/> + <location line="-140"/> <source>Up to date</source> <translation>Rahansiirtohistoria on ajan tasalla</translation> </message> <message> - <location line="+32"/> + <location line="+31"/> <source>Catching up...</source> <translation>Saavutetaan verkkoa...</translation> </message> <message> - <location line="+110"/> + <location line="+113"/> <source>Confirm transaction fee</source> <translation>Vahvista maksukulu</translation> </message> @@ -670,7 +670,7 @@ Osoite: %4</translation> <translation>Lompakko on <b>salattu</b> ja tällä hetkellä <b>lukittuna</b></translation> </message> <message> - <location filename="../bitcoin.cpp" line="+104"/> + <location filename="../bitcoin.cpp" line="+111"/> <source>A fatal error occurred. Bitcoin can no longer continue safely and will quit.</source> <translation>Peruuttamaton virhe on tapahtunut. Bitcoin ei voi enää jatkaa turvallisesti ja sammutetaan.</translation> </message> @@ -678,7 +678,7 @@ Osoite: %4</translation> <context> <name>ClientModel</name> <message> - <location filename="../clientmodel.cpp" line="+98"/> + <location filename="../clientmodel.cpp" line="+104"/> <source>Network Alert</source> <translation>Verkkohälytys</translation> </message> @@ -809,8 +809,8 @@ Osoite: %4</translation> </message> <message> <location line="+6"/> - <source>Optional transaction fee per kB that helps make sure your transactions are processed quickly. Most transactions are 1 kB. Fee 0.01 recommended.</source> - <translation>Vapaaehtoinen rahansiirtopalkkio per kB auttaa nopeuttamaan siirtoja. Useimmat rahansiirrot ovat 1 kB. 0.01 palkkio on suositeltava.</translation> + <source>Optional transaction fee per kB that helps make sure your transactions are processed quickly. Most transactions are 1 kB.</source> + <translation type="unfinished"/> </message> <message> <location line="+15"/> @@ -1059,7 +1059,7 @@ Osoite: %4</translation> <translation>Niiden saapuvien rahansiirtojen määrä, joita Bitcoin-verkko ei vielä ole ehtinyt vahvistaa ja siten eivät vielä näy saldossa.</translation> </message> <message> - <location filename="../overviewpage.cpp" line="+115"/> + <location filename="../overviewpage.cpp" line="+116"/> <location line="+1"/> <source>out of sync</source> <translation>Ei ajan tasalla</translation> @@ -1646,6 +1646,19 @@ Osoite: %4</translation> </message> </context> <context> + <name>SplashScreen</name> + <message> + <location filename="../splashscreen.cpp" line="+22"/> + <source>The Bitcoin developers</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>[testnet]</source> + <translation>[testnet]</translation> + </message> +</context> +<context> <name>TransactionDesc</name> <message> <location filename="../transactiondesc.cpp" line="+20"/> @@ -2120,9 +2133,27 @@ Osoite: %4</translation> </message> </context> <context> + <name>WalletModel</name> + <message> + <location filename="../walletmodel.cpp" line="+193"/> + <source>Send Coins</source> + <translation>Lähetä Bitcoineja</translation> + </message> +</context> +<context> <name>WalletView</name> <message> - <location filename="../walletview.cpp" line="+247"/> + <location filename="../walletview.cpp" line="+42"/> + <source>&Export</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Export the data in the current tab to a file</source> + <translation>Vie auki olevan välilehden tiedot tiedostoon</translation> + </message> + <message> + <location line="+193"/> <source>Backup Wallet</source> <translation type="unfinished"/> </message> @@ -2155,37 +2186,37 @@ Osoite: %4</translation> <context> <name>bitcoin-core</name> <message> - <location filename="../bitcoinstrings.cpp" line="+96"/> + <location filename="../bitcoinstrings.cpp" line="+94"/> <source>Bitcoin version</source> <translation>Bitcoinin versio</translation> </message> <message> - <location line="+98"/> + <location line="+102"/> <source>Usage:</source> <translation>Käyttö:</translation> </message> <message> - <location line="-25"/> + <location line="-29"/> <source>Send command to -server or bitcoind</source> <translation>Lähetä käsky palvelimelle tai bitcoind:lle</translation> </message> <message> - <location line="-22"/> + <location line="-23"/> <source>List commands</source> <translation>Lista komennoista</translation> </message> <message> - <location line="-10"/> + <location line="-12"/> <source>Get help for a command</source> <translation>Hanki apua käskyyn</translation> </message> <message> - <location line="+21"/> + <location line="+24"/> <source>Options:</source> <translation>Asetukset:</translation> </message> <message> - <location line="+23"/> + <location line="+24"/> <source>Specify configuration file (default: bitcoin.conf)</source> <translation>Määritä asetustiedosto (oletus: bitcoin.conf)</translation> </message> @@ -2195,27 +2226,17 @@ Osoite: %4</translation> <translation>Määritä pid-tiedosto (oletus: bitcoin.pid)</translation> </message> <message> - <location line="-48"/> - <source>Generate coins</source> - <translation>Generoi kolikoita</translation> - </message> - <message> - <location line="-27"/> - <source>Don't generate coins</source> - <translation>Älä generoi kolikoita</translation> - </message> - <message> - <location line="+74"/> + <location line="-1"/> <source>Specify data directory</source> <translation>Määritä data-hakemisto</translation> </message> <message> - <location line="-8"/> + <location line="-9"/> <source>Set database cache size in megabytes (default: 25)</source> <translation>Aseta tietokannan välimuistin koko megatavuina (oletus: 25)</translation> </message> <message> - <location line="-27"/> + <location line="-28"/> <source>Listen for connections on <port> (default: 8333 or testnet: 18333)</source> <translation>Kuuntele yhteyksiä portista <port> (oletus: 8333 tai testnet: 18333)</translation> </message> @@ -2230,7 +2251,7 @@ Osoite: %4</translation> <translation>Yhdistä noodiin hakeaksesi naapurien osoitteet ja katkaise yhteys</translation> </message> <message> - <location line="+80"/> + <location line="+82"/> <source>Specify your own public address</source> <translation>Määritä julkinen osoitteesi</translation> </message> @@ -2240,22 +2261,22 @@ Osoite: %4</translation> <translation>Kynnysarvo aikakatkaisulle heikosti toimiville verkoille (oletus: 100)</translation> </message> <message> - <location line="-132"/> + <location line="-134"/> <source>Number of seconds to keep misbehaving peers from reconnecting (default: 86400)</source> <translation>Sekuntien määrä, kuinka kauan uudelleenkytkeydytään verkkoihin (oletus: 86400)</translation> </message> <message> - <location line="-32"/> + <location line="-29"/> <source>An error occurred while setting up the RPC port %u for listening on IPv4: %s</source> <translation>Virhe valmisteltaessa RPC-portin %u avaamista kuunneltavaksi: %s</translation> </message> <message> - <location line="+30"/> + <location line="+27"/> <source>Listen for JSON-RPC connections on <port> (default: 8332 or testnet: 18332)</source> <translation>Kuuntele JSON-RPC -yhteyksiä portista <port> (oletus: 8332 or testnet: 18332)</translation> </message> <message> - <location line="+36"/> + <location line="+37"/> <source>Accept command line and JSON-RPC commands</source> <translation>Hyväksy merkkipohjaiset- ja JSON-RPC-käskyt</translation> </message> @@ -2265,17 +2286,17 @@ Osoite: %4</translation> <translation>Aja taustalla daemonina ja hyväksy komennot</translation> </message> <message> - <location line="+33"/> + <location line="+37"/> <source>Use the test network</source> <translation>Käytä test -verkkoa</translation> </message> <message> - <location line="-108"/> + <location line="-112"/> <source>Accept connections from outside (default: 1 if no -proxy or -connect)</source> <translation>Hyväksy yhteyksiä ulkopuolelta (vakioasetus: 1 jos -proxy tai -connect ei määritelty)</translation> </message> <message> - <location line="-82"/> + <location line="-80"/> <source>%s, you must set a rpcpassword in the configuration file: %s It is recommended you use the following random password: @@ -2306,11 +2327,6 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. </message> <message> <location line="+3"/> - <source>Error initializing database environment %s! To recover, BACKUP THAT DIRECTORY, then remove everything from it except for wallet.dat.</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+3"/> <source>Error: The transaction was rejected! This might happen if some of the coins in your wallet were already spent, such as if you used a copy of wallet.dat and coins were spent in the copy but not marked as spent here.</source> <translation type="unfinished"/> </message> @@ -2335,12 +2351,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Aseta suurin korkean prioriteetin / matalan palkkion siirron koko tavuissa (vakioasetus: 27000)</translation> </message> <message> - <location line="+3"/> - <source>Set the number of script verification threads (1-16, 0=auto, default: 0)</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+2"/> + <location line="+6"/> <source>This is a pre-release test build - use at your own risk - do not use for mining or merchant applications</source> <translation type="unfinished"/> </message> @@ -2380,7 +2391,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Lohkon luonnin asetukset:</translation> </message> <message> - <location line="+6"/> + <location line="+5"/> <source>Connect only to the specified node(s)</source> <translation>Yhidstä ainoastaan määrättyihin noodeihin</translation> </message> @@ -2400,7 +2411,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+3"/> + <location line="+2"/> <source>Error initializing block database</source> <translation type="unfinished"/> </message> @@ -2426,11 +2437,6 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. </message> <message> <location line="+1"/> - <source>Error: Transaction creation failed!</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+1"/> <source>Error: Wallet locked, unable to create transaction!</source> <translation type="unfinished"/> </message> @@ -2500,7 +2506,12 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Hae naapureita DNS hauilla (vakioasetus: 1 paitsi jos -connect)</translation> </message> <message> - <location line="+3"/> + <location line="+1"/> + <source>Generate coins (default: 0)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+2"/> <source>How many blocks to check at startup (default: 288, 0 = all)</source> <translation type="unfinished"/> </message> @@ -2510,7 +2521,12 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+24"/> + <location line="+19"/> + <source>Not enough file descriptors available.</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+8"/> <source>Rebuild block chain index from current blk000??.dat files</source> <translation type="unfinished"/> </message> @@ -2520,7 +2536,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+22"/> + <location line="+26"/> <source>Verifying blocks...</source> <translation type="unfinished"/> </message> @@ -2530,12 +2546,17 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="-62"/> + <location line="-69"/> <source>Imports blocks from external blk000??.dat file</source> <translation>Tuodaan lohkoja ulkoisesta blk000??.dat tiedostosta</translation> </message> <message> - <location line="+1"/> + <location line="-76"/> + <source>Set the number of script verification threads (up to 16, 0 = auto, <0 = leave that many cores free, default: 0)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+77"/> <source>Information</source> <translation>Tietoa</translation> </message> @@ -2545,6 +2566,16 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Virheellinen -tor osoite '%s'</translation> </message> <message> + <location line="+1"/> + <source>Invalid amount for -minrelaytxfee=<amount>: '%s'</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Invalid amount for -mintxfee=<amount>: '%s'</source> + <translation type="unfinished"/> + </message> + <message> <location line="+8"/> <source>Maintain a full transaction index (default: 0)</source> <translation type="unfinished"/> @@ -2560,7 +2591,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Suurin lähetyspuskuri yksittäiselle yhteydelle, <n>*1000 tavua (vakioasetus: 1000)</translation> </message> <message> - <location line="+1"/> + <location line="+2"/> <source>Only accept block chain matching built-in checkpoints (default: 1)</source> <translation type="unfinished"/> </message> @@ -2620,6 +2651,11 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Pienennä debug.log tiedosto käynnistyksen yhteydessä (vakioasetus: 1 kun ei -debug)</translation> </message> <message> + <location line="+1"/> + <source>Signing transaction failed</source> + <translation type="unfinished"/> + </message> + <message> <location line="+2"/> <source>Specify connection timeout in milliseconds (default: 5000)</source> <translation>Määritä yhteyden aikakataisu millisekunneissa (vakioasetus: 5000)</translation> @@ -2630,7 +2666,22 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Järjestelmävirhe:</translation> </message> <message> - <location line="+10"/> + <location line="+4"/> + <source>Transaction amount too small</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Transaction amounts must be positive</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Transaction too large</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+7"/> <source>Use UPnP to map the listening port (default: 0)</source> <translation>Käytä UPnP:tä kuunneltavan portin avaamiseen (vakioasetus: 0)</translation> </message> @@ -2670,7 +2721,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="-46"/> + <location line="-50"/> <source>Password for JSON-RPC connections</source> <translation>Salasana JSON-RPC-yhteyksille</translation> </message> @@ -2685,17 +2736,17 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Lähetä käskyjä solmuun osoitteessa <ip> (oletus: 127.0.0.1)</translation> </message> <message> - <location line="-119"/> + <location line="-120"/> <source>Execute command when the best block changes (%s in cmd is replaced by block hash)</source> <translation>Suorita käsky kun paras lohko muuttuu (%s cmd on vaihdettu block hashin kanssa)</translation> </message> <message> - <location line="+142"/> + <location line="+147"/> <source>Upgrade wallet to latest format</source> <translation>Päivitä lompakko uusimpaan formaattiin</translation> </message> <message> - <location line="-17"/> + <location line="-21"/> <source>Set key pool size to <n> (default: 100)</source> <translation>Aseta avainpoolin koko arvoon <n> (oletus: 100)</translation> </message> @@ -2705,12 +2756,12 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Skannaa uudelleen lohkoketju lompakon puuttuvien rahasiirtojen vuoksi</translation> </message> <message> - <location line="+31"/> + <location line="+35"/> <source>Use OpenSSL (https) for JSON-RPC connections</source> <translation>Käytä OpenSSL:ää (https) JSON-RPC-yhteyksille</translation> </message> <message> - <location line="-22"/> + <location line="-26"/> <source>Server certificate file (default: server.cert)</source> <translation>Palvelimen sertifikaatti-tiedosto (oletus: server.cert)</translation> </message> @@ -2720,38 +2771,38 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Palvelimen yksityisavain (oletus: server.pem)</translation> </message> <message> - <location line="-153"/> + <location line="-151"/> <source>Acceptable ciphers (default: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH)</source> <translation>Hyväksyttävä salaus (oletus: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH)</translation> </message> <message> - <location line="+166"/> + <location line="+165"/> <source>This help message</source> <translation>Tämä ohjeviesti</translation> </message> <message> - <location line="+3"/> + <location line="+6"/> <source>Unable to bind to %s on this computer (bind returned error %d, %s)</source> <translation>Kytkeytyminen %s tällä tietokonella ei onnistu (kytkeytyminen palautti virheen %d, %s)</translation> </message> <message> - <location line="-86"/> + <location line="-91"/> <source>Connect through socks proxy</source> <translation>Yhdistä socks proxyn läpi</translation> </message> <message> - <location line="-11"/> + <location line="-10"/> <source>Allow DNS lookups for -addnode, -seednode and -connect</source> <translation>Salli DNS kyselyt -addnode, -seednode ja -connect yhteydessä</translation> </message> <message> - <location line="+56"/> + <location line="+55"/> <source>Loading addresses...</source> <translation>Ladataan osoitteita...</translation> </message> <message> - <location line="-34"/> + <location line="-35"/> <source>Error loading wallet.dat: Wallet corrupted</source> <translation>Virhe ladattaessa wallet.dat-tiedostoa: Lompakko vioittunut</translation> </message> @@ -2761,22 +2812,22 @@ TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH)</translation> <translation>Virhe ladattaessa wallet.dat-tiedostoa: Tarvitset uudemman version Bitcoinista</translation> </message> <message> - <location line="+87"/> + <location line="+93"/> <source>Wallet needed to be rewritten: restart Bitcoin to complete</source> <translation>Lompakko tarvitsee uudelleenkirjoittaa: käynnistä Bitcoin uudelleen</translation> </message> <message> - <location line="-89"/> + <location line="-95"/> <source>Error loading wallet.dat</source> <translation>Virhe ladattaessa wallet.dat-tiedostoa</translation> </message> <message> - <location line="+29"/> + <location line="+28"/> <source>Invalid -proxy address: '%s'</source> <translation>Virheellinen proxy-osoite '%s'</translation> </message> <message> - <location line="+49"/> + <location line="+56"/> <source>Unknown network specified in -onlynet: '%s'</source> <translation>Tuntematon verkko -onlynet parametrina: '%s'</translation> </message> @@ -2786,7 +2837,7 @@ TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH)</translation> <translation>Tuntematon -socks proxy versio pyydetty: %i</translation> </message> <message> - <location line="-91"/> + <location line="-96"/> <source>Cannot resolve -bind address: '%s'</source> <translation>-bind osoitteen '%s' selvittäminen epäonnistui</translation> </message> @@ -2806,17 +2857,17 @@ TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH)</translation> <translation>Virheellinen määrä</translation> </message> <message> - <location line="-4"/> + <location line="-6"/> <source>Insufficient funds</source> <translation>Lompakon saldo ei riitä</translation> </message> <message> - <location line="+8"/> + <location line="+10"/> <source>Loading block index...</source> <translation>Ladataan lohkoindeksiä...</translation> </message> <message> - <location line="-58"/> + <location line="-57"/> <source>Add a node to connect to and attempt to keep the connection open</source> <translation>Linää solmu mihin liittyä pitääksesi yhteyden auki</translation> </message> @@ -2826,52 +2877,47 @@ TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH)</translation> <translation>Kytkeytyminen %s ei onnistu tällä tietokoneella. Bitcoin on todennäköisesti jo ajamassa.</translation> </message> <message> - <location line="+67"/> + <location line="+64"/> <source>Fee per KB to add to transactions you send</source> <translation>Rahansiirtopalkkio per KB lisätään lähettämääsi rahansiirtoon</translation> </message> <message> - <location line="+17"/> + <location line="+19"/> <source>Loading wallet...</source> <translation>Ladataan lompakkoa...</translation> </message> <message> - <location line="-53"/> + <location line="-52"/> <source>Cannot downgrade wallet</source> <translation>Et voi päivittää lompakkoasi vanhempaan versioon</translation> </message> <message> - <location line="+1"/> - <source>Cannot initialize keypool</source> - <translation>Avainvarastoa ei voi alustaa</translation> - </message> - <message> <location line="+3"/> <source>Cannot write default address</source> <translation>Oletusosoitetta ei voi kirjoittaa</translation> </message> <message> - <location line="+63"/> + <location line="+64"/> <source>Rescanning...</source> <translation>Skannataan uudelleen...</translation> </message> <message> - <location line="-55"/> + <location line="-57"/> <source>Done loading</source> <translation>Lataus on valmis</translation> </message> <message> - <location line="+79"/> + <location line="+82"/> <source>To use the %s option</source> <translation>Käytä %s optiota</translation> </message> <message> - <location line="-71"/> + <location line="-74"/> <source>Error</source> <translation>Virhe</translation> </message> <message> - <location line="-33"/> + <location line="-31"/> <source>You must set rpcpassword=<password> in the configuration file: %s If the file does not exist, create it with owner-readable-only file permissions.</source> diff --git a/src/qt/locale/bitcoin_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.</translation> </message> <message> - <location filename="../aboutdialog.cpp" line="+17"/> + <location filename="../aboutdialog.cpp" line="+14"/> <source>Copyright</source> <translation>Droit d'auteur</translation> </message> <message> <location line="+0"/> - <source>2009-%1 The Bitcoin developers</source> - <translation>2009-%1 Développeurs de Bitcoin</translation> + <source>The Bitcoin developers</source> + <translation>Les développeurs Bitcoin</translation> </message> </context> <context> @@ -43,7 +43,7 @@ This product includes software developed by the OpenSSL Project for use in the O <message> <location filename="../forms/addressbookpage.ui" line="+14"/> <source>Address Book</source> - <translation>Options interface utilisateur</translation> + <translation>Carnet d'adresses</translation> </message> <message> <location line="+19"/> @@ -66,7 +66,7 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>&Nouvelle adresse</translation> </message> <message> - <location filename="../addressbookpage.cpp" line="+59"/> + <location filename="../addressbookpage.cpp" line="+63"/> <source>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.</source> <translation>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.</translation> </message> @@ -96,7 +96,17 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>Effacer l'adresse actuellement sélectionnée de la liste</translation> </message> <message> - <location line="-14"/> + <location line="+27"/> + <source>Export the data in the current tab to a file</source> + <translation>Exporter les données de l'onglet courant vers un fichier</translation> + </message> + <message> + <location line="+3"/> + <source>&Export</source> + <translation>&Exporter</translation> + </message> + <message> + <location line="-44"/> <source>Verify a message to ensure it was signed with a specified Bitcoin address</source> <translation>Vérifier un message pour vous assurer qu'il a bien été signé avec l'adresse Bitcoin spécifiée</translation> </message> @@ -318,12 +328,12 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>Signer un &message...</translation> </message> <message> - <location line="+299"/> + <location line="+280"/> <source>Synchronizing with network...</source> <translation>Synchronisation avec le réseau…</translation> </message> <message> - <location line="-368"/> + <location line="-349"/> <source>&Overview</source> <translation>&Vue d'ensemble</translation> </message> @@ -398,7 +408,7 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>&Modifier la phrase de passe...</translation> </message> <message> - <location line="+304"/> + <location line="+285"/> <source>Importing blocks from disk...</source> <translation>Importation des blocs depuis le disque...</translation> </message> @@ -408,12 +418,7 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>Réindexation des blocs sur le disque...</translation> </message> <message> - <location line="-300"/> - <source>&Export...</source> - <translation>&Exporter…</translation> - </message> - <message> - <location line="-66"/> + <location line="-347"/> <source>Send coins to a Bitcoin address</source> <translation>Envoyer des pièces à une adresse Bitcoin</translation> </message> @@ -423,12 +428,7 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>Modifier les options de configuration de Bitcoin</translation> </message> <message> - <location line="+18"/> - <source>Export the data in the current tab to a file</source> - <translation>Exporter les données de l'onglet courant vers un fichier</translation> - </message> - <message> - <location line="-9"/> + <location line="+9"/> <source>Backup wallet to another location</source> <translation>Sauvegarder le porte-monnaie à un autre emplacement</translation> </message> @@ -438,7 +438,7 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>Modifier la phrase de passe utilisée pour le chiffrement du porte-monnaie</translation> </message> <message> - <location line="+9"/> + <location line="+6"/> <source>&Debug window</source> <translation>Fenêtre de &débogage</translation> </message> @@ -448,23 +448,23 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>Ouvrir une console de débogage et de diagnostic</translation> </message> <message> - <location line="-7"/> + <location line="-4"/> <source>&Verify message...</source> <translation>&Vérifier un message...</translation> </message> <message> - <location line="-163"/> - <location line="+541"/> + <location line="-165"/> + <location line="+530"/> <source>Bitcoin</source> <translation>Bitcoin</translation> </message> <message> - <location line="-541"/> + <location line="-530"/> <source>Wallet</source> <translation>Porte-monnaie</translation> </message> <message> - <location line="+99"/> + <location line="+101"/> <source>&Send</source> <translation>&Envoyer</translation> </message> @@ -509,12 +509,12 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>Vérifier les messages pour vous assurer qu'ils ont bien été signés avec les adresses Bitcoin spécifiées</translation> </message> <message> - <location line="+31"/> + <location line="+28"/> <source>&File</source> <translation>&Fichier</translation> </message> <message> - <location line="+8"/> + <location line="+7"/> <source>&Settings</source> <translation>&Réglages</translation> </message> @@ -529,12 +529,7 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>Barre d'outils des onglets</translation> </message> <message> - <location line="+8"/> - <source>Actions toolbar</source> - <translation>Barre d'outils des actions</translation> - </message> - <message> - <location line="+13"/> + <location line="+17"/> <location line="+10"/> <source>[testnet]</source> <translation>[testnet]</translation> @@ -545,12 +540,17 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>Client Bitcoin</translation> </message> <message numerus="yes"> - <location line="+140"/> + <location line="+141"/> <source>%n active connection(s) to Bitcoin network</source> <translation><numerusform>%n connexion active avec le réseau Bitcoin</numerusform><numerusform>%n connexions actives avec le réseau Bitcoin</numerusform></translation> </message> <message> - <location line="+39"/> + <location line="+22"/> + <source>No block source available...</source> + <translation>Aucune source de bloc disponible...</translation> + </message> + <message> + <location line="+12"/> <source>Processed %1 of %2 (estimated) blocks of transaction history.</source> <translation>%1 blocs sur %2 (estimés) de l'historique des transactions traités.</translation> </message> @@ -575,7 +575,7 @@ This product includes software developed by the OpenSSL Project for use in the O <translation><numerusform>%n semaine</numerusform><numerusform>%n semaines</numerusform></translation> </message> <message> - <location line="+5"/> + <location line="+4"/> <source>%1 behind</source> <translation>%1 en arrière</translation> </message> @@ -590,7 +590,7 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>Les transactions après cela ne seront pas encore visibles.</translation> </message> <message> - <location line="+21"/> + <location line="+22"/> <source>Error</source> <translation>Erreur</translation> </message> @@ -605,22 +605,22 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>Information</translation> </message> <message> - <location line="+68"/> + <location line="+70"/> <source>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?</source> <translation>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 ?</translation> </message> <message> - <location line="-138"/> + <location line="-140"/> <source>Up to date</source> <translation>À jour</translation> </message> <message> - <location line="+32"/> + <location line="+31"/> <source>Catching up...</source> <translation>Rattrapage…</translation> </message> <message> - <location line="+110"/> + <location line="+113"/> <source>Confirm transaction fee</source> <translation>Confirmer les frais de transaction</translation> </message> @@ -670,7 +670,7 @@ Adresse : %4 <translation>Le porte-monnaie est <b>chiffré</b> et est actuellement <b>verrouillé</b></translation> </message> <message> - <location filename="../bitcoin.cpp" line="+104"/> + <location filename="../bitcoin.cpp" line="+111"/> <source>A fatal error occurred. Bitcoin can no longer continue safely and will quit.</source> <translation>Une erreur fatale est survenue. Bitcoin ne peut plus continuer à fonctionner de façon sûre et va s'arrêter.</translation> </message> @@ -678,7 +678,7 @@ Adresse : %4 <context> <name>ClientModel</name> <message> - <location filename="../clientmodel.cpp" line="+98"/> + <location filename="../clientmodel.cpp" line="+104"/> <source>Network Alert</source> <translation>Alerte réseau</translation> </message> @@ -809,8 +809,8 @@ Adresse : %4 </message> <message> <location line="+6"/> - <source>Optional transaction fee per kB that helps make sure your transactions are processed quickly. Most transactions are 1 kB. Fee 0.01 recommended.</source> - <translation>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.</translation> + <source>Optional transaction fee per kB that helps make sure your transactions are processed quickly. Most transactions are 1 kB.</source> + <translation>Frais de transaction optionnel par ko qui aident à garantir un traitement rapide des transactions. La plupart des transactions utilisent 1 ko.</translation> </message> <message> <location line="+15"/> @@ -1059,7 +1059,7 @@ Adresse : %4 <translation>Total des transactions qui doivent encore être confirmées et qui ne sont pas prises en compte dans le solde actuel</translation> </message> <message> - <location filename="../overviewpage.cpp" line="+115"/> + <location filename="../overviewpage.cpp" line="+116"/> <location line="+1"/> <source>out of sync</source> <translation>désynchronisé</translation> @@ -1646,6 +1646,19 @@ Adresse : %4 </message> </context> <context> + <name>SplashScreen</name> + <message> + <location filename="../splashscreen.cpp" line="+22"/> + <source>The Bitcoin developers</source> + <translation>Les développeurs Bitcoin</translation> + </message> + <message> + <location line="+1"/> + <source>[testnet]</source> + <translation>[testnet]</translation> + </message> +</context> +<context> <name>TransactionDesc</name> <message> <location filename="../transactiondesc.cpp" line="+20"/> @@ -2120,9 +2133,27 @@ Adresse : %4 </message> </context> <context> + <name>WalletModel</name> + <message> + <location filename="../walletmodel.cpp" line="+193"/> + <source>Send Coins</source> + <translation>Envoyer des pièces</translation> + </message> +</context> +<context> <name>WalletView</name> <message> - <location filename="../walletview.cpp" line="+247"/> + <location filename="../walletview.cpp" line="+42"/> + <source>&Export</source> + <translation>&Exporter</translation> + </message> + <message> + <location line="+1"/> + <source>Export the data in the current tab to a file</source> + <translation>Exporter les données de l'onglet courant vers un fichier</translation> + </message> + <message> + <location line="+193"/> <source>Backup Wallet</source> <translation>Sauvegarder le porte-monnaie</translation> </message> @@ -2155,37 +2186,37 @@ Adresse : %4 <context> <name>bitcoin-core</name> <message> - <location filename="../bitcoinstrings.cpp" line="+96"/> + <location filename="../bitcoinstrings.cpp" line="+94"/> <source>Bitcoin version</source> <translation>Version de Bitcoin</translation> </message> <message> - <location line="+98"/> + <location line="+102"/> <source>Usage:</source> <translation>Utilisation :</translation> </message> <message> - <location line="-25"/> + <location line="-29"/> <source>Send command to -server or bitcoind</source> <translation>Envoyer une commande à -server ou à bitcoind</translation> </message> <message> - <location line="-22"/> + <location line="-23"/> <source>List commands</source> <translation>Lister les commandes</translation> </message> <message> - <location line="-10"/> + <location line="-12"/> <source>Get help for a command</source> <translation>Obtenir de l’aide pour une commande</translation> </message> <message> - <location line="+21"/> + <location line="+24"/> <source>Options:</source> <translation>Options :</translation> </message> <message> - <location line="+23"/> + <location line="+24"/> <source>Specify configuration file (default: bitcoin.conf)</source> <translation>Spécifier le fichier de configuration (par défaut : bitcoin.conf)</translation> </message> @@ -2195,27 +2226,17 @@ Adresse : %4 <translation>Spécifier le fichier PID (par défaut : bitcoind.pid)</translation> </message> <message> - <location line="-48"/> - <source>Generate coins</source> - <translation>Générer des pièces</translation> - </message> - <message> - <location line="-27"/> - <source>Don't generate coins</source> - <translation>Ne pas générer de pièces</translation> - </message> - <message> - <location line="+74"/> + <location line="-1"/> <source>Specify data directory</source> <translation>Spécifier le répertoire de données</translation> </message> <message> - <location line="-8"/> + <location line="-9"/> <source>Set database cache size in megabytes (default: 25)</source> <translation>Définir la taille du tampon en mégaoctets (par défaut : 25)</translation> </message> <message> - <location line="-27"/> + <location line="-28"/> <source>Listen for connections on <port> (default: 8333 or testnet: 18333)</source> <translation>Écouter les connexions sur le <port> (par défaut : 8333 ou testnet : 18333)</translation> </message> @@ -2230,7 +2251,7 @@ Adresse : %4 <translation>Se connecter à un nœud pour obtenir des adresses de pairs puis se déconnecter</translation> </message> <message> - <location line="+80"/> + <location line="+82"/> <source>Specify your own public address</source> <translation>Spécifier votre propre adresse publique</translation> </message> @@ -2240,22 +2261,22 @@ Adresse : %4 <translation>Seuil de déconnexion des pairs de mauvaise qualité (par défaut : 100)</translation> </message> <message> - <location line="-132"/> + <location line="-134"/> <source>Number of seconds to keep misbehaving peers from reconnecting (default: 86400)</source> <translation>Délai en secondes de refus de reconnexion aux pairs de mauvaise qualité (par défaut : 86400)</translation> </message> <message> - <location line="-32"/> + <location line="-29"/> <source>An error occurred while setting up the RPC port %u for listening on IPv4: %s</source> <translation>Une erreur est survenue lors de la mise en place du port RPC %u pour écouter sur IPv4 : %s</translation> </message> <message> - <location line="+30"/> + <location line="+27"/> <source>Listen for JSON-RPC connections on <port> (default: 8332 or testnet: 18332)</source> <translation>Écouter les connexions JSON-RPC sur le <port> (par défaut : 8332 ou tesnet : 18332)</translation> </message> <message> - <location line="+36"/> + <location line="+37"/> <source>Accept command line and JSON-RPC commands</source> <translation>Accepter les commandes de JSON-RPC et de la ligne de commande</translation> </message> @@ -2265,17 +2286,17 @@ Adresse : %4 <translation>Fonctionner en arrière-plan en tant que démon et accepter les commandes</translation> </message> <message> - <location line="+33"/> + <location line="+37"/> <source>Use the test network</source> <translation>Utiliser le réseau de test</translation> </message> <message> - <location line="-108"/> + <location line="-112"/> <source>Accept connections from outside (default: 1 if no -proxy or -connect)</source> <translation>Accepter les connexions entrantes (par défaut : 1 si -proxy ou -connect ne sont pas présents)</translation> </message> <message> - <location line="-82"/> + <location line="-80"/> <source>%s, you must set a rpcpassword in the configuration file: %s It is recommended you use the following random password: @@ -2316,11 +2337,6 @@ par exemple : alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo </message> <message> <location line="+3"/> - <source>Error initializing database environment %s! To recover, BACKUP THAT DIRECTORY, then remove everything from it except for wallet.dat.</source> - <translation>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.</translation> - </message> - <message> - <location line="+3"/> <source>Error: The transaction was rejected! This might happen if some of the coins in your wallet were already spent, such as if you used a copy of wallet.dat and coins were spent in the copy but not marked as spent here.</source> <translation>Erreur : la transaction a été rejetée ! Cela peut arriver si certaines pièces de votre porte-monnaie étaient déjà dépensées, par exemple si vous avez utilisé une copie de wallet.dat et les pièces ont été dépensées avec cette copie sans être marquées comme telles ici.</translation> </message> @@ -2345,12 +2361,7 @@ par exemple : alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo <translation>Définir la taille maximale en octets des transactions prioritaires/à frais modiques (par défaut : 27000)</translation> </message> <message> - <location line="+3"/> - <source>Set the number of script verification threads (1-16, 0=auto, default: 0)</source> - <translation>Définir le nombre de fils de vérification de script (1-16, 0=auto, par défaut : 0)</translation> - </message> - <message> - <location line="+2"/> + <location line="+6"/> <source>This is a pre-release test build - use at your own risk - do not use for mining or merchant applications</source> <translation>Ceci est une pré-version de test - utilisez à vos risques et périls - ne l'utilisez pas pour miner ou pour des applications marchandes</translation> </message> @@ -2390,7 +2401,7 @@ par exemple : alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo <translation>Options de création des blocs :</translation> </message> <message> - <location line="+6"/> + <location line="+5"/> <source>Connect only to the specified node(s)</source> <translation>Ne se connecter qu'au(x) nœud(s) spécifié(s)</translation> </message> @@ -2410,7 +2421,7 @@ par exemple : alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo <translation>Voulez-vous reconstruire la base de données des blocs maintenant ?</translation> </message> <message> - <location line="+3"/> + <location line="+2"/> <source>Error initializing block database</source> <translation>Erreur lors de l'initialisation de la base de données des blocs</translation> </message> @@ -2436,11 +2447,6 @@ par exemple : alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo </message> <message> <location line="+1"/> - <source>Error: Transaction creation failed!</source> - <translation>Erreur : Échec de la création de la transaction !</translation> - </message> - <message> - <location line="+1"/> <source>Error: Wallet locked, unable to create transaction!</source> <translation>Erreur : Porte-monnaie verrouillé, impossible de créer la transaction !</translation> </message> @@ -2510,7 +2516,12 @@ par exemple : alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo <translation>Trouver des pairs en utilisant la recherche DNS (par défaut : 1 sauf si -connect est utilisé)</translation> </message> <message> - <location line="+3"/> + <location line="+1"/> + <source>Generate coins (default: 0)</source> + <translation>Générer des pièces (défaut: 0)</translation> + </message> + <message> + <location line="+2"/> <source>How many blocks to check at startup (default: 288, 0 = all)</source> <translation>Nombre de blocs à vérifier au démarrage (par défaut : 288, 0 = tout)</translation> </message> @@ -2520,7 +2531,12 @@ par exemple : alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo <translation>Niveau d'approfondissement de la vérification des blocs (0-4, par défaut : 3)</translation> </message> <message> - <location line="+24"/> + <location line="+19"/> + <source>Not enough file descriptors available.</source> + <translation>Pas assez de descripteurs de fichiers disponibles.</translation> + </message> + <message> + <location line="+8"/> <source>Rebuild block chain index from current blk000??.dat files</source> <translation>Reconstruire l'index de la chaîne des blocs à partir des fichiers blk000??.dat actuels</translation> </message> @@ -2530,7 +2546,7 @@ par exemple : alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo <translation>Définir le nombre d'exétrons pour desservir les appels RPC (par défaut : 4)</translation> </message> <message> - <location line="+22"/> + <location line="+26"/> <source>Verifying blocks...</source> <translation>Vérification des blocs...</translation> </message> @@ -2540,12 +2556,17 @@ par exemple : alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo <translation>Vérification du porte-monnaie...</translation> </message> <message> - <location line="-62"/> + <location line="-69"/> <source>Imports blocks from external blk000??.dat file</source> <translation>Importe des blocs depuis un fichier blk000??.dat externe</translation> </message> <message> - <location line="+1"/> + <location line="-76"/> + <source>Set the number of script verification threads (up to 16, 0 = auto, <0 = leave that many cores free, default: 0)</source> + <translation>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)</translation> + </message> + <message> + <location line="+77"/> <source>Information</source> <translation>Informations</translation> </message> @@ -2555,6 +2576,16 @@ par exemple : alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo <translation>Adresse -tor invalide : « %s »</translation> </message> <message> + <location line="+1"/> + <source>Invalid amount for -minrelaytxfee=<amount>: '%s'</source> + <translation>Montant invalide pour -minrelayfee=<montant> : « %s »</translation> + </message> + <message> + <location line="+1"/> + <source>Invalid amount for -mintxfee=<amount>: '%s'</source> + <translation>Montant invalide pour -mintxfee=<montant> : « %s »</translation> + </message> + <message> <location line="+8"/> <source>Maintain a full transaction index (default: 0)</source> <translation>Maintenir un index complet des transactions (par défaut : 0)</translation> @@ -2570,7 +2601,7 @@ par exemple : alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo <translation>Tampon maximal d'envoi par connexion, <n>*1000 octets (par défaut : 1000)</translation> </message> <message> - <location line="+1"/> + <location line="+2"/> <source>Only accept block chain matching built-in checkpoints (default: 1)</source> <translation>N'accepter que la chaîne de blocs correspondant aux points de vérification internes (par défaut : 1)</translation> </message> @@ -2630,6 +2661,11 @@ par exemple : alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo <translation>Réduire le fichier debug.log lors du démarrage du client (par défaut : 1 lorsque -debug n'est pas présent)</translation> </message> <message> + <location line="+1"/> + <source>Signing transaction failed</source> + <translation>La signature de la transaction a échoué</translation> + </message> + <message> <location line="+2"/> <source>Specify connection timeout in milliseconds (default: 5000)</source> <translation>Spécifier le délai d'expiration de la connexion en millisecondes (par défaut : 5000)</translation> @@ -2640,7 +2676,22 @@ par exemple : alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo <translation>Erreur système :</translation> </message> <message> - <location line="+10"/> + <location line="+4"/> + <source>Transaction amount too small</source> + <translation>Montant de la transaction trop bas</translation> + </message> + <message> + <location line="+1"/> + <source>Transaction amounts must be positive</source> + <translation>Les montants de la transaction doivent être positifs</translation> + </message> + <message> + <location line="+1"/> + <source>Transaction too large</source> + <translation>Transaction trop volumineuse</translation> + </message> + <message> + <location line="+7"/> <source>Use UPnP to map the listening port (default: 0)</source> <translation>Utiliser l'UPnP pour rediriger le port d'écoute (par défaut : 0)</translation> </message> @@ -2680,7 +2731,7 @@ par exemple : alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo <translation>wallet.dat corrompu, la récupération a échoué</translation> </message> <message> - <location line="-46"/> + <location line="-50"/> <source>Password for JSON-RPC connections</source> <translation>Mot de passe pour les connexions JSON-RPC</translation> </message> @@ -2695,17 +2746,17 @@ par exemple : alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo <translation>Envoyer des commandes au nœud fonctionnant à <ip> (par défaut : 127.0.0.1)</translation> </message> <message> - <location line="-119"/> + <location line="-120"/> <source>Execute command when the best block changes (%s in cmd is replaced by block hash)</source> <translation>Exécuter la commande lorsque le meilleur bloc change (%s est remplacé par le hachage du bloc dans cmd)</translation> </message> <message> - <location line="+142"/> + <location line="+147"/> <source>Upgrade wallet to latest format</source> <translation>Mettre à jour le format du porte-monnaie</translation> </message> <message> - <location line="-17"/> + <location line="-21"/> <source>Set key pool size to <n> (default: 100)</source> <translation>Régler la taille de la plage de clefs sur <n> (par défaut : 100)</translation> </message> @@ -2715,12 +2766,12 @@ par exemple : alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo <translation>Réanalyser la chaîne de blocs pour les transactions de porte-monnaie manquantes</translation> </message> <message> - <location line="+31"/> + <location line="+35"/> <source>Use OpenSSL (https) for JSON-RPC connections</source> <translation>Utiliser OpenSSL (https) pour les connexions JSON-RPC</translation> </message> <message> - <location line="-22"/> + <location line="-26"/> <source>Server certificate file (default: server.cert)</source> <translation>Fichier de certificat serveur (par défaut : server.cert)</translation> </message> @@ -2730,37 +2781,37 @@ par exemple : alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo <translation>Clef privée du serveur (par défaut : server.pem)</translation> </message> <message> - <location line="-153"/> + <location line="-151"/> <source>Acceptable ciphers (default: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH)</source> <translation>Clefs de chiffrement acceptables (par défaut : TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH)</translation> </message> <message> - <location line="+166"/> + <location line="+165"/> <source>This help message</source> <translation>Ce message d'aide</translation> </message> <message> - <location line="+3"/> + <location line="+6"/> <source>Unable to bind to %s on this computer (bind returned error %d, %s)</source> <translation>Impossible de se lier à %s sur cet ordinateur (bind a retourné l'erreur %d, %s)</translation> </message> <message> - <location line="-86"/> + <location line="-91"/> <source>Connect through socks proxy</source> <translation>Connexion via un proxy socks</translation> </message> <message> - <location line="-11"/> + <location line="-10"/> <source>Allow DNS lookups for -addnode, -seednode and -connect</source> <translation>Autoriser les recherches DNS pour -addnode, -seednode et -connect</translation> </message> <message> - <location line="+56"/> + <location line="+55"/> <source>Loading addresses...</source> <translation>Chargement des adresses…</translation> </message> <message> - <location line="-34"/> + <location line="-35"/> <source>Error loading wallet.dat: Wallet corrupted</source> <translation>Erreur lors du chargement de wallet.dat : porte-monnaie corrompu</translation> </message> @@ -2770,22 +2821,22 @@ par exemple : alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo <translation>Erreur lors du chargement de wallet.dat : le porte-monnaie nécessite une version plus récente de Bitcoin</translation> </message> <message> - <location line="+87"/> + <location line="+93"/> <source>Wallet needed to be rewritten: restart Bitcoin to complete</source> <translation>Le porte-monnaie nécessitait une réécriture : veuillez redémarrer Bitcoin pour terminer l'opération</translation> </message> <message> - <location line="-89"/> + <location line="-95"/> <source>Error loading wallet.dat</source> <translation>Erreur lors du chargement de wallet.dat</translation> </message> <message> - <location line="+29"/> + <location line="+28"/> <source>Invalid -proxy address: '%s'</source> <translation>Adresse -proxy invalide : « %s »</translation> </message> <message> - <location line="+49"/> + <location line="+56"/> <source>Unknown network specified in -onlynet: '%s'</source> <translation>Réseau inconnu spécifié sur -onlynet : « %s »</translation> </message> @@ -2795,7 +2846,7 @@ par exemple : alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo <translation>Version inconnue de proxy -socks demandée : %i</translation> </message> <message> - <location line="-91"/> + <location line="-96"/> <source>Cannot resolve -bind address: '%s'</source> <translation>Impossible de résoudre l'adresse -bind : « %s »</translation> </message> @@ -2815,17 +2866,17 @@ par exemple : alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo <translation>Montant invalide</translation> </message> <message> - <location line="-4"/> + <location line="-6"/> <source>Insufficient funds</source> <translation>Fonds insuffisants</translation> </message> <message> - <location line="+8"/> + <location line="+10"/> <source>Loading block index...</source> <translation>Chargement de l’index des blocs…</translation> </message> <message> - <location line="-58"/> + <location line="-57"/> <source>Add a node to connect to and attempt to keep the connection open</source> <translation>Ajouter un nœud auquel se connecter et tenter de garder la connexion ouverte</translation> </message> @@ -2835,52 +2886,47 @@ par exemple : alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo <translation>Impossible de se lier à %s sur cet ordinateur. Bitcoin fonctionne probablement déjà.</translation> </message> <message> - <location line="+67"/> + <location line="+64"/> <source>Fee per KB to add to transactions you send</source> <translation>Frais par Ko à ajouter aux transactions que vous enverrez</translation> </message> <message> - <location line="+17"/> + <location line="+19"/> <source>Loading wallet...</source> <translation>Chargement du porte-monnaie…</translation> </message> <message> - <location line="-53"/> + <location line="-52"/> <source>Cannot downgrade wallet</source> <translation>Impossible de revenir à une version antérieure du porte-monnaie</translation> </message> <message> - <location line="+1"/> - <source>Cannot initialize keypool</source> - <translation>Impossible d'initialiser la plage des clefs</translation> - </message> - <message> <location line="+3"/> <source>Cannot write default address</source> <translation>Impossible d'écrire l'adresse par défaut</translation> </message> <message> - <location line="+63"/> + <location line="+64"/> <source>Rescanning...</source> <translation>Nouvelle analyse…</translation> </message> <message> - <location line="-55"/> + <location line="-57"/> <source>Done loading</source> <translation>Chargement terminé</translation> </message> <message> - <location line="+79"/> + <location line="+82"/> <source>To use the %s option</source> <translation>Pour utiliser l'option %s</translation> </message> <message> - <location line="-71"/> + <location line="-74"/> <source>Error</source> <translation>Erreur</translation> </message> <message> - <location line="-33"/> + <location line="-31"/> <source>You must set rpcpassword=<password> in the configuration file: %s If the file does not exist, create it with owner-readable-only file permissions.</source> diff --git a/src/qt/locale/bitcoin_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.</translation> </message> <message> - <location filename="../aboutdialog.cpp" line="+17"/> + <location filename="../aboutdialog.cpp" line="+14"/> <source>Copyright</source> <translation type="unfinished"/> </message> <message> <location line="+0"/> - <source>2009-%1 The Bitcoin developers</source> + <source>The Bitcoin developers</source> <translation type="unfinished"/> </message> </context> @@ -66,7 +66,7 @@ Ce produit comprend des logiciels développés par le projet OpenSSL pour être <translation type="unfinished"/> </message> <message> - <location filename="../addressbookpage.cpp" line="+59"/> + <location filename="../addressbookpage.cpp" line="+63"/> <source>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.</source> <translation>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.</translation> </message> @@ -96,7 +96,17 @@ Ce produit comprend des logiciels développés par le projet OpenSSL pour être <translation type="unfinished"/> </message> <message> - <location line="-14"/> + <location line="+27"/> + <source>Export the data in the current tab to a file</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+3"/> + <source>&Export</source> + <translation type="unfinished"/> + </message> + <message> + <location line="-44"/> <source>Verify a message to ensure it was signed with a specified Bitcoin address</source> <translation type="unfinished"/> </message> @@ -318,12 +328,12 @@ Ce produit comprend des logiciels développés par le projet OpenSSL pour être <translation type="unfinished"/> </message> <message> - <location line="+299"/> + <location line="+280"/> <source>Synchronizing with network...</source> <translation type="unfinished"/> </message> <message> - <location line="-368"/> + <location line="-349"/> <source>&Overview</source> <translation type="unfinished"/> </message> @@ -398,7 +408,7 @@ Ce produit comprend des logiciels développés par le projet OpenSSL pour être <translation type="unfinished"/> </message> <message> - <location line="+304"/> + <location line="+285"/> <source>Importing blocks from disk...</source> <translation type="unfinished"/> </message> @@ -408,12 +418,7 @@ Ce produit comprend des logiciels développés par le projet OpenSSL pour être <translation type="unfinished"/> </message> <message> - <location line="-300"/> - <source>&Export...</source> - <translation type="unfinished"/> - </message> - <message> - <location line="-66"/> + <location line="-347"/> <source>Send coins to a Bitcoin address</source> <translation type="unfinished"/> </message> @@ -423,12 +428,7 @@ Ce produit comprend des logiciels développés par le projet OpenSSL pour être <translation type="unfinished"/> </message> <message> - <location line="+18"/> - <source>Export the data in the current tab to a file</source> - <translation type="unfinished"/> - </message> - <message> - <location line="-9"/> + <location line="+9"/> <source>Backup wallet to another location</source> <translation type="unfinished"/> </message> @@ -438,7 +438,7 @@ Ce produit comprend des logiciels développés par le projet OpenSSL pour être <translation type="unfinished"/> </message> <message> - <location line="+9"/> + <location line="+6"/> <source>&Debug window</source> <translation type="unfinished"/> </message> @@ -448,23 +448,23 @@ Ce produit comprend des logiciels développés par le projet OpenSSL pour être <translation type="unfinished"/> </message> <message> - <location line="-7"/> + <location line="-4"/> <source>&Verify message...</source> <translation type="unfinished"/> </message> <message> - <location line="-163"/> - <location line="+541"/> + <location line="-165"/> + <location line="+530"/> <source>Bitcoin</source> <translation type="unfinished"/> </message> <message> - <location line="-541"/> + <location line="-530"/> <source>Wallet</source> <translation type="unfinished"/> </message> <message> - <location line="+99"/> + <location line="+101"/> <source>&Send</source> <translation type="unfinished"/> </message> @@ -509,12 +509,12 @@ Ce produit comprend des logiciels développés par le projet OpenSSL pour être <translation type="unfinished"/> </message> <message> - <location line="+31"/> + <location line="+28"/> <source>&File</source> <translation type="unfinished"/> </message> <message> - <location line="+8"/> + <location line="+7"/> <source>&Settings</source> <translation type="unfinished"/> </message> @@ -529,12 +529,7 @@ Ce produit comprend des logiciels développés par le projet OpenSSL pour être <translation type="unfinished"/> </message> <message> - <location line="+8"/> - <source>Actions toolbar</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+13"/> + <location line="+17"/> <location line="+10"/> <source>[testnet]</source> <translation type="unfinished"/> @@ -545,12 +540,17 @@ Ce produit comprend des logiciels développés par le projet OpenSSL pour être <translation type="unfinished"/> </message> <message numerus="yes"> - <location line="+140"/> + <location line="+141"/> <source>%n active connection(s) to Bitcoin network</source> <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation> </message> <message> - <location line="+39"/> + <location line="+22"/> + <source>No block source available...</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+12"/> <source>Processed %1 of %2 (estimated) blocks of transaction history.</source> <translation type="unfinished"/> </message> @@ -575,7 +575,7 @@ Ce produit comprend des logiciels développés par le projet OpenSSL pour être <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation> </message> <message> - <location line="+5"/> + <location line="+4"/> <source>%1 behind</source> <translation type="unfinished"/> </message> @@ -590,7 +590,7 @@ Ce produit comprend des logiciels développés par le projet OpenSSL pour être <translation type="unfinished"/> </message> <message> - <location line="+21"/> + <location line="+22"/> <source>Error</source> <translation type="unfinished"/> </message> @@ -605,22 +605,22 @@ Ce produit comprend des logiciels développés par le projet OpenSSL pour être <translation type="unfinished"/> </message> <message> - <location line="+68"/> + <location line="+70"/> <source>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?</source> <translation type="unfinished"/> </message> <message> - <location line="-138"/> + <location line="-140"/> <source>Up to date</source> <translation type="unfinished"/> </message> <message> - <location line="+32"/> + <location line="+31"/> <source>Catching up...</source> <translation type="unfinished"/> </message> <message> - <location line="+110"/> + <location line="+113"/> <source>Confirm transaction fee</source> <translation type="unfinished"/> </message> @@ -666,7 +666,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location filename="../bitcoin.cpp" line="+104"/> + <location filename="../bitcoin.cpp" line="+111"/> <source>A fatal error occurred. Bitcoin can no longer continue safely and will quit.</source> <translation type="unfinished"/> </message> @@ -674,7 +674,7 @@ Address: %4 <context> <name>ClientModel</name> <message> - <location filename="../clientmodel.cpp" line="+98"/> + <location filename="../clientmodel.cpp" line="+104"/> <source>Network Alert</source> <translation type="unfinished"/> </message> @@ -805,7 +805,7 @@ Address: %4 </message> <message> <location line="+6"/> - <source>Optional transaction fee per kB that helps make sure your transactions are processed quickly. Most transactions are 1 kB. Fee 0.01 recommended.</source> + <source>Optional transaction fee per kB that helps make sure your transactions are processed quickly. Most transactions are 1 kB.</source> <translation type="unfinished"/> </message> <message> @@ -1055,7 +1055,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location filename="../overviewpage.cpp" line="+115"/> + <location filename="../overviewpage.cpp" line="+116"/> <location line="+1"/> <source>out of sync</source> <translation type="unfinished"/> @@ -1642,6 +1642,19 @@ Address: %4 </message> </context> <context> + <name>SplashScreen</name> + <message> + <location filename="../splashscreen.cpp" line="+22"/> + <source>The Bitcoin developers</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>[testnet]</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>TransactionDesc</name> <message> <location filename="../transactiondesc.cpp" line="+20"/> @@ -2116,9 +2129,27 @@ Address: %4 </message> </context> <context> + <name>WalletModel</name> + <message> + <location filename="../walletmodel.cpp" line="+193"/> + <source>Send Coins</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>WalletView</name> <message> - <location filename="../walletview.cpp" line="+247"/> + <location filename="../walletview.cpp" line="+42"/> + <source>&Export</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Export the data in the current tab to a file</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+193"/> <source>Backup Wallet</source> <translation type="unfinished"/> </message> @@ -2151,37 +2182,37 @@ Address: %4 <context> <name>bitcoin-core</name> <message> - <location filename="../bitcoinstrings.cpp" line="+96"/> + <location filename="../bitcoinstrings.cpp" line="+94"/> <source>Bitcoin version</source> <translation type="unfinished"/> </message> <message> - <location line="+98"/> + <location line="+102"/> <source>Usage:</source> <translation type="unfinished"/> </message> <message> - <location line="-25"/> + <location line="-29"/> <source>Send command to -server or bitcoind</source> <translation type="unfinished"/> </message> <message> - <location line="-22"/> + <location line="-23"/> <source>List commands</source> <translation type="unfinished"/> </message> <message> - <location line="-10"/> + <location line="-12"/> <source>Get help for a command</source> <translation type="unfinished"/> </message> <message> - <location line="+21"/> + <location line="+24"/> <source>Options:</source> <translation type="unfinished"/> </message> <message> - <location line="+23"/> + <location line="+24"/> <source>Specify configuration file (default: bitcoin.conf)</source> <translation type="unfinished"/> </message> @@ -2191,27 +2222,17 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="-48"/> - <source>Generate coins</source> - <translation type="unfinished"/> - </message> - <message> - <location line="-27"/> - <source>Don't generate coins</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+74"/> + <location line="-1"/> <source>Specify data directory</source> <translation type="unfinished"/> </message> <message> - <location line="-8"/> + <location line="-9"/> <source>Set database cache size in megabytes (default: 25)</source> <translation type="unfinished"/> </message> <message> - <location line="-27"/> + <location line="-28"/> <source>Listen for connections on <port> (default: 8333 or testnet: 18333)</source> <translation type="unfinished"/> </message> @@ -2226,7 +2247,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+80"/> + <location line="+82"/> <source>Specify your own public address</source> <translation type="unfinished"/> </message> @@ -2236,22 +2257,22 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="-132"/> + <location line="-134"/> <source>Number of seconds to keep misbehaving peers from reconnecting (default: 86400)</source> <translation type="unfinished"/> </message> <message> - <location line="-32"/> + <location line="-29"/> <source>An error occurred while setting up the RPC port %u for listening on IPv4: %s</source> <translation type="unfinished"/> </message> <message> - <location line="+30"/> + <location line="+27"/> <source>Listen for JSON-RPC connections on <port> (default: 8332 or testnet: 18332)</source> <translation type="unfinished"/> </message> <message> - <location line="+36"/> + <location line="+37"/> <source>Accept command line and JSON-RPC commands</source> <translation type="unfinished"/> </message> @@ -2261,17 +2282,17 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+33"/> + <location line="+37"/> <source>Use the test network</source> <translation type="unfinished"/> </message> <message> - <location line="-108"/> + <location line="-112"/> <source>Accept connections from outside (default: 1 if no -proxy or -connect)</source> <translation type="unfinished"/> </message> <message> - <location line="-82"/> + <location line="-80"/> <source>%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. </message> <message> <location line="+3"/> - <source>Error initializing database environment %s! To recover, BACKUP THAT DIRECTORY, then remove everything from it except for wallet.dat.</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+3"/> <source>Error: The transaction was rejected! This might happen if some of the coins in your wallet were already spent, such as if you used a copy of wallet.dat and coins were spent in the copy but not marked as spent here.</source> <translation type="unfinished"/> </message> @@ -2331,12 +2347,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+3"/> - <source>Set the number of script verification threads (1-16, 0=auto, default: 0)</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+2"/> + <location line="+6"/> <source>This is a pre-release test build - use at your own risk - do not use for mining or merchant applications</source> <translation type="unfinished"/> </message> @@ -2376,7 +2387,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+6"/> + <location line="+5"/> <source>Connect only to the specified node(s)</source> <translation type="unfinished"/> </message> @@ -2396,7 +2407,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+3"/> + <location line="+2"/> <source>Error initializing block database</source> <translation type="unfinished"/> </message> @@ -2422,11 +2433,6 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. </message> <message> <location line="+1"/> - <source>Error: Transaction creation failed!</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+1"/> <source>Error: Wallet locked, unable to create transaction!</source> <translation type="unfinished"/> </message> @@ -2496,7 +2502,12 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+3"/> + <location line="+1"/> + <source>Generate coins (default: 0)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+2"/> <source>How many blocks to check at startup (default: 288, 0 = all)</source> <translation type="unfinished"/> </message> @@ -2506,7 +2517,12 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+24"/> + <location line="+19"/> + <source>Not enough file descriptors available.</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+8"/> <source>Rebuild block chain index from current blk000??.dat files</source> <translation type="unfinished"/> </message> @@ -2516,7 +2532,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+22"/> + <location line="+26"/> <source>Verifying blocks...</source> <translation type="unfinished"/> </message> @@ -2526,12 +2542,17 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="-62"/> + <location line="-69"/> <source>Imports blocks from external blk000??.dat file</source> <translation type="unfinished"/> </message> <message> - <location line="+1"/> + <location line="-76"/> + <source>Set the number of script verification threads (up to 16, 0 = auto, <0 = leave that many cores free, default: 0)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+77"/> <source>Information</source> <translation type="unfinished"/> </message> @@ -2541,6 +2562,16 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> + <location line="+1"/> + <source>Invalid amount for -minrelaytxfee=<amount>: '%s'</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Invalid amount for -mintxfee=<amount>: '%s'</source> + <translation type="unfinished"/> + </message> + <message> <location line="+8"/> <source>Maintain a full transaction index (default: 0)</source> <translation type="unfinished"/> @@ -2556,7 +2587,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+1"/> + <location line="+2"/> <source>Only accept block chain matching built-in checkpoints (default: 1)</source> <translation type="unfinished"/> </message> @@ -2616,6 +2647,11 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> + <location line="+1"/> + <source>Signing transaction failed</source> + <translation type="unfinished"/> + </message> + <message> <location line="+2"/> <source>Specify connection timeout in milliseconds (default: 5000)</source> <translation type="unfinished"/> @@ -2626,7 +2662,22 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+10"/> + <location line="+4"/> + <source>Transaction amount too small</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Transaction amounts must be positive</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Transaction too large</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+7"/> <source>Use UPnP to map the listening port (default: 0)</source> <translation type="unfinished"/> </message> @@ -2666,7 +2717,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="-46"/> + <location line="-50"/> <source>Password for JSON-RPC connections</source> <translation type="unfinished"/> </message> @@ -2681,17 +2732,17 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="-119"/> + <location line="-120"/> <source>Execute command when the best block changes (%s in cmd is replaced by block hash)</source> <translation type="unfinished"/> </message> <message> - <location line="+142"/> + <location line="+147"/> <source>Upgrade wallet to latest format</source> <translation type="unfinished"/> </message> <message> - <location line="-17"/> + <location line="-21"/> <source>Set key pool size to <n> (default: 100)</source> <translation type="unfinished"/> </message> @@ -2701,12 +2752,12 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+31"/> + <location line="+35"/> <source>Use OpenSSL (https) for JSON-RPC connections</source> <translation type="unfinished"/> </message> <message> - <location line="-22"/> + <location line="-26"/> <source>Server certificate file (default: server.cert)</source> <translation type="unfinished"/> </message> @@ -2716,37 +2767,37 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="-153"/> + <location line="-151"/> <source>Acceptable ciphers (default: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH)</source> <translation type="unfinished"/> </message> <message> - <location line="+166"/> + <location line="+165"/> <source>This help message</source> <translation type="unfinished"/> </message> <message> - <location line="+3"/> + <location line="+6"/> <source>Unable to bind to %s on this computer (bind returned error %d, %s)</source> <translation type="unfinished"/> </message> <message> - <location line="-86"/> + <location line="-91"/> <source>Connect through socks proxy</source> <translation type="unfinished"/> </message> <message> - <location line="-11"/> + <location line="-10"/> <source>Allow DNS lookups for -addnode, -seednode and -connect</source> <translation type="unfinished"/> </message> <message> - <location line="+56"/> + <location line="+55"/> <source>Loading addresses...</source> <translation type="unfinished"/> </message> <message> - <location line="-34"/> + <location line="-35"/> <source>Error loading wallet.dat: Wallet corrupted</source> <translation type="unfinished"/> </message> @@ -2756,22 +2807,22 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+87"/> + <location line="+93"/> <source>Wallet needed to be rewritten: restart Bitcoin to complete</source> <translation type="unfinished"/> </message> <message> - <location line="-89"/> + <location line="-95"/> <source>Error loading wallet.dat</source> <translation type="unfinished"/> </message> <message> - <location line="+29"/> + <location line="+28"/> <source>Invalid -proxy address: '%s'</source> <translation type="unfinished"/> </message> <message> - <location line="+49"/> + <location line="+56"/> <source>Unknown network specified in -onlynet: '%s'</source> <translation type="unfinished"/> </message> @@ -2781,7 +2832,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="-91"/> + <location line="-96"/> <source>Cannot resolve -bind address: '%s'</source> <translation type="unfinished"/> </message> @@ -2801,17 +2852,17 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="-4"/> + <location line="-6"/> <source>Insufficient funds</source> <translation type="unfinished"/> </message> <message> - <location line="+8"/> + <location line="+10"/> <source>Loading block index...</source> <translation type="unfinished"/> </message> <message> - <location line="-58"/> + <location line="-57"/> <source>Add a node to connect to and attempt to keep the connection open</source> <translation type="unfinished"/> </message> @@ -2821,52 +2872,47 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+67"/> + <location line="+64"/> <source>Fee per KB to add to transactions you send</source> <translation type="unfinished"/> </message> <message> - <location line="+17"/> + <location line="+19"/> <source>Loading wallet...</source> <translation type="unfinished"/> </message> <message> - <location line="-53"/> + <location line="-52"/> <source>Cannot downgrade wallet</source> <translation type="unfinished"/> </message> <message> - <location line="+1"/> - <source>Cannot initialize keypool</source> - <translation type="unfinished"/> - </message> - <message> <location line="+3"/> <source>Cannot write default address</source> <translation type="unfinished"/> </message> <message> - <location line="+63"/> + <location line="+64"/> <source>Rescanning...</source> <translation type="unfinished"/> </message> <message> - <location line="-55"/> + <location line="-57"/> <source>Done loading</source> <translation type="unfinished"/> </message> <message> - <location line="+79"/> + <location line="+82"/> <source>To use the %s option</source> <translation type="unfinished"/> </message> <message> - <location line="-71"/> + <location line="-74"/> <source>Error</source> <translation type="unfinished"/> </message> <message> - <location line="-33"/> + <location line="-31"/> <source>You must set rpcpassword=<password> in the configuration file: %s If the file does not exist, create it with owner-readable-only file permissions.</source> diff --git a/src/qt/locale/bitcoin_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 <translation type="unfinished"/> </message> <message> - <location filename="../aboutdialog.cpp" line="+17"/> + <location filename="../aboutdialog.cpp" line="+14"/> <source>Copyright</source> <translation type="unfinished"/> </message> <message> <location line="+0"/> - <source>2009-%1 The Bitcoin developers</source> + <source>The Bitcoin developers</source> <translation type="unfinished"/> </message> </context> @@ -61,7 +61,7 @@ This product includes software developed by the OpenSSL Project for use in the O <translation type="unfinished"/> </message> <message> - <location filename="../addressbookpage.cpp" line="+59"/> + <location filename="../addressbookpage.cpp" line="+63"/> <source>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.</source> <translation type="unfinished"/> </message> @@ -91,7 +91,17 @@ This product includes software developed by the OpenSSL Project for use in the O <translation type="unfinished"/> </message> <message> - <location line="-14"/> + <location line="+27"/> + <source>Export the data in the current tab to a file</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+3"/> + <source>&Export</source> + <translation type="unfinished"/> + </message> + <message> + <location line="-44"/> <source>Verify a message to ensure it was signed with a specified Bitcoin address</source> <translation type="unfinished"/> </message> @@ -313,12 +323,12 @@ This product includes software developed by the OpenSSL Project for use in the O <translation type="unfinished"/> </message> <message> - <location line="+299"/> + <location line="+280"/> <source>Synchronizing with network...</source> <translation type="unfinished"/> </message> <message> - <location line="-368"/> + <location line="-349"/> <source>&Overview</source> <translation type="unfinished"/> </message> @@ -393,7 +403,7 @@ This product includes software developed by the OpenSSL Project for use in the O <translation type="unfinished"/> </message> <message> - <location line="+304"/> + <location line="+285"/> <source>Importing blocks from disk...</source> <translation type="unfinished"/> </message> @@ -403,12 +413,7 @@ This product includes software developed by the OpenSSL Project for use in the O <translation type="unfinished"/> </message> <message> - <location line="-300"/> - <source>&Export...</source> - <translation type="unfinished"/> - </message> - <message> - <location line="-66"/> + <location line="-347"/> <source>Send coins to a Bitcoin address</source> <translation type="unfinished"/> </message> @@ -418,12 +423,7 @@ This product includes software developed by the OpenSSL Project for use in the O <translation type="unfinished"/> </message> <message> - <location line="+18"/> - <source>Export the data in the current tab to a file</source> - <translation type="unfinished"/> - </message> - <message> - <location line="-9"/> + <location line="+9"/> <source>Backup wallet to another location</source> <translation type="unfinished"/> </message> @@ -433,7 +433,7 @@ This product includes software developed by the OpenSSL Project for use in the O <translation type="unfinished"/> </message> <message> - <location line="+9"/> + <location line="+6"/> <source>&Debug window</source> <translation type="unfinished"/> </message> @@ -443,23 +443,23 @@ This product includes software developed by the OpenSSL Project for use in the O <translation type="unfinished"/> </message> <message> - <location line="-7"/> + <location line="-4"/> <source>&Verify message...</source> <translation type="unfinished"/> </message> <message> - <location line="-163"/> - <location line="+541"/> + <location line="-165"/> + <location line="+530"/> <source>Bitcoin</source> <translation type="unfinished"/> </message> <message> - <location line="-541"/> + <location line="-530"/> <source>Wallet</source> <translation type="unfinished"/> </message> <message> - <location line="+99"/> + <location line="+101"/> <source>&Send</source> <translation type="unfinished"/> </message> @@ -504,12 +504,12 @@ This product includes software developed by the OpenSSL Project for use in the O <translation type="unfinished"/> </message> <message> - <location line="+31"/> + <location line="+28"/> <source>&File</source> <translation type="unfinished"/> </message> <message> - <location line="+8"/> + <location line="+7"/> <source>&Settings</source> <translation type="unfinished"/> </message> @@ -524,12 +524,7 @@ This product includes software developed by the OpenSSL Project for use in the O <translation type="unfinished"/> </message> <message> - <location line="+8"/> - <source>Actions toolbar</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+13"/> + <location line="+17"/> <location line="+10"/> <source>[testnet]</source> <translation type="unfinished"/> @@ -540,12 +535,17 @@ This product includes software developed by the OpenSSL Project for use in the O <translation type="unfinished"/> </message> <message numerus="yes"> - <location line="+140"/> + <location line="+141"/> <source>%n active connection(s) to Bitcoin network</source> <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation> </message> <message> - <location line="+39"/> + <location line="+22"/> + <source>No block source available...</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+12"/> <source>Processed %1 of %2 (estimated) blocks of transaction history.</source> <translation type="unfinished"/> </message> @@ -570,7 +570,7 @@ This product includes software developed by the OpenSSL Project for use in the O <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation> </message> <message> - <location line="+5"/> + <location line="+4"/> <source>%1 behind</source> <translation type="unfinished"/> </message> @@ -585,7 +585,7 @@ This product includes software developed by the OpenSSL Project for use in the O <translation type="unfinished"/> </message> <message> - <location line="+21"/> + <location line="+22"/> <source>Error</source> <translation type="unfinished"/> </message> @@ -600,22 +600,22 @@ This product includes software developed by the OpenSSL Project for use in the O <translation type="unfinished"/> </message> <message> - <location line="+68"/> + <location line="+70"/> <source>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?</source> <translation type="unfinished"/> </message> <message> - <location line="-138"/> + <location line="-140"/> <source>Up to date</source> <translation type="unfinished"/> </message> <message> - <location line="+32"/> + <location line="+31"/> <source>Catching up...</source> <translation type="unfinished"/> </message> <message> - <location line="+110"/> + <location line="+113"/> <source>Confirm transaction fee</source> <translation type="unfinished"/> </message> @@ -661,7 +661,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location filename="../bitcoin.cpp" line="+104"/> + <location filename="../bitcoin.cpp" line="+111"/> <source>A fatal error occurred. Bitcoin can no longer continue safely and will quit.</source> <translation type="unfinished"/> </message> @@ -669,7 +669,7 @@ Address: %4 <context> <name>ClientModel</name> <message> - <location filename="../clientmodel.cpp" line="+98"/> + <location filename="../clientmodel.cpp" line="+104"/> <source>Network Alert</source> <translation type="unfinished"/> </message> @@ -800,7 +800,7 @@ Address: %4 </message> <message> <location line="+6"/> - <source>Optional transaction fee per kB that helps make sure your transactions are processed quickly. Most transactions are 1 kB. Fee 0.01 recommended.</source> + <source>Optional transaction fee per kB that helps make sure your transactions are processed quickly. Most transactions are 1 kB.</source> <translation type="unfinished"/> </message> <message> @@ -1050,7 +1050,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location filename="../overviewpage.cpp" line="+115"/> + <location filename="../overviewpage.cpp" line="+116"/> <location line="+1"/> <source>out of sync</source> <translation type="unfinished"/> @@ -1637,6 +1637,19 @@ Address: %4 </message> </context> <context> + <name>SplashScreen</name> + <message> + <location filename="../splashscreen.cpp" line="+22"/> + <source>The Bitcoin developers</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>[testnet]</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>TransactionDesc</name> <message> <location filename="../transactiondesc.cpp" line="+20"/> @@ -2111,9 +2124,27 @@ Address: %4 </message> </context> <context> + <name>WalletModel</name> + <message> + <location filename="../walletmodel.cpp" line="+193"/> + <source>Send Coins</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>WalletView</name> <message> - <location filename="../walletview.cpp" line="+247"/> + <location filename="../walletview.cpp" line="+42"/> + <source>&Export</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Export the data in the current tab to a file</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+193"/> <source>Backup Wallet</source> <translation type="unfinished"/> </message> @@ -2146,37 +2177,37 @@ Address: %4 <context> <name>bitcoin-core</name> <message> - <location filename="../bitcoinstrings.cpp" line="+96"/> + <location filename="../bitcoinstrings.cpp" line="+94"/> <source>Bitcoin version</source> <translation type="unfinished"/> </message> <message> - <location line="+98"/> + <location line="+102"/> <source>Usage:</source> <translation type="unfinished"/> </message> <message> - <location line="-25"/> + <location line="-29"/> <source>Send command to -server or bitcoind</source> <translation type="unfinished"/> </message> <message> - <location line="-22"/> + <location line="-23"/> <source>List commands</source> <translation type="unfinished"/> </message> <message> - <location line="-10"/> + <location line="-12"/> <source>Get help for a command</source> <translation type="unfinished"/> </message> <message> - <location line="+21"/> + <location line="+24"/> <source>Options:</source> <translation type="unfinished"/> </message> <message> - <location line="+23"/> + <location line="+24"/> <source>Specify configuration file (default: bitcoin.conf)</source> <translation type="unfinished"/> </message> @@ -2186,27 +2217,17 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="-48"/> - <source>Generate coins</source> - <translation type="unfinished"/> - </message> - <message> - <location line="-27"/> - <source>Don't generate coins</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+74"/> + <location line="-1"/> <source>Specify data directory</source> <translation type="unfinished"/> </message> <message> - <location line="-8"/> + <location line="-9"/> <source>Set database cache size in megabytes (default: 25)</source> <translation type="unfinished"/> </message> <message> - <location line="-27"/> + <location line="-28"/> <source>Listen for connections on <port> (default: 8333 or testnet: 18333)</source> <translation type="unfinished"/> </message> @@ -2221,7 +2242,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+80"/> + <location line="+82"/> <source>Specify your own public address</source> <translation type="unfinished"/> </message> @@ -2231,22 +2252,22 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="-132"/> + <location line="-134"/> <source>Number of seconds to keep misbehaving peers from reconnecting (default: 86400)</source> <translation type="unfinished"/> </message> <message> - <location line="-32"/> + <location line="-29"/> <source>An error occurred while setting up the RPC port %u for listening on IPv4: %s</source> <translation type="unfinished"/> </message> <message> - <location line="+30"/> + <location line="+27"/> <source>Listen for JSON-RPC connections on <port> (default: 8332 or testnet: 18332)</source> <translation type="unfinished"/> </message> <message> - <location line="+36"/> + <location line="+37"/> <source>Accept command line and JSON-RPC commands</source> <translation type="unfinished"/> </message> @@ -2256,17 +2277,17 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+33"/> + <location line="+37"/> <source>Use the test network</source> <translation type="unfinished"/> </message> <message> - <location line="-108"/> + <location line="-112"/> <source>Accept connections from outside (default: 1 if no -proxy or -connect)</source> <translation type="unfinished"/> </message> <message> - <location line="-82"/> + <location line="-80"/> <source>%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. </message> <message> <location line="+3"/> - <source>Error initializing database environment %s! To recover, BACKUP THAT DIRECTORY, then remove everything from it except for wallet.dat.</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+3"/> <source>Error: The transaction was rejected! This might happen if some of the coins in your wallet were already spent, such as if you used a copy of wallet.dat and coins were spent in the copy but not marked as spent here.</source> <translation type="unfinished"/> </message> @@ -2326,12 +2342,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+3"/> - <source>Set the number of script verification threads (1-16, 0=auto, default: 0)</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+2"/> + <location line="+6"/> <source>This is a pre-release test build - use at your own risk - do not use for mining or merchant applications</source> <translation type="unfinished"/> </message> @@ -2371,7 +2382,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+6"/> + <location line="+5"/> <source>Connect only to the specified node(s)</source> <translation type="unfinished"/> </message> @@ -2391,7 +2402,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+3"/> + <location line="+2"/> <source>Error initializing block database</source> <translation type="unfinished"/> </message> @@ -2417,11 +2428,6 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. </message> <message> <location line="+1"/> - <source>Error: Transaction creation failed!</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+1"/> <source>Error: Wallet locked, unable to create transaction!</source> <translation type="unfinished"/> </message> @@ -2491,7 +2497,12 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+3"/> + <location line="+1"/> + <source>Generate coins (default: 0)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+2"/> <source>How many blocks to check at startup (default: 288, 0 = all)</source> <translation type="unfinished"/> </message> @@ -2501,7 +2512,12 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+24"/> + <location line="+19"/> + <source>Not enough file descriptors available.</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+8"/> <source>Rebuild block chain index from current blk000??.dat files</source> <translation type="unfinished"/> </message> @@ -2511,7 +2527,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+22"/> + <location line="+26"/> <source>Verifying blocks...</source> <translation type="unfinished"/> </message> @@ -2521,12 +2537,17 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="-62"/> + <location line="-69"/> <source>Imports blocks from external blk000??.dat file</source> <translation type="unfinished"/> </message> <message> - <location line="+1"/> + <location line="-76"/> + <source>Set the number of script verification threads (up to 16, 0 = auto, <0 = leave that many cores free, default: 0)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+77"/> <source>Information</source> <translation type="unfinished"/> </message> @@ -2536,6 +2557,16 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> + <location line="+1"/> + <source>Invalid amount for -minrelaytxfee=<amount>: '%s'</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Invalid amount for -mintxfee=<amount>: '%s'</source> + <translation type="unfinished"/> + </message> + <message> <location line="+8"/> <source>Maintain a full transaction index (default: 0)</source> <translation type="unfinished"/> @@ -2551,7 +2582,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+1"/> + <location line="+2"/> <source>Only accept block chain matching built-in checkpoints (default: 1)</source> <translation type="unfinished"/> </message> @@ -2611,6 +2642,11 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> + <location line="+1"/> + <source>Signing transaction failed</source> + <translation type="unfinished"/> + </message> + <message> <location line="+2"/> <source>Specify connection timeout in milliseconds (default: 5000)</source> <translation type="unfinished"/> @@ -2621,7 +2657,22 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+10"/> + <location line="+4"/> + <source>Transaction amount too small</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Transaction amounts must be positive</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Transaction too large</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+7"/> <source>Use UPnP to map the listening port (default: 0)</source> <translation type="unfinished"/> </message> @@ -2661,7 +2712,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="-46"/> + <location line="-50"/> <source>Password for JSON-RPC connections</source> <translation type="unfinished"/> </message> @@ -2676,17 +2727,17 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="-119"/> + <location line="-120"/> <source>Execute command when the best block changes (%s in cmd is replaced by block hash)</source> <translation type="unfinished"/> </message> <message> - <location line="+142"/> + <location line="+147"/> <source>Upgrade wallet to latest format</source> <translation type="unfinished"/> </message> <message> - <location line="-17"/> + <location line="-21"/> <source>Set key pool size to <n> (default: 100)</source> <translation type="unfinished"/> </message> @@ -2696,12 +2747,12 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+31"/> + <location line="+35"/> <source>Use OpenSSL (https) for JSON-RPC connections</source> <translation type="unfinished"/> </message> <message> - <location line="-22"/> + <location line="-26"/> <source>Server certificate file (default: server.cert)</source> <translation type="unfinished"/> </message> @@ -2711,37 +2762,37 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="-153"/> + <location line="-151"/> <source>Acceptable ciphers (default: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH)</source> <translation type="unfinished"/> </message> <message> - <location line="+166"/> + <location line="+165"/> <source>This help message</source> <translation type="unfinished"/> </message> <message> - <location line="+3"/> + <location line="+6"/> <source>Unable to bind to %s on this computer (bind returned error %d, %s)</source> <translation type="unfinished"/> </message> <message> - <location line="-86"/> + <location line="-91"/> <source>Connect through socks proxy</source> <translation type="unfinished"/> </message> <message> - <location line="-11"/> + <location line="-10"/> <source>Allow DNS lookups for -addnode, -seednode and -connect</source> <translation type="unfinished"/> </message> <message> - <location line="+56"/> + <location line="+55"/> <source>Loading addresses...</source> <translation type="unfinished"/> </message> <message> - <location line="-34"/> + <location line="-35"/> <source>Error loading wallet.dat: Wallet corrupted</source> <translation type="unfinished"/> </message> @@ -2751,22 +2802,22 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+87"/> + <location line="+93"/> <source>Wallet needed to be rewritten: restart Bitcoin to complete</source> <translation type="unfinished"/> </message> <message> - <location line="-89"/> + <location line="-95"/> <source>Error loading wallet.dat</source> <translation type="unfinished"/> </message> <message> - <location line="+29"/> + <location line="+28"/> <source>Invalid -proxy address: '%s'</source> <translation type="unfinished"/> </message> <message> - <location line="+49"/> + <location line="+56"/> <source>Unknown network specified in -onlynet: '%s'</source> <translation type="unfinished"/> </message> @@ -2776,7 +2827,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="-91"/> + <location line="-96"/> <source>Cannot resolve -bind address: '%s'</source> <translation type="unfinished"/> </message> @@ -2796,17 +2847,17 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="-4"/> + <location line="-6"/> <source>Insufficient funds</source> <translation type="unfinished"/> </message> <message> - <location line="+8"/> + <location line="+10"/> <source>Loading block index...</source> <translation type="unfinished"/> </message> <message> - <location line="-58"/> + <location line="-57"/> <source>Add a node to connect to and attempt to keep the connection open</source> <translation type="unfinished"/> </message> @@ -2816,52 +2867,47 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+67"/> + <location line="+64"/> <source>Fee per KB to add to transactions you send</source> <translation type="unfinished"/> </message> <message> - <location line="+17"/> + <location line="+19"/> <source>Loading wallet...</source> <translation type="unfinished"/> </message> <message> - <location line="-53"/> + <location line="-52"/> <source>Cannot downgrade wallet</source> <translation type="unfinished"/> </message> <message> - <location line="+1"/> - <source>Cannot initialize keypool</source> - <translation type="unfinished"/> - </message> - <message> <location line="+3"/> <source>Cannot write default address</source> <translation type="unfinished"/> </message> <message> - <location line="+63"/> + <location line="+64"/> <source>Rescanning...</source> <translation type="unfinished"/> </message> <message> - <location line="-55"/> + <location line="-57"/> <source>Done loading</source> <translation type="unfinished"/> </message> <message> - <location line="+79"/> + <location line="+82"/> <source>To use the %s option</source> <translation type="unfinished"/> </message> <message> - <location line="-71"/> + <location line="-74"/> <source>Error</source> <translation type="unfinished"/> </message> <message> - <location line="-33"/> + <location line="-31"/> <source>You must set rpcpassword=<password> in the configuration file: %s If the file does not exist, create it with owner-readable-only file permissions.</source> diff --git a/src/qt/locale/bitcoin_he.ts b/src/qt/locale/bitcoin_he.ts index 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 שנכתבה ע"י תומס ברנרד.</translation> </message> <message> - <location filename="../aboutdialog.cpp" line="+17"/> + <location filename="../aboutdialog.cpp" line="+14"/> <source>Copyright</source> <translation>זכויות יוצרים</translation> </message> <message> <location line="+0"/> - <source>2009-%1 The Bitcoin developers</source> - <translation>2009-%1 מפתחי ביטקוין</translation> + <source>The Bitcoin developers</source> + <translation type="unfinished"/> </message> </context> <context> @@ -66,7 +66,7 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>כתובת חדשה</translation> </message> <message> - <location filename="../addressbookpage.cpp" line="+59"/> + <location filename="../addressbookpage.cpp" line="+63"/> <source>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.</source> <translation>אלה כתובת הביטקוין שלך עבור קבלת תשלומים. ייתכן ותרצה לתת כתובת שונה לכל שולח כדי שתוכל לעקוב אחר מי משלם לך.</translation> </message> @@ -96,7 +96,17 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>מחק את הכתובת שנבחרה מהרשימה</translation> </message> <message> - <location line="-14"/> + <location line="+27"/> + <source>Export the data in the current tab to a file</source> + <translation>יצוא הנתונים בטאב הנוכחי לקובץ</translation> + </message> + <message> + <location line="+3"/> + <source>&Export</source> + <translation type="unfinished"/> + </message> + <message> + <location line="-44"/> <source>Verify a message to ensure it was signed with a specified Bitcoin address</source> <translation>אמת הודעה בכדי להבטיח שהיא נחתמה עם כתובת ביטקוין מסוימת.</translation> </message> @@ -318,12 +328,12 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>חתום על הודעה</translation> </message> <message> - <location line="+299"/> + <location line="+280"/> <source>Synchronizing with network...</source> <translation>מסתנכרן עם הרשת...</translation> </message> <message> - <location line="-368"/> + <location line="-349"/> <source>&Overview</source> <translation>&סקירה</translation> </message> @@ -398,7 +408,7 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>שנה סיסמא</translation> </message> <message> - <location line="+304"/> + <location line="+285"/> <source>Importing blocks from disk...</source> <translation>מייבא בלוקים מהדיסק...</translation> </message> @@ -408,12 +418,7 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>מחדש את אינדקס הבלוקים בדיסק...</translation> </message> <message> - <location line="-300"/> - <source>&Export...</source> - <translation>י&צא לקובץ</translation> - </message> - <message> - <location line="-66"/> + <location line="-347"/> <source>Send coins to a Bitcoin address</source> <translation>שלח מטבעות לכתובת ביטקוין</translation> </message> @@ -423,12 +428,7 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>שנה אפשרויות תצורה עבור ביטקוין</translation> </message> <message> - <location line="+18"/> - <source>Export the data in the current tab to a file</source> - <translation>יצוא הנתונים בטאב הנוכחי לקובץ</translation> - </message> - <message> - <location line="-9"/> + <location line="+9"/> <source>Backup wallet to another location</source> <translation>גיבוי הארנק למקום אחר</translation> </message> @@ -438,7 +438,7 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>שנה את הסיסמה להצפנת הארנק</translation> </message> <message> - <location line="+9"/> + <location line="+6"/> <source>&Debug window</source> <translation>חלון ניפוי</translation> </message> @@ -448,23 +448,23 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>פתח את לוח הבקרה לאבחון וניפוי</translation> </message> <message> - <location line="-7"/> + <location line="-4"/> <source>&Verify message...</source> <translation>אמת הודעה...</translation> </message> <message> - <location line="-163"/> - <location line="+541"/> + <location line="-165"/> + <location line="+530"/> <source>Bitcoin</source> <translation>ביטקוין</translation> </message> <message> - <location line="-541"/> + <location line="-530"/> <source>Wallet</source> <translation>ארנק</translation> </message> <message> - <location line="+99"/> + <location line="+101"/> <source>&Send</source> <translation>ושלח</translation> </message> @@ -509,12 +509,12 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>אמת הודעות כדי להבטיח שהן נחתמו עם כתובת ביטקוין מסוימות</translation> </message> <message> - <location line="+31"/> + <location line="+28"/> <source>&File</source> <translation>&קובץ</translation> </message> <message> - <location line="+8"/> + <location line="+7"/> <source>&Settings</source> <translation>ה&גדרות</translation> </message> @@ -529,12 +529,7 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>סרגל כלים טאבים</translation> </message> <message> - <location line="+8"/> - <source>Actions toolbar</source> - <translation>סרגל כלים פעולות</translation> - </message> - <message> - <location line="+13"/> + <location line="+17"/> <location line="+10"/> <source>[testnet]</source> <translation>[רשת-בדיקה]</translation> @@ -545,12 +540,17 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>תוכנת ביטקוין</translation> </message> <message numerus="yes"> - <location line="+140"/> + <location line="+141"/> <source>%n active connection(s) to Bitcoin network</source> <translation><numerusform>חיבור פעיל אחד לרשת הביטקוין</numerusform><numerusform>%n חיבורים פעילים לרשת הביטקוין</numerusform></translation> </message> <message> - <location line="+39"/> + <location line="+22"/> + <source>No block source available...</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+12"/> <source>Processed %1 of %2 (estimated) blocks of transaction history.</source> <translation>1% מתוך 2% (משוער) בלוקים של הסטוריית פעולת עובדו </translation> </message> @@ -575,7 +575,7 @@ This product includes software developed by the OpenSSL Project for use in the O <translation><numerusform>%n שבוע</numerusform><numerusform>%n שבועות</numerusform></translation> </message> <message> - <location line="+5"/> + <location line="+4"/> <source>%1 behind</source> <translation>1% מאחור</translation> </message> @@ -590,7 +590,7 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>לאחר זאת פעולות נספות טרם יהיו גלויות</translation> </message> <message> - <location line="+21"/> + <location line="+22"/> <source>Error</source> <translation>שגיאה</translation> </message> @@ -605,22 +605,22 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>מידע</translation> </message> <message> - <location line="+68"/> + <location line="+70"/> <source>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?</source> <translation>פעולה זו חורגת מגבולות הגודל. עדיין באפשרותך לשלוח אותה תמורת עמלה של %1, המיועדת לצמתים שמעבדים את הפעולה שלך ועוזרת לתמוך ברשת. האם ברצונך לשלם את העמלה?</translation> </message> <message> - <location line="-138"/> + <location line="-140"/> <source>Up to date</source> <translation>עדכני</translation> </message> <message> - <location line="+32"/> + <location line="+31"/> <source>Catching up...</source> <translation>מתעדכן...</translation> </message> <message> - <location line="+110"/> + <location line="+113"/> <source>Confirm transaction fee</source> <translation>אשר עמלת פעולה</translation> </message> @@ -669,7 +669,7 @@ Address: %4 <translation>הארנק <b>מוצפן</b> וכרגע <b>נעול</b></translation> </message> <message> - <location filename="../bitcoin.cpp" line="+104"/> + <location filename="../bitcoin.cpp" line="+111"/> <source>A fatal error occurred. Bitcoin can no longer continue safely and will quit.</source> <translation>שגיאה סופנית אירעה. ביטקוין אינו יכול להמשיך לפעול בבטחה ולכן ייסגר.</translation> </message> @@ -677,7 +677,7 @@ Address: %4 <context> <name>ClientModel</name> <message> - <location filename="../clientmodel.cpp" line="+98"/> + <location filename="../clientmodel.cpp" line="+104"/> <source>Network Alert</source> <translation>אזעקת רשת</translation> </message> @@ -808,8 +808,8 @@ Address: %4 </message> <message> <location line="+6"/> - <source>Optional transaction fee per kB that helps make sure your transactions are processed quickly. Most transactions are 1 kB. Fee 0.01 recommended.</source> - <translation>עמלת פעולה אופציונלית לכל kB תבטיח שהפעולה שלך תעובד בזריזות. רוב הפעולות הן 1 kB. מומלצת עמלה בסך 0.01.</translation> + <source>Optional transaction fee per kB that helps make sure your transactions are processed quickly. Most transactions are 1 kB.</source> + <translation type="unfinished"/> </message> <message> <location line="+15"/> @@ -1058,7 +1058,7 @@ Address: %4 <translation>הסכום הכולל של פעולות שטרם אושרו, ועוד אינן נספרות בחישוב היתרה הנוכחית</translation> </message> <message> - <location filename="../overviewpage.cpp" line="+115"/> + <location filename="../overviewpage.cpp" line="+116"/> <location line="+1"/> <source>out of sync</source> <translation>לא מסונכרן</translation> @@ -1645,6 +1645,19 @@ Address: %4 </message> </context> <context> + <name>SplashScreen</name> + <message> + <location filename="../splashscreen.cpp" line="+22"/> + <source>The Bitcoin developers</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>[testnet]</source> + <translation>[רשת-בדיקה]</translation> + </message> +</context> +<context> <name>TransactionDesc</name> <message> <location filename="../transactiondesc.cpp" line="+20"/> @@ -2119,9 +2132,27 @@ Address: %4 </message> </context> <context> + <name>WalletModel</name> + <message> + <location filename="../walletmodel.cpp" line="+193"/> + <source>Send Coins</source> + <translation>שלח מטבעות</translation> + </message> +</context> +<context> <name>WalletView</name> <message> - <location filename="../walletview.cpp" line="+247"/> + <location filename="../walletview.cpp" line="+42"/> + <source>&Export</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Export the data in the current tab to a file</source> + <translation>יצוא הנתונים בטאב הנוכחי לקובץ</translation> + </message> + <message> + <location line="+193"/> <source>Backup Wallet</source> <translation>גבה ארנק</translation> </message> @@ -2154,37 +2185,37 @@ Address: %4 <context> <name>bitcoin-core</name> <message> - <location filename="../bitcoinstrings.cpp" line="+96"/> + <location filename="../bitcoinstrings.cpp" line="+94"/> <source>Bitcoin version</source> <translation>גרסת ביטקוין</translation> </message> <message> - <location line="+98"/> + <location line="+102"/> <source>Usage:</source> <translation>שימוש:</translation> </message> <message> - <location line="-25"/> + <location line="-29"/> <source>Send command to -server or bitcoind</source> <translation>שלח פקודה ל -server או bitcoind</translation> </message> <message> - <location line="-22"/> + <location line="-23"/> <source>List commands</source> <translation>רשימת פקודות</translation> </message> <message> - <location line="-10"/> + <location line="-12"/> <source>Get help for a command</source> <translation>קבל עזרה עבור פקודה</translation> </message> <message> - <location line="+21"/> + <location line="+24"/> <source>Options:</source> <translation>אפשרויות:</translation> </message> <message> - <location line="+23"/> + <location line="+24"/> <source>Specify configuration file (default: bitcoin.conf)</source> <translation>ציין קובץ הגדרות (ברירת מחדל: bitcoin.conf)</translation> </message> @@ -2194,27 +2225,17 @@ Address: %4 <translation>ציין קובץ pid (ברירת מחדל: bitcoind.pid)</translation> </message> <message> - <location line="-48"/> - <source>Generate coins</source> - <translation>צור מטבעות</translation> - </message> - <message> - <location line="-27"/> - <source>Don't generate coins</source> - <translation>אל תייצר מטבעות</translation> - </message> - <message> - <location line="+74"/> + <location line="-1"/> <source>Specify data directory</source> <translation>ציין תיקיית נתונים</translation> </message> <message> - <location line="-8"/> + <location line="-9"/> <source>Set database cache size in megabytes (default: 25)</source> <translation>קבע את גודל המטמון של מסד הנתונים במגהבייט (ברירת מחדל: 25)</translation> </message> <message> - <location line="-27"/> + <location line="-28"/> <source>Listen for connections on <port> (default: 8333 or testnet: 18333)</source> <translation>האזן לחיבורים ב<פורט> (ברירת מחדל: 8333 או ברשת הבדיקה: 18333)</translation> </message> @@ -2229,7 +2250,7 @@ Address: %4 <translation>התחבר לצומת כדי לדלות כתובות עמיתים, ואז התנתק</translation> </message> <message> - <location line="+80"/> + <location line="+82"/> <source>Specify your own public address</source> <translation>ציין את הכתובת הפומבית שלך</translation> </message> @@ -2239,22 +2260,22 @@ Address: %4 <translation>סף להתנתקות מעמיתים הנוהגים שלא כהלכה (ברירת מחדל: 100)</translation> </message> <message> - <location line="-132"/> + <location line="-134"/> <source>Number of seconds to keep misbehaving peers from reconnecting (default: 86400)</source> <translation>מספר שניות למנוע מעמיתים הנוהגים שלא כהלכה מלהתחבר מחדש (ברירת מחדל: 86400)</translation> </message> <message> - <location line="-32"/> + <location line="-29"/> <source>An error occurred while setting up the RPC port %u for listening on IPv4: %s</source> <translation>אירעה שגיאה בעת הגדרת פורט RPC %u להאזנה ב-IPv4: %s</translation> </message> <message> - <location line="+30"/> + <location line="+27"/> <source>Listen for JSON-RPC connections on <port> (default: 8332 or testnet: 18332)</source> <translation>האזן לחיבורי JSON-RPC ב- <port> (ברירת מחדל: 8332 או רשת בדיקה: 18332)</translation> </message> <message> - <location line="+36"/> + <location line="+37"/> <source>Accept command line and JSON-RPC commands</source> <translation>קבל פקודות משורת הפקודה ו- JSON-RPC</translation> </message> @@ -2264,17 +2285,17 @@ Address: %4 <translation>רוץ ברקע כדימון וקבל פקודות</translation> </message> <message> - <location line="+33"/> + <location line="+37"/> <source>Use the test network</source> <translation>השתמש ברשת הבדיקה</translation> </message> <message> - <location line="-108"/> + <location line="-112"/> <source>Accept connections from outside (default: 1 if no -proxy or -connect)</source> <translation>קבל חיבורים מבחוץ (ברירת מחדל: 1 ללא -proxy או -connect)</translation> </message> <message> - <location line="-82"/> + <location line="-80"/> <source>%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 </message> <message> <location line="+3"/> - <source>Error initializing database environment %s! To recover, BACKUP THAT DIRECTORY, then remove everything from it except for wallet.dat.</source> - <translation>שגיאה באתחול סביבת מסד הנתונים %s! בשביל להתאושש, גבה את התיקיה הזאת, ואז הסר הכל מלבד wallet.dat.</translation> - </message> - <message> - <location line="+3"/> <source>Error: The transaction was rejected! This might happen if some of the coins in your wallet were already spent, such as if you used a copy of wallet.dat and coins were spent in the copy but not marked as spent here.</source> <translation>שגיאה: הפעולה נדחתה! זה עלול לקרות אם כמה מהמטבעות בארנק שלך כבר נוצלו, למשל אם השתמשת בעותק של wallet.dat ומטבעות נשלחו בעותק אך לא סומנו כמנוצלות כאן.</translation> </message> @@ -2344,12 +2360,7 @@ rpcpassword=%s <translation>קבע גודל מקסימלי עבור פעולות עדיפות גבוהה/עמלה נמוכה בבתים (ברירת מחדל: 27000)</translation> </message> <message> - <location line="+3"/> - <source>Set the number of script verification threads (1-16, 0=auto, default: 0)</source> - <translation>קבע את מספר תהליכוני אימות הסקריפטים (1-16, 0 = אוטומטי, ברירת מחדל: 0)</translation> - </message> - <message> - <location line="+2"/> + <location line="+6"/> <source>This is a pre-release test build - use at your own risk - do not use for mining or merchant applications</source> <translation>זוהי בניית ניסיון טרום-שחרור - השימוש בה על אחריותך - אין להשתמש לצורך כריה או יישומי מסחר</translation> </message> @@ -2389,7 +2400,7 @@ rpcpassword=%s <translation>אפשרויות יצירת בלוק:</translation> </message> <message> - <location line="+6"/> + <location line="+5"/> <source>Connect only to the specified node(s)</source> <translation>התחבר רק לצמתים המצוינים</translation> </message> @@ -2409,7 +2420,7 @@ rpcpassword=%s <translation>האם תרצה כעט לבנות מחדש את מסד נתוני הבלוקים?</translation> </message> <message> - <location line="+3"/> + <location line="+2"/> <source>Error initializing block database</source> <translation>שגיאה באתחול מסד נתוני הבלוקים</translation> </message> @@ -2435,11 +2446,6 @@ rpcpassword=%s </message> <message> <location line="+1"/> - <source>Error: Transaction creation failed!</source> - <translation>שגיאה: יצירת הפעולה נכשלה!</translation> - </message> - <message> - <location line="+1"/> <source>Error: Wallet locked, unable to create transaction!</source> <translation>שגיאה: הארנק נעול, אין אפשרות ליצור פעולה!</translation> </message> @@ -2509,7 +2515,12 @@ rpcpassword=%s <translation>מצא עמיתים ע"י חיפוש DNS (ברירת מחדל: 1 ללא -connect)</translation> </message> <message> - <location line="+3"/> + <location line="+1"/> + <source>Generate coins (default: 0)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+2"/> <source>How many blocks to check at startup (default: 288, 0 = all)</source> <translation>מספר הבלוקים לבדוק בעת אתחול (ברירת מחדל: 288, 0 = כולם)</translation> </message> @@ -2519,7 +2530,12 @@ rpcpassword=%s <translation>מידת היסודיות של אימות הבלוקים (0-4, ברירת מחדל: 3)</translation> </message> <message> - <location line="+24"/> + <location line="+19"/> + <source>Not enough file descriptors available.</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+8"/> <source>Rebuild block chain index from current blk000??.dat files</source> <translation>בנה מחדש את אינדק שרשרת הבלוקים מקבצי ה-blk000??.dat הנוכחיים.</translation> </message> @@ -2529,7 +2545,7 @@ rpcpassword=%s <translation>קבע את מספר תהליכוני לשירות קריאות RPC (ברירת מחדל: 4)</translation> </message> <message> - <location line="+22"/> + <location line="+26"/> <source>Verifying blocks...</source> <translation>מאמת את שלמות מסד הנתונים...</translation> </message> @@ -2539,12 +2555,17 @@ rpcpassword=%s <translation>מאמת את יושרת הארנק...</translation> </message> <message> - <location line="-62"/> + <location line="-69"/> <source>Imports blocks from external blk000??.dat file</source> <translation>מייבא בלוקים מקובצי blk000??.dat חיצוניים</translation> </message> <message> - <location line="+1"/> + <location line="-76"/> + <source>Set the number of script verification threads (up to 16, 0 = auto, <0 = leave that many cores free, default: 0)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+77"/> <source>Information</source> <translation>מידע</translation> </message> @@ -2554,6 +2575,16 @@ rpcpassword=%s <translation>כתובת לא תקינה ל -tor: '%s'</translation> </message> <message> + <location line="+1"/> + <source>Invalid amount for -minrelaytxfee=<amount>: '%s'</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Invalid amount for -mintxfee=<amount>: '%s'</source> + <translation type="unfinished"/> + </message> + <message> <location line="+8"/> <source>Maintain a full transaction index (default: 0)</source> <translation>תחזק אינדקס פעולות מלא (ברירת מחדל: 0)</translation> @@ -2569,7 +2600,7 @@ rpcpassword=%s <translation>חוצץ שליחה מירבי לכל חיבור, <n>*1000 בתים (ברירת מחדל: 1000)</translation> </message> <message> - <location line="+1"/> + <location line="+2"/> <source>Only accept block chain matching built-in checkpoints (default: 1)</source> <translation>קבל רק שרשרת בלוקים התואמת נקודות ביקורת מובנות (ברירת מחדל: 1)</translation> </message> @@ -2629,6 +2660,11 @@ rpcpassword=%s <translation>כווץ את קובץ debug.log בהפעלת הקליינט (ברירת מחדל: 1 ללא -debug)</translation> </message> <message> + <location line="+1"/> + <source>Signing transaction failed</source> + <translation type="unfinished"/> + </message> + <message> <location line="+2"/> <source>Specify connection timeout in milliseconds (default: 5000)</source> <translation>ציין הגבלת זמן לחיבור במילישניות (ברירת מחדל: 5000)</translation> @@ -2639,7 +2675,22 @@ rpcpassword=%s <translation>שגיאת מערכת:</translation> </message> <message> - <location line="+10"/> + <location line="+4"/> + <source>Transaction amount too small</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Transaction amounts must be positive</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Transaction too large</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+7"/> <source>Use UPnP to map the listening port (default: 0)</source> <translation>השתמש ב-UPnP כדי למפות את הפורט להאזנה (ברירת מחדל: 0)</translation> </message> @@ -2679,7 +2730,7 @@ rpcpassword=%s <translation>קובץ wallet.dat מושחת, החילוץ נכשל</translation> </message> <message> - <location line="-46"/> + <location line="-50"/> <source>Password for JSON-RPC connections</source> <translation>סיסמה לחיבורי JSON-RPC</translation> </message> @@ -2694,17 +2745,17 @@ rpcpassword=%s <translation>שלח פקודות לצומת ב-<ip> (ברירת מחדל: 127.0.0.1)</translation> </message> <message> - <location line="-119"/> + <location line="-120"/> <source>Execute command when the best block changes (%s in cmd is replaced by block hash)</source> <translation>בצע פקודה זו כשהבלוק הטוב ביותר משתנה (%s בפקודה יוחלף בגיבוב הבלוק)</translation> </message> <message> - <location line="+142"/> + <location line="+147"/> <source>Upgrade wallet to latest format</source> <translation>שדרג את הארנק לפורמט העדכני</translation> </message> <message> - <location line="-17"/> + <location line="-21"/> <source>Set key pool size to <n> (default: 100)</source> <translation>קבע את גודל המאגר ל -<n> (ברירת מחדל: 100)</translation> </message> @@ -2714,12 +2765,12 @@ rpcpassword=%s <translation>סרוק מחדש את שרשרת הבלוקים למציאת פעולות חסרות בארנק</translation> </message> <message> - <location line="+31"/> + <location line="+35"/> <source>Use OpenSSL (https) for JSON-RPC connections</source> <translation>השתמש ב-OpenSSL (https( עבור חיבורי JSON-RPC</translation> </message> <message> - <location line="-22"/> + <location line="-26"/> <source>Server certificate file (default: server.cert)</source> <translation>קובץ תעודת שרת (ברירת מחדל: server.cert)</translation> </message> @@ -2729,37 +2780,37 @@ rpcpassword=%s <translation>מפתח פרטי של השרת (ברירת מחדל: server.pem)</translation> </message> <message> - <location line="-153"/> + <location line="-151"/> <source>Acceptable ciphers (default: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH)</source> <translation>צפנים קבילים (ברירת מחדל: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH)</translation> </message> <message> - <location line="+166"/> + <location line="+165"/> <source>This help message</source> <translation>הודעת העזרה הזו</translation> </message> <message> - <location line="+3"/> + <location line="+6"/> <source>Unable to bind to %s on this computer (bind returned error %d, %s)</source> <translation>לא מסוגל לקשור ל-%s במחשב זה (הקשירה החזירה שגיאה %d, %s)</translation> </message> <message> - <location line="-86"/> + <location line="-91"/> <source>Connect through socks proxy</source> <translation>התחבר דרך פרוקסי SOCKS</translation> </message> <message> - <location line="-11"/> + <location line="-10"/> <source>Allow DNS lookups for -addnode, -seednode and -connect</source> <translation>אפשר בדיקת DNS עבור -addnode, -seednode ו- -connect</translation> </message> <message> - <location line="+56"/> + <location line="+55"/> <source>Loading addresses...</source> <translation>טוען כתובות...</translation> </message> <message> - <location line="-34"/> + <location line="-35"/> <source>Error loading wallet.dat: Wallet corrupted</source> <translation>שגיאה בטעינת הקובץ wallet.dat: הארנק מושחת</translation> </message> @@ -2769,22 +2820,22 @@ rpcpassword=%s <translation>שגיאה בטעינת הקובץ wallet.dat: הארנק דורש גרסה חדשה יותר של ביטקוין</translation> </message> <message> - <location line="+87"/> + <location line="+93"/> <source>Wallet needed to be rewritten: restart Bitcoin to complete</source> <translation>יש לכתוב מחדש את הארנק: אתחל את ביטקוין לסיום</translation> </message> <message> - <location line="-89"/> + <location line="-95"/> <source>Error loading wallet.dat</source> <translation>שגיאה בטעינת הקובץ wallet.dat</translation> </message> <message> - <location line="+29"/> + <location line="+28"/> <source>Invalid -proxy address: '%s'</source> <translation>כתובת -proxy לא תקינה: '%s'</translation> </message> <message> - <location line="+49"/> + <location line="+56"/> <source>Unknown network specified in -onlynet: '%s'</source> <translation>רשת לא ידועה צוינה ב- -onlynet: '%s'</translation> </message> @@ -2794,7 +2845,7 @@ rpcpassword=%s <translation>התבקשה גרסת פרוקסי -socks לא ידועה: %i</translation> </message> <message> - <location line="-91"/> + <location line="-96"/> <source>Cannot resolve -bind address: '%s'</source> <translation>לא מסוגל לפתור כתובת -bind: '%s'</translation> </message> @@ -2814,17 +2865,17 @@ rpcpassword=%s <translation>כמות לא תקינה</translation> </message> <message> - <location line="-4"/> + <location line="-6"/> <source>Insufficient funds</source> <translation>אין מספיק כספים</translation> </message> <message> - <location line="+8"/> + <location line="+10"/> <source>Loading block index...</source> <translation>טוען את אינדקס הבלוקים...</translation> </message> <message> - <location line="-58"/> + <location line="-57"/> <source>Add a node to connect to and attempt to keep the connection open</source> <translation>הוסף צומת להתחברות ונסה לשמור את החיבור פתוח</translation> </message> @@ -2834,52 +2885,47 @@ rpcpassword=%s <translation>לא ניתן לקשור ל-%s במחשב זה. ביטקוין כנראה עדיין רץ.</translation> </message> <message> - <location line="+67"/> + <location line="+64"/> <source>Fee per KB to add to transactions you send</source> <translation>עמלה להוסיף לפעולות שאתה שולח עבור כל KB</translation> </message> <message> - <location line="+17"/> + <location line="+19"/> <source>Loading wallet...</source> <translation>טוען ארנק...</translation> </message> <message> - <location line="-53"/> + <location line="-52"/> <source>Cannot downgrade wallet</source> <translation>לא יכול להוריד דרגת הארנק</translation> </message> <message> - <location line="+1"/> - <source>Cannot initialize keypool</source> - <translation>לא יכול לאתחל את מאגר המפתחות</translation> - </message> - <message> <location line="+3"/> <source>Cannot write default address</source> <translation>לא יכול לכתוב את כתובת ברירת המחדל</translation> </message> <message> - <location line="+63"/> + <location line="+64"/> <source>Rescanning...</source> <translation>סורק מחדש...</translation> </message> <message> - <location line="-55"/> + <location line="-57"/> <source>Done loading</source> <translation>טעינה הושלמה</translation> </message> <message> - <location line="+79"/> + <location line="+82"/> <source>To use the %s option</source> <translation>להשתמש באפשרות %s</translation> </message> <message> - <location line="-71"/> + <location line="-74"/> <source>Error</source> <translation>שגיאה</translation> </message> <message> - <location line="-33"/> + <location line="-31"/> <source>You must set rpcpassword=<password> in the configuration file: %s If the file does not exist, create it with owner-readable-only file permissions.</source> diff --git a/src/qt/locale/bitcoin_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 <translation type="unfinished"/> </message> <message> - <location filename="../aboutdialog.cpp" line="+17"/> + <location filename="../aboutdialog.cpp" line="+14"/> <source>Copyright</source> <translation>कापीराइट</translation> </message> <message> <location line="+0"/> - <source>2009-%1 The Bitcoin developers</source> + <source>The Bitcoin developers</source> <translation type="unfinished"/> </message> </context> @@ -61,7 +61,7 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>&नया पता</translation> </message> <message> - <location filename="../addressbookpage.cpp" line="+59"/> + <location filename="../addressbookpage.cpp" line="+63"/> <source>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.</source> <translation type="unfinished"/> </message> @@ -91,7 +91,17 @@ This product includes software developed by the OpenSSL Project for use in the O <translation type="unfinished"/> </message> <message> - <location line="-14"/> + <location line="+27"/> + <source>Export the data in the current tab to a file</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+3"/> + <source>&Export</source> + <translation type="unfinished"/> + </message> + <message> + <location line="-44"/> <source>Verify a message to ensure it was signed with a specified Bitcoin address</source> <translation type="unfinished"/> </message> @@ -313,12 +323,12 @@ This product includes software developed by the OpenSSL Project for use in the O <translation type="unfinished"/> </message> <message> - <location line="+299"/> + <location line="+280"/> <source>Synchronizing with network...</source> <translation>नेटवर्क से समकालिक (मिल) रहा है ...</translation> </message> <message> - <location line="-368"/> + <location line="-349"/> <source>&Overview</source> <translation>&विवरण</translation> </message> @@ -394,7 +404,7 @@ This product includes software developed by the OpenSSL Project for use in the O <translation type="unfinished"/> </message> <message> - <location line="+304"/> + <location line="+285"/> <source>Importing blocks from disk...</source> <translation type="unfinished"/> </message> @@ -404,12 +414,7 @@ This product includes software developed by the OpenSSL Project for use in the O <translation type="unfinished"/> </message> <message> - <location line="-300"/> - <source>&Export...</source> - <translation>&निर्यात</translation> - </message> - <message> - <location line="-66"/> + <location line="-347"/> <source>Send coins to a Bitcoin address</source> <translation type="unfinished"/> </message> @@ -419,12 +424,7 @@ This product includes software developed by the OpenSSL Project for use in the O <translation type="unfinished"/> </message> <message> - <location line="+18"/> - <source>Export the data in the current tab to a file</source> - <translation type="unfinished"/> - </message> - <message> - <location line="-9"/> + <location line="+9"/> <source>Backup wallet to another location</source> <translation type="unfinished"/> </message> @@ -434,7 +434,7 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>पहचान शब्द/अक्षर जो वॉलेट एनक्रिपशन के लिए इस्तेमाल किया है उसे बदलिए!</translation> </message> <message> - <location line="+9"/> + <location line="+6"/> <source>&Debug window</source> <translation type="unfinished"/> </message> @@ -444,23 +444,23 @@ This product includes software developed by the OpenSSL Project for use in the O <translation type="unfinished"/> </message> <message> - <location line="-7"/> + <location line="-4"/> <source>&Verify message...</source> <translation type="unfinished"/> </message> <message> - <location line="-163"/> - <location line="+541"/> + <location line="-165"/> + <location line="+530"/> <source>Bitcoin</source> <translation>बीटकोइन</translation> </message> <message> - <location line="-541"/> + <location line="-530"/> <source>Wallet</source> <translation>वॉलेट</translation> </message> <message> - <location line="+99"/> + <location line="+101"/> <source>&Send</source> <translation type="unfinished"/> </message> @@ -505,12 +505,12 @@ This product includes software developed by the OpenSSL Project for use in the O <translation type="unfinished"/> </message> <message> - <location line="+31"/> + <location line="+28"/> <source>&File</source> <translation>&फाइल</translation> </message> <message> - <location line="+8"/> + <location line="+7"/> <source>&Settings</source> <translation>&सेट्टिंग्स</translation> </message> @@ -525,12 +525,7 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>टैबस टूलबार</translation> </message> <message> - <location line="+8"/> - <source>Actions toolbar</source> - <translation>कार्य टूलबार</translation> - </message> - <message> - <location line="+13"/> + <location line="+17"/> <location line="+10"/> <source>[testnet]</source> <translation>[टेस्टनेट]</translation> @@ -541,12 +536,17 @@ This product includes software developed by the OpenSSL Project for use in the O <translation type="unfinished"/> </message> <message numerus="yes"> - <location line="+140"/> + <location line="+141"/> <source>%n active connection(s) to Bitcoin network</source> <translation><numerusform>%n सक्रिया संपर्क बीटकोइन नेटवर्क से</numerusform><numerusform>%n सक्रिया संपर्क बीटकोइन नेटवर्क से</numerusform></translation> </message> <message> - <location line="+39"/> + <location line="+22"/> + <source>No block source available...</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+12"/> <source>Processed %1 of %2 (estimated) blocks of transaction history.</source> <translation type="unfinished"/> </message> @@ -571,7 +571,7 @@ This product includes software developed by the OpenSSL Project for use in the O <translation><numerusform>%n हफ़्ता</numerusform><numerusform>%n हफ्ते</numerusform></translation> </message> <message> - <location line="+5"/> + <location line="+4"/> <source>%1 behind</source> <translation>%1 पीछे</translation> </message> @@ -586,7 +586,7 @@ This product includes software developed by the OpenSSL Project for use in the O <translation type="unfinished"/> </message> <message> - <location line="+21"/> + <location line="+22"/> <source>Error</source> <translation>भूल</translation> </message> @@ -601,22 +601,22 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>जानकारी</translation> </message> <message> - <location line="+68"/> + <location line="+70"/> <source>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?</source> <translation type="unfinished"/> </message> <message> - <location line="-138"/> + <location line="-140"/> <source>Up to date</source> <translation>नवीनतम</translation> </message> <message> - <location line="+32"/> + <location line="+31"/> <source>Catching up...</source> <translation type="unfinished"/> </message> <message> - <location line="+110"/> + <location line="+113"/> <source>Confirm transaction fee</source> <translation type="unfinished"/> </message> @@ -665,7 +665,7 @@ Address: %4 <translation>वॉलेट एन्क्रिप्टेड है तथा अभी लॉक्ड है</translation> </message> <message> - <location filename="../bitcoin.cpp" line="+104"/> + <location filename="../bitcoin.cpp" line="+111"/> <source>A fatal error occurred. Bitcoin can no longer continue safely and will quit.</source> <translation type="unfinished"/> </message> @@ -673,7 +673,7 @@ Address: %4 <context> <name>ClientModel</name> <message> - <location filename="../clientmodel.cpp" line="+98"/> + <location filename="../clientmodel.cpp" line="+104"/> <source>Network Alert</source> <translation type="unfinished"/> </message> @@ -804,7 +804,7 @@ Address: %4 </message> <message> <location line="+6"/> - <source>Optional transaction fee per kB that helps make sure your transactions are processed quickly. Most transactions are 1 kB. Fee 0.01 recommended.</source> + <source>Optional transaction fee per kB that helps make sure your transactions are processed quickly. Most transactions are 1 kB.</source> <translation type="unfinished"/> </message> <message> @@ -1054,7 +1054,7 @@ Address: %4 <translation>लेन देन की पुष्टि अभी नहीं हुई है, इसलिए इन्हें अभी मोजुदा बैलेंस में गिना नहीं गया है|</translation> </message> <message> - <location filename="../overviewpage.cpp" line="+115"/> + <location filename="../overviewpage.cpp" line="+116"/> <location line="+1"/> <source>out of sync</source> <translation type="unfinished"/> @@ -1642,6 +1642,19 @@ Address: %4 </message> </context> <context> + <name>SplashScreen</name> + <message> + <location filename="../splashscreen.cpp" line="+22"/> + <source>The Bitcoin developers</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>[testnet]</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>TransactionDesc</name> <message> <location filename="../transactiondesc.cpp" line="+20"/> @@ -2116,9 +2129,27 @@ Address: %4 </message> </context> <context> + <name>WalletModel</name> + <message> + <location filename="../walletmodel.cpp" line="+193"/> + <source>Send Coins</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>WalletView</name> <message> - <location filename="../walletview.cpp" line="+247"/> + <location filename="../walletview.cpp" line="+42"/> + <source>&Export</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Export the data in the current tab to a file</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+193"/> <source>Backup Wallet</source> <translation>बैकप वॉलेट</translation> </message> @@ -2151,37 +2182,37 @@ Address: %4 <context> <name>bitcoin-core</name> <message> - <location filename="../bitcoinstrings.cpp" line="+96"/> + <location filename="../bitcoinstrings.cpp" line="+94"/> <source>Bitcoin version</source> <translation>बीटकोइन संस्करण</translation> </message> <message> - <location line="+98"/> + <location line="+102"/> <source>Usage:</source> <translation>खपत :</translation> </message> <message> - <location line="-25"/> + <location line="-29"/> <source>Send command to -server or bitcoind</source> <translation>-server या bitcoind को कमांड भेजें</translation> </message> <message> - <location line="-22"/> + <location line="-23"/> <source>List commands</source> <translation>commands की लिस्ट बनाएं</translation> </message> <message> - <location line="-10"/> + <location line="-12"/> <source>Get help for a command</source> <translation>किसी command के लिए मदद लें</translation> </message> <message> - <location line="+21"/> + <location line="+24"/> <source>Options:</source> <translation>विकल्प:</translation> </message> <message> - <location line="+23"/> + <location line="+24"/> <source>Specify configuration file (default: bitcoin.conf)</source> <translation>configuraion की फाइल का विवरण दें (default: bitcoin.conf)</translation> </message> @@ -2191,27 +2222,17 @@ Address: %4 <translation>pid फाइल का विवरण दें (default: bitcoin.pid)</translation> </message> <message> - <location line="-48"/> - <source>Generate coins</source> - <translation>Coins बनाएं</translation> - </message> - <message> - <location line="-27"/> - <source>Don't generate coins</source> - <translation>Coins न बनाएं</translation> - </message> - <message> - <location line="+74"/> + <location line="-1"/> <source>Specify data directory</source> <translation type="unfinished"/> </message> <message> - <location line="-8"/> + <location line="-9"/> <source>Set database cache size in megabytes (default: 25)</source> <translation type="unfinished"/> </message> <message> - <location line="-27"/> + <location line="-28"/> <source>Listen for connections on <port> (default: 8333 or testnet: 18333)</source> <translation type="unfinished"/> </message> @@ -2226,7 +2247,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+80"/> + <location line="+82"/> <source>Specify your own public address</source> <translation type="unfinished"/> </message> @@ -2236,22 +2257,22 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="-132"/> + <location line="-134"/> <source>Number of seconds to keep misbehaving peers from reconnecting (default: 86400)</source> <translation type="unfinished"/> </message> <message> - <location line="-32"/> + <location line="-29"/> <source>An error occurred while setting up the RPC port %u for listening on IPv4: %s</source> <translation type="unfinished"/> </message> <message> - <location line="+30"/> + <location line="+27"/> <source>Listen for JSON-RPC connections on <port> (default: 8332 or testnet: 18332)</source> <translation type="unfinished"/> </message> <message> - <location line="+36"/> + <location line="+37"/> <source>Accept command line and JSON-RPC commands</source> <translation type="unfinished"/> </message> @@ -2261,17 +2282,17 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+33"/> + <location line="+37"/> <source>Use the test network</source> <translation type="unfinished"/> </message> <message> - <location line="-108"/> + <location line="-112"/> <source>Accept connections from outside (default: 1 if no -proxy or -connect)</source> <translation type="unfinished"/> </message> <message> - <location line="-82"/> + <location line="-80"/> <source>%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. </message> <message> <location line="+3"/> - <source>Error initializing database environment %s! To recover, BACKUP THAT DIRECTORY, then remove everything from it except for wallet.dat.</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+3"/> <source>Error: The transaction was rejected! This might happen if some of the coins in your wallet were already spent, such as if you used a copy of wallet.dat and coins were spent in the copy but not marked as spent here.</source> <translation type="unfinished"/> </message> @@ -2331,12 +2347,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+3"/> - <source>Set the number of script verification threads (1-16, 0=auto, default: 0)</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+2"/> + <location line="+6"/> <source>This is a pre-release test build - use at your own risk - do not use for mining or merchant applications</source> <translation type="unfinished"/> </message> @@ -2376,7 +2387,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+6"/> + <location line="+5"/> <source>Connect only to the specified node(s)</source> <translation type="unfinished"/> </message> @@ -2396,7 +2407,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+3"/> + <location line="+2"/> <source>Error initializing block database</source> <translation type="unfinished"/> </message> @@ -2422,11 +2433,6 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. </message> <message> <location line="+1"/> - <source>Error: Transaction creation failed!</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+1"/> <source>Error: Wallet locked, unable to create transaction!</source> <translation type="unfinished"/> </message> @@ -2496,7 +2502,12 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+3"/> + <location line="+1"/> + <source>Generate coins (default: 0)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+2"/> <source>How many blocks to check at startup (default: 288, 0 = all)</source> <translation type="unfinished"/> </message> @@ -2506,7 +2517,12 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+24"/> + <location line="+19"/> + <source>Not enough file descriptors available.</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+8"/> <source>Rebuild block chain index from current blk000??.dat files</source> <translation type="unfinished"/> </message> @@ -2516,7 +2532,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+22"/> + <location line="+26"/> <source>Verifying blocks...</source> <translation>ब्लॉक्स जाँचे जा रहा है...</translation> </message> @@ -2526,12 +2542,17 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>वॉलेट जाँचा जा रहा है...</translation> </message> <message> - <location line="-62"/> + <location line="-69"/> <source>Imports blocks from external blk000??.dat file</source> <translation type="unfinished"/> </message> <message> - <location line="+1"/> + <location line="-76"/> + <source>Set the number of script verification threads (up to 16, 0 = auto, <0 = leave that many cores free, default: 0)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+77"/> <source>Information</source> <translation>जानकारी</translation> </message> @@ -2541,6 +2562,16 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> + <location line="+1"/> + <source>Invalid amount for -minrelaytxfee=<amount>: '%s'</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Invalid amount for -mintxfee=<amount>: '%s'</source> + <translation type="unfinished"/> + </message> + <message> <location line="+8"/> <source>Maintain a full transaction index (default: 0)</source> <translation type="unfinished"/> @@ -2556,7 +2587,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+1"/> + <location line="+2"/> <source>Only accept block chain matching built-in checkpoints (default: 1)</source> <translation type="unfinished"/> </message> @@ -2616,6 +2647,11 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> + <location line="+1"/> + <source>Signing transaction failed</source> + <translation type="unfinished"/> + </message> + <message> <location line="+2"/> <source>Specify connection timeout in milliseconds (default: 5000)</source> <translation type="unfinished"/> @@ -2626,7 +2662,22 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+10"/> + <location line="+4"/> + <source>Transaction amount too small</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Transaction amounts must be positive</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Transaction too large</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+7"/> <source>Use UPnP to map the listening port (default: 0)</source> <translation type="unfinished"/> </message> @@ -2666,7 +2717,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="-46"/> + <location line="-50"/> <source>Password for JSON-RPC connections</source> <translation type="unfinished"/> </message> @@ -2681,17 +2732,17 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="-119"/> + <location line="-120"/> <source>Execute command when the best block changes (%s in cmd is replaced by block hash)</source> <translation type="unfinished"/> </message> <message> - <location line="+142"/> + <location line="+147"/> <source>Upgrade wallet to latest format</source> <translation type="unfinished"/> </message> <message> - <location line="-17"/> + <location line="-21"/> <source>Set key pool size to <n> (default: 100)</source> <translation type="unfinished"/> </message> @@ -2701,12 +2752,12 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+31"/> + <location line="+35"/> <source>Use OpenSSL (https) for JSON-RPC connections</source> <translation type="unfinished"/> </message> <message> - <location line="-22"/> + <location line="-26"/> <source>Server certificate file (default: server.cert)</source> <translation type="unfinished"/> </message> @@ -2716,37 +2767,37 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="-153"/> + <location line="-151"/> <source>Acceptable ciphers (default: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH)</source> <translation type="unfinished"/> </message> <message> - <location line="+166"/> + <location line="+165"/> <source>This help message</source> <translation type="unfinished"/> </message> <message> - <location line="+3"/> + <location line="+6"/> <source>Unable to bind to %s on this computer (bind returned error %d, %s)</source> <translation type="unfinished"/> </message> <message> - <location line="-86"/> + <location line="-91"/> <source>Connect through socks proxy</source> <translation type="unfinished"/> </message> <message> - <location line="-11"/> + <location line="-10"/> <source>Allow DNS lookups for -addnode, -seednode and -connect</source> <translation type="unfinished"/> </message> <message> - <location line="+56"/> + <location line="+55"/> <source>Loading addresses...</source> <translation>पता पुस्तक आ रही है...</translation> </message> <message> - <location line="-34"/> + <location line="-35"/> <source>Error loading wallet.dat: Wallet corrupted</source> <translation type="unfinished"/> </message> @@ -2756,22 +2807,22 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+87"/> + <location line="+93"/> <source>Wallet needed to be rewritten: restart Bitcoin to complete</source> <translation type="unfinished"/> </message> <message> - <location line="-89"/> + <location line="-95"/> <source>Error loading wallet.dat</source> <translation type="unfinished"/> </message> <message> - <location line="+29"/> + <location line="+28"/> <source>Invalid -proxy address: '%s'</source> <translation type="unfinished"/> </message> <message> - <location line="+49"/> + <location line="+56"/> <source>Unknown network specified in -onlynet: '%s'</source> <translation type="unfinished"/> </message> @@ -2781,7 +2832,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="-91"/> + <location line="-96"/> <source>Cannot resolve -bind address: '%s'</source> <translation type="unfinished"/> </message> @@ -2801,17 +2852,17 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>राशि ग़लत है</translation> </message> <message> - <location line="-4"/> + <location line="-6"/> <source>Insufficient funds</source> <translation type="unfinished"/> </message> <message> - <location line="+8"/> + <location line="+10"/> <source>Loading block index...</source> <translation>ब्लॉक इंडेक्स आ रहा है...</translation> </message> <message> - <location line="-58"/> + <location line="-57"/> <source>Add a node to connect to and attempt to keep the connection open</source> <translation type="unfinished"/> </message> @@ -2821,52 +2872,47 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+67"/> + <location line="+64"/> <source>Fee per KB to add to transactions you send</source> <translation type="unfinished"/> </message> <message> - <location line="+17"/> + <location line="+19"/> <source>Loading wallet...</source> <translation>वॉलेट आ रहा है...</translation> </message> <message> - <location line="-53"/> + <location line="-52"/> <source>Cannot downgrade wallet</source> <translation type="unfinished"/> </message> <message> - <location line="+1"/> - <source>Cannot initialize keypool</source> - <translation type="unfinished"/> - </message> - <message> <location line="+3"/> <source>Cannot write default address</source> <translation type="unfinished"/> </message> <message> - <location line="+63"/> + <location line="+64"/> <source>Rescanning...</source> <translation>रि-स्केनी-इंग...</translation> </message> <message> - <location line="-55"/> + <location line="-57"/> <source>Done loading</source> <translation>लोड हो गया|</translation> </message> <message> - <location line="+79"/> + <location line="+82"/> <source>To use the %s option</source> <translation type="unfinished"/> </message> <message> - <location line="-71"/> + <location line="-74"/> <source>Error</source> <translation>भूल</translation> </message> <message> - <location line="-33"/> + <location line="-31"/> <source>You must set rpcpassword=<password> in the configuration file: %s If the file does not exist, create it with owner-readable-only file permissions.</source> diff --git a/src/qt/locale/bitcoin_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 @@ <message> <location filename="../forms/aboutdialog.ui" line="+14"/> <source>About Bitcoin</source> - <translation>O Bitcoinu</translation> + <translation>O Bitcoin-u</translation> </message> <message> <location line="+39"/> @@ -23,13 +23,13 @@ This product includes software developed by the OpenSSL Project for use in the O <translation type="unfinished"/> </message> <message> - <location filename="../aboutdialog.cpp" line="+17"/> + <location filename="../aboutdialog.cpp" line="+14"/> <source>Copyright</source> <translation type="unfinished"/> </message> <message> <location line="+0"/> - <source>2009-%1 The Bitcoin developers</source> + <source>The Bitcoin developers</source> <translation type="unfinished"/> </message> </context> @@ -61,7 +61,7 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>&Nova adresa</translation> </message> <message> - <location filename="../addressbookpage.cpp" line="+59"/> + <location filename="../addressbookpage.cpp" line="+63"/> <source>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.</source> <translation>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.</translation> </message> @@ -91,7 +91,17 @@ This product includes software developed by the OpenSSL Project for use in the O <translation type="unfinished"/> </message> <message> - <location line="-14"/> + <location line="+27"/> + <source>Export the data in the current tab to a file</source> + <translation>Izvoz podataka iz trenutnog taba u datoteku</translation> + </message> + <message> + <location line="+3"/> + <source>&Export</source> + <translation type="unfinished"/> + </message> + <message> + <location line="-44"/> <source>Verify a message to ensure it was signed with a specified Bitcoin address</source> <translation type="unfinished"/> </message> @@ -313,12 +323,12 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>&Potpišite poruku...</translation> </message> <message> - <location line="+299"/> + <location line="+280"/> <source>Synchronizing with network...</source> <translation>Usklađivanje s mrežom ...</translation> </message> <message> - <location line="-368"/> + <location line="-349"/> <source>&Overview</source> <translation>&Pregled</translation> </message> @@ -393,22 +403,17 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>&Promijena lozinke...</translation> </message> <message> - <location line="+304"/> + <location line="+285"/> <source>Importing blocks from disk...</source> - <translation type="unfinished"/> + <translation>Importiranje blokova sa diska...</translation> </message> <message> <location line="+3"/> <source>Reindexing blocks on disk...</source> - <translation type="unfinished"/> + <translation>Re-indeksiranje blokova na disku...</translation> </message> <message> - <location line="-300"/> - <source>&Export...</source> - <translation>&Izvoz...</translation> - </message> - <message> - <location line="-66"/> + <location line="-347"/> <source>Send coins to a Bitcoin address</source> <translation>Slanje novca na bitcoin adresu</translation> </message> @@ -418,12 +423,7 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>Promijeni postavke konfiguracije za bitcoin</translation> </message> <message> - <location line="+18"/> - <source>Export the data in the current tab to a file</source> - <translation>Izvoz podataka iz trenutnog taba u datoteku</translation> - </message> - <message> - <location line="-9"/> + <location line="+9"/> <source>Backup wallet to another location</source> <translation>Napravite sigurnosnu kopiju novčanika na drugoj lokaciji</translation> </message> @@ -433,7 +433,7 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>Promijenite lozinku za šifriranje novčanika</translation> </message> <message> - <location line="+9"/> + <location line="+6"/> <source>&Debug window</source> <translation type="unfinished"/> </message> @@ -443,23 +443,23 @@ This product includes software developed by the OpenSSL Project for use in the O <translation type="unfinished"/> </message> <message> - <location line="-7"/> + <location line="-4"/> <source>&Verify message...</source> <translation type="unfinished"/> </message> <message> - <location line="-163"/> - <location line="+541"/> + <location line="-165"/> + <location line="+530"/> <source>Bitcoin</source> <translation>Bitcoin</translation> </message> <message> - <location line="-541"/> + <location line="-530"/> <source>Wallet</source> <translation>Novčanik</translation> </message> <message> - <location line="+99"/> + <location line="+101"/> <source>&Send</source> <translation type="unfinished"/> </message> @@ -504,12 +504,12 @@ This product includes software developed by the OpenSSL Project for use in the O <translation type="unfinished"/> </message> <message> - <location line="+31"/> + <location line="+28"/> <source>&File</source> <translation>&Datoteka</translation> </message> <message> - <location line="+8"/> + <location line="+7"/> <source>&Settings</source> <translation>&Konfiguracija</translation> </message> @@ -524,12 +524,7 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>Traka kartica</translation> </message> <message> - <location line="+8"/> - <source>Actions toolbar</source> - <translation>Traka akcija</translation> - </message> - <message> - <location line="+13"/> + <location line="+17"/> <location line="+10"/> <source>[testnet]</source> <translation>[testnet]</translation> @@ -540,19 +535,24 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>Bitcoin klijent</translation> </message> <message numerus="yes"> - <location line="+140"/> + <location line="+141"/> <source>%n active connection(s) to Bitcoin network</source> <translation><numerusform>%n aktivna veza na Bitcoin mrežu</numerusform><numerusform>%n aktivne veze na Bitcoin mrežu</numerusform><numerusform>%n aktivnih veza na Bitcoin mrežu</numerusform></translation> </message> <message> - <location line="+39"/> + <location line="+22"/> + <source>No block source available...</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+12"/> <source>Processed %1 of %2 (estimated) blocks of transaction history.</source> <translation type="unfinished"/> </message> <message> <location line="+4"/> <source>Processed %1 blocks of transaction history.</source> - <translation type="unfinished"/> + <translation>Obrađeno %1 blokova povijesti transakcije.</translation> </message> <message numerus="yes"> <location line="+20"/> @@ -570,7 +570,7 @@ This product includes software developed by the OpenSSL Project for use in the O <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation> </message> <message> - <location line="+5"/> + <location line="+4"/> <source>%1 behind</source> <translation type="unfinished"/> </message> @@ -585,7 +585,7 @@ This product includes software developed by the OpenSSL Project for use in the O <translation type="unfinished"/> </message> <message> - <location line="+21"/> + <location line="+22"/> <source>Error</source> <translation>Greška</translation> </message> @@ -600,22 +600,22 @@ This product includes software developed by the OpenSSL Project for use in the O <translation type="unfinished"/> </message> <message> - <location line="+68"/> + <location line="+70"/> <source>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?</source> <translation type="unfinished"/> </message> <message> - <location line="-138"/> + <location line="-140"/> <source>Up to date</source> <translation>Ažurno</translation> </message> <message> - <location line="+32"/> + <location line="+31"/> <source>Catching up...</source> <translation>Ažuriranje...</translation> </message> <message> - <location line="+110"/> + <location line="+113"/> <source>Confirm transaction fee</source> <translation type="unfinished"/> </message> @@ -665,7 +665,7 @@ Adresa:%4 <translation>Novčanik je <b>šifriran</b> i trenutno <b>zaključan</b></translation> </message> <message> - <location filename="../bitcoin.cpp" line="+104"/> + <location filename="../bitcoin.cpp" line="+111"/> <source>A fatal error occurred. Bitcoin can no longer continue safely and will quit.</source> <translation type="unfinished"/> </message> @@ -673,7 +673,7 @@ Adresa:%4 <context> <name>ClientModel</name> <message> - <location filename="../clientmodel.cpp" line="+98"/> + <location filename="../clientmodel.cpp" line="+104"/> <source>Network Alert</source> <translation type="unfinished"/> </message> @@ -804,8 +804,8 @@ Adresa:%4 </message> <message> <location line="+6"/> - <source>Optional transaction fee per kB that helps make sure your transactions are processed quickly. Most transactions are 1 kB. Fee 0.01 recommended.</source> - <translation>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.</translation> + <source>Optional transaction fee per kB that helps make sure your transactions are processed quickly. Most transactions are 1 kB.</source> + <translation type="unfinished"/> </message> <message> <location line="+15"/> @@ -1054,7 +1054,7 @@ Adresa:%4 <translation>Ukupni iznos transakcija koje tek trebaju biti potvrđene, i još uvijek nisu uračunate u trenutni saldo</translation> </message> <message> - <location filename="../overviewpage.cpp" line="+115"/> + <location filename="../overviewpage.cpp" line="+116"/> <location line="+1"/> <source>out of sync</source> <translation type="unfinished"/> @@ -1185,22 +1185,22 @@ Adresa:%4 <message> <location line="+23"/> <source>Block chain</source> - <translation type="unfinished"/> + <translation>Lanac blokova</translation> </message> <message> <location line="+7"/> <source>Current number of blocks</source> - <translation type="unfinished"/> + <translation>Trenutni broj blokova</translation> </message> <message> <location line="+23"/> <source>Estimated total blocks</source> - <translation type="unfinished"/> + <translation>Procjenjeni ukupni broj blokova</translation> </message> <message> <location line="+23"/> <source>Last block time</source> - <translation type="unfinished"/> + <translation>Posljednje vrijeme bloka</translation> </message> <message> <location line="+52"/> @@ -1641,6 +1641,19 @@ Adresa:%4 </message> </context> <context> + <name>SplashScreen</name> + <message> + <location filename="../splashscreen.cpp" line="+22"/> + <source>The Bitcoin developers</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>[testnet]</source> + <translation>[testnet]</translation> + </message> +</context> +<context> <name>TransactionDesc</name> <message> <location filename="../transactiondesc.cpp" line="+20"/> @@ -2115,9 +2128,27 @@ Adresa:%4 </message> </context> <context> + <name>WalletModel</name> + <message> + <location filename="../walletmodel.cpp" line="+193"/> + <source>Send Coins</source> + <translation>Slanje novca</translation> + </message> +</context> +<context> <name>WalletView</name> <message> - <location filename="../walletview.cpp" line="+247"/> + <location filename="../walletview.cpp" line="+42"/> + <source>&Export</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Export the data in the current tab to a file</source> + <translation>Izvoz podataka iz trenutnog taba u datoteku</translation> + </message> + <message> + <location line="+193"/> <source>Backup Wallet</source> <translation type="unfinished"/> </message> @@ -2150,37 +2181,37 @@ Adresa:%4 <context> <name>bitcoin-core</name> <message> - <location filename="../bitcoinstrings.cpp" line="+96"/> + <location filename="../bitcoinstrings.cpp" line="+94"/> <source>Bitcoin version</source> <translation>Bitcoin verzija</translation> </message> <message> - <location line="+98"/> + <location line="+102"/> <source>Usage:</source> <translation>Upotreba:</translation> </message> <message> - <location line="-25"/> + <location line="-29"/> <source>Send command to -server or bitcoind</source> <translation>Pošalji komandu usluzi -server ili bitcoind</translation> </message> <message> - <location line="-22"/> + <location line="-23"/> <source>List commands</source> <translation>Prikaži komande</translation> </message> <message> - <location line="-10"/> + <location line="-12"/> <source>Get help for a command</source> <translation>Potraži pomoć za komandu</translation> </message> <message> - <location line="+21"/> + <location line="+24"/> <source>Options:</source> <translation>Postavke:</translation> </message> <message> - <location line="+23"/> + <location line="+24"/> <source>Specify configuration file (default: bitcoin.conf)</source> <translation>Odredi konfiguracijsku datoteku (ugrađeni izbor: bitcoin.conf)</translation> </message> @@ -2190,27 +2221,17 @@ Adresa:%4 <translation>Odredi proces ID datoteku (ugrađeni izbor: bitcoin.pid)</translation> </message> <message> - <location line="-48"/> - <source>Generate coins</source> - <translation>Generiraj novčiće</translation> - </message> - <message> - <location line="-27"/> - <source>Don't generate coins</source> - <translation>Ne generiraj novčiće</translation> - </message> - <message> - <location line="+74"/> + <location line="-1"/> <source>Specify data directory</source> <translation>Odredi direktorij za datoteke</translation> </message> <message> - <location line="-8"/> + <location line="-9"/> <source>Set database cache size in megabytes (default: 25)</source> <translation>Postavi cache za bazu podataka u MB (zadano:25)</translation> </message> <message> - <location line="-27"/> + <location line="-28"/> <source>Listen for connections on <port> (default: 8333 or testnet: 18333)</source> <translation>Slušaj na <port>u (default: 8333 ili testnet: 18333)</translation> </message> @@ -2225,7 +2246,7 @@ Adresa:%4 <translation type="unfinished"/> </message> <message> - <location line="+80"/> + <location line="+82"/> <source>Specify your own public address</source> <translation type="unfinished"/> </message> @@ -2235,22 +2256,22 @@ Adresa:%4 <translation>Prag za odspajanje članova koji se čudno ponašaju (default: 100)</translation> </message> <message> - <location line="-132"/> + <location line="-134"/> <source>Number of seconds to keep misbehaving peers from reconnecting (default: 86400)</source> <translation>Broj sekundi koliko se članovima koji se čudno ponašaju neće dopustiti da se opet spoje (default: 86400)</translation> </message> <message> - <location line="-32"/> + <location line="-29"/> <source>An error occurred while setting up the RPC port %u for listening on IPv4: %s</source> <translation type="unfinished"/> </message> <message> - <location line="+30"/> + <location line="+27"/> <source>Listen for JSON-RPC connections on <port> (default: 8332 or testnet: 18332)</source> <translation>Prihvaćaj JSON-RPC povezivanje na portu broj <port> (ugrađeni izbor: 8332 or testnet: 18332)</translation> </message> <message> - <location line="+36"/> + <location line="+37"/> <source>Accept command line and JSON-RPC commands</source> <translation>Prihvati komande iz tekst moda i JSON-RPC</translation> </message> @@ -2260,17 +2281,17 @@ Adresa:%4 <translation>Izvršavaj u pozadini kao uslužnik i prihvaćaj komande</translation> </message> <message> - <location line="+33"/> + <location line="+37"/> <source>Use the test network</source> <translation>Koristi test mrežu</translation> </message> <message> - <location line="-108"/> + <location line="-112"/> <source>Accept connections from outside (default: 1 if no -proxy or -connect)</source> <translation type="unfinished"/> </message> <message> - <location line="-82"/> + <location line="-80"/> <source>%s, you must set a rpcpassword in the configuration file: %s It is recommended you use the following random password: @@ -2301,11 +2322,6 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. </message> <message> <location line="+3"/> - <source>Error initializing database environment %s! To recover, BACKUP THAT DIRECTORY, then remove everything from it except for wallet.dat.</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+3"/> <source>Error: The transaction was rejected! This might happen if some of the coins in your wallet were already spent, such as if you used a copy of wallet.dat and coins were spent in the copy but not marked as spent here.</source> <translation type="unfinished"/> </message> @@ -2330,12 +2346,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+3"/> - <source>Set the number of script verification threads (1-16, 0=auto, default: 0)</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+2"/> + <location line="+6"/> <source>This is a pre-release test build - use at your own risk - do not use for mining or merchant applications</source> <translation type="unfinished"/> </message> @@ -2372,10 +2383,10 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <message> <location line="+2"/> <source>Block creation options:</source> - <translation type="unfinished"/> + <translation>Opcije za kreiranje bloka:</translation> </message> <message> - <location line="+6"/> + <location line="+5"/> <source>Connect only to the specified node(s)</source> <translation>Poveži se samo sa određenim nodom</translation> </message> @@ -2395,7 +2406,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+3"/> + <location line="+2"/> <source>Error initializing block database</source> <translation type="unfinished"/> </message> @@ -2421,11 +2432,6 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. </message> <message> <location line="+1"/> - <source>Error: Transaction creation failed!</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+1"/> <source>Error: Wallet locked, unable to create transaction!</source> <translation type="unfinished"/> </message> @@ -2495,7 +2501,12 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+3"/> + <location line="+1"/> + <source>Generate coins (default: 0)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+2"/> <source>How many blocks to check at startup (default: 288, 0 = all)</source> <translation type="unfinished"/> </message> @@ -2505,7 +2516,12 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+24"/> + <location line="+19"/> + <source>Not enough file descriptors available.</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+8"/> <source>Rebuild block chain index from current blk000??.dat files</source> <translation type="unfinished"/> </message> @@ -2515,7 +2531,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+22"/> + <location line="+26"/> <source>Verifying blocks...</source> <translation type="unfinished"/> </message> @@ -2525,12 +2541,17 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="-62"/> + <location line="-69"/> <source>Imports blocks from external blk000??.dat file</source> + <translation>Importiraj blokove sa vanjskog blk000??.dat fajla</translation> + </message> + <message> + <location line="-76"/> + <source>Set the number of script verification threads (up to 16, 0 = auto, <0 = leave that many cores free, default: 0)</source> <translation type="unfinished"/> </message> <message> - <location line="+1"/> + <location line="+77"/> <source>Information</source> <translation type="unfinished"/> </message> @@ -2540,6 +2561,16 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Nevaljala -tor adresa: '%s'</translation> </message> <message> + <location line="+1"/> + <source>Invalid amount for -minrelaytxfee=<amount>: '%s'</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Invalid amount for -mintxfee=<amount>: '%s'</source> + <translation type="unfinished"/> + </message> + <message> <location line="+8"/> <source>Maintain a full transaction index (default: 0)</source> <translation type="unfinished"/> @@ -2555,9 +2586,9 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+1"/> + <location line="+2"/> <source>Only accept block chain matching built-in checkpoints (default: 1)</source> - <translation type="unfinished"/> + <translation>Prihvati samo lance blokova koji se podudaraju sa ugrađenim checkpoint-ovima (default: 1)</translation> </message> <message> <location line="+1"/> @@ -2602,12 +2633,12 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <message> <location line="+5"/> <source>Set maximum block size in bytes (default: 250000)</source> - <translation type="unfinished"/> + <translation>Podesite maksimalnu veličinu bloka u bajtovima (default: 250000)</translation> </message> <message> <location line="+1"/> <source>Set minimum block size in bytes (default: 0)</source> - <translation type="unfinished"/> + <translation>Podesite minimalnu veličinu bloka u bajtovima (default: 0)</translation> </message> <message> <location line="+2"/> @@ -2615,6 +2646,11 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> + <location line="+1"/> + <source>Signing transaction failed</source> + <translation type="unfinished"/> + </message> + <message> <location line="+2"/> <source>Specify connection timeout in milliseconds (default: 5000)</source> <translation>Odredi vremenski prozor za spajanje na mrežu u milisekundama (ugrađeni izbor: 5000)</translation> @@ -2625,7 +2661,22 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+10"/> + <location line="+4"/> + <source>Transaction amount too small</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Transaction amounts must be positive</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Transaction too large</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+7"/> <source>Use UPnP to map the listening port (default: 0)</source> <translation>Pokušaj koristiti UPnP da otvoriš port za uslugu (default: 0)</translation> </message> @@ -2665,7 +2716,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="-46"/> + <location line="-50"/> <source>Password for JSON-RPC connections</source> <translation>Lozinka za JSON-RPC veze</translation> </message> @@ -2680,17 +2731,17 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Pošalji komande nodu na adresi <ip> (ugrađeni izbor: 127.0.0.1)</translation> </message> <message> - <location line="-119"/> + <location line="-120"/> <source>Execute command when the best block changes (%s in cmd is replaced by block hash)</source> - <translation type="unfinished"/> + <translation>Izvršite naredbu kada se najbolji blok promjeni (%s u cmd je zamjenjen sa block hash)</translation> </message> <message> - <location line="+142"/> + <location line="+147"/> <source>Upgrade wallet to latest format</source> <translation>Nadogradite novčanik u posljednji format.</translation> </message> <message> - <location line="-17"/> + <location line="-21"/> <source>Set key pool size to <n> (default: 100)</source> <translation>Podesi memorijski prostor za ključeve na <n> (ugrađeni izbor: 100)</translation> </message> @@ -2700,12 +2751,12 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Ponovno pretraži lanac blokova za transakcije koje nedostaju</translation> </message> <message> - <location line="+31"/> + <location line="+35"/> <source>Use OpenSSL (https) for JSON-RPC connections</source> <translation>Koristi OpenSSL (https) za JSON-RPC povezivanje</translation> </message> <message> - <location line="-22"/> + <location line="-26"/> <source>Server certificate file (default: server.cert)</source> <translation>Uslužnikov SSL certifikat (ugrađeni izbor: server.cert)</translation> </message> @@ -2715,37 +2766,37 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Uslužnikov privatni ključ (ugrađeni izbor: server.pem)</translation> </message> <message> - <location line="-153"/> + <location line="-151"/> <source>Acceptable ciphers (default: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH)</source> <translation>Prihvaljivi načini šifriranja (ugrađeni izbor: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH)</translation> </message> <message> - <location line="+166"/> + <location line="+165"/> <source>This help message</source> <translation>Ova poruka za pomoć</translation> </message> <message> - <location line="+3"/> + <location line="+6"/> <source>Unable to bind to %s on this computer (bind returned error %d, %s)</source> <translation>Program ne može koristiti %s na ovom računalu (bind returned error %d, %s)</translation> </message> <message> - <location line="-86"/> + <location line="-91"/> <source>Connect through socks proxy</source> <translation>Poveži se kroz socks proxy</translation> </message> <message> - <location line="-11"/> + <location line="-10"/> <source>Allow DNS lookups for -addnode, -seednode and -connect</source> <translation>Dozvoli DNS upite za dodavanje nodova i povezivanje</translation> </message> <message> - <location line="+56"/> + <location line="+55"/> <source>Loading addresses...</source> <translation>Učitavanje adresa...</translation> </message> <message> - <location line="-34"/> + <location line="-35"/> <source>Error loading wallet.dat: Wallet corrupted</source> <translation>Greška kod učitavanja wallet.dat: Novčanik pokvaren</translation> </message> @@ -2755,22 +2806,22 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Greška kod učitavanja wallet.dat: Novčanik zahtjeva noviju verziju Bitcoina</translation> </message> <message> - <location line="+87"/> + <location line="+93"/> <source>Wallet needed to be rewritten: restart Bitcoin to complete</source> <translation>Novčanik je trebao prepravak: ponovo pokrenite Bitcoin</translation> </message> <message> - <location line="-89"/> + <location line="-95"/> <source>Error loading wallet.dat</source> <translation>Greška kod učitavanja wallet.dat</translation> </message> <message> - <location line="+29"/> + <location line="+28"/> <source>Invalid -proxy address: '%s'</source> <translation>Nevaljala -proxy adresa: '%s'</translation> </message> <message> - <location line="+49"/> + <location line="+56"/> <source>Unknown network specified in -onlynet: '%s'</source> <translation type="unfinished"/> </message> @@ -2780,7 +2831,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="-91"/> + <location line="-96"/> <source>Cannot resolve -bind address: '%s'</source> <translation type="unfinished"/> </message> @@ -2800,17 +2851,17 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Nevaljali iznos za opciju</translation> </message> <message> - <location line="-4"/> + <location line="-6"/> <source>Insufficient funds</source> <translation>Nedovoljna sredstva</translation> </message> <message> - <location line="+8"/> + <location line="+10"/> <source>Loading block index...</source> <translation>Učitavanje indeksa blokova...</translation> </message> <message> - <location line="-58"/> + <location line="-57"/> <source>Add a node to connect to and attempt to keep the connection open</source> <translation>Unesite nod s kojim se želite spojiti and attempt to keep the connection open</translation> </message> @@ -2820,52 +2871,47 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Program ne može koristiti %s na ovom računalu. Bitcoin program je vjerojatno već pokrenut.</translation> </message> <message> - <location line="+67"/> + <location line="+64"/> <source>Fee per KB to add to transactions you send</source> <translation>Naknada posredniku po KB-u koja će biti dodana svakoj transakciji koju pošalješ</translation> </message> <message> - <location line="+17"/> + <location line="+19"/> <source>Loading wallet...</source> <translation>Učitavanje novčanika...</translation> </message> <message> - <location line="-53"/> + <location line="-52"/> <source>Cannot downgrade wallet</source> <translation>Nije moguće novčanik vratiti na prijašnju verziju.</translation> </message> <message> - <location line="+1"/> - <source>Cannot initialize keypool</source> - <translation>Keypool nije moguće inicijalizirati.</translation> - </message> - <message> <location line="+3"/> <source>Cannot write default address</source> <translation>Nije moguće upisati zadanu adresu.</translation> </message> <message> - <location line="+63"/> + <location line="+64"/> <source>Rescanning...</source> <translation>Rescaniranje</translation> </message> <message> - <location line="-55"/> + <location line="-57"/> <source>Done loading</source> <translation>Učitavanje gotovo</translation> </message> <message> - <location line="+79"/> + <location line="+82"/> <source>To use the %s option</source> <translation type="unfinished"/> </message> <message> - <location line="-71"/> + <location line="-74"/> <source>Error</source> <translation>Greška</translation> </message> <message> - <location line="-33"/> + <location line="-31"/> <source>You must set rpcpassword=<password> in the configuration file: %s If the file does not exist, create it with owner-readable-only file permissions.</source> diff --git a/src/qt/locale/bitcoin_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.</translation> </message> <message> - <location filename="../aboutdialog.cpp" line="+17"/> + <location filename="../aboutdialog.cpp" line="+14"/> <source>Copyright</source> <translation type="unfinished"/> </message> <message> <location line="+0"/> - <source>2009-%1 The Bitcoin developers</source> + <source>The Bitcoin developers</source> <translation type="unfinished"/> </message> </context> @@ -65,7 +65,7 @@ Ez a termék az OpenSSL Project által lett kifejlesztve az OpenSSL Toolkit (htt <translation>&Új cím</translation> </message> <message> - <location filename="../addressbookpage.cpp" line="+59"/> + <location filename="../addressbookpage.cpp" line="+63"/> <source>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.</source> <translation>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.</translation> </message> @@ -95,7 +95,17 @@ Ez a termék az OpenSSL Project által lett kifejlesztve az OpenSSL Toolkit (htt <translation type="unfinished"/> </message> <message> - <location line="-14"/> + <location line="+27"/> + <source>Export the data in the current tab to a file</source> + <translation>Jelenlegi nézet exportálása fájlba</translation> + </message> + <message> + <location line="+3"/> + <source>&Export</source> + <translation type="unfinished"/> + </message> + <message> + <location line="-44"/> <source>Verify a message to ensure it was signed with a specified Bitcoin address</source> <translation>Üzenet ellenőrzése, hogy valóban a megjelölt Bitcoin címekkel van-e aláírva.</translation> </message> @@ -317,12 +327,12 @@ Ez a termék az OpenSSL Project által lett kifejlesztve az OpenSSL Toolkit (htt <translation>Üzenet aláírása...</translation> </message> <message> - <location line="+299"/> + <location line="+280"/> <source>Synchronizing with network...</source> <translation>Szinkronizálás a hálózattal...</translation> </message> <message> - <location line="-368"/> + <location line="-349"/> <source>&Overview</source> <translation>&Áttekintés</translation> </message> @@ -397,7 +407,7 @@ Ez a termék az OpenSSL Project által lett kifejlesztve az OpenSSL Toolkit (htt <translation>Jelszó &megváltoztatása...</translation> </message> <message> - <location line="+304"/> + <location line="+285"/> <source>Importing blocks from disk...</source> <translation>A blokkok importálása lemezről...</translation> </message> @@ -407,12 +417,7 @@ Ez a termék az OpenSSL Project által lett kifejlesztve az OpenSSL Toolkit (htt <translation>A blokkok lemezen történő ujraindexelése...</translation> </message> <message> - <location line="-300"/> - <source>&Export...</source> - <translation>&Exportálás...</translation> - </message> - <message> - <location line="-66"/> + <location line="-347"/> <source>Send coins to a Bitcoin address</source> <translation>Érmék küldése megadott címre</translation> </message> @@ -422,12 +427,7 @@ Ez a termék az OpenSSL Project által lett kifejlesztve az OpenSSL Toolkit (htt <translation>Bitcoin konfigurációs opciók</translation> </message> <message> - <location line="+18"/> - <source>Export the data in the current tab to a file</source> - <translation>Jelenlegi nézet exportálása fájlba</translation> - </message> - <message> - <location line="-9"/> + <location line="+9"/> <source>Backup wallet to another location</source> <translation>Biztonsági másolat készítése a Tárcáról egy másik helyre</translation> </message> @@ -437,7 +437,7 @@ Ez a termék az OpenSSL Project által lett kifejlesztve az OpenSSL Toolkit (htt <translation>Tárcakódoló jelszó megváltoztatása</translation> </message> <message> - <location line="+9"/> + <location line="+6"/> <source>&Debug window</source> <translation>&Debug ablak</translation> </message> @@ -447,23 +447,23 @@ Ez a termék az OpenSSL Project által lett kifejlesztve az OpenSSL Toolkit (htt <translation>Hibakereső és diagnosztikai konzol megnyitása</translation> </message> <message> - <location line="-7"/> + <location line="-4"/> <source>&Verify message...</source> <translation>Üzenet &valódiságának ellenőrzése</translation> </message> <message> - <location line="-163"/> - <location line="+541"/> + <location line="-165"/> + <location line="+530"/> <source>Bitcoin</source> <translation>Bitcoin</translation> </message> <message> - <location line="-541"/> + <location line="-530"/> <source>Wallet</source> <translation>Tárca</translation> </message> <message> - <location line="+99"/> + <location line="+101"/> <source>&Send</source> <translation type="unfinished"/> </message> @@ -508,12 +508,12 @@ Ez a termék az OpenSSL Project által lett kifejlesztve az OpenSSL Toolkit (htt <translation>Annak ellenőrzése, hogy az üzenetek valóban a megjelölt Bitcoin címekkel vannak-e alaírva</translation> </message> <message> - <location line="+31"/> + <location line="+28"/> <source>&File</source> <translation>&Fájl</translation> </message> <message> - <location line="+8"/> + <location line="+7"/> <source>&Settings</source> <translation>&Beállítások</translation> </message> @@ -528,12 +528,7 @@ Ez a termék az OpenSSL Project által lett kifejlesztve az OpenSSL Toolkit (htt <translation>Fül eszköztár</translation> </message> <message> - <location line="+8"/> - <source>Actions toolbar</source> - <translation>Parancsok eszköztár</translation> - </message> - <message> - <location line="+13"/> + <location line="+17"/> <location line="+10"/> <source>[testnet]</source> <translation>[teszthálózat]</translation> @@ -544,12 +539,17 @@ Ez a termék az OpenSSL Project által lett kifejlesztve az OpenSSL Toolkit (htt <translation>Bitcoin kliens</translation> </message> <message numerus="yes"> - <location line="+140"/> + <location line="+141"/> <source>%n active connection(s) to Bitcoin network</source> <translation><numerusform>%n aktív kapcsolat a Bitcoin-hálózattal</numerusform><numerusform>%n aktív kapcsolat a Bitcoin-hálózattal</numerusform></translation> </message> <message> - <location line="+39"/> + <location line="+22"/> + <source>No block source available...</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+12"/> <source>Processed %1 of %2 (estimated) blocks of transaction history.</source> <translation type="unfinished"/> </message> @@ -574,7 +574,7 @@ Ez a termék az OpenSSL Project által lett kifejlesztve az OpenSSL Toolkit (htt <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation> </message> <message> - <location line="+5"/> + <location line="+4"/> <source>%1 behind</source> <translation type="unfinished"/> </message> @@ -589,7 +589,7 @@ Ez a termék az OpenSSL Project által lett kifejlesztve az OpenSSL Toolkit (htt <translation type="unfinished"/> </message> <message> - <location line="+21"/> + <location line="+22"/> <source>Error</source> <translation type="unfinished"/> </message> @@ -604,22 +604,22 @@ Ez a termék az OpenSSL Project által lett kifejlesztve az OpenSSL Toolkit (htt <translation type="unfinished"/> </message> <message> - <location line="+68"/> + <location line="+70"/> <source>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?</source> <translation type="unfinished"/> </message> <message> - <location line="-138"/> + <location line="-140"/> <source>Up to date</source> <translation>Naprakész</translation> </message> <message> - <location line="+32"/> + <location line="+31"/> <source>Catching up...</source> <translation>Frissítés...</translation> </message> <message> - <location line="+110"/> + <location line="+113"/> <source>Confirm transaction fee</source> <translation>Tranzakciós díj jóváhagyása</translation> </message> @@ -669,7 +669,7 @@ Cím: %4 <translation>Tárca <b>kódolva</b> és jelenleg <b>zárva</b>.</translation> </message> <message> - <location filename="../bitcoin.cpp" line="+104"/> + <location filename="../bitcoin.cpp" line="+111"/> <source>A fatal error occurred. Bitcoin can no longer continue safely and will quit.</source> <translation type="unfinished"/> </message> @@ -677,7 +677,7 @@ Cím: %4 <context> <name>ClientModel</name> <message> - <location filename="../clientmodel.cpp" line="+98"/> + <location filename="../clientmodel.cpp" line="+104"/> <source>Network Alert</source> <translation type="unfinished"/> </message> @@ -809,8 +809,8 @@ Cím: %4 </message> <message> <location line="+6"/> - <source>Optional transaction fee per kB that helps make sure your transactions are processed quickly. Most transactions are 1 kB. Fee 0.01 recommended.</source> - <translation>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.</translation> + <source>Optional transaction fee per kB that helps make sure your transactions are processed quickly. Most transactions are 1 kB.</source> + <translation type="unfinished"/> </message> <message> <location line="+15"/> @@ -1059,7 +1059,7 @@ Cím: %4 <translation>Még megerősítésre váró, a jelenlegi egyenlegbe be nem számított tranzakciók</translation> </message> <message> - <location filename="../overviewpage.cpp" line="+115"/> + <location filename="../overviewpage.cpp" line="+116"/> <location line="+1"/> <source>out of sync</source> <translation>Nincs szinkronban.</translation> @@ -1647,6 +1647,19 @@ Cím: %4 </message> </context> <context> + <name>SplashScreen</name> + <message> + <location filename="../splashscreen.cpp" line="+22"/> + <source>The Bitcoin developers</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>[testnet]</source> + <translation>[teszthálózat]</translation> + </message> +</context> +<context> <name>TransactionDesc</name> <message> <location filename="../transactiondesc.cpp" line="+20"/> @@ -2121,9 +2134,27 @@ Cím: %4 </message> </context> <context> + <name>WalletModel</name> + <message> + <location filename="../walletmodel.cpp" line="+193"/> + <source>Send Coins</source> + <translation>Érmék küldése</translation> + </message> +</context> +<context> <name>WalletView</name> <message> - <location filename="../walletview.cpp" line="+247"/> + <location filename="../walletview.cpp" line="+42"/> + <source>&Export</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Export the data in the current tab to a file</source> + <translation>Jelenlegi nézet exportálása fájlba</translation> + </message> + <message> + <location line="+193"/> <source>Backup Wallet</source> <translation>Biztonsági másolat készítése a Tárcáról</translation> </message> @@ -2156,41 +2187,41 @@ Cím: %4 <context> <name>bitcoin-core</name> <message> - <location filename="../bitcoinstrings.cpp" line="+96"/> + <location filename="../bitcoinstrings.cpp" line="+94"/> <source>Bitcoin version</source> <translation>Bitcoin verzió</translation> </message> <message> - <location line="+98"/> + <location line="+102"/> <source>Usage:</source> <translation>Használat:</translation> </message> <message> - <location line="-25"/> + <location line="-29"/> <source>Send command to -server or bitcoind</source> <translation>Parancs küldése a -serverhez vagy a bitcoindhez </translation> </message> <message> - <location line="-22"/> + <location line="-23"/> <source>List commands</source> <translation>Parancsok kilistázása </translation> </message> <message> - <location line="-10"/> + <location line="-12"/> <source>Get help for a command</source> <translation>Segítség egy parancsról </translation> </message> <message> - <location line="+21"/> + <location line="+24"/> <source>Options:</source> <translation>Opciók </translation> </message> <message> - <location line="+23"/> + <location line="+24"/> <source>Specify configuration file (default: bitcoin.conf)</source> <translation>Konfigurációs fájl (alapértelmezett: bitcoin.conf) </translation> @@ -2202,30 +2233,18 @@ Cím: %4 </translation> </message> <message> - <location line="-48"/> - <source>Generate coins</source> - <translation>Érmék generálása -</translation> - </message> - <message> - <location line="-27"/> - <source>Don't generate coins</source> - <translation>Bitcoin-generálás leállítása -</translation> - </message> - <message> - <location line="+74"/> + <location line="-1"/> <source>Specify data directory</source> <translation>Adatkönyvtár </translation> </message> <message> - <location line="-8"/> + <location line="-9"/> <source>Set database cache size in megabytes (default: 25)</source> <translation>Az adatbázis gyorsítótár mérete megabájtban (alapértelmezés: 25)</translation> </message> <message> - <location line="-27"/> + <location line="-28"/> <source>Listen for connections on <port> (default: 8333 or testnet: 18333)</source> <translation>Csatlakozásokhoz figyelendő <port> (alapértelmezett: 8333 or testnet: 18333)</translation> </message> @@ -2240,7 +2259,7 @@ Cím: %4 <translation>Kapcsolódás egy csomóponthoz a peerek címeinek megszerzése miatt, majd szétkapcsolás</translation> </message> <message> - <location line="+80"/> + <location line="+82"/> <source>Specify your own public address</source> <translation>Adja meg az Ön saját nyilvános címét</translation> </message> @@ -2250,22 +2269,22 @@ Cím: %4 <translation>Helytelenül viselkedő peerek leválasztási határértéke (alapértelmezés: 100)</translation> </message> <message> - <location line="-132"/> + <location line="-134"/> <source>Number of seconds to keep misbehaving peers from reconnecting (default: 86400)</source> <translation>Helytelenül viselkedő peerek kizárási ideje másodpercben (alapértelmezés: 86400)</translation> </message> <message> - <location line="-32"/> + <location line="-29"/> <source>An error occurred while setting up the RPC port %u for listening on IPv4: %s</source> <translation type="unfinished"/> </message> <message> - <location line="+30"/> + <location line="+27"/> <source>Listen for JSON-RPC connections on <port> (default: 8332 or testnet: 18332)</source> <translation>JSON-RPC csatlakozásokhoz figyelendő <port> (alapértelmezett: 8332 or testnet: 18332)</translation> </message> <message> - <location line="+36"/> + <location line="+37"/> <source>Accept command line and JSON-RPC commands</source> <translation>Parancssoros és JSON-RPC parancsok elfogadása </translation> @@ -2277,18 +2296,18 @@ Cím: %4 </translation> </message> <message> - <location line="+33"/> + <location line="+37"/> <source>Use the test network</source> <translation>Teszthálózat használata </translation> </message> <message> - <location line="-108"/> + <location line="-112"/> <source>Accept connections from outside (default: 1 if no -proxy or -connect)</source> <translation type="unfinished"/> </message> <message> - <location line="-82"/> + <location line="-80"/> <source>%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. </message> <message> <location line="+3"/> - <source>Error initializing database environment %s! To recover, BACKUP THAT DIRECTORY, then remove everything from it except for wallet.dat.</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+3"/> <source>Error: The transaction was rejected! This might happen if some of the coins in your wallet were already spent, such as if you used a copy of wallet.dat and coins were spent in the copy but not marked as spent here.</source> <translation type="unfinished"/> </message> @@ -2348,12 +2362,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+3"/> - <source>Set the number of script verification threads (1-16, 0=auto, default: 0)</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+2"/> + <location line="+6"/> <source>This is a pre-release test build - use at your own risk - do not use for mining or merchant applications</source> <translation type="unfinished"/> </message> @@ -2393,7 +2402,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+6"/> + <location line="+5"/> <source>Connect only to the specified node(s)</source> <translation>Csatlakozás csak a megadott csomóponthoz</translation> </message> @@ -2413,7 +2422,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+3"/> + <location line="+2"/> <source>Error initializing block database</source> <translation type="unfinished"/> </message> @@ -2439,11 +2448,6 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. </message> <message> <location line="+1"/> - <source>Error: Transaction creation failed!</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+1"/> <source>Error: Wallet locked, unable to create transaction!</source> <translation type="unfinished"/> </message> @@ -2513,7 +2517,12 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+3"/> + <location line="+1"/> + <source>Generate coins (default: 0)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+2"/> <source>How many blocks to check at startup (default: 288, 0 = all)</source> <translation type="unfinished"/> </message> @@ -2523,7 +2532,12 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+24"/> + <location line="+19"/> + <source>Not enough file descriptors available.</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+8"/> <source>Rebuild block chain index from current blk000??.dat files</source> <translation type="unfinished"/> </message> @@ -2533,7 +2547,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+22"/> + <location line="+26"/> <source>Verifying blocks...</source> <translation type="unfinished"/> </message> @@ -2543,12 +2557,17 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="-62"/> + <location line="-69"/> <source>Imports blocks from external blk000??.dat file</source> <translation type="unfinished"/> </message> <message> - <location line="+1"/> + <location line="-76"/> + <source>Set the number of script verification threads (up to 16, 0 = auto, <0 = leave that many cores free, default: 0)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+77"/> <source>Information</source> <translation type="unfinished"/> </message> @@ -2558,6 +2577,16 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Érvénytelen -tor cím: '%s'</translation> </message> <message> + <location line="+1"/> + <source>Invalid amount for -minrelaytxfee=<amount>: '%s'</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Invalid amount for -mintxfee=<amount>: '%s'</source> + <translation type="unfinished"/> + </message> + <message> <location line="+8"/> <source>Maintain a full transaction index (default: 0)</source> <translation type="unfinished"/> @@ -2573,7 +2602,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+1"/> + <location line="+2"/> <source>Only accept block chain matching built-in checkpoints (default: 1)</source> <translation>Csak blokklánccal egyező beépített ellenőrző pontok elfogadása (alapértelmezés: 1)</translation> </message> @@ -2633,6 +2662,11 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> + <location line="+1"/> + <source>Signing transaction failed</source> + <translation type="unfinished"/> + </message> + <message> <location line="+2"/> <source>Specify connection timeout in milliseconds (default: 5000)</source> <translation>Csatlakozás időkerete milliszekundumban (alapértelmezett: 5000)</translation> @@ -2643,7 +2677,22 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+10"/> + <location line="+4"/> + <source>Transaction amount too small</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Transaction amounts must be positive</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Transaction too large</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+7"/> <source>Use UPnP to map the listening port (default: 0)</source> <translation>UPnP-használat engedélyezése a figyelő port feltérképezésénél (default: 0)</translation> </message> @@ -2684,7 +2733,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="-46"/> + <location line="-50"/> <source>Password for JSON-RPC connections</source> <translation>Jelszó JSON-RPC csatlakozásokhoz </translation> @@ -2702,17 +2751,17 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. </translation> </message> <message> - <location line="-119"/> + <location line="-120"/> <source>Execute command when the best block changes (%s in cmd is replaced by block hash)</source> <translation>Parancs, amit akkor hajt végre, amikor a legjobb blokk megváltozik (%s a cmd-ban lecserélődik a blokk hash-re)</translation> </message> <message> - <location line="+142"/> + <location line="+147"/> <source>Upgrade wallet to latest format</source> <translation>A Tárca frissítése a legfrissebb formátumra</translation> </message> <message> - <location line="-17"/> + <location line="-21"/> <source>Set key pool size to <n> (default: 100)</source> <translation>Kulcskarika mérete <n> (alapértelmezett: 100) </translation> @@ -2724,13 +2773,13 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. </translation> </message> <message> - <location line="+31"/> + <location line="+35"/> <source>Use OpenSSL (https) for JSON-RPC connections</source> <translation>OpenSSL (https) használata JSON-RPC csatalkozásokhoz </translation> </message> <message> - <location line="-22"/> + <location line="-26"/> <source>Server certificate file (default: server.cert)</source> <translation>Szervertanúsítvány-fájl (alapértelmezett: server.cert) </translation> @@ -2742,39 +2791,39 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. </translation> </message> <message> - <location line="-153"/> + <location line="-151"/> <source>Acceptable ciphers (default: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH)</source> <translation>Elfogadható rejtjelkulcsok (alapértelmezett: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH ) </translation> </message> <message> - <location line="+166"/> + <location line="+165"/> <source>This help message</source> <translation>Ez a súgó-üzenet </translation> </message> <message> - <location line="+3"/> + <location line="+6"/> <source>Unable to bind to %s on this computer (bind returned error %d, %s)</source> <translation>A %s nem elérhető ezen a gépen (bind returned error %d, %s)</translation> </message> <message> - <location line="-86"/> + <location line="-91"/> <source>Connect through socks proxy</source> <translation>Csatlakozás SOCKS proxyn keresztül</translation> </message> <message> - <location line="-11"/> + <location line="-10"/> <source>Allow DNS lookups for -addnode, -seednode and -connect</source> <translation>DNS-kikeresés engedélyezése az addnode-nál és a connect-nél</translation> </message> <message> - <location line="+56"/> + <location line="+55"/> <source>Loading addresses...</source> <translation>Címek betöltése...</translation> </message> <message> - <location line="-34"/> + <location line="-35"/> <source>Error loading wallet.dat: Wallet corrupted</source> <translation>Hiba a wallet.dat betöltése közben: meghibásodott tárca</translation> </message> @@ -2784,22 +2833,22 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Hiba a wallet.dat betöltése közben: ehhez a tárcához újabb verziójú Bitcoin-kliens szükséges</translation> </message> <message> - <location line="+87"/> + <location line="+93"/> <source>Wallet needed to be rewritten: restart Bitcoin to complete</source> <translation>A Tárca újraírása szükséges: Indítsa újra a teljesen a Bitcoin-t</translation> </message> <message> - <location line="-89"/> + <location line="-95"/> <source>Error loading wallet.dat</source> <translation>Hiba az wallet.dat betöltése közben</translation> </message> <message> - <location line="+29"/> + <location line="+28"/> <source>Invalid -proxy address: '%s'</source> <translation>Érvénytelen -proxy cím: '%s'</translation> </message> <message> - <location line="+49"/> + <location line="+56"/> <source>Unknown network specified in -onlynet: '%s'</source> <translation>Ismeretlen hálózat lett megadva -onlynet: '%s'</translation> </message> @@ -2809,7 +2858,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Ismeretlen -socks proxy kérése: %i</translation> </message> <message> - <location line="-91"/> + <location line="-96"/> <source>Cannot resolve -bind address: '%s'</source> <translation type="unfinished"/> </message> @@ -2829,17 +2878,17 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Étvénytelen összeg</translation> </message> <message> - <location line="-4"/> + <location line="-6"/> <source>Insufficient funds</source> <translation>Nincs elég bitcoinod.</translation> </message> <message> - <location line="+8"/> + <location line="+10"/> <source>Loading block index...</source> <translation>Blokkindex betöltése...</translation> </message> <message> - <location line="-58"/> + <location line="-57"/> <source>Add a node to connect to and attempt to keep the connection open</source> <translation>Elérendő csomópont megadása and attempt to keep the connection open</translation> </message> @@ -2849,52 +2898,47 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>A %s nem elérhető ezen a gépen. A Bitcoin valószínűleg fut már.</translation> </message> <message> - <location line="+67"/> + <location line="+64"/> <source>Fee per KB to add to transactions you send</source> <translation>kB-onként felajánlandó díj az általad küldött tranzakciókhoz</translation> </message> <message> - <location line="+17"/> + <location line="+19"/> <source>Loading wallet...</source> <translation>Tárca betöltése...</translation> </message> <message> - <location line="-53"/> + <location line="-52"/> <source>Cannot downgrade wallet</source> <translation>Nem sikerült a Tárca visszaállítása a korábbi verzióra</translation> </message> <message> - <location line="+1"/> - <source>Cannot initialize keypool</source> - <translation>Nem lehet a keypool-t inicializálni</translation> - </message> - <message> <location line="+3"/> <source>Cannot write default address</source> <translation>Nem sikerült az alapértelmezett címet írni.</translation> </message> <message> - <location line="+63"/> + <location line="+64"/> <source>Rescanning...</source> <translation>Újraszkennelés...</translation> </message> <message> - <location line="-55"/> + <location line="-57"/> <source>Done loading</source> <translation>Betöltés befejezve.</translation> </message> <message> - <location line="+79"/> + <location line="+82"/> <source>To use the %s option</source> <translation>Használd a %s opciót</translation> </message> <message> - <location line="-71"/> + <location line="-74"/> <source>Error</source> <translation>Hiba</translation> </message> <message> - <location line="-33"/> + <location line="-31"/> <source>You must set rpcpassword=<password> in the configuration file: %s If the file does not exist, create it with owner-readable-only file permissions.</source> diff --git a/src/qt/locale/bitcoin_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.</translation> </message> <message> - <location filename="../aboutdialog.cpp" line="+17"/> + <location filename="../aboutdialog.cpp" line="+14"/> <source>Copyright</source> <translation>Copyright</translation> </message> <message> <location line="+0"/> - <source>2009-%1 The Bitcoin developers</source> - <translation>2009-%1 Gli sviluppatori di Bitcoin</translation> + <source>The Bitcoin developers</source> + <translation>Sviluppatori di Bitcoin</translation> </message> </context> <context> @@ -66,7 +66,7 @@ Questo prodotto include software sviluppato dal progetto OpenSSL per l'uso <translation>&Nuovo indirizzo</translation> </message> <message> - <location filename="../addressbookpage.cpp" line="+59"/> + <location filename="../addressbookpage.cpp" line="+63"/> <source>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.</source> <translation>Questi sono i tuoi indirizzi Bitcoin per ricevere pagamenti. Potrai darne uno diverso ad ognuno per tenere così traccia di chi ti sta pagando.</translation> </message> @@ -96,7 +96,17 @@ Questo prodotto include software sviluppato dal progetto OpenSSL per l'uso <translation>Cancella l'indirizzo attualmente selezionato dalla lista</translation> </message> <message> - <location line="-14"/> + <location line="+27"/> + <source>Export the data in the current tab to a file</source> + <translation>Esporta i dati nella tabella corrente su un file</translation> + </message> + <message> + <location line="+3"/> + <source>&Export</source> + <translation>&Esporta...</translation> + </message> + <message> + <location line="-44"/> <source>Verify a message to ensure it was signed with a specified Bitcoin address</source> <translation>Verifica un messaggio per accertarsi che sia firmato con un indirizzo Bitcoin specifico</translation> </message> @@ -318,12 +328,12 @@ Questo prodotto include software sviluppato dal progetto OpenSSL per l'uso <translation>Firma il &messaggio...</translation> </message> <message> - <location line="+299"/> + <location line="+280"/> <source>Synchronizing with network...</source> <translation>Sto sincronizzando con la rete...</translation> </message> <message> - <location line="-368"/> + <location line="-349"/> <source>&Overview</source> <translation>&Sintesi</translation> </message> @@ -398,7 +408,7 @@ Questo prodotto include software sviluppato dal progetto OpenSSL per l'uso <translation>&Cambia la passphrase...</translation> </message> <message> - <location line="+304"/> + <location line="+285"/> <source>Importing blocks from disk...</source> <translation>Importa blocchi dal disco...</translation> </message> @@ -408,12 +418,7 @@ Questo prodotto include software sviluppato dal progetto OpenSSL per l'uso <translation>Re-indicizzazione blocchi su disco...</translation> </message> <message> - <location line="-300"/> - <source>&Export...</source> - <translation>&Esporta...</translation> - </message> - <message> - <location line="-66"/> + <location line="-347"/> <source>Send coins to a Bitcoin address</source> <translation>Invia monete ad un indirizzo bitcoin</translation> </message> @@ -423,12 +428,7 @@ Questo prodotto include software sviluppato dal progetto OpenSSL per l'uso <translation>Modifica configurazione opzioni per bitcoin</translation> </message> <message> - <location line="+18"/> - <source>Export the data in the current tab to a file</source> - <translation>Esporta i dati nella tabella corrente su un file</translation> - </message> - <message> - <location line="-9"/> + <location line="+9"/> <source>Backup wallet to another location</source> <translation>Backup portamonete in un'altra locazione</translation> </message> @@ -438,7 +438,7 @@ Questo prodotto include software sviluppato dal progetto OpenSSL per l'uso <translation>Cambia la passphrase per la cifratura del portamonete</translation> </message> <message> - <location line="+9"/> + <location line="+6"/> <source>&Debug window</source> <translation>Finestra &Debug</translation> </message> @@ -448,35 +448,35 @@ Questo prodotto include software sviluppato dal progetto OpenSSL per l'uso <translation>Apri la console di degugging e diagnostica</translation> </message> <message> - <location line="-7"/> + <location line="-4"/> <source>&Verify message...</source> <translation>&Verifica messaggio...</translation> </message> <message> - <location line="-163"/> - <location line="+541"/> + <location line="-165"/> + <location line="+530"/> <source>Bitcoin</source> <translation>Bitcoin</translation> </message> <message> - <location line="-541"/> + <location line="-530"/> <source>Wallet</source> <translation>Portamonete</translation> </message> <message> - <location line="+99"/> + <location line="+101"/> <source>&Send</source> <translation>&Spedisci</translation> </message> <message> <location line="+7"/> <source>&Receive</source> - <translation type="unfinished"/> + <translation>&Ricevi</translation> </message> <message> <location line="+14"/> <source>&Addresses</source> - <translation type="unfinished"/> + <translation>&Indirizzi</translation> </message> <message> <location line="+22"/> @@ -509,12 +509,12 @@ Questo prodotto include software sviluppato dal progetto OpenSSL per l'uso <translation>Verifica i messaggi per accertarsi che siano stati firmati con gli indirizzi Bitcoin specificati</translation> </message> <message> - <location line="+31"/> + <location line="+28"/> <source>&File</source> <translation>&File</translation> </message> <message> - <location line="+8"/> + <location line="+7"/> <source>&Settings</source> <translation>&Impostazioni</translation> </message> @@ -529,12 +529,7 @@ Questo prodotto include software sviluppato dal progetto OpenSSL per l'uso <translation>Barra degli strumenti "Tabs"</translation> </message> <message> - <location line="+8"/> - <source>Actions toolbar</source> - <translation>Barra degli strumenti "Azioni"</translation> - </message> - <message> - <location line="+13"/> + <location line="+17"/> <location line="+10"/> <source>[testnet]</source> <translation>[testnet]</translation> @@ -545,12 +540,17 @@ Questo prodotto include software sviluppato dal progetto OpenSSL per l'uso <translation>Bitcoin client</translation> </message> <message numerus="yes"> - <location line="+140"/> + <location line="+141"/> <source>%n active connection(s) to Bitcoin network</source> <translation><numerusform>%n connessione attiva alla rete Bitcoin</numerusform><numerusform>%n connessioni attive alla rete Bitcoin</numerusform></translation> </message> <message> - <location line="+39"/> + <location line="+22"/> + <source>No block source available...</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+12"/> <source>Processed %1 of %2 (estimated) blocks of transaction history.</source> <translation>Processati %1 di %2 (circa) blocchi della cronologia transazioni.</translation> </message> @@ -575,7 +575,7 @@ Questo prodotto include software sviluppato dal progetto OpenSSL per l'uso <translation><numerusform>%n settimana</numerusform><numerusform>%n settimane</numerusform></translation> </message> <message> - <location line="+5"/> + <location line="+4"/> <source>%1 behind</source> <translation type="unfinished"/> </message> @@ -590,7 +590,7 @@ Questo prodotto include software sviluppato dal progetto OpenSSL per l'uso <translation type="unfinished"/> </message> <message> - <location line="+21"/> + <location line="+22"/> <source>Error</source> <translation>Errore</translation> </message> @@ -605,22 +605,22 @@ Questo prodotto include software sviluppato dal progetto OpenSSL per l'uso <translation>Informazione</translation> </message> <message> - <location line="+68"/> + <location line="+70"/> <source>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?</source> <translation>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?</translation> </message> <message> - <location line="-138"/> + <location line="-140"/> <source>Up to date</source> <translation>Aggiornato</translation> </message> <message> - <location line="+32"/> + <location line="+31"/> <source>Catching up...</source> <translation>In aggiornamento...</translation> </message> <message> - <location line="+110"/> + <location line="+113"/> <source>Confirm transaction fee</source> <translation>Conferma compenso transazione</translation> </message> @@ -671,7 +671,7 @@ Indirizzo: %4 <translation>Il portamonete è <b>cifrato</b> e attualmente <b>bloccato</b></translation> </message> <message> - <location filename="../bitcoin.cpp" line="+104"/> + <location filename="../bitcoin.cpp" line="+111"/> <source>A fatal error occurred. Bitcoin can no longer continue safely and will quit.</source> <translation>Riscontrato un errore irreversibile. Bitcoin non può più continuare in sicurezza e verrà terminato.</translation> </message> @@ -679,7 +679,7 @@ Indirizzo: %4 <context> <name>ClientModel</name> <message> - <location filename="../clientmodel.cpp" line="+98"/> + <location filename="../clientmodel.cpp" line="+104"/> <source>Network Alert</source> <translation>Avviso di rete</translation> </message> @@ -811,8 +811,8 @@ Indirizzo: %4 </message> <message> <location line="+6"/> - <source>Optional transaction fee per kB that helps make sure your transactions are processed quickly. Most transactions are 1 kB. Fee 0.01 recommended.</source> - <translation>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.</translation> + <source>Optional transaction fee per kB that helps make sure your transactions are processed quickly. Most transactions are 1 kB.</source> + <translation type="unfinished"/> </message> <message> <location line="+15"/> @@ -1061,7 +1061,7 @@ Indirizzo: %4 <translation>Totale delle transazioni in corso di conferma, che non sono ancora incluse nel saldo attuale</translation> </message> <message> - <location filename="../overviewpage.cpp" line="+115"/> + <location filename="../overviewpage.cpp" line="+116"/> <location line="+1"/> <source>out of sync</source> <translation>fuori sincrono</translation> @@ -1648,6 +1648,19 @@ Indirizzo: %4 </message> </context> <context> + <name>SplashScreen</name> + <message> + <location filename="../splashscreen.cpp" line="+22"/> + <source>The Bitcoin developers</source> + <translation>Sviluppatori di Bitcoin</translation> + </message> + <message> + <location line="+1"/> + <source>[testnet]</source> + <translation>[testnet]</translation> + </message> +</context> +<context> <name>TransactionDesc</name> <message> <location filename="../transactiondesc.cpp" line="+20"/> @@ -2122,9 +2135,27 @@ Indirizzo: %4 </message> </context> <context> + <name>WalletModel</name> + <message> + <location filename="../walletmodel.cpp" line="+193"/> + <source>Send Coins</source> + <translation>Spedisci Bitcoin</translation> + </message> +</context> +<context> <name>WalletView</name> <message> - <location filename="../walletview.cpp" line="+247"/> + <location filename="../walletview.cpp" line="+42"/> + <source>&Export</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Export the data in the current tab to a file</source> + <translation>Esporta i dati nella tabella corrente su un file</translation> + </message> + <message> + <location line="+193"/> <source>Backup Wallet</source> <translation type="unfinished"/> </message> @@ -2136,7 +2167,7 @@ Indirizzo: %4 <message> <location line="+3"/> <source>Backup Failed</source> - <translation type="unfinished"/> + <translation>Backup fallito</translation> </message> <message> <location line="+0"/> @@ -2157,41 +2188,41 @@ Indirizzo: %4 <context> <name>bitcoin-core</name> <message> - <location filename="../bitcoinstrings.cpp" line="+96"/> + <location filename="../bitcoinstrings.cpp" line="+94"/> <source>Bitcoin version</source> <translation>Versione di Bitcoin</translation> </message> <message> - <location line="+98"/> + <location line="+102"/> <source>Usage:</source> <translation>Utilizzo:</translation> </message> <message> - <location line="-25"/> + <location line="-29"/> <source>Send command to -server or bitcoind</source> <translation>Manda il comando a -server o bitcoind </translation> </message> <message> - <location line="-22"/> + <location line="-23"/> <source>List commands</source> <translation>Lista comandi </translation> </message> <message> - <location line="-10"/> + <location line="-12"/> <source>Get help for a command</source> <translation>Aiuto su un comando </translation> </message> <message> - <location line="+21"/> + <location line="+24"/> <source>Options:</source> <translation>Opzioni: </translation> </message> <message> - <location line="+23"/> + <location line="+24"/> <source>Specify configuration file (default: bitcoin.conf)</source> <translation>Specifica il file di configurazione (di default: bitcoin.conf) </translation> @@ -2203,30 +2234,18 @@ Indirizzo: %4 </translation> </message> <message> - <location line="-48"/> - <source>Generate coins</source> - <translation>Genera Bitcoin -</translation> - </message> - <message> - <location line="-27"/> - <source>Don't generate coins</source> - <translation>Non generare Bitcoin -</translation> - </message> - <message> - <location line="+74"/> + <location line="-1"/> <source>Specify data directory</source> <translation>Specifica la cartella dati </translation> </message> <message> - <location line="-8"/> + <location line="-9"/> <source>Set database cache size in megabytes (default: 25)</source> <translation>Imposta la dimensione cache del database in megabyte (default: 25)</translation> </message> <message> - <location line="-27"/> + <location line="-28"/> <source>Listen for connections on <port> (default: 8333 or testnet: 18333)</source> <translation>Ascolta le connessioni JSON-RPC su <porta> (default: 8333 o testnet: 18333)</translation> </message> @@ -2241,7 +2260,7 @@ Indirizzo: %4 <translation>Connessione ad un nodo per ricevere l'indirizzo del peer, e disconnessione</translation> </message> <message> - <location line="+80"/> + <location line="+82"/> <source>Specify your own public address</source> <translation>Specifica il tuo indirizzo pubblico</translation> </message> @@ -2251,22 +2270,22 @@ Indirizzo: %4 <translation>Soglia di disconnessione dei peer di cattiva qualità (default: 100)</translation> </message> <message> - <location line="-132"/> + <location line="-134"/> <source>Number of seconds to keep misbehaving peers from reconnecting (default: 86400)</source> <translation>Numero di secondi di sospensione che i peer di cattiva qualità devono trascorrere prima di riconnettersi (default: 86400)</translation> </message> <message> - <location line="-32"/> + <location line="-29"/> <source>An error occurred while setting up the RPC port %u for listening on IPv4: %s</source> <translation>Errore riscontrato durante l'impostazione della porta RPC %u per l'ascolto su IPv4: %s</translation> </message> <message> - <location line="+30"/> + <location line="+27"/> <source>Listen for JSON-RPC connections on <port> (default: 8332 or testnet: 18332)</source> <translation>Attendi le connessioni JSON-RPC su <porta> (default: 8332 or testnet: 18332)</translation> </message> <message> - <location line="+36"/> + <location line="+37"/> <source>Accept command line and JSON-RPC commands</source> <translation>Accetta da linea di comando e da comandi JSON-RPC </translation> @@ -2278,18 +2297,18 @@ Indirizzo: %4 </translation> </message> <message> - <location line="+33"/> + <location line="+37"/> <source>Use the test network</source> <translation>Utilizza la rete di prova </translation> </message> <message> - <location line="-108"/> + <location line="-112"/> <source>Accept connections from outside (default: 1 if no -proxy or -connect)</source> <translation>Accetta connessioni dall'esterno (default: 1 se no -proxy o -connect)</translation> </message> <message> - <location line="-82"/> + <location line="-80"/> <source>%s, you must set a rpcpassword in the configuration file: %s It is recommended you use the following random password: @@ -2320,11 +2339,6 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. </message> <message> <location line="+3"/> - <source>Error initializing database environment %s! To recover, BACKUP THAT DIRECTORY, then remove everything from it except for wallet.dat.</source> - <translation>Errore nell'inizializzazione dell'ambiente del database %s! Per ripristinare, FAI UN BACKUP DI QUELLA CARTELLA, poi rimuovi tutto all'interno eccetto wallet.dat.</translation> - </message> - <message> - <location line="+3"/> <source>Error: The transaction was rejected! This might happen if some of the coins in your wallet were already spent, such as if you used a copy of wallet.dat and coins were spent in the copy but not marked as spent here.</source> <translation>Errore: la transazione è stata rifiutata. Ciò accade se alcuni bitcoin nel portamonete sono stati già spesi, ad esempio se è stata usata una copia del file wallet.dat e i bitcoin sono stati spesi dalla copia ma non segnati come spesi qui.</translation> </message> @@ -2349,12 +2363,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Imposta dimensione massima delle transazioni ad alta priorità/bassa-tassa in bytes (predefinito: 27000)</translation> </message> <message> - <location line="+3"/> - <source>Set the number of script verification threads (1-16, 0=auto, default: 0)</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+2"/> + <location line="+6"/> <source>This is a pre-release test build - use at your own risk - do not use for mining or merchant applications</source> <translation>Questa versione è una compilazione pre-rilascio - usala a tuo rischio - non utilizzarla per la generazione o per applicazioni di commercio</translation> </message> @@ -2394,14 +2403,14 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Opzioni creazione blocco:</translation> </message> <message> - <location line="+6"/> + <location line="+5"/> <source>Connect only to the specified node(s)</source> <translation>Connetti solo al nodo specificato</translation> </message> <message> <location line="+3"/> <source>Corrupted block database detected</source> - <translation type="unfinished"/> + <translation>Rilevato database blocchi corrotto</translation> </message> <message> <location line="+1"/> @@ -2411,10 +2420,10 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <message> <location line="+1"/> <source>Do you want to rebuild the block database now?</source> - <translation type="unfinished"/> + <translation>Vuoi ricostruire ora il database dei blocchi?</translation> </message> <message> - <location line="+3"/> + <location line="+2"/> <source>Error initializing block database</source> <translation type="unfinished"/> </message> @@ -2431,7 +2440,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <message> <location line="+4"/> <source>Error opening block database</source> - <translation type="unfinished"/> + <translation>Errore caricamento database blocchi</translation> </message> <message> <location line="+2"/> @@ -2440,11 +2449,6 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. </message> <message> <location line="+1"/> - <source>Error: Transaction creation failed!</source> - <translation>Errore: Creazione transazione fallita!</translation> - </message> - <message> - <location line="+1"/> <source>Error: Wallet locked, unable to create transaction!</source> <translation>Errore: portafoglio bloccato, impossibile creare la transazione!</translation> </message> @@ -2514,7 +2518,12 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Trova peer utilizzando la ricerca DNS (predefinito: 1 finché utilizzato -connect)</translation> </message> <message> - <location line="+3"/> + <location line="+1"/> + <source>Generate coins (default: 0)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+2"/> <source>How many blocks to check at startup (default: 288, 0 = all)</source> <translation>Quanti blocchi da controllare all'avvio (predefinito: 288, 0 = tutti)</translation> </message> @@ -2524,7 +2533,12 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+24"/> + <location line="+19"/> + <source>Not enough file descriptors available.</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+8"/> <source>Rebuild block chain index from current blk000??.dat files</source> <translation type="unfinished"/> </message> @@ -2534,7 +2548,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+22"/> + <location line="+26"/> <source>Verifying blocks...</source> <translation>Verifica blocchi...</translation> </message> @@ -2544,12 +2558,17 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Verifica portafoglio...</translation> </message> <message> - <location line="-62"/> + <location line="-69"/> <source>Imports blocks from external blk000??.dat file</source> <translation>Importa blocchi da un file blk000??.dat esterno</translation> </message> <message> - <location line="+1"/> + <location line="-76"/> + <source>Set the number of script verification threads (up to 16, 0 = auto, <0 = leave that many cores free, default: 0)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+77"/> <source>Information</source> <translation>Informazione</translation> </message> @@ -2559,6 +2578,16 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Indirizzo -tor non valido: '%s'</translation> </message> <message> + <location line="+1"/> + <source>Invalid amount for -minrelaytxfee=<amount>: '%s'</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Invalid amount for -mintxfee=<amount>: '%s'</source> + <translation type="unfinished"/> + </message> + <message> <location line="+8"/> <source>Maintain a full transaction index (default: 0)</source> <translation type="unfinished"/> @@ -2574,7 +2603,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Buffer di invio massimo per connessione, <n>*1000 byte (default: 1000)</translation> </message> <message> - <location line="+1"/> + <location line="+2"/> <source>Only accept block chain matching built-in checkpoints (default: 1)</source> <translation type="unfinished"/> </message> @@ -2634,6 +2663,11 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Riduci il file debug.log all'avvio del client (predefinito: 1 se non impostato -debug)</translation> </message> <message> + <location line="+1"/> + <source>Signing transaction failed</source> + <translation type="unfinished"/> + </message> + <message> <location line="+2"/> <source>Specify connection timeout in milliseconds (default: 5000)</source> <translation>Specifica il timeout di connessione in millisecondi (default: 5000)</translation> @@ -2644,7 +2678,22 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Errore di sistema:</translation> </message> <message> - <location line="+10"/> + <location line="+4"/> + <source>Transaction amount too small</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Transaction amounts must be positive</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Transaction too large</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+7"/> <source>Use UPnP to map the listening port (default: 0)</source> <translation>UPnP-használat engedélyezése a figyelő port feltérképezésénél (default: 0)</translation> </message> @@ -2685,7 +2734,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>wallet.dat corrotto, salvataggio fallito</translation> </message> <message> - <location line="-46"/> + <location line="-50"/> <source>Password for JSON-RPC connections</source> <translation>Password per connessioni JSON-RPC </translation> @@ -2703,17 +2752,17 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. </translation> </message> <message> - <location line="-119"/> + <location line="-120"/> <source>Execute command when the best block changes (%s in cmd is replaced by block hash)</source> <translation>Esegui il comando quando il miglior block cambia(%s nel cmd è sostituito dall'hash del blocco)</translation> </message> <message> - <location line="+142"/> + <location line="+147"/> <source>Upgrade wallet to latest format</source> <translation>Aggiorna il wallet all'ultimo formato</translation> </message> <message> - <location line="-17"/> + <location line="-21"/> <source>Set key pool size to <n> (default: 100)</source> <translation>Impostare la quantità di chiavi di riserva a <n> (default: 100) </translation> @@ -2725,13 +2774,13 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. </translation> </message> <message> - <location line="+31"/> + <location line="+35"/> <source>Use OpenSSL (https) for JSON-RPC connections</source> <translation>Utilizzare OpenSSL (https) per le connessioni JSON-RPC </translation> </message> <message> - <location line="-22"/> + <location line="-26"/> <source>Server certificate file (default: server.cert)</source> <translation>File certificato del server (default: server.cert) </translation> @@ -2743,40 +2792,40 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. </translation> </message> <message> - <location line="-153"/> + <location line="-151"/> <source>Acceptable ciphers (default: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH)</source> <translation>Cifrari accettabili (default: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH) </translation> </message> <message> - <location line="+166"/> + <location line="+165"/> <source>This help message</source> <translation>Questo messaggio di aiuto </translation> </message> <message> - <location line="+3"/> + <location line="+6"/> <source>Unable to bind to %s on this computer (bind returned error %d, %s)</source> <translation>Impossibile collegarsi alla %s su questo computer (bind returned error %d, %s)</translation> </message> <message> - <location line="-86"/> + <location line="-91"/> <source>Connect through socks proxy</source> <translation>Connessione tramite socks proxy</translation> </message> <message> - <location line="-11"/> + <location line="-10"/> <source>Allow DNS lookups for -addnode, -seednode and -connect</source> <translation>Consenti ricerche DNS per aggiungere nodi e collegare </translation> </message> <message> - <location line="+56"/> + <location line="+55"/> <source>Loading addresses...</source> <translation>Caricamento indirizzi...</translation> </message> <message> - <location line="-34"/> + <location line="-35"/> <source>Error loading wallet.dat: Wallet corrupted</source> <translation>Errore caricamento wallet.dat: Wallet corrotto</translation> </message> @@ -2786,22 +2835,22 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Errore caricamento wallet.dat: il wallet richiede una versione nuova di Bitcoin</translation> </message> <message> - <location line="+87"/> + <location line="+93"/> <source>Wallet needed to be rewritten: restart Bitcoin to complete</source> <translation>Il portamonete deve essere riscritto: riavviare Bitcoin per completare</translation> </message> <message> - <location line="-89"/> + <location line="-95"/> <source>Error loading wallet.dat</source> <translation>Errore caricamento wallet.dat</translation> </message> <message> - <location line="+29"/> + <location line="+28"/> <source>Invalid -proxy address: '%s'</source> <translation>Indirizzo -proxy non valido: '%s'</translation> </message> <message> - <location line="+49"/> + <location line="+56"/> <source>Unknown network specified in -onlynet: '%s'</source> <translation>Rete sconosciuta specificata in -onlynet: '%s'</translation> </message> @@ -2811,7 +2860,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Versione -socks proxy sconosciuta richiesta: %i</translation> </message> <message> - <location line="-91"/> + <location line="-96"/> <source>Cannot resolve -bind address: '%s'</source> <translation>Impossibile risolvere -bind address: '%s'</translation> </message> @@ -2831,17 +2880,17 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Importo non valido</translation> </message> <message> - <location line="-4"/> + <location line="-6"/> <source>Insufficient funds</source> <translation>Fondi insufficienti</translation> </message> <message> - <location line="+8"/> + <location line="+10"/> <source>Loading block index...</source> <translation>Caricamento dell'indice del blocco...</translation> </message> <message> - <location line="-58"/> + <location line="-57"/> <source>Add a node to connect to and attempt to keep the connection open</source> <translation>Elérendő csomópont megadása and attempt to keep the connection open</translation> </message> @@ -2851,52 +2900,47 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Impossibile collegarsi alla %s su questo computer. Probabilmente Bitcoin è già in esecuzione.</translation> </message> <message> - <location line="+67"/> + <location line="+64"/> <source>Fee per KB to add to transactions you send</source> <translation>Commissione per KB da aggiungere alle transazioni in uscita</translation> </message> <message> - <location line="+17"/> + <location line="+19"/> <source>Loading wallet...</source> <translation>Caricamento portamonete...</translation> </message> <message> - <location line="-53"/> + <location line="-52"/> <source>Cannot downgrade wallet</source> <translation>Non è possibile retrocedere il wallet</translation> </message> <message> - <location line="+1"/> - <source>Cannot initialize keypool</source> - <translation>Non è possibile iniziare la keypool</translation> - </message> - <message> <location line="+3"/> <source>Cannot write default address</source> <translation>Non è possibile scrivere l'indirizzo di default</translation> </message> <message> - <location line="+63"/> + <location line="+64"/> <source>Rescanning...</source> <translation>Ripetere la scansione...</translation> </message> <message> - <location line="-55"/> + <location line="-57"/> <source>Done loading</source> <translation>Caricamento completato</translation> </message> <message> - <location line="+79"/> + <location line="+82"/> <source>To use the %s option</source> <translation>Per usare la opzione %s</translation> </message> <message> - <location line="-71"/> + <location line="-74"/> <source>Error</source> <translation>Errore</translation> </message> <message> - <location line="-33"/> + <location line="-31"/> <source>You must set rpcpassword=<password> in the configuration file: %s If the file does not exist, create it with owner-readable-only file permissions.</source> diff --git a/src/qt/locale/bitcoin_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 <translation type="unfinished"/> </message> <message> - <location filename="../aboutdialog.cpp" line="+17"/> + <location filename="../aboutdialog.cpp" line="+14"/> <source>Copyright</source> <translation type="unfinished"/> </message> <message> <location line="+0"/> - <source>2009-%1 The Bitcoin developers</source> + <source>The Bitcoin developers</source> <translation type="unfinished"/> </message> </context> @@ -43,12 +43,12 @@ This product includes software developed by the OpenSSL Project for use in the O <message> <location line="+19"/> <source>Double-click to edit address or label</source> - <translation>アドレスかレーベルを編集するのためにダブルクリックして</translation> + <translation>アドレスまたはラベルを編集するにはダブルクリック</translation> </message> <message> <location line="+27"/> <source>Create a new address</source> - <translation>新しいのアドレスを作る</translation> + <translation>新規アドレスの作成</translation> </message> <message> <location line="+14"/> @@ -61,7 +61,7 @@ This product includes software developed by the OpenSSL Project for use in the O <translation type="unfinished"/> </message> <message> - <location filename="../addressbookpage.cpp" line="+59"/> + <location filename="../addressbookpage.cpp" line="+63"/> <source>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.</source> <translation type="unfinished"/> </message> @@ -91,7 +91,17 @@ This product includes software developed by the OpenSSL Project for use in the O <translation type="unfinished"/> </message> <message> - <location line="-14"/> + <location line="+27"/> + <source>Export the data in the current tab to a file</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+3"/> + <source>&Export</source> + <translation type="unfinished"/> + </message> + <message> + <location line="-44"/> <source>Verify a message to ensure it was signed with a specified Bitcoin address</source> <translation type="unfinished"/> </message> @@ -103,7 +113,7 @@ This product includes software developed by the OpenSSL Project for use in the O <message> <location line="+14"/> <source>&Delete</source> - <translation>&消す</translation> + <translation>削除(&D)</translation> </message> <message> <location filename="../addressbookpage.cpp" line="-5"/> @@ -128,17 +138,17 @@ This product includes software developed by the OpenSSL Project for use in the O <message> <location line="+260"/> <source>Export Address Book Data</source> - <translation>アドレス帳データーを輸出する</translation> + <translation>アドレス帳データをエクスポートする</translation> </message> <message> <location line="+1"/> <source>Comma separated file (*.csv)</source> - <translation>テキスト CSV (*.csv)</translation> + <translation>CSVファイル (*.csv)</translation> </message> <message> <location line="+13"/> <source>Error exporting</source> - <translation>エラー輸出</translation> + <translation>エクスポートエラー</translation> </message> <message> <location line="+0"/> @@ -151,7 +161,7 @@ This product includes software developed by the OpenSSL Project for use in the O <message> <location filename="../addresstablemodel.cpp" line="+144"/> <source>Label</source> - <translation>レーベル</translation> + <translation>ラベル</translation> </message> <message> <location line="+0"/> @@ -161,7 +171,7 @@ This product includes software developed by the OpenSSL Project for use in the O <message> <location line="+36"/> <source>(no label)</source> - <translation>（レーベル無し）</translation> + <translation>（ラベル無し）</translation> </message> </context> <context> @@ -174,62 +184,62 @@ This product includes software developed by the OpenSSL Project for use in the O <message> <location line="+21"/> <source>Enter passphrase</source> - <translation>パスフレーズを入って</translation> + <translation>パスフレーズを入力</translation> </message> <message> <location line="+14"/> <source>New passphrase</source> - <translation>新しいのパスフレーズ</translation> + <translation>新しいパスフレーズ</translation> </message> <message> <location line="+14"/> <source>Repeat new passphrase</source> - <translation>新しいのパスフレーズを繰り返して</translation> + <translation>新しいパスフレーズをもう一度</translation> </message> <message> <location filename="../askpassphrasedialog.cpp" line="+33"/> <source>Enter the new passphrase to the wallet.<br/>Please use a passphrase of <b>10 or more random characters</b>, or <b>eight or more words</b>.</source> - <translation>財布の新しいのパスフレーズを入って。<br/><b>8個以上のワードか10個以上のランダムな文字</b>を使ってください。</translation> + <translation>ウォレットの新しいパスフレーズを入力してください。<br/><b>8個以上の単語か10個以上のランダムな文字</b>を使ってください。</translation> </message> <message> <location line="+1"/> <source>Encrypt wallet</source> - <translation>財布を暗号化する</translation> + <translation>ウォレットを暗号化する</translation> </message> <message> <location line="+3"/> <source>This operation needs your wallet passphrase to unlock the wallet.</source> - <translation>この動作は財布のアンロックするように財布のパスフレーズが必要です。</translation> + <translation>この操作はウォレットをアンロックするためにパスフレーズが必要です。</translation> </message> <message> <location line="+5"/> <source>Unlock wallet</source> - <translation>財布をアンロックする</translation> + <translation>ウォレットをアンロックする</translation> </message> <message> <location line="+3"/> <source>This operation needs your wallet passphrase to decrypt the wallet.</source> - <translation>この動作は財布の解読するように財布のパスフレーズが必要です。</translation> + <translation>この操作はウォレットの暗号化解除のためにパスフレーズが必要です。</translation> </message> <message> <location line="+5"/> <source>Decrypt wallet</source> - <translation>財布を解読する</translation> + <translation>ウォレットの暗号化を解除する</translation> </message> <message> <location line="+3"/> <source>Change passphrase</source> - <translation>パスフレーズを変わります</translation> + <translation>パスフレーズの変更</translation> </message> <message> <location line="+1"/> <source>Enter the old and new passphrase to the wallet.</source> - <translation>前と新しいの財布のパスフレーズを入って。</translation> + <translation>新旧両方のパスフレーズを入力してください。</translation> </message> <message> <location line="+46"/> <source>Confirm wallet encryption</source> - <translation>財布の暗号化を確認する</translation> + <translation>ウォレットの暗号化を確認する</translation> </message> <message> <location line="+1"/> @@ -256,7 +266,7 @@ This product includes software developed by the OpenSSL Project for use in the O <location line="-130"/> <location line="+58"/> <source>Wallet encrypted</source> - <translation>財布は暗号化しました</translation> + <translation>ウォレットは暗号化されました</translation> </message> <message> <location line="-56"/> @@ -269,35 +279,35 @@ This product includes software developed by the OpenSSL Project for use in the O <location line="+42"/> <location line="+6"/> <source>Wallet encryption failed</source> - <translation>財布の暗号化するのは失敗しました</translation> + <translation>ウォレットの暗号化に失敗しました</translation> </message> <message> <location line="-54"/> <source>Wallet encryption failed due to an internal error. Your wallet was not encrypted.</source> - <translation>内部エラーですから財布の暗号化が失敗しました。財布は暗号化しませんでした。</translation> + <translation>内部エラーによりウォレットの暗号化が失敗しました。ウォレットは暗号化されませんでした。</translation> </message> <message> <location line="+7"/> <location line="+48"/> <source>The supplied passphrases do not match.</source> - <translation>パスフレーズは同じではありません。</translation> + <translation>パスフレーズが同じではありません。</translation> </message> <message> <location line="-37"/> <source>Wallet unlock failed</source> - <translation>財布のアンロックは失敗しました</translation> + <translation>ウォレットのアンロックに失敗しました</translation> </message> <message> <location line="+1"/> <location line="+11"/> <location line="+19"/> <source>The passphrase entered for the wallet decryption was incorrect.</source> - <translation>財布の</translation> + <translation>ウォレットの暗号化解除のパスフレーズが正しくありません。</translation> </message> <message> <location line="-20"/> <source>Wallet decryption failed</source> - <translation>財布の解読は失敗しました</translation> + <translation>ウォレットの暗号化解除に失敗しました</translation> </message> <message> <location line="+14"/> @@ -313,39 +323,39 @@ This product includes software developed by the OpenSSL Project for use in the O <translation type="unfinished"/> </message> <message> - <location line="+299"/> + <location line="+280"/> <source>Synchronizing with network...</source> - <translation>ネットワークと同期化中。。。</translation> + <translation>ネットワークに同期中……</translation> </message> <message> - <location line="-368"/> + <location line="-349"/> <source>&Overview</source> - <translation>&概観</translation> + <translation>概要(&O)</translation> </message> <message> <location line="+1"/> <source>Show general overview of wallet</source> - <translation>財布の概観を見せる</translation> + <translation>ウォレットの概要を見る</translation> </message> <message> <location line="+20"/> <source>&Transactions</source> - <translation>&取引</translation> + <translation>取引(&T)</translation> </message> <message> <location line="+1"/> <source>Browse transaction history</source> - <translation>昔の取引をブラウズする</translation> + <translation>取引履歴を閲覧</translation> </message> <message> <location line="+7"/> <source>Edit the list of stored addresses and labels</source> - <translation>アドレスとレーベルのリストを編集する</translation> + <translation>保存されたアドレスとラベルのリストを編集</translation> </message> <message> <location line="-14"/> <source>Show the list of addresses for receiving payments</source> - <translation>支払いを受け取るのアドレスのリストを見せる</translation> + <translation>支払い受け取り用アドレスのリストを見る</translation> </message> <message> <location line="+31"/> @@ -355,12 +365,12 @@ This product includes software developed by the OpenSSL Project for use in the O <message> <location line="+1"/> <source>Quit application</source> - <translation>アプリを終了</translation> + <translation>アプリケーションを終了</translation> </message> <message> <location line="+4"/> <source>Show information about Bitcoin</source> - <translation>Bitcoinの事の情報を見せる</translation> + <translation>Bitcoinに関する情報を見る</translation> </message> <message> <location line="+2"/> @@ -375,7 +385,7 @@ This product includes software developed by the OpenSSL Project for use in the O <message> <location line="+2"/> <source>&Options...</source> - <translation>&オプションズ</translation> + <translation>オプション(&O)</translation> </message> <message> <location line="+6"/> @@ -393,7 +403,7 @@ This product includes software developed by the OpenSSL Project for use in the O <translation type="unfinished"/> </message> <message> - <location line="+304"/> + <location line="+285"/> <source>Importing blocks from disk...</source> <translation type="unfinished"/> </message> @@ -403,12 +413,7 @@ This product includes software developed by the OpenSSL Project for use in the O <translation type="unfinished"/> </message> <message> - <location line="-300"/> - <source>&Export...</source> - <translation>&輸出。。。</translation> - </message> - <message> - <location line="-66"/> + <location line="-347"/> <source>Send coins to a Bitcoin address</source> <translation type="unfinished"/> </message> @@ -418,22 +423,17 @@ This product includes software developed by the OpenSSL Project for use in the O <translation type="unfinished"/> </message> <message> - <location line="+18"/> - <source>Export the data in the current tab to a file</source> - <translation type="unfinished"/> - </message> - <message> - <location line="-9"/> + <location line="+9"/> <source>Backup wallet to another location</source> <translation type="unfinished"/> </message> <message> <location line="+2"/> <source>Change the passphrase used for wallet encryption</source> - <translation>財布の暗号化のためのパスフレーズを変わる</translation> + <translation>ウォレット暗号化用パスフレーズの変更</translation> </message> <message> - <location line="+9"/> + <location line="+6"/> <source>&Debug window</source> <translation type="unfinished"/> </message> @@ -443,23 +443,23 @@ This product includes software developed by the OpenSSL Project for use in the O <translation type="unfinished"/> </message> <message> - <location line="-7"/> + <location line="-4"/> <source>&Verify message...</source> <translation type="unfinished"/> </message> <message> - <location line="-163"/> - <location line="+541"/> + <location line="-165"/> + <location line="+530"/> <source>Bitcoin</source> <translation type="unfinished"/> </message> <message> - <location line="-541"/> + <location line="-530"/> <source>Wallet</source> <translation type="unfinished"/> </message> <message> - <location line="+99"/> + <location line="+101"/> <source>&Send</source> <translation type="unfinished"/> </message> @@ -504,19 +504,19 @@ This product includes software developed by the OpenSSL Project for use in the O <translation type="unfinished"/> </message> <message> - <location line="+31"/> + <location line="+28"/> <source>&File</source> - <translation>&ファイル</translation> + <translation>ファイル(&F)</translation> </message> <message> - <location line="+8"/> + <location line="+7"/> <source>&Settings</source> - <translation>&設定</translation> + <translation>設定(&S)</translation> </message> <message> <location line="+6"/> <source>&Help</source> - <translation>&ヘルプ</translation> + <translation>ヘルプ(&H)</translation> </message> <message> <location line="+9"/> @@ -524,15 +524,10 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>タブツールバー</translation> </message> <message> - <location line="+8"/> - <source>Actions toolbar</source> - <translation>アクションツールバー</translation> - </message> - <message> - <location line="+13"/> + <location line="+17"/> <location line="+10"/> <source>[testnet]</source> - <translation>[テストネット]</translation> + <translation>[testnet]</translation> </message> <message> <location line="+47"/> @@ -540,12 +535,17 @@ This product includes software developed by the OpenSSL Project for use in the O <translation type="unfinished"/> </message> <message numerus="yes"> - <location line="+140"/> + <location line="+141"/> <source>%n active connection(s) to Bitcoin network</source> <translation type="unfinished"><numerusform></numerusform></translation> </message> <message> - <location line="+39"/> + <location line="+22"/> + <source>No block source available...</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+12"/> <source>Processed %1 of %2 (estimated) blocks of transaction history.</source> <translation type="unfinished"/> </message> @@ -570,7 +570,7 @@ This product includes software developed by the OpenSSL Project for use in the O <translation type="unfinished"><numerusform></numerusform></translation> </message> <message> - <location line="+5"/> + <location line="+4"/> <source>%1 behind</source> <translation type="unfinished"/> </message> @@ -585,7 +585,7 @@ This product includes software developed by the OpenSSL Project for use in the O <translation type="unfinished"/> </message> <message> - <location line="+21"/> + <location line="+22"/> <source>Error</source> <translation type="unfinished"/> </message> @@ -600,34 +600,34 @@ This product includes software developed by the OpenSSL Project for use in the O <translation type="unfinished"/> </message> <message> - <location line="+68"/> + <location line="+70"/> <source>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?</source> <translation type="unfinished"/> </message> <message> - <location line="-138"/> + <location line="-140"/> <source>Up to date</source> - <translation>新しいのバージョンが無し</translation> + <translation>バージョンは最新です</translation> </message> <message> - <location line="+32"/> + <location line="+31"/> <source>Catching up...</source> - <translation>追いつく中。。。</translation> + <translation type="unfinished"/> </message> <message> - <location line="+110"/> + <location line="+113"/> <source>Confirm transaction fee</source> <translation type="unfinished"/> </message> <message> <location line="+8"/> <source>Sent transaction</source> - <translation>送ったの取引</translation> + <translation>送金取引</translation> </message> <message> <location line="+0"/> <source>Incoming transaction</source> - <translation>入ってくるの取引</translation> + <translation>着金取引</translation> </message> <message> <location line="+1"/> @@ -653,15 +653,15 @@ Address: %4 <message> <location line="+17"/> <source>Wallet is <b>encrypted</b> and currently <b>unlocked</b></source> - <translation>財布は<b>暗号化とアンロックです</b></translation> + <translation>ウォレットは<b>暗号化され、アンロックされています</b></translation> </message> <message> <location line="+8"/> <source>Wallet is <b>encrypted</b> and currently <b>locked</b></source> - <translation>財布は<b>暗号化とロックです</b></translation> + <translation>ウォレットは<b>暗号化され、ロックされています</b></translation> </message> <message> - <location filename="../bitcoin.cpp" line="+104"/> + <location filename="../bitcoin.cpp" line="+111"/> <source>A fatal error occurred. Bitcoin can no longer continue safely and will quit.</source> <translation type="unfinished"/> </message> @@ -669,7 +669,7 @@ Address: %4 <context> <name>ClientModel</name> <message> - <location filename="../clientmodel.cpp" line="+98"/> + <location filename="../clientmodel.cpp" line="+104"/> <source>Network Alert</source> <translation type="unfinished"/> </message> @@ -679,12 +679,12 @@ Address: %4 <message> <location filename="../forms/editaddressdialog.ui" line="+14"/> <source>Edit Address</source> - <translation>アドレスを編集する</translation> + <translation>アドレスの編集</translation> </message> <message> <location line="+11"/> <source>&Label</source> - <translation>&レーベル</translation> + <translation>ラベル(&L)</translation> </message> <message> <location line="+10"/> @@ -800,7 +800,7 @@ Address: %4 </message> <message> <location line="+6"/> - <source>Optional transaction fee per kB that helps make sure your transactions are processed quickly. Most transactions are 1 kB. Fee 0.01 recommended.</source> + <source>Optional transaction fee per kB that helps make sure your transactions are processed quickly. Most transactions are 1 kB.</source> <translation type="unfinished"/> </message> <message> @@ -1050,7 +1050,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location filename="../overviewpage.cpp" line="+115"/> + <location filename="../overviewpage.cpp" line="+116"/> <location line="+1"/> <source>out of sync</source> <translation type="unfinished"/> @@ -1637,6 +1637,19 @@ Address: %4 </message> </context> <context> + <name>SplashScreen</name> + <message> + <location filename="../splashscreen.cpp" line="+22"/> + <source>The Bitcoin developers</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>[testnet]</source> + <translation>[testnet]</translation> + </message> +</context> +<context> <name>TransactionDesc</name> <message> <location filename="../transactiondesc.cpp" line="+20"/> @@ -2111,9 +2124,27 @@ Address: %4 </message> </context> <context> + <name>WalletModel</name> + <message> + <location filename="../walletmodel.cpp" line="+193"/> + <source>Send Coins</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>WalletView</name> <message> - <location filename="../walletview.cpp" line="+247"/> + <location filename="../walletview.cpp" line="+42"/> + <source>&Export</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Export the data in the current tab to a file</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+193"/> <source>Backup Wallet</source> <translation type="unfinished"/> </message> @@ -2146,37 +2177,37 @@ Address: %4 <context> <name>bitcoin-core</name> <message> - <location filename="../bitcoinstrings.cpp" line="+96"/> + <location filename="../bitcoinstrings.cpp" line="+94"/> <source>Bitcoin version</source> <translation>Bitcoin Bertsio</translation> </message> <message> - <location line="+98"/> + <location line="+102"/> <source>Usage:</source> <translation type="unfinished"/> </message> <message> - <location line="-25"/> + <location line="-29"/> <source>Send command to -server or bitcoind</source> <translation type="unfinished"/> </message> <message> - <location line="-22"/> + <location line="-23"/> <source>List commands</source> <translation type="unfinished"/> </message> <message> - <location line="-10"/> + <location line="-12"/> <source>Get help for a command</source> <translation type="unfinished"/> </message> <message> - <location line="+21"/> + <location line="+24"/> <source>Options:</source> <translation type="unfinished"/> </message> <message> - <location line="+23"/> + <location line="+24"/> <source>Specify configuration file (default: bitcoin.conf)</source> <translation type="unfinished"/> </message> @@ -2186,27 +2217,17 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="-48"/> - <source>Generate coins</source> - <translation type="unfinished"/> - </message> - <message> - <location line="-27"/> - <source>Don't generate coins</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+74"/> + <location line="-1"/> <source>Specify data directory</source> <translation type="unfinished"/> </message> <message> - <location line="-8"/> + <location line="-9"/> <source>Set database cache size in megabytes (default: 25)</source> <translation type="unfinished"/> </message> <message> - <location line="-27"/> + <location line="-28"/> <source>Listen for connections on <port> (default: 8333 or testnet: 18333)</source> <translation type="unfinished"/> </message> @@ -2221,7 +2242,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+80"/> + <location line="+82"/> <source>Specify your own public address</source> <translation type="unfinished"/> </message> @@ -2231,22 +2252,22 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="-132"/> + <location line="-134"/> <source>Number of seconds to keep misbehaving peers from reconnecting (default: 86400)</source> <translation type="unfinished"/> </message> <message> - <location line="-32"/> + <location line="-29"/> <source>An error occurred while setting up the RPC port %u for listening on IPv4: %s</source> <translation type="unfinished"/> </message> <message> - <location line="+30"/> + <location line="+27"/> <source>Listen for JSON-RPC connections on <port> (default: 8332 or testnet: 18332)</source> <translation type="unfinished"/> </message> <message> - <location line="+36"/> + <location line="+37"/> <source>Accept command line and JSON-RPC commands</source> <translation type="unfinished"/> </message> @@ -2256,17 +2277,17 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+33"/> + <location line="+37"/> <source>Use the test network</source> <translation type="unfinished"/> </message> <message> - <location line="-108"/> + <location line="-112"/> <source>Accept connections from outside (default: 1 if no -proxy or -connect)</source> <translation type="unfinished"/> </message> <message> - <location line="-82"/> + <location line="-80"/> <source>%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. </message> <message> <location line="+3"/> - <source>Error initializing database environment %s! To recover, BACKUP THAT DIRECTORY, then remove everything from it except for wallet.dat.</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+3"/> <source>Error: The transaction was rejected! This might happen if some of the coins in your wallet were already spent, such as if you used a copy of wallet.dat and coins were spent in the copy but not marked as spent here.</source> <translation type="unfinished"/> </message> @@ -2326,12 +2342,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+3"/> - <source>Set the number of script verification threads (1-16, 0=auto, default: 0)</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+2"/> + <location line="+6"/> <source>This is a pre-release test build - use at your own risk - do not use for mining or merchant applications</source> <translation type="unfinished"/> </message> @@ -2371,7 +2382,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+6"/> + <location line="+5"/> <source>Connect only to the specified node(s)</source> <translation type="unfinished"/> </message> @@ -2391,7 +2402,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+3"/> + <location line="+2"/> <source>Error initializing block database</source> <translation type="unfinished"/> </message> @@ -2417,11 +2428,6 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. </message> <message> <location line="+1"/> - <source>Error: Transaction creation failed!</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+1"/> <source>Error: Wallet locked, unable to create transaction!</source> <translation type="unfinished"/> </message> @@ -2491,7 +2497,12 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+3"/> + <location line="+1"/> + <source>Generate coins (default: 0)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+2"/> <source>How many blocks to check at startup (default: 288, 0 = all)</source> <translation type="unfinished"/> </message> @@ -2501,7 +2512,12 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+24"/> + <location line="+19"/> + <source>Not enough file descriptors available.</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+8"/> <source>Rebuild block chain index from current blk000??.dat files</source> <translation type="unfinished"/> </message> @@ -2511,7 +2527,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+22"/> + <location line="+26"/> <source>Verifying blocks...</source> <translation type="unfinished"/> </message> @@ -2521,12 +2537,17 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="-62"/> + <location line="-69"/> <source>Imports blocks from external blk000??.dat file</source> <translation type="unfinished"/> </message> <message> - <location line="+1"/> + <location line="-76"/> + <source>Set the number of script verification threads (up to 16, 0 = auto, <0 = leave that many cores free, default: 0)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+77"/> <source>Information</source> <translation type="unfinished"/> </message> @@ -2536,6 +2557,16 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> + <location line="+1"/> + <source>Invalid amount for -minrelaytxfee=<amount>: '%s'</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Invalid amount for -mintxfee=<amount>: '%s'</source> + <translation type="unfinished"/> + </message> + <message> <location line="+8"/> <source>Maintain a full transaction index (default: 0)</source> <translation type="unfinished"/> @@ -2551,7 +2582,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+1"/> + <location line="+2"/> <source>Only accept block chain matching built-in checkpoints (default: 1)</source> <translation type="unfinished"/> </message> @@ -2611,6 +2642,11 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> + <location line="+1"/> + <source>Signing transaction failed</source> + <translation type="unfinished"/> + </message> + <message> <location line="+2"/> <source>Specify connection timeout in milliseconds (default: 5000)</source> <translation type="unfinished"/> @@ -2621,7 +2657,22 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+10"/> + <location line="+4"/> + <source>Transaction amount too small</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Transaction amounts must be positive</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Transaction too large</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+7"/> <source>Use UPnP to map the listening port (default: 0)</source> <translation type="unfinished"/> </message> @@ -2661,7 +2712,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="-46"/> + <location line="-50"/> <source>Password for JSON-RPC connections</source> <translation type="unfinished"/> </message> @@ -2676,17 +2727,17 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="-119"/> + <location line="-120"/> <source>Execute command when the best block changes (%s in cmd is replaced by block hash)</source> <translation type="unfinished"/> </message> <message> - <location line="+142"/> + <location line="+147"/> <source>Upgrade wallet to latest format</source> <translation type="unfinished"/> </message> <message> - <location line="-17"/> + <location line="-21"/> <source>Set key pool size to <n> (default: 100)</source> <translation type="unfinished"/> </message> @@ -2696,12 +2747,12 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+31"/> + <location line="+35"/> <source>Use OpenSSL (https) for JSON-RPC connections</source> <translation type="unfinished"/> </message> <message> - <location line="-22"/> + <location line="-26"/> <source>Server certificate file (default: server.cert)</source> <translation type="unfinished"/> </message> @@ -2711,37 +2762,37 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="-153"/> + <location line="-151"/> <source>Acceptable ciphers (default: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH)</source> <translation type="unfinished"/> </message> <message> - <location line="+166"/> + <location line="+165"/> <source>This help message</source> <translation type="unfinished"/> </message> <message> - <location line="+3"/> + <location line="+6"/> <source>Unable to bind to %s on this computer (bind returned error %d, %s)</source> <translation type="unfinished"/> </message> <message> - <location line="-86"/> + <location line="-91"/> <source>Connect through socks proxy</source> <translation type="unfinished"/> </message> <message> - <location line="-11"/> + <location line="-10"/> <source>Allow DNS lookups for -addnode, -seednode and -connect</source> <translation type="unfinished"/> </message> <message> - <location line="+56"/> + <location line="+55"/> <source>Loading addresses...</source> <translation type="unfinished"/> </message> <message> - <location line="-34"/> + <location line="-35"/> <source>Error loading wallet.dat: Wallet corrupted</source> <translation type="unfinished"/> </message> @@ -2751,22 +2802,22 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+87"/> + <location line="+93"/> <source>Wallet needed to be rewritten: restart Bitcoin to complete</source> <translation type="unfinished"/> </message> <message> - <location line="-89"/> + <location line="-95"/> <source>Error loading wallet.dat</source> <translation type="unfinished"/> </message> <message> - <location line="+29"/> + <location line="+28"/> <source>Invalid -proxy address: '%s'</source> <translation type="unfinished"/> </message> <message> - <location line="+49"/> + <location line="+56"/> <source>Unknown network specified in -onlynet: '%s'</source> <translation type="unfinished"/> </message> @@ -2776,7 +2827,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="-91"/> + <location line="-96"/> <source>Cannot resolve -bind address: '%s'</source> <translation type="unfinished"/> </message> @@ -2796,17 +2847,17 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="-4"/> + <location line="-6"/> <source>Insufficient funds</source> <translation type="unfinished"/> </message> <message> - <location line="+8"/> + <location line="+10"/> <source>Loading block index...</source> <translation type="unfinished"/> </message> <message> - <location line="-58"/> + <location line="-57"/> <source>Add a node to connect to and attempt to keep the connection open</source> <translation type="unfinished"/> </message> @@ -2816,52 +2867,47 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+67"/> + <location line="+64"/> <source>Fee per KB to add to transactions you send</source> <translation type="unfinished"/> </message> <message> - <location line="+17"/> + <location line="+19"/> <source>Loading wallet...</source> <translation type="unfinished"/> </message> <message> - <location line="-53"/> + <location line="-52"/> <source>Cannot downgrade wallet</source> <translation type="unfinished"/> </message> <message> - <location line="+1"/> - <source>Cannot initialize keypool</source> - <translation type="unfinished"/> - </message> - <message> <location line="+3"/> <source>Cannot write default address</source> <translation type="unfinished"/> </message> <message> - <location line="+63"/> + <location line="+64"/> <source>Rescanning...</source> <translation type="unfinished"/> </message> <message> - <location line="-55"/> + <location line="-57"/> <source>Done loading</source> <translation type="unfinished"/> </message> <message> - <location line="+79"/> + <location line="+82"/> <source>To use the %s option</source> <translation type="unfinished"/> </message> <message> - <location line="-71"/> + <location line="-74"/> <source>Error</source> <translation type="unfinished"/> </message> <message> - <location line="-33"/> + <location line="-31"/> <source>You must set rpcpassword=<password> in the configuration file: %s If the file does not exist, create it with owner-readable-only file permissions.</source> diff --git a/src/qt/locale/bitcoin_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.</translation> </message> <message> - <location filename="../aboutdialog.cpp" line="+17"/> + <location filename="../aboutdialog.cpp" line="+14"/> <source>Copyright</source> <translation>Copyright</translation> </message> <message> <location line="+0"/> - <source>2009-%1 The Bitcoin developers</source> - <translation>2009-%1 Bitcoin curatores</translation> + <source>The Bitcoin developers</source> + <translation>Bitcoin curatores</translation> </message> </context> <context> @@ -65,7 +65,7 @@ Hoc productum continet programmata composita ab OpenSSL Project pro utendo in Op <translation>&Nova Inscriptio</translation> </message> <message> - <location filename="../addressbookpage.cpp" line="+59"/> + <location filename="../addressbookpage.cpp" line="+63"/> <source>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.</source> <translation>Haec sunt inscriptiones Bitcoin tuae pro accipendo pensitationes. Cupias variam ad quemque mittentem dare ut melius scias quem tibi pensare.</translation> </message> @@ -95,7 +95,17 @@ Hoc productum continet programmata composita ab OpenSSL Project pro utendo in Op <translation>Dele active selectam inscriptionem ex enumeratione</translation> </message> <message> - <location line="-14"/> + <location line="+27"/> + <source>Export the data in the current tab to a file</source> + <translation>Exporta data in hac tabella in plicam</translation> + </message> + <message> + <location line="+3"/> + <source>&Export</source> + <translation>&Exporta</translation> + </message> + <message> + <location line="-44"/> <source>Verify a message to ensure it was signed with a specified Bitcoin address</source> <translation>Verifica nuntium ut cures signatum esse cum specificata inscriptione Bitcoin</translation> </message> @@ -112,7 +122,7 @@ Hoc productum continet programmata composita ab OpenSSL Project pro utendo in Op <message> <location filename="../addressbookpage.cpp" line="-5"/> <source>These are your Bitcoin addresses for sending payments. Always check the amount and the receiving address before sending coins.</source> - <translation type="unfinished"/> + <translation>Hae sunt inscriptiones mittendi pensitationes. Semper inspice quantitatem et inscriptionem accipiendi antequam nummos mittis.</translation> </message> <message> <location line="+13"/> @@ -317,12 +327,12 @@ Hoc productum continet programmata composita ab OpenSSL Project pro utendo in Op <translation>Signa &nuntium...</translation> </message> <message> - <location line="+299"/> + <location line="+280"/> <source>Synchronizing with network...</source> <translation>Synchronizans cum rete...</translation> </message> <message> - <location line="-368"/> + <location line="-349"/> <source>&Overview</source> <translation>&Summarium</translation> </message> @@ -397,7 +407,7 @@ Hoc productum continet programmata composita ab OpenSSL Project pro utendo in Op <translation>&Muta tesseram...</translation> </message> <message> - <location line="+304"/> + <location line="+285"/> <source>Importing blocks from disk...</source> <translation>Importans frusta ab disco...</translation> </message> @@ -407,12 +417,7 @@ Hoc productum continet programmata composita ab OpenSSL Project pro utendo in Op <translation>Recreans indicem frustorum in disco...</translation> </message> <message> - <location line="-300"/> - <source>&Export...</source> - <translation>&Exporta...</translation> - </message> - <message> - <location line="-66"/> + <location line="-347"/> <source>Send coins to a Bitcoin address</source> <translation>Mitte nummos ad inscriptionem Bitcoin</translation> </message> @@ -422,12 +427,7 @@ Hoc productum continet programmata composita ab OpenSSL Project pro utendo in Op <translation>Muta configurationis optiones pro Bitcoin</translation> </message> <message> - <location line="+18"/> - <source>Export the data in the current tab to a file</source> - <translation>Exporta data in activa tabella ad plicam</translation> - </message> - <message> - <location line="-9"/> + <location line="+9"/> <source>Backup wallet to another location</source> <translation>Conserva cassidile in locum alium</translation> </message> @@ -437,7 +437,7 @@ Hoc productum continet programmata composita ab OpenSSL Project pro utendo in Op <translation>Muta tesseram utam pro cassidilis cifrando</translation> </message> <message> - <location line="+9"/> + <location line="+6"/> <source>&Debug window</source> <translation>Fenestra &Debug</translation> </message> @@ -447,23 +447,23 @@ Hoc productum continet programmata composita ab OpenSSL Project pro utendo in Op <translation>Aperi terminalem debug et diagnosticalem</translation> </message> <message> - <location line="-7"/> + <location line="-4"/> <source>&Verify message...</source> <translation>&Verifica nuntium...</translation> </message> <message> - <location line="-163"/> - <location line="+541"/> + <location line="-165"/> + <location line="+530"/> <source>Bitcoin</source> <translation>Bitcoin</translation> </message> <message> - <location line="-541"/> + <location line="-530"/> <source>Wallet</source> <translation>Cassidile</translation> </message> <message> - <location line="+99"/> + <location line="+101"/> <source>&Send</source> <translation>&Mitte</translation> </message> @@ -508,12 +508,12 @@ Hoc productum continet programmata composita ab OpenSSL Project pro utendo in Op <translation>Verifica nuntios ut certus sis eos signatos esse cum specificatis inscriptionibus Bitcoin</translation> </message> <message> - <location line="+31"/> + <location line="+28"/> <source>&File</source> <translation>&Plica</translation> </message> <message> - <location line="+8"/> + <location line="+7"/> <source>&Settings</source> <translation>&Configuratio</translation> </message> @@ -528,12 +528,7 @@ Hoc productum continet programmata composita ab OpenSSL Project pro utendo in Op <translation>Tabella instrumentorum "Tabs"</translation> </message> <message> - <location line="+8"/> - <source>Actions toolbar</source> - <translation>Tabella instrumentorum "Actiones"</translation> - </message> - <message> - <location line="+13"/> + <location line="+17"/> <location line="+10"/> <source>[testnet]</source> <translation>[testnet]</translation> @@ -544,12 +539,17 @@ Hoc productum continet programmata composita ab OpenSSL Project pro utendo in Op <translation>Bitcoin cliens</translation> </message> <message numerus="yes"> - <location line="+140"/> + <location line="+141"/> <source>%n active connection(s) to Bitcoin network</source> <translation><numerusform>%n activa conexio ad rete Bitcoin</numerusform><numerusform>%n activae conexiones ad rete Bitcoin</numerusform></translation> </message> <message> - <location line="+39"/> + <location line="+22"/> + <source>No block source available...</source> + <translation>Nulla fons frustorum absens...</translation> + </message> + <message> + <location line="+12"/> <source>Processed %1 of %2 (estimated) blocks of transaction history.</source> <translation>Perfecta %1 de %2 (aestimato) frusta historiae transactionum.</translation> </message> @@ -574,7 +574,7 @@ Hoc productum continet programmata composita ab OpenSSL Project pro utendo in Op <translation><numerusform>%n hebdomas</numerusform><numerusform>%n hebdomades</numerusform></translation> </message> <message> - <location line="+5"/> + <location line="+4"/> <source>%1 behind</source> <translation>%1 post</translation> </message> @@ -589,7 +589,7 @@ Hoc productum continet programmata composita ab OpenSSL Project pro utendo in Op <translation>Transactiones post hoc nondum visibiles erunt.</translation> </message> <message> - <location line="+21"/> + <location line="+22"/> <source>Error</source> <translation>Error</translation> </message> @@ -604,22 +604,22 @@ Hoc productum continet programmata composita ab OpenSSL Project pro utendo in Op <translation>Informatio</translation> </message> <message> - <location line="+68"/> + <location line="+70"/> <source>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?</source> <translation>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?</translation> </message> <message> - <location line="-138"/> + <location line="-140"/> <source>Up to date</source> <translation>Recentissimo</translation> </message> <message> - <location line="+32"/> + <location line="+31"/> <source>Catching up...</source> <translation>Persequens...</translation> </message> <message> - <location line="+110"/> + <location line="+113"/> <source>Confirm transaction fee</source> <translation>Confirma mercedem transactionis</translation> </message> @@ -669,7 +669,7 @@ Inscriptio: %4 <translation>Cassidile <b>cifratum</b> est et iam nunc <b>seratum</b></translation> </message> <message> - <location filename="../bitcoin.cpp" line="+104"/> + <location filename="../bitcoin.cpp" line="+111"/> <source>A fatal error occurred. Bitcoin can no longer continue safely and will quit.</source> <translation>Error fatalis accidit. Bitcoin nondum pergere tute potest, et exibit.</translation> </message> @@ -677,7 +677,7 @@ Inscriptio: %4 <context> <name>ClientModel</name> <message> - <location filename="../clientmodel.cpp" line="+98"/> + <location filename="../clientmodel.cpp" line="+104"/> <source>Network Alert</source> <translation>Monitio Retis</translation> </message> @@ -808,8 +808,8 @@ Inscriptio: %4 </message> <message> <location line="+6"/> - <source>Optional transaction fee per kB that helps make sure your transactions are processed quickly. Most transactions are 1 kB. Fee 0.01 recommended.</source> - <translation>Optionalis merces transactionum singulis kB quae adiuvat curare ut tuae transactiones processae sit celeriter. Plurimi transactiones 1kB sunt. Merces 0.01 hortata.</translation> + <source>Optional transaction fee per kB that helps make sure your transactions are processed quickly. Most transactions are 1 kB.</source> + <translation>Optionalis merces transactionum singulis kB quae adiuvat curare tuas transactiones processas esse celeriter. Plurimi transactiones 1kB sunt.</translation> </message> <message> <location line="+15"/> @@ -1058,7 +1058,7 @@ Inscriptio: %4 <translation>Totali nummi transactionum quae adhuc confirmandae sunt, et nondum afficiunt pendendum</translation> </message> <message> - <location filename="../overviewpage.cpp" line="+115"/> + <location filename="../overviewpage.cpp" line="+116"/> <location line="+1"/> <source>out of sync</source> <translation>non synchronizato</translation> @@ -1645,6 +1645,19 @@ Inscriptio: %4 </message> </context> <context> + <name>SplashScreen</name> + <message> + <location filename="../splashscreen.cpp" line="+22"/> + <source>The Bitcoin developers</source> + <translation>Bitcoin curatores</translation> + </message> + <message> + <location line="+1"/> + <source>[testnet]</source> + <translation>[testnet]</translation> + </message> +</context> +<context> <name>TransactionDesc</name> <message> <location filename="../transactiondesc.cpp" line="+20"/> @@ -2119,9 +2132,27 @@ Inscriptio: %4 </message> </context> <context> + <name>WalletModel</name> + <message> + <location filename="../walletmodel.cpp" line="+193"/> + <source>Send Coins</source> + <translation>Mitte Nummos</translation> + </message> +</context> +<context> <name>WalletView</name> <message> - <location filename="../walletview.cpp" line="+247"/> + <location filename="../walletview.cpp" line="+42"/> + <source>&Export</source> + <translation>&Exporta</translation> + </message> + <message> + <location line="+1"/> + <source>Export the data in the current tab to a file</source> + <translation>Exporta data in hac tabella in plicam</translation> + </message> + <message> + <location line="+193"/> <source>Backup Wallet</source> <translation>Conserva cassidile</translation> </message> @@ -2154,37 +2185,37 @@ Inscriptio: %4 <context> <name>bitcoin-core</name> <message> - <location filename="../bitcoinstrings.cpp" line="+96"/> + <location filename="../bitcoinstrings.cpp" line="+94"/> <source>Bitcoin version</source> <translation>Versio de Bitcoin</translation> </message> <message> - <location line="+98"/> + <location line="+102"/> <source>Usage:</source> <translation>Usus:</translation> </message> <message> - <location line="-25"/> + <location line="-29"/> <source>Send command to -server or bitcoind</source> <translation>Mitte mandatum ad -server vel bitcoind</translation> </message> <message> - <location line="-22"/> + <location line="-23"/> <source>List commands</source> <translation>Enumera mandata</translation> </message> <message> - <location line="-10"/> + <location line="-12"/> <source>Get help for a command</source> <translation>Accipe auxilium pro mandato</translation> </message> <message> - <location line="+21"/> + <location line="+24"/> <source>Options:</source> <translation>Optiones:</translation> </message> <message> - <location line="+23"/> + <location line="+24"/> <source>Specify configuration file (default: bitcoin.conf)</source> <translation>Specifica configurationis plicam (praedefinitum: bitcoin.conf)</translation> </message> @@ -2194,27 +2225,17 @@ Inscriptio: %4 <translation>Specifica pid plicam (praedefinitum: bitcoin.pid)</translation> </message> <message> - <location line="-48"/> - <source>Generate coins</source> - <translation>Genera nummos</translation> - </message> - <message> - <location line="-27"/> - <source>Don't generate coins</source> - <translation>Nolite nummos generare</translation> - </message> - <message> - <location line="+74"/> + <location line="-1"/> <source>Specify data directory</source> <translation>Specifica indicem datorum</translation> </message> <message> - <location line="-8"/> + <location line="-9"/> <source>Set database cache size in megabytes (default: 25)</source> <translation>Constitue magnitudinem databasis cache in megabytes (praedefinitum: 25)</translation> </message> <message> - <location line="-27"/> + <location line="-28"/> <source>Listen for connections on <port> (default: 8333 or testnet: 18333)</source> <translation>Ausculta pro conexionibus in <porta> (praedefinitum: 8333 vel testnet: 18333)</translation> </message> @@ -2229,7 +2250,7 @@ Inscriptio: %4 <translation>Conecta ad nodum acceptare inscriptiones parium, et disconecte</translation> </message> <message> - <location line="+80"/> + <location line="+82"/> <source>Specify your own public address</source> <translation>Specifica tuam propriam publicam inscriptionem</translation> </message> @@ -2239,22 +2260,22 @@ Inscriptio: %4 <translation>Limen pro disconectendo paria improba (praedefinitum: 100)</translation> </message> <message> - <location line="-132"/> + <location line="-134"/> <source>Number of seconds to keep misbehaving peers from reconnecting (default: 86400)</source> <translation>Numerum secundorum prohibere ne paria improba reconectant (praedefinitum: 86400)</translation> </message> <message> - <location line="-32"/> + <location line="-29"/> <source>An error occurred while setting up the RPC port %u for listening on IPv4: %s</source> <translation>Error erat dum initians portam RPC %u pro auscultando in IPv4: %s</translation> </message> <message> - <location line="+30"/> + <location line="+27"/> <source>Listen for JSON-RPC connections on <port> (default: 8332 or testnet: 18332)</source> <translation>Ausculta pro conexionibus JSON-RPC in <porta> (praedefinitum: 8332 vel testnet: 18332)</translation> </message> <message> - <location line="+36"/> + <location line="+37"/> <source>Accept command line and JSON-RPC commands</source> <translation>Accipe terminalis et JSON-RPC mandata.</translation> </message> @@ -2264,17 +2285,17 @@ Inscriptio: %4 <translation>Operare infere sicut daemon et mandata accipe</translation> </message> <message> - <location line="+33"/> + <location line="+37"/> <source>Use the test network</source> <translation>Utere rete experimentale</translation> </message> <message> - <location line="-108"/> + <location line="-112"/> <source>Accept connections from outside (default: 1 if no -proxy or -connect)</source> <translation>Accipe conexiones externas (praedefinitum: 1 nisi -proxy neque -connect)</translation> </message> <message> - <location line="-82"/> + <location line="-80"/> <source>%s, you must set a rpcpassword in the configuration file: %s It is recommended you use the following random password: @@ -2315,11 +2336,6 @@ exempli gratia: alertnotify=echo %%s | mail -s "Bitcoin Notificatio" a </message> <message> <location line="+3"/> - <source>Error initializing database environment %s! To recover, BACKUP THAT DIRECTORY, then remove everything from it except for wallet.dat.</source> - <translation>Error initiando systema databasi %s! Ut restituas, CONSERVA ILLUM INDICEM PLICARUM, tunc remove omnes ex illo praeter wallet.dat.</translation> - </message> - <message> - <location line="+3"/> <source>Error: The transaction was rejected! This might happen if some of the coins in your wallet were already spent, such as if you used a copy of wallet.dat and coins were spent in the copy but not marked as spent here.</source> <translation>Error: Transactio eiecta est! Hoc possit accidere si alii nummorum in cassidili tuo iam soluti sint, ut si usus es exemplar de wallet.dat et nummi soluti sunt in exemplari sed non hic notati ut soluti.</translation> </message> @@ -2344,12 +2360,7 @@ exempli gratia: alertnotify=echo %%s | mail -s "Bitcoin Notificatio" a <translation>Constitue magnitudinem maximam transactionum magnae-prioritatis/parvae-mercedis in octetis/bytes (praedefinitum: 27000)</translation> </message> <message> - <location line="+3"/> - <source>Set the number of script verification threads (1-16, 0=auto, default: 0)</source> - <translation>Constitue numerum filorum verificationis scriptorum (1-16, 0=auto, praedefinitum: 0)</translation> - </message> - <message> - <location line="+2"/> + <location line="+6"/> <source>This is a pre-release test build - use at your own risk - do not use for mining or merchant applications</source> <translation>Hoc est prae-dimittum experimentala aedes - utere eo periculo tuo proprio - nolite utere fodendo vel applicationibus mercatoriis</translation> </message> @@ -2389,7 +2400,7 @@ exempli gratia: alertnotify=echo %%s | mail -s "Bitcoin Notificatio" a <translation>Optiones creandi frustorum:</translation> </message> <message> - <location line="+6"/> + <location line="+5"/> <source>Connect only to the specified node(s)</source> <translation>Conecte sole ad nodos specificatos (vel nodum specificatum)</translation> </message> @@ -2409,7 +2420,7 @@ exempli gratia: alertnotify=echo %%s | mail -s "Bitcoin Notificatio" a <translation>Visne reficere databasum frustorum iam?</translation> </message> <message> - <location line="+3"/> + <location line="+2"/> <source>Error initializing block database</source> <translation>Error initiando databasem frustorum</translation> </message> @@ -2435,11 +2446,6 @@ exempli gratia: alertnotify=echo %%s | mail -s "Bitcoin Notificatio" a </message> <message> <location line="+1"/> - <source>Error: Transaction creation failed!</source> - <translation>Error: Creare transactionum abortum est!</translation> - </message> - <message> - <location line="+1"/> <source>Error: Wallet locked, unable to create transaction!</source> <translation>Error: Cassidile seratum, non posse transactionem creare!</translation> </message> @@ -2509,7 +2515,12 @@ exempli gratia: alertnotify=echo %%s | mail -s "Bitcoin Notificatio" a <translation>Inveni paria utendo DNS quaerendo (praedefinitum: 1 nisi -connect)</translation> </message> <message> - <location line="+3"/> + <location line="+1"/> + <source>Generate coins (default: 0)</source> + <translation>Genera nummos (praedefinitum: 0)</translation> + </message> + <message> + <location line="+2"/> <source>How many blocks to check at startup (default: 288, 0 = all)</source> <translation>Quot frusta proba ad initium (praedefinitum: 288, 0 = omnia)</translation> </message> @@ -2519,17 +2530,22 @@ exempli gratia: alertnotify=echo %%s | mail -s "Bitcoin Notificatio" a <translation>Quam perfecta frustorum verificatio est (0-4, praedefinitum: 3)</translation> </message> <message> - <location line="+24"/> + <location line="+19"/> + <source>Not enough file descriptors available.</source> + <translation>Inopia descriptorum plicarum.</translation> + </message> + <message> + <location line="+8"/> <source>Rebuild block chain index from current blk000??.dat files</source> <translation>Restituere indicem catenae frustorum ex activis plicis blk000??.dat</translation> </message> <message> <location line="+16"/> <source>Set the number of threads to service RPC calls (default: 4)</source> - <translation type="unfinished"/> + <translation>Constitue numerum filorum ad tractandum RPC postulationes (praedefinitum: 4)</translation> </message> <message> - <location line="+22"/> + <location line="+26"/> <source>Verifying blocks...</source> <translation>Verificante frusta...</translation> </message> @@ -2539,12 +2555,17 @@ exempli gratia: alertnotify=echo %%s | mail -s "Bitcoin Notificatio" a <translation>Verificante cassidilem...</translation> </message> <message> - <location line="-62"/> + <location line="-69"/> <source>Imports blocks from external blk000??.dat file</source> <translation>Importat frusta ab externa plica blk000??.dat</translation> </message> <message> - <location line="+1"/> + <location line="-76"/> + <source>Set the number of script verification threads (up to 16, 0 = auto, <0 = leave that many cores free, default: 0)</source> + <translation>Constitue numerum filorum verificationis scriptorum (Maximum 16, 0 = auto, <0 = tot corda libera erunt, praedefinitum: 0)</translation> + </message> + <message> + <location line="+77"/> <source>Information</source> <translation>Informatio</translation> </message> @@ -2554,6 +2575,16 @@ exempli gratia: alertnotify=echo %%s | mail -s "Bitcoin Notificatio" a <translation>Inscriptio -tor non valida: '%s'</translation> </message> <message> + <location line="+1"/> + <source>Invalid amount for -minrelaytxfee=<amount>: '%s'</source> + <translation>Quantitas non valida pro -minrelaytxfee=<amount>: '%s'</translation> + </message> + <message> + <location line="+1"/> + <source>Invalid amount for -mintxfee=<amount>: '%s'</source> + <translation>Quantitas non valida pro -mintxfee=<amount>: '%s'</translation> + </message> + <message> <location line="+8"/> <source>Maintain a full transaction index (default: 0)</source> <translation>Manutene completam indicem transactionum (praedefinitum: 0)</translation> @@ -2569,7 +2600,7 @@ exempli gratia: alertnotify=echo %%s | mail -s "Bitcoin Notificatio" a <translation>Maxima magnitudo memoriae pro datis mittendis singulis conexionibus, <n>*1000 octetis/bytes (praedefinitum: 1000)</translation> </message> <message> - <location line="+1"/> + <location line="+2"/> <source>Only accept block chain matching built-in checkpoints (default: 1)</source> <translation>Tantum accipe catenam frustorum convenientem internis lapidibus (praedefinitum: 1)</translation> </message> @@ -2629,6 +2660,11 @@ exempli gratia: alertnotify=echo %%s | mail -s "Bitcoin Notificatio" a <translation>Diminue plicam debug.log ad initium clientis (praedefinitum: 1 nisi -debug)</translation> </message> <message> + <location line="+1"/> + <source>Signing transaction failed</source> + <translation>Signandum transactionis abortum est</translation> + </message> + <message> <location line="+2"/> <source>Specify connection timeout in milliseconds (default: 5000)</source> <translation>Specifica tempumfati conexionis in millisecundis (praedefinitum: 5000)</translation> @@ -2639,7 +2675,22 @@ exempli gratia: alertnotify=echo %%s | mail -s "Bitcoin Notificatio" a <translation>Systematis error:</translation> </message> <message> - <location line="+10"/> + <location line="+4"/> + <source>Transaction amount too small</source> + <translation>Magnitudo transactionis nimis parva</translation> + </message> + <message> + <location line="+1"/> + <source>Transaction amounts must be positive</source> + <translation>Necesse est magnitudines transactionum positivas esse.</translation> + </message> + <message> + <location line="+1"/> + <source>Transaction too large</source> + <translation>Transactio nimis magna</translation> + </message> + <message> + <location line="+7"/> <source>Use UPnP to map the listening port (default: 0)</source> <translation>Utere UPnP designare portam auscultandi (praedefinitum: 0)</translation> </message> @@ -2679,7 +2730,7 @@ exempli gratia: alertnotify=echo %%s | mail -s "Bitcoin Notificatio" a <translation>wallet.dat corrupta, salvare abortum est</translation> </message> <message> - <location line="-46"/> + <location line="-50"/> <source>Password for JSON-RPC connections</source> <translation>Tessera pro conexionibus JSON-RPC</translation> </message> @@ -2694,17 +2745,17 @@ exempli gratia: alertnotify=echo %%s | mail -s "Bitcoin Notificatio" a <translation>Mitte mandata nodo operanti in <ip> (praedefinitum: 127.0.0.1)</translation> </message> <message> - <location line="-119"/> + <location line="-120"/> <source>Execute command when the best block changes (%s in cmd is replaced by block hash)</source> <translation>Pelle mandatum quando optissimum frustum mutat (%s in mandato substituitur ab hash frusti)</translation> </message> <message> - <location line="+142"/> + <location line="+147"/> <source>Upgrade wallet to latest format</source> <translation>Progredere cassidile ad formam recentissimam</translation> </message> <message> - <location line="-17"/> + <location line="-21"/> <source>Set key pool size to <n> (default: 100)</source> <translation>Constitue magnitudinem stagni clavium ad <n> (praedefinitum: 100)</translation> </message> @@ -2714,12 +2765,12 @@ exempli gratia: alertnotify=echo %%s | mail -s "Bitcoin Notificatio" a <translation>Iterum perlege catenam frustorum propter absentes cassidilis transactiones</translation> </message> <message> - <location line="+31"/> + <location line="+35"/> <source>Use OpenSSL (https) for JSON-RPC connections</source> <translation>Utere OpenSSL (https) pro conexionibus JSON-RPC</translation> </message> <message> - <location line="-22"/> + <location line="-26"/> <source>Server certificate file (default: server.cert)</source> <translation>Plica certificationis daemonis moderantis (praedefinitum: server.cert)</translation> </message> @@ -2729,37 +2780,37 @@ exempli gratia: alertnotify=echo %%s | mail -s "Bitcoin Notificatio" a <translation>Clavis privata daemonis moderans (praedefinitum: server.pem)</translation> </message> <message> - <location line="-153"/> + <location line="-151"/> <source>Acceptable ciphers (default: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH)</source> <translation>Acceptabiles cifrae (praedefinitum: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH)</translation> </message> <message> - <location line="+166"/> + <location line="+165"/> <source>This help message</source> <translation>Hic nuntius auxilii</translation> </message> <message> - <location line="+3"/> + <location line="+6"/> <source>Unable to bind to %s on this computer (bind returned error %d, %s)</source> <translation>Non posse conglutinare ad %s in hoc computatro (conglutinare redidit errorem %d, %s)</translation> </message> <message> - <location line="-86"/> + <location line="-91"/> <source>Connect through socks proxy</source> <translation>Conecte per socks vicarium</translation> </message> <message> - <location line="-11"/> + <location line="-10"/> <source>Allow DNS lookups for -addnode, -seednode and -connect</source> <translation>Permitte quaerenda DNS pro -addnode, -seednode, et -connect</translation> </message> <message> - <location line="+56"/> + <location line="+55"/> <source>Loading addresses...</source> <translation>Legens inscriptiones...</translation> </message> <message> - <location line="-34"/> + <location line="-35"/> <source>Error loading wallet.dat: Wallet corrupted</source> <translation>Error legendi wallet.dat: Cassidile corruptum</translation> </message> @@ -2769,22 +2820,22 @@ exempli gratia: alertnotify=echo %%s | mail -s "Bitcoin Notificatio" a <translation>Error legendi wallet.dat: Cassidili necesse est recentior versio Bitcoin</translation> </message> <message> - <location line="+87"/> + <location line="+93"/> <source>Wallet needed to be rewritten: restart Bitcoin to complete</source> <translation>Cassidili necesse erat rescribi: Repelle Bitcoin ut compleas</translation> </message> <message> - <location line="-89"/> + <location line="-95"/> <source>Error loading wallet.dat</source> <translation>Error legendi wallet.dat</translation> </message> <message> - <location line="+29"/> + <location line="+28"/> <source>Invalid -proxy address: '%s'</source> <translation>Inscriptio -proxy non valida: '%s'</translation> </message> <message> - <location line="+49"/> + <location line="+56"/> <source>Unknown network specified in -onlynet: '%s'</source> <translation>Ignotum rete specificatum in -onlynet: '%s'</translation> </message> @@ -2794,7 +2845,7 @@ exempli gratia: alertnotify=echo %%s | mail -s "Bitcoin Notificatio" a <translation>Ignota -socks vicarii versio postulata: %i</translation> </message> <message> - <location line="-91"/> + <location line="-96"/> <source>Cannot resolve -bind address: '%s'</source> <translation>Non posse resolvere -bind inscriptonem: '%s'</translation> </message> @@ -2814,17 +2865,17 @@ exempli gratia: alertnotify=echo %%s | mail -s "Bitcoin Notificatio" a <translation>Quantitas non valida</translation> </message> <message> - <location line="-4"/> + <location line="-6"/> <source>Insufficient funds</source> <translation>Inopia nummorum</translation> </message> <message> - <location line="+8"/> + <location line="+10"/> <source>Loading block index...</source> <translation>Legens indicem frustorum...</translation> </message> <message> - <location line="-58"/> + <location line="-57"/> <source>Add a node to connect to and attempt to keep the connection open</source> <translation>Adice nodum cui conectere et conare sustinere conexionem apertam</translation> </message> @@ -2834,52 +2885,47 @@ exempli gratia: alertnotify=echo %%s | mail -s "Bitcoin Notificatio" a <translation>Non posse conglutinare ad %s in hoc cumputatro. Bitcoin probabiliter iam operatur.</translation> </message> <message> - <location line="+67"/> + <location line="+64"/> <source>Fee per KB to add to transactions you send</source> <translation>Merces per KB addere ad transactiones tu mittas</translation> </message> <message> - <location line="+17"/> + <location line="+19"/> <source>Loading wallet...</source> <translation>Legens cassidile...</translation> </message> <message> - <location line="-53"/> + <location line="-52"/> <source>Cannot downgrade wallet</source> <translation>Non posse cassidile regredi</translation> </message> <message> - <location line="+1"/> - <source>Cannot initialize keypool</source> - <translation>Non posse initiare stagnum clavium</translation> - </message> - <message> <location line="+3"/> <source>Cannot write default address</source> <translation>Non posse scribere praedefinitam inscriptionem</translation> </message> <message> - <location line="+63"/> + <location line="+64"/> <source>Rescanning...</source> <translation>Iterum perlegens...</translation> </message> <message> - <location line="-55"/> + <location line="-57"/> <source>Done loading</source> <translation>Completo lengendi</translation> </message> <message> - <location line="+79"/> + <location line="+82"/> <source>To use the %s option</source> <translation>Ut utaris optione %s</translation> </message> <message> - <location line="-71"/> + <location line="-74"/> <source>Error</source> <translation>Error</translation> </message> <message> - <location line="-33"/> + <location line="-31"/> <source>You must set rpcpassword=<password> in the configuration file: %s If the file does not exist, create it with owner-readable-only file permissions.</source> diff --git a/src/qt/locale/bitcoin_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.</translation> </message> <message> - <location filename="../aboutdialog.cpp" line="+17"/> + <location filename="../aboutdialog.cpp" line="+14"/> <source>Copyright</source> <translation type="unfinished"/> </message> <message> <location line="+0"/> - <source>2009-%1 The Bitcoin developers</source> + <source>The Bitcoin developers</source> <translation type="unfinished"/> </message> </context> @@ -65,7 +65,7 @@ Platinama pagal MIT/X11 licenciją, kurią rasite faile COPYING arba http://www. <translation>&Naujas adresas</translation> </message> <message> - <location filename="../addressbookpage.cpp" line="+59"/> + <location filename="../addressbookpage.cpp" line="+63"/> <source>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.</source> <translation>Tai yra jūsų Bitcoin adresai mokėjimų gavimui. Galite duoti skirtingus adresus atskiriems siuntėjams, kad galėtumėte sekti, kas jums moka.</translation> </message> @@ -95,7 +95,17 @@ Platinama pagal MIT/X11 licenciją, kurią rasite faile COPYING arba http://www. <translation type="unfinished"/> </message> <message> - <location line="-14"/> + <location line="+27"/> + <source>Export the data in the current tab to a file</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+3"/> + <source>&Export</source> + <translation type="unfinished"/> + </message> + <message> + <location line="-44"/> <source>Verify a message to ensure it was signed with a specified Bitcoin address</source> <translation>Patikrinkite žinutę, jog įsitikintumėte, kad ją pasirašė nurodytas Bitcoin adresas</translation> </message> @@ -317,12 +327,12 @@ Platinama pagal MIT/X11 licenciją, kurią rasite faile COPYING arba http://www. <translation>Pasirašyti ži&nutę...</translation> </message> <message> - <location line="+299"/> + <location line="+280"/> <source>Synchronizing with network...</source> <translation>Sinchronizavimas su tinklu ...</translation> </message> <message> - <location line="-368"/> + <location line="-349"/> <source>&Overview</source> <translation>&Apžvalga</translation> </message> @@ -397,7 +407,7 @@ Platinama pagal MIT/X11 licenciją, kurią rasite faile COPYING arba http://www. <translation>&Keisti slaptafrazę...</translation> </message> <message> - <location line="+304"/> + <location line="+285"/> <source>Importing blocks from disk...</source> <translation type="unfinished"/> </message> @@ -407,12 +417,7 @@ Platinama pagal MIT/X11 licenciją, kurią rasite faile COPYING arba http://www. <translation type="unfinished"/> </message> <message> - <location line="-300"/> - <source>&Export...</source> - <translation>&Eksportuoti...</translation> - </message> - <message> - <location line="-66"/> + <location line="-347"/> <source>Send coins to a Bitcoin address</source> <translation>Siųsti monetas Bitcoin adresui</translation> </message> @@ -422,12 +427,7 @@ Platinama pagal MIT/X11 licenciją, kurią rasite faile COPYING arba http://www. <translation>Keisti bitcoin konfigūracijos galimybes</translation> </message> <message> - <location line="+18"/> - <source>Export the data in the current tab to a file</source> - <translation type="unfinished"/> - </message> - <message> - <location line="-9"/> + <location line="+9"/> <source>Backup wallet to another location</source> <translation>Daryti piniginės atsarginę kopiją</translation> </message> @@ -437,7 +437,7 @@ Platinama pagal MIT/X11 licenciją, kurią rasite faile COPYING arba http://www. <translation>Pakeisti slaptafrazę naudojamą piniginės užšifravimui</translation> </message> <message> - <location line="+9"/> + <location line="+6"/> <source>&Debug window</source> <translation>&Derinimo langas</translation> </message> @@ -447,23 +447,23 @@ Platinama pagal MIT/X11 licenciją, kurią rasite faile COPYING arba http://www. <translation>Atverti derinimo ir diagnostikos konsolę</translation> </message> <message> - <location line="-7"/> + <location line="-4"/> <source>&Verify message...</source> <translation>&Tikrinti žinutę...</translation> </message> <message> - <location line="-163"/> - <location line="+541"/> + <location line="-165"/> + <location line="+530"/> <source>Bitcoin</source> <translation>Bitcoin</translation> </message> <message> - <location line="-541"/> + <location line="-530"/> <source>Wallet</source> <translation>Piniginė</translation> </message> <message> - <location line="+99"/> + <location line="+101"/> <source>&Send</source> <translation type="unfinished"/> </message> @@ -508,12 +508,12 @@ Platinama pagal MIT/X11 licenciją, kurią rasite faile COPYING arba http://www. <translation type="unfinished"/> </message> <message> - <location line="+31"/> + <location line="+28"/> <source>&File</source> <translation>&Failas</translation> </message> <message> - <location line="+8"/> + <location line="+7"/> <source>&Settings</source> <translation>&Nustatymai</translation> </message> @@ -528,12 +528,7 @@ Platinama pagal MIT/X11 licenciją, kurią rasite faile COPYING arba http://www. <translation>Kortelių įrankinė</translation> </message> <message> - <location line="+8"/> - <source>Actions toolbar</source> - <translation>Veiksmų įrankinė</translation> - </message> - <message> - <location line="+13"/> + <location line="+17"/> <location line="+10"/> <source>[testnet]</source> <translation>[testavimotinklas]</translation> @@ -544,12 +539,17 @@ Platinama pagal MIT/X11 licenciją, kurią rasite faile COPYING arba http://www. <translation>Bitcoin klientas</translation> </message> <message numerus="yes"> - <location line="+140"/> + <location line="+141"/> <source>%n active connection(s) to Bitcoin network</source> <translation><numerusform>%n Bitcoin tinklo aktyvus ryšys</numerusform><numerusform>%n Bitcoin tinklo aktyvūs ryšiai</numerusform><numerusform>%n Bitcoin tinklo aktyvūs ryšiai</numerusform></translation> </message> <message> - <location line="+39"/> + <location line="+22"/> + <source>No block source available...</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+12"/> <source>Processed %1 of %2 (estimated) blocks of transaction history.</source> <translation type="unfinished"/> </message> @@ -574,7 +574,7 @@ Platinama pagal MIT/X11 licenciją, kurią rasite faile COPYING arba http://www. <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation> </message> <message> - <location line="+5"/> + <location line="+4"/> <source>%1 behind</source> <translation type="unfinished"/> </message> @@ -589,7 +589,7 @@ Platinama pagal MIT/X11 licenciją, kurią rasite faile COPYING arba http://www. <translation type="unfinished"/> </message> <message> - <location line="+21"/> + <location line="+22"/> <source>Error</source> <translation type="unfinished"/> </message> @@ -604,22 +604,22 @@ Platinama pagal MIT/X11 licenciją, kurią rasite faile COPYING arba http://www. <translation type="unfinished"/> </message> <message> - <location line="+68"/> + <location line="+70"/> <source>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?</source> <translation type="unfinished"/> </message> <message> - <location line="-138"/> + <location line="-140"/> <source>Up to date</source> <translation>Atnaujinta</translation> </message> <message> - <location line="+32"/> + <location line="+31"/> <source>Catching up...</source> <translation>Vejamasi...</translation> </message> <message> - <location line="+110"/> + <location line="+113"/> <source>Confirm transaction fee</source> <translation>Patvirtinti sandorio mokestį</translation> </message> @@ -668,7 +668,7 @@ Adresas: %4</translation> <translation>Piniginė <b>užšifruota</b> ir šiuo metu <b>užrakinta</b></translation> </message> <message> - <location filename="../bitcoin.cpp" line="+104"/> + <location filename="../bitcoin.cpp" line="+111"/> <source>A fatal error occurred. Bitcoin can no longer continue safely and will quit.</source> <translation type="unfinished"/> </message> @@ -676,7 +676,7 @@ Adresas: %4</translation> <context> <name>ClientModel</name> <message> - <location filename="../clientmodel.cpp" line="+98"/> + <location filename="../clientmodel.cpp" line="+104"/> <source>Network Alert</source> <translation>Tinklo įspėjimas</translation> </message> @@ -807,8 +807,8 @@ Adresas: %4</translation> </message> <message> <location line="+6"/> - <source>Optional transaction fee per kB that helps make sure your transactions are processed quickly. Most transactions are 1 kB. Fee 0.01 recommended.</source> - <translation>Neprivalomas sandorio mokestis už KB, kuris padeda greičiau sutvarkyti sandorius. Daugelis sandorių yra tik 1KB dydžio. Rekomenduojamas 0,01 mokestis.</translation> + <source>Optional transaction fee per kB that helps make sure your transactions are processed quickly. Most transactions are 1 kB.</source> + <translation type="unfinished"/> </message> <message> <location line="+15"/> @@ -1057,7 +1057,7 @@ Adresas: %4</translation> <translation>Iš viso sandorių, įskaitant tuos kurie dar turi būti patvirtinti, ir jie dar nėra įskaičiuotii į einamosios sąskaitos balansą</translation> </message> <message> - <location filename="../overviewpage.cpp" line="+115"/> + <location filename="../overviewpage.cpp" line="+116"/> <location line="+1"/> <source>out of sync</source> <translation type="unfinished"/> @@ -1644,6 +1644,19 @@ Adresas: %4</translation> </message> </context> <context> + <name>SplashScreen</name> + <message> + <location filename="../splashscreen.cpp" line="+22"/> + <source>The Bitcoin developers</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>[testnet]</source> + <translation>[testavimotinklas]</translation> + </message> +</context> +<context> <name>TransactionDesc</name> <message> <location filename="../transactiondesc.cpp" line="+20"/> @@ -2118,9 +2131,27 @@ Adresas: %4</translation> </message> </context> <context> + <name>WalletModel</name> + <message> + <location filename="../walletmodel.cpp" line="+193"/> + <source>Send Coins</source> + <translation>Siųsti monetas</translation> + </message> +</context> +<context> <name>WalletView</name> <message> - <location filename="../walletview.cpp" line="+247"/> + <location filename="../walletview.cpp" line="+42"/> + <source>&Export</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Export the data in the current tab to a file</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+193"/> <source>Backup Wallet</source> <translation type="unfinished"/> </message> @@ -2153,37 +2184,37 @@ Adresas: %4</translation> <context> <name>bitcoin-core</name> <message> - <location filename="../bitcoinstrings.cpp" line="+96"/> + <location filename="../bitcoinstrings.cpp" line="+94"/> <source>Bitcoin version</source> <translation>Bitcoin versija</translation> </message> <message> - <location line="+98"/> + <location line="+102"/> <source>Usage:</source> <translation>Naudojimas:</translation> </message> <message> - <location line="-25"/> + <location line="-29"/> <source>Send command to -server or bitcoind</source> <translation>Siųsti komandą serveriui arba bitcoind</translation> </message> <message> - <location line="-22"/> + <location line="-23"/> <source>List commands</source> <translation>Komandų sąrašas</translation> </message> <message> - <location line="-10"/> + <location line="-12"/> <source>Get help for a command</source> <translation>Suteikti pagalba komandai</translation> </message> <message> - <location line="+21"/> + <location line="+24"/> <source>Options:</source> <translation>Parinktys:</translation> </message> <message> - <location line="+23"/> + <location line="+24"/> <source>Specify configuration file (default: bitcoin.conf)</source> <translation>Nurodyti konfigūracijos failą (pagal nutylėjimąt: bitcoin.conf)</translation> </message> @@ -2193,27 +2224,17 @@ Adresas: %4</translation> <translation>Nurodyti pid failą (pagal nutylėjimą: bitcoind.pid)</translation> </message> <message> - <location line="-48"/> - <source>Generate coins</source> - <translation>Generuoti monetas</translation> - </message> - <message> - <location line="-27"/> - <source>Don't generate coins</source> - <translation>Negeneruoti monetų</translation> - </message> - <message> - <location line="+74"/> + <location line="-1"/> <source>Specify data directory</source> <translation>Nustatyti duomenų aplanką</translation> </message> <message> - <location line="-8"/> + <location line="-9"/> <source>Set database cache size in megabytes (default: 25)</source> <translation type="unfinished"/> </message> <message> - <location line="-27"/> + <location line="-28"/> <source>Listen for connections on <port> (default: 8333 or testnet: 18333)</source> <translation>Sujungimo klausymas prijungčiai <port> (pagal nutylėjimą: 8333 arba testnet: 18333)</translation> </message> @@ -2228,7 +2249,7 @@ Adresas: %4</translation> <translation type="unfinished"/> </message> <message> - <location line="+80"/> + <location line="+82"/> <source>Specify your own public address</source> <translation type="unfinished"/> </message> @@ -2238,22 +2259,22 @@ Adresas: %4</translation> <translation>Atjungimo dėl netinkamo kolegų elgesio riba (pagal nutylėjimą: 100)</translation> </message> <message> - <location line="-132"/> + <location line="-134"/> <source>Number of seconds to keep misbehaving peers from reconnecting (default: 86400)</source> <translation>Sekundžių kiekis eikiamas palaikyti ryšį dėl lygiarangių nestabilumo (pagal nutylėjimą: 86.400)</translation> </message> <message> - <location line="-32"/> + <location line="-29"/> <source>An error occurred while setting up the RPC port %u for listening on IPv4: %s</source> <translation type="unfinished"/> </message> <message> - <location line="+30"/> + <location line="+27"/> <source>Listen for JSON-RPC connections on <port> (default: 8332 or testnet: 18332)</source> <translation>Klausymas JSON-RPC sujungimui prijungčiai <port> (pagal nutylėjimą: 8332 or testnet: 18332)</translation> </message> <message> - <location line="+36"/> + <location line="+37"/> <source>Accept command line and JSON-RPC commands</source> <translation>Priimti komandinę eilutę ir JSON-RPC komandas</translation> </message> @@ -2263,17 +2284,17 @@ Adresas: %4</translation> <translation>Dirbti fone kaip šešėlyje ir priimti komandas</translation> </message> <message> - <location line="+33"/> + <location line="+37"/> <source>Use the test network</source> <translation>Naudoti testavimo tinklą</translation> </message> <message> - <location line="-108"/> + <location line="-112"/> <source>Accept connections from outside (default: 1 if no -proxy or -connect)</source> <translation type="unfinished"/> </message> <message> - <location line="-82"/> + <location line="-80"/> <source>%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. </message> <message> <location line="+3"/> - <source>Error initializing database environment %s! To recover, BACKUP THAT DIRECTORY, then remove everything from it except for wallet.dat.</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+3"/> <source>Error: The transaction was rejected! This might happen if some of the coins in your wallet were already spent, such as if you used a copy of wallet.dat and coins were spent in the copy but not marked as spent here.</source> <translation type="unfinished"/> </message> @@ -2333,12 +2349,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+3"/> - <source>Set the number of script verification threads (1-16, 0=auto, default: 0)</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+2"/> + <location line="+6"/> <source>This is a pre-release test build - use at your own risk - do not use for mining or merchant applications</source> <translation type="unfinished"/> </message> @@ -2378,7 +2389,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+6"/> + <location line="+5"/> <source>Connect only to the specified node(s)</source> <translation>Prisijungti tik prie nurodyto mazgo</translation> </message> @@ -2398,7 +2409,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+3"/> + <location line="+2"/> <source>Error initializing block database</source> <translation type="unfinished"/> </message> @@ -2424,11 +2435,6 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. </message> <message> <location line="+1"/> - <source>Error: Transaction creation failed!</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+1"/> <source>Error: Wallet locked, unable to create transaction!</source> <translation type="unfinished"/> </message> @@ -2498,7 +2504,12 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+3"/> + <location line="+1"/> + <source>Generate coins (default: 0)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+2"/> <source>How many blocks to check at startup (default: 288, 0 = all)</source> <translation type="unfinished"/> </message> @@ -2508,7 +2519,12 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+24"/> + <location line="+19"/> + <source>Not enough file descriptors available.</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+8"/> <source>Rebuild block chain index from current blk000??.dat files</source> <translation type="unfinished"/> </message> @@ -2518,7 +2534,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+22"/> + <location line="+26"/> <source>Verifying blocks...</source> <translation type="unfinished"/> </message> @@ -2528,12 +2544,17 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="-62"/> + <location line="-69"/> <source>Imports blocks from external blk000??.dat file</source> <translation type="unfinished"/> </message> <message> - <location line="+1"/> + <location line="-76"/> + <source>Set the number of script verification threads (up to 16, 0 = auto, <0 = leave that many cores free, default: 0)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+77"/> <source>Information</source> <translation type="unfinished"/> </message> @@ -2543,6 +2564,16 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Neteisingas tor adresas: '%s'</translation> </message> <message> + <location line="+1"/> + <source>Invalid amount for -minrelaytxfee=<amount>: '%s'</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Invalid amount for -mintxfee=<amount>: '%s'</source> + <translation type="unfinished"/> + </message> + <message> <location line="+8"/> <source>Maintain a full transaction index (default: 0)</source> <translation type="unfinished"/> @@ -2558,7 +2589,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Maksimalus buferis siuntimo sujungimui <n>*1000 bitų (pagal nutylėjimą: 1000)</translation> </message> <message> - <location line="+1"/> + <location line="+2"/> <source>Only accept block chain matching built-in checkpoints (default: 1)</source> <translation type="unfinished"/> </message> @@ -2618,6 +2649,11 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> + <location line="+1"/> + <source>Signing transaction failed</source> + <translation type="unfinished"/> + </message> + <message> <location line="+2"/> <source>Specify connection timeout in milliseconds (default: 5000)</source> <translation>Nustatyti sujungimo trukmę milisekundėmis (pagal nutylėjimą: 5000)</translation> @@ -2628,7 +2664,22 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+10"/> + <location line="+4"/> + <source>Transaction amount too small</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Transaction amounts must be positive</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Transaction too large</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+7"/> <source>Use UPnP to map the listening port (default: 0)</source> <translation>Bandymas naudoti UPnP struktūra klausymosi prievadui (default: 0)</translation> </message> @@ -2668,7 +2719,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="-46"/> + <location line="-50"/> <source>Password for JSON-RPC connections</source> <translation>Slaptažodis JSON-RPC sujungimams</translation> </message> @@ -2683,17 +2734,17 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Siųsti komandą mazgui dirbančiam <ip> (pagal nutylėjimą: 127.0.0.1)</translation> </message> <message> - <location line="-119"/> + <location line="-120"/> <source>Execute command when the best block changes (%s in cmd is replaced by block hash)</source> <translation type="unfinished"/> </message> <message> - <location line="+142"/> + <location line="+147"/> <source>Upgrade wallet to latest format</source> <translation>Atnaujinti piniginę į naujausią formatą</translation> </message> <message> - <location line="-17"/> + <location line="-21"/> <source>Set key pool size to <n> (default: 100)</source> <translation>Nustatyti rakto apimties dydį <n> (pagal nutylėjimą: 100)</translation> </message> @@ -2703,12 +2754,12 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Ieškoti prarastų piniginės sandorių blokų grandinėje</translation> </message> <message> - <location line="+31"/> + <location line="+35"/> <source>Use OpenSSL (https) for JSON-RPC connections</source> <translation>Naudoti OpenSSL (https) jungimuisi JSON-RPC </translation> </message> <message> - <location line="-22"/> + <location line="-26"/> <source>Server certificate file (default: server.cert)</source> <translation>Serverio sertifikato failas (pagal nutylėjimą: server.cert)</translation> </message> @@ -2718,37 +2769,37 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Serverio privatus raktas (pagal nutylėjimą: server.pem)</translation> </message> <message> - <location line="-153"/> + <location line="-151"/> <source>Acceptable ciphers (default: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH)</source> <translation>Priimtini šifrai (pagal nutylėjimą: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH)</translation> </message> <message> - <location line="+166"/> + <location line="+165"/> <source>This help message</source> <translation>Pagelbos žinutė</translation> </message> <message> - <location line="+3"/> + <location line="+6"/> <source>Unable to bind to %s on this computer (bind returned error %d, %s)</source> <translation>Nepavyko susieti šiame kompiuteryje prievado %s (bind returned error %d, %s)</translation> </message> <message> - <location line="-86"/> + <location line="-91"/> <source>Connect through socks proxy</source> <translation>Jungtis per socks tarpinį serverį</translation> </message> <message> - <location line="-11"/> + <location line="-10"/> <source>Allow DNS lookups for -addnode, -seednode and -connect</source> <translation>Leisti DNS paiešką sujungimui ir mazgo pridėjimui</translation> </message> <message> - <location line="+56"/> + <location line="+55"/> <source>Loading addresses...</source> <translation>Užkraunami adresai...</translation> </message> <message> - <location line="-34"/> + <location line="-35"/> <source>Error loading wallet.dat: Wallet corrupted</source> <translation> wallet.dat pakrovimo klaida, wallet.dat sugadintas</translation> </message> @@ -2758,22 +2809,22 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation> wallet.dat pakrovimo klaida, wallet.dat reikalauja naujasnės Bitcoin versijos</translation> </message> <message> - <location line="+87"/> + <location line="+93"/> <source>Wallet needed to be rewritten: restart Bitcoin to complete</source> <translation>Piniginė turi būti prrašyta: įvykdymui perkraukite Bitcoin</translation> </message> <message> - <location line="-89"/> + <location line="-95"/> <source>Error loading wallet.dat</source> <translation> wallet.dat pakrovimo klaida</translation> </message> <message> - <location line="+29"/> + <location line="+28"/> <source>Invalid -proxy address: '%s'</source> <translation>Neteisingas proxy adresas: '%s'</translation> </message> <message> - <location line="+49"/> + <location line="+56"/> <source>Unknown network specified in -onlynet: '%s'</source> <translation type="unfinished"/> </message> @@ -2783,7 +2834,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="-91"/> + <location line="-96"/> <source>Cannot resolve -bind address: '%s'</source> <translation type="unfinished"/> </message> @@ -2803,17 +2854,17 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Neteisinga suma</translation> </message> <message> - <location line="-4"/> + <location line="-6"/> <source>Insufficient funds</source> <translation>Nepakanka lėšų</translation> </message> <message> - <location line="+8"/> + <location line="+10"/> <source>Loading block index...</source> <translation>Įkeliamas blokų indeksas...</translation> </message> <message> - <location line="-58"/> + <location line="-57"/> <source>Add a node to connect to and attempt to keep the connection open</source> <translation>Pridėti mazgą prie sujungti su and attempt to keep the connection open</translation> </message> @@ -2823,52 +2874,47 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Nepavyko susieti šiame kompiuteryje prievado %s. Bitcoin tikriausiai jau veikia.</translation> </message> <message> - <location line="+67"/> + <location line="+64"/> <source>Fee per KB to add to transactions you send</source> <translation>Įtraukti mokestį už kB siunčiamiems sandoriams</translation> </message> <message> - <location line="+17"/> + <location line="+19"/> <source>Loading wallet...</source> <translation>Užkraunama piniginė...</translation> </message> <message> - <location line="-53"/> + <location line="-52"/> <source>Cannot downgrade wallet</source> <translation type="unfinished"/> </message> <message> - <location line="+1"/> - <source>Cannot initialize keypool</source> - <translation type="unfinished"/> - </message> - <message> <location line="+3"/> <source>Cannot write default address</source> <translation type="unfinished"/> </message> <message> - <location line="+63"/> + <location line="+64"/> <source>Rescanning...</source> <translation>Peržiūra</translation> </message> <message> - <location line="-55"/> + <location line="-57"/> <source>Done loading</source> <translation>Įkėlimas baigtas</translation> </message> <message> - <location line="+79"/> + <location line="+82"/> <source>To use the %s option</source> <translation type="unfinished"/> </message> <message> - <location line="-71"/> + <location line="-74"/> <source>Error</source> <translation>Klaida</translation> </message> <message> - <location line="-33"/> + <location line="-31"/> <source>You must set rpcpassword=<password> in the configuration file: %s If the file does not exist, create it with owner-readable-only file permissions.</source> diff --git a/src/qt/locale/bitcoin_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 <translation type="unfinished"/> </message> <message> - <location filename="../aboutdialog.cpp" line="+17"/> + <location filename="../aboutdialog.cpp" line="+14"/> <source>Copyright</source> <translation type="unfinished"/> </message> <message> <location line="+0"/> - <source>2009-%1 The Bitcoin developers</source> + <source>The Bitcoin developers</source> <translation type="unfinished"/> </message> </context> @@ -61,7 +61,7 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>&Jauna adrese</translation> </message> <message> - <location filename="../addressbookpage.cpp" line="+59"/> + <location filename="../addressbookpage.cpp" line="+63"/> <source>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.</source> <translation type="unfinished"/> </message> @@ -91,7 +91,17 @@ This product includes software developed by the OpenSSL Project for use in the O <translation type="unfinished"/> </message> <message> - <location line="-14"/> + <location line="+27"/> + <source>Export the data in the current tab to a file</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+3"/> + <source>&Export</source> + <translation type="unfinished"/> + </message> + <message> + <location line="-44"/> <source>Verify a message to ensure it was signed with a specified Bitcoin address</source> <translation type="unfinished"/> </message> @@ -313,12 +323,12 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>Parakstīt &ziņojumu...</translation> </message> <message> - <location line="+299"/> + <location line="+280"/> <source>Synchronizing with network...</source> <translation>Sinhronizācija ar tīklu...</translation> </message> <message> - <location line="-368"/> + <location line="-349"/> <source>&Overview</source> <translation>&Pārskats</translation> </message> @@ -393,7 +403,7 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>&Mainīt paroli</translation> </message> <message> - <location line="+304"/> + <location line="+285"/> <source>Importing blocks from disk...</source> <translation type="unfinished"/> </message> @@ -403,12 +413,7 @@ This product includes software developed by the OpenSSL Project for use in the O <translation type="unfinished"/> </message> <message> - <location line="-300"/> - <source>&Export...</source> - <translation>&Eksportēt...</translation> - </message> - <message> - <location line="-66"/> + <location line="-347"/> <source>Send coins to a Bitcoin address</source> <translation>Nosūtīt bitkoinus uz Bitcoin adresi</translation> </message> @@ -418,12 +423,7 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>Mainīt Bitcoin konfigurācijas uzstādījumus</translation> </message> <message> - <location line="+18"/> - <source>Export the data in the current tab to a file</source> - <translation>Datus no tekošā ieliktņa eksportēt uz failu</translation> - </message> - <message> - <location line="-9"/> + <location line="+9"/> <source>Backup wallet to another location</source> <translation>Izveidot maciņa rezerves kopiju citur</translation> </message> @@ -433,7 +433,7 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>Mainīt maciņa šifrēšanas paroli</translation> </message> <message> - <location line="+9"/> + <location line="+6"/> <source>&Debug window</source> <translation>&Debug logs</translation> </message> @@ -443,23 +443,23 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>Atvērt atkļūdošanas un diagnostikas konsoli</translation> </message> <message> - <location line="-7"/> + <location line="-4"/> <source>&Verify message...</source> <translation>&Pārbaudīt ziņojumu...</translation> </message> <message> - <location line="-163"/> - <location line="+541"/> + <location line="-165"/> + <location line="+530"/> <source>Bitcoin</source> <translation type="unfinished"/> </message> <message> - <location line="-541"/> + <location line="-530"/> <source>Wallet</source> <translation>Maciņš</translation> </message> <message> - <location line="+99"/> + <location line="+101"/> <source>&Send</source> <translation type="unfinished"/> </message> @@ -504,12 +504,12 @@ This product includes software developed by the OpenSSL Project for use in the O <translation type="unfinished"/> </message> <message> - <location line="+31"/> + <location line="+28"/> <source>&File</source> <translation>&Fails</translation> </message> <message> - <location line="+8"/> + <location line="+7"/> <source>&Settings</source> <translation>&Uzstādījumi</translation> </message> @@ -524,12 +524,7 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>Ciļņu rīkjosla</translation> </message> <message> - <location line="+8"/> - <source>Actions toolbar</source> - <translation>Darbību rīkjosla</translation> - </message> - <message> - <location line="+13"/> + <location line="+17"/> <location line="+10"/> <source>[testnet]</source> <translation>[testnet]</translation> @@ -540,12 +535,17 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>Bitcoin klients</translation> </message> <message numerus="yes"> - <location line="+140"/> + <location line="+141"/> <source>%n active connection(s) to Bitcoin network</source> <translation><numerusform>%n aktīvu savienojumu ar Bitcoin tīklu</numerusform><numerusform>%n aktīvs savienojums ar Bitcoin tīklu</numerusform><numerusform>%n aktīvu savienojumu as Bitcoin tīklu</numerusform></translation> </message> <message> - <location line="+39"/> + <location line="+22"/> + <source>No block source available...</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+12"/> <source>Processed %1 of %2 (estimated) blocks of transaction history.</source> <translation type="unfinished"/> </message> @@ -570,7 +570,7 @@ This product includes software developed by the OpenSSL Project for use in the O <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation> </message> <message> - <location line="+5"/> + <location line="+4"/> <source>%1 behind</source> <translation type="unfinished"/> </message> @@ -585,7 +585,7 @@ This product includes software developed by the OpenSSL Project for use in the O <translation type="unfinished"/> </message> <message> - <location line="+21"/> + <location line="+22"/> <source>Error</source> <translation>Kļūda</translation> </message> @@ -600,22 +600,22 @@ This product includes software developed by the OpenSSL Project for use in the O <translation type="unfinished"/> </message> <message> - <location line="+68"/> + <location line="+70"/> <source>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?</source> <translation type="unfinished"/> </message> <message> - <location line="-138"/> + <location line="-140"/> <source>Up to date</source> <translation>Sinhronizēts</translation> </message> <message> - <location line="+32"/> + <location line="+31"/> <source>Catching up...</source> <translation>Sinhronizējos...</translation> </message> <message> - <location line="+110"/> + <location line="+113"/> <source>Confirm transaction fee</source> <translation>Apstiprināt transakcijas maksu</translation> </message> @@ -665,7 +665,7 @@ Adrese: %4 <translation>Maciņš ir <b>šifrēts</b> un pašlaik <b>slēgts</b></translation> </message> <message> - <location filename="../bitcoin.cpp" line="+104"/> + <location filename="../bitcoin.cpp" line="+111"/> <source>A fatal error occurred. Bitcoin can no longer continue safely and will quit.</source> <translation type="unfinished"/> </message> @@ -673,7 +673,7 @@ Adrese: %4 <context> <name>ClientModel</name> <message> - <location filename="../clientmodel.cpp" line="+98"/> + <location filename="../clientmodel.cpp" line="+104"/> <source>Network Alert</source> <translation>Tīkla brīdinājums</translation> </message> @@ -804,8 +804,8 @@ Adrese: %4 </message> <message> <location line="+6"/> - <source>Optional transaction fee per kB that helps make sure your transactions are processed quickly. Most transactions are 1 kB. Fee 0.01 recommended.</source> - <translation>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.</translation> + <source>Optional transaction fee per kB that helps make sure your transactions are processed quickly. Most transactions are 1 kB.</source> + <translation type="unfinished"/> </message> <message> <location line="+15"/> @@ -1054,7 +1054,7 @@ Adrese: %4 <translation>Kopējā apstiprināmo transakciju vērtība, vēl nav ieskaitīta kopējā bilancē</translation> </message> <message> - <location filename="../overviewpage.cpp" line="+115"/> + <location filename="../overviewpage.cpp" line="+116"/> <location line="+1"/> <source>out of sync</source> <translation>nav sinhronizēts</translation> @@ -1641,6 +1641,19 @@ Adrese: %4 </message> </context> <context> + <name>SplashScreen</name> + <message> + <location filename="../splashscreen.cpp" line="+22"/> + <source>The Bitcoin developers</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>[testnet]</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>TransactionDesc</name> <message> <location filename="../transactiondesc.cpp" line="+20"/> @@ -2115,9 +2128,27 @@ Adrese: %4 </message> </context> <context> + <name>WalletModel</name> + <message> + <location filename="../walletmodel.cpp" line="+193"/> + <source>Send Coins</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>WalletView</name> <message> - <location filename="../walletview.cpp" line="+247"/> + <location filename="../walletview.cpp" line="+42"/> + <source>&Export</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Export the data in the current tab to a file</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+193"/> <source>Backup Wallet</source> <translation>Izveidot maciņa rezerves kopiju</translation> </message> @@ -2150,37 +2181,37 @@ Adrese: %4 <context> <name>bitcoin-core</name> <message> - <location filename="../bitcoinstrings.cpp" line="+96"/> + <location filename="../bitcoinstrings.cpp" line="+94"/> <source>Bitcoin version</source> <translation>Bitcoin versija</translation> </message> <message> - <location line="+98"/> + <location line="+102"/> <source>Usage:</source> <translation>Lietojums:</translation> </message> <message> - <location line="-25"/> + <location line="-29"/> <source>Send command to -server or bitcoind</source> <translation>Nosūtīt komantu uz -server vai bitcoind</translation> </message> <message> - <location line="-22"/> + <location line="-23"/> <source>List commands</source> <translation>Komandu saraksts</translation> </message> <message> - <location line="-10"/> + <location line="-12"/> <source>Get help for a command</source> <translation>Palīdzība par komandu</translation> </message> <message> - <location line="+21"/> + <location line="+24"/> <source>Options:</source> <translation>Iespējas:</translation> </message> <message> - <location line="+23"/> + <location line="+24"/> <source>Specify configuration file (default: bitcoin.conf)</source> <translation>Norādiet konfigurācijas failu (pēc noklusēšanas: bitcoin.conf)</translation> </message> @@ -2190,27 +2221,17 @@ Adrese: %4 <translation>Norādiet pid failu (pēc noklusēšanas: bitcoind.pid)</translation> </message> <message> - <location line="-48"/> - <source>Generate coins</source> - <translation>Bitkoinu ģenerēšana</translation> - </message> - <message> - <location line="-27"/> - <source>Don't generate coins</source> - <translation>Neģenerēt bitkoinus</translation> - </message> - <message> - <location line="+74"/> + <location line="-1"/> <source>Specify data directory</source> <translation>Norādiet datu direktoriju</translation> </message> <message> - <location line="-8"/> + <location line="-9"/> <source>Set database cache size in megabytes (default: 25)</source> <translation>Uzstādiet datu bāzes bufera izmēru megabaitos (pēc noklusēšanas: 25)</translation> </message> <message> - <location line="-27"/> + <location line="-28"/> <source>Listen for connections on <port> (default: 8333 or testnet: 18333)</source> <translation>Gaidīt savienojumus portā <port> (pēc noklusēšanas: 8333 vai testnet: 18333)</translation> </message> @@ -2225,7 +2246,7 @@ Adrese: %4 <translation>Pievienoties mezglam, lai iegūtu citu mezglu adreses, un atvienoties</translation> </message> <message> - <location line="+80"/> + <location line="+82"/> <source>Specify your own public address</source> <translation>Norādiet savu publisko adresi</translation> </message> @@ -2235,22 +2256,22 @@ Adrese: %4 <translation>Slieksnis pārkāpējmezglu atvienošanai (pēc noklusēšanas: 100)</translation> </message> <message> - <location line="-132"/> + <location line="-134"/> <source>Number of seconds to keep misbehaving peers from reconnecting (default: 86400)</source> <translation>Sekundes, cik ilgi atturēt pārkāpējmezglus no atkārtotas pievienošanās (pēc noklusēšanas: 86400)</translation> </message> <message> - <location line="-32"/> + <location line="-29"/> <source>An error occurred while setting up the RPC port %u for listening on IPv4: %s</source> <translation type="unfinished"/> </message> <message> - <location line="+30"/> + <location line="+27"/> <source>Listen for JSON-RPC connections on <port> (default: 8332 or testnet: 18332)</source> <translation type="unfinished"/> </message> <message> - <location line="+36"/> + <location line="+37"/> <source>Accept command line and JSON-RPC commands</source> <translation>Pieņemt komandrindas un JSON-RPC komandas</translation> </message> @@ -2260,17 +2281,17 @@ Adrese: %4 <translation>Darbināt fonā kā servisu un pieņemt komandas</translation> </message> <message> - <location line="+33"/> + <location line="+37"/> <source>Use the test network</source> <translation>Izmantot testa tīklu</translation> </message> <message> - <location line="-108"/> + <location line="-112"/> <source>Accept connections from outside (default: 1 if no -proxy or -connect)</source> <translation type="unfinished"/> </message> <message> - <location line="-82"/> + <location line="-80"/> <source>%s, you must set a rpcpassword in the configuration file: %s It is recommended you use the following random password: @@ -2301,11 +2322,6 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. </message> <message> <location line="+3"/> - <source>Error initializing database environment %s! To recover, BACKUP THAT DIRECTORY, then remove everything from it except for wallet.dat.</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+3"/> <source>Error: The transaction was rejected! This might happen if some of the coins in your wallet were already spent, such as if you used a copy of wallet.dat and coins were spent in the copy but not marked as spent here.</source> <translation type="unfinished"/> </message> @@ -2330,12 +2346,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+3"/> - <source>Set the number of script verification threads (1-16, 0=auto, default: 0)</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+2"/> + <location line="+6"/> <source>This is a pre-release test build - use at your own risk - do not use for mining or merchant applications</source> <translation type="unfinished"/> </message> @@ -2375,7 +2386,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+6"/> + <location line="+5"/> <source>Connect only to the specified node(s)</source> <translation type="unfinished"/> </message> @@ -2395,7 +2406,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+3"/> + <location line="+2"/> <source>Error initializing block database</source> <translation type="unfinished"/> </message> @@ -2421,11 +2432,6 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. </message> <message> <location line="+1"/> - <source>Error: Transaction creation failed!</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+1"/> <source>Error: Wallet locked, unable to create transaction!</source> <translation type="unfinished"/> </message> @@ -2495,7 +2501,12 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+3"/> + <location line="+1"/> + <source>Generate coins (default: 0)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+2"/> <source>How many blocks to check at startup (default: 288, 0 = all)</source> <translation type="unfinished"/> </message> @@ -2505,7 +2516,12 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+24"/> + <location line="+19"/> + <source>Not enough file descriptors available.</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+8"/> <source>Rebuild block chain index from current blk000??.dat files</source> <translation type="unfinished"/> </message> @@ -2515,7 +2531,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+22"/> + <location line="+26"/> <source>Verifying blocks...</source> <translation type="unfinished"/> </message> @@ -2525,12 +2541,17 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="-62"/> + <location line="-69"/> <source>Imports blocks from external blk000??.dat file</source> <translation type="unfinished"/> </message> <message> - <location line="+1"/> + <location line="-76"/> + <source>Set the number of script verification threads (up to 16, 0 = auto, <0 = leave that many cores free, default: 0)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+77"/> <source>Information</source> <translation type="unfinished"/> </message> @@ -2540,6 +2561,16 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> + <location line="+1"/> + <source>Invalid amount for -minrelaytxfee=<amount>: '%s'</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Invalid amount for -mintxfee=<amount>: '%s'</source> + <translation type="unfinished"/> + </message> + <message> <location line="+8"/> <source>Maintain a full transaction index (default: 0)</source> <translation type="unfinished"/> @@ -2555,7 +2586,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+1"/> + <location line="+2"/> <source>Only accept block chain matching built-in checkpoints (default: 1)</source> <translation type="unfinished"/> </message> @@ -2615,6 +2646,11 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> + <location line="+1"/> + <source>Signing transaction failed</source> + <translation type="unfinished"/> + </message> + <message> <location line="+2"/> <source>Specify connection timeout in milliseconds (default: 5000)</source> <translation type="unfinished"/> @@ -2625,7 +2661,22 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+10"/> + <location line="+4"/> + <source>Transaction amount too small</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Transaction amounts must be positive</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Transaction too large</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+7"/> <source>Use UPnP to map the listening port (default: 0)</source> <translation type="unfinished"/> </message> @@ -2665,7 +2716,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="-46"/> + <location line="-50"/> <source>Password for JSON-RPC connections</source> <translation>JSON-RPC savienojumu parole</translation> </message> @@ -2680,17 +2731,17 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Nosūtīt komandas mezglam, kas darbojas adresē <ip> (pēc noklusēšanas: 127.0.0.1)</translation> </message> <message> - <location line="-119"/> + <location line="-120"/> <source>Execute command when the best block changes (%s in cmd is replaced by block hash)</source> <translation>Izpildīt komandu, kad labāk atbilstošais bloks izmainās (%s cmd aizvieto ar bloka hešu)</translation> </message> <message> - <location line="+142"/> + <location line="+147"/> <source>Upgrade wallet to latest format</source> <translation>Atjaunot maciņa formātu uz jaunāko</translation> </message> <message> - <location line="-17"/> + <location line="-21"/> <source>Set key pool size to <n> (default: 100)</source> <translation>Uzstādīt atslēgu bufera izmēru uz <n> (pēc noklusēšanas: 100)</translation> </message> @@ -2700,12 +2751,12 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Atkārtoti skanēt bloku virkni, meklējot trūkstošās maciņa transakcijas</translation> </message> <message> - <location line="+31"/> + <location line="+35"/> <source>Use OpenSSL (https) for JSON-RPC connections</source> <translation>JSON-RPC savienojumiem izmantot OpenSSL (https)</translation> </message> <message> - <location line="-22"/> + <location line="-26"/> <source>Server certificate file (default: server.cert)</source> <translation>Servera sertifikāta fails (pēc noklusēšanas: server.cert)</translation> </message> @@ -2715,37 +2766,37 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Servera privātā atslēga (pēc noklusēšanas: server.pem)</translation> </message> <message> - <location line="-153"/> + <location line="-151"/> <source>Acceptable ciphers (default: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH)</source> <translation>Pieņemamie šifri (pēc noklusēšanas: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH)</translation> </message> <message> - <location line="+166"/> + <location line="+165"/> <source>This help message</source> <translation>Šis palīdzības paziņojums</translation> </message> <message> - <location line="+3"/> + <location line="+6"/> <source>Unable to bind to %s on this computer (bind returned error %d, %s)</source> <translation>Nevar pievienoties pie %s šajā datorā (pievienošanās atgrieza kļūdu %d, %s)</translation> </message> <message> - <location line="-86"/> + <location line="-91"/> <source>Connect through socks proxy</source> <translation>Savienoties caurs socks proxy</translation> </message> <message> - <location line="-11"/> + <location line="-10"/> <source>Allow DNS lookups for -addnode, -seednode and -connect</source> <translation>Atļaut DNS uzmeklēšanu priekš -addnode, -seednode un -connect</translation> </message> <message> - <location line="+56"/> + <location line="+55"/> <source>Loading addresses...</source> <translation>Ielādē adreses...</translation> </message> <message> - <location line="-34"/> + <location line="-35"/> <source>Error loading wallet.dat: Wallet corrupted</source> <translation>Nevar ielādēt wallet.dat: maciņš bojāts</translation> </message> @@ -2755,22 +2806,22 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Nevar ielādēt wallet.dat: maciņa atvēršanai nepieciešama jaunāka Bitcoin versija</translation> </message> <message> - <location line="+87"/> + <location line="+93"/> <source>Wallet needed to be rewritten: restart Bitcoin to complete</source> <translation>Bija nepieciešams pārstartēt maciņu: pabeigšanai pārstartējiet Bitcoin</translation> </message> <message> - <location line="-89"/> + <location line="-95"/> <source>Error loading wallet.dat</source> <translation>Kļūda ielādējot wallet.dat</translation> </message> <message> - <location line="+29"/> + <location line="+28"/> <source>Invalid -proxy address: '%s'</source> <translation>Nederīga -proxy adrese: '%s'</translation> </message> <message> - <location line="+49"/> + <location line="+56"/> <source>Unknown network specified in -onlynet: '%s'</source> <translation>-onlynet komandā norādīts nepazīstams tīkls: '%s'</translation> </message> @@ -2780,7 +2831,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Pieprasīta nezināma -socks proxy versija: %i</translation> </message> <message> - <location line="-91"/> + <location line="-96"/> <source>Cannot resolve -bind address: '%s'</source> <translation>Nevar uzmeklēt -bind adresi: '%s'</translation> </message> @@ -2800,17 +2851,17 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Nederīgs daudzums</translation> </message> <message> - <location line="-4"/> + <location line="-6"/> <source>Insufficient funds</source> <translation>Nepietiek bitkoinu</translation> </message> <message> - <location line="+8"/> + <location line="+10"/> <source>Loading block index...</source> <translation>Ielādē bloku indeksu...</translation> </message> <message> - <location line="-58"/> + <location line="-57"/> <source>Add a node to connect to and attempt to keep the connection open</source> <translation>Pievienot mezglu, kam pievienoties un turēt savienojumu atvērtu</translation> </message> @@ -2820,52 +2871,47 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Nevar pievienoties %s uz šī datora. Bitcoin droši vien jau darbojas.</translation> </message> <message> - <location line="+67"/> + <location line="+64"/> <source>Fee per KB to add to transactions you send</source> <translation>Maksa par KB, ko pievienot nosūtāmajām transakcijām</translation> </message> <message> - <location line="+17"/> + <location line="+19"/> <source>Loading wallet...</source> <translation>Ielādē maciņu...</translation> </message> <message> - <location line="-53"/> + <location line="-52"/> <source>Cannot downgrade wallet</source> <translation>Nevar maciņa formātu padarīt vecāku</translation> </message> <message> - <location line="+1"/> - <source>Cannot initialize keypool</source> - <translation>Nevar inicializēt atslēgu buferi</translation> - </message> - <message> <location line="+3"/> <source>Cannot write default address</source> <translation>Nevar ierakstīt adresi pēc noklusēšanas</translation> </message> <message> - <location line="+63"/> + <location line="+64"/> <source>Rescanning...</source> <translation>Skanēju no jauna...</translation> </message> <message> - <location line="-55"/> + <location line="-57"/> <source>Done loading</source> <translation>Ielāde pabeigta</translation> </message> <message> - <location line="+79"/> + <location line="+82"/> <source>To use the %s option</source> <translation>Izmantot opciju %s</translation> </message> <message> - <location line="-71"/> + <location line="-74"/> <source>Error</source> <translation>Kļūda</translation> </message> <message> - <location line="-33"/> + <location line="-31"/> <source>You must set rpcpassword=<password> in the configuration file: %s If the file does not exist, create it with owner-readable-only file permissions.</source> diff --git a/src/qt/locale/bitcoin_nb.ts b/src/qt/locale/bitcoin_nb.ts index 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.</translation> </message> <message> - <location filename="../aboutdialog.cpp" line="+17"/> + <location filename="../aboutdialog.cpp" line="+14"/> <source>Copyright</source> <translation type="unfinished"/> </message> <message> <location line="+0"/> - <source>2009-%1 The Bitcoin developers</source> + <source>The Bitcoin developers</source> <translation type="unfinished"/> </message> </context> @@ -66,7 +66,7 @@ Dette produktet inneholder programvare utviklet av OpenSSL prosjektet for bruk i <translation>&Ny Adresse</translation> </message> <message> - <location filename="../addressbookpage.cpp" line="+59"/> + <location filename="../addressbookpage.cpp" line="+63"/> <source>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.</source> <translation>Dette er dine Bitcoin-adresser for mottak av betalinger. Du kan gi forskjellige adresser til alle som skal betale deg for å holde bedre oversikt.</translation> </message> @@ -96,7 +96,17 @@ Dette produktet inneholder programvare utviklet av OpenSSL prosjektet for bruk i <translation>Slett den valgte adressen fra listen.</translation> </message> <message> - <location line="-14"/> + <location line="+27"/> + <source>Export the data in the current tab to a file</source> + <translation>Eksporter data fra nåværende fane til fil</translation> + </message> + <message> + <location line="+3"/> + <source>&Export</source> + <translation type="unfinished"/> + </message> + <message> + <location line="-44"/> <source>Verify a message to ensure it was signed with a specified Bitcoin address</source> <translation>Verifiser en melding for å være sikker på at den ble signert av en angitt Bitcoin-adresse</translation> </message> @@ -318,12 +328,12 @@ Dette produktet inneholder programvare utviklet av OpenSSL prosjektet for bruk i <translation>Signer &melding...</translation> </message> <message> - <location line="+299"/> + <location line="+280"/> <source>Synchronizing with network...</source> <translation>Synkroniserer med nettverk...</translation> </message> <message> - <location line="-368"/> + <location line="-349"/> <source>&Overview</source> <translation>&Oversikt</translation> </message> @@ -398,7 +408,7 @@ Dette produktet inneholder programvare utviklet av OpenSSL prosjektet for bruk i <translation>&Endre Adgangsfrase...</translation> </message> <message> - <location line="+304"/> + <location line="+285"/> <source>Importing blocks from disk...</source> <translation>Importere blokker...</translation> </message> @@ -408,12 +418,7 @@ Dette produktet inneholder programvare utviklet av OpenSSL prosjektet for bruk i <translation>Re-indekserer blokker på disk...</translation> </message> <message> - <location line="-300"/> - <source>&Export...</source> - <translation>&Eksporter...</translation> - </message> - <message> - <location line="-66"/> + <location line="-347"/> <source>Send coins to a Bitcoin address</source> <translation>Send til en Bitcoin-adresse</translation> </message> @@ -423,12 +428,7 @@ Dette produktet inneholder programvare utviklet av OpenSSL prosjektet for bruk i <translation>Endre oppsett for Bitcoin</translation> </message> <message> - <location line="+18"/> - <source>Export the data in the current tab to a file</source> - <translation>Eksporter data fra nåværende fane til fil</translation> - </message> - <message> - <location line="-9"/> + <location line="+9"/> <source>Backup wallet to another location</source> <translation>Sikkerhetskopiér lommebok til annet sted</translation> </message> @@ -438,7 +438,7 @@ Dette produktet inneholder programvare utviklet av OpenSSL prosjektet for bruk i <translation>Endre adgangsfrasen brukt for kryptering av lommebok</translation> </message> <message> - <location line="+9"/> + <location line="+6"/> <source>&Debug window</source> <translation>&Feilsøkingsvindu</translation> </message> @@ -448,23 +448,23 @@ Dette produktet inneholder programvare utviklet av OpenSSL prosjektet for bruk i <translation>Åpne konsoll for feilsøk og diagnostikk</translation> </message> <message> - <location line="-7"/> + <location line="-4"/> <source>&Verify message...</source> <translation>&Verifiser melding...</translation> </message> <message> - <location line="-163"/> - <location line="+541"/> + <location line="-165"/> + <location line="+530"/> <source>Bitcoin</source> <translation>Bitcoin</translation> </message> <message> - <location line="-541"/> + <location line="-530"/> <source>Wallet</source> <translation>Lommebok</translation> </message> <message> - <location line="+99"/> + <location line="+101"/> <source>&Send</source> <translation>&Send</translation> </message> @@ -509,12 +509,12 @@ Dette produktet inneholder programvare utviklet av OpenSSL prosjektet for bruk i <translation>Bekreft meldinger for å være sikker på at de ble signert av en angitt Bitcoin-adresse</translation> </message> <message> - <location line="+31"/> + <location line="+28"/> <source>&File</source> <translation>&Fil</translation> </message> <message> - <location line="+8"/> + <location line="+7"/> <source>&Settings</source> <translation>&Innstillinger</translation> </message> @@ -529,12 +529,7 @@ Dette produktet inneholder programvare utviklet av OpenSSL prosjektet for bruk i <translation>Verktøylinje for faner</translation> </message> <message> - <location line="+8"/> - <source>Actions toolbar</source> - <translation>Verktøylinje for handlinger</translation> - </message> - <message> - <location line="+13"/> + <location line="+17"/> <location line="+10"/> <source>[testnet]</source> <translation>[testnett]</translation> @@ -545,12 +540,17 @@ Dette produktet inneholder programvare utviklet av OpenSSL prosjektet for bruk i <translation>Bitcoinklient</translation> </message> <message numerus="yes"> - <location line="+140"/> + <location line="+141"/> <source>%n active connection(s) to Bitcoin network</source> <translation><numerusform>%n aktiv forbindelse til Bitcoin-nettverket</numerusform><numerusform>%n aktive forbindelser til Bitcoin-nettverket</numerusform></translation> </message> <message> - <location line="+39"/> + <location line="+22"/> + <source>No block source available...</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+12"/> <source>Processed %1 of %2 (estimated) blocks of transaction history.</source> <translation type="unfinished"/> </message> @@ -575,7 +575,7 @@ Dette produktet inneholder programvare utviklet av OpenSSL prosjektet for bruk i <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation> </message> <message> - <location line="+5"/> + <location line="+4"/> <source>%1 behind</source> <translation type="unfinished"/> </message> @@ -590,7 +590,7 @@ Dette produktet inneholder programvare utviklet av OpenSSL prosjektet for bruk i <translation>Transaksjoner etter dette vil ikke være synlige enda.</translation> </message> <message> - <location line="+21"/> + <location line="+22"/> <source>Error</source> <translation type="unfinished"/> </message> @@ -605,22 +605,22 @@ Dette produktet inneholder programvare utviklet av OpenSSL prosjektet for bruk i <translation type="unfinished"/> </message> <message> - <location line="+68"/> + <location line="+70"/> <source>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?</source> <translation>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?</translation> </message> <message> - <location line="-138"/> + <location line="-140"/> <source>Up to date</source> <translation>Ajour</translation> </message> <message> - <location line="+32"/> + <location line="+31"/> <source>Catching up...</source> <translation>Kommer ajour...</translation> </message> <message> - <location line="+110"/> + <location line="+113"/> <source>Confirm transaction fee</source> <translation>Bekreft transaksjonsgebyr</translation> </message> @@ -670,7 +670,7 @@ Adresse: %4 <translation>Lommeboken er <b>kryptert</b> og for tiden <b>låst</b></translation> </message> <message> - <location filename="../bitcoin.cpp" line="+104"/> + <location filename="../bitcoin.cpp" line="+111"/> <source>A fatal error occurred. Bitcoin can no longer continue safely and will quit.</source> <translation>En fatal feil har inntruffet. Det er ikke trygt å fortsette og Bitcoin må derfor avslutte.</translation> </message> @@ -678,7 +678,7 @@ Adresse: %4 <context> <name>ClientModel</name> <message> - <location filename="../clientmodel.cpp" line="+98"/> + <location filename="../clientmodel.cpp" line="+104"/> <source>Network Alert</source> <translation>Nettverksvarsel</translation> </message> @@ -810,8 +810,8 @@ Adresse: %4 </message> <message> <location line="+6"/> - <source>Optional transaction fee per kB that helps make sure your transactions are processed quickly. Most transactions are 1 kB. Fee 0.01 recommended.</source> - <translation>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.</translation> + <source>Optional transaction fee per kB that helps make sure your transactions are processed quickly. Most transactions are 1 kB.</source> + <translation type="unfinished"/> </message> <message> <location line="+15"/> @@ -1060,7 +1060,7 @@ Adresse: %4 <translation>Totalt antall ubekreftede transaksjoner som ikke telles med i saldo enda</translation> </message> <message> - <location filename="../overviewpage.cpp" line="+115"/> + <location filename="../overviewpage.cpp" line="+116"/> <location line="+1"/> <source>out of sync</source> <translation>ute av synk</translation> @@ -1647,6 +1647,19 @@ Adresse: %4 </message> </context> <context> + <name>SplashScreen</name> + <message> + <location filename="../splashscreen.cpp" line="+22"/> + <source>The Bitcoin developers</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>[testnet]</source> + <translation>[testnett]</translation> + </message> +</context> +<context> <name>TransactionDesc</name> <message> <location filename="../transactiondesc.cpp" line="+20"/> @@ -2121,9 +2134,27 @@ Adresse: %4 </message> </context> <context> + <name>WalletModel</name> + <message> + <location filename="../walletmodel.cpp" line="+193"/> + <source>Send Coins</source> + <translation>Send Bitcoins</translation> + </message> +</context> +<context> <name>WalletView</name> <message> - <location filename="../walletview.cpp" line="+247"/> + <location filename="../walletview.cpp" line="+42"/> + <source>&Export</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Export the data in the current tab to a file</source> + <translation>Eksporter data fra nåværende fane til fil</translation> + </message> + <message> + <location line="+193"/> <source>Backup Wallet</source> <translation>Sikkerhetskopier lommebok</translation> </message> @@ -2156,37 +2187,37 @@ Adresse: %4 <context> <name>bitcoin-core</name> <message> - <location filename="../bitcoinstrings.cpp" line="+96"/> + <location filename="../bitcoinstrings.cpp" line="+94"/> <source>Bitcoin version</source> <translation>Bitcoin versjon</translation> </message> <message> - <location line="+98"/> + <location line="+102"/> <source>Usage:</source> <translation>Bruk:</translation> </message> <message> - <location line="-25"/> + <location line="-29"/> <source>Send command to -server or bitcoind</source> <translation>Send kommando til -server eller bitcoind</translation> </message> <message> - <location line="-22"/> + <location line="-23"/> <source>List commands</source> <translation>List opp kommandoer</translation> </message> <message> - <location line="-10"/> + <location line="-12"/> <source>Get help for a command</source> <translation>Vis hjelpetekst for en kommando</translation> </message> <message> - <location line="+21"/> + <location line="+24"/> <source>Options:</source> <translation>Innstillinger:</translation> </message> <message> - <location line="+23"/> + <location line="+24"/> <source>Specify configuration file (default: bitcoin.conf)</source> <translation>Angi konfigurasjonsfil (standardverdi: bitcoin.conf)</translation> </message> @@ -2196,27 +2227,17 @@ Adresse: %4 <translation>Angi pid-fil (standardverdi: bitcoind.pid)</translation> </message> <message> - <location line="-48"/> - <source>Generate coins</source> - <translation>Generér bitcoins</translation> - </message> - <message> - <location line="-27"/> - <source>Don't generate coins</source> - <translation>Ikke generér bitcoins</translation> - </message> - <message> - <location line="+74"/> + <location line="-1"/> <source>Specify data directory</source> <translation>Angi mappe for datafiler</translation> </message> <message> - <location line="-8"/> + <location line="-9"/> <source>Set database cache size in megabytes (default: 25)</source> <translation>Sett størrelse på mellomlager for database i megabytes (standardverdi: 25)</translation> </message> <message> - <location line="-27"/> + <location line="-28"/> <source>Listen for connections on <port> (default: 8333 or testnet: 18333)</source> <translation>Lytt etter tilkoblinger på <port> (standardverdi: 8333 eller testnet: 18333)</translation> </message> @@ -2231,7 +2252,7 @@ Adresse: %4 <translation>Koble til node for å hente adresser til andre noder, koble så fra igjen</translation> </message> <message> - <location line="+80"/> + <location line="+82"/> <source>Specify your own public address</source> <translation>Angi din egen offentlige adresse</translation> </message> @@ -2241,22 +2262,22 @@ Adresse: %4 <translation>Grenseverdi for å koble fra noder med dårlig oppførsel (standardverdi: 100)</translation> </message> <message> - <location line="-132"/> + <location line="-134"/> <source>Number of seconds to keep misbehaving peers from reconnecting (default: 86400)</source> <translation>Antall sekunder noder med dårlig oppførsel hindres fra å koble til på nytt (standardverdi: 86400)</translation> </message> <message> - <location line="-32"/> + <location line="-29"/> <source>An error occurred while setting up the RPC port %u for listening on IPv4: %s</source> <translation>En feil oppstod ved opprettelse av RPC port %u for lytting: %s</translation> </message> <message> - <location line="+30"/> + <location line="+27"/> <source>Listen for JSON-RPC connections on <port> (default: 8332 or testnet: 18332)</source> <translation>Lytt etter JSON-RPC tilkoblinger på <port> (standardverdi: 8332 or testnet: 18332)</translation> </message> <message> - <location line="+36"/> + <location line="+37"/> <source>Accept command line and JSON-RPC commands</source> <translation>Ta imot kommandolinje- og JSON-RPC-kommandoer</translation> </message> @@ -2266,17 +2287,17 @@ Adresse: %4 <translation>Kjør i bakgrunnen som daemon og ta imot kommandoer</translation> </message> <message> - <location line="+33"/> + <location line="+37"/> <source>Use the test network</source> <translation>Bruk testnettverket</translation> </message> <message> - <location line="-108"/> + <location line="-112"/> <source>Accept connections from outside (default: 1 if no -proxy or -connect)</source> <translation>Ta imot tilkoblinger fra utsiden (standardverdi: 1 hvis uten -proxy eller -connect)</translation> </message> <message> - <location line="-82"/> + <location line="-80"/> <source>%s, you must set a rpcpassword in the configuration file: %s It is recommended you use the following random password: @@ -2316,11 +2337,6 @@ For eksempel: varselmelding=echo %%s | mail -s "Bitcoin varsel" admin@ </message> <message> <location line="+3"/> - <source>Error initializing database environment %s! To recover, BACKUP THAT DIRECTORY, then remove everything from it except for wallet.dat.</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+3"/> <source>Error: The transaction was rejected! This might happen if some of the coins in your wallet were already spent, such as if you used a copy of wallet.dat and coins were spent in the copy but not marked as spent here.</source> <translation type="unfinished"/> </message> @@ -2345,12 +2361,7 @@ For eksempel: varselmelding=echo %%s | mail -s "Bitcoin varsel" admin@ <translation>Sett maks størrelse for transaksjoner med høy prioritet / lavt gebyr, i bytes (standardverdi: 27000)</translation> </message> <message> - <location line="+3"/> - <source>Set the number of script verification threads (1-16, 0=auto, default: 0)</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+2"/> + <location line="+6"/> <source>This is a pre-release test build - use at your own risk - do not use for mining or merchant applications</source> <translation type="unfinished"/> </message> @@ -2390,7 +2401,7 @@ For eksempel: varselmelding=echo %%s | mail -s "Bitcoin varsel" admin@ <translation>Valg for opprettelse av blokker:</translation> </message> <message> - <location line="+6"/> + <location line="+5"/> <source>Connect only to the specified node(s)</source> <translation>Koble kun til angitt(e) node(r)</translation> </message> @@ -2410,7 +2421,7 @@ For eksempel: varselmelding=echo %%s | mail -s "Bitcoin varsel" admin@ <translation>Ønsker du å gjenopprette blokkdatabasen nå?</translation> </message> <message> - <location line="+3"/> + <location line="+2"/> <source>Error initializing block database</source> <translation type="unfinished"/> </message> @@ -2436,11 +2447,6 @@ For eksempel: varselmelding=echo %%s | mail -s "Bitcoin varsel" admin@ </message> <message> <location line="+1"/> - <source>Error: Transaction creation failed!</source> - <translation>Feil: Opprettelse av transaksjon feilet </translation> - </message> - <message> - <location line="+1"/> <source>Error: Wallet locked, unable to create transaction!</source> <translation type="unfinished"/> </message> @@ -2510,7 +2516,12 @@ For eksempel: varselmelding=echo %%s | mail -s "Bitcoin varsel" admin@ <translation>Finn andre noder gjennom DNS-oppslag (standardverdi: 1 med mindre -connect er oppgit)</translation> </message> <message> - <location line="+3"/> + <location line="+1"/> + <source>Generate coins (default: 0)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+2"/> <source>How many blocks to check at startup (default: 288, 0 = all)</source> <translation type="unfinished"/> </message> @@ -2520,7 +2531,12 @@ For eksempel: varselmelding=echo %%s | mail -s "Bitcoin varsel" admin@ <translation type="unfinished"/> </message> <message> - <location line="+24"/> + <location line="+19"/> + <source>Not enough file descriptors available.</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+8"/> <source>Rebuild block chain index from current blk000??.dat files</source> <translation>Gjenopprett blokkjedeindex fra blk000??.dat filer</translation> </message> @@ -2530,7 +2546,7 @@ For eksempel: varselmelding=echo %%s | mail -s "Bitcoin varsel" admin@ <translation type="unfinished"/> </message> <message> - <location line="+22"/> + <location line="+26"/> <source>Verifying blocks...</source> <translation>Verifiserer blokker...</translation> </message> @@ -2540,12 +2556,17 @@ For eksempel: varselmelding=echo %%s | mail -s "Bitcoin varsel" admin@ <translation>Verifiserer lommebok...</translation> </message> <message> - <location line="-62"/> + <location line="-69"/> <source>Imports blocks from external blk000??.dat file</source> <translation type="unfinished"/> </message> <message> - <location line="+1"/> + <location line="-76"/> + <source>Set the number of script verification threads (up to 16, 0 = auto, <0 = leave that many cores free, default: 0)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+77"/> <source>Information</source> <translation type="unfinished"/> </message> @@ -2555,6 +2576,16 @@ For eksempel: varselmelding=echo %%s | mail -s "Bitcoin varsel" admin@ <translation>Ugyldig -tor adresse: '%s'</translation> </message> <message> + <location line="+1"/> + <source>Invalid amount for -minrelaytxfee=<amount>: '%s'</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Invalid amount for -mintxfee=<amount>: '%s'</source> + <translation type="unfinished"/> + </message> + <message> <location line="+8"/> <source>Maintain a full transaction index (default: 0)</source> <translation type="unfinished"/> @@ -2570,7 +2601,7 @@ For eksempel: varselmelding=echo %%s | mail -s "Bitcoin varsel" admin@ <translation>Maks sendebuffer per forbindelse, <n>*1000 bytes (standardverdi: 1000)</translation> </message> <message> - <location line="+1"/> + <location line="+2"/> <source>Only accept block chain matching built-in checkpoints (default: 1)</source> <translation type="unfinished"/> </message> @@ -2630,6 +2661,11 @@ For eksempel: varselmelding=echo %%s | mail -s "Bitcoin varsel" admin@ <translation>Krymp debug.log filen når klienten starter (standardverdi: 1 hvis uten -debug)</translation> </message> <message> + <location line="+1"/> + <source>Signing transaction failed</source> + <translation type="unfinished"/> + </message> + <message> <location line="+2"/> <source>Specify connection timeout in milliseconds (default: 5000)</source> <translation>Angi tidsavbrudd for forbindelse i millisekunder (standardverdi: 5000)</translation> @@ -2640,7 +2676,22 @@ For eksempel: varselmelding=echo %%s | mail -s "Bitcoin varsel" admin@ <translation type="unfinished"/> </message> <message> - <location line="+10"/> + <location line="+4"/> + <source>Transaction amount too small</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Transaction amounts must be positive</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Transaction too large</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+7"/> <source>Use UPnP to map the listening port (default: 0)</source> <translation>Bruk UPnP for lytteport (standardverdi: 0)</translation> </message> @@ -2680,7 +2731,7 @@ For eksempel: varselmelding=echo %%s | mail -s "Bitcoin varsel" admin@ <translation type="unfinished"/> </message> <message> - <location line="-46"/> + <location line="-50"/> <source>Password for JSON-RPC connections</source> <translation>Passord for JSON-RPC forbindelser</translation> </message> @@ -2695,17 +2746,17 @@ For eksempel: varselmelding=echo %%s | mail -s "Bitcoin varsel" admin@ <translation>Send kommandoer til node på <ip> (standardverdi: 127.0.0.1)</translation> </message> <message> - <location line="-119"/> + <location line="-120"/> <source>Execute command when the best block changes (%s in cmd is replaced by block hash)</source> <translation>Eksekvér kommando når beste blokk endrer seg (%s i kommandoen erstattes med blokkens hash)</translation> </message> <message> - <location line="+142"/> + <location line="+147"/> <source>Upgrade wallet to latest format</source> <translation>Oppgradér lommebok til nyeste format</translation> </message> <message> - <location line="-17"/> + <location line="-21"/> <source>Set key pool size to <n> (default: 100)</source> <translation>Angi størrelse på nøkkel-lager til <n> (standardverdi: 100)</translation> </message> @@ -2715,12 +2766,12 @@ For eksempel: varselmelding=echo %%s | mail -s "Bitcoin varsel" admin@ <translation>Se gjennom blokk-kjeden etter manglende lommeboktransaksjoner</translation> </message> <message> - <location line="+31"/> + <location line="+35"/> <source>Use OpenSSL (https) for JSON-RPC connections</source> <translation>Bruk OpenSSL (https) for JSON-RPC forbindelser</translation> </message> <message> - <location line="-22"/> + <location line="-26"/> <source>Server certificate file (default: server.cert)</source> <translation>Servers sertifikat (standardverdi: server.cert)</translation> </message> @@ -2730,37 +2781,37 @@ For eksempel: varselmelding=echo %%s | mail -s "Bitcoin varsel" admin@ <translation>Servers private nøkkel (standardverdi: server.pem)</translation> </message> <message> - <location line="-153"/> + <location line="-151"/> <source>Acceptable ciphers (default: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH)</source> <translation>Akseptable krypteringsmetoder (standardverdi: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH)</translation> </message> <message> - <location line="+166"/> + <location line="+165"/> <source>This help message</source> <translation>Denne hjelpemeldingen</translation> </message> <message> - <location line="+3"/> + <location line="+6"/> <source>Unable to bind to %s on this computer (bind returned error %d, %s)</source> <translation>Kan ikke binde til %s på denne datamaskinen (bind returnerte feil %d, %s)</translation> </message> <message> - <location line="-86"/> + <location line="-91"/> <source>Connect through socks proxy</source> <translation>Koble til gjennom socks proxy</translation> </message> <message> - <location line="-11"/> + <location line="-10"/> <source>Allow DNS lookups for -addnode, -seednode and -connect</source> <translation>Tillat DNS oppslag for -addnode, -seednode og -connect</translation> </message> <message> - <location line="+56"/> + <location line="+55"/> <source>Loading addresses...</source> <translation>Laster adresser...</translation> </message> <message> - <location line="-34"/> + <location line="-35"/> <source>Error loading wallet.dat: Wallet corrupted</source> <translation>Feil ved lasting av wallet.dat: Lommeboken er skadet</translation> </message> @@ -2770,22 +2821,22 @@ For eksempel: varselmelding=echo %%s | mail -s "Bitcoin varsel" admin@ <translation>Feil ved lasting av wallet.dat: Lommeboken krever en nyere versjon av Bitcoin</translation> </message> <message> - <location line="+87"/> + <location line="+93"/> <source>Wallet needed to be rewritten: restart Bitcoin to complete</source> <translation>Lommeboken måtte skrives om: start Bitcoin på nytt for å fullføre</translation> </message> <message> - <location line="-89"/> + <location line="-95"/> <source>Error loading wallet.dat</source> <translation>Feil ved lasting av wallet.dat</translation> </message> <message> - <location line="+29"/> + <location line="+28"/> <source>Invalid -proxy address: '%s'</source> <translation>Ugyldig -proxy adresse: '%s'</translation> </message> <message> - <location line="+49"/> + <location line="+56"/> <source>Unknown network specified in -onlynet: '%s'</source> <translation>Ukjent nettverk angitt i -onlynet '%s'</translation> </message> @@ -2795,7 +2846,7 @@ For eksempel: varselmelding=echo %%s | mail -s "Bitcoin varsel" admin@ <translation>Ukjent -socks proxy versjon angitt: %i</translation> </message> <message> - <location line="-91"/> + <location line="-96"/> <source>Cannot resolve -bind address: '%s'</source> <translation>Kunne ikke slå opp -bind adresse: '%s'</translation> </message> @@ -2815,17 +2866,17 @@ For eksempel: varselmelding=echo %%s | mail -s "Bitcoin varsel" admin@ <translation>Ugyldig beløp</translation> </message> <message> - <location line="-4"/> + <location line="-6"/> <source>Insufficient funds</source> <translation>Utilstrekkelige midler</translation> </message> <message> - <location line="+8"/> + <location line="+10"/> <source>Loading block index...</source> <translation>Laster blokkindeks...</translation> </message> <message> - <location line="-58"/> + <location line="-57"/> <source>Add a node to connect to and attempt to keep the connection open</source> <translation>Legg til node for tilkobling og hold forbindelsen åpen</translation> </message> @@ -2835,52 +2886,47 @@ For eksempel: varselmelding=echo %%s | mail -s "Bitcoin varsel" admin@ <translation>Kan ikke binde til %s på denne datamaskinen. Sannsynligvis kjører Bitcoin allerede.</translation> </message> <message> - <location line="+67"/> + <location line="+64"/> <source>Fee per KB to add to transactions you send</source> <translation>Gebyr per KB for transaksjoner du sender</translation> </message> <message> - <location line="+17"/> + <location line="+19"/> <source>Loading wallet...</source> <translation>Laster lommebok...</translation> </message> <message> - <location line="-53"/> + <location line="-52"/> <source>Cannot downgrade wallet</source> <translation>Kan ikke nedgradere lommebok</translation> </message> <message> - <location line="+1"/> - <source>Cannot initialize keypool</source> - <translation>Kan ikke initialisere nøkkellager</translation> - </message> - <message> <location line="+3"/> <source>Cannot write default address</source> <translation>Kan ikke skrive standardadresse</translation> </message> <message> - <location line="+63"/> + <location line="+64"/> <source>Rescanning...</source> <translation>Leser gjennom...</translation> </message> <message> - <location line="-55"/> + <location line="-57"/> <source>Done loading</source> <translation>Ferdig med lasting</translation> </message> <message> - <location line="+79"/> + <location line="+82"/> <source>To use the %s option</source> <translation>For å bruke %s opsjonen</translation> </message> <message> - <location line="-71"/> + <location line="-74"/> <source>Error</source> <translation>Feil</translation> </message> <message> - <location line="-33"/> + <location line="-31"/> <source>You must set rpcpassword=<password> in the configuration file: %s If the file does not exist, create it with owner-readable-only file permissions.</source> diff --git a/src/qt/locale/bitcoin_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.</translation> </message> <message> - <location filename="../aboutdialog.cpp" line="+17"/> + <location filename="../aboutdialog.cpp" line="+14"/> <source>Copyright</source> <translation>Auteursrecht</translation> </message> <message> <location line="+0"/> - <source>2009-%1 The Bitcoin developers</source> - <translation>2009-%1 De Bitcoinontwikkelaars</translation> + <source>The Bitcoin developers</source> + <translation>De Bitcoin-ontwikkelaars</translation> </message> </context> <context> @@ -66,7 +66,7 @@ Dit product bevat software ontwikkeld door het OpenSSL Project voor gebruik in d <translation>&Nieuw Adres</translation> </message> <message> - <location filename="../addressbookpage.cpp" line="+59"/> + <location filename="../addressbookpage.cpp" line="+63"/> <source>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.</source> <translation>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.</translation> </message> @@ -96,7 +96,17 @@ Dit product bevat software ontwikkeld door het OpenSSL Project voor gebruik in d <translation>Verwijder het geselecteerde adres van de lijst</translation> </message> <message> - <location line="-14"/> + <location line="+27"/> + <source>Export the data in the current tab to a file</source> + <translation>Exporteer de data in de huidige tab naar een bestand</translation> + </message> + <message> + <location line="+3"/> + <source>&Export</source> + <translation>&Exporteer</translation> + </message> + <message> + <location line="-44"/> <source>Verify a message to ensure it was signed with a specified Bitcoin address</source> <translation>Controleer een bericht om te verifiëren dat het gespecificeerde Bitcoinadres het bericht heeft ondertekend.</translation> </message> @@ -318,12 +328,12 @@ Dit product bevat software ontwikkeld door het OpenSSL Project voor gebruik in d <translation>&Onderteken bericht...</translation> </message> <message> - <location line="+299"/> + <location line="+280"/> <source>Synchronizing with network...</source> <translation>Synchroniseren met netwerk...</translation> </message> <message> - <location line="-368"/> + <location line="-349"/> <source>&Overview</source> <translation>&Overzicht</translation> </message> @@ -398,7 +408,7 @@ Dit product bevat software ontwikkeld door het OpenSSL Project voor gebruik in d <translation>&Wijzig Wachtwoord</translation> </message> <message> - <location line="+304"/> + <location line="+285"/> <source>Importing blocks from disk...</source> <translation>Blokken aan het importeren vanaf harde schijf...</translation> </message> @@ -408,12 +418,7 @@ Dit product bevat software ontwikkeld door het OpenSSL Project voor gebruik in d <translation>Bezig met herindexeren van blokken op harde schijf...</translation> </message> <message> - <location line="-300"/> - <source>&Export...</source> - <translation>&Exporteer...</translation> - </message> - <message> - <location line="-66"/> + <location line="-347"/> <source>Send coins to a Bitcoin address</source> <translation>Verstuur munten naar een Bitcoinadres</translation> </message> @@ -423,12 +428,7 @@ Dit product bevat software ontwikkeld door het OpenSSL Project voor gebruik in d <translation>Wijzig instellingen van Bitcoin</translation> </message> <message> - <location line="+18"/> - <source>Export the data in the current tab to a file</source> - <translation>Exporteer de data in de huidige tab naar een bestand</translation> - </message> - <message> - <location line="-9"/> + <location line="+9"/> <source>Backup wallet to another location</source> <translation>&Backup portemonnee naar een andere locatie</translation> </message> @@ -438,7 +438,7 @@ Dit product bevat software ontwikkeld door het OpenSSL Project voor gebruik in d <translation>Wijzig het wachtwoord voor uw portemonneversleuteling</translation> </message> <message> - <location line="+9"/> + <location line="+6"/> <source>&Debug window</source> <translation>&Debugscherm</translation> </message> @@ -448,23 +448,23 @@ Dit product bevat software ontwikkeld door het OpenSSL Project voor gebruik in d <translation>Open debugging en diagnostische console</translation> </message> <message> - <location line="-7"/> + <location line="-4"/> <source>&Verify message...</source> <translation>&Verifiëer bericht...</translation> </message> <message> - <location line="-163"/> - <location line="+541"/> + <location line="-165"/> + <location line="+530"/> <source>Bitcoin</source> <translation>Bitcoin</translation> </message> <message> - <location line="-541"/> + <location line="-530"/> <source>Wallet</source> <translation>Portemonnee</translation> </message> <message> - <location line="+99"/> + <location line="+101"/> <source>&Send</source> <translation>&Versturen</translation> </message> @@ -509,12 +509,12 @@ Dit product bevat software ontwikkeld door het OpenSSL Project voor gebruik in d <translation>Verifiëer handtekeningen om zeker te zijn dat de berichten zijn ondertekend met de gespecificeerde Bitcoinadressen</translation> </message> <message> - <location line="+31"/> + <location line="+28"/> <source>&File</source> <translation>&Bestand</translation> </message> <message> - <location line="+8"/> + <location line="+7"/> <source>&Settings</source> <translation>&Instellingen</translation> </message> @@ -529,12 +529,7 @@ Dit product bevat software ontwikkeld door het OpenSSL Project voor gebruik in d <translation>Tab-werkbalk</translation> </message> <message> - <location line="+8"/> - <source>Actions toolbar</source> - <translation>Actie-werkbalk</translation> - </message> - <message> - <location line="+13"/> + <location line="+17"/> <location line="+10"/> <source>[testnet]</source> <translation>[testnetwerk]</translation> @@ -545,12 +540,17 @@ Dit product bevat software ontwikkeld door het OpenSSL Project voor gebruik in d <translation>Bitcoin client</translation> </message> <message numerus="yes"> - <location line="+140"/> + <location line="+141"/> <source>%n active connection(s) to Bitcoin network</source> <translation><numerusform>%n actieve connectie naar Bitcoinnetwerk</numerusform><numerusform>%n actieve connecties naar Bitcoinnetwerk</numerusform></translation> </message> <message> - <location line="+39"/> + <location line="+22"/> + <source>No block source available...</source> + <translation>Geen bron van blokken beschikbaar...</translation> + </message> + <message> + <location line="+12"/> <source>Processed %1 of %2 (estimated) blocks of transaction history.</source> <translation>%1 van %2 (geschat) blokken van de transactiehistorie verwerkt.</translation> </message> @@ -575,7 +575,7 @@ Dit product bevat software ontwikkeld door het OpenSSL Project voor gebruik in d <translation><numerusform>%n week</numerusform><numerusform>%n weken</numerusform></translation> </message> <message> - <location line="+5"/> + <location line="+4"/> <source>%1 behind</source> <translation>%1 achter</translation> </message> @@ -590,7 +590,7 @@ Dit product bevat software ontwikkeld door het OpenSSL Project voor gebruik in d <translation>Transacties na dit moment zullen nu nog niet zichtbaar zijn.</translation> </message> <message> - <location line="+21"/> + <location line="+22"/> <source>Error</source> <translation>Fout</translation> </message> @@ -605,22 +605,22 @@ Dit product bevat software ontwikkeld door het OpenSSL Project voor gebruik in d <translation>Informatie</translation> </message> <message> - <location line="+68"/> + <location line="+70"/> <source>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?</source> <translation>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?</translation> </message> <message> - <location line="-138"/> + <location line="-140"/> <source>Up to date</source> <translation>Bijgewerkt</translation> </message> <message> - <location line="+32"/> + <location line="+31"/> <source>Catching up...</source> <translation>Aan het bijwerken...</translation> </message> <message> - <location line="+110"/> + <location line="+113"/> <source>Confirm transaction fee</source> <translation>Bevestig transactiekosten</translation> </message> @@ -670,7 +670,7 @@ Adres: %4 <translation>Portemonnee is <b>versleuteld</b> en momenteel <b>gesloten</b></translation> </message> <message> - <location filename="../bitcoin.cpp" line="+104"/> + <location filename="../bitcoin.cpp" line="+111"/> <source>A fatal error occurred. Bitcoin can no longer continue safely and will quit.</source> <translation>Er is een fatale fout opgetreden. Bitcoin kan niet meer veilig doorgaan en zal nu afgesloten worden.</translation> </message> @@ -678,7 +678,7 @@ Adres: %4 <context> <name>ClientModel</name> <message> - <location filename="../clientmodel.cpp" line="+98"/> + <location filename="../clientmodel.cpp" line="+104"/> <source>Network Alert</source> <translation>Netwerkwaarschuwing</translation> </message> @@ -809,8 +809,8 @@ Adres: %4 </message> <message> <location line="+6"/> - <source>Optional transaction fee per kB that helps make sure your transactions are processed quickly. Most transactions are 1 kB. Fee 0.01 recommended.</source> - <translation>Optionele transactiekosten per kB die helpen om uw transacties snel te verwerken. De meeste transacties zijn 1 kB. Transactiekosten van 0,01 wordt aangeraden</translation> + <source>Optional transaction fee per kB that helps make sure your transactions are processed quickly. Most transactions are 1 kB.</source> + <translation>Optionele transactiekosten per kB. Transactiekosten helpen ervoor te zorgen dat uw transacties snel verwerkt worden. De meeste transacties zijn 1kB.</translation> </message> <message> <location line="+15"/> @@ -1059,7 +1059,7 @@ Adres: %4 <translation>Totaal van de transacties die nog moeten worden bevestigd en nog niet zijn meegeteld in uw huidige saldo </translation> </message> <message> - <location filename="../overviewpage.cpp" line="+115"/> + <location filename="../overviewpage.cpp" line="+116"/> <location line="+1"/> <source>out of sync</source> <translation>niet gesynchroniseerd</translation> @@ -1646,6 +1646,19 @@ Adres: %4 </message> </context> <context> + <name>SplashScreen</name> + <message> + <location filename="../splashscreen.cpp" line="+22"/> + <source>The Bitcoin developers</source> + <translation>De Bitcoin-ontwikkelaars</translation> + </message> + <message> + <location line="+1"/> + <source>[testnet]</source> + <translation>[testnetwerk]</translation> + </message> +</context> +<context> <name>TransactionDesc</name> <message> <location filename="../transactiondesc.cpp" line="+20"/> @@ -2120,9 +2133,27 @@ Adres: %4 </message> </context> <context> + <name>WalletModel</name> + <message> + <location filename="../walletmodel.cpp" line="+193"/> + <source>Send Coins</source> + <translation>Verstuur munten</translation> + </message> +</context> +<context> <name>WalletView</name> <message> - <location filename="../walletview.cpp" line="+247"/> + <location filename="../walletview.cpp" line="+42"/> + <source>&Export</source> + <translation>&Exporteer</translation> + </message> + <message> + <location line="+1"/> + <source>Export the data in the current tab to a file</source> + <translation>Exporteer de data in de huidige tab naar een bestand</translation> + </message> + <message> + <location line="+193"/> <source>Backup Wallet</source> <translation>Portomonnee backuppen</translation> </message> @@ -2155,37 +2186,37 @@ Adres: %4 <context> <name>bitcoin-core</name> <message> - <location filename="../bitcoinstrings.cpp" line="+96"/> + <location filename="../bitcoinstrings.cpp" line="+94"/> <source>Bitcoin version</source> <translation>Bitcoinversie</translation> </message> <message> - <location line="+98"/> + <location line="+102"/> <source>Usage:</source> <translation>Gebruik:</translation> </message> <message> - <location line="-25"/> + <location line="-29"/> <source>Send command to -server or bitcoind</source> <translation>Stuur commando naar -server of bitcoind</translation> </message> <message> - <location line="-22"/> + <location line="-23"/> <source>List commands</source> <translation>Lijst van commando's</translation> </message> <message> - <location line="-10"/> + <location line="-12"/> <source>Get help for a command</source> <translation>Toon hulp voor een commando</translation> </message> <message> - <location line="+21"/> + <location line="+24"/> <source>Options:</source> <translation>Opties:</translation> </message> <message> - <location line="+23"/> + <location line="+24"/> <source>Specify configuration file (default: bitcoin.conf)</source> <translation>Specificeer configuratiebestand (standaard: bitcoin.conf) </translation> @@ -2197,29 +2228,17 @@ Adres: %4 </translation> </message> <message> - <location line="-48"/> - <source>Generate coins</source> - <translation>Genereer munten -</translation> - </message> - <message> - <location line="-27"/> - <source>Don't generate coins</source> - <translation>Genereer geen munten -</translation> - </message> - <message> - <location line="+74"/> + <location line="-1"/> <source>Specify data directory</source> <translation>Stel datamap in</translation> </message> <message> - <location line="-8"/> + <location line="-9"/> <source>Set database cache size in megabytes (default: 25)</source> <translation>Stel databankcachegrootte in in megabytes (standaard: 25)</translation> </message> <message> - <location line="-27"/> + <location line="-28"/> <source>Listen for connections on <port> (default: 8333 or testnet: 18333)</source> <translation>Luister voor verbindingen op <poort> (standaard: 8333 of testnet: 18333)</translation> </message> @@ -2234,7 +2253,7 @@ Adres: %4 <translation>Verbind naar een node om adressen van anderen op te halen, en verbreek vervolgens de verbinding</translation> </message> <message> - <location line="+80"/> + <location line="+82"/> <source>Specify your own public address</source> <translation>Specificeer uw eigen publieke adres</translation> </message> @@ -2244,22 +2263,22 @@ Adres: %4 <translation>Drempel om verbinding te verbreken naar zich misdragende peers (standaard: 100)</translation> </message> <message> - <location line="-132"/> + <location line="-134"/> <source>Number of seconds to keep misbehaving peers from reconnecting (default: 86400)</source> <translation>Aantal seconden dat zich misdragende peers niet opnieuw mogen verbinden (standaard: 86400)</translation> </message> <message> - <location line="-32"/> + <location line="-29"/> <source>An error occurred while setting up the RPC port %u for listening on IPv4: %s</source> <translation>Er is een fout opgetreden tijdens het instellen van de inkomende RPC-poort %u op IPv4: %s</translation> </message> <message> - <location line="+30"/> + <location line="+27"/> <source>Listen for JSON-RPC connections on <port> (default: 8332 or testnet: 18332)</source> <translation>Wacht op JSON-RPC-connecties op poort <port> (standaard: 8332 of testnet: 18332)</translation> </message> <message> - <location line="+36"/> + <location line="+37"/> <source>Accept command line and JSON-RPC commands</source> <translation>Aanvaard commandoregel- en JSON-RPC-commando's</translation> </message> @@ -2269,17 +2288,17 @@ Adres: %4 <translation>Draai in de achtergrond als daemon en aanvaard commando's</translation> </message> <message> - <location line="+33"/> + <location line="+37"/> <source>Use the test network</source> <translation>Gebruik het testnetwerk</translation> </message> <message> - <location line="-108"/> + <location line="-112"/> <source>Accept connections from outside (default: 1 if no -proxy or -connect)</source> <translation>Accepteer verbindingen van buitenaf (standaard: 1 als geen -proxy of -connect is opgegeven)</translation> </message> <message> - <location line="-82"/> + <location line="-80"/> <source>%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. </message> <message> <location line="+3"/> - <source>Error initializing database environment %s! To recover, BACKUP THAT DIRECTORY, then remove everything from it except for wallet.dat.</source> - <translation>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.</translation> - </message> - <message> - <location line="+3"/> <source>Error: The transaction was rejected! This might happen if some of the coins in your wallet were already spent, such as if you used a copy of wallet.dat and coins were spent in the copy but not marked as spent here.</source> <translation>Fout: De transactie was afgewezen! Dit kan gebeuren als sommige munten in uw portemonnee al eerder uitgegeven zijn, zoals wanneer u een kopie van uw wallet.dat heeft gebruikt en in de kopie deze munten zijn uitgegeven, maar in deze portemonnee die munten nog niet als zodanig zijn gemarkeerd.</translation> </message> @@ -2347,12 +2361,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Stel maximumgrootte in in bytes voor hoge-prioriteits-/lage-transactiekosten-transacties (standaard: 27000)</translation> </message> <message> - <location line="+3"/> - <source>Set the number of script verification threads (1-16, 0=auto, default: 0)</source> - <translation>Stel het aantal threads in voor scriptverificatie (1-16, 0=auto, standaard: 0)</translation> - </message> - <message> - <location line="+2"/> + <location line="+6"/> <source>This is a pre-release test build - use at your own risk - do not use for mining or merchant applications</source> <translation>Dit is een pre-release testversie - gebruik op eigen risico! Gebruik deze niet voor het delven van munten of handelsdoeleinden</translation> </message> @@ -2392,7 +2401,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Blokcreatie-opties:</translation> </message> <message> - <location line="+6"/> + <location line="+5"/> <source>Connect only to the specified node(s)</source> <translation>Verbind alleen naar de gespecificeerde node(s)</translation> </message> @@ -2412,7 +2421,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Wilt u de blokkendatabase nu herbouwen?</translation> </message> <message> - <location line="+3"/> + <location line="+2"/> <source>Error initializing block database</source> <translation>Fout bij intialisatie blokkendatabase</translation> </message> @@ -2438,11 +2447,6 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. </message> <message> <location line="+1"/> - <source>Error: Transaction creation failed!</source> - <translation>Fout: Aanmaak transactie mislukt!</translation> - </message> - <message> - <location line="+1"/> <source>Error: Wallet locked, unable to create transaction!</source> <translation>Fout: Portemonnee vergrendeld, aanmaak transactie niet mogelijk!</translation> </message> @@ -2512,7 +2516,12 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Vind andere nodes d.m.v. DNS-naslag (standaard: 1 tenzij -connect)</translation> </message> <message> - <location line="+3"/> + <location line="+1"/> + <source>Generate coins (default: 0)</source> + <translation>Genereer munten (standaard: 0)</translation> + </message> + <message> + <location line="+2"/> <source>How many blocks to check at startup (default: 288, 0 = all)</source> <translation>Aantal te checken blokken bij het opstarten (standaard: 288, 0 = allemaal)</translation> </message> @@ -2522,7 +2531,12 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Hoe grondig de blokverificatie is (0-4, standaard: 3)</translation> </message> <message> - <location line="+24"/> + <location line="+19"/> + <source>Not enough file descriptors available.</source> + <translation>Niet genoeg file descriptors beschikbaar.</translation> + </message> + <message> + <location line="+8"/> <source>Rebuild block chain index from current blk000??.dat files</source> <translation>Blokketen opnieuw opbouwen van huidige blk000??.dat-bestanden</translation> </message> @@ -2532,7 +2546,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Stel het aantal threads in om RPC-aanvragen mee te bedienen (standaard: 4)</translation> </message> <message> - <location line="+22"/> + <location line="+26"/> <source>Verifying blocks...</source> <translation>Blokken aan het controleren...</translation> </message> @@ -2542,12 +2556,17 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Portomonnee aan het controleren...</translation> </message> <message> - <location line="-62"/> + <location line="-69"/> <source>Imports blocks from external blk000??.dat file</source> <translation>Importeert blokken van extern blk000??.dat bestand</translation> </message> <message> - <location line="+1"/> + <location line="-76"/> + <source>Set the number of script verification threads (up to 16, 0 = auto, <0 = leave that many cores free, default: 0)</source> + <translation>Stel het aantal threads voor scriptverificatie in (max 16, 0 = auto, <0 = laat zoveel cores vrij, standaard: 0)</translation> + </message> + <message> + <location line="+77"/> <source>Information</source> <translation>Informatie</translation> </message> @@ -2557,6 +2576,16 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Ongeldig -tor adres: '%s'</translation> </message> <message> + <location line="+1"/> + <source>Invalid amount for -minrelaytxfee=<amount>: '%s'</source> + <translation>Ongeldig bedrag voor -minrelaytxfee=<bedrag>: '%s'</translation> + </message> + <message> + <location line="+1"/> + <source>Invalid amount for -mintxfee=<amount>: '%s'</source> + <translation>Ongeldig bedrag voor -mintxfee=<bedrag>: '%s'</translation> + </message> + <message> <location line="+8"/> <source>Maintain a full transaction index (default: 0)</source> <translation>Onderhoud een volledige transactieindex (standaard: 0)</translation> @@ -2572,7 +2601,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Maximum per-connectie zendbuffer, <n>*1000 bytes (standaard: 1000)</translation> </message> <message> - <location line="+1"/> + <location line="+2"/> <source>Only accept block chain matching built-in checkpoints (default: 1)</source> <translation>Accepteer alleen blokketen die overeenkomt met de ingebouwde checkpoints (standaard: 1)</translation> </message> @@ -2632,6 +2661,11 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Verklein debug.log-bestand bij het opstarten van de client (standaard: 1 als geen -debug)</translation> </message> <message> + <location line="+1"/> + <source>Signing transaction failed</source> + <translation>Ondertekenen van transactie mislukt</translation> + </message> + <message> <location line="+2"/> <source>Specify connection timeout in milliseconds (default: 5000)</source> <translation>Specificeer de time-outtijd in milliseconden (standaard: 5000)</translation> @@ -2642,7 +2676,22 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Systeemfout:</translation> </message> <message> - <location line="+10"/> + <location line="+4"/> + <source>Transaction amount too small</source> + <translation>Transactiebedrag te klein</translation> + </message> + <message> + <location line="+1"/> + <source>Transaction amounts must be positive</source> + <translation>Transactiebedragen moeten positief zijn</translation> + </message> + <message> + <location line="+1"/> + <source>Transaction too large</source> + <translation>Transactie te groot</translation> + </message> + <message> + <location line="+7"/> <source>Use UPnP to map the listening port (default: 0)</source> <translation>Gebruik UPnP om de luisterende poort te mappen (standaard: 0)</translation> </message> @@ -2682,7 +2731,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>wallet.dat corrupt, veiligstellen mislukt</translation> </message> <message> - <location line="-46"/> + <location line="-50"/> <source>Password for JSON-RPC connections</source> <translation>Wachtwoord voor JSON-RPC-verbindingen</translation> </message> @@ -2697,17 +2746,17 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Verstuur commando's naar proces dat op <ip> draait (standaard: 127.0.0.1)</translation> </message> <message> - <location line="-119"/> + <location line="-120"/> <source>Execute command when the best block changes (%s in cmd is replaced by block hash)</source> <translation>Voer commando uit zodra het beste blok verandert (%s in cmd wordt vervangen door blockhash)</translation> </message> <message> - <location line="+142"/> + <location line="+147"/> <source>Upgrade wallet to latest format</source> <translation>Vernieuw portemonnee naar nieuwste versie</translation> </message> <message> - <location line="-17"/> + <location line="-21"/> <source>Set key pool size to <n> (default: 100)</source> <translation>Stel sleutelpoelgrootte in op <n> (standaard: 100)</translation> </message> @@ -2717,12 +2766,12 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Doorzoek de blokketen op ontbrekende portemonnee-transacties</translation> </message> <message> - <location line="+31"/> + <location line="+35"/> <source>Use OpenSSL (https) for JSON-RPC connections</source> <translation>Gebruik OpenSSL (https) voor JSON-RPC-verbindingen</translation> </message> <message> - <location line="-22"/> + <location line="-26"/> <source>Server certificate file (default: server.cert)</source> <translation>Certificaat-bestand voor server (standaard: server.cert)</translation> </message> @@ -2732,37 +2781,37 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Geheime sleutel voor server (standaard: server.pem)</translation> </message> <message> - <location line="-153"/> + <location line="-151"/> <source>Acceptable ciphers (default: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH)</source> <translation>Aanvaardbare ciphers (standaard: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH)</translation> </message> <message> - <location line="+166"/> + <location line="+165"/> <source>This help message</source> <translation>Dit helpbericht</translation> </message> <message> - <location line="+3"/> + <location line="+6"/> <source>Unable to bind to %s on this computer (bind returned error %d, %s)</source> <translation>Niet in staat om aan %s te binden op deze computer (bind gaf error %d, %s)</translation> </message> <message> - <location line="-86"/> + <location line="-91"/> <source>Connect through socks proxy</source> <translation>Verbind via een socks-proxy</translation> </message> <message> - <location line="-11"/> + <location line="-10"/> <source>Allow DNS lookups for -addnode, -seednode and -connect</source> <translation>Sta DNS-naslag toe voor -addnode, -seednode en -connect</translation> </message> <message> - <location line="+56"/> + <location line="+55"/> <source>Loading addresses...</source> <translation>Adressen aan het laden...</translation> </message> <message> - <location line="-34"/> + <location line="-35"/> <source>Error loading wallet.dat: Wallet corrupted</source> <translation>Fout bij laden wallet.dat: Portemonnee corrupt</translation> </message> @@ -2772,22 +2821,22 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Fout bij laden wallet.dat: Portemonnee vereist een nieuwere versie van Bitcoin</translation> </message> <message> - <location line="+87"/> + <location line="+93"/> <source>Wallet needed to be rewritten: restart Bitcoin to complete</source> <translation>Portemonnee moest herschreven worden: Herstart Bitcoin om te voltooien</translation> </message> <message> - <location line="-89"/> + <location line="-95"/> <source>Error loading wallet.dat</source> <translation>Fout bij laden wallet.dat</translation> </message> <message> - <location line="+29"/> + <location line="+28"/> <source>Invalid -proxy address: '%s'</source> <translation>Ongeldig -proxy adres: '%s'</translation> </message> <message> - <location line="+49"/> + <location line="+56"/> <source>Unknown network specified in -onlynet: '%s'</source> <translation>Onbekend netwerk gespecificeerd in -onlynet: '%s'</translation> </message> @@ -2797,7 +2846,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Onbekende -socks proxyversie aangegeven: %i</translation> </message> <message> - <location line="-91"/> + <location line="-96"/> <source>Cannot resolve -bind address: '%s'</source> <translation>Kan -bind adres niet herleiden: '%s'</translation> </message> @@ -2817,17 +2866,17 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Ongeldig bedrag</translation> </message> <message> - <location line="-4"/> + <location line="-6"/> <source>Insufficient funds</source> <translation>Ontoereikend saldo</translation> </message> <message> - <location line="+8"/> + <location line="+10"/> <source>Loading block index...</source> <translation>Blokindex aan het laden...</translation> </message> <message> - <location line="-58"/> + <location line="-57"/> <source>Add a node to connect to and attempt to keep the connection open</source> <translation>Voeg een node om naar te verbinden toe en probeer de verbinding open te houden</translation> </message> @@ -2837,52 +2886,47 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Niet in staat om aan %s te binden op deze computer. Bitcoin draait vermoedelijk reeds.</translation> </message> <message> - <location line="+67"/> + <location line="+64"/> <source>Fee per KB to add to transactions you send</source> <translation>Kosten per KB om aan transacties toe te voegen die u verstuurt</translation> </message> <message> - <location line="+17"/> + <location line="+19"/> <source>Loading wallet...</source> <translation>Portemonnee aan het laden...</translation> </message> <message> - <location line="-53"/> + <location line="-52"/> <source>Cannot downgrade wallet</source> <translation>Kan portemonnee niet downgraden</translation> </message> <message> - <location line="+1"/> - <source>Cannot initialize keypool</source> - <translation>Kan sleutel-pool niet initialiseren</translation> - </message> - <message> <location line="+3"/> <source>Cannot write default address</source> <translation>Kan standaardadres niet schrijven</translation> </message> <message> - <location line="+63"/> + <location line="+64"/> <source>Rescanning...</source> <translation>Blokketen aan het doorzoeken...</translation> </message> <message> - <location line="-55"/> + <location line="-57"/> <source>Done loading</source> <translation>Klaar met laden</translation> </message> <message> - <location line="+79"/> + <location line="+82"/> <source>To use the %s option</source> <translation>Om de %s optie te gebruiken</translation> </message> <message> - <location line="-71"/> + <location line="-74"/> <source>Error</source> <translation>Fout</translation> </message> <message> - <location line="-33"/> + <location line="-31"/> <source>You must set rpcpassword=<password> in the configuration file: %s If the file does not exist, create it with owner-readable-only file permissions.</source> diff --git a/src/qt/locale/bitcoin_pl.ts b/src/qt/locale/bitcoin_pl.ts index 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.</translation> </message> <message> - <location filename="../aboutdialog.cpp" line="+17"/> + <location filename="../aboutdialog.cpp" line="+14"/> <source>Copyright</source> <translation>Prawo autorskie</translation> </message> <message> <location line="+0"/> - <source>2009-%1 The Bitcoin developers</source> - <translation>2009-%1 deweloperzy Bitcoin</translation> + <source>The Bitcoin developers</source> + <translation>Deweloperzy Bitcoin</translation> </message> </context> <context> @@ -66,7 +66,7 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>&Nowy Adres</translation> </message> <message> - <location filename="../addressbookpage.cpp" line="+59"/> + <location filename="../addressbookpage.cpp" line="+63"/> <source>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.</source> <translation>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.</translation> </message> @@ -96,7 +96,17 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>Usuń zaznaczony adres z listy</translation> </message> <message> - <location line="-14"/> + <location line="+27"/> + <source>Export the data in the current tab to a file</source> + <translation>Eksportuj dane z aktywnej karty do pliku</translation> + </message> + <message> + <location line="+3"/> + <source>&Export</source> + <translation>&Eksportuj</translation> + </message> + <message> + <location line="-44"/> <source>Verify a message to ensure it was signed with a specified Bitcoin address</source> <translation>Zweryfikuj wiadomość, aby upewnić się, że została podpisana odpowiednim adresem Bitcoin.</translation> </message> @@ -318,12 +328,12 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>Podpisz wiado&mość...</translation> </message> <message> - <location line="+299"/> + <location line="+280"/> <source>Synchronizing with network...</source> <translation>Synchronizacja z siecią...</translation> </message> <message> - <location line="-368"/> + <location line="-349"/> <source>&Overview</source> <translation>P&odsumowanie</translation> </message> @@ -398,7 +408,7 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>&Zmień hasło...</translation> </message> <message> - <location line="+304"/> + <location line="+285"/> <source>Importing blocks from disk...</source> <translation>Importowanie bloków z dysku...</translation> </message> @@ -408,12 +418,7 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>Ponowne indeksowanie bloków na dysku...</translation> </message> <message> - <location line="-300"/> - <source>&Export...</source> - <translation>&Eksportuj...</translation> - </message> - <message> - <location line="-66"/> + <location line="-347"/> <source>Send coins to a Bitcoin address</source> <translation>Wyślij monety na adres Bitcoin</translation> </message> @@ -423,12 +428,7 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>Zmienia opcje konfiguracji bitcoina</translation> </message> <message> - <location line="+18"/> - <source>Export the data in the current tab to a file</source> - <translation>Eksportuj dane z aktywnej karty do pliku</translation> - </message> - <message> - <location line="-9"/> + <location line="+9"/> <source>Backup wallet to another location</source> <translation>Zapasowy portfel w innej lokalizacji</translation> </message> @@ -438,7 +438,7 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>Zmień hasło użyte do szyfrowania portfela</translation> </message> <message> - <location line="+9"/> + <location line="+6"/> <source>&Debug window</source> <translation>&Okno debudowania</translation> </message> @@ -448,23 +448,23 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>Otwórz konsolę debugowania i diagnostyki</translation> </message> <message> - <location line="-7"/> + <location line="-4"/> <source>&Verify message...</source> <translation>&Zweryfikuj wiadomość...</translation> </message> <message> - <location line="-163"/> - <location line="+541"/> + <location line="-165"/> + <location line="+530"/> <source>Bitcoin</source> <translation>Bitcoin</translation> </message> <message> - <location line="-541"/> + <location line="-530"/> <source>Wallet</source> <translation>Portfel</translation> </message> <message> - <location line="+99"/> + <location line="+101"/> <source>&Send</source> <translation>Wyślij</translation> </message> @@ -509,12 +509,12 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>Zweryfikuj wiadomość, aby upewnić się, że została podpisana odpowiednim adresem Bitcoin.</translation> </message> <message> - <location line="+31"/> + <location line="+28"/> <source>&File</source> <translation>&Plik</translation> </message> <message> - <location line="+8"/> + <location line="+7"/> <source>&Settings</source> <translation>P&referencje</translation> </message> @@ -529,12 +529,7 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>Pasek zakładek</translation> </message> <message> - <location line="+8"/> - <source>Actions toolbar</source> - <translation>Pasek akcji</translation> - </message> - <message> - <location line="+13"/> + <location line="+17"/> <location line="+10"/> <source>[testnet]</source> <translation>[testnet]</translation> @@ -545,12 +540,17 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>Bitcoin klient</translation> </message> <message numerus="yes"> - <location line="+140"/> + <location line="+141"/> <source>%n active connection(s) to Bitcoin network</source> <translation><numerusform>%n aktywne połączenie do sieci Bitcoin</numerusform><numerusform>%n aktywne połączenia do sieci Bitcoin</numerusform><numerusform>%n aktywnych połączeń do sieci Bitcoin</numerusform></translation> </message> <message> - <location line="+39"/> + <location line="+22"/> + <source>No block source available...</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+12"/> <source>Processed %1 of %2 (estimated) blocks of transaction history.</source> <translation>Przetworzono (w przybliżeniu) %1 z %2 bloków historii transakcji.</translation> </message> @@ -575,7 +575,7 @@ This product includes software developed by the OpenSSL Project for use in the O <translation><numerusform>%n tydzień</numerusform><numerusform>%n tygodni</numerusform><numerusform>%n tygodni</numerusform></translation> </message> <message> - <location line="+5"/> + <location line="+4"/> <source>%1 behind</source> <translation type="unfinished"/> </message> @@ -590,7 +590,7 @@ This product includes software developed by the OpenSSL Project for use in the O <translation type="unfinished"/> </message> <message> - <location line="+21"/> + <location line="+22"/> <source>Error</source> <translation>Błąd</translation> </message> @@ -605,22 +605,22 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>Informacja</translation> </message> <message> - <location line="+68"/> + <location line="+70"/> <source>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?</source> <translation>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ę?</translation> </message> <message> - <location line="-138"/> + <location line="-140"/> <source>Up to date</source> <translation>Aktualny</translation> </message> <message> - <location line="+32"/> + <location line="+31"/> <source>Catching up...</source> <translation>Łapanie bloków...</translation> </message> <message> - <location line="+110"/> + <location line="+113"/> <source>Confirm transaction fee</source> <translation>Potwierdź prowizję transakcyjną</translation> </message> @@ -670,7 +670,7 @@ Adres: %4 <translation>Portfel jest <b>zaszyfrowany</b> i obecnie <b>zablokowany</b></translation> </message> <message> - <location filename="../bitcoin.cpp" line="+104"/> + <location filename="../bitcoin.cpp" line="+111"/> <source>A fatal error occurred. Bitcoin can no longer continue safely and will quit.</source> <translation>Błąd krytyczny. Bitcoin nie może kontynuować bezpiecznie więc zostanie zamknięty.</translation> </message> @@ -678,7 +678,7 @@ Adres: %4 <context> <name>ClientModel</name> <message> - <location filename="../clientmodel.cpp" line="+98"/> + <location filename="../clientmodel.cpp" line="+104"/> <source>Network Alert</source> <translation>Sieć Alert</translation> </message> @@ -809,8 +809,8 @@ Adres: %4 </message> <message> <location line="+6"/> - <source>Optional transaction fee per kB that helps make sure your transactions are processed quickly. Most transactions are 1 kB. Fee 0.01 recommended.</source> - <translation>Opcjonalna prowizja za transakcje za kB, wspomaga ona szybkość przebiegu transakcji. Większość transakcji jest 1 kB. Zalecana prowizja 0.01 .</translation> + <source>Optional transaction fee per kB that helps make sure your transactions are processed quickly. Most transactions are 1 kB.</source> + <translation type="unfinished"/> </message> <message> <location line="+15"/> @@ -1059,7 +1059,7 @@ Adres: %4 <translation>Suma transakcji, które nie zostały jeszcze potwierdzone, i które nie zostały wliczone do twojego obecnego salda</translation> </message> <message> - <location filename="../overviewpage.cpp" line="+115"/> + <location filename="../overviewpage.cpp" line="+116"/> <location line="+1"/> <source>out of sync</source> <translation>desynchronizacja</translation> @@ -1646,6 +1646,19 @@ Adres: %4 </message> </context> <context> + <name>SplashScreen</name> + <message> + <location filename="../splashscreen.cpp" line="+22"/> + <source>The Bitcoin developers</source> + <translation>Deweloperzy Bitcoin</translation> + </message> + <message> + <location line="+1"/> + <source>[testnet]</source> + <translation>[testnet]</translation> + </message> +</context> +<context> <name>TransactionDesc</name> <message> <location filename="../transactiondesc.cpp" line="+20"/> @@ -2120,9 +2133,27 @@ Adres: %4 </message> </context> <context> + <name>WalletModel</name> + <message> + <location filename="../walletmodel.cpp" line="+193"/> + <source>Send Coins</source> + <translation>Wyślij płatność</translation> + </message> +</context> +<context> <name>WalletView</name> <message> - <location filename="../walletview.cpp" line="+247"/> + <location filename="../walletview.cpp" line="+42"/> + <source>&Export</source> + <translation>&Eksportuj</translation> + </message> + <message> + <location line="+1"/> + <source>Export the data in the current tab to a file</source> + <translation>Eksportuj dane z aktywnej karty do pliku</translation> + </message> + <message> + <location line="+193"/> <source>Backup Wallet</source> <translation>Kopia Zapasowa Portfela</translation> </message> @@ -2155,37 +2186,37 @@ Adres: %4 <context> <name>bitcoin-core</name> <message> - <location filename="../bitcoinstrings.cpp" line="+96"/> + <location filename="../bitcoinstrings.cpp" line="+94"/> <source>Bitcoin version</source> <translation>Wersja Bitcoin</translation> </message> <message> - <location line="+98"/> + <location line="+102"/> <source>Usage:</source> <translation>Użycie:</translation> </message> <message> - <location line="-25"/> + <location line="-29"/> <source>Send command to -server or bitcoind</source> <translation>Wyślij polecenie do -server lub bitcoind</translation> </message> <message> - <location line="-22"/> + <location line="-23"/> <source>List commands</source> <translation>Lista poleceń</translation> </message> <message> - <location line="-10"/> + <location line="-12"/> <source>Get help for a command</source> <translation>Uzyskaj pomoc do polecenia</translation> </message> <message> - <location line="+21"/> + <location line="+24"/> <source>Options:</source> <translation>Opcje:</translation> </message> <message> - <location line="+23"/> + <location line="+24"/> <source>Specify configuration file (default: bitcoin.conf)</source> <translation>Wskaż plik konfiguracyjny (domyślnie: bitcoin.conf)</translation> </message> @@ -2195,27 +2226,17 @@ Adres: %4 <translation>Wskaż plik pid (domyślnie: bitcoin.pid)</translation> </message> <message> - <location line="-48"/> - <source>Generate coins</source> - <translation>Generuj monety</translation> - </message> - <message> - <location line="-27"/> - <source>Don't generate coins</source> - <translation>Nie generuj monet</translation> - </message> - <message> - <location line="+74"/> + <location line="-1"/> <source>Specify data directory</source> <translation>Wskaż folder danych</translation> </message> <message> - <location line="-8"/> + <location line="-9"/> <source>Set database cache size in megabytes (default: 25)</source> <translation>Ustaw rozmiar w megabajtach cache-u bazy danych (domyślnie: 25)</translation> </message> <message> - <location line="-27"/> + <location line="-28"/> <source>Listen for connections on <port> (default: 8333 or testnet: 18333)</source> <translation>Nasłuchuj połączeń na <port> (domyślnie: 8333 lub testnet: 18333)</translation> </message> @@ -2230,7 +2251,7 @@ Adres: %4 <translation>Podłącz się do węzła aby otrzymać adresy peerów i rozłącz</translation> </message> <message> - <location line="+80"/> + <location line="+82"/> <source>Specify your own public address</source> <translation>Podaj swój publiczny adres</translation> </message> @@ -2240,22 +2261,22 @@ Adres: %4 <translation>Próg po którym nastąpi rozłączenie nietrzymających się zasad peerów (domyślnie: 100)</translation> </message> <message> - <location line="-132"/> + <location line="-134"/> <source>Number of seconds to keep misbehaving peers from reconnecting (default: 86400)</source> <translation>Czas w sekundach, przez jaki nietrzymający się zasad peerzy nie będą mogli ponownie się podłączyć (domyślnie: 86400)</translation> </message> <message> - <location line="-32"/> + <location line="-29"/> <source>An error occurred while setting up the RPC port %u for listening on IPv4: %s</source> <translation>Wystąpił błąd podczas ustawiania portu RPC %u w tryb nasłuchu: %s</translation> </message> <message> - <location line="+30"/> + <location line="+27"/> <source>Listen for JSON-RPC connections on <port> (default: 8332 or testnet: 18332)</source> <translation>Nasłuchuj połączeń JSON-RPC na <port> (domyślnie: 8332 or testnet: 18332)</translation> </message> <message> - <location line="+36"/> + <location line="+37"/> <source>Accept command line and JSON-RPC commands</source> <translation>Akceptuj linię poleceń oraz polecenia JSON-RPC</translation> </message> @@ -2265,17 +2286,17 @@ Adres: %4 <translation>Uruchom w tle jako daemon i przyjmuj polecenia</translation> </message> <message> - <location line="+33"/> + <location line="+37"/> <source>Use the test network</source> <translation>Użyj sieci testowej</translation> </message> <message> - <location line="-108"/> + <location line="-112"/> <source>Accept connections from outside (default: 1 if no -proxy or -connect)</source> <translation>Akceptuj połączenia z zewnątrz (domyślnie: 1 jeśli nie ustawiono -proxy lub -connect)</translation> </message> <message> - <location line="-82"/> + <location line="-80"/> <source>%s, you must set a rpcpassword in the configuration file: %s It is recommended you use the following random password: @@ -2315,11 +2336,6 @@ na przykład: alertnotify=echo %%s | mail -s "Alarm Bitcoin" admin@foo </message> <message> <location line="+3"/> - <source>Error initializing database environment %s! To recover, BACKUP THAT DIRECTORY, then remove everything from it except for wallet.dat.</source> - <translation>Błąd inicjowania środowiska bazy danych %s! Aby odtworzyć, ZACHOWAJ TEN KATALOG, po czym usuń z niego wszystko poza wallet.dat.</translation> - </message> - <message> - <location line="+3"/> <source>Error: The transaction was rejected! This might happen if some of the coins in your wallet were already spent, such as if you used a copy of wallet.dat and coins were spent in the copy but not marked as spent here.</source> <translation type="unfinished"/> </message> @@ -2344,12 +2360,7 @@ na przykład: alertnotify=echo %%s | mail -s "Alarm Bitcoin" admin@foo <translation>Ustaw maksymalny rozmiar transakcji o wysokim priorytecie/niskiej prowizji w bajtach (domyślnie: 27000)</translation> </message> <message> - <location line="+3"/> - <source>Set the number of script verification threads (1-16, 0=auto, default: 0)</source> - <translation>Ustaw liczbę wątków weryfikacji skryptów (1-16, 0=auto, domyślnie: 0)</translation> - </message> - <message> - <location line="+2"/> + <location line="+6"/> <source>This is a pre-release test build - use at your own risk - do not use for mining or merchant applications</source> <translation type="unfinished"/> </message> @@ -2389,7 +2400,7 @@ na przykład: alertnotify=echo %%s | mail -s "Alarm Bitcoin" admin@foo <translation>Opcje tworzenia bloku:</translation> </message> <message> - <location line="+6"/> + <location line="+5"/> <source>Connect only to the specified node(s)</source> <translation>Łącz tylko do wskazanego węzła</translation> </message> @@ -2409,7 +2420,7 @@ na przykład: alertnotify=echo %%s | mail -s "Alarm Bitcoin" admin@foo <translation>Czy chcesz teraz przebudować bazę bloków?</translation> </message> <message> - <location line="+3"/> + <location line="+2"/> <source>Error initializing block database</source> <translation>Błąd inicjowania bloku bazy danych</translation> </message> @@ -2435,11 +2446,6 @@ na przykład: alertnotify=echo %%s | mail -s "Alarm Bitcoin" admin@foo </message> <message> <location line="+1"/> - <source>Error: Transaction creation failed!</source> - <translation>Błąd: Utworzenie transakcji nie powiodło się!</translation> - </message> - <message> - <location line="+1"/> <source>Error: Wallet locked, unable to create transaction!</source> <translation>Błąd: Zablokowany portfel, nie można utworzyć transakcji!</translation> </message> @@ -2509,7 +2515,12 @@ na przykład: alertnotify=echo %%s | mail -s "Alarm Bitcoin" admin@foo <translation>Wyszukaj połączenia wykorzystując zapytanie DNS (domyślnie 1 jeśli nie użyto -connect)</translation> </message> <message> - <location line="+3"/> + <location line="+1"/> + <source>Generate coins (default: 0)</source> + <translation>Generuj monety (domyślnie: 0)</translation> + </message> + <message> + <location line="+2"/> <source>How many blocks to check at startup (default: 288, 0 = all)</source> <translation>Ile bloków sprawdzić przy starcie (domyślnie: 288, 0 = wszystkie)</translation> </message> @@ -2519,7 +2530,12 @@ na przykład: alertnotify=echo %%s | mail -s "Alarm Bitcoin" admin@foo <translation>Jak dokładna jest weryfikacja bloku (0-4, domyślnie: 3)</translation> </message> <message> - <location line="+24"/> + <location line="+19"/> + <source>Not enough file descriptors available.</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+8"/> <source>Rebuild block chain index from current blk000??.dat files</source> <translation>Odbuduj indeks łańcucha bloków z obecnych plików blk000??.dat</translation> </message> @@ -2529,7 +2545,7 @@ na przykład: alertnotify=echo %%s | mail -s "Alarm Bitcoin" admin@foo <translation>Ustaw liczbę wątków do odwołań RPC (domyślnie: 4)</translation> </message> <message> - <location line="+22"/> + <location line="+26"/> <source>Verifying blocks...</source> <translation>Weryfikacja bloków...</translation> </message> @@ -2539,12 +2555,17 @@ na przykład: alertnotify=echo %%s | mail -s "Alarm Bitcoin" admin@foo <translation>Weryfikacja portfela...</translation> </message> <message> - <location line="-62"/> + <location line="-69"/> <source>Imports blocks from external blk000??.dat file</source> <translation>Importuj bloki z zewnętrznego pliku blk000??.dat</translation> </message> <message> - <location line="+1"/> + <location line="-76"/> + <source>Set the number of script verification threads (up to 16, 0 = auto, <0 = leave that many cores free, default: 0)</source> + <translation>Ustaw liczbę wątków skryptu weryfikacji (do 16, 0 = auto, <0 = zostawia taką ilość rdzenie wolnych, domyślnie: 0)</translation> + </message> + <message> + <location line="+77"/> <source>Information</source> <translation>Informacja</translation> </message> @@ -2554,6 +2575,16 @@ na przykład: alertnotify=echo %%s | mail -s "Alarm Bitcoin" admin@foo <translation>Nieprawidłowy adres -tor: '%s'</translation> </message> <message> + <location line="+1"/> + <source>Invalid amount for -minrelaytxfee=<amount>: '%s'</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Invalid amount for -mintxfee=<amount>: '%s'</source> + <translation type="unfinished"/> + </message> + <message> <location line="+8"/> <source>Maintain a full transaction index (default: 0)</source> <translation>Utrzymuj pełen indeks transakcji (domyślnie: 0)</translation> @@ -2569,7 +2600,7 @@ na przykład: alertnotify=echo %%s | mail -s "Alarm Bitcoin" admin@foo <translation>Maksymalny bufor wysyłu na połączenie, <n>*1000 bajtów (domyślnie: 1000)</translation> </message> <message> - <location line="+1"/> + <location line="+2"/> <source>Only accept block chain matching built-in checkpoints (default: 1)</source> <translation>Akceptuj tylko łańcuch bloków zgodny z wbudowanymi punktami kontrolnymi (domyślnie: 1)</translation> </message> @@ -2629,6 +2660,11 @@ na przykład: alertnotify=echo %%s | mail -s "Alarm Bitcoin" admin@foo <translation>Zmniejsz plik debug.log przy starcie programu (domyślnie: 1 jeśli nie użyto -debug)</translation> </message> <message> + <location line="+1"/> + <source>Signing transaction failed</source> + <translation type="unfinished"/> + </message> + <message> <location line="+2"/> <source>Specify connection timeout in milliseconds (default: 5000)</source> <translation>Wskaż czas oczekiwania bezczynności połączenia w milisekundach (domyślnie: 5000)</translation> @@ -2639,7 +2675,22 @@ na przykład: alertnotify=echo %%s | mail -s "Alarm Bitcoin" admin@foo <translation>Błąd systemu:</translation> </message> <message> - <location line="+10"/> + <location line="+4"/> + <source>Transaction amount too small</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Transaction amounts must be positive</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Transaction too large</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+7"/> <source>Use UPnP to map the listening port (default: 0)</source> <translation>Używaj UPnP do mapowania portu nasłuchu (domyślnie: 0)</translation> </message> @@ -2679,7 +2730,7 @@ na przykład: alertnotify=echo %%s | mail -s "Alarm Bitcoin" admin@foo <translation>wallet.dat uszkodzony, odtworzenie się nie powiodło</translation> </message> <message> - <location line="-46"/> + <location line="-50"/> <source>Password for JSON-RPC connections</source> <translation>Hasło do połączeń JSON-RPC</translation> </message> @@ -2694,17 +2745,17 @@ na przykład: alertnotify=echo %%s | mail -s "Alarm Bitcoin" admin@foo <translation>Wysyłaj polecenia do węzła działającego na <ip> (domyślnie: 127.0.0.1)</translation> </message> <message> - <location line="-119"/> + <location line="-120"/> <source>Execute command when the best block changes (%s in cmd is replaced by block hash)</source> <translation>Wykonaj polecenie kiedy najlepszy blok ulegnie zmianie (%s w komendzie zastanie zastąpione przez hash bloku)</translation> </message> <message> - <location line="+142"/> + <location line="+147"/> <source>Upgrade wallet to latest format</source> <translation>Zaktualizuj portfel do najnowszego formatu.</translation> </message> <message> - <location line="-17"/> + <location line="-21"/> <source>Set key pool size to <n> (default: 100)</source> <translation>Ustaw rozmiar puli kluczy na <n> (domyślnie: 100)</translation> </message> @@ -2714,12 +2765,12 @@ na przykład: alertnotify=echo %%s | mail -s "Alarm Bitcoin" admin@foo <translation>Przeskanuj blok łańcuchów żeby znaleźć zaginione transakcje portfela</translation> </message> <message> - <location line="+31"/> + <location line="+35"/> <source>Use OpenSSL (https) for JSON-RPC connections</source> <translation>Użyj OpenSSL (https) do połączeń JSON-RPC</translation> </message> <message> - <location line="-22"/> + <location line="-26"/> <source>Server certificate file (default: server.cert)</source> <translation>Plik certyfikatu serwera (domyślnie: server.cert)</translation> </message> @@ -2729,37 +2780,37 @@ na przykład: alertnotify=echo %%s | mail -s "Alarm Bitcoin" admin@foo <translation>Klucz prywatny serwera (domyślnie: server.pem)</translation> </message> <message> - <location line="-153"/> + <location line="-151"/> <source>Acceptable ciphers (default: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH)</source> <translation>Aceptowalne szyfry (domyślnie: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH)</translation> </message> <message> - <location line="+166"/> + <location line="+165"/> <source>This help message</source> <translation>Ta wiadomość pomocy</translation> </message> <message> - <location line="+3"/> + <location line="+6"/> <source>Unable to bind to %s on this computer (bind returned error %d, %s)</source> <translation>Nie można przywiązać %s na tym komputerze (bind returned error %d, %s)</translation> </message> <message> - <location line="-86"/> + <location line="-91"/> <source>Connect through socks proxy</source> <translation>Łączy przez proxy socks</translation> </message> <message> - <location line="-11"/> + <location line="-10"/> <source>Allow DNS lookups for -addnode, -seednode and -connect</source> <translation>Zezwól -addnode, -seednode i -connect na łączenie się z serwerem DNS</translation> </message> <message> - <location line="+56"/> + <location line="+55"/> <source>Loading addresses...</source> <translation>Wczytywanie adresów...</translation> </message> <message> - <location line="-34"/> + <location line="-35"/> <source>Error loading wallet.dat: Wallet corrupted</source> <translation>Błąd ładowania wallet.dat: Uszkodzony portfel</translation> </message> @@ -2769,22 +2820,22 @@ na przykład: alertnotify=echo %%s | mail -s "Alarm Bitcoin" admin@foo <translation>Błąd ładowania wallet.dat: Portfel wymaga nowszej wersji Bitcoin</translation> </message> <message> - <location line="+87"/> + <location line="+93"/> <source>Wallet needed to be rewritten: restart Bitcoin to complete</source> <translation>Portfel wymaga przepisania: zrestartuj Bitcoina żeby ukończyć</translation> </message> <message> - <location line="-89"/> + <location line="-95"/> <source>Error loading wallet.dat</source> <translation>Błąd ładowania wallet.dat</translation> </message> <message> - <location line="+29"/> + <location line="+28"/> <source>Invalid -proxy address: '%s'</source> <translation>Nieprawidłowy adres -proxy: '%s'</translation> </message> <message> - <location line="+49"/> + <location line="+56"/> <source>Unknown network specified in -onlynet: '%s'</source> <translation>Nieznana sieć w -onlynet: '%s'</translation> </message> @@ -2794,7 +2845,7 @@ na przykład: alertnotify=echo %%s | mail -s "Alarm Bitcoin" admin@foo <translation>Nieznana wersja proxy w -socks: %i</translation> </message> <message> - <location line="-91"/> + <location line="-96"/> <source>Cannot resolve -bind address: '%s'</source> <translation>Nie można uzyskać adresu -bind: '%s'</translation> </message> @@ -2814,17 +2865,17 @@ na przykład: alertnotify=echo %%s | mail -s "Alarm Bitcoin" admin@foo <translation>Nieprawidłowa kwota</translation> </message> <message> - <location line="-4"/> + <location line="-6"/> <source>Insufficient funds</source> <translation>Niewystarczające środki</translation> </message> <message> - <location line="+8"/> + <location line="+10"/> <source>Loading block index...</source> <translation>Ładowanie indeksu bloku...</translation> </message> <message> - <location line="-58"/> + <location line="-57"/> <source>Add a node to connect to and attempt to keep the connection open</source> <translation>Dodaj węzeł do łączenia się and attempt to keep the connection open</translation> </message> @@ -2834,53 +2885,48 @@ na przykład: alertnotify=echo %%s | mail -s "Alarm Bitcoin" admin@foo <translation>Nie można przywiązać %s na tym komputerze. Bitcoin prawdopodobnie już działa.</translation> </message> <message> - <location line="+67"/> + <location line="+64"/> <source>Fee per KB to add to transactions you send</source> <translation> </translation> </message> <message> - <location line="+17"/> + <location line="+19"/> <source>Loading wallet...</source> <translation>Wczytywanie portfela...</translation> </message> <message> - <location line="-53"/> + <location line="-52"/> <source>Cannot downgrade wallet</source> <translation>Nie można dezaktualizować portfela</translation> </message> <message> - <location line="+1"/> - <source>Cannot initialize keypool</source> - <translation>Inicjalizacja puli kluczy nieudana</translation> - </message> - <message> <location line="+3"/> <source>Cannot write default address</source> <translation>Nie można zapisać domyślnego adresu</translation> </message> <message> - <location line="+63"/> + <location line="+64"/> <source>Rescanning...</source> <translation>Ponowne skanowanie...</translation> </message> <message> - <location line="-55"/> + <location line="-57"/> <source>Done loading</source> <translation>Wczytywanie zakończone</translation> </message> <message> - <location line="+79"/> + <location line="+82"/> <source>To use the %s option</source> <translation>Aby użyć opcji %s</translation> </message> <message> - <location line="-71"/> + <location line="-74"/> <source>Error</source> <translation>Błąd</translation> </message> <message> - <location line="-33"/> + <location line="-31"/> <source>You must set rpcpassword=<password> in the configuration file: %s If the file does not exist, create it with owner-readable-only file permissions.</source> diff --git a/src/qt/locale/bitcoin_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.</translation> </message> <message> - <location filename="../aboutdialog.cpp" line="+17"/> + <location filename="../aboutdialog.cpp" line="+14"/> <source>Copyright</source> <translation>Copyright</translation> </message> <message> <location line="+0"/> - <source>2009-%1 The Bitcoin developers</source> - <translation>2009-%1 Os desenvolvedores do Bitcoin</translation> + <source>The Bitcoin developers</source> + <translation>Desenvolvedores do Bitcoin</translation> </message> </context> <context> @@ -66,7 +66,7 @@ Este produto inclui software desenvolvido pelo Projeto OpenSSL para uso no OpenS <translation>&Novo endereço</translation> </message> <message> - <location filename="../addressbookpage.cpp" line="+59"/> + <location filename="../addressbookpage.cpp" line="+63"/> <source>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.</source> <translation>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.</translation> </message> @@ -96,7 +96,17 @@ Este produto inclui software desenvolvido pelo Projeto OpenSSL para uso no OpenS <translation>Excluir os endereços selecionados da lista</translation> </message> <message> - <location line="-14"/> + <location line="+27"/> + <source>Export the data in the current tab to a file</source> + <translation>Exportar os dados na aba atual para um arquivo</translation> + </message> + <message> + <location line="+3"/> + <source>&Export</source> + <translation>&Exportar</translation> + </message> + <message> + <location line="-44"/> <source>Verify a message to ensure it was signed with a specified Bitcoin address</source> <translation>Verificar mensagem para se assegurar que ela foi assinada pelo dono de um endereço Bitcoin específico.</translation> </message> @@ -318,12 +328,12 @@ Este produto inclui software desenvolvido pelo Projeto OpenSSL para uso no OpenS <translation>&Assinar Mensagem...</translation> </message> <message> - <location line="+299"/> + <location line="+280"/> <source>Synchronizing with network...</source> <translation>Sincronizando com a rede...</translation> </message> <message> - <location line="-368"/> + <location line="-349"/> <source>&Overview</source> <translation>&Visão geral</translation> </message> @@ -398,7 +408,7 @@ Este produto inclui software desenvolvido pelo Projeto OpenSSL para uso no OpenS <translation>&Mudar frase de segurança...</translation> </message> <message> - <location line="+304"/> + <location line="+285"/> <source>Importing blocks from disk...</source> <translation>Importando blocos do disco...</translation> </message> @@ -408,12 +418,7 @@ Este produto inclui software desenvolvido pelo Projeto OpenSSL para uso no OpenS <translation>Reindexando blocos no disco...</translation> </message> <message> - <location line="-300"/> - <source>&Export...</source> - <translation>&Exportar...</translation> - </message> - <message> - <location line="-66"/> + <location line="-347"/> <source>Send coins to a Bitcoin address</source> <translation>Enviar moedas para um endereço bitcoin</translation> </message> @@ -423,12 +428,7 @@ Este produto inclui software desenvolvido pelo Projeto OpenSSL para uso no OpenS <translation>Modificar opções de configuração para bitcoin</translation> </message> <message> - <location line="+18"/> - <source>Export the data in the current tab to a file</source> - <translation>Exportar os dados na aba atual para um arquivo</translation> - </message> - <message> - <location line="-9"/> + <location line="+9"/> <source>Backup wallet to another location</source> <translation>Fazer cópia de segurança da carteira para uma outra localização</translation> </message> @@ -438,7 +438,7 @@ Este produto inclui software desenvolvido pelo Projeto OpenSSL para uso no OpenS <translation>Mudar a frase de segurança utilizada na criptografia da carteira</translation> </message> <message> - <location line="+9"/> + <location line="+6"/> <source>&Debug window</source> <translation>Janela de &Depuração</translation> </message> @@ -448,23 +448,23 @@ Este produto inclui software desenvolvido pelo Projeto OpenSSL para uso no OpenS <translation>Abrir console de depuração e diagnóstico</translation> </message> <message> - <location line="-7"/> + <location line="-4"/> <source>&Verify message...</source> <translation>&Verificar mensagem...</translation> </message> <message> - <location line="-163"/> - <location line="+541"/> + <location line="-165"/> + <location line="+530"/> <source>Bitcoin</source> <translation>Bitcoin</translation> </message> <message> - <location line="-541"/> + <location line="-530"/> <source>Wallet</source> <translation>Carteira</translation> </message> <message> - <location line="+99"/> + <location line="+101"/> <source>&Send</source> <translation>&Enviar</translation> </message> @@ -509,12 +509,12 @@ Este produto inclui software desenvolvido pelo Projeto OpenSSL para uso no OpenS <translation>Verificar mensagens para se assegurar que elas foram assinadas pelo dono de Endereços Bitcoin específicos</translation> </message> <message> - <location line="+31"/> + <location line="+28"/> <source>&File</source> <translation>&Arquivo</translation> </message> <message> - <location line="+8"/> + <location line="+7"/> <source>&Settings</source> <translation>&Configurações</translation> </message> @@ -529,12 +529,7 @@ Este produto inclui software desenvolvido pelo Projeto OpenSSL para uso no OpenS <translation>Barra de ferramentas</translation> </message> <message> - <location line="+8"/> - <source>Actions toolbar</source> - <translation>Barra de ações</translation> - </message> - <message> - <location line="+13"/> + <location line="+17"/> <location line="+10"/> <source>[testnet]</source> <translation>[testnet]</translation> @@ -545,12 +540,17 @@ Este produto inclui software desenvolvido pelo Projeto OpenSSL para uso no OpenS <translation>Cliente Bitcoin</translation> </message> <message numerus="yes"> - <location line="+140"/> + <location line="+141"/> <source>%n active connection(s) to Bitcoin network</source> <translation><numerusform>%n conexão ativa na rede Bitcoin</numerusform><numerusform>%n conexões ativas na rede Bitcoin</numerusform></translation> </message> <message> - <location line="+39"/> + <location line="+22"/> + <source>No block source available...</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+12"/> <source>Processed %1 of %2 (estimated) blocks of transaction history.</source> <translation>Processado %1 de %2 blocos (estimado) de histórico de transações.</translation> </message> @@ -575,7 +575,7 @@ Este produto inclui software desenvolvido pelo Projeto OpenSSL para uso no OpenS <translation><numerusform>%n semana</numerusform><numerusform>%n semanas</numerusform></translation> </message> <message> - <location line="+5"/> + <location line="+4"/> <source>%1 behind</source> <translation>%1 atrás</translation> </message> @@ -590,7 +590,7 @@ Este produto inclui software desenvolvido pelo Projeto OpenSSL para uso no OpenS <translation>Transações após isso ainda não estão visíveis.</translation> </message> <message> - <location line="+21"/> + <location line="+22"/> <source>Error</source> <translation>Erro</translation> </message> @@ -605,22 +605,22 @@ Este produto inclui software desenvolvido pelo Projeto OpenSSL para uso no OpenS <translation>Informação</translation> </message> <message> - <location line="+68"/> + <location line="+70"/> <source>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?</source> <translation>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?</translation> </message> <message> - <location line="-138"/> + <location line="-140"/> <source>Up to date</source> <translation>Atualizado</translation> </message> <message> - <location line="+32"/> + <location line="+31"/> <source>Catching up...</source> <translation>Recuperando o atraso ...</translation> </message> <message> - <location line="+110"/> + <location line="+113"/> <source>Confirm transaction fee</source> <translation>Confirmar taxa de transação</translation> </message> @@ -669,7 +669,7 @@ Endereço: %4</translation> <translation>Carteira está <b>criptografada</b> e atualmente <b>bloqueada</b></translation> </message> <message> - <location filename="../bitcoin.cpp" line="+104"/> + <location filename="../bitcoin.cpp" line="+111"/> <source>A fatal error occurred. Bitcoin can no longer continue safely and will quit.</source> <translation>Um erro fatal ocorreu. Bitcoin não pode continuar em segurança e irá fechar.</translation> </message> @@ -677,7 +677,7 @@ Endereço: %4</translation> <context> <name>ClientModel</name> <message> - <location filename="../clientmodel.cpp" line="+98"/> + <location filename="../clientmodel.cpp" line="+104"/> <source>Network Alert</source> <translation>Alerta da Rede</translation> </message> @@ -808,8 +808,8 @@ Endereço: %4</translation> </message> <message> <location line="+6"/> - <source>Optional transaction fee per kB that helps make sure your transactions are processed quickly. Most transactions are 1 kB. Fee 0.01 recommended.</source> - <translation>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.</translation> + <source>Optional transaction fee per kB that helps make sure your transactions are processed quickly. Most transactions are 1 kB.</source> + <translation type="unfinished"/> </message> <message> <location line="+15"/> @@ -1058,7 +1058,7 @@ Endereço: %4</translation> <translation>Total de transações ainda não confirmadas, e que ainda não contam no saldo atual</translation> </message> <message> - <location filename="../overviewpage.cpp" line="+115"/> + <location filename="../overviewpage.cpp" line="+116"/> <location line="+1"/> <source>out of sync</source> <translation>fora de sincronia</translation> @@ -1645,6 +1645,19 @@ Endereço: %4</translation> </message> </context> <context> + <name>SplashScreen</name> + <message> + <location filename="../splashscreen.cpp" line="+22"/> + <source>The Bitcoin developers</source> + <translation>Desenvolvedores do Bitcoin</translation> + </message> + <message> + <location line="+1"/> + <source>[testnet]</source> + <translation>[testnet]</translation> + </message> +</context> +<context> <name>TransactionDesc</name> <message> <location filename="../transactiondesc.cpp" line="+20"/> @@ -2119,9 +2132,27 @@ Endereço: %4</translation> </message> </context> <context> + <name>WalletModel</name> + <message> + <location filename="../walletmodel.cpp" line="+193"/> + <source>Send Coins</source> + <translation>Send Coins</translation> + </message> +</context> +<context> <name>WalletView</name> <message> - <location filename="../walletview.cpp" line="+247"/> + <location filename="../walletview.cpp" line="+42"/> + <source>&Export</source> + <translation>&Exportar</translation> + </message> + <message> + <location line="+1"/> + <source>Export the data in the current tab to a file</source> + <translation>Exportar os dados na aba atual para um arquivo</translation> + </message> + <message> + <location line="+193"/> <source>Backup Wallet</source> <translation>Fazer cópia de segurança da Carteira</translation> </message> @@ -2154,37 +2185,37 @@ Endereço: %4</translation> <context> <name>bitcoin-core</name> <message> - <location filename="../bitcoinstrings.cpp" line="+96"/> + <location filename="../bitcoinstrings.cpp" line="+94"/> <source>Bitcoin version</source> <translation>Versão do Bitcoin</translation> </message> <message> - <location line="+98"/> + <location line="+102"/> <source>Usage:</source> <translation>Uso:</translation> </message> <message> - <location line="-25"/> + <location line="-29"/> <source>Send command to -server or bitcoind</source> <translation>Enviar comando para -server ou bitcoind</translation> </message> <message> - <location line="-22"/> + <location line="-23"/> <source>List commands</source> <translation>Lista de comandos</translation> </message> <message> - <location line="-10"/> + <location line="-12"/> <source>Get help for a command</source> <translation>Obtenha ajuda sobre um comando</translation> </message> <message> - <location line="+21"/> + <location line="+24"/> <source>Options:</source> <translation>Opções:</translation> </message> <message> - <location line="+23"/> + <location line="+24"/> <source>Specify configuration file (default: bitcoin.conf)</source> <translation>Especifique um arquivo de configurações (padrão: bitcoin.conf)</translation> </message> @@ -2194,27 +2225,17 @@ Endereço: %4</translation> <translation>Especifique um arquivo de pid (padrão: bitcoind.pid)</translation> </message> <message> - <location line="-48"/> - <source>Generate coins</source> - <translation>Gerar bitcoins</translation> - </message> - <message> - <location line="-27"/> - <source>Don't generate coins</source> - <translation>Não gerar bitcoins</translation> - </message> - <message> - <location line="+74"/> + <location line="-1"/> <source>Specify data directory</source> <translation>Especificar diretório de dados</translation> </message> <message> - <location line="-8"/> + <location line="-9"/> <source>Set database cache size in megabytes (default: 25)</source> <translation>Definir o tamanho do cache do banco de dados em megabytes (padrão: 25)</translation> </message> <message> - <location line="-27"/> + <location line="-28"/> <source>Listen for connections on <port> (default: 8333 or testnet: 18333)</source> <translation>Procurar por conexões em <port> (padrão: 8333 ou testnet:18333)</translation> </message> @@ -2229,7 +2250,7 @@ Endereço: %4</translation> <translation>Conectar a um nó para receber endereços de participantes, e desconectar.</translation> </message> <message> - <location line="+80"/> + <location line="+82"/> <source>Specify your own public address</source> <translation>Especificar seu próprio endereço público</translation> </message> @@ -2239,22 +2260,22 @@ Endereço: %4</translation> <translation>Limite para desconectar peers mal comportados (padrão: 100)</translation> </message> <message> - <location line="-132"/> + <location line="-134"/> <source>Number of seconds to keep misbehaving peers from reconnecting (default: 86400)</source> <translation>Número de segundos para impedir que peers mal comportados reconectem (padrão: 86400)</translation> </message> <message> - <location line="-32"/> + <location line="-29"/> <source>An error occurred while setting up the RPC port %u for listening on IPv4: %s</source> <translation>Um erro ocorreu ao configurar a porta RPC %u para escuta em IPv4: %s</translation> </message> <message> - <location line="+30"/> + <location line="+27"/> <source>Listen for JSON-RPC connections on <port> (default: 8332 or testnet: 18332)</source> <translation>Escutar conexões JSON-RPC na porta <porta> (padrão: 8332 ou testnet: 18332)</translation> </message> <message> - <location line="+36"/> + <location line="+37"/> <source>Accept command line and JSON-RPC commands</source> <translation>Aceitar linha de comando e comandos JSON-RPC</translation> </message> @@ -2264,17 +2285,17 @@ Endereço: %4</translation> <translation>Rodar em segundo plano como serviço e aceitar comandos</translation> </message> <message> - <location line="+33"/> + <location line="+37"/> <source>Use the test network</source> <translation>Usar rede de teste</translation> </message> <message> - <location line="-108"/> + <location line="-112"/> <source>Accept connections from outside (default: 1 if no -proxy or -connect)</source> <translation>Aceitar conexões externas (padrão: 1 se opções -proxy ou -connect não estiverem presentes)</translation> </message> <message> - <location line="-82"/> + <location line="-80"/> <source>%s, you must set a rpcpassword in the configuration file: %s It is recommended you use the following random password: @@ -2315,11 +2336,6 @@ por exemplo: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. </message> <message> <location line="+3"/> - <source>Error initializing database environment %s! To recover, BACKUP THAT DIRECTORY, then remove everything from it except for wallet.dat.</source> - <translation>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.</translation> - </message> - <message> - <location line="+3"/> <source>Error: The transaction was rejected! This might happen if some of the coins in your wallet were already spent, such as if you used a copy of wallet.dat and coins were spent in the copy but not marked as spent here.</source> <translation>Erro: A transação foi rejeitada. Isso pode acontecer se alguns dos bitcoins de sua carteira já haviam sido gastos, por exemplo se você usou uma cópia do arquivo wallet.dat e alguns bitcoins foram gastos na cópia mas não foram marcados como gastos aqui.</translation> </message> @@ -2344,12 +2360,7 @@ por exemplo: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Determinar tamanho máximo de transações de alta-prioridade/baixa-taxa em bytes (padrão: 27000)</translation> </message> <message> - <location line="+3"/> - <source>Set the number of script verification threads (1-16, 0=auto, default: 0)</source> - <translation>Definir número de threads de script de verificação (1-16, 0=auto, padrão: 0)</translation> - </message> - <message> - <location line="+2"/> + <location line="+6"/> <source>This is a pre-release test build - use at your own risk - do not use for mining or merchant applications</source> <translation>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.</translation> </message> @@ -2389,7 +2400,7 @@ por exemplo: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Opções de criação de blocos:</translation> </message> <message> - <location line="+6"/> + <location line="+5"/> <source>Connect only to the specified node(s)</source> <translation>Conectar apenas a nó(s) específico(s)</translation> </message> @@ -2409,7 +2420,7 @@ por exemplo: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Você quer reconstruir o banco de dados de blocos agora?</translation> </message> <message> - <location line="+3"/> + <location line="+2"/> <source>Error initializing block database</source> <translation>Erro ao inicializar banco de dados de blocos</translation> </message> @@ -2435,11 +2446,6 @@ por exemplo: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. </message> <message> <location line="+1"/> - <source>Error: Transaction creation failed!</source> - <translation>Erro: Criação da transação falhou!</translation> - </message> - <message> - <location line="+1"/> <source>Error: Wallet locked, unable to create transaction!</source> <translation>Erro: Carteira travada, impossível criar transação!</translation> </message> @@ -2509,7 +2515,12 @@ por exemplo: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Procurar pares usando consulta de DNS (padrão: 1 a menos que a opção -connect esteja presente)</translation> </message> <message> - <location line="+3"/> + <location line="+1"/> + <source>Generate coins (default: 0)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+2"/> <source>How many blocks to check at startup (default: 288, 0 = all)</source> <translation>Quantos blocos checar ao inicializar (padrão: 288, 0 = todos)</translation> </message> @@ -2519,7 +2530,12 @@ por exemplo: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Quão minuciosa é a verificação dos blocos (0-4, padrão: 3)</translation> </message> <message> - <location line="+24"/> + <location line="+19"/> + <source>Not enough file descriptors available.</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+8"/> <source>Rebuild block chain index from current blk000??.dat files</source> <translation>Reconstruir índice de blockchain a partir dos arquivos atuais blk000??.dat</translation> </message> @@ -2529,7 +2545,7 @@ por exemplo: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Defina o número de threads de script de verificação. (Padrão: 4)</translation> </message> <message> - <location line="+22"/> + <location line="+26"/> <source>Verifying blocks...</source> <translation>Verificando blocos...</translation> </message> @@ -2539,12 +2555,17 @@ por exemplo: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Verificando carteira...</translation> </message> <message> - <location line="-62"/> + <location line="-69"/> <source>Imports blocks from external blk000??.dat file</source> <translation>Importar blocos de um arquivo externo blk000??.dat</translation> </message> <message> - <location line="+1"/> + <location line="-76"/> + <source>Set the number of script verification threads (up to 16, 0 = auto, <0 = leave that many cores free, default: 0)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+77"/> <source>Information</source> <translation>Informação</translation> </message> @@ -2554,6 +2575,16 @@ por exemplo: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Endereço -tor inválido: '%s'</translation> </message> <message> + <location line="+1"/> + <source>Invalid amount for -minrelaytxfee=<amount>: '%s'</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Invalid amount for -mintxfee=<amount>: '%s'</source> + <translation type="unfinished"/> + </message> + <message> <location line="+8"/> <source>Maintain a full transaction index (default: 0)</source> <translation>Manter índice completo de transações (padrão: 0)</translation> @@ -2569,7 +2600,7 @@ por exemplo: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Buffer máximo de envio por conexão, <n>*1000 bytes (padrão: 1000)</translation> </message> <message> - <location line="+1"/> + <location line="+2"/> <source>Only accept block chain matching built-in checkpoints (default: 1)</source> <translation>Apenas aceitar cadeia de blocos correspondente a marcas de verificação internas (padrão: 1)</translation> </message> @@ -2629,6 +2660,11 @@ por exemplo: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Encolher arquivo debug.log ao iniciar o cliente (padrão 1 se opção -debug não estiver presente)</translation> </message> <message> + <location line="+1"/> + <source>Signing transaction failed</source> + <translation type="unfinished"/> + </message> + <message> <location line="+2"/> <source>Specify connection timeout in milliseconds (default: 5000)</source> <translation>Especifique o tempo limite (timeout) da conexão em milissegundos (padrão: 5000) </translation> @@ -2639,7 +2675,22 @@ por exemplo: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Erro de sistema:</translation> </message> <message> - <location line="+10"/> + <location line="+4"/> + <source>Transaction amount too small</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Transaction amounts must be positive</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Transaction too large</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+7"/> <source>Use UPnP to map the listening port (default: 0)</source> <translation>Usar UPnP para mapear porta de escuta (padrão: 0)</translation> </message> @@ -2679,7 +2730,7 @@ por exemplo: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>wallet.dat corrompido, recuperação falhou</translation> </message> <message> - <location line="-46"/> + <location line="-50"/> <source>Password for JSON-RPC connections</source> <translation>Senha para conexões JSON-RPC</translation> </message> @@ -2694,17 +2745,17 @@ por exemplo: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Enviar comando para nó rodando em <ip> (pardão: 127.0.0.1)</translation> </message> <message> - <location line="-119"/> + <location line="-120"/> <source>Execute command when the best block changes (%s in cmd is replaced by block hash)</source> <translation>Executar comando quando o melhor bloco mudar (%s no comando será substituído pelo hash do bloco)</translation> </message> <message> - <location line="+142"/> + <location line="+147"/> <source>Upgrade wallet to latest format</source> <translation>Atualizar carteira para o formato mais recente</translation> </message> <message> - <location line="-17"/> + <location line="-21"/> <source>Set key pool size to <n> (default: 100)</source> <translation>Determinar tamanho do pool de endereços para <n> (padrão: 100)</translation> </message> @@ -2714,12 +2765,12 @@ por exemplo: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Re-escanear blocos procurando por transações perdidas da carteira</translation> </message> <message> - <location line="+31"/> + <location line="+35"/> <source>Use OpenSSL (https) for JSON-RPC connections</source> <translation>Usar OpenSSL (https) para conexões JSON-RPC</translation> </message> <message> - <location line="-22"/> + <location line="-26"/> <source>Server certificate file (default: server.cert)</source> <translation>Arquivo de certificado do servidor (padrão: server.cert)</translation> </message> @@ -2729,37 +2780,37 @@ por exemplo: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Chave privada do servidor (padrão: server.pem)</translation> </message> <message> - <location line="-153"/> + <location line="-151"/> <source>Acceptable ciphers (default: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH)</source> <translation>Algoritmos de criptografia aceitos (padrão: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH)</translation> </message> <message> - <location line="+166"/> + <location line="+165"/> <source>This help message</source> <translation>Esta mensagem de ajuda</translation> </message> <message> - <location line="+3"/> + <location line="+6"/> <source>Unable to bind to %s on this computer (bind returned error %d, %s)</source> <translation>Impossível vincular a %s neste computador (bind retornou erro %d, %s)</translation> </message> <message> - <location line="-86"/> + <location line="-91"/> <source>Connect through socks proxy</source> <translation>Conectar através de um proxy socks</translation> </message> <message> - <location line="-11"/> + <location line="-10"/> <source>Allow DNS lookups for -addnode, -seednode and -connect</source> <translation>Permitir consultas DNS para -addnode, -seednode e -connect</translation> </message> <message> - <location line="+56"/> + <location line="+55"/> <source>Loading addresses...</source> <translation>Carregando endereços...</translation> </message> <message> - <location line="-34"/> + <location line="-35"/> <source>Error loading wallet.dat: Wallet corrupted</source> <translation>Erro ao carregar wallet.dat: Carteira corrompida</translation> </message> @@ -2769,22 +2820,22 @@ por exemplo: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Erro ao carregar wallet.dat: Carteira requer uma versão mais nova do Bitcoin</translation> </message> <message> - <location line="+87"/> + <location line="+93"/> <source>Wallet needed to be rewritten: restart Bitcoin to complete</source> <translation>A Carteira precisou ser reescrita: reinicie o Bitcoin para completar</translation> </message> <message> - <location line="-89"/> + <location line="-95"/> <source>Error loading wallet.dat</source> <translation>Erro ao carregar wallet.dat</translation> </message> <message> - <location line="+29"/> + <location line="+28"/> <source>Invalid -proxy address: '%s'</source> <translation>Endereço -proxy inválido: '%s'</translation> </message> <message> - <location line="+49"/> + <location line="+56"/> <source>Unknown network specified in -onlynet: '%s'</source> <translation>Rede desconhecida especificada em -onlynet: '%s'</translation> </message> @@ -2794,7 +2845,7 @@ por exemplo: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Versão desconhecida do proxy -socks requisitada: %i</translation> </message> <message> - <location line="-91"/> + <location line="-96"/> <source>Cannot resolve -bind address: '%s'</source> <translation>Impossível encontrar o endereço -bind: '%s'</translation> </message> @@ -2814,17 +2865,17 @@ por exemplo: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Quantidade inválida</translation> </message> <message> - <location line="-4"/> + <location line="-6"/> <source>Insufficient funds</source> <translation>Saldo insuficiente</translation> </message> <message> - <location line="+8"/> + <location line="+10"/> <source>Loading block index...</source> <translation>Carregando índice de blocos...</translation> </message> <message> - <location line="-58"/> + <location line="-57"/> <source>Add a node to connect to and attempt to keep the connection open</source> <translation>Adicionar um nó com o qual se conectar e tentar manter a conexão ativa</translation> </message> @@ -2834,52 +2885,47 @@ por exemplo: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Impossível vincular a %s neste computador. O Bitcoin provavelmente já está rodando.</translation> </message> <message> - <location line="+67"/> + <location line="+64"/> <source>Fee per KB to add to transactions you send</source> <translation>Taxa por KB a ser acrescida nas transações que você enviar</translation> </message> <message> - <location line="+17"/> + <location line="+19"/> <source>Loading wallet...</source> <translation>Carregando carteira...</translation> </message> <message> - <location line="-53"/> + <location line="-52"/> <source>Cannot downgrade wallet</source> <translation>Não é possível fazer downgrade da carteira</translation> </message> <message> - <location line="+1"/> - <source>Cannot initialize keypool</source> - <translation>Não foi possível inicializar o pool de chaves</translation> - </message> - <message> <location line="+3"/> <source>Cannot write default address</source> <translation>Não foi possível escrever no endereço padrão</translation> </message> <message> - <location line="+63"/> + <location line="+64"/> <source>Rescanning...</source> <translation>Re-escaneando...</translation> </message> <message> - <location line="-55"/> + <location line="-57"/> <source>Done loading</source> <translation>Carregamento terminado</translation> </message> <message> - <location line="+79"/> + <location line="+82"/> <source>To use the %s option</source> <translation>Para usar a opção %s</translation> </message> <message> - <location line="-71"/> + <location line="-74"/> <source>Error</source> <translation>Erro</translation> </message> <message> - <location line="-33"/> + <location line="-31"/> <source>You must set rpcpassword=<password> in the configuration file: %s If the file does not exist, create it with owner-readable-only file permissions.</source> diff --git a/src/qt/locale/bitcoin_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 @@ <message> <location line="+39"/> <source><b>Bitcoin</b> version</source> - <translation><b>Bitcoin</b> versão</translation> + <translation>Versão do <b>Bitcoin</b></translation> </message> <message> <location line="+57"/> @@ -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.</translation> </message> <message> - <location filename="../aboutdialog.cpp" line="+17"/> + <location filename="../aboutdialog.cpp" line="+14"/> <source>Copyright</source> <translation>Copyright</translation> </message> <message> <location line="+0"/> - <source>2009-%1 The Bitcoin developers</source> - <translation>2009-%1 Os programadores Bitcoin</translation> + <source>The Bitcoin developers</source> + <translation>Os programadores Bitcoin</translation> </message> </context> <context> @@ -66,7 +66,7 @@ Este produto inclui software desenvolvido pelo Projecto OpenSSL para uso no Open <translation>&Novo Endereço</translation> </message> <message> - <location filename="../addressbookpage.cpp" line="+59"/> + <location filename="../addressbookpage.cpp" line="+63"/> <source>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.</source> <translation>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.</translation> </message> @@ -96,7 +96,17 @@ Este produto inclui software desenvolvido pelo Projecto OpenSSL para uso no Open <translation>Apagar o endereço selecionado da lista</translation> </message> <message> - <location line="-14"/> + <location line="+27"/> + <source>Export the data in the current tab to a file</source> + <translation>Exportar os dados no separador actual para um ficheiro</translation> + </message> + <message> + <location line="+3"/> + <source>&Export</source> + <translation>&Exportar</translation> + </message> + <message> + <location line="-44"/> <source>Verify a message to ensure it was signed with a specified Bitcoin address</source> <translation>Verifique a mensagem para assegurar que foi assinada com o endereço Bitcoin especificado</translation> </message> @@ -148,7 +158,7 @@ Este produto inclui software desenvolvido pelo Projecto OpenSSL para uso no Open <message> <location line="+0"/> <source>Could not write to file %1.</source> - <translation>Não conseguiu escrever para o ficheiro %1.</translation> + <translation>Não foi possível escrever para o ficheiro %1.</translation> </message> </context> <context> @@ -318,12 +328,12 @@ Este produto inclui software desenvolvido pelo Projecto OpenSSL para uso no Open <translation>Assinar &mensagem...</translation> </message> <message> - <location line="+299"/> + <location line="+280"/> <source>Synchronizing with network...</source> <translation>Sincronizando com a rede...</translation> </message> <message> - <location line="-368"/> + <location line="-349"/> <source>&Overview</source> <translation>Visã&o geral</translation> </message> @@ -398,7 +408,7 @@ Este produto inclui software desenvolvido pelo Projecto OpenSSL para uso no Open <translation>Mudar &Palavra-passe...</translation> </message> <message> - <location line="+304"/> + <location line="+285"/> <source>Importing blocks from disk...</source> <translation>Importando blocos do disco...</translation> </message> @@ -408,12 +418,7 @@ Este produto inclui software desenvolvido pelo Projecto OpenSSL para uso no Open <translation>Reindexando blocos no disco...</translation> </message> <message> - <location line="-300"/> - <source>&Export...</source> - <translation>&Exportar...</translation> - </message> - <message> - <location line="-66"/> + <location line="-347"/> <source>Send coins to a Bitcoin address</source> <translation>Enviar moedas para um endereço bitcoin</translation> </message> @@ -423,12 +428,7 @@ Este produto inclui software desenvolvido pelo Projecto OpenSSL para uso no Open <translation>Modificar opções de configuração para bitcoin</translation> </message> <message> - <location line="+18"/> - <source>Export the data in the current tab to a file</source> - <translation>Exportar os dados no separador actual para um ficheiro</translation> - </message> - <message> - <location line="-9"/> + <location line="+9"/> <source>Backup wallet to another location</source> <translation>Faça uma cópia de segurança da carteira para outra localização</translation> </message> @@ -438,7 +438,7 @@ Este produto inclui software desenvolvido pelo Projecto OpenSSL para uso no Open <translation>Mudar a frase de segurança utilizada na encriptação da carteira</translation> </message> <message> - <location line="+9"/> + <location line="+6"/> <source>&Debug window</source> <translation>Janela de &depuração</translation> </message> @@ -448,23 +448,23 @@ Este produto inclui software desenvolvido pelo Projecto OpenSSL para uso no Open <translation>Abrir consola de diagnóstico e depuração</translation> </message> <message> - <location line="-7"/> + <location line="-4"/> <source>&Verify message...</source> <translation>&Verificar mensagem...</translation> </message> <message> - <location line="-163"/> - <location line="+541"/> + <location line="-165"/> + <location line="+530"/> <source>Bitcoin</source> <translation>Bitcoin</translation> </message> <message> - <location line="-541"/> + <location line="-530"/> <source>Wallet</source> <translation>Carteira</translation> </message> <message> - <location line="+99"/> + <location line="+101"/> <source>&Send</source> <translation>&Enviar</translation> </message> @@ -509,12 +509,12 @@ Este produto inclui software desenvolvido pelo Projecto OpenSSL para uso no Open <translation>Verifique mensagens para assegurar que foram assinadas com o endereço Bitcoin especificado</translation> </message> <message> - <location line="+31"/> + <location line="+28"/> <source>&File</source> <translation>&Ficheiro</translation> </message> <message> - <location line="+8"/> + <location line="+7"/> <source>&Settings</source> <translation>Con&figurações</translation> </message> @@ -529,12 +529,7 @@ Este produto inclui software desenvolvido pelo Projecto OpenSSL para uso no Open <translation>Barra de separadores</translation> </message> <message> - <location line="+8"/> - <source>Actions toolbar</source> - <translation>Barra de ações</translation> - </message> - <message> - <location line="+13"/> + <location line="+17"/> <location line="+10"/> <source>[testnet]</source> <translation>[rede de testes]</translation> @@ -545,12 +540,17 @@ Este produto inclui software desenvolvido pelo Projecto OpenSSL para uso no Open <translation>Cliente Bitcoin</translation> </message> <message numerus="yes"> - <location line="+140"/> + <location line="+141"/> <source>%n active connection(s) to Bitcoin network</source> <translation><numerusform>%n ligação ativa à rede Bitcoin</numerusform><numerusform>%n ligações ativas à rede Bitcoin</numerusform></translation> </message> <message> - <location line="+39"/> + <location line="+22"/> + <source>No block source available...</source> + <translation>Nenhum bloco fonto disponível</translation> + </message> + <message> + <location line="+12"/> <source>Processed %1 of %2 (estimated) blocks of transaction history.</source> <translation>Processados %1 dos %2 blocos (estimados) do histórico de transacções.</translation> </message> @@ -575,7 +575,7 @@ Este produto inclui software desenvolvido pelo Projecto OpenSSL para uso no Open <translation><numerusform>%n semana</numerusform><numerusform>%n semanas</numerusform></translation> </message> <message> - <location line="+5"/> + <location line="+4"/> <source>%1 behind</source> <translation>%1 em atraso</translation> </message> @@ -590,7 +590,7 @@ Este produto inclui software desenvolvido pelo Projecto OpenSSL para uso no Open <translation>Transações posteriores poderão não ser imediatamente visíveis.</translation> </message> <message> - <location line="+21"/> + <location line="+22"/> <source>Error</source> <translation>Erro</translation> </message> @@ -605,22 +605,22 @@ Este produto inclui software desenvolvido pelo Projecto OpenSSL para uso no Open <translation>Informação</translation> </message> <message> - <location line="+68"/> + <location line="+70"/> <source>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?</source> <translation>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?</translation> </message> <message> - <location line="-138"/> + <location line="-140"/> <source>Up to date</source> <translation>Atualizado</translation> </message> <message> - <location line="+32"/> + <location line="+31"/> <source>Catching up...</source> <translation>Recuperando...</translation> </message> <message> - <location line="+110"/> + <location line="+113"/> <source>Confirm transaction fee</source> <translation>Confirme a taxa de transação</translation> </message> @@ -670,7 +670,7 @@ Endereço: %4 <translation>A carteira está <b>encriptada</b> e atualmente <b>bloqueada</b></translation> </message> <message> - <location filename="../bitcoin.cpp" line="+104"/> + <location filename="../bitcoin.cpp" line="+111"/> <source>A fatal error occurred. Bitcoin can no longer continue safely and will quit.</source> <translation>Ocorreu um erro fatal. O Bitcoin não pode continuar com segurança e irá fechar.</translation> </message> @@ -678,7 +678,7 @@ Endereço: %4 <context> <name>ClientModel</name> <message> - <location filename="../clientmodel.cpp" line="+98"/> + <location filename="../clientmodel.cpp" line="+104"/> <source>Network Alert</source> <translation>Alerta da Rede</translation> </message> @@ -809,8 +809,8 @@ Endereço: %4 </message> <message> <location line="+6"/> - <source>Optional transaction fee per kB that helps make sure your transactions are processed quickly. Most transactions are 1 kB. Fee 0.01 recommended.</source> - <translation>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.</translation> + <source>Optional transaction fee per kB that helps make sure your transactions are processed quickly. Most transactions are 1 kB.</source> + <translation>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.</translation> </message> <message> <location line="+15"/> @@ -1059,7 +1059,7 @@ Endereço: %4 <translation>Total de transações ainda não confirmadas, e que não estão contabilizadas ainda no seu saldo actual</translation> </message> <message> - <location filename="../overviewpage.cpp" line="+115"/> + <location filename="../overviewpage.cpp" line="+116"/> <location line="+1"/> <source>out of sync</source> <translation>fora de sincronia</translation> @@ -1646,6 +1646,19 @@ Endereço: %4 </message> </context> <context> + <name>SplashScreen</name> + <message> + <location filename="../splashscreen.cpp" line="+22"/> + <source>The Bitcoin developers</source> + <translation>Os programadores Bitcoin</translation> + </message> + <message> + <location line="+1"/> + <source>[testnet]</source> + <translation>[rede de testes]</translation> + </message> +</context> +<context> <name>TransactionDesc</name> <message> <location filename="../transactiondesc.cpp" line="+20"/> @@ -2120,9 +2133,27 @@ Endereço: %4 </message> </context> <context> + <name>WalletModel</name> + <message> + <location filename="../walletmodel.cpp" line="+193"/> + <source>Send Coins</source> + <translation>Enviar Moedas</translation> + </message> +</context> +<context> <name>WalletView</name> <message> - <location filename="../walletview.cpp" line="+247"/> + <location filename="../walletview.cpp" line="+42"/> + <source>&Export</source> + <translation>&Exportar</translation> + </message> + <message> + <location line="+1"/> + <source>Export the data in the current tab to a file</source> + <translation>Exportar os dados no separador actual para um ficheiro</translation> + </message> + <message> + <location line="+193"/> <source>Backup Wallet</source> <translation>Cópia de Segurança da Carteira</translation> </message> @@ -2155,37 +2186,37 @@ Endereço: %4 <context> <name>bitcoin-core</name> <message> - <location filename="../bitcoinstrings.cpp" line="+96"/> + <location filename="../bitcoinstrings.cpp" line="+94"/> <source>Bitcoin version</source> <translation>Versão Bitcoin</translation> </message> <message> - <location line="+98"/> + <location line="+102"/> <source>Usage:</source> <translation>Utilização:</translation> </message> <message> - <location line="-25"/> + <location line="-29"/> <source>Send command to -server or bitcoind</source> <translation>Enviar comando para -server ou bitcoind</translation> </message> <message> - <location line="-22"/> + <location line="-23"/> <source>List commands</source> <translation>Listar comandos</translation> </message> <message> - <location line="-10"/> + <location line="-12"/> <source>Get help for a command</source> <translation>Obter ajuda para um comando</translation> </message> <message> - <location line="+21"/> + <location line="+24"/> <source>Options:</source> <translation>Opções:</translation> </message> <message> - <location line="+23"/> + <location line="+24"/> <source>Specify configuration file (default: bitcoin.conf)</source> <translation>Especificar ficheiro de configuração (por defeito: bitcoin.conf)</translation> </message> @@ -2195,27 +2226,17 @@ Endereço: %4 <translation>Especificar ficheiro pid (por defeito: bitcoind.pid)</translation> </message> <message> - <location line="-48"/> - <source>Generate coins</source> - <translation>Gerar moedas</translation> - </message> - <message> - <location line="-27"/> - <source>Don't generate coins</source> - <translation>Não gerar moedas</translation> - </message> - <message> - <location line="+74"/> + <location line="-1"/> <source>Specify data directory</source> <translation>Especificar pasta de dados</translation> </message> <message> - <location line="-8"/> + <location line="-9"/> <source>Set database cache size in megabytes (default: 25)</source> <translation>Definir o tamanho da cache de base de dados em megabytes (por defeito: 25)</translation> </message> <message> - <location line="-27"/> + <location line="-28"/> <source>Listen for connections on <port> (default: 8333 or testnet: 18333)</source> <translation>Escute por ligações em <port> (por defeito: 8333 ou testnet: 18333)</translation> </message> @@ -2230,7 +2251,7 @@ Endereço: %4 <translation>Ligar a um nó para recuperar endereços de pares, e desligar</translation> </message> <message> - <location line="+80"/> + <location line="+82"/> <source>Specify your own public address</source> <translation>Especifique o seu endereço público</translation> </message> @@ -2240,22 +2261,22 @@ Endereço: %4 <translation>Tolerância para desligar nós mal-formados (por defeito: 100)</translation> </message> <message> - <location line="-132"/> + <location line="-134"/> <source>Number of seconds to keep misbehaving peers from reconnecting (default: 86400)</source> <translation>Número de segundos a impedir que nós mal-formados se liguem de novo (por defeito: 86400)</translation> </message> <message> - <location line="-32"/> + <location line="-29"/> <source>An error occurred while setting up the RPC port %u for listening on IPv4: %s</source> <translation>Ocorreu um erro ao definir a porta %u do serviço RPC a escutar em IPv4: %s</translation> </message> <message> - <location line="+30"/> + <location line="+27"/> <source>Listen for JSON-RPC connections on <port> (default: 8332 or testnet: 18332)</source> <translation>Escutar por ligações JSON-RPC em <port> (por defeito: 8332 ou rede de testes: 18332)</translation> </message> <message> - <location line="+36"/> + <location line="+37"/> <source>Accept command line and JSON-RPC commands</source> <translation>Aceitar comandos da consola e JSON-RPC</translation> </message> @@ -2265,17 +2286,17 @@ Endereço: %4 <translation>Correr o processo como um daemon e aceitar comandos</translation> </message> <message> - <location line="+33"/> + <location line="+37"/> <source>Use the test network</source> <translation>Utilizar a rede de testes - testnet</translation> </message> <message> - <location line="-108"/> + <location line="-112"/> <source>Accept connections from outside (default: 1 if no -proxy or -connect)</source> <translation>Aceitar ligações externas (padrão: 1 sem -proxy ou -connect)</translation> </message> <message> - <location line="-82"/> + <location line="-80"/> <source>%s, you must set a rpcpassword in the configuration file: %s It is recommended you use the following random password: @@ -2316,11 +2337,6 @@ por exemplo: alertnotify=echo %%s | mail -s "Alerta Bitcoin" admin@foo </message> <message> <location line="+3"/> - <source>Error initializing database environment %s! To recover, BACKUP THAT DIRECTORY, then remove everything from it except for wallet.dat.</source> - <translation>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.</translation> - </message> - <message> - <location line="+3"/> <source>Error: The transaction was rejected! This might happen if some of the coins in your wallet were already spent, such as if you used a copy of wallet.dat and coins were spent in the copy but not marked as spent here.</source> <translation>Erro: A transação foi rejeitada. Isso poderá acontecer se algumas das moedas na sua carteira já tiverem sido gastas, se por exemplo tiver usado uma cópia do ficheiro wallet.dat e as moedas foram gastas na cópia mas não foram marcadas como gastas aqui.</translation> </message> @@ -2345,12 +2361,7 @@ por exemplo: alertnotify=echo %%s | mail -s "Alerta Bitcoin" admin@foo <translation>Definir tamanho máximo de transações de alta-/baixa-prioridade em bytes (por defeito: 27000)</translation> </message> <message> - <location line="+3"/> - <source>Set the number of script verification threads (1-16, 0=auto, default: 0)</source> - <translation>Defina o número de processos de verificação (1-16, 0=auto, por defeito: 0)</translation> - </message> - <message> - <location line="+2"/> + <location line="+6"/> <source>This is a pre-release test build - use at your own risk - do not use for mining or merchant applications</source> <translation>Esta é uma versão de pré-lançamento - use à sua responsabilidade - não usar para minar ou aplicações comerciais</translation> </message> @@ -2390,7 +2401,7 @@ por exemplo: alertnotify=echo %%s | mail -s "Alerta Bitcoin" admin@foo <translation>Opções de criação de bloco:</translation> </message> <message> - <location line="+6"/> + <location line="+5"/> <source>Connect only to the specified node(s)</source> <translation>Apenas ligar ao(s) nó(s) especificado(s)</translation> </message> @@ -2410,7 +2421,7 @@ por exemplo: alertnotify=echo %%s | mail -s "Alerta Bitcoin" admin@foo <translation>Deseja reconstruir agora a cadeia de blocos?</translation> </message> <message> - <location line="+3"/> + <location line="+2"/> <source>Error initializing block database</source> <translation>Erro ao inicializar a cadeia de blocos</translation> </message> @@ -2436,11 +2447,6 @@ por exemplo: alertnotify=echo %%s | mail -s "Alerta Bitcoin" admin@foo </message> <message> <location line="+1"/> - <source>Error: Transaction creation failed!</source> - <translation>Erro: A criação da transacção falhou! </translation> - </message> - <message> - <location line="+1"/> <source>Error: Wallet locked, unable to create transaction!</source> <translation>Erro: Carteira bloqueada, incapaz de criar transação! </translation> </message> @@ -2510,7 +2516,12 @@ por exemplo: alertnotify=echo %%s | mail -s "Alerta Bitcoin" admin@foo <translation>Encontrar pares usando procura DNS (por defeito: 1 excepto -connect)</translation> </message> <message> - <location line="+3"/> + <location line="+1"/> + <source>Generate coins (default: 0)</source> + <translation>Gerar moedas (por defeito: 0)</translation> + </message> + <message> + <location line="+2"/> <source>How many blocks to check at startup (default: 288, 0 = all)</source> <translation>Quantos blocos verificar ao começar (por defeito: 288, 0 = todos)</translation> </message> @@ -2520,7 +2531,12 @@ por exemplo: alertnotify=echo %%s | mail -s "Alerta Bitcoin" admin@foo <translation>Qual a minúcia na verificação de blocos (0-4, por defeito: 3)</translation> </message> <message> - <location line="+24"/> + <location line="+19"/> + <source>Not enough file descriptors available.</source> + <translation>Descritores de ficheiros disponíveis são insuficientes.</translation> + </message> + <message> + <location line="+8"/> <source>Rebuild block chain index from current blk000??.dat files</source> <translation>Reconstruir a cadeia de blocos dos ficheiros blk000??.dat actuais</translation> </message> @@ -2530,7 +2546,7 @@ por exemplo: alertnotify=echo %%s | mail -s "Alerta Bitcoin" admin@foo <translation>Defina o número de processos para servir as chamadas RPC (por defeito: 4)</translation> </message> <message> - <location line="+22"/> + <location line="+26"/> <source>Verifying blocks...</source> <translation>Verificando blocos...</translation> </message> @@ -2540,12 +2556,17 @@ por exemplo: alertnotify=echo %%s | mail -s "Alerta Bitcoin" admin@foo <translation>Verificando a carteira...</translation> </message> <message> - <location line="-62"/> + <location line="-69"/> <source>Imports blocks from external blk000??.dat file</source> <translation>Importar blocos de um ficheiro blk000??.dat externo</translation> </message> <message> - <location line="+1"/> + <location line="-76"/> + <source>Set the number of script verification threads (up to 16, 0 = auto, <0 = leave that many cores free, default: 0)</source> + <translation>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)</translation> + </message> + <message> + <location line="+77"/> <source>Information</source> <translation>Informação</translation> </message> @@ -2555,6 +2576,16 @@ por exemplo: alertnotify=echo %%s | mail -s "Alerta Bitcoin" admin@foo <translation>Endereço -tor inválido: '%s'</translation> </message> <message> + <location line="+1"/> + <source>Invalid amount for -minrelaytxfee=<amount>: '%s'</source> + <translation>Quantia inválida para -minrelaytxfee=<amount>: '%s'</translation> + </message> + <message> + <location line="+1"/> + <source>Invalid amount for -mintxfee=<amount>: '%s'</source> + <translation>Quantia inválida para -mintxfee=<amount>: '%s'</translation> + </message> + <message> <location line="+8"/> <source>Maintain a full transaction index (default: 0)</source> <translation>Manter índice de transações completo (por defeito: 0)</translation> @@ -2570,7 +2601,7 @@ por exemplo: alertnotify=echo %%s | mail -s "Alerta Bitcoin" admin@foo <translation>Armazenamento intermédio de envio por ligação, <n>*1000 bytes (por defeito: 1000)</translation> </message> <message> - <location line="+1"/> + <location line="+2"/> <source>Only accept block chain matching built-in checkpoints (default: 1)</source> <translation>Apenas aceitar cadeia de blocos coincidente com marcas de verificação internas (por defeito: 1)</translation> </message> @@ -2630,6 +2661,11 @@ por exemplo: alertnotify=echo %%s | mail -s "Alerta Bitcoin" admin@foo <translation>Encolher ficheiro debug.log ao iniciar o cliente (por defeito: 1 sem -debug definido)</translation> </message> <message> + <location line="+1"/> + <source>Signing transaction failed</source> + <translation>Falhou assinatura da transação</translation> + </message> + <message> <location line="+2"/> <source>Specify connection timeout in milliseconds (default: 5000)</source> <translation>Especificar tempo de espera da ligação em millisegundos (por defeito: 5000)</translation> @@ -2640,7 +2676,22 @@ por exemplo: alertnotify=echo %%s | mail -s "Alerta Bitcoin" admin@foo <translation>Erro de sistema:</translation> </message> <message> - <location line="+10"/> + <location line="+4"/> + <source>Transaction amount too small</source> + <translation>Quantia da transação é muito baixa</translation> + </message> + <message> + <location line="+1"/> + <source>Transaction amounts must be positive</source> + <translation>Quantia da transação deverá ser positiva</translation> + </message> + <message> + <location line="+1"/> + <source>Transaction too large</source> + <translation>Transação grande demais</translation> + </message> + <message> + <location line="+7"/> <source>Use UPnP to map the listening port (default: 0)</source> <translation>Usar UPnP para mapear a porta de escuta (padrão: 0)</translation> </message> @@ -2680,7 +2731,7 @@ por exemplo: alertnotify=echo %%s | mail -s "Alerta Bitcoin" admin@foo <translation>wallet.dat corrupta, recuperação falhou</translation> </message> <message> - <location line="-46"/> + <location line="-50"/> <source>Password for JSON-RPC connections</source> <translation>Palavra-passe para ligações JSON-RPC</translation> </message> @@ -2695,17 +2746,17 @@ por exemplo: alertnotify=echo %%s | mail -s "Alerta Bitcoin" admin@foo <translation>Enviar comandos para o nó a correr em <ip> (por defeito: 127.0.0.1)</translation> </message> <message> - <location line="-119"/> + <location line="-120"/> <source>Execute command when the best block changes (%s in cmd is replaced by block hash)</source> <translation>Executar comando quando mudar o melhor bloco (no comando, %s é substituído pela hash do bloco)</translation> </message> <message> - <location line="+142"/> + <location line="+147"/> <source>Upgrade wallet to latest format</source> <translation>Atualize a carteira para o formato mais recente</translation> </message> <message> - <location line="-17"/> + <location line="-21"/> <source>Set key pool size to <n> (default: 100)</source> <translation>Definir o tamanho da memória de chaves para <n> (por defeito: 100)</translation> </message> @@ -2715,12 +2766,12 @@ por exemplo: alertnotify=echo %%s | mail -s "Alerta Bitcoin" admin@foo <translation>Reexaminar a cadeia de blocos para transações em falta na carteira</translation> </message> <message> - <location line="+31"/> + <location line="+35"/> <source>Use OpenSSL (https) for JSON-RPC connections</source> <translation>Usar OpenSSL (https) para ligações JSON-RPC</translation> </message> <message> - <location line="-22"/> + <location line="-26"/> <source>Server certificate file (default: server.cert)</source> <translation>Ficheiro de certificado do servidor (por defeito: server.cert)</translation> </message> @@ -2730,37 +2781,37 @@ por exemplo: alertnotify=echo %%s | mail -s "Alerta Bitcoin" admin@foo <translation>Chave privada do servidor (por defeito: server.pem)</translation> </message> <message> - <location line="-153"/> + <location line="-151"/> <source>Acceptable ciphers (default: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH)</source> <translation>Cifras aceitáveis (por defeito: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH)</translation> </message> <message> - <location line="+166"/> + <location line="+165"/> <source>This help message</source> <translation>Esta mensagem de ajuda</translation> </message> <message> - <location line="+3"/> + <location line="+6"/> <source>Unable to bind to %s on this computer (bind returned error %d, %s)</source> <translation>Incapaz de vincular a %s neste computador (vínculo retornou erro %d, %s)</translation> </message> <message> - <location line="-86"/> + <location line="-91"/> <source>Connect through socks proxy</source> <translation>Ligar através de um proxy socks</translation> </message> <message> - <location line="-11"/> + <location line="-10"/> <source>Allow DNS lookups for -addnode, -seednode and -connect</source> <translation>Permitir procuras DNS para -addnode, -seednode e -connect</translation> </message> <message> - <location line="+56"/> + <location line="+55"/> <source>Loading addresses...</source> <translation>Carregar endereços...</translation> </message> <message> - <location line="-34"/> + <location line="-35"/> <source>Error loading wallet.dat: Wallet corrupted</source> <translation>Erro ao carregar wallet.dat: Carteira danificada</translation> </message> @@ -2770,22 +2821,22 @@ por exemplo: alertnotify=echo %%s | mail -s "Alerta Bitcoin" admin@foo <translation>Erro ao carregar wallet.dat: A Carteira requer uma versão mais recente do Bitcoin</translation> </message> <message> - <location line="+87"/> + <location line="+93"/> <source>Wallet needed to be rewritten: restart Bitcoin to complete</source> <translation>A Carteira precisou ser reescrita: reinicie o Bitcoin para completar</translation> </message> <message> - <location line="-89"/> + <location line="-95"/> <source>Error loading wallet.dat</source> <translation>Erro ao carregar wallet.dat</translation> </message> <message> - <location line="+29"/> + <location line="+28"/> <source>Invalid -proxy address: '%s'</source> <translation>Endereço -proxy inválido: '%s'</translation> </message> <message> - <location line="+49"/> + <location line="+56"/> <source>Unknown network specified in -onlynet: '%s'</source> <translation>Rede desconhecida especificada em -onlynet: '%s'</translation> </message> @@ -2795,7 +2846,7 @@ por exemplo: alertnotify=echo %%s | mail -s "Alerta Bitcoin" admin@foo <translation>Versão desconhecida de proxy -socks requisitada: %i</translation> </message> <message> - <location line="-91"/> + <location line="-96"/> <source>Cannot resolve -bind address: '%s'</source> <translation>Não conseguiu resolver endereço -bind: '%s'</translation> </message> @@ -2815,17 +2866,17 @@ por exemplo: alertnotify=echo %%s | mail -s "Alerta Bitcoin" admin@foo <translation>Quantia inválida</translation> </message> <message> - <location line="-4"/> + <location line="-6"/> <source>Insufficient funds</source> <translation>Fundos insuficientes</translation> </message> <message> - <location line="+8"/> + <location line="+10"/> <source>Loading block index...</source> <translation>Carregar índice de blocos...</translation> </message> <message> - <location line="-58"/> + <location line="-57"/> <source>Add a node to connect to and attempt to keep the connection open</source> <translation>Adicione um nó ao qual se ligar e tentar manter a ligação aberta</translation> </message> @@ -2835,52 +2886,47 @@ por exemplo: alertnotify=echo %%s | mail -s "Alerta Bitcoin" admin@foo <translation>Incapaz de vincular à porta %s neste computador. Provavelmente o Bitcoin já está a funcionar.</translation> </message> <message> - <location line="+67"/> + <location line="+64"/> <source>Fee per KB to add to transactions you send</source> <translation>Taxa por KB a adicionar a transações enviadas</translation> </message> <message> - <location line="+17"/> + <location line="+19"/> <source>Loading wallet...</source> <translation>Carregar carteira...</translation> </message> <message> - <location line="-53"/> + <location line="-52"/> <source>Cannot downgrade wallet</source> <translation>Impossível mudar a carteira para uma versão anterior</translation> </message> <message> - <location line="+1"/> - <source>Cannot initialize keypool</source> - <translation>Impossível inicializar keypool</translation> - </message> - <message> <location line="+3"/> <source>Cannot write default address</source> <translation>Impossível escrever endereço por defeito</translation> </message> <message> - <location line="+63"/> + <location line="+64"/> <source>Rescanning...</source> <translation>Reexaminando...</translation> </message> <message> - <location line="-55"/> + <location line="-57"/> <source>Done loading</source> <translation>Carregamento completo</translation> </message> <message> - <location line="+79"/> + <location line="+82"/> <source>To use the %s option</source> <translation>Para usar a opção %s</translation> </message> <message> - <location line="-71"/> + <location line="-74"/> <source>Error</source> <translation>Erro</translation> </message> <message> - <location line="-33"/> + <location line="-31"/> <source>You must set rpcpassword=<password> in the configuration file: %s If the file does not exist, create it with owner-readable-only file permissions.</source> diff --git a/src/qt/locale/bitcoin_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 <translation type="unfinished"/> </message> <message> - <location filename="../aboutdialog.cpp" line="+17"/> + <location filename="../aboutdialog.cpp" line="+14"/> <source>Copyright</source> <translation type="unfinished"/> </message> <message> <location line="+0"/> - <source>2009-%1 The Bitcoin developers</source> + <source>The Bitcoin developers</source> <translation type="unfinished"/> </message> </context> @@ -61,7 +61,7 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>&Adresă nouă</translation> </message> <message> - <location filename="../addressbookpage.cpp" line="+59"/> + <location filename="../addressbookpage.cpp" line="+63"/> <source>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.</source> <translation>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.</translation> </message> @@ -91,7 +91,17 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>Sterge adresele curent selectate din lista</translation> </message> <message> - <location line="-14"/> + <location line="+27"/> + <source>Export the data in the current tab to a file</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+3"/> + <source>&Export</source> + <translation type="unfinished"/> + </message> + <message> + <location line="-44"/> <source>Verify a message to ensure it was signed with a specified Bitcoin address</source> <translation>Verifica mesajul pentru a te asigura ca a fost insemnat cu o adresa bitcoin specifica</translation> </message> @@ -313,12 +323,12 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>Semneaza &mesaj...</translation> </message> <message> - <location line="+299"/> + <location line="+280"/> <source>Synchronizing with network...</source> <translation>Se sincronizează cu reţeaua...</translation> </message> <message> - <location line="-368"/> + <location line="-349"/> <source>&Overview</source> <translation>&Detalii</translation> </message> @@ -393,7 +403,7 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>&Schimbă parola...</translation> </message> <message> - <location line="+304"/> + <location line="+285"/> <source>Importing blocks from disk...</source> <translation>Importare blocks de pe disk...</translation> </message> @@ -403,12 +413,7 @@ This product includes software developed by the OpenSSL Project for use in the O <translation type="unfinished"/> </message> <message> - <location line="-300"/> - <source>&Export...</source> - <translation>&Exportă...</translation> - </message> - <message> - <location line="-66"/> + <location line="-347"/> <source>Send coins to a Bitcoin address</source> <translation>&Trimiteţi Bitcoin către o anumită adresă</translation> </message> @@ -418,12 +423,7 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>Modifică setările pentru Bitcoin</translation> </message> <message> - <location line="+18"/> - <source>Export the data in the current tab to a file</source> - <translation>Exporta datele din tab-ul curent catre un fiesier</translation> - </message> - <message> - <location line="-9"/> + <location line="+9"/> <source>Backup wallet to another location</source> <translation>Creaza copie de rezerva a portofelului intr-o locatie diferita</translation> </message> @@ -433,7 +433,7 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>&Schimbă parola folosită pentru criptarea portofelului electronic</translation> </message> <message> - <location line="+9"/> + <location line="+6"/> <source>&Debug window</source> <translation>& Fereastra debug</translation> </message> @@ -443,23 +443,23 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>Deschide consola de debug si diagnosticare</translation> </message> <message> - <location line="-7"/> + <location line="-4"/> <source>&Verify message...</source> <translation>Verifica mesajul</translation> </message> <message> - <location line="-163"/> - <location line="+541"/> + <location line="-165"/> + <location line="+530"/> <source>Bitcoin</source> <translation>Bitcoin</translation> </message> <message> - <location line="-541"/> + <location line="-530"/> <source>Wallet</source> <translation>Portofelul</translation> </message> <message> - <location line="+99"/> + <location line="+101"/> <source>&Send</source> <translation type="unfinished"/> </message> @@ -504,12 +504,12 @@ This product includes software developed by the OpenSSL Project for use in the O <translation type="unfinished"/> </message> <message> - <location line="+31"/> + <location line="+28"/> <source>&File</source> <translation>&Fişier</translation> </message> <message> - <location line="+8"/> + <location line="+7"/> <source>&Settings</source> <translation>&Setări</translation> </message> @@ -524,12 +524,7 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>Bara de ferestre de lucru</translation> </message> <message> - <location line="+8"/> - <source>Actions toolbar</source> - <translation>Bara de acţiuni</translation> - </message> - <message> - <location line="+13"/> + <location line="+17"/> <location line="+10"/> <source>[testnet]</source> <translation>[testnet]</translation> @@ -540,12 +535,17 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>Client Bitcoin</translation> </message> <message numerus="yes"> - <location line="+140"/> + <location line="+141"/> <source>%n active connection(s) to Bitcoin network</source> <translation><numerusform>%n active connections to Bitcoin network</numerusform><numerusform>%n active connections to Bitcoin network</numerusform><numerusform>%n active connections to Bitcoin network</numerusform></translation> </message> <message> - <location line="+39"/> + <location line="+22"/> + <source>No block source available...</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+12"/> <source>Processed %1 of %2 (estimated) blocks of transaction history.</source> <translation type="unfinished"/> </message> @@ -570,7 +570,7 @@ This product includes software developed by the OpenSSL Project for use in the O <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation> </message> <message> - <location line="+5"/> + <location line="+4"/> <source>%1 behind</source> <translation type="unfinished"/> </message> @@ -585,7 +585,7 @@ This product includes software developed by the OpenSSL Project for use in the O <translation type="unfinished"/> </message> <message> - <location line="+21"/> + <location line="+22"/> <source>Error</source> <translation type="unfinished"/> </message> @@ -600,22 +600,22 @@ This product includes software developed by the OpenSSL Project for use in the O <translation type="unfinished"/> </message> <message> - <location line="+68"/> + <location line="+70"/> <source>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?</source> <translation type="unfinished"/> </message> <message> - <location line="-138"/> + <location line="-140"/> <source>Up to date</source> <translation>Actualizat</translation> </message> <message> - <location line="+32"/> + <location line="+31"/> <source>Catching up...</source> <translation>Se actualizează...</translation> </message> <message> - <location line="+110"/> + <location line="+113"/> <source>Confirm transaction fee</source> <translation>Confirma taxa tranzactiei</translation> </message> @@ -661,7 +661,7 @@ Address: %4 <translation>Portofelul electronic este <b>criptat</b> iar in momentul de faţă este <b>blocat</b></translation> </message> <message> - <location filename="../bitcoin.cpp" line="+104"/> + <location filename="../bitcoin.cpp" line="+111"/> <source>A fatal error occurred. Bitcoin can no longer continue safely and will quit.</source> <translation type="unfinished"/> </message> @@ -669,7 +669,7 @@ Address: %4 <context> <name>ClientModel</name> <message> - <location filename="../clientmodel.cpp" line="+98"/> + <location filename="../clientmodel.cpp" line="+104"/> <source>Network Alert</source> <translation>Alerta retea</translation> </message> @@ -800,8 +800,8 @@ Address: %4 </message> <message> <location line="+6"/> - <source>Optional transaction fee per kB that helps make sure your transactions are processed quickly. Most transactions are 1 kB. Fee 0.01 recommended.</source> - <translation>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.</translation> + <source>Optional transaction fee per kB that helps make sure your transactions are processed quickly. Most transactions are 1 kB.</source> + <translation type="unfinished"/> </message> <message> <location line="+15"/> @@ -1050,7 +1050,7 @@ Address: %4 <translation>Totalul tranzacţiilor care aşteaptă să fie confirmate şi care nu sunt încă luate în calcul la afişarea soldului contului.</translation> </message> <message> - <location filename="../overviewpage.cpp" line="+115"/> + <location filename="../overviewpage.cpp" line="+116"/> <location line="+1"/> <source>out of sync</source> <translation>Nu este sincronizat</translation> @@ -1637,6 +1637,19 @@ Address: %4 </message> </context> <context> + <name>SplashScreen</name> + <message> + <location filename="../splashscreen.cpp" line="+22"/> + <source>The Bitcoin developers</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>[testnet]</source> + <translation>[testnet]</translation> + </message> +</context> +<context> <name>TransactionDesc</name> <message> <location filename="../transactiondesc.cpp" line="+20"/> @@ -2111,9 +2124,27 @@ Address: %4 </message> </context> <context> + <name>WalletModel</name> + <message> + <location filename="../walletmodel.cpp" line="+193"/> + <source>Send Coins</source> + <translation>Trimite Bitcoin</translation> + </message> +</context> +<context> <name>WalletView</name> <message> - <location filename="../walletview.cpp" line="+247"/> + <location filename="../walletview.cpp" line="+42"/> + <source>&Export</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Export the data in the current tab to a file</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+193"/> <source>Backup Wallet</source> <translation type="unfinished"/> </message> @@ -2146,37 +2177,37 @@ Address: %4 <context> <name>bitcoin-core</name> <message> - <location filename="../bitcoinstrings.cpp" line="+96"/> + <location filename="../bitcoinstrings.cpp" line="+94"/> <source>Bitcoin version</source> <translation>versiunea Bitcoin</translation> </message> <message> - <location line="+98"/> + <location line="+102"/> <source>Usage:</source> <translation>Uz:</translation> </message> <message> - <location line="-25"/> + <location line="-29"/> <source>Send command to -server or bitcoind</source> <translation>Trimite comanda la -server sau bitcoind</translation> </message> <message> - <location line="-22"/> + <location line="-23"/> <source>List commands</source> <translation>Listă de comenzi</translation> </message> <message> - <location line="-10"/> + <location line="-12"/> <source>Get help for a command</source> <translation>Ajutor pentru o comandă</translation> </message> <message> - <location line="+21"/> + <location line="+24"/> <source>Options:</source> <translation>Setări:</translation> </message> <message> - <location line="+23"/> + <location line="+24"/> <source>Specify configuration file (default: bitcoin.conf)</source> <translation>Specifica-ți configurația fisierului (in mod normal: bitcoin.conf)</translation> </message> @@ -2186,27 +2217,17 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="-48"/> - <source>Generate coins</source> - <translation>Generare monede</translation> - </message> - <message> - <location line="-27"/> - <source>Don't generate coins</source> - <translation>Nu genera monede!</translation> - </message> - <message> - <location line="+74"/> + <location line="-1"/> <source>Specify data directory</source> <translation>Specifica datele directorului</translation> </message> <message> - <location line="-8"/> + <location line="-9"/> <source>Set database cache size in megabytes (default: 25)</source> <translation>Seteaza marimea cache a bazei de date in MB (initial: 25)</translation> </message> <message> - <location line="-27"/> + <location line="-28"/> <source>Listen for connections on <port> (default: 8333 or testnet: 18333)</source> <translation>Lista a conectiunile in <port> (initial: 8333 sau testnet: 18333)</translation> </message> @@ -2221,7 +2242,7 @@ Address: %4 <translation>Conecteaza-te la nod pentru a optine adresa peer, si deconecteaza-te</translation> </message> <message> - <location line="+80"/> + <location line="+82"/> <source>Specify your own public address</source> <translation>Specifica adresa ta publica</translation> </message> @@ -2231,22 +2252,22 @@ Address: %4 <translation>Prag pentru deconectarea colegii funcționează corect (implicit: 100)</translation> </message> <message> - <location line="-132"/> + <location line="-134"/> <source>Number of seconds to keep misbehaving peers from reconnecting (default: 86400)</source> <translation>Numărul de secunde pentru a păstra colegii funcționează corect la reconectare (implicit: 86400)</translation> </message> <message> - <location line="-32"/> + <location line="-29"/> <source>An error occurred while setting up the RPC port %u for listening on IPv4: %s</source> <translation type="unfinished"/> </message> <message> - <location line="+30"/> + <location line="+27"/> <source>Listen for JSON-RPC connections on <port> (default: 8332 or testnet: 18332)</source> <translation type="unfinished"/> </message> <message> - <location line="+36"/> + <location line="+37"/> <source>Accept command line and JSON-RPC commands</source> <translation>Se accepta command line si comenzi JSON-RPC</translation> </message> @@ -2256,18 +2277,18 @@ Address: %4 <translation>Ruleaza în background ca un demon și accepta comenzi.</translation> </message> <message> - <location line="+33"/> + <location line="+37"/> <source>Use the test network</source> <translation>Utilizeaza test de retea</translation> </message> <message> - <location line="-108"/> + <location line="-112"/> <source>Accept connections from outside (default: 1 if no -proxy or -connect)</source> <translation>Accepta conexiuni de la straini (initial: 1 if no -proxy or -connect) </translation> </message> <message> - <location line="-82"/> + <location line="-80"/> <source>%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. </message> <message> <location line="+3"/> - <source>Error initializing database environment %s! To recover, BACKUP THAT DIRECTORY, then remove everything from it except for wallet.dat.</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+3"/> <source>Error: The transaction was rejected! This might happen if some of the coins in your wallet were already spent, such as if you used a copy of wallet.dat and coins were spent in the copy but not marked as spent here.</source> <translation type="unfinished"/> </message> @@ -2327,12 +2343,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Seteaza marimea maxima a tranzactie mare/mica in bytes (initial:27000)</translation> </message> <message> - <location line="+3"/> - <source>Set the number of script verification threads (1-16, 0=auto, default: 0)</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+2"/> + <location line="+6"/> <source>This is a pre-release test build - use at your own risk - do not use for mining or merchant applications</source> <translation type="unfinished"/> </message> @@ -2372,7 +2383,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Optiuni creare block</translation> </message> <message> - <location line="+6"/> + <location line="+5"/> <source>Connect only to the specified node(s)</source> <translation>Conecteaza-te doar la nod(urile) specifice</translation> </message> @@ -2392,7 +2403,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+3"/> + <location line="+2"/> <source>Error initializing block database</source> <translation type="unfinished"/> </message> @@ -2418,11 +2429,6 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. </message> <message> <location line="+1"/> - <source>Error: Transaction creation failed!</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+1"/> <source>Error: Wallet locked, unable to create transaction!</source> <translation type="unfinished"/> </message> @@ -2492,7 +2498,12 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+3"/> + <location line="+1"/> + <source>Generate coins (default: 0)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+2"/> <source>How many blocks to check at startup (default: 288, 0 = all)</source> <translation type="unfinished"/> </message> @@ -2502,7 +2513,12 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+24"/> + <location line="+19"/> + <source>Not enough file descriptors available.</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+8"/> <source>Rebuild block chain index from current blk000??.dat files</source> <translation type="unfinished"/> </message> @@ -2512,7 +2528,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+22"/> + <location line="+26"/> <source>Verifying blocks...</source> <translation type="unfinished"/> </message> @@ -2522,12 +2538,17 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="-62"/> + <location line="-69"/> <source>Imports blocks from external blk000??.dat file</source> <translation type="unfinished"/> </message> <message> - <location line="+1"/> + <location line="-76"/> + <source>Set the number of script verification threads (up to 16, 0 = auto, <0 = leave that many cores free, default: 0)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+77"/> <source>Information</source> <translation type="unfinished"/> </message> @@ -2537,6 +2558,16 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> + <location line="+1"/> + <source>Invalid amount for -minrelaytxfee=<amount>: '%s'</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Invalid amount for -mintxfee=<amount>: '%s'</source> + <translation type="unfinished"/> + </message> + <message> <location line="+8"/> <source>Maintain a full transaction index (default: 0)</source> <translation type="unfinished"/> @@ -2552,7 +2583,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+1"/> + <location line="+2"/> <source>Only accept block chain matching built-in checkpoints (default: 1)</source> <translation type="unfinished"/> </message> @@ -2612,6 +2643,11 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> + <location line="+1"/> + <source>Signing transaction failed</source> + <translation type="unfinished"/> + </message> + <message> <location line="+2"/> <source>Specify connection timeout in milliseconds (default: 5000)</source> <translation type="unfinished"/> @@ -2622,7 +2658,22 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+10"/> + <location line="+4"/> + <source>Transaction amount too small</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Transaction amounts must be positive</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Transaction too large</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+7"/> <source>Use UPnP to map the listening port (default: 0)</source> <translation>Foloseste UPnP pentru a vedea porturile (initial: 0)</translation> </message> @@ -2662,7 +2713,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="-46"/> + <location line="-50"/> <source>Password for JSON-RPC connections</source> <translation>Parola pentru conectiunile JSON-RPC</translation> </message> @@ -2677,17 +2728,17 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Trimite comenzi la nod, ruland pe ip-ul (initial: 127.0.0.1)</translation> </message> <message> - <location line="-119"/> + <location line="-120"/> <source>Execute command when the best block changes (%s in cmd is replaced by block hash)</source> <translation>Executa comanda cand cel mai bun block se schimba (%s in cmd se inlocuieste cu block hash)</translation> </message> <message> - <location line="+142"/> + <location line="+147"/> <source>Upgrade wallet to latest format</source> <translation>Actualizeaza portofelul la ultimul format</translation> </message> <message> - <location line="-17"/> + <location line="-21"/> <source>Set key pool size to <n> (default: 100)</source> <translation>Setarea marimii cheii bezinului la <n>(initial 100)</translation> </message> @@ -2697,12 +2748,12 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Rescanare lanțul de bloc pentru tranzacțiile portofel lipsă</translation> </message> <message> - <location line="+31"/> + <location line="+35"/> <source>Use OpenSSL (https) for JSON-RPC connections</source> <translation>Foloseste Open SSL(https) pentru coneciunile JSON-RPC</translation> </message> <message> - <location line="-22"/> + <location line="-26"/> <source>Server certificate file (default: server.cert)</source> <translation>Certificatul serverulu (initial: server.cert)</translation> </message> @@ -2712,39 +2763,39 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Cheia privata a serverului ( initial: server.pem)</translation> </message> <message> - <location line="-153"/> + <location line="-151"/> <source>Acceptable ciphers (default: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH)</source> <translation>Accepta cifruri (initial: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH)</translation> </message> <message> - <location line="+166"/> + <location line="+165"/> <source>This help message</source> <translation>Acest mesaj de ajutor.</translation> </message> <message> - <location line="+3"/> + <location line="+6"/> <source>Unable to bind to %s on this computer (bind returned error %d, %s)</source> <translation>Nu se poate lega %s cu acest calculator (retunare eroare legatura %d, %s) </translation> </message> <message> - <location line="-86"/> + <location line="-91"/> <source>Connect through socks proxy</source> <translation>Conectează prin proxy SOCKS</translation> </message> <message> - <location line="-11"/> + <location line="-10"/> <source>Allow DNS lookups for -addnode, -seednode and -connect</source> <translation>Permite DNS-ului sa se uite dupa -addnode, -seednode si -connect</translation> </message> <message> - <location line="+56"/> + <location line="+55"/> <source>Loading addresses...</source> <translation>Încarc adrese...</translation> </message> <message> - <location line="-34"/> + <location line="-35"/> <source>Error loading wallet.dat: Wallet corrupted</source> <translation>Eroare incarcand wallet.dat: Portofel corupt</translation> </message> @@ -2754,22 +2805,22 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Eroare incarcare wallet.dat: Portofelul are nevoie de o versiune Bitcoin mai noua</translation> </message> <message> - <location line="+87"/> + <location line="+93"/> <source>Wallet needed to be rewritten: restart Bitcoin to complete</source> <translation>Portofelul trebuie rescris: restarteaza aplicatia bitcoin pentru a face asta.</translation> </message> <message> - <location line="-89"/> + <location line="-95"/> <source>Error loading wallet.dat</source> <translation>Eroare incarcand wallet.dat</translation> </message> <message> - <location line="+29"/> + <location line="+28"/> <source>Invalid -proxy address: '%s'</source> <translation>Adresa proxy invalida: '%s'</translation> </message> <message> - <location line="+49"/> + <location line="+56"/> <source>Unknown network specified in -onlynet: '%s'</source> <translation>Retea specificata necunoscuta -onlynet: '%s'</translation> </message> @@ -2779,7 +2830,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Necunoscut -socks proxy version requested: %i</translation> </message> <message> - <location line="-91"/> + <location line="-96"/> <source>Cannot resolve -bind address: '%s'</source> <translation>Nu se poate rezolca -bind address: '%s'</translation> </message> @@ -2799,17 +2850,17 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Suma invalida</translation> </message> <message> - <location line="-4"/> + <location line="-6"/> <source>Insufficient funds</source> <translation>Fonduri insuficiente</translation> </message> <message> - <location line="+8"/> + <location line="+10"/> <source>Loading block index...</source> <translation>Încarc indice bloc...</translation> </message> <message> - <location line="-58"/> + <location line="-57"/> <source>Add a node to connect to and attempt to keep the connection open</source> <translation>Add a node to connect to and attempt to keep the connection open details suggestions history @@ -2821,52 +2872,47 @@ details suggestions history <translation>Imposibilitatea de a lega la% s pe acest computer. Bitcoin este, probabil, deja în execuție.</translation> </message> <message> - <location line="+67"/> + <location line="+64"/> <source>Fee per KB to add to transactions you send</source> <translation>Taxa pe kb pentru a adauga tranzactii trimise</translation> </message> <message> - <location line="+17"/> + <location line="+19"/> <source>Loading wallet...</source> <translation>Încarc portofel...</translation> </message> <message> - <location line="-53"/> + <location line="-52"/> <source>Cannot downgrade wallet</source> <translation>Nu se poate face downgrade la portofel</translation> </message> <message> - <location line="+1"/> - <source>Cannot initialize keypool</source> - <translation>Nu se poate initializa keypool</translation> - </message> - <message> <location line="+3"/> <source>Cannot write default address</source> <translation>Nu se poate scrie adresa initiala</translation> </message> <message> - <location line="+63"/> + <location line="+64"/> <source>Rescanning...</source> <translation>Rescanez...</translation> </message> <message> - <location line="-55"/> + <location line="-57"/> <source>Done loading</source> <translation>Încărcare terminată</translation> </message> <message> - <location line="+79"/> + <location line="+82"/> <source>To use the %s option</source> <translation>Pentru a folosii optiunea %s</translation> </message> <message> - <location line="-71"/> + <location line="-74"/> <source>Error</source> <translation>Eroare</translation> </message> <message> - <location line="-33"/> + <location line="-31"/> <source>You must set rpcpassword=<password> in the configuration file: %s If the file does not exist, create it with owner-readable-only file permissions.</source> diff --git a/src/qt/locale/bitcoin_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.</translation> </message> <message> - <location filename="../aboutdialog.cpp" line="+17"/> + <location filename="../aboutdialog.cpp" line="+14"/> <source>Copyright</source> <translation>Все права защищены</translation> </message> <message> <location line="+0"/> - <source>2009-%1 The Bitcoin developers</source> - <translation>2009-%1 разработчики Bitcoin</translation> + <source>The Bitcoin developers</source> + <translation>Разработчики Bitcoin</translation> </message> </context> <context> @@ -66,7 +66,7 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>&Новый адрес</translation> </message> <message> - <location filename="../addressbookpage.cpp" line="+59"/> + <location filename="../addressbookpage.cpp" line="+63"/> <source>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.</source> <translation>Это Ваши адреса для получения платежей. Вы можете дать разные адреса отправителям, чтобы отслеживать, кто именно вам платит.</translation> </message> @@ -96,7 +96,17 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>Удалить выбранный адрес из списка</translation> </message> <message> - <location line="-14"/> + <location line="+27"/> + <source>Export the data in the current tab to a file</source> + <translation>Экспортировать данные из вкладки в файл</translation> + </message> + <message> + <location line="+3"/> + <source>&Export</source> + <translation>&Экспорт</translation> + </message> + <message> + <location line="-44"/> <source>Verify a message to ensure it was signed with a specified Bitcoin address</source> <translation>Проверить сообщение, чтобы убедиться, что оно было подписано указанным адресом Bitcoin</translation> </message> @@ -318,12 +328,12 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>&Подписать сообщение...</translation> </message> <message> - <location line="+299"/> + <location line="+280"/> <source>Synchronizing with network...</source> <translation>Синхронизация с сетью...</translation> </message> <message> - <location line="-368"/> + <location line="-349"/> <source>&Overview</source> <translation>О&бзор</translation> </message> @@ -398,7 +408,7 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>&Изменить пароль...</translation> </message> <message> - <location line="+304"/> + <location line="+285"/> <source>Importing blocks from disk...</source> <translation>Импортируются блоки с диска...</translation> </message> @@ -408,12 +418,7 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>Идёт переиндексация блоков на диске...</translation> </message> <message> - <location line="-300"/> - <source>&Export...</source> - <translation>&Экспорт...</translation> - </message> - <message> - <location line="-66"/> + <location line="-347"/> <source>Send coins to a Bitcoin address</source> <translation>Отправить монеты на указанный адрес Bitcoin</translation> </message> @@ -423,12 +428,7 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>Изменить параметры конфигурации Bitcoin</translation> </message> <message> - <location line="+18"/> - <source>Export the data in the current tab to a file</source> - <translation>Экспортировать данные из вкладки в файл</translation> - </message> - <message> - <location line="-9"/> + <location line="+9"/> <source>Backup wallet to another location</source> <translation>Сделать резервную копию бумажника в другом месте</translation> </message> @@ -438,7 +438,7 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>Изменить пароль шифрования бумажника</translation> </message> <message> - <location line="+9"/> + <location line="+6"/> <source>&Debug window</source> <translation>&Окно отладки</translation> </message> @@ -448,23 +448,23 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>Открыть консоль отладки и диагностики</translation> </message> <message> - <location line="-7"/> + <location line="-4"/> <source>&Verify message...</source> <translation>&Проверить сообщение...</translation> </message> <message> - <location line="-163"/> - <location line="+541"/> + <location line="-165"/> + <location line="+530"/> <source>Bitcoin</source> <translation>Биткоин</translation> </message> <message> - <location line="-541"/> + <location line="-530"/> <source>Wallet</source> <translation>Бумажник</translation> </message> <message> - <location line="+99"/> + <location line="+101"/> <source>&Send</source> <translation>&Отправить</translation> </message> @@ -509,12 +509,12 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>Проверить сообщения, чтобы удостовериться, что они были подписаны определённым адресом Bitcoin</translation> </message> <message> - <location line="+31"/> + <location line="+28"/> <source>&File</source> <translation>&Файл</translation> </message> <message> - <location line="+8"/> + <location line="+7"/> <source>&Settings</source> <translation>&Настройки</translation> </message> @@ -529,12 +529,7 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>Панель вкладок</translation> </message> <message> - <location line="+8"/> - <source>Actions toolbar</source> - <translation>Панель действий</translation> - </message> - <message> - <location line="+13"/> + <location line="+17"/> <location line="+10"/> <source>[testnet]</source> <translation>[тестовая сеть]</translation> @@ -545,12 +540,17 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>Bitcoin клиент</translation> </message> <message numerus="yes"> - <location line="+140"/> + <location line="+141"/> <source>%n active connection(s) to Bitcoin network</source> <translation><numerusform>%n активное соединение с сетью</numerusform><numerusform>%n активных соединений с сетью</numerusform><numerusform>%n активных соединений с сетью</numerusform></translation> </message> <message> - <location line="+39"/> + <location line="+22"/> + <source>No block source available...</source> + <translation>Источник блоков недоступен...</translation> + </message> + <message> + <location line="+12"/> <source>Processed %1 of %2 (estimated) blocks of transaction history.</source> <translation>Обработано %1 из %2 (примерно) блоков истории транзакций.</translation> </message> @@ -575,7 +575,7 @@ This product includes software developed by the OpenSSL Project for use in the O <translation><numerusform>%n неделя</numerusform><numerusform>%n недели</numerusform><numerusform>%n недель</numerusform></translation> </message> <message> - <location line="+5"/> + <location line="+4"/> <source>%1 behind</source> <translation>%1 позади</translation> </message> @@ -590,7 +590,7 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>Транзакции после этой пока не будут видны.</translation> </message> <message> - <location line="+21"/> + <location line="+22"/> <source>Error</source> <translation>Ошибка</translation> </message> @@ -605,22 +605,22 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>Информация</translation> </message> <message> - <location line="+68"/> + <location line="+70"/> <source>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?</source> <translation>Транзакция превышает максимальный размер. Вы можете провести её, заплатив комиссию %1, которая достанется узлам, обрабатывающим эту транзакцию, и поможет работе сети. Вы действительно хотите заплатить комиссию?</translation> </message> <message> - <location line="-138"/> + <location line="-140"/> <source>Up to date</source> <translation>Синхронизировано</translation> </message> <message> - <location line="+32"/> + <location line="+31"/> <source>Catching up...</source> <translation>Синхронизируется...</translation> </message> <message> - <location line="+110"/> + <location line="+113"/> <source>Confirm transaction fee</source> <translation>Подтвердите комиссию</translation> </message> @@ -670,7 +670,7 @@ Address: %4 <translation>Бумажник <b>зашифрован</b> и в настоящее время <b>заблокирован</b></translation> </message> <message> - <location filename="../bitcoin.cpp" line="+104"/> + <location filename="../bitcoin.cpp" line="+111"/> <source>A fatal error occurred. Bitcoin can no longer continue safely and will quit.</source> <translation>Произошла неисправимая ошибка. Bitcoin не может безопасно продолжать работу и будет закрыт.</translation> </message> @@ -678,7 +678,7 @@ Address: %4 <context> <name>ClientModel</name> <message> - <location filename="../clientmodel.cpp" line="+98"/> + <location filename="../clientmodel.cpp" line="+104"/> <source>Network Alert</source> <translation>Сетевая Тревога</translation> </message> @@ -809,8 +809,8 @@ Address: %4 </message> <message> <location line="+6"/> - <source>Optional transaction fee per kB that helps make sure your transactions are processed quickly. Most transactions are 1 kB. Fee 0.01 recommended.</source> - <translation>Необязательная комиссия за каждый КБ транзакции, которая позволяет быть уверенным, что Ваша транзакция будет обработана быстро. Большинство транзакций занимают 1КБ. Рекомендуется комиссия 0.01.</translation> + <source>Optional transaction fee per kB that helps make sure your transactions are processed quickly. Most transactions are 1 kB.</source> + <translation>Необязательная комиссия за каждый КБ транзакции, которая ускоряет обработку Ваших транзакций. Большинство транзакций занимают 1КБ.</translation> </message> <message> <location line="+15"/> @@ -1059,7 +1059,7 @@ Address: %4 <translation>Общая сумма всех транзакций, которые до сих пор не подтверждены, и до сих пор не учитываются в текущем балансе</translation> </message> <message> - <location filename="../overviewpage.cpp" line="+115"/> + <location filename="../overviewpage.cpp" line="+116"/> <location line="+1"/> <source>out of sync</source> <translation>не синхронизировано</translation> @@ -1646,6 +1646,19 @@ Address: %4 </message> </context> <context> + <name>SplashScreen</name> + <message> + <location filename="../splashscreen.cpp" line="+22"/> + <source>The Bitcoin developers</source> + <translation>Разработчики Bitcoin</translation> + </message> + <message> + <location line="+1"/> + <source>[testnet]</source> + <translation>[тестовая сеть]</translation> + </message> +</context> +<context> <name>TransactionDesc</name> <message> <location filename="../transactiondesc.cpp" line="+20"/> @@ -2120,9 +2133,27 @@ Address: %4 </message> </context> <context> + <name>WalletModel</name> + <message> + <location filename="../walletmodel.cpp" line="+193"/> + <source>Send Coins</source> + <translation>Отправка</translation> + </message> +</context> +<context> <name>WalletView</name> <message> - <location filename="../walletview.cpp" line="+247"/> + <location filename="../walletview.cpp" line="+42"/> + <source>&Export</source> + <translation>&Экспорт</translation> + </message> + <message> + <location line="+1"/> + <source>Export the data in the current tab to a file</source> + <translation>Экспортировать данные из вкладки в файл</translation> + </message> + <message> + <location line="+193"/> <source>Backup Wallet</source> <translation>Сделать резервную копию бумажника</translation> </message> @@ -2155,38 +2186,38 @@ Address: %4 <context> <name>bitcoin-core</name> <message> - <location filename="../bitcoinstrings.cpp" line="+96"/> + <location filename="../bitcoinstrings.cpp" line="+94"/> <source>Bitcoin version</source> <translation>Версия</translation> </message> <message> - <location line="+98"/> + <location line="+102"/> <source>Usage:</source> <translation>Использование:</translation> </message> <message> - <location line="-25"/> + <location line="-29"/> <source>Send command to -server or bitcoind</source> <translation>Отправить команду на -server или bitcoind</translation> </message> <message> - <location line="-22"/> + <location line="-23"/> <source>List commands</source> <translation>Список команд </translation> </message> <message> - <location line="-10"/> + <location line="-12"/> <source>Get help for a command</source> <translation>Получить помощь по команде</translation> </message> <message> - <location line="+21"/> + <location line="+24"/> <source>Options:</source> <translation>Опции:</translation> </message> <message> - <location line="+23"/> + <location line="+24"/> <source>Specify configuration file (default: bitcoin.conf)</source> <translation>Указать конфигурационный файл (по умолчанию: bitcoin.conf)</translation> </message> @@ -2196,27 +2227,17 @@ Address: %4 <translation>Задать pid-файл (по умолчанию: bitcoin.pid)</translation> </message> <message> - <location line="-48"/> - <source>Generate coins</source> - <translation>Генерировать монеты</translation> - </message> - <message> - <location line="-27"/> - <source>Don't generate coins</source> - <translation>Не генерировать монеты</translation> - </message> - <message> - <location line="+74"/> + <location line="-1"/> <source>Specify data directory</source> <translation>Задать каталог данных</translation> </message> <message> - <location line="-8"/> + <location line="-9"/> <source>Set database cache size in megabytes (default: 25)</source> <translation>Установить размер кэша базы данных в мегабайтах (по умолчанию: 25)</translation> </message> <message> - <location line="-27"/> + <location line="-28"/> <source>Listen for connections on <port> (default: 8333 or testnet: 18333)</source> <translation>Принимать входящие подключения на <port> (по умолчанию: 8333 или 18333 в тестовой сети)</translation> </message> @@ -2231,7 +2252,7 @@ Address: %4 <translation>Подключиться к узлу, чтобы получить список адресов других участников и отключиться</translation> </message> <message> - <location line="+80"/> + <location line="+82"/> <source>Specify your own public address</source> <translation>Укажите ваш собственный публичный адрес</translation> </message> @@ -2241,22 +2262,22 @@ Address: %4 <translation>Порог для отключения неправильно ведущих себя узлов (по умолчанию: 100)</translation> </message> <message> - <location line="-132"/> + <location line="-134"/> <source>Number of seconds to keep misbehaving peers from reconnecting (default: 86400)</source> <translation>Число секунд блокирования неправильно ведущих себя узлов (по умолчанию: 86400)</translation> </message> <message> - <location line="-32"/> + <location line="-29"/> <source>An error occurred while setting up the RPC port %u for listening on IPv4: %s</source> <translation>Произошла ошибка при открытии RPC-порта %u для прослушивания на IPv4: %s</translation> </message> <message> - <location line="+30"/> + <location line="+27"/> <source>Listen for JSON-RPC connections on <port> (default: 8332 or testnet: 18332)</source> <translation>Прослушивать подключения JSON-RPC на <порту> (по умолчанию: 8332 или для testnet: 18332)</translation> </message> <message> - <location line="+36"/> + <location line="+37"/> <source>Accept command line and JSON-RPC commands</source> <translation>Принимать командную строку и команды JSON-RPC</translation> </message> @@ -2266,17 +2287,17 @@ Address: %4 <translation>Запускаться в фоне как демон и принимать команды</translation> </message> <message> - <location line="+33"/> + <location line="+37"/> <source>Use the test network</source> <translation>Использовать тестовую сеть</translation> </message> <message> - <location line="-108"/> + <location line="-112"/> <source>Accept connections from outside (default: 1 if no -proxy or -connect)</source> <translation>Принимать подключения извне (по умолчанию: 1, если не используется -proxy или -connect)</translation> </message> <message> - <location line="-82"/> + <location line="-80"/> <source>%s, you must set a rpcpassword in the configuration file: %s It is recommended you use the following random password: @@ -2317,11 +2338,6 @@ rpcpassword=%s </message> <message> <location line="+3"/> - <source>Error initializing database environment %s! To recover, BACKUP THAT DIRECTORY, then remove everything from it except for wallet.dat.</source> - <translation>Ошибка инициализации окружения базы данных %s! Чтобы восстановить работоспособность, СДЕЛАЙТЕ РЕЗЕРВНУЮ КОПИЮ ЭТОГО КАТАЛОГА, после чего удалите из него всё, кроме wallet.dat.</translation> - </message> - <message> - <location line="+3"/> <source>Error: The transaction was rejected! This might happen if some of the coins in your wallet were already spent, such as if you used a copy of wallet.dat and coins were spent in the copy but not marked as spent here.</source> <translation>Ошибка: транзакция была отклонена! Это могло произойти в случае, если некоторые монеты в вашем бумажнике уже были потрачены, например, если вы используете копию wallet.dat, и монеты были использованы в копии, но не отмечены как потраченные здесь.</translation> </message> @@ -2346,12 +2362,7 @@ rpcpassword=%s <translation>Максимальный размер высокоприоритетных/низкокомиссионных транзакций в байтах (по умолчанию: 27000)</translation> </message> <message> - <location line="+3"/> - <source>Set the number of script verification threads (1-16, 0=auto, default: 0)</source> - <translation>Задать число потоков проверки скрипта (1-16, 0=авто, по умолчанию: 0)</translation> - </message> - <message> - <location line="+2"/> + <location line="+6"/> <source>This is a pre-release test build - use at your own risk - do not use for mining or merchant applications</source> <translation>Это пре-релизная тестовая сборка - используйте на свой страх и риск - не используйте для добычи или торговых приложений</translation> </message> @@ -2391,7 +2402,7 @@ rpcpassword=%s <translation>Параметры создания блоков:</translation> </message> <message> - <location line="+6"/> + <location line="+5"/> <source>Connect only to the specified node(s)</source> <translation>Подключаться только к указанному узлу(ам)</translation> </message> @@ -2411,7 +2422,7 @@ rpcpassword=%s <translation>Пересобрать БД блоков прямо сейчас?</translation> </message> <message> - <location line="+3"/> + <location line="+2"/> <source>Error initializing block database</source> <translation>Ошибка инициализации БД блоков</translation> </message> @@ -2437,11 +2448,6 @@ rpcpassword=%s </message> <message> <location line="+1"/> - <source>Error: Transaction creation failed!</source> - <translation>Ошибка: не удалось создать транзакцию!</translation> - </message> - <message> - <location line="+1"/> <source>Error: Wallet locked, unable to create transaction!</source> <translation>Ошибка: бумажник заблокирован, невозможно создать транзакцию!</translation> </message> @@ -2511,7 +2517,12 @@ rpcpassword=%s <translation>Искать узлы с помощью DNS (по умолчанию: 1, если не указан -connect)</translation> </message> <message> - <location line="+3"/> + <location line="+1"/> + <source>Generate coins (default: 0)</source> + <translation>Включить добычу монет (по умолчанию: 0)</translation> + </message> + <message> + <location line="+2"/> <source>How many blocks to check at startup (default: 288, 0 = all)</source> <translation>Сколько блоков проверять при запуске (по умолчанию: 288, 0 = все)</translation> </message> @@ -2521,7 +2532,12 @@ rpcpassword=%s <translation>Насколько тщательно проверять блок (0-4, по умолчанию: 3)</translation> </message> <message> - <location line="+24"/> + <location line="+19"/> + <source>Not enough file descriptors available.</source> + <translation>Недостаточно файловых дескрипторов.</translation> + </message> + <message> + <location line="+8"/> <source>Rebuild block chain index from current blk000??.dat files</source> <translation>Перестроить индекс цепи блоков из текущих файлов blk000??.dat</translation> </message> @@ -2531,7 +2547,7 @@ rpcpassword=%s <translation>Задать число потоков выполнения(по умолчанию: 4)</translation> </message> <message> - <location line="+22"/> + <location line="+26"/> <source>Verifying blocks...</source> <translation>Проверка блоков...</translation> </message> @@ -2541,12 +2557,17 @@ rpcpassword=%s <translation>Проверка бумажника...</translation> </message> <message> - <location line="-62"/> + <location line="-69"/> <source>Imports blocks from external blk000??.dat file</source> <translation>Импортировать блоки из внешнего файла blk000??.dat</translation> </message> <message> - <location line="+1"/> + <location line="-76"/> + <source>Set the number of script verification threads (up to 16, 0 = auto, <0 = leave that many cores free, default: 0)</source> + <translation>Задать число потоков проверки скрипта (вплоть до 16, 0=авто, <0 = оставить столько ядер свободными, по умолчанию: 0)</translation> + </message> + <message> + <location line="+77"/> <source>Information</source> <translation>Информация</translation> </message> @@ -2556,6 +2577,16 @@ rpcpassword=%s <translation>Неверный адрес -tor: '%s'</translation> </message> <message> + <location line="+1"/> + <source>Invalid amount for -minrelaytxfee=<amount>: '%s'</source> + <translation>Неверное количество в параметре -minrelaytxfee=<кол-во>: '%s'</translation> + </message> + <message> + <location line="+1"/> + <source>Invalid amount for -mintxfee=<amount>: '%s'</source> + <translation>Неверное количество в параметре -mintxfee=<кол-во>: '%s'</translation> + </message> + <message> <location line="+8"/> <source>Maintain a full transaction index (default: 0)</source> <translation>Держать полный индекс транзакций (по умолчанию: 0)</translation> @@ -2571,7 +2602,7 @@ rpcpassword=%s <translation>Максимальный размер буфера отправки на соединение, <n>*1000 байт (по умолчанию: 1000)</translation> </message> <message> - <location line="+1"/> + <location line="+2"/> <source>Only accept block chain matching built-in checkpoints (default: 1)</source> <translation>Принимать цепь блоков, только если она соответствует встроенным контрольным точкам (по умолчанию: 1)</translation> </message> @@ -2632,6 +2663,11 @@ rpcpassword=%s <translation>Сжимать файл debug.log при запуске клиента (по умолчанию: 1, если нет -debug)</translation> </message> <message> + <location line="+1"/> + <source>Signing transaction failed</source> + <translation>Не удалось подписать транзакцию</translation> + </message> + <message> <location line="+2"/> <source>Specify connection timeout in milliseconds (default: 5000)</source> <translation>Таймаут соединения в миллисекундах (по умолчанию: 5000)</translation> @@ -2642,7 +2678,22 @@ rpcpassword=%s <translation>Системная ошибка:</translation> </message> <message> - <location line="+10"/> + <location line="+4"/> + <source>Transaction amount too small</source> + <translation>Объём транзакции слишком мал</translation> + </message> + <message> + <location line="+1"/> + <source>Transaction amounts must be positive</source> + <translation>Объём транзакции должен быть положителен</translation> + </message> + <message> + <location line="+1"/> + <source>Transaction too large</source> + <translation>Транзакция слишком большая</translation> + </message> + <message> + <location line="+7"/> <source>Use UPnP to map the listening port (default: 0)</source> <translation>Использовать UPnP для проброса порта (по умолчанию: 0)</translation> </message> @@ -2682,7 +2733,7 @@ rpcpassword=%s <translation>wallet.dat повреждён, спасение данных не удалось</translation> </message> <message> - <location line="-46"/> + <location line="-50"/> <source>Password for JSON-RPC connections</source> <translation>Пароль для подключений JSON-RPC</translation> </message> @@ -2697,17 +2748,17 @@ rpcpassword=%s <translation>Посылать команды узлу, запущенному на <ip> (по умолчанию: 127.0.0.1)</translation> </message> <message> - <location line="-119"/> + <location line="-120"/> <source>Execute command when the best block changes (%s in cmd is replaced by block hash)</source> <translation>Выполнить команду, когда появляется новый блок (%s в команде заменяется на хэш блока)</translation> </message> <message> - <location line="+142"/> + <location line="+147"/> <source>Upgrade wallet to latest format</source> <translation>Обновить бумажник до последнего формата</translation> </message> <message> - <location line="-17"/> + <location line="-21"/> <source>Set key pool size to <n> (default: 100)</source> <translation>Установить размер запаса ключей в <n> (по умолчанию: 100)</translation> </message> @@ -2717,12 +2768,12 @@ rpcpassword=%s <translation>Перепроверить цепь блоков на предмет отсутствующих в бумажнике транзакций</translation> </message> <message> - <location line="+31"/> + <location line="+35"/> <source>Use OpenSSL (https) for JSON-RPC connections</source> <translation>Использовать OpenSSL (https) для подключений JSON-RPC</translation> </message> <message> - <location line="-22"/> + <location line="-26"/> <source>Server certificate file (default: server.cert)</source> <translation>Файл серверного сертификата (по умолчанию: server.cert)</translation> </message> @@ -2732,37 +2783,37 @@ rpcpassword=%s <translation>Приватный ключ сервера (по умолчанию: server.pem)</translation> </message> <message> - <location line="-153"/> + <location line="-151"/> <source>Acceptable ciphers (default: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH)</source> <translation>Разрешённые алгоритмы (по умолчанию: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH)</translation> </message> <message> - <location line="+166"/> + <location line="+165"/> <source>This help message</source> <translation>Эта справка</translation> </message> <message> - <location line="+3"/> + <location line="+6"/> <source>Unable to bind to %s on this computer (bind returned error %d, %s)</source> <translation>Невозможно привязаться к %s на этом компьютере (bind вернул ошибку %d, %s)</translation> </message> <message> - <location line="-86"/> + <location line="-91"/> <source>Connect through socks proxy</source> <translation>Подключаться через socks прокси</translation> </message> <message> - <location line="-11"/> + <location line="-10"/> <source>Allow DNS lookups for -addnode, -seednode and -connect</source> <translation>Разрешить поиск в DNS для -addnode, -seednode и -connect</translation> </message> <message> - <location line="+56"/> + <location line="+55"/> <source>Loading addresses...</source> <translation>Загрузка адресов...</translation> </message> <message> - <location line="-34"/> + <location line="-35"/> <source>Error loading wallet.dat: Wallet corrupted</source> <translation>Ошибка загрузки wallet.dat: Бумажник поврежден</translation> </message> @@ -2772,22 +2823,22 @@ rpcpassword=%s <translation>Ошибка загрузки wallet.dat: бумажник требует более новую версию Bitcoin</translation> </message> <message> - <location line="+87"/> + <location line="+93"/> <source>Wallet needed to be rewritten: restart Bitcoin to complete</source> <translation>Необходимо перезаписать бумажник, перезапустите Bitcoin для завершения операции.</translation> </message> <message> - <location line="-89"/> + <location line="-95"/> <source>Error loading wallet.dat</source> <translation>Ошибка при загрузке wallet.dat</translation> </message> <message> - <location line="+29"/> + <location line="+28"/> <source>Invalid -proxy address: '%s'</source> <translation>Неверный адрес -proxy: '%s'</translation> </message> <message> - <location line="+49"/> + <location line="+56"/> <source>Unknown network specified in -onlynet: '%s'</source> <translation>В параметре -onlynet указана неизвестная сеть: '%s'</translation> </message> @@ -2797,7 +2848,7 @@ rpcpassword=%s <translation>В параметре -socks запрошена неизвестная версия: %i</translation> </message> <message> - <location line="-91"/> + <location line="-96"/> <source>Cannot resolve -bind address: '%s'</source> <translation>Не удаётся разрешить адрес в параметре -bind: '%s'</translation> </message> @@ -2817,17 +2868,17 @@ rpcpassword=%s <translation>Неверное количество</translation> </message> <message> - <location line="-4"/> + <location line="-6"/> <source>Insufficient funds</source> <translation>Недостаточно монет</translation> </message> <message> - <location line="+8"/> + <location line="+10"/> <source>Loading block index...</source> <translation>Загрузка индекса блоков...</translation> </message> <message> - <location line="-58"/> + <location line="-57"/> <source>Add a node to connect to and attempt to keep the connection open</source> <translation>Добавить узел для подключения и пытаться поддерживать соединение открытым</translation> </message> @@ -2837,52 +2888,47 @@ rpcpassword=%s <translation>Невозможно привязаться к %s на этом компьютере. Возможно, Bitcoin уже работает.</translation> </message> <message> - <location line="+67"/> + <location line="+64"/> <source>Fee per KB to add to transactions you send</source> <translation>Комиссия на килобайт, добавляемая к вашим транзакциям</translation> </message> <message> - <location line="+17"/> + <location line="+19"/> <source>Loading wallet...</source> <translation>Загрузка бумажника...</translation> </message> <message> - <location line="-53"/> + <location line="-52"/> <source>Cannot downgrade wallet</source> <translation>Не удаётся понизить версию бумажника</translation> </message> <message> - <location line="+1"/> - <source>Cannot initialize keypool</source> - <translation>Не удаётся инициализировать массив ключей</translation> - </message> - <message> <location line="+3"/> <source>Cannot write default address</source> <translation>Не удаётся записать адрес по умолчанию</translation> </message> <message> - <location line="+63"/> + <location line="+64"/> <source>Rescanning...</source> <translation>Сканирование...</translation> </message> <message> - <location line="-55"/> + <location line="-57"/> <source>Done loading</source> <translation>Загрузка завершена</translation> </message> <message> - <location line="+79"/> + <location line="+82"/> <source>To use the %s option</source> <translation>Чтобы использовать опцию %s</translation> </message> <message> - <location line="-71"/> + <location line="-74"/> <source>Error</source> <translation>Ошибка</translation> </message> <message> - <location line="-33"/> + <location line="-31"/> <source>You must set rpcpassword=<password> in the configuration file: %s If the file does not exist, create it with owner-readable-only file permissions.</source> diff --git a/src/qt/locale/bitcoin_sk.ts b/src/qt/locale/bitcoin_sk.ts index 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 <translation type="unfinished"/> </message> <message> - <location filename="../aboutdialog.cpp" line="+17"/> + <location filename="../aboutdialog.cpp" line="+14"/> <source>Copyright</source> <translation type="unfinished"/> </message> <message> <location line="+0"/> - <source>2009-%1 The Bitcoin developers</source> + <source>The Bitcoin developers</source> <translation type="unfinished"/> </message> </context> @@ -61,7 +61,7 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>&Nová adresa</translation> </message> <message> - <location filename="../addressbookpage.cpp" line="+59"/> + <location filename="../addressbookpage.cpp" line="+63"/> <source>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.</source> <translation>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.</translation> </message> @@ -91,7 +91,17 @@ This product includes software developed by the OpenSSL Project for use in the O <translation type="unfinished"/> </message> <message> - <location line="-14"/> + <location line="+27"/> + <source>Export the data in the current tab to a file</source> + <translation>Exportovať tento náhľad do súboru</translation> + </message> + <message> + <location line="+3"/> + <source>&Export</source> + <translation type="unfinished"/> + </message> + <message> + <location line="-44"/> <source>Verify a message to ensure it was signed with a specified Bitcoin address</source> <translation type="unfinished"/> </message> @@ -313,12 +323,12 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>Podpísať &správu...</translation> </message> <message> - <location line="+299"/> + <location line="+280"/> <source>Synchronizing with network...</source> <translation>Synchronizácia so sieťou...</translation> </message> <message> - <location line="-368"/> + <location line="-349"/> <source>&Overview</source> <translation>&Prehľad</translation> </message> @@ -393,7 +403,7 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>&Zmena Hesla...</translation> </message> <message> - <location line="+304"/> + <location line="+285"/> <source>Importing blocks from disk...</source> <translation type="unfinished"/> </message> @@ -403,12 +413,7 @@ This product includes software developed by the OpenSSL Project for use in the O <translation type="unfinished"/> </message> <message> - <location line="-300"/> - <source>&Export...</source> - <translation>&Export...</translation> - </message> - <message> - <location line="-66"/> + <location line="-347"/> <source>Send coins to a Bitcoin address</source> <translation>Poslať bitcoins na adresu</translation> </message> @@ -418,12 +423,7 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>Upraviť možnosti nastavenia pre bitcoin</translation> </message> <message> - <location line="+18"/> - <source>Export the data in the current tab to a file</source> - <translation>Exportovať tento náhľad do súboru</translation> - </message> - <message> - <location line="-9"/> + <location line="+9"/> <source>Backup wallet to another location</source> <translation>Zálohovať peňaženku na iné miesto</translation> </message> @@ -433,33 +433,33 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>Zmeniť heslo použité na šifrovanie peňaženky</translation> </message> <message> - <location line="+9"/> + <location line="+6"/> <source>&Debug window</source> - <translation type="unfinished"/> + <translation>&Okno pre ladenie</translation> </message> <message> <location line="+1"/> <source>Open debugging and diagnostic console</source> - <translation type="unfinished"/> + <translation>Otvor konzolu pre ladenie a diagnostiku</translation> </message> <message> - <location line="-7"/> + <location line="-4"/> <source>&Verify message...</source> <translation type="unfinished"/> </message> <message> - <location line="-163"/> - <location line="+541"/> + <location line="-165"/> + <location line="+530"/> <source>Bitcoin</source> <translation type="unfinished"/> </message> <message> - <location line="-541"/> + <location line="-530"/> <source>Wallet</source> <translation>Peňaženka</translation> </message> <message> - <location line="+99"/> + <location line="+101"/> <source>&Send</source> <translation type="unfinished"/> </message> @@ -504,12 +504,12 @@ This product includes software developed by the OpenSSL Project for use in the O <translation type="unfinished"/> </message> <message> - <location line="+31"/> + <location line="+28"/> <source>&File</source> <translation>&Súbor</translation> </message> <message> - <location line="+8"/> + <location line="+7"/> <source>&Settings</source> <translation>&Nastavenia</translation> </message> @@ -524,12 +524,7 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>Lišta záložiek</translation> </message> <message> - <location line="+8"/> - <source>Actions toolbar</source> - <translation>Lišta aktvivít</translation> - </message> - <message> - <location line="+13"/> + <location line="+17"/> <location line="+10"/> <source>[testnet]</source> <translation>[testovacia sieť]</translation> @@ -537,15 +532,20 @@ This product includes software developed by the OpenSSL Project for use in the O <message> <location line="+47"/> <source>Bitcoin client</source> - <translation type="unfinished"/> + <translation>Bitcoin klient</translation> </message> <message numerus="yes"> - <location line="+140"/> + <location line="+141"/> <source>%n active connection(s) to Bitcoin network</source> <translation><numerusform>%n aktívne spojenie v Bitcoin sieti</numerusform><numerusform>%n aktívne spojenia v Bitcoin sieti</numerusform><numerusform>%n aktívnych spojení v Bitconi sieti</numerusform></translation> </message> <message> - <location line="+39"/> + <location line="+22"/> + <source>No block source available...</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+12"/> <source>Processed %1 of %2 (estimated) blocks of transaction history.</source> <translation type="unfinished"/> </message> @@ -570,7 +570,7 @@ This product includes software developed by the OpenSSL Project for use in the O <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation> </message> <message> - <location line="+5"/> + <location line="+4"/> <source>%1 behind</source> <translation type="unfinished"/> </message> @@ -585,7 +585,7 @@ This product includes software developed by the OpenSSL Project for use in the O <translation type="unfinished"/> </message> <message> - <location line="+21"/> + <location line="+22"/> <source>Error</source> <translation type="unfinished"/> </message> @@ -600,24 +600,24 @@ This product includes software developed by the OpenSSL Project for use in the O <translation type="unfinished"/> </message> <message> - <location line="+68"/> + <location line="+70"/> <source>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?</source> <translation type="unfinished"/> </message> <message> - <location line="-138"/> + <location line="-140"/> <source>Up to date</source> <translation>Aktualizovaný</translation> </message> <message> - <location line="+32"/> + <location line="+31"/> <source>Catching up...</source> <translation>Sťahujem...</translation> </message> <message> - <location line="+110"/> + <location line="+113"/> <source>Confirm transaction fee</source> - <translation type="unfinished"/> + <translation>Potvrď poplatok za transakciu.</translation> </message> <message> <location line="+8"/> @@ -664,7 +664,7 @@ Adresa: %4</translation> <translation>Peňaženka je <b>zašifrovaná</b> a momentálne <b>zamknutá</b></translation> </message> <message> - <location filename="../bitcoin.cpp" line="+104"/> + <location filename="../bitcoin.cpp" line="+111"/> <source>A fatal error occurred. Bitcoin can no longer continue safely and will quit.</source> <translation type="unfinished"/> </message> @@ -672,7 +672,7 @@ Adresa: %4</translation> <context> <name>ClientModel</name> <message> - <location filename="../clientmodel.cpp" line="+98"/> + <location filename="../clientmodel.cpp" line="+104"/> <source>Network Alert</source> <translation type="unfinished"/> </message> @@ -803,8 +803,8 @@ Adresa: %4</translation> </message> <message> <location line="+6"/> - <source>Optional transaction fee per kB that helps make sure your transactions are processed quickly. Most transactions are 1 kB. Fee 0.01 recommended.</source> - <translation>Voliteľný transakčný poplatok za kB ktorý pomôže rýchlemu spracovaniu transakcie. Väčšina transakcií má 1 kB. Poplatok 0.01 je odporúčaný.</translation> + <source>Optional transaction fee per kB that helps make sure your transactions are processed quickly. Most transactions are 1 kB.</source> + <translation type="unfinished"/> </message> <message> <location line="+15"/> @@ -1053,7 +1053,7 @@ Adresa: %4</translation> <translation>Suma transakcií ktoré ešte neboli potvrdené a nezapočítavaju sa do celkového zostatku.</translation> </message> <message> - <location filename="../overviewpage.cpp" line="+115"/> + <location filename="../overviewpage.cpp" line="+116"/> <location line="+1"/> <source>out of sync</source> <translation type="unfinished"/> @@ -1102,7 +1102,7 @@ Adresa: %4</translation> <message> <location filename="../qrcodedialog.cpp" line="+62"/> <source>Error encoding URI into QR Code.</source> - <translation type="unfinished"/> + <translation>Chyba v zakódovaní URI do QR kódu</translation> </message> <message> <location line="+40"/> @@ -1112,17 +1112,17 @@ Adresa: %4</translation> <message> <location line="+23"/> <source>Resulting URI too long, try to reduce the text for label / message.</source> - <translation type="unfinished"/> + <translation>Výsledné URI príliš dlhé, skráť text pre názov / správu.</translation> </message> <message> <location line="+25"/> <source>Save QR Code</source> - <translation type="unfinished"/> + <translation>Ukladanie QR kódu</translation> </message> <message> <location line="+0"/> <source>PNG Images (*.png)</source> - <translation type="unfinished"/> + <translation>PNG obrázky (*.png)</translation> </message> </context> <context> @@ -1130,7 +1130,7 @@ Adresa: %4</translation> <message> <location filename="../forms/rpcconsole.ui" line="+46"/> <source>Client name</source> - <translation type="unfinished"/> + <translation>Meno klienta</translation> </message> <message> <location line="+10"/> @@ -1144,12 +1144,12 @@ Adresa: %4</translation> <location line="+23"/> <location filename="../rpcconsole.cpp" line="+339"/> <source>N/A</source> - <translation type="unfinished"/> + <translation>nie je k dispozícii</translation> </message> <message> <location line="-217"/> <source>Client version</source> - <translation type="unfinished"/> + <translation>Verzia klienta</translation> </message> <message> <location line="-45"/> @@ -1169,27 +1169,27 @@ Adresa: %4</translation> <message> <location line="+29"/> <source>Network</source> - <translation type="unfinished"/> + <translation>Sieť</translation> </message> <message> <location line="+7"/> <source>Number of connections</source> - <translation type="unfinished"/> + <translation>Počet pripojení</translation> </message> <message> <location line="+23"/> <source>On testnet</source> - <translation type="unfinished"/> + <translation>Na testovacej sieti</translation> </message> <message> <location line="+23"/> <source>Block chain</source> - <translation type="unfinished"/> + <translation>Reťazec blokov</translation> </message> <message> <location line="+7"/> <source>Current number of blocks</source> - <translation type="unfinished"/> + <translation>Aktuálny počet blokov</translation> </message> <message> <location line="+23"/> @@ -1640,6 +1640,19 @@ Adresa: %4</translation> </message> </context> <context> + <name>SplashScreen</name> + <message> + <location filename="../splashscreen.cpp" line="+22"/> + <source>The Bitcoin developers</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>[testnet]</source> + <translation>[testovacia sieť]</translation> + </message> +</context> +<context> <name>TransactionDesc</name> <message> <location filename="../transactiondesc.cpp" line="+20"/> @@ -2114,9 +2127,27 @@ Adresa: %4</translation> </message> </context> <context> + <name>WalletModel</name> + <message> + <location filename="../walletmodel.cpp" line="+193"/> + <source>Send Coins</source> + <translation>Poslať Bitcoins</translation> + </message> +</context> +<context> <name>WalletView</name> <message> - <location filename="../walletview.cpp" line="+247"/> + <location filename="../walletview.cpp" line="+42"/> + <source>&Export</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Export the data in the current tab to a file</source> + <translation>Exportovať tento náhľad do súboru</translation> + </message> + <message> + <location line="+193"/> <source>Backup Wallet</source> <translation type="unfinished"/> </message> @@ -2149,37 +2180,37 @@ Adresa: %4</translation> <context> <name>bitcoin-core</name> <message> - <location filename="../bitcoinstrings.cpp" line="+96"/> + <location filename="../bitcoinstrings.cpp" line="+94"/> <source>Bitcoin version</source> <translation>Bitcoin verzia</translation> </message> <message> - <location line="+98"/> + <location line="+102"/> <source>Usage:</source> <translation>Použitie:</translation> </message> <message> - <location line="-25"/> + <location line="-29"/> <source>Send command to -server or bitcoind</source> <translation>Odoslať príkaz -server alebo bitcoind</translation> </message> <message> - <location line="-22"/> + <location line="-23"/> <source>List commands</source> <translation>Zoznam príkazov</translation> </message> <message> - <location line="-10"/> + <location line="-12"/> <source>Get help for a command</source> <translation>Dostať pomoc pre príkaz</translation> </message> <message> - <location line="+21"/> + <location line="+24"/> <source>Options:</source> <translation>Možnosti:</translation> </message> <message> - <location line="+23"/> + <location line="+24"/> <source>Specify configuration file (default: bitcoin.conf)</source> <translation>Určiť súbor s nastaveniami (predvolené: bitcoin.conf)</translation> </message> @@ -2189,27 +2220,17 @@ Adresa: %4</translation> <translation>Určiť súbor pid (predvolené: bitcoind.pid)</translation> </message> <message> - <location line="-48"/> - <source>Generate coins</source> - <translation>Počítaj bitcoins</translation> - </message> - <message> - <location line="-27"/> - <source>Don't generate coins</source> - <translation>Nepočítaj bitcoins</translation> - </message> - <message> - <location line="+74"/> + <location line="-1"/> <source>Specify data directory</source> <translation>Určiť priečinok s dátami</translation> </message> <message> - <location line="-8"/> + <location line="-9"/> <source>Set database cache size in megabytes (default: 25)</source> - <translation type="unfinished"/> + <translation>Veľkosť vyrovnávajúcej pamäte pre databázu v megabytoch (predvolené:25)</translation> </message> <message> - <location line="-27"/> + <location line="-28"/> <source>Listen for connections on <port> (default: 8333 or testnet: 18333)</source> <translation>Načúvať spojeniam na <port> (prednastavené: 8333 alebo testovacia sieť: 18333)</translation> </message> @@ -2224,32 +2245,32 @@ Adresa: %4</translation> <translation type="unfinished"/> </message> <message> - <location line="+80"/> + <location line="+82"/> <source>Specify your own public address</source> <translation type="unfinished"/> </message> <message> <location line="+3"/> <source>Threshold for disconnecting misbehaving peers (default: 100)</source> - <translation type="unfinished"/> + <translation>Hranica pre odpojenie zle sa správajúcich peerov (predvolené: 100)</translation> </message> <message> - <location line="-132"/> + <location line="-134"/> <source>Number of seconds to keep misbehaving peers from reconnecting (default: 86400)</source> - <translation type="unfinished"/> + <translation>Počet sekúnd kedy sa zabráni zle sa správajúcim peerom znovupripojenie (predvolené: 86400)</translation> </message> <message> - <location line="-32"/> + <location line="-29"/> <source>An error occurred while setting up the RPC port %u for listening on IPv4: %s</source> <translation type="unfinished"/> </message> <message> - <location line="+30"/> + <location line="+27"/> <source>Listen for JSON-RPC connections on <port> (default: 8332 or testnet: 18332)</source> <translation>Počúvať JSON-RPC spojeniam na <port> (predvolené: 8332 or testnet: 18332)</translation> </message> <message> - <location line="+36"/> + <location line="+37"/> <source>Accept command line and JSON-RPC commands</source> <translation>Prijímať príkazy z príkazového riadku a JSON-RPC</translation> </message> @@ -2259,17 +2280,17 @@ Adresa: %4</translation> <translation>Bežať na pozadí ako démon a prijímať príkazy</translation> </message> <message> - <location line="+33"/> + <location line="+37"/> <source>Use the test network</source> <translation>Použiť testovaciu sieť</translation> </message> <message> - <location line="-108"/> + <location line="-112"/> <source>Accept connections from outside (default: 1 if no -proxy or -connect)</source> <translation type="unfinished"/> </message> <message> - <location line="-82"/> + <location line="-80"/> <source>%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. </message> <message> <location line="+3"/> - <source>Error initializing database environment %s! To recover, BACKUP THAT DIRECTORY, then remove everything from it except for wallet.dat.</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+3"/> <source>Error: The transaction was rejected! This might happen if some of the coins in your wallet were already spent, such as if you used a copy of wallet.dat and coins were spent in the copy but not marked as spent here.</source> <translation type="unfinished"/> </message> @@ -2329,12 +2345,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+3"/> - <source>Set the number of script verification threads (1-16, 0=auto, default: 0)</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+2"/> + <location line="+6"/> <source>This is a pre-release test build - use at your own risk - do not use for mining or merchant applications</source> <translation type="unfinished"/> </message> @@ -2374,7 +2385,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+6"/> + <location line="+5"/> <source>Connect only to the specified node(s)</source> <translation>Pripojiť sa len k určenej nóde</translation> </message> @@ -2394,7 +2405,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+3"/> + <location line="+2"/> <source>Error initializing block database</source> <translation type="unfinished"/> </message> @@ -2420,11 +2431,6 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. </message> <message> <location line="+1"/> - <source>Error: Transaction creation failed!</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+1"/> <source>Error: Wallet locked, unable to create transaction!</source> <translation type="unfinished"/> </message> @@ -2494,7 +2500,12 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+3"/> + <location line="+1"/> + <source>Generate coins (default: 0)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+2"/> <source>How many blocks to check at startup (default: 288, 0 = all)</source> <translation type="unfinished"/> </message> @@ -2504,7 +2515,12 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+24"/> + <location line="+19"/> + <source>Not enough file descriptors available.</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+8"/> <source>Rebuild block chain index from current blk000??.dat files</source> <translation type="unfinished"/> </message> @@ -2514,7 +2530,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+22"/> + <location line="+26"/> <source>Verifying blocks...</source> <translation type="unfinished"/> </message> @@ -2524,12 +2540,17 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="-62"/> + <location line="-69"/> <source>Imports blocks from external blk000??.dat file</source> <translation type="unfinished"/> </message> <message> - <location line="+1"/> + <location line="-76"/> + <source>Set the number of script verification threads (up to 16, 0 = auto, <0 = leave that many cores free, default: 0)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+77"/> <source>Information</source> <translation type="unfinished"/> </message> @@ -2539,6 +2560,16 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Neplatná adresa tor: '%s'</translation> </message> <message> + <location line="+1"/> + <source>Invalid amount for -minrelaytxfee=<amount>: '%s'</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Invalid amount for -mintxfee=<amount>: '%s'</source> + <translation type="unfinished"/> + </message> + <message> <location line="+8"/> <source>Maintain a full transaction index (default: 0)</source> <translation type="unfinished"/> @@ -2554,7 +2585,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+1"/> + <location line="+2"/> <source>Only accept block chain matching built-in checkpoints (default: 1)</source> <translation type="unfinished"/> </message> @@ -2614,6 +2645,11 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> + <location line="+1"/> + <source>Signing transaction failed</source> + <translation type="unfinished"/> + </message> + <message> <location line="+2"/> <source>Specify connection timeout in milliseconds (default: 5000)</source> <translation>Určiť aut spojenia v milisekundách (predvolené: 5000)</translation> @@ -2624,7 +2660,22 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+10"/> + <location line="+4"/> + <source>Transaction amount too small</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Transaction amounts must be positive</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Transaction too large</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+7"/> <source>Use UPnP to map the listening port (default: 0)</source> <translation>Skúsiť použiť UPnP pre mapovanie počúvajúceho portu (default: 0)</translation> </message> @@ -2664,7 +2715,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="-46"/> + <location line="-50"/> <source>Password for JSON-RPC connections</source> <translation>Heslo pre JSON-rPC spojenia</translation> </message> @@ -2679,17 +2730,17 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Poslať príkaz nóde bežiacej na <ip> (predvolené: 127.0.0.1)</translation> </message> <message> - <location line="-119"/> + <location line="-120"/> <source>Execute command when the best block changes (%s in cmd is replaced by block hash)</source> - <translation type="unfinished"/> + <translation>Vykonaj príkaz, ak zmeny v najlepšom bloku (%s v príkaze nahradí blok hash)</translation> </message> <message> - <location line="+142"/> + <location line="+147"/> <source>Upgrade wallet to latest format</source> - <translation type="unfinished"/> + <translation>Aktualizuj peňaženku na najnovší formát.</translation> </message> <message> - <location line="-17"/> + <location line="-21"/> <source>Set key pool size to <n> (default: 100)</source> <translation>Nastaviť zásobu adries na <n> (predvolené: 100)</translation> </message> @@ -2699,12 +2750,12 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Znovu skenovať reťaz blokov pre chýbajúce transakcie</translation> </message> <message> - <location line="+31"/> + <location line="+35"/> <source>Use OpenSSL (https) for JSON-RPC connections</source> <translation>Použiť OpenSSL (https) pre JSON-RPC spojenia</translation> </message> <message> - <location line="-22"/> + <location line="-26"/> <source>Server certificate file (default: server.cert)</source> <translation>Súbor s certifikátom servra (predvolené: server.cert)</translation> </message> @@ -2714,37 +2765,37 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Súkromný kľúč servra (predvolené: server.pem)</translation> </message> <message> - <location line="-153"/> + <location line="-151"/> <source>Acceptable ciphers (default: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH)</source> <translation>Prijateľné šifry (predvolené: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH)</translation> </message> <message> - <location line="+166"/> + <location line="+165"/> <source>This help message</source> <translation>Táto pomocná správa</translation> </message> <message> - <location line="+3"/> + <location line="+6"/> <source>Unable to bind to %s on this computer (bind returned error %d, %s)</source> <translation type="unfinished"/> </message> <message> - <location line="-86"/> + <location line="-91"/> <source>Connect through socks proxy</source> <translation>Pripojenie cez socks proxy</translation> </message> <message> - <location line="-11"/> + <location line="-10"/> <source>Allow DNS lookups for -addnode, -seednode and -connect</source> <translation>Povoliť vyhľadávanie DNS pre pridanie nódy a spojenie</translation> </message> <message> - <location line="+56"/> + <location line="+55"/> <source>Loading addresses...</source> <translation>Načítavanie adries...</translation> </message> <message> - <location line="-34"/> + <location line="-35"/> <source>Error loading wallet.dat: Wallet corrupted</source> <translation>Chyba načítania wallet.dat: Peňaženka je poškodená</translation> </message> @@ -2754,22 +2805,22 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Chyba načítania wallet.dat: Peňaženka vyžaduje novšiu verziu Bitcoin</translation> </message> <message> - <location line="+87"/> + <location line="+93"/> <source>Wallet needed to be rewritten: restart Bitcoin to complete</source> <translation>Bolo potrebné prepísať peňaženku: dokončite reštartovaním Bitcoin</translation> </message> <message> - <location line="-89"/> + <location line="-95"/> <source>Error loading wallet.dat</source> <translation>Chyba načítania wallet.dat</translation> </message> <message> - <location line="+29"/> + <location line="+28"/> <source>Invalid -proxy address: '%s'</source> <translation>Neplatná adresa proxy: '%s'</translation> </message> <message> - <location line="+49"/> + <location line="+56"/> <source>Unknown network specified in -onlynet: '%s'</source> <translation type="unfinished"/> </message> @@ -2779,7 +2830,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="-91"/> + <location line="-96"/> <source>Cannot resolve -bind address: '%s'</source> <translation type="unfinished"/> </message> @@ -2799,19 +2850,19 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Neplatná suma</translation> </message> <message> - <location line="-4"/> + <location line="-6"/> <source>Insufficient funds</source> - <translation type="unfinished"/> + <translation>Nedostatok prostriedkov</translation> </message> <message> - <location line="+8"/> + <location line="+10"/> <source>Loading block index...</source> <translation>Načítavanie zoznamu blokov...</translation> </message> <message> - <location line="-58"/> + <location line="-57"/> <source>Add a node to connect to and attempt to keep the connection open</source> - <translation>Pridať nódu a pripojiť sa and attempt to keep the connection open</translation> + <translation>Pridať nód na pripojenie a pokus o udržanie pripojenia otvoreného</translation> </message> <message> <location line="-25"/> @@ -2819,56 +2870,53 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+67"/> + <location line="+64"/> <source>Fee per KB to add to transactions you send</source> <translation>Poplatok za kB ktorý treba pridať k odoslanej transakcii</translation> </message> <message> - <location line="+17"/> + <location line="+19"/> <source>Loading wallet...</source> <translation>Načítavam peňaženku...</translation> </message> <message> - <location line="-53"/> + <location line="-52"/> <source>Cannot downgrade wallet</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+1"/> - <source>Cannot initialize keypool</source> - <translation type="unfinished"/> + <translation>Nie je možné prejsť na nižšiu verziu peňaženky</translation> </message> <message> <location line="+3"/> <source>Cannot write default address</source> - <translation type="unfinished"/> + <translation>Nie je možné zapísať predvolenú adresu.</translation> </message> <message> - <location line="+63"/> + <location line="+64"/> <source>Rescanning...</source> <translation type="unfinished"/> </message> <message> - <location line="-55"/> + <location line="-57"/> <source>Done loading</source> <translation>Dokončené načítavanie</translation> </message> <message> - <location line="+79"/> + <location line="+82"/> <source>To use the %s option</source> - <translation type="unfinished"/> + <translation>Použiť %s možnosť.</translation> </message> <message> - <location line="-71"/> + <location line="-74"/> <source>Error</source> <translation>Chyba</translation> </message> <message> - <location line="-33"/> + <location line="-31"/> <source>You must set rpcpassword=<password> in the configuration file: %s If the file does not exist, create it with owner-readable-only file permissions.</source> - <translation type="unfinished"/> + <translation>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)</translation> </message> </context> </TS>
\ No newline at end of file diff --git a/src/qt/locale/bitcoin_sr.ts b/src/qt/locale/bitcoin_sr.ts index 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 <translation type="unfinished"/> </message> <message> - <location filename="../aboutdialog.cpp" line="+17"/> + <location filename="../aboutdialog.cpp" line="+14"/> <source>Copyright</source> <translation type="unfinished"/> </message> <message> <location line="+0"/> - <source>2009-%1 The Bitcoin developers</source> + <source>The Bitcoin developers</source> <translation type="unfinished"/> </message> </context> @@ -61,7 +61,7 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>&Нова адреса</translation> </message> <message> - <location filename="../addressbookpage.cpp" line="+59"/> + <location filename="../addressbookpage.cpp" line="+63"/> <source>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.</source> <translation>Ово су Ваше Bitcoin адресе за примање уплата. Можете да сваком пошиљаоцу дате другачију адресу да би пратили ко је вршио уплате.</translation> </message> @@ -91,7 +91,17 @@ This product includes software developed by the OpenSSL Project for use in the O <translation type="unfinished"/> </message> <message> - <location line="-14"/> + <location line="+27"/> + <source>Export the data in the current tab to a file</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+3"/> + <source>&Export</source> + <translation type="unfinished"/> + </message> + <message> + <location line="-44"/> <source>Verify a message to ensure it was signed with a specified Bitcoin address</source> <translation type="unfinished"/> </message> @@ -313,12 +323,12 @@ This product includes software developed by the OpenSSL Project for use in the O <translation type="unfinished"/> </message> <message> - <location line="+299"/> + <location line="+280"/> <source>Synchronizing with network...</source> <translation>Синхронизација са мрежом у току...</translation> </message> <message> - <location line="-368"/> + <location line="-349"/> <source>&Overview</source> <translation>&Општи преглед</translation> </message> @@ -393,7 +403,7 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>Промени &лозинку...</translation> </message> <message> - <location line="+304"/> + <location line="+285"/> <source>Importing blocks from disk...</source> <translation type="unfinished"/> </message> @@ -403,12 +413,7 @@ This product includes software developed by the OpenSSL Project for use in the O <translation type="unfinished"/> </message> <message> - <location line="-300"/> - <source>&Export...</source> - <translation>&Извоз...</translation> - </message> - <message> - <location line="-66"/> + <location line="-347"/> <source>Send coins to a Bitcoin address</source> <translation>Пошаљите новац на bitcoin адресу</translation> </message> @@ -418,12 +423,7 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>Изаберите могућности bitcoin-а</translation> </message> <message> - <location line="+18"/> - <source>Export the data in the current tab to a file</source> - <translation type="unfinished"/> - </message> - <message> - <location line="-9"/> + <location line="+9"/> <source>Backup wallet to another location</source> <translation type="unfinished"/> </message> @@ -433,7 +433,7 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>Мењање лозинке којом се шифрује новчаник</translation> </message> <message> - <location line="+9"/> + <location line="+6"/> <source>&Debug window</source> <translation type="unfinished"/> </message> @@ -443,23 +443,23 @@ This product includes software developed by the OpenSSL Project for use in the O <translation type="unfinished"/> </message> <message> - <location line="-7"/> + <location line="-4"/> <source>&Verify message...</source> <translation type="unfinished"/> </message> <message> - <location line="-163"/> - <location line="+541"/> + <location line="-165"/> + <location line="+530"/> <source>Bitcoin</source> <translation type="unfinished"/> </message> <message> - <location line="-541"/> + <location line="-530"/> <source>Wallet</source> <translation>новчаник</translation> </message> <message> - <location line="+99"/> + <location line="+101"/> <source>&Send</source> <translation type="unfinished"/> </message> @@ -504,12 +504,12 @@ This product includes software developed by the OpenSSL Project for use in the O <translation type="unfinished"/> </message> <message> - <location line="+31"/> + <location line="+28"/> <source>&File</source> <translation>&Фајл</translation> </message> <message> - <location line="+8"/> + <location line="+7"/> <source>&Settings</source> <translation>&Подешавања</translation> </message> @@ -524,12 +524,7 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>Трака са картицама</translation> </message> <message> - <location line="+8"/> - <source>Actions toolbar</source> - <translation>Трака са алаткама</translation> - </message> - <message> - <location line="+13"/> + <location line="+17"/> <location line="+10"/> <source>[testnet]</source> <translation>[testnet]</translation> @@ -540,12 +535,17 @@ This product includes software developed by the OpenSSL Project for use in the O <translation type="unfinished"/> </message> <message numerus="yes"> - <location line="+140"/> + <location line="+141"/> <source>%n active connection(s) to Bitcoin network</source> <translation><numerusform>%n активна веза са Bitcoin мрежом</numerusform><numerusform>%n активне везе са Bitcoin мрежом</numerusform><numerusform>%n активних веза са Bitcoin мрежом</numerusform></translation> </message> <message> - <location line="+39"/> + <location line="+22"/> + <source>No block source available...</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+12"/> <source>Processed %1 of %2 (estimated) blocks of transaction history.</source> <translation type="unfinished"/> </message> @@ -570,7 +570,7 @@ This product includes software developed by the OpenSSL Project for use in the O <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation> </message> <message> - <location line="+5"/> + <location line="+4"/> <source>%1 behind</source> <translation type="unfinished"/> </message> @@ -585,7 +585,7 @@ This product includes software developed by the OpenSSL Project for use in the O <translation type="unfinished"/> </message> <message> - <location line="+21"/> + <location line="+22"/> <source>Error</source> <translation type="unfinished"/> </message> @@ -600,22 +600,22 @@ This product includes software developed by the OpenSSL Project for use in the O <translation type="unfinished"/> </message> <message> - <location line="+68"/> + <location line="+70"/> <source>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?</source> <translation type="unfinished"/> </message> <message> - <location line="-138"/> + <location line="-140"/> <source>Up to date</source> <translation>Ажурно</translation> </message> <message> - <location line="+32"/> + <location line="+31"/> <source>Catching up...</source> <translation>Ажурирање у току...</translation> </message> <message> - <location line="+110"/> + <location line="+113"/> <source>Confirm transaction fee</source> <translation type="unfinished"/> </message> @@ -661,7 +661,7 @@ Address: %4 <translation>Новчаник јс <b>шифрован</b> и тренутно <b>закључан</b></translation> </message> <message> - <location filename="../bitcoin.cpp" line="+104"/> + <location filename="../bitcoin.cpp" line="+111"/> <source>A fatal error occurred. Bitcoin can no longer continue safely and will quit.</source> <translation type="unfinished"/> </message> @@ -669,7 +669,7 @@ Address: %4 <context> <name>ClientModel</name> <message> - <location filename="../clientmodel.cpp" line="+98"/> + <location filename="../clientmodel.cpp" line="+104"/> <source>Network Alert</source> <translation type="unfinished"/> </message> @@ -800,7 +800,7 @@ Address: %4 </message> <message> <location line="+6"/> - <source>Optional transaction fee per kB that helps make sure your transactions are processed quickly. Most transactions are 1 kB. Fee 0.01 recommended.</source> + <source>Optional transaction fee per kB that helps make sure your transactions are processed quickly. Most transactions are 1 kB.</source> <translation type="unfinished"/> </message> <message> @@ -1050,7 +1050,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location filename="../overviewpage.cpp" line="+115"/> + <location filename="../overviewpage.cpp" line="+116"/> <location line="+1"/> <source>out of sync</source> <translation type="unfinished"/> @@ -1637,6 +1637,19 @@ Address: %4 </message> </context> <context> + <name>SplashScreen</name> + <message> + <location filename="../splashscreen.cpp" line="+22"/> + <source>The Bitcoin developers</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>[testnet]</source> + <translation>[testnet]</translation> + </message> +</context> +<context> <name>TransactionDesc</name> <message> <location filename="../transactiondesc.cpp" line="+20"/> @@ -2111,9 +2124,27 @@ Address: %4 </message> </context> <context> + <name>WalletModel</name> + <message> + <location filename="../walletmodel.cpp" line="+193"/> + <source>Send Coins</source> + <translation>Слање новца</translation> + </message> +</context> +<context> <name>WalletView</name> <message> - <location filename="../walletview.cpp" line="+247"/> + <location filename="../walletview.cpp" line="+42"/> + <source>&Export</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Export the data in the current tab to a file</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+193"/> <source>Backup Wallet</source> <translation type="unfinished"/> </message> @@ -2146,38 +2177,38 @@ Address: %4 <context> <name>bitcoin-core</name> <message> - <location filename="../bitcoinstrings.cpp" line="+96"/> + <location filename="../bitcoinstrings.cpp" line="+94"/> <source>Bitcoin version</source> <translation>Bitcoin верзија</translation> </message> <message> - <location line="+98"/> + <location line="+102"/> <source>Usage:</source> <translation>Korišćenje:</translation> </message> <message> - <location line="-25"/> + <location line="-29"/> <source>Send command to -server or bitcoind</source> <translation>Pošalji naredbu na -server ili bitcoinid </translation> </message> <message> - <location line="-22"/> + <location line="-23"/> <source>List commands</source> <translation>Listaj komande</translation> </message> <message> - <location line="-10"/> + <location line="-12"/> <source>Get help for a command</source> <translation>Zatraži pomoć za komande</translation> </message> <message> - <location line="+21"/> + <location line="+24"/> <source>Options:</source> <translation>Opcije</translation> </message> <message> - <location line="+23"/> + <location line="+24"/> <source>Specify configuration file (default: bitcoin.conf)</source> <translation>Potvrdi željeni konfiguracioni fajl (podrazumevani:bitcoin.conf)</translation> </message> @@ -2187,27 +2218,17 @@ Address: %4 <translation>Konkretizuj pid fajl (podrazumevani: bitcoind.pid)</translation> </message> <message> - <location line="-48"/> - <source>Generate coins</source> - <translation>Generiši novčiće</translation> - </message> - <message> - <location line="-27"/> - <source>Don't generate coins</source> - <translation>Ne generiši novčiće</translation> - </message> - <message> - <location line="+74"/> + <location line="-1"/> <source>Specify data directory</source> <translation>Gde je konkretni data direktorijum </translation> </message> <message> - <location line="-8"/> + <location line="-9"/> <source>Set database cache size in megabytes (default: 25)</source> <translation type="unfinished"/> </message> <message> - <location line="-27"/> + <location line="-28"/> <source>Listen for connections on <port> (default: 8333 or testnet: 18333)</source> <translation>Slušaj konekcije na <port> (default: 8333 or testnet: 18333)</translation> </message> @@ -2223,7 +2244,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+80"/> + <location line="+82"/> <source>Specify your own public address</source> <translation type="unfinished"/> </message> @@ -2233,22 +2254,22 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="-132"/> + <location line="-134"/> <source>Number of seconds to keep misbehaving peers from reconnecting (default: 86400)</source> <translation type="unfinished"/> </message> <message> - <location line="-32"/> + <location line="-29"/> <source>An error occurred while setting up the RPC port %u for listening on IPv4: %s</source> <translation type="unfinished"/> </message> <message> - <location line="+30"/> + <location line="+27"/> <source>Listen for JSON-RPC connections on <port> (default: 8332 or testnet: 18332)</source> <translation type="unfinished"/> </message> <message> - <location line="+36"/> + <location line="+37"/> <source>Accept command line and JSON-RPC commands</source> <translation>Prihvati komandnu liniju i JSON-RPC komande</translation> </message> @@ -2258,17 +2279,17 @@ Address: %4 <translation>Radi u pozadini kao daemon servis i prihvati komande</translation> </message> <message> - <location line="+33"/> + <location line="+37"/> <source>Use the test network</source> <translation>Koristi testnu mrežu</translation> </message> <message> - <location line="-108"/> + <location line="-112"/> <source>Accept connections from outside (default: 1 if no -proxy or -connect)</source> <translation type="unfinished"/> </message> <message> - <location line="-82"/> + <location line="-80"/> <source>%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. </message> <message> <location line="+3"/> - <source>Error initializing database environment %s! To recover, BACKUP THAT DIRECTORY, then remove everything from it except for wallet.dat.</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+3"/> <source>Error: The transaction was rejected! This might happen if some of the coins in your wallet were already spent, such as if you used a copy of wallet.dat and coins were spent in the copy but not marked as spent here.</source> <translation type="unfinished"/> </message> @@ -2328,12 +2344,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+3"/> - <source>Set the number of script verification threads (1-16, 0=auto, default: 0)</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+2"/> + <location line="+6"/> <source>This is a pre-release test build - use at your own risk - do not use for mining or merchant applications</source> <translation type="unfinished"/> </message> @@ -2373,7 +2384,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+6"/> + <location line="+5"/> <source>Connect only to the specified node(s)</source> <translation type="unfinished"/> </message> @@ -2393,7 +2404,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+3"/> + <location line="+2"/> <source>Error initializing block database</source> <translation type="unfinished"/> </message> @@ -2419,11 +2430,6 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. </message> <message> <location line="+1"/> - <source>Error: Transaction creation failed!</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+1"/> <source>Error: Wallet locked, unable to create transaction!</source> <translation type="unfinished"/> </message> @@ -2493,7 +2499,12 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+3"/> + <location line="+1"/> + <source>Generate coins (default: 0)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+2"/> <source>How many blocks to check at startup (default: 288, 0 = all)</source> <translation type="unfinished"/> </message> @@ -2503,7 +2514,12 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+24"/> + <location line="+19"/> + <source>Not enough file descriptors available.</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+8"/> <source>Rebuild block chain index from current blk000??.dat files</source> <translation type="unfinished"/> </message> @@ -2513,7 +2529,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+22"/> + <location line="+26"/> <source>Verifying blocks...</source> <translation type="unfinished"/> </message> @@ -2523,12 +2539,17 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="-62"/> + <location line="-69"/> <source>Imports blocks from external blk000??.dat file</source> <translation type="unfinished"/> </message> <message> - <location line="+1"/> + <location line="-76"/> + <source>Set the number of script verification threads (up to 16, 0 = auto, <0 = leave that many cores free, default: 0)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+77"/> <source>Information</source> <translation type="unfinished"/> </message> @@ -2538,6 +2559,16 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> + <location line="+1"/> + <source>Invalid amount for -minrelaytxfee=<amount>: '%s'</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Invalid amount for -mintxfee=<amount>: '%s'</source> + <translation type="unfinished"/> + </message> + <message> <location line="+8"/> <source>Maintain a full transaction index (default: 0)</source> <translation type="unfinished"/> @@ -2553,7 +2584,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+1"/> + <location line="+2"/> <source>Only accept block chain matching built-in checkpoints (default: 1)</source> <translation type="unfinished"/> </message> @@ -2613,6 +2644,11 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> + <location line="+1"/> + <source>Signing transaction failed</source> + <translation type="unfinished"/> + </message> + <message> <location line="+2"/> <source>Specify connection timeout in milliseconds (default: 5000)</source> <translation type="unfinished"/> @@ -2623,7 +2659,22 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+10"/> + <location line="+4"/> + <source>Transaction amount too small</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Transaction amounts must be positive</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Transaction too large</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+7"/> <source>Use UPnP to map the listening port (default: 0)</source> <translation type="unfinished"/> </message> @@ -2663,7 +2714,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="-46"/> + <location line="-50"/> <source>Password for JSON-RPC connections</source> <translation>Lozinka za JSON-RPC konekcije</translation> </message> @@ -2678,17 +2729,17 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Pošalji komande to nodu koji radi na <ip> (default: 127.0.0.1)</translation> </message> <message> - <location line="-119"/> + <location line="-120"/> <source>Execute command when the best block changes (%s in cmd is replaced by block hash)</source> <translation type="unfinished"/> </message> <message> - <location line="+142"/> + <location line="+147"/> <source>Upgrade wallet to latest format</source> <translation type="unfinished"/> </message> <message> - <location line="-17"/> + <location line="-21"/> <source>Set key pool size to <n> (default: 100)</source> <translation>Odredi veličinu zaštićenih ključeva na <n> (default: 100)</translation> </message> @@ -2698,12 +2749,12 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Ponovo skeniraj lanac blokova za nedostajuće transakcije iz novčanika</translation> </message> <message> - <location line="+31"/> + <location line="+35"/> <source>Use OpenSSL (https) for JSON-RPC connections</source> <translation>Koristi OpenSSL (https) za JSON-RPC konekcije</translation> </message> <message> - <location line="-22"/> + <location line="-26"/> <source>Server certificate file (default: server.cert)</source> <translation type="unfinished"/> </message> @@ -2713,37 +2764,37 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>privatni ključ za Server (podrazumevan: server.pem)</translation> </message> <message> - <location line="-153"/> + <location line="-151"/> <source>Acceptable ciphers (default: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH)</source> <translation>Prihvatljive cifre (podrazumevano: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH)</translation> </message> <message> - <location line="+166"/> + <location line="+165"/> <source>This help message</source> <translation>Ova poruka Pomoći</translation> </message> <message> - <location line="+3"/> + <location line="+6"/> <source>Unable to bind to %s on this computer (bind returned error %d, %s)</source> <translation type="unfinished"/> </message> <message> - <location line="-86"/> + <location line="-91"/> <source>Connect through socks proxy</source> <translation type="unfinished"/> </message> <message> - <location line="-11"/> + <location line="-10"/> <source>Allow DNS lookups for -addnode, -seednode and -connect</source> <translation type="unfinished"/> </message> <message> - <location line="+56"/> + <location line="+55"/> <source>Loading addresses...</source> <translation>učitavam adrese....</translation> </message> <message> - <location line="-34"/> + <location line="-35"/> <source>Error loading wallet.dat: Wallet corrupted</source> <translation type="unfinished"/> </message> @@ -2753,22 +2804,22 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+87"/> + <location line="+93"/> <source>Wallet needed to be rewritten: restart Bitcoin to complete</source> <translation type="unfinished"/> </message> <message> - <location line="-89"/> + <location line="-95"/> <source>Error loading wallet.dat</source> <translation type="unfinished"/> </message> <message> - <location line="+29"/> + <location line="+28"/> <source>Invalid -proxy address: '%s'</source> <translation type="unfinished"/> </message> <message> - <location line="+49"/> + <location line="+56"/> <source>Unknown network specified in -onlynet: '%s'</source> <translation type="unfinished"/> </message> @@ -2778,7 +2829,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="-91"/> + <location line="-96"/> <source>Cannot resolve -bind address: '%s'</source> <translation type="unfinished"/> </message> @@ -2798,17 +2849,17 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="-4"/> + <location line="-6"/> <source>Insufficient funds</source> <translation type="unfinished"/> </message> <message> - <location line="+8"/> + <location line="+10"/> <source>Loading block index...</source> <translation>Učitavam blok indeksa...</translation> </message> <message> - <location line="-58"/> + <location line="-57"/> <source>Add a node to connect to and attempt to keep the connection open</source> <translation type="unfinished"/> </message> @@ -2818,52 +2869,47 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+67"/> + <location line="+64"/> <source>Fee per KB to add to transactions you send</source> <translation type="unfinished"/> </message> <message> - <location line="+17"/> + <location line="+19"/> <source>Loading wallet...</source> <translation>Новчаник се учитава...</translation> </message> <message> - <location line="-53"/> + <location line="-52"/> <source>Cannot downgrade wallet</source> <translation type="unfinished"/> </message> <message> - <location line="+1"/> - <source>Cannot initialize keypool</source> - <translation type="unfinished"/> - </message> - <message> <location line="+3"/> <source>Cannot write default address</source> <translation type="unfinished"/> </message> <message> - <location line="+63"/> + <location line="+64"/> <source>Rescanning...</source> <translation>Ponovo skeniram...</translation> </message> <message> - <location line="-55"/> + <location line="-57"/> <source>Done loading</source> <translation>Završeno učitavanje</translation> </message> <message> - <location line="+79"/> + <location line="+82"/> <source>To use the %s option</source> <translation type="unfinished"/> </message> <message> - <location line="-71"/> + <location line="-74"/> <source>Error</source> <translation type="unfinished"/> </message> <message> - <location line="-33"/> + <location line="-31"/> <source>You must set rpcpassword=<password> in the configuration file: %s If the file does not exist, create it with owner-readable-only file permissions.</source> diff --git a/src/qt/locale/bitcoin_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.</translation> </message> <message> - <location filename="../aboutdialog.cpp" line="+17"/> + <location filename="../aboutdialog.cpp" line="+14"/> <source>Copyright</source> <translation>Copyright</translation> </message> <message> <location line="+0"/> - <source>2009-%1 The Bitcoin developers</source> - <translation>2009-%1 Bitcoin-utvecklarna</translation> + <source>The Bitcoin developers</source> + <translation>Bitcoin-utvecklarna</translation> </message> </context> <context> @@ -67,7 +67,7 @@ Denna produkten innehåller mjukvara utvecklad av OpenSSL Project för användni <translation>&Ny adress</translation> </message> <message> - <location filename="../addressbookpage.cpp" line="+59"/> + <location filename="../addressbookpage.cpp" line="+63"/> <source>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.</source> <translation>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.</translation> </message> @@ -97,7 +97,17 @@ Denna produkten innehåller mjukvara utvecklad av OpenSSL Project för användni <translation>Ta bort den valda adressen från listan</translation> </message> <message> - <location line="-14"/> + <location line="+27"/> + <source>Export the data in the current tab to a file</source> + <translation>Exportera informationen i den nuvarande fliken till en fil</translation> + </message> + <message> + <location line="+3"/> + <source>&Export</source> + <translation>&Exportera</translation> + </message> + <message> + <location line="-44"/> <source>Verify a message to ensure it was signed with a specified Bitcoin address</source> <translation>Verifiera meddelandet för att vara säker på att den var signerad med den specificerade Bitcoin-adressen</translation> </message> @@ -319,12 +329,12 @@ Denna produkten innehåller mjukvara utvecklad av OpenSSL Project för användni <translation>Signera &meddelande...</translation> </message> <message> - <location line="+299"/> + <location line="+280"/> <source>Synchronizing with network...</source> <translation>Synkroniserar med nätverk...</translation> </message> <message> - <location line="-368"/> + <location line="-349"/> <source>&Overview</source> <translation>&Översikt</translation> </message> @@ -399,7 +409,7 @@ Denna produkten innehåller mjukvara utvecklad av OpenSSL Project för användni <translation>&Byt Lösenord...</translation> </message> <message> - <location line="+304"/> + <location line="+285"/> <source>Importing blocks from disk...</source> <translation>Importerar block från disk...</translation> </message> @@ -409,12 +419,7 @@ Denna produkten innehåller mjukvara utvecklad av OpenSSL Project för användni <translation>Återindexerar block på disken...</translation> </message> <message> - <location line="-300"/> - <source>&Export...</source> - <translation>&Exportera...</translation> - </message> - <message> - <location line="-66"/> + <location line="-347"/> <source>Send coins to a Bitcoin address</source> <translation>Skicka mynt till en Bitcoin-adress</translation> </message> @@ -424,12 +429,7 @@ Denna produkten innehåller mjukvara utvecklad av OpenSSL Project för användni <translation>Ändra konfigurationsalternativ för Bitcoin</translation> </message> <message> - <location line="+18"/> - <source>Export the data in the current tab to a file</source> - <translation>Exportera informationen i den nuvarande fliken till en fil</translation> - </message> - <message> - <location line="-9"/> + <location line="+9"/> <source>Backup wallet to another location</source> <translation>Säkerhetskopiera plånboken till en annan plats</translation> </message> @@ -439,7 +439,7 @@ Denna produkten innehåller mjukvara utvecklad av OpenSSL Project för användni <translation>Byt lösenord för kryptering av plånbok</translation> </message> <message> - <location line="+9"/> + <location line="+6"/> <source>&Debug window</source> <translation>&Debug fönster</translation> </message> @@ -449,23 +449,23 @@ Denna produkten innehåller mjukvara utvecklad av OpenSSL Project för användni <translation>Öppna debug- och diagnostikkonsolen</translation> </message> <message> - <location line="-7"/> + <location line="-4"/> <source>&Verify message...</source> <translation>&Verifiera meddelande...</translation> </message> <message> - <location line="-163"/> - <location line="+541"/> + <location line="-165"/> + <location line="+530"/> <source>Bitcoin</source> <translation>Bitcoin</translation> </message> <message> - <location line="-541"/> + <location line="-530"/> <source>Wallet</source> <translation>Plånbok</translation> </message> <message> - <location line="+99"/> + <location line="+101"/> <source>&Send</source> <translation>&Skicka</translation> </message> @@ -510,12 +510,12 @@ Denna produkten innehåller mjukvara utvecklad av OpenSSL Project för användni <translation>Verifiera meddelanden för att vara säker på att de var signerade med den specificerade Bitcoin-adressen</translation> </message> <message> - <location line="+31"/> + <location line="+28"/> <source>&File</source> <translation>&Arkiv</translation> </message> <message> - <location line="+8"/> + <location line="+7"/> <source>&Settings</source> <translation>&Inställningar</translation> </message> @@ -530,12 +530,7 @@ Denna produkten innehåller mjukvara utvecklad av OpenSSL Project för användni <translation>Verktygsfält för Tabbar</translation> </message> <message> - <location line="+8"/> - <source>Actions toolbar</source> - <translation>Verktygsfältet för Handlingar</translation> - </message> - <message> - <location line="+13"/> + <location line="+17"/> <location line="+10"/> <source>[testnet]</source> <translation>[testnet]</translation> @@ -546,12 +541,17 @@ Denna produkten innehåller mjukvara utvecklad av OpenSSL Project för användni <translation>Bitcoin-klient</translation> </message> <message numerus="yes"> - <location line="+140"/> + <location line="+141"/> <source>%n active connection(s) to Bitcoin network</source> <translation><numerusform>%n aktiv anslutning till Bitcoin-nätverket</numerusform><numerusform>%n aktiva anslutningar till Bitcoin-nätverket</numerusform></translation> </message> <message> - <location line="+39"/> + <location line="+22"/> + <source>No block source available...</source> + <translation>Ingen block-källa tillgänglig...</translation> + </message> + <message> + <location line="+12"/> <source>Processed %1 of %2 (estimated) blocks of transaction history.</source> <translation>Bearbetat %1 av %2 (uppskattade) block av transaktionshistorik.</translation> </message> @@ -576,7 +576,7 @@ Denna produkten innehåller mjukvara utvecklad av OpenSSL Project för användni <translation><numerusform>%n vecka</numerusform><numerusform>%n veckor</numerusform></translation> </message> <message> - <location line="+5"/> + <location line="+4"/> <source>%1 behind</source> <translation>%1 efter</translation> </message> @@ -591,7 +591,7 @@ Denna produkten innehåller mjukvara utvecklad av OpenSSL Project för användni <translation>Transaktioner efter denna kommer inte ännu vara synliga.</translation> </message> <message> - <location line="+21"/> + <location line="+22"/> <source>Error</source> <translation>Fel</translation> </message> @@ -606,22 +606,22 @@ Denna produkten innehåller mjukvara utvecklad av OpenSSL Project för användni <translation>Information</translation> </message> <message> - <location line="+68"/> + <location line="+70"/> <source>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?</source> <translation>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?</translation> </message> <message> - <location line="-138"/> + <location line="-140"/> <source>Up to date</source> <translation>Uppdaterad</translation> </message> <message> - <location line="+32"/> + <location line="+31"/> <source>Catching up...</source> <translation>Hämtar senaste...</translation> </message> <message> - <location line="+110"/> + <location line="+113"/> <source>Confirm transaction fee</source> <translation>Bekräfta överföringsavgift</translation> </message> @@ -671,7 +671,7 @@ Adress: %4 <translation>Denna plånbok är <b>krypterad</b> och för närvarande <b>låst</b></translation> </message> <message> - <location filename="../bitcoin.cpp" line="+104"/> + <location filename="../bitcoin.cpp" line="+111"/> <source>A fatal error occurred. Bitcoin can no longer continue safely and will quit.</source> <translation>Ett allvarligt fel har uppstått. Bitcoin kan inte längre köras säkert och kommer att avslutas.</translation> </message> @@ -679,7 +679,7 @@ Adress: %4 <context> <name>ClientModel</name> <message> - <location filename="../clientmodel.cpp" line="+98"/> + <location filename="../clientmodel.cpp" line="+104"/> <source>Network Alert</source> <translation>Nätverkslarm</translation> </message> @@ -810,8 +810,8 @@ Adress: %4 </message> <message> <location line="+6"/> - <source>Optional transaction fee per kB that helps make sure your transactions are processed quickly. Most transactions are 1 kB. Fee 0.01 recommended.</source> - <translation>Valfri transaktionsavgift per kB som ser till att dina transaktioner behandlas snabbt. De flesta transaktioner är 1 kB. Avgift 0.01 rekommenderas.</translation> + <source>Optional transaction fee per kB that helps make sure your transactions are processed quickly. Most transactions are 1 kB.</source> + <translation>Valfri transaktionsavgift per kB som ser till att dina transaktioner behandlas snabbt. De flesta transaktioner är 1 kB.</translation> </message> <message> <location line="+15"/> @@ -1060,7 +1060,7 @@ Adress: %4 <translation>Totalt antal transaktioner som ännu inte bekräftats, och som ännu inte räknas med i aktuellt saldo</translation> </message> <message> - <location filename="../overviewpage.cpp" line="+115"/> + <location filename="../overviewpage.cpp" line="+116"/> <location line="+1"/> <source>out of sync</source> <translation>osynkroniserad</translation> @@ -1647,6 +1647,19 @@ Adress: %4 </message> </context> <context> + <name>SplashScreen</name> + <message> + <location filename="../splashscreen.cpp" line="+22"/> + <source>The Bitcoin developers</source> + <translation>Bitcoin-utvecklarna</translation> + </message> + <message> + <location line="+1"/> + <source>[testnet]</source> + <translation>[testnet]</translation> + </message> +</context> +<context> <name>TransactionDesc</name> <message> <location filename="../transactiondesc.cpp" line="+20"/> @@ -2121,9 +2134,27 @@ Adress: %4 </message> </context> <context> + <name>WalletModel</name> + <message> + <location filename="../walletmodel.cpp" line="+193"/> + <source>Send Coins</source> + <translation>Skicka pengar</translation> + </message> +</context> +<context> <name>WalletView</name> <message> - <location filename="../walletview.cpp" line="+247"/> + <location filename="../walletview.cpp" line="+42"/> + <source>&Export</source> + <translation>&Exportera</translation> + </message> + <message> + <location line="+1"/> + <source>Export the data in the current tab to a file</source> + <translation>Exportera informationen i den nuvarande fliken till en fil</translation> + </message> + <message> + <location line="+193"/> <source>Backup Wallet</source> <translation>Säkerhetskopiera Plånbok</translation> </message> @@ -2156,37 +2187,37 @@ Adress: %4 <context> <name>bitcoin-core</name> <message> - <location filename="../bitcoinstrings.cpp" line="+96"/> + <location filename="../bitcoinstrings.cpp" line="+94"/> <source>Bitcoin version</source> <translation>Bitcoin version</translation> </message> <message> - <location line="+98"/> + <location line="+102"/> <source>Usage:</source> <translation>Användning:</translation> </message> <message> - <location line="-25"/> + <location line="-29"/> <source>Send command to -server or bitcoind</source> <translation>Skicka kommando till -server eller bitcoind</translation> </message> <message> - <location line="-22"/> + <location line="-23"/> <source>List commands</source> <translation>Lista kommandon</translation> </message> <message> - <location line="-10"/> + <location line="-12"/> <source>Get help for a command</source> <translation>Få hjälp med ett kommando</translation> </message> <message> - <location line="+21"/> + <location line="+24"/> <source>Options:</source> <translation>Inställningar:</translation> </message> <message> - <location line="+23"/> + <location line="+24"/> <source>Specify configuration file (default: bitcoin.conf)</source> <translation>Ange konfigurationsfil (förvalt: bitcoin.conf)</translation> </message> @@ -2196,27 +2227,17 @@ Adress: %4 <translation>Ange pid fil (förvalt: bitcoind.pid)</translation> </message> <message> - <location line="-48"/> - <source>Generate coins</source> - <translation>Generera mynt</translation> - </message> - <message> - <location line="-27"/> - <source>Don't generate coins</source> - <translation>Generera inte mynt</translation> - </message> - <message> - <location line="+74"/> + <location line="-1"/> <source>Specify data directory</source> <translation>Ange katalog för data</translation> </message> <message> - <location line="-8"/> + <location line="-9"/> <source>Set database cache size in megabytes (default: 25)</source> <translation>Sätt databas cache storleken i megabyte (förvalt: 25)</translation> </message> <message> - <location line="-27"/> + <location line="-28"/> <source>Listen for connections on <port> (default: 8333 or testnet: 18333)</source> <translation>Lyssna efter anslutningar på <port> (förvalt: 8333 eller testnet: 18333)</translation> </message> @@ -2231,7 +2252,7 @@ Adress: %4 <translation>Anslut till en nod för att hämta klientadresser, och koppla från</translation> </message> <message> - <location line="+80"/> + <location line="+82"/> <source>Specify your own public address</source> <translation>Ange din egen publika adress</translation> </message> @@ -2241,22 +2262,22 @@ Adress: %4 <translation>Tröskelvärde för att koppla ifrån klienter som missköter sig (förvalt: 100)</translation> </message> <message> - <location line="-132"/> + <location line="-134"/> <source>Number of seconds to keep misbehaving peers from reconnecting (default: 86400)</source> <translation>Antal sekunder att hindra klienter som missköter sig från att ansluta (förvalt: 86400)</translation> </message> <message> - <location line="-32"/> + <location line="-29"/> <source>An error occurred while setting up the RPC port %u for listening on IPv4: %s</source> <translation>Ett fel uppstod vid upprättandet av RPC port %u för att lyssna på IPv4: %s</translation> </message> <message> - <location line="+30"/> + <location line="+27"/> <source>Listen for JSON-RPC connections on <port> (default: 8332 or testnet: 18332)</source> <translation>Lyssna på JSON-RPC-anslutningar på <port> (förvalt: 8332 eller testnet: 18332)</translation> </message> <message> - <location line="+36"/> + <location line="+37"/> <source>Accept command line and JSON-RPC commands</source> <translation>Tillåt kommandon från kommandotolken och JSON-RPC-kommandon</translation> </message> @@ -2266,17 +2287,17 @@ Adress: %4 <translation>Kör i bakgrunden som tjänst och acceptera kommandon</translation> </message> <message> - <location line="+33"/> + <location line="+37"/> <source>Use the test network</source> <translation>Använd testnätverket</translation> </message> <message> - <location line="-108"/> + <location line="-112"/> <source>Accept connections from outside (default: 1 if no -proxy or -connect)</source> <translation>Acceptera anslutningar utifrån (förvalt: 1 om ingen -proxy eller -connect)</translation> </message> <message> - <location line="-82"/> + <location line="-80"/> <source>%s, you must set a rpcpassword in the configuration file: %s It is recommended you use the following random password: @@ -2317,11 +2338,6 @@ till exempel: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo </message> <message> <location line="+3"/> - <source>Error initializing database environment %s! To recover, BACKUP THAT DIRECTORY, then remove everything from it except for wallet.dat.</source> - <translation>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.</translation> - </message> - <message> - <location line="+3"/> <source>Error: The transaction was rejected! This might happen if some of the coins in your wallet were already spent, such as if you used a copy of wallet.dat and coins were spent in the copy but not marked as spent here.</source> <translation>Fel: Transaktionen avslogs! Detta kan hända om några av mynten i plånboken redan spenderats, t.ex om du använt en kopia av wallet.dat och mynt spenderades i kopian men inte markerats som spenderas här.</translation> </message> @@ -2346,12 +2362,7 @@ till exempel: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo <translation>Sätt den maximala storleken av hög-prioriterade/låg-avgifts transaktioner i byte (förvalt: 27000)</translation> </message> <message> - <location line="+3"/> - <source>Set the number of script verification threads (1-16, 0=auto, default: 0)</source> - <translation>Ange antalet skriptkontrolltrådar (1-16, 0 = auto, förval: 0)</translation> - </message> - <message> - <location line="+2"/> + <location line="+6"/> <source>This is a pre-release test build - use at your own risk - do not use for mining or merchant applications</source> <translation>Detta är ett förhands testbygge - använd på egen risk - använd inte för mining eller handels applikationer</translation> </message> @@ -2391,7 +2402,7 @@ till exempel: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo <translation>Block skapande inställningar:</translation> </message> <message> - <location line="+6"/> + <location line="+5"/> <source>Connect only to the specified node(s)</source> <translation>Koppla enbart upp till den/de specificerade noden/noder</translation> </message> @@ -2411,7 +2422,7 @@ till exempel: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo <translation>Vill du bygga om blockdatabasen nu?</translation> </message> <message> - <location line="+3"/> + <location line="+2"/> <source>Error initializing block database</source> <translation>Fel vid initiering av blockdatabasen</translation> </message> @@ -2437,11 +2448,6 @@ till exempel: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo </message> <message> <location line="+1"/> - <source>Error: Transaction creation failed!</source> - <translation>Fel: Transaktionen gick inte att skapa!</translation> - </message> - <message> - <location line="+1"/> <source>Error: Wallet locked, unable to create transaction!</source> <translation>Fel: Plånboken är låst, det går ej att skapa en transaktion!</translation> </message> @@ -2511,7 +2517,12 @@ till exempel: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo <translation>Sök efter klienter med DNS sökningen (förvalt: 1 om inte -connect)</translation> </message> <message> - <location line="+3"/> + <location line="+1"/> + <source>Generate coins (default: 0)</source> + <translation>Generera mynt (förvalt: 0)</translation> + </message> + <message> + <location line="+2"/> <source>How many blocks to check at startup (default: 288, 0 = all)</source> <translation>Hur många block att kontrollera vid uppstart (standardvärde: 288, 0 = alla)</translation> </message> @@ -2521,7 +2532,12 @@ till exempel: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo <translation>Hur grundlig blockverifikationen är (0-4, förvalt: 3)</translation> </message> <message> - <location line="+24"/> + <location line="+19"/> + <source>Not enough file descriptors available.</source> + <translation>Inte tillräckligt med filbeskrivningar tillgängliga.</translation> + </message> + <message> + <location line="+8"/> <source>Rebuild block chain index from current blk000??.dat files</source> <translation>Återskapa blockkedjans index från nuvarande blk000??.dat filer</translation> </message> @@ -2531,7 +2547,7 @@ till exempel: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo <translation>Ange antalet trådar för att hantera RPC anrop (standard: 4)</translation> </message> <message> - <location line="+22"/> + <location line="+26"/> <source>Verifying blocks...</source> <translation>Verifierar block...</translation> </message> @@ -2541,12 +2557,17 @@ till exempel: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo <translation>Verifierar plånboken...</translation> </message> <message> - <location line="-62"/> + <location line="-69"/> <source>Imports blocks from external blk000??.dat file</source> <translation>Importerar block från extern blk000??.dat fil</translation> </message> <message> - <location line="+1"/> + <location line="-76"/> + <source>Set the number of script verification threads (up to 16, 0 = auto, <0 = leave that many cores free, default: 0)</source> + <translation>Ange antalet skriptkontrolltrådar (upp till 16, 0 = auto, <0 = lämna så många kärnor lediga, förval: 0)</translation> + </message> + <message> + <location line="+77"/> <source>Information</source> <translation>Information</translation> </message> @@ -2556,6 +2577,16 @@ till exempel: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo <translation>Ogiltig -tor adress: '%s'</translation> </message> <message> + <location line="+1"/> + <source>Invalid amount for -minrelaytxfee=<amount>: '%s'</source> + <translation>Ogiltigt belopp för -minrelaytxfee=<belopp>: '%s'</translation> + </message> + <message> + <location line="+1"/> + <source>Invalid amount for -mintxfee=<amount>: '%s'</source> + <translation>Ogiltigt belopp för -mintxfee=<belopp>: '%s'</translation> + </message> + <message> <location line="+8"/> <source>Maintain a full transaction index (default: 0)</source> <translation>Upprätthåll ett fullständigt transaktionsindex (förval: 0)</translation> @@ -2571,7 +2602,7 @@ till exempel: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo <translation>Maximal buffert för sändning per anslutning, <n>*1000 byte (förvalt: 5000)</translation> </message> <message> - <location line="+1"/> + <location line="+2"/> <source>Only accept block chain matching built-in checkpoints (default: 1)</source> <translation>Acceptera bara blockkedjans matchande inbyggda kontrollpunkter (förvalt: 1)</translation> </message> @@ -2631,6 +2662,11 @@ till exempel: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo <translation>Krymp debug.log filen vid klient start (förvalt: 1 vid ingen -debug)</translation> </message> <message> + <location line="+1"/> + <source>Signing transaction failed</source> + <translation>Signering av transaktion misslyckades</translation> + </message> + <message> <location line="+2"/> <source>Specify connection timeout in milliseconds (default: 5000)</source> <translation>Ange timeout för uppkoppling i millisekunder (förvalt: 5000)</translation> @@ -2641,7 +2677,22 @@ till exempel: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo <translation>Systemfel:</translation> </message> <message> - <location line="+10"/> + <location line="+4"/> + <source>Transaction amount too small</source> + <translation>Transaktions belopp för liten</translation> + </message> + <message> + <location line="+1"/> + <source>Transaction amounts must be positive</source> + <translation>Transaktionens belopp måste vara positiva</translation> + </message> + <message> + <location line="+1"/> + <source>Transaction too large</source> + <translation>Transaktionen är för stor</translation> + </message> + <message> + <location line="+7"/> <source>Use UPnP to map the listening port (default: 0)</source> <translation>Använd UPnP för att mappa den lyssnande porten (förvalt: 0)</translation> </message> @@ -2681,7 +2732,7 @@ till exempel: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo <translation>wallet.dat korrupt, räddning misslyckades</translation> </message> <message> - <location line="-46"/> + <location line="-50"/> <source>Password for JSON-RPC connections</source> <translation>Lösenord för JSON-RPC-anslutningar</translation> </message> @@ -2696,17 +2747,17 @@ till exempel: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo <translation>Skicka kommandon till klient på <ip> (förvalt: 127.0.0.1)</translation> </message> <message> - <location line="-119"/> + <location line="-120"/> <source>Execute command when the best block changes (%s in cmd is replaced by block hash)</source> <translation>Exekvera kommando när det bästa blocket ändras (%s i cmd är utbytt av blockhash)</translation> </message> <message> - <location line="+142"/> + <location line="+147"/> <source>Upgrade wallet to latest format</source> <translation>Uppgradera plånboken till senaste formatet</translation> </message> <message> - <location line="-17"/> + <location line="-21"/> <source>Set key pool size to <n> (default: 100)</source> <translation>Sätt storleken på nyckelpoolen till <n> (förvalt: 100)</translation> </message> @@ -2716,12 +2767,12 @@ till exempel: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo <translation>Sök i blockkedjan efter saknade plånboks transaktioner</translation> </message> <message> - <location line="+31"/> + <location line="+35"/> <source>Use OpenSSL (https) for JSON-RPC connections</source> <translation>Använd OpenSSL (https) för JSON-RPC-anslutningar</translation> </message> <message> - <location line="-22"/> + <location line="-26"/> <source>Server certificate file (default: server.cert)</source> <translation>Serverns certifikatfil (förvalt: server.cert)</translation> </message> @@ -2731,37 +2782,37 @@ till exempel: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo <translation>Serverns privata nyckel (förvalt: server.pem)</translation> </message> <message> - <location line="-153"/> + <location line="-151"/> <source>Acceptable ciphers (default: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH)</source> <translation>Accepterade krypteringsalgoritmer (förvalt: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH)</translation> </message> <message> - <location line="+166"/> + <location line="+165"/> <source>This help message</source> <translation>Det här hjälp medelandet</translation> </message> <message> - <location line="+3"/> + <location line="+6"/> <source>Unable to bind to %s on this computer (bind returned error %d, %s)</source> <translation>Det går inte att binda till %s på den här datorn (bind returnerade felmeddelande %d, %s)</translation> </message> <message> - <location line="-86"/> + <location line="-91"/> <source>Connect through socks proxy</source> <translation>Anslut genom socks-proxy</translation> </message> <message> - <location line="-11"/> + <location line="-10"/> <source>Allow DNS lookups for -addnode, -seednode and -connect</source> <translation>Tillåt DNS-sökningar för -addnode, -seednode och -connect</translation> </message> <message> - <location line="+56"/> + <location line="+55"/> <source>Loading addresses...</source> <translation>Laddar adresser...</translation> </message> <message> - <location line="-34"/> + <location line="-35"/> <source>Error loading wallet.dat: Wallet corrupted</source> <translation>Fel vid inläsningen av wallet.dat: Plånboken är skadad</translation> </message> @@ -2771,22 +2822,22 @@ till exempel: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo <translation>Fel vid inläsningen av wallet.dat: Plånboken kräver en senare version av Bitcoin</translation> </message> <message> - <location line="+87"/> + <location line="+93"/> <source>Wallet needed to be rewritten: restart Bitcoin to complete</source> <translation>Plånboken behöver skrivas om: Starta om Bitcoin för att färdigställa</translation> </message> <message> - <location line="-89"/> + <location line="-95"/> <source>Error loading wallet.dat</source> <translation>Fel vid inläsning av plånboksfilen wallet.dat</translation> </message> <message> - <location line="+29"/> + <location line="+28"/> <source>Invalid -proxy address: '%s'</source> <translation>Ogiltig -proxy adress: '%s'</translation> </message> <message> - <location line="+49"/> + <location line="+56"/> <source>Unknown network specified in -onlynet: '%s'</source> <translation>Okänt nätverk som anges i -onlynet: '%s'</translation> </message> @@ -2796,7 +2847,7 @@ till exempel: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo <translation>Okänd -socks proxy version begärd: %i</translation> </message> <message> - <location line="-91"/> + <location line="-96"/> <source>Cannot resolve -bind address: '%s'</source> <translation>Kan inte matcha -bind adress: '%s'</translation> </message> @@ -2816,17 +2867,17 @@ till exempel: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo <translation>Ogiltig mängd</translation> </message> <message> - <location line="-4"/> + <location line="-6"/> <source>Insufficient funds</source> <translation>Otillräckligt med bitcoins</translation> </message> <message> - <location line="+8"/> + <location line="+10"/> <source>Loading block index...</source> <translation>Laddar blockindex...</translation> </message> <message> - <location line="-58"/> + <location line="-57"/> <source>Add a node to connect to and attempt to keep the connection open</source> <translation>Lägg till en nod att koppla upp mot och försök att hålla anslutningen öppen</translation> </message> @@ -2836,52 +2887,47 @@ till exempel: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo <translation>Det går inte att binda till %s på den här datorn. Bitcoin är förmodligen redan igång.</translation> </message> <message> - <location line="+67"/> + <location line="+64"/> <source>Fee per KB to add to transactions you send</source> <translation>Avgift per KB att lägga till på transaktioner du skickar</translation> </message> <message> - <location line="+17"/> + <location line="+19"/> <source>Loading wallet...</source> <translation>Laddar plånbok...</translation> </message> <message> - <location line="-53"/> + <location line="-52"/> <source>Cannot downgrade wallet</source> <translation>Kan inte nedgradera plånboken</translation> </message> <message> - <location line="+1"/> - <source>Cannot initialize keypool</source> - <translation>Kan inte initiera keypool</translation> - </message> - <message> <location line="+3"/> <source>Cannot write default address</source> <translation>Kan inte skriva standardadress</translation> </message> <message> - <location line="+63"/> + <location line="+64"/> <source>Rescanning...</source> <translation>Söker igen...</translation> </message> <message> - <location line="-55"/> + <location line="-57"/> <source>Done loading</source> <translation>Klar med laddning</translation> </message> <message> - <location line="+79"/> + <location line="+82"/> <source>To use the %s option</source> <translation>Att använda %s alternativet</translation> </message> <message> - <location line="-71"/> + <location line="-74"/> <source>Error</source> <translation>Fel</translation> </message> <message> - <location line="-33"/> + <location line="-31"/> <source>You must set rpcpassword=<password> in the configuration file: %s If the file does not exist, create it with owner-readable-only file permissions.</source> diff --git a/src/qt/locale/bitcoin_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 @@ <message> <location filename="../forms/aboutdialog.ui" line="+14"/> <source>About Bitcoin</source> - <translation type="unfinished"/> + <translation>เกี่ยวกับ บิตคอย์น</translation> </message> <message> <location line="+39"/> <source><b>Bitcoin</b> version</source> - <translation type="unfinished"/> + <translation><b>บิตคอย์น<b>รุ่น</translation> </message> <message> <location line="+57"/> @@ -23,13 +23,13 @@ This product includes software developed by the OpenSSL Project for use in the O <translation type="unfinished"/> </message> <message> - <location filename="../aboutdialog.cpp" line="+17"/> + <location filename="../aboutdialog.cpp" line="+14"/> <source>Copyright</source> <translation type="unfinished"/> </message> <message> <location line="+0"/> - <source>2009-%1 The Bitcoin developers</source> + <source>The Bitcoin developers</source> <translation type="unfinished"/> </message> </context> @@ -38,22 +38,22 @@ This product includes software developed by the OpenSSL Project for use in the O <message> <location filename="../forms/addressbookpage.ui" line="+14"/> <source>Address Book</source> - <translation type="unfinished"/> + <translation>สมุดรายชื่อ</translation> </message> <message> <location line="+19"/> <source>Double-click to edit address or label</source> - <translation type="unfinished"/> + <translation>ดับเบิลคลิก เพื่อแก้ไขที่อยู่ หรือชื่อ</translation> </message> <message> <location line="+27"/> <source>Create a new address</source> - <translation type="unfinished"/> + <translation>สร้างที่อยู่ใหม่</translation> </message> <message> <location line="+14"/> <source>Copy the currently selected address to the system clipboard</source> - <translation type="unfinished"/> + <translation>คัดลอกที่อยู่ที่ถูกเลือกไปยัง คลิปบอร์ดของระบบ</translation> </message> <message> <location line="-11"/> @@ -61,7 +61,7 @@ This product includes software developed by the OpenSSL Project for use in the O <translation type="unfinished"/> </message> <message> - <location filename="../addressbookpage.cpp" line="+59"/> + <location filename="../addressbookpage.cpp" line="+63"/> <source>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.</source> <translation type="unfinished"/> </message> @@ -91,7 +91,17 @@ This product includes software developed by the OpenSSL Project for use in the O <translation type="unfinished"/> </message> <message> - <location line="-14"/> + <location line="+27"/> + <source>Export the data in the current tab to a file</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+3"/> + <source>&Export</source> + <translation type="unfinished"/> + </message> + <message> + <location line="-44"/> <source>Verify a message to ensure it was signed with a specified Bitcoin address</source> <translation type="unfinished"/> </message> @@ -103,7 +113,7 @@ This product includes software developed by the OpenSSL Project for use in the O <message> <location line="+14"/> <source>&Delete</source> - <translation type="unfinished"/> + <translation>ลบ</translation> </message> <message> <location filename="../addressbookpage.cpp" line="-5"/> @@ -128,7 +138,7 @@ This product includes software developed by the OpenSSL Project for use in the O <message> <location line="+260"/> <source>Export Address Book Data</source> - <translation type="unfinished"/> + <translation>ส่งออกรายชื่อทั้งหมด</translation> </message> <message> <location line="+1"/> @@ -138,12 +148,12 @@ This product includes software developed by the OpenSSL Project for use in the O <message> <location line="+13"/> <source>Error exporting</source> - <translation type="unfinished"/> + <translation>ส่งออกผิดพลาด</translation> </message> <message> <location line="+0"/> <source>Could not write to file %1.</source> - <translation type="unfinished"/> + <translation>ไม่สามารถเขียนไปยังไฟล์ %1</translation> </message> </context> <context> @@ -151,17 +161,17 @@ This product includes software developed by the OpenSSL Project for use in the O <message> <location filename="../addresstablemodel.cpp" line="+144"/> <source>Label</source> - <translation type="unfinished"/> + <translation>ชื่อ</translation> </message> <message> <location line="+0"/> <source>Address</source> - <translation type="unfinished"/> + <translation>ที่อยู่</translation> </message> <message> <location line="+36"/> <source>(no label)</source> - <translation type="unfinished"/> + <translation>(ไม่มีชื่อ)</translation> </message> </context> <context> @@ -174,17 +184,17 @@ This product includes software developed by the OpenSSL Project for use in the O <message> <location line="+21"/> <source>Enter passphrase</source> - <translation type="unfinished"/> + <translation>ใส่รหัสผ่าน</translation> </message> <message> <location line="+14"/> <source>New passphrase</source> - <translation type="unfinished"/> + <translation>รหัสผา่นใหม่</translation> </message> <message> <location line="+14"/> <source>Repeat new passphrase</source> - <translation type="unfinished"/> + <translation>กรุณากรอกรหัสผ่านใหม่อีกครั้งหนึ่ง</translation> </message> <message> <location filename="../askpassphrasedialog.cpp" line="+33"/> @@ -194,7 +204,7 @@ This product includes software developed by the OpenSSL Project for use in the O <message> <location line="+1"/> <source>Encrypt wallet</source> - <translation type="unfinished"/> + <translation>กระเป๋าสตางค์ที่เข้ารหัส</translation> </message> <message> <location line="+3"/> @@ -204,7 +214,7 @@ This product includes software developed by the OpenSSL Project for use in the O <message> <location line="+5"/> <source>Unlock wallet</source> - <translation type="unfinished"/> + <translation>เปิดกระเป๋าสตางค์</translation> </message> <message> <location line="+3"/> @@ -214,22 +224,22 @@ This product includes software developed by the OpenSSL Project for use in the O <message> <location line="+5"/> <source>Decrypt wallet</source> - <translation type="unfinished"/> + <translation>ถอดรหัสกระเป๋าสตางค์</translation> </message> <message> <location line="+3"/> <source>Change passphrase</source> - <translation type="unfinished"/> + <translation>เปลี่ยนรหัสผ่าน</translation> </message> <message> <location line="+1"/> <source>Enter the old and new passphrase to the wallet.</source> - <translation type="unfinished"/> + <translation>กรอกรหัสผ่านเก่าและรหัสผ่านใหม่สำหรับกระเป๋าสตางค์</translation> </message> <message> <location line="+46"/> <source>Confirm wallet encryption</source> - <translation type="unfinished"/> + <translation>ยืนยันการเข้ารหัสกระเป๋าสตางค์</translation> </message> <message> <location line="+1"/> @@ -256,7 +266,7 @@ This product includes software developed by the OpenSSL Project for use in the O <location line="-130"/> <location line="+58"/> <source>Wallet encrypted</source> - <translation type="unfinished"/> + <translation>กระเป๋าสตางค์ถูกเข้ารหัสเรียบร้อยแล้ว</translation> </message> <message> <location line="-56"/> @@ -269,7 +279,7 @@ This product includes software developed by the OpenSSL Project for use in the O <location line="+42"/> <location line="+6"/> <source>Wallet encryption failed</source> - <translation type="unfinished"/> + <translation>การเข้ารหัสกระเป๋าสตางค์ผิดพลาด</translation> </message> <message> <location line="-54"/> @@ -280,7 +290,7 @@ This product includes software developed by the OpenSSL Project for use in the O <location line="+7"/> <location line="+48"/> <source>The supplied passphrases do not match.</source> - <translation type="unfinished"/> + <translation>รหัสผ่านที่คุณกรอกไม่ตรงกัน</translation> </message> <message> <location line="-37"/> @@ -313,12 +323,12 @@ This product includes software developed by the OpenSSL Project for use in the O <translation type="unfinished"/> </message> <message> - <location line="+299"/> + <location line="+280"/> <source>Synchronizing with network...</source> <translation type="unfinished"/> </message> <message> - <location line="-368"/> + <location line="-349"/> <source>&Overview</source> <translation type="unfinished"/> </message> @@ -393,7 +403,7 @@ This product includes software developed by the OpenSSL Project for use in the O <translation type="unfinished"/> </message> <message> - <location line="+304"/> + <location line="+285"/> <source>Importing blocks from disk...</source> <translation type="unfinished"/> </message> @@ -403,12 +413,7 @@ This product includes software developed by the OpenSSL Project for use in the O <translation type="unfinished"/> </message> <message> - <location line="-300"/> - <source>&Export...</source> - <translation type="unfinished"/> - </message> - <message> - <location line="-66"/> + <location line="-347"/> <source>Send coins to a Bitcoin address</source> <translation type="unfinished"/> </message> @@ -418,12 +423,7 @@ This product includes software developed by the OpenSSL Project for use in the O <translation type="unfinished"/> </message> <message> - <location line="+18"/> - <source>Export the data in the current tab to a file</source> - <translation type="unfinished"/> - </message> - <message> - <location line="-9"/> + <location line="+9"/> <source>Backup wallet to another location</source> <translation type="unfinished"/> </message> @@ -433,7 +433,7 @@ This product includes software developed by the OpenSSL Project for use in the O <translation type="unfinished"/> </message> <message> - <location line="+9"/> + <location line="+6"/> <source>&Debug window</source> <translation type="unfinished"/> </message> @@ -443,23 +443,23 @@ This product includes software developed by the OpenSSL Project for use in the O <translation type="unfinished"/> </message> <message> - <location line="-7"/> + <location line="-4"/> <source>&Verify message...</source> <translation type="unfinished"/> </message> <message> - <location line="-163"/> - <location line="+541"/> + <location line="-165"/> + <location line="+530"/> <source>Bitcoin</source> <translation type="unfinished"/> </message> <message> - <location line="-541"/> + <location line="-530"/> <source>Wallet</source> <translation type="unfinished"/> </message> <message> - <location line="+99"/> + <location line="+101"/> <source>&Send</source> <translation type="unfinished"/> </message> @@ -504,12 +504,12 @@ This product includes software developed by the OpenSSL Project for use in the O <translation type="unfinished"/> </message> <message> - <location line="+31"/> + <location line="+28"/> <source>&File</source> <translation type="unfinished"/> </message> <message> - <location line="+8"/> + <location line="+7"/> <source>&Settings</source> <translation type="unfinished"/> </message> @@ -524,12 +524,7 @@ This product includes software developed by the OpenSSL Project for use in the O <translation type="unfinished"/> </message> <message> - <location line="+8"/> - <source>Actions toolbar</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+13"/> + <location line="+17"/> <location line="+10"/> <source>[testnet]</source> <translation type="unfinished"/> @@ -540,12 +535,17 @@ This product includes software developed by the OpenSSL Project for use in the O <translation type="unfinished"/> </message> <message numerus="yes"> - <location line="+140"/> + <location line="+141"/> <source>%n active connection(s) to Bitcoin network</source> <translation type="unfinished"><numerusform></numerusform></translation> </message> <message> - <location line="+39"/> + <location line="+22"/> + <source>No block source available...</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+12"/> <source>Processed %1 of %2 (estimated) blocks of transaction history.</source> <translation type="unfinished"/> </message> @@ -570,7 +570,7 @@ This product includes software developed by the OpenSSL Project for use in the O <translation type="unfinished"><numerusform></numerusform></translation> </message> <message> - <location line="+5"/> + <location line="+4"/> <source>%1 behind</source> <translation type="unfinished"/> </message> @@ -585,7 +585,7 @@ This product includes software developed by the OpenSSL Project for use in the O <translation type="unfinished"/> </message> <message> - <location line="+21"/> + <location line="+22"/> <source>Error</source> <translation type="unfinished"/> </message> @@ -600,22 +600,22 @@ This product includes software developed by the OpenSSL Project for use in the O <translation type="unfinished"/> </message> <message> - <location line="+68"/> + <location line="+70"/> <source>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?</source> <translation type="unfinished"/> </message> <message> - <location line="-138"/> + <location line="-140"/> <source>Up to date</source> <translation type="unfinished"/> </message> <message> - <location line="+32"/> + <location line="+31"/> <source>Catching up...</source> <translation type="unfinished"/> </message> <message> - <location line="+110"/> + <location line="+113"/> <source>Confirm transaction fee</source> <translation type="unfinished"/> </message> @@ -661,7 +661,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location filename="../bitcoin.cpp" line="+104"/> + <location filename="../bitcoin.cpp" line="+111"/> <source>A fatal error occurred. Bitcoin can no longer continue safely and will quit.</source> <translation type="unfinished"/> </message> @@ -669,7 +669,7 @@ Address: %4 <context> <name>ClientModel</name> <message> - <location filename="../clientmodel.cpp" line="+98"/> + <location filename="../clientmodel.cpp" line="+104"/> <source>Network Alert</source> <translation type="unfinished"/> </message> @@ -800,7 +800,7 @@ Address: %4 </message> <message> <location line="+6"/> - <source>Optional transaction fee per kB that helps make sure your transactions are processed quickly. Most transactions are 1 kB. Fee 0.01 recommended.</source> + <source>Optional transaction fee per kB that helps make sure your transactions are processed quickly. Most transactions are 1 kB.</source> <translation type="unfinished"/> </message> <message> @@ -1050,7 +1050,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location filename="../overviewpage.cpp" line="+115"/> + <location filename="../overviewpage.cpp" line="+116"/> <location line="+1"/> <source>out of sync</source> <translation type="unfinished"/> @@ -1637,6 +1637,19 @@ Address: %4 </message> </context> <context> + <name>SplashScreen</name> + <message> + <location filename="../splashscreen.cpp" line="+22"/> + <source>The Bitcoin developers</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>[testnet]</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>TransactionDesc</name> <message> <location filename="../transactiondesc.cpp" line="+20"/> @@ -1838,7 +1851,7 @@ Address: %4 <message> <location line="+0"/> <source>Address</source> - <translation type="unfinished"/> + <translation>ที่อยู่</translation> </message> <message> <location line="+0"/> @@ -2072,12 +2085,12 @@ Address: %4 <message> <location line="+1"/> <source>Label</source> - <translation type="unfinished"/> + <translation>ชื่อ</translation> </message> <message> <location line="+1"/> <source>Address</source> - <translation type="unfinished"/> + <translation>ที่อยู่</translation> </message> <message> <location line="+1"/> @@ -2092,12 +2105,12 @@ Address: %4 <message> <location line="+4"/> <source>Error exporting</source> - <translation type="unfinished"/> + <translation>ส่งออกผิดพลาด</translation> </message> <message> <location line="+0"/> <source>Could not write to file %1.</source> - <translation type="unfinished"/> + <translation>ไม่สามารถเขียนไปยังไฟล์ %1</translation> </message> <message> <location line="+100"/> @@ -2111,9 +2124,27 @@ Address: %4 </message> </context> <context> + <name>WalletModel</name> + <message> + <location filename="../walletmodel.cpp" line="+193"/> + <source>Send Coins</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>WalletView</name> <message> - <location filename="../walletview.cpp" line="+247"/> + <location filename="../walletview.cpp" line="+42"/> + <source>&Export</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Export the data in the current tab to a file</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+193"/> <source>Backup Wallet</source> <translation type="unfinished"/> </message> @@ -2146,37 +2177,37 @@ Address: %4 <context> <name>bitcoin-core</name> <message> - <location filename="../bitcoinstrings.cpp" line="+96"/> + <location filename="../bitcoinstrings.cpp" line="+94"/> <source>Bitcoin version</source> <translation type="unfinished"/> </message> <message> - <location line="+98"/> + <location line="+102"/> <source>Usage:</source> <translation type="unfinished"/> </message> <message> - <location line="-25"/> + <location line="-29"/> <source>Send command to -server or bitcoind</source> <translation type="unfinished"/> </message> <message> - <location line="-22"/> + <location line="-23"/> <source>List commands</source> <translation type="unfinished"/> </message> <message> - <location line="-10"/> + <location line="-12"/> <source>Get help for a command</source> <translation type="unfinished"/> </message> <message> - <location line="+21"/> + <location line="+24"/> <source>Options:</source> <translation type="unfinished"/> </message> <message> - <location line="+23"/> + <location line="+24"/> <source>Specify configuration file (default: bitcoin.conf)</source> <translation type="unfinished"/> </message> @@ -2186,27 +2217,17 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="-48"/> - <source>Generate coins</source> - <translation type="unfinished"/> - </message> - <message> - <location line="-27"/> - <source>Don't generate coins</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+74"/> + <location line="-1"/> <source>Specify data directory</source> <translation type="unfinished"/> </message> <message> - <location line="-8"/> + <location line="-9"/> <source>Set database cache size in megabytes (default: 25)</source> <translation type="unfinished"/> </message> <message> - <location line="-27"/> + <location line="-28"/> <source>Listen for connections on <port> (default: 8333 or testnet: 18333)</source> <translation type="unfinished"/> </message> @@ -2221,7 +2242,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+80"/> + <location line="+82"/> <source>Specify your own public address</source> <translation type="unfinished"/> </message> @@ -2231,22 +2252,22 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="-132"/> + <location line="-134"/> <source>Number of seconds to keep misbehaving peers from reconnecting (default: 86400)</source> <translation type="unfinished"/> </message> <message> - <location line="-32"/> + <location line="-29"/> <source>An error occurred while setting up the RPC port %u for listening on IPv4: %s</source> <translation type="unfinished"/> </message> <message> - <location line="+30"/> + <location line="+27"/> <source>Listen for JSON-RPC connections on <port> (default: 8332 or testnet: 18332)</source> <translation type="unfinished"/> </message> <message> - <location line="+36"/> + <location line="+37"/> <source>Accept command line and JSON-RPC commands</source> <translation type="unfinished"/> </message> @@ -2256,17 +2277,17 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+33"/> + <location line="+37"/> <source>Use the test network</source> <translation type="unfinished"/> </message> <message> - <location line="-108"/> + <location line="-112"/> <source>Accept connections from outside (default: 1 if no -proxy or -connect)</source> <translation type="unfinished"/> </message> <message> - <location line="-82"/> + <location line="-80"/> <source>%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. </message> <message> <location line="+3"/> - <source>Error initializing database environment %s! To recover, BACKUP THAT DIRECTORY, then remove everything from it except for wallet.dat.</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+3"/> <source>Error: The transaction was rejected! This might happen if some of the coins in your wallet were already spent, such as if you used a copy of wallet.dat and coins were spent in the copy but not marked as spent here.</source> <translation type="unfinished"/> </message> @@ -2326,12 +2342,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+3"/> - <source>Set the number of script verification threads (1-16, 0=auto, default: 0)</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+2"/> + <location line="+6"/> <source>This is a pre-release test build - use at your own risk - do not use for mining or merchant applications</source> <translation type="unfinished"/> </message> @@ -2371,7 +2382,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+6"/> + <location line="+5"/> <source>Connect only to the specified node(s)</source> <translation type="unfinished"/> </message> @@ -2391,7 +2402,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+3"/> + <location line="+2"/> <source>Error initializing block database</source> <translation type="unfinished"/> </message> @@ -2417,11 +2428,6 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. </message> <message> <location line="+1"/> - <source>Error: Transaction creation failed!</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+1"/> <source>Error: Wallet locked, unable to create transaction!</source> <translation type="unfinished"/> </message> @@ -2491,7 +2497,12 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+3"/> + <location line="+1"/> + <source>Generate coins (default: 0)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+2"/> <source>How many blocks to check at startup (default: 288, 0 = all)</source> <translation type="unfinished"/> </message> @@ -2501,7 +2512,12 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+24"/> + <location line="+19"/> + <source>Not enough file descriptors available.</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+8"/> <source>Rebuild block chain index from current blk000??.dat files</source> <translation type="unfinished"/> </message> @@ -2511,7 +2527,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+22"/> + <location line="+26"/> <source>Verifying blocks...</source> <translation type="unfinished"/> </message> @@ -2521,12 +2537,17 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="-62"/> + <location line="-69"/> <source>Imports blocks from external blk000??.dat file</source> <translation type="unfinished"/> </message> <message> - <location line="+1"/> + <location line="-76"/> + <source>Set the number of script verification threads (up to 16, 0 = auto, <0 = leave that many cores free, default: 0)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+77"/> <source>Information</source> <translation type="unfinished"/> </message> @@ -2536,6 +2557,16 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> + <location line="+1"/> + <source>Invalid amount for -minrelaytxfee=<amount>: '%s'</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Invalid amount for -mintxfee=<amount>: '%s'</source> + <translation type="unfinished"/> + </message> + <message> <location line="+8"/> <source>Maintain a full transaction index (default: 0)</source> <translation type="unfinished"/> @@ -2551,7 +2582,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+1"/> + <location line="+2"/> <source>Only accept block chain matching built-in checkpoints (default: 1)</source> <translation type="unfinished"/> </message> @@ -2611,6 +2642,11 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> + <location line="+1"/> + <source>Signing transaction failed</source> + <translation type="unfinished"/> + </message> + <message> <location line="+2"/> <source>Specify connection timeout in milliseconds (default: 5000)</source> <translation type="unfinished"/> @@ -2621,7 +2657,22 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+10"/> + <location line="+4"/> + <source>Transaction amount too small</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Transaction amounts must be positive</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Transaction too large</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+7"/> <source>Use UPnP to map the listening port (default: 0)</source> <translation type="unfinished"/> </message> @@ -2661,7 +2712,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="-46"/> + <location line="-50"/> <source>Password for JSON-RPC connections</source> <translation type="unfinished"/> </message> @@ -2676,17 +2727,17 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="-119"/> + <location line="-120"/> <source>Execute command when the best block changes (%s in cmd is replaced by block hash)</source> <translation type="unfinished"/> </message> <message> - <location line="+142"/> + <location line="+147"/> <source>Upgrade wallet to latest format</source> <translation type="unfinished"/> </message> <message> - <location line="-17"/> + <location line="-21"/> <source>Set key pool size to <n> (default: 100)</source> <translation type="unfinished"/> </message> @@ -2696,12 +2747,12 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+31"/> + <location line="+35"/> <source>Use OpenSSL (https) for JSON-RPC connections</source> <translation type="unfinished"/> </message> <message> - <location line="-22"/> + <location line="-26"/> <source>Server certificate file (default: server.cert)</source> <translation type="unfinished"/> </message> @@ -2711,37 +2762,37 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="-153"/> + <location line="-151"/> <source>Acceptable ciphers (default: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH)</source> <translation type="unfinished"/> </message> <message> - <location line="+166"/> + <location line="+165"/> <source>This help message</source> <translation type="unfinished"/> </message> <message> - <location line="+3"/> + <location line="+6"/> <source>Unable to bind to %s on this computer (bind returned error %d, %s)</source> <translation type="unfinished"/> </message> <message> - <location line="-86"/> + <location line="-91"/> <source>Connect through socks proxy</source> <translation type="unfinished"/> </message> <message> - <location line="-11"/> + <location line="-10"/> <source>Allow DNS lookups for -addnode, -seednode and -connect</source> <translation type="unfinished"/> </message> <message> - <location line="+56"/> + <location line="+55"/> <source>Loading addresses...</source> <translation type="unfinished"/> </message> <message> - <location line="-34"/> + <location line="-35"/> <source>Error loading wallet.dat: Wallet corrupted</source> <translation type="unfinished"/> </message> @@ -2751,22 +2802,22 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+87"/> + <location line="+93"/> <source>Wallet needed to be rewritten: restart Bitcoin to complete</source> <translation type="unfinished"/> </message> <message> - <location line="-89"/> + <location line="-95"/> <source>Error loading wallet.dat</source> <translation type="unfinished"/> </message> <message> - <location line="+29"/> + <location line="+28"/> <source>Invalid -proxy address: '%s'</source> <translation type="unfinished"/> </message> <message> - <location line="+49"/> + <location line="+56"/> <source>Unknown network specified in -onlynet: '%s'</source> <translation type="unfinished"/> </message> @@ -2776,7 +2827,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="-91"/> + <location line="-96"/> <source>Cannot resolve -bind address: '%s'</source> <translation type="unfinished"/> </message> @@ -2796,17 +2847,17 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="-4"/> + <location line="-6"/> <source>Insufficient funds</source> <translation type="unfinished"/> </message> <message> - <location line="+8"/> + <location line="+10"/> <source>Loading block index...</source> <translation type="unfinished"/> </message> <message> - <location line="-58"/> + <location line="-57"/> <source>Add a node to connect to and attempt to keep the connection open</source> <translation type="unfinished"/> </message> @@ -2816,52 +2867,47 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+67"/> + <location line="+64"/> <source>Fee per KB to add to transactions you send</source> <translation type="unfinished"/> </message> <message> - <location line="+17"/> + <location line="+19"/> <source>Loading wallet...</source> <translation type="unfinished"/> </message> <message> - <location line="-53"/> + <location line="-52"/> <source>Cannot downgrade wallet</source> <translation type="unfinished"/> </message> <message> - <location line="+1"/> - <source>Cannot initialize keypool</source> - <translation type="unfinished"/> - </message> - <message> <location line="+3"/> <source>Cannot write default address</source> <translation type="unfinished"/> </message> <message> - <location line="+63"/> + <location line="+64"/> <source>Rescanning...</source> <translation type="unfinished"/> </message> <message> - <location line="-55"/> + <location line="-57"/> <source>Done loading</source> <translation type="unfinished"/> </message> <message> - <location line="+79"/> + <location line="+82"/> <source>To use the %s option</source> <translation type="unfinished"/> </message> <message> - <location line="-71"/> + <location line="-74"/> <source>Error</source> <translation type="unfinished"/> </message> <message> - <location line="-33"/> + <location line="-31"/> <source>You must set rpcpassword=<password> in the configuration file: %s If the file does not exist, create it with owner-readable-only file permissions.</source> diff --git a/src/qt/locale/bitcoin_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.</translation> </message> <message> - <location filename="../aboutdialog.cpp" line="+17"/> + <location filename="../aboutdialog.cpp" line="+14"/> <source>Copyright</source> <translation>Telif hakkı</translation> </message> <message> <location line="+0"/> - <source>2009-%1 The Bitcoin developers</source> - <translation>2009-%1 Bitcoin geliştiricileri</translation> + <source>The Bitcoin developers</source> + <translation>Bitcoin geliştiricileri</translation> </message> </context> <context> @@ -66,7 +66,7 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>&Yeni adres</translation> </message> <message> - <location filename="../addressbookpage.cpp" line="+59"/> + <location filename="../addressbookpage.cpp" line="+63"/> <source>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.</source> <translation>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.</translation> </message> @@ -96,7 +96,17 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>Seçili adresi listeden sil</translation> </message> <message> - <location line="-14"/> + <location line="+27"/> + <source>Export the data in the current tab to a file</source> + <translation>Güncel sekmedeki verileri bir dosyaya aktar</translation> + </message> + <message> + <location line="+3"/> + <source>&Export</source> + <translation>&Dışa aktar</translation> + </message> + <message> + <location line="-44"/> <source>Verify a message to ensure it was signed with a specified Bitcoin address</source> <translation>Belirtilen Bitcoin adresi ile imzalandığını doğrulamak için bir mesajı kontrol et</translation> </message> @@ -318,12 +328,12 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>&Mesaj imzala...</translation> </message> <message> - <location line="+299"/> + <location line="+280"/> <source>Synchronizing with network...</source> <translation>Şebeke ile senkronizasyon...</translation> </message> <message> - <location line="-368"/> + <location line="-349"/> <source>&Overview</source> <translation>&Genel bakış</translation> </message> @@ -398,7 +408,7 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>Parolayı &değiştir...</translation> </message> <message> - <location line="+304"/> + <location line="+285"/> <source>Importing blocks from disk...</source> <translation>Bloklar diskten içe aktarılıyor...</translation> </message> @@ -408,12 +418,7 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>Diskteki bloklar yeniden endeksleniyor...</translation> </message> <message> - <location line="-300"/> - <source>&Export...</source> - <translation>&Dışa aktar...</translation> - </message> - <message> - <location line="-66"/> + <location line="-347"/> <source>Send coins to a Bitcoin address</source> <translation>Bir Bitcoin adresine Bitcoin yolla</translation> </message> @@ -423,12 +428,7 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>Bitcoin seçeneklerinin yapılandırmasını değiştir</translation> </message> <message> - <location line="+18"/> - <source>Export the data in the current tab to a file</source> - <translation>Güncel sekmedeki verileri bir dosyaya aktar</translation> - </message> - <message> - <location line="-9"/> + <location line="+9"/> <source>Backup wallet to another location</source> <translation>Cüzdanı diğer bir konumda yedekle</translation> </message> @@ -438,7 +438,7 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>Cüzdan şifrelemesi için kullanılan parolayı değiştir</translation> </message> <message> - <location line="+9"/> + <location line="+6"/> <source>&Debug window</source> <translation>&Hata ayıklama penceresi</translation> </message> @@ -448,23 +448,23 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>Hata ayıklama ve teşhis penceresini aç</translation> </message> <message> - <location line="-7"/> + <location line="-4"/> <source>&Verify message...</source> <translation>Mesaj &kontrol et...</translation> </message> <message> - <location line="-163"/> - <location line="+541"/> + <location line="-165"/> + <location line="+530"/> <source>Bitcoin</source> <translation>Bitcoin</translation> </message> <message> - <location line="-541"/> + <location line="-530"/> <source>Wallet</source> <translation>Cüzdan</translation> </message> <message> - <location line="+99"/> + <location line="+101"/> <source>&Send</source> <translation>&Gönder</translation> </message> @@ -509,12 +509,12 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>Belirtilen Bitcoin adresleri ile imzalandıklarından emin olmak için mesajları kontrol et</translation> </message> <message> - <location line="+31"/> + <location line="+28"/> <source>&File</source> <translation>&Dosya</translation> </message> <message> - <location line="+8"/> + <location line="+7"/> <source>&Settings</source> <translation>&Ayarlar</translation> </message> @@ -529,12 +529,7 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>Sekme araç çubuğu</translation> </message> <message> - <location line="+8"/> - <source>Actions toolbar</source> - <translation>Faaliyet araç çubuğu</translation> - </message> - <message> - <location line="+13"/> + <location line="+17"/> <location line="+10"/> <source>[testnet]</source> <translation>[testnet]</translation> @@ -545,12 +540,17 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>Bitcoin istemcisi</translation> </message> <message numerus="yes"> - <location line="+140"/> + <location line="+141"/> <source>%n active connection(s) to Bitcoin network</source> <translation><numerusform>Bitcoin şebekesine %n faal bağlantı</numerusform><numerusform>Bitcoin şebekesine %n faal bağlantı</numerusform></translation> </message> <message> - <location line="+39"/> + <location line="+22"/> + <source>No block source available...</source> + <translation>Hiçbir blok kaynağı mevcut değil...</translation> + </message> + <message> + <location line="+12"/> <source>Processed %1 of %2 (estimated) blocks of transaction history.</source> <translation>Muamele tarihçesinin toplam (tahmini) %2 blokundan %1 blok işlendi.</translation> </message> @@ -575,7 +575,7 @@ This product includes software developed by the OpenSSL Project for use in the O <translation><numerusform>%n hafta</numerusform><numerusform>%n hafta</numerusform></translation> </message> <message> - <location line="+5"/> + <location line="+4"/> <source>%1 behind</source> <translation>%1 geride</translation> </message> @@ -590,7 +590,7 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>Bundan sonraki muameleler henüz görüntülenemez.</translation> </message> <message> - <location line="+21"/> + <location line="+22"/> <source>Error</source> <translation>Hata</translation> </message> @@ -605,22 +605,22 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>Bilgi</translation> </message> <message> - <location line="+68"/> + <location line="+70"/> <source>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?</source> <translation>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?</translation> </message> <message> - <location line="-138"/> + <location line="-140"/> <source>Up to date</source> <translation>Güncel</translation> </message> <message> - <location line="+32"/> + <location line="+31"/> <source>Catching up...</source> <translation>Aralık kapatılıyor...</translation> </message> <message> - <location line="+110"/> + <location line="+113"/> <source>Confirm transaction fee</source> <translation>Muamele ücretini teyit et</translation> </message> @@ -670,7 +670,7 @@ Adres: %4 <translation>Cüzdan <b>şifrelenmiştir</b> ve şu anda <b>kilitlidir</b></translation> </message> <message> - <location filename="../bitcoin.cpp" line="+104"/> + <location filename="../bitcoin.cpp" line="+111"/> <source>A fatal error occurred. Bitcoin can no longer continue safely and will quit.</source> <translation>Ciddi bir hata oluştu. Bitcoin artık güvenli bir şekilde işlemeye devam edemez ve kapanacaktır.</translation> </message> @@ -678,7 +678,7 @@ Adres: %4 <context> <name>ClientModel</name> <message> - <location filename="../clientmodel.cpp" line="+98"/> + <location filename="../clientmodel.cpp" line="+104"/> <source>Network Alert</source> <translation>Şebeke hakkında uyarı</translation> </message> @@ -809,8 +809,8 @@ Adres: %4 </message> <message> <location line="+6"/> - <source>Optional transaction fee per kB that helps make sure your transactions are processed quickly. Most transactions are 1 kB. Fee 0.01 recommended.</source> - <translation>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.</translation> + <source>Optional transaction fee per kB that helps make sure your transactions are processed quickly. Most transactions are 1 kB.</source> + <translation>Muamelelerin hızlı işlenmesini garantilemeye yardım eden, seçime dayalı kB başı muamele ücreti. Muamelelerin çoğunluğunun boyutu 1 kB'dir.</translation> </message> <message> <location line="+15"/> @@ -1059,7 +1059,7 @@ Adres: %4 <translation>Doğrulanması beklenen ve henüz güncel bakiyeye ilâve edilmemiş muamelelerin toplamı</translation> </message> <message> - <location filename="../overviewpage.cpp" line="+115"/> + <location filename="../overviewpage.cpp" line="+116"/> <location line="+1"/> <source>out of sync</source> <translation>eşleşme dışı</translation> @@ -1646,6 +1646,19 @@ Adres: %4 </message> </context> <context> + <name>SplashScreen</name> + <message> + <location filename="../splashscreen.cpp" line="+22"/> + <source>The Bitcoin developers</source> + <translation>Bitcoin geliştiricileri</translation> + </message> + <message> + <location line="+1"/> + <source>[testnet]</source> + <translation>[testnet]</translation> + </message> +</context> +<context> <name>TransactionDesc</name> <message> <location filename="../transactiondesc.cpp" line="+20"/> @@ -2120,9 +2133,27 @@ Adres: %4 </message> </context> <context> + <name>WalletModel</name> + <message> + <location filename="../walletmodel.cpp" line="+193"/> + <source>Send Coins</source> + <translation>Bitcoin yolla</translation> + </message> +</context> +<context> <name>WalletView</name> <message> - <location filename="../walletview.cpp" line="+247"/> + <location filename="../walletview.cpp" line="+42"/> + <source>&Export</source> + <translation>&Dışa aktar</translation> + </message> + <message> + <location line="+1"/> + <source>Export the data in the current tab to a file</source> + <translation>Güncel sekmedeki verileri bir dosyaya aktar</translation> + </message> + <message> + <location line="+193"/> <source>Backup Wallet</source> <translation>Cüzdanı yedekle</translation> </message> @@ -2155,37 +2186,37 @@ Adres: %4 <context> <name>bitcoin-core</name> <message> - <location filename="../bitcoinstrings.cpp" line="+96"/> + <location filename="../bitcoinstrings.cpp" line="+94"/> <source>Bitcoin version</source> <translation>Bitcoin sürümü</translation> </message> <message> - <location line="+98"/> + <location line="+102"/> <source>Usage:</source> <translation>Kullanım:</translation> </message> <message> - <location line="-25"/> + <location line="-29"/> <source>Send command to -server or bitcoind</source> <translation>-server ya da bitcoind'ye komut gönder</translation> </message> <message> - <location line="-22"/> + <location line="-23"/> <source>List commands</source> <translation>Komutları listele</translation> </message> <message> - <location line="-10"/> + <location line="-12"/> <source>Get help for a command</source> <translation>Bir komut için yardım al</translation> </message> <message> - <location line="+21"/> + <location line="+24"/> <source>Options:</source> <translation>Seçenekler:</translation> </message> <message> - <location line="+23"/> + <location line="+24"/> <source>Specify configuration file (default: bitcoin.conf)</source> <translation>Yapılandırma dosyası belirt (varsayılan: bitcoin.conf)</translation> </message> @@ -2195,27 +2226,17 @@ Adres: %4 <translation>Pid dosyası belirt (varsayılan: bitcoind.pid)</translation> </message> <message> - <location line="-48"/> - <source>Generate coins</source> - <translation>Madenî para (Bitcoin) oluştur</translation> - </message> - <message> - <location line="-27"/> - <source>Don't generate coins</source> - <translation>Bitcoin oluşturmasını devre dışı bırak</translation> - </message> - <message> - <location line="+74"/> + <location line="-1"/> <source>Specify data directory</source> <translation>Veri dizinini belirt</translation> </message> <message> - <location line="-8"/> + <location line="-9"/> <source>Set database cache size in megabytes (default: 25)</source> <translation>Veritabanı önbellek boyutunu megabayt olarak belirt (varsayılan: 25)</translation> </message> <message> - <location line="-27"/> + <location line="-28"/> <source>Listen for connections on <port> (default: 8333 or testnet: 18333)</source> <translation>Bağlantılar için dinlenecek <port> (varsayılan: 8333 ya da testnet: 18333)</translation> </message> @@ -2230,7 +2251,7 @@ Adres: %4 <translation>Eş adresleri elde etmek için bir düğüme bağlan ve ardından bağlantıyı kes</translation> </message> <message> - <location line="+80"/> + <location line="+82"/> <source>Specify your own public address</source> <translation>Kendi genel adresinizi tanımlayın</translation> </message> @@ -2240,22 +2261,22 @@ Adres: %4 <translation>Aksaklık gösteren eşlerle bağlantıyı kesme sınırı (varsayılan: 100)</translation> </message> <message> - <location line="-132"/> + <location line="-134"/> <source>Number of seconds to keep misbehaving peers from reconnecting (default: 86400)</source> <translation>Aksaklık gösteren eşlerle yeni bağlantıları engelleme süresi, saniye olarak (varsayılan: 86400)</translation> </message> <message> - <location line="-32"/> + <location line="-29"/> <source>An error occurred while setting up the RPC port %u for listening on IPv4: %s</source> <translation>IPv4 üzerinde dinlemek için %u numaralı RPC portunun kurulumu sırasında hata meydana geldi: %s</translation> </message> <message> - <location line="+30"/> + <location line="+27"/> <source>Listen for JSON-RPC connections on <port> (default: 8332 or testnet: 18332)</source> <translation>JSON-RPC bağlantılarını <port> üzerinde dinle (varsayılan: 8332 veya tesnet: 18332)</translation> </message> <message> - <location line="+36"/> + <location line="+37"/> <source>Accept command line and JSON-RPC commands</source> <translation>Konut satırı ve JSON-RPC komutlarını kabul et</translation> </message> @@ -2265,17 +2286,17 @@ Adres: %4 <translation>Arka planda daemon (servis) olarak çalış ve komutları kabul et</translation> </message> <message> - <location line="+33"/> + <location line="+37"/> <source>Use the test network</source> <translation>Deneme şebekesini kullan</translation> </message> <message> - <location line="-108"/> + <location line="-112"/> <source>Accept connections from outside (default: 1 if no -proxy or -connect)</source> <translation>Dışarıdan gelen bağlantıları kabul et (varsayılan: -proxy veya -connect yoksa 1)</translation> </message> <message> - <location line="-82"/> + <location line="-80"/> <source>%s, you must set a rpcpassword in the configuration file: %s It is recommended you use the following random password: @@ -2316,11 +2337,6 @@ mesela: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com </message> <message> <location line="+3"/> - <source>Error initializing database environment %s! To recover, BACKUP THAT DIRECTORY, then remove everything from it except for wallet.dat.</source> - <translation>%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.</translation> - </message> - <message> - <location line="+3"/> <source>Error: The transaction was rejected! This might happen if some of the coins in your wallet were already spent, such as if you used a copy of wallet.dat and coins were spent in the copy but not marked as spent here.</source> <translation>Hata: Muamele reddedildi! Cüzdanınızdaki madenî paraların bazıları zaten harcanmış olduğunda bu meydana gelebilir. Örneğin wallet.dat dosyasının bir kopyasını kullandıysanız ve kopyada para harcandığında ancak burada harcandığı işaretlenmediğinde.</translation> </message> @@ -2345,12 +2361,7 @@ mesela: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com <translation>Yüksek öncelikli/düşük ücretli muamelelerin boyutunu bayt olarak tanımla (varsayılan: 27000)</translation> </message> <message> - <location line="+3"/> - <source>Set the number of script verification threads (1-16, 0=auto, default: 0)</source> - <translation>Betik kontrolü iş parçacığı sayısını belirt (1 ilâ 6, 0=otomatik, varsayılan: 0)</translation> - </message> - <message> - <location line="+2"/> + <location line="+6"/> <source>This is a pre-release test build - use at your own risk - do not use for mining or merchant applications</source> <translation>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</translation> </message> @@ -2390,7 +2401,7 @@ mesela: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com <translation>Blok oluşturma seçenekleri:</translation> </message> <message> - <location line="+6"/> + <location line="+5"/> <source>Connect only to the specified node(s)</source> <translation>Sadece belirtilen düğüme veya düğümlere bağlan</translation> </message> @@ -2410,7 +2421,7 @@ mesela: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com <translation>Blok veritabanını şimdi yeniden inşa etmek istiyor musunuz?</translation> </message> <message> - <location line="+3"/> + <location line="+2"/> <source>Error initializing block database</source> <translation>Blok veritabanını başlatılırken bir hata meydana geldi</translation> </message> @@ -2436,11 +2447,6 @@ mesela: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com </message> <message> <location line="+1"/> - <source>Error: Transaction creation failed!</source> - <translation>Hata: Muamele oluşturması başarısız oldu!</translation> - </message> - <message> - <location line="+1"/> <source>Error: Wallet locked, unable to create transaction!</source> <translation>Hata: Cüzdan kilitli, muamele oluşturulamadı!</translation> </message> @@ -2510,7 +2516,12 @@ mesela: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com <translation>Eşleri DNS araması vasıtasıyla bul (varsayılan: 1, eğer -connect kullanılmadıysa)</translation> </message> <message> - <location line="+3"/> + <location line="+1"/> + <source>Generate coins (default: 0)</source> + <translation>Bitcoin oluştur (varsayılan: 0)</translation> + </message> + <message> + <location line="+2"/> <source>How many blocks to check at startup (default: 288, 0 = all)</source> <translation>Başlangıçta kontrol edilecek blok sayısı (varsayılan: 288, 0 = hepsi)</translation> </message> @@ -2520,7 +2531,12 @@ mesela: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com <translation>Blok kontrolünün ne kadar derin olacağı (0 ilâ 4, varsayılan: 3)</translation> </message> <message> - <location line="+24"/> + <location line="+19"/> + <source>Not enough file descriptors available.</source> + <translation>Kafi derecede dosya tanımlayıcıları mevcut değil.</translation> + </message> + <message> + <location line="+8"/> <source>Rebuild block chain index from current blk000??.dat files</source> <translation>Blok zinciri indeksini güncel blk000??.dat dosyalarından tekrar inşa et</translation> </message> @@ -2530,7 +2546,7 @@ mesela: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com <translation>RPC aramaları için iş parçacığı sayısını belirle (varsayılan: 4)</translation> </message> <message> - <location line="+22"/> + <location line="+26"/> <source>Verifying blocks...</source> <translation>Bloklar kontrol ediliyor...</translation> </message> @@ -2540,12 +2556,17 @@ mesela: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com <translation>Cüzdan kontrol ediliyor...</translation> </message> <message> - <location line="-62"/> + <location line="-69"/> <source>Imports blocks from external blk000??.dat file</source> <translation>Harici blk000??.dat dosyasından blokları içe aktarır</translation> </message> <message> - <location line="+1"/> + <location line="-76"/> + <source>Set the number of script verification threads (up to 16, 0 = auto, <0 = leave that many cores free, default: 0)</source> + <translation>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)</translation> + </message> + <message> + <location line="+77"/> <source>Information</source> <translation>Bilgi</translation> </message> @@ -2555,6 +2576,16 @@ mesela: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com <translation>Geçersiz -tor adresi: '%s'</translation> </message> <message> + <location line="+1"/> + <source>Invalid amount for -minrelaytxfee=<amount>: '%s'</source> + <translation>-minrelaytxfee=<amount> için geçersiz meblağ: '%s'</translation> + </message> + <message> + <location line="+1"/> + <source>Invalid amount for -mintxfee=<amount>: '%s'</source> + <translation>-mintxfee=<amount> için geçersiz meblağ: '%s'</translation> + </message> + <message> <location line="+8"/> <source>Maintain a full transaction index (default: 0)</source> <translation>Muamelelerin tamamının indeksini tut (varsayılan: 0)</translation> @@ -2570,7 +2601,7 @@ mesela: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com <translation>Bağlantı başına azami yollama tamponu, <n>*1000 bayt (varsayılan: 1000)</translation> </message> <message> - <location line="+1"/> + <location line="+2"/> <source>Only accept block chain matching built-in checkpoints (default: 1)</source> <translation>Sadece yerleşik kontrol noktalarıyla eşleşen blok zincirini kabul et (varsayılan: 1)</translation> </message> @@ -2630,6 +2661,11 @@ mesela: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com <translation>İstemci başlatıldığında debug.log dosyasını küçült (varsayılan: -debug bulunmadığında 1)</translation> </message> <message> + <location line="+1"/> + <source>Signing transaction failed</source> + <translation>Muamelenin imzalanması başarısız oldu</translation> + </message> + <message> <location line="+2"/> <source>Specify connection timeout in milliseconds (default: 5000)</source> <translation>Bağlantı zaman aşım süresini milisaniye olarak belirt (varsayılan: 5000)</translation> @@ -2640,7 +2676,22 @@ mesela: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com <translation>Sistem hatası:</translation> </message> <message> - <location line="+10"/> + <location line="+4"/> + <source>Transaction amount too small</source> + <translation>Muamele meblağı çok düşük</translation> + </message> + <message> + <location line="+1"/> + <source>Transaction amounts must be positive</source> + <translation>Muamele tutarının pozitif olması lazımdır</translation> + </message> + <message> + <location line="+1"/> + <source>Transaction too large</source> + <translation>Muamele çok büyük</translation> + </message> + <message> + <location line="+7"/> <source>Use UPnP to map the listening port (default: 0)</source> <translation>Dinlenecek portu haritalamak için UPnP kullan (varsayılan: 0)</translation> </message> @@ -2680,7 +2731,7 @@ mesela: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com <translation>wallet.dat bozuk, geri kazanım başarısız oldu</translation> </message> <message> - <location line="-46"/> + <location line="-50"/> <source>Password for JSON-RPC connections</source> <translation>JSON-RPC bağlantıları için parola</translation> </message> @@ -2695,17 +2746,17 @@ mesela: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com <translation>Şu <ip> adresinde (varsayılan: 127.0.0.1) çalışan düğüme komut yolla</translation> </message> <message> - <location line="-119"/> + <location line="-120"/> <source>Execute command when the best block changes (%s in cmd is replaced by block hash)</source> <translation>En iyi blok değiştiğinde komutu çalıştır (komut için %s parametresi blok hash değeri ile değiştirilecektir)</translation> </message> <message> - <location line="+142"/> + <location line="+147"/> <source>Upgrade wallet to latest format</source> <translation>Cüzdanı en yeni biçime güncelle</translation> </message> <message> - <location line="-17"/> + <location line="-21"/> <source>Set key pool size to <n> (default: 100)</source> <translation>Anahtar alan boyutunu <n> değerine ayarla (varsayılan: 100)</translation> </message> @@ -2715,12 +2766,12 @@ mesela: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com <translation>Blok zincirini eksik cüzdan muameleleri için tekrar tara</translation> </message> <message> - <location line="+31"/> + <location line="+35"/> <source>Use OpenSSL (https) for JSON-RPC connections</source> <translation>JSON-RPC bağlantıları için OpenSSL (https) kullan</translation> </message> <message> - <location line="-22"/> + <location line="-26"/> <source>Server certificate file (default: server.cert)</source> <translation>Sunucu sertifika dosyası (varsayılan: server.cert)</translation> </message> @@ -2730,37 +2781,37 @@ mesela: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com <translation>Sunucu özel anahtarı (varsayılan: server.pem)</translation> </message> <message> - <location line="-153"/> + <location line="-151"/> <source>Acceptable ciphers (default: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH)</source> <translation>Kabul edilebilir şifreler (varsayılan: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH)</translation> </message> <message> - <location line="+166"/> + <location line="+165"/> <source>This help message</source> <translation>Bu yardım mesajı</translation> </message> <message> - <location line="+3"/> + <location line="+6"/> <source>Unable to bind to %s on this computer (bind returned error %d, %s)</source> <translation>Bu bilgisayarda %s unsuruna bağlanılamadı. (bind şu hatayı iletti: %d, %s)</translation> </message> <message> - <location line="-86"/> + <location line="-91"/> <source>Connect through socks proxy</source> <translation>Socks vekil sunucusu vasıtasıyla bağlan</translation> </message> <message> - <location line="-11"/> + <location line="-10"/> <source>Allow DNS lookups for -addnode, -seednode and -connect</source> <translation>-addnode, -seednode ve -connect için DNS aramalarına izin ver</translation> </message> <message> - <location line="+56"/> + <location line="+55"/> <source>Loading addresses...</source> <translation>Adresler yükleniyor...</translation> </message> <message> - <location line="-34"/> + <location line="-35"/> <source>Error loading wallet.dat: Wallet corrupted</source> <translation>wallet.dat dosyasının yüklenmesinde hata oluştu: bozuk cüzdan</translation> </message> @@ -2770,22 +2821,22 @@ mesela: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com <translation>wallet.dat dosyasının yüklenmesinde hata oluştu: cüzdanın daha yeni bir Bitcoin sürümüne ihtiyacı var</translation> </message> <message> - <location line="+87"/> + <location line="+93"/> <source>Wallet needed to be rewritten: restart Bitcoin to complete</source> <translation>Cüzdanın tekrar yazılması gerekiyordu: işlemi tamamlamak için Bitcoin'i yeniden başlatınız</translation> </message> <message> - <location line="-89"/> + <location line="-95"/> <source>Error loading wallet.dat</source> <translation>wallet.dat dosyasının yüklenmesinde hata oluştu</translation> </message> <message> - <location line="+29"/> + <location line="+28"/> <source>Invalid -proxy address: '%s'</source> <translation>Geçersiz -proxy adresi: '%s'</translation> </message> <message> - <location line="+49"/> + <location line="+56"/> <source>Unknown network specified in -onlynet: '%s'</source> <translation>-onlynet için bilinmeyen bir şebeke belirtildi: '%s'</translation> </message> @@ -2795,7 +2846,7 @@ mesela: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com <translation>Bilinmeyen bir -socks vekil sürümü talep edildi: %i</translation> </message> <message> - <location line="-91"/> + <location line="-96"/> <source>Cannot resolve -bind address: '%s'</source> <translation>-bind adresi çözümlenemedi: '%s'</translation> </message> @@ -2815,17 +2866,17 @@ mesela: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com <translation>Geçersiz miktar</translation> </message> <message> - <location line="-4"/> + <location line="-6"/> <source>Insufficient funds</source> <translation>Yetersiz bakiye</translation> </message> <message> - <location line="+8"/> + <location line="+10"/> <source>Loading block index...</source> <translation>Blok indeksi yükleniyor...</translation> </message> <message> - <location line="-58"/> + <location line="-57"/> <source>Add a node to connect to and attempt to keep the connection open</source> <translation>Bağlanılacak düğüm ekle ve bağlantıyı zinde tutmaya çalış</translation> </message> @@ -2835,52 +2886,47 @@ mesela: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com <translation>Bu bilgisayarda %s unsuruna bağlanılamadı. Bitcoin muhtemelen hâlihazırda çalışmaktadır.</translation> </message> <message> - <location line="+67"/> + <location line="+64"/> <source>Fee per KB to add to transactions you send</source> <translation>Yolladığınız muameleler için eklenecek KB başı ücret</translation> </message> <message> - <location line="+17"/> + <location line="+19"/> <source>Loading wallet...</source> <translation>Cüzdan yükleniyor...</translation> </message> <message> - <location line="-53"/> + <location line="-52"/> <source>Cannot downgrade wallet</source> <translation>Cüzdan eski biçime geri alınamaz</translation> </message> <message> - <location line="+1"/> - <source>Cannot initialize keypool</source> - <translation>Keypool başlatılamadı</translation> - </message> - <message> <location line="+3"/> <source>Cannot write default address</source> <translation>Varsayılan adres yazılamadı</translation> </message> <message> - <location line="+63"/> + <location line="+64"/> <source>Rescanning...</source> <translation>Yeniden tarama...</translation> </message> <message> - <location line="-55"/> + <location line="-57"/> <source>Done loading</source> <translation>Yükleme tamamlandı</translation> </message> <message> - <location line="+79"/> + <location line="+82"/> <source>To use the %s option</source> <translation>%s seçeneğini kullanmak için</translation> </message> <message> - <location line="-71"/> + <location line="-74"/> <source>Error</source> <translation>Hata</translation> </message> <message> - <location line="-33"/> + <location line="-31"/> <source>You must set rpcpassword=<password> in the configuration file: %s If the file does not exist, create it with owner-readable-only file permissions.</source> diff --git a/src/qt/locale/bitcoin_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, написані Томасом Бернардом.</translation> </message> <message> - <location filename="../aboutdialog.cpp" line="+17"/> + <location filename="../aboutdialog.cpp" line="+14"/> <source>Copyright</source> <translation>Авторське право</translation> </message> <message> <location line="+0"/> - <source>2009-%1 The Bitcoin developers</source> - <translation>2009-%1 Розробники Bitcoin</translation> + <source>The Bitcoin developers</source> + <translation type="unfinished"/> </message> </context> <context> @@ -66,7 +66,7 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>&Створити адресу</translation> </message> <message> - <location filename="../addressbookpage.cpp" line="+59"/> + <location filename="../addressbookpage.cpp" line="+63"/> <source>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.</source> <translation>Це ваші адреси для отримання платежів. Ви можете давати різні адреси різним людям, таким чином маючи можливість відслідкувати хто конкретно і скільки вам заплатив.</translation> </message> @@ -96,7 +96,17 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>Вилучити вибрані адреси з переліку</translation> </message> <message> - <location line="-14"/> + <location line="+27"/> + <source>Export the data in the current tab to a file</source> + <translation>Експортувати дані з поточної вкладки в файл</translation> + </message> + <message> + <location line="+3"/> + <source>&Export</source> + <translation type="unfinished"/> + </message> + <message> + <location line="-44"/> <source>Verify a message to ensure it was signed with a specified Bitcoin address</source> <translation>Перевірте повідомлення для впевненості, що воно підписано вказаною Bitcoin-адресою</translation> </message> @@ -318,12 +328,12 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>&Підписати повідомлення...</translation> </message> <message> - <location line="+299"/> + <location line="+280"/> <source>Synchronizing with network...</source> <translation>Синхронізація з мережею...</translation> </message> <message> - <location line="-368"/> + <location line="-349"/> <source>&Overview</source> <translation>&Огляд</translation> </message> @@ -398,7 +408,7 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>Змінити парол&ь...</translation> </message> <message> - <location line="+304"/> + <location line="+285"/> <source>Importing blocks from disk...</source> <translation>Імпорт блоків з диску...</translation> </message> @@ -408,12 +418,7 @@ This product includes software developed by the OpenSSL Project for use in the O <translation type="unfinished"/> </message> <message> - <location line="-300"/> - <source>&Export...</source> - <translation>&Експорт...</translation> - </message> - <message> - <location line="-66"/> + <location line="-347"/> <source>Send coins to a Bitcoin address</source> <translation>Відправити монети на вказану адресу</translation> </message> @@ -423,12 +428,7 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>Редагувати параметри</translation> </message> <message> - <location line="+18"/> - <source>Export the data in the current tab to a file</source> - <translation>Експортувати дані з поточної вкладки в файл</translation> - </message> - <message> - <location line="-9"/> + <location line="+9"/> <source>Backup wallet to another location</source> <translation>Резервне копіювання гаманця в інше місце</translation> </message> @@ -438,7 +438,7 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>Змінити пароль, який використовується для шифрування гаманця</translation> </message> <message> - <location line="+9"/> + <location line="+6"/> <source>&Debug window</source> <translation>Вікно зневадження</translation> </message> @@ -448,23 +448,23 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>Відкрити консоль зневадження і діагностики</translation> </message> <message> - <location line="-7"/> + <location line="-4"/> <source>&Verify message...</source> <translation>Перевірити повідомлення...</translation> </message> <message> - <location line="-163"/> - <location line="+541"/> + <location line="-165"/> + <location line="+530"/> <source>Bitcoin</source> <translation>Bitcoin</translation> </message> <message> - <location line="-541"/> + <location line="-530"/> <source>Wallet</source> <translation>Гаманець</translation> </message> <message> - <location line="+99"/> + <location line="+101"/> <source>&Send</source> <translation type="unfinished"/> </message> @@ -509,12 +509,12 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>Перевірте повідомлення для впевненості, що воно підписано вказаною Bitcoin-адресою</translation> </message> <message> - <location line="+31"/> + <location line="+28"/> <source>&File</source> <translation>&Файл</translation> </message> <message> - <location line="+8"/> + <location line="+7"/> <source>&Settings</source> <translation>&Налаштування</translation> </message> @@ -529,12 +529,7 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>Панель вкладок</translation> </message> <message> - <location line="+8"/> - <source>Actions toolbar</source> - <translation>Панель дій</translation> - </message> - <message> - <location line="+13"/> + <location line="+17"/> <location line="+10"/> <source>[testnet]</source> <translation>[тестова мережа]</translation> @@ -545,12 +540,17 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>Bitcoin-клієнт</translation> </message> <message numerus="yes"> - <location line="+140"/> + <location line="+141"/> <source>%n active connection(s) to Bitcoin network</source> <translation><numerusform>%n активне з'єднання з мережею</numerusform><numerusform>%n активні з'єднання з мережею</numerusform><numerusform>%n активних з'єднань з мережею</numerusform></translation> </message> <message> - <location line="+39"/> + <location line="+22"/> + <source>No block source available...</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+12"/> <source>Processed %1 of %2 (estimated) blocks of transaction history.</source> <translation type="unfinished"/> </message> @@ -575,7 +575,7 @@ This product includes software developed by the OpenSSL Project for use in the O <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation> </message> <message> - <location line="+5"/> + <location line="+4"/> <source>%1 behind</source> <translation type="unfinished"/> </message> @@ -590,7 +590,7 @@ This product includes software developed by the OpenSSL Project for use in the O <translation type="unfinished"/> </message> <message> - <location line="+21"/> + <location line="+22"/> <source>Error</source> <translation>Помилка</translation> </message> @@ -605,22 +605,22 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>Інформація</translation> </message> <message> - <location line="+68"/> + <location line="+70"/> <source>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?</source> <translation type="unfinished"/> </message> <message> - <location line="-138"/> + <location line="-140"/> <source>Up to date</source> <translation>Синхронізовано</translation> </message> <message> - <location line="+32"/> + <location line="+31"/> <source>Catching up...</source> <translation>Синхронізується...</translation> </message> <message> - <location line="+110"/> + <location line="+113"/> <source>Confirm transaction fee</source> <translation>Підтвердити комісію</translation> </message> @@ -670,7 +670,7 @@ Address: %4 <translation><b>Зашифрований</b> гаманець <b>заблоковано</b></translation> </message> <message> - <location filename="../bitcoin.cpp" line="+104"/> + <location filename="../bitcoin.cpp" line="+111"/> <source>A fatal error occurred. Bitcoin can no longer continue safely and will quit.</source> <translation type="unfinished"/> </message> @@ -678,7 +678,7 @@ Address: %4 <context> <name>ClientModel</name> <message> - <location filename="../clientmodel.cpp" line="+98"/> + <location filename="../clientmodel.cpp" line="+104"/> <source>Network Alert</source> <translation>Сповіщення мережі</translation> </message> @@ -809,8 +809,8 @@ Address: %4 </message> <message> <location line="+6"/> - <source>Optional transaction fee per kB that helps make sure your transactions are processed quickly. Most transactions are 1 kB. Fee 0.01 recommended.</source> - <translation>Добровільна комісія за кожен КБ транзакції, яка дозволяє бути впевненим у тому, що ваш вона буде оброблено швидко. Розмір більшості транзакцій є 1 КБ. Рекомендована комісія: 0,01.</translation> + <source>Optional transaction fee per kB that helps make sure your transactions are processed quickly. Most transactions are 1 kB.</source> + <translation type="unfinished"/> </message> <message> <location line="+15"/> @@ -1059,7 +1059,7 @@ Address: %4 <translation>Загальна сума всіх транзакцій, які ще не підтверджені, та до цих пір не враховуються в загальному балансі</translation> </message> <message> - <location filename="../overviewpage.cpp" line="+115"/> + <location filename="../overviewpage.cpp" line="+116"/> <location line="+1"/> <source>out of sync</source> <translation>не синхронізовано</translation> @@ -1646,6 +1646,19 @@ Address: %4 </message> </context> <context> + <name>SplashScreen</name> + <message> + <location filename="../splashscreen.cpp" line="+22"/> + <source>The Bitcoin developers</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>[testnet]</source> + <translation>[тестова мережа]</translation> + </message> +</context> +<context> <name>TransactionDesc</name> <message> <location filename="../transactiondesc.cpp" line="+20"/> @@ -2120,9 +2133,27 @@ Address: %4 </message> </context> <context> + <name>WalletModel</name> + <message> + <location filename="../walletmodel.cpp" line="+193"/> + <source>Send Coins</source> + <translation>Відправити</translation> + </message> +</context> +<context> <name>WalletView</name> <message> - <location filename="../walletview.cpp" line="+247"/> + <location filename="../walletview.cpp" line="+42"/> + <source>&Export</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Export the data in the current tab to a file</source> + <translation>Експортувати дані з поточної вкладки в файл</translation> + </message> + <message> + <location line="+193"/> <source>Backup Wallet</source> <translation type="unfinished"/> </message> @@ -2155,37 +2186,37 @@ Address: %4 <context> <name>bitcoin-core</name> <message> - <location filename="../bitcoinstrings.cpp" line="+96"/> + <location filename="../bitcoinstrings.cpp" line="+94"/> <source>Bitcoin version</source> <translation>Версія</translation> </message> <message> - <location line="+98"/> + <location line="+102"/> <source>Usage:</source> <translation>Використання:</translation> </message> <message> - <location line="-25"/> + <location line="-29"/> <source>Send command to -server or bitcoind</source> <translation>Відправити команду серверу -server чи демону</translation> </message> <message> - <location line="-22"/> + <location line="-23"/> <source>List commands</source> <translation>Список команд</translation> </message> <message> - <location line="-10"/> + <location line="-12"/> <source>Get help for a command</source> <translation>Отримати довідку по команді</translation> </message> <message> - <location line="+21"/> + <location line="+24"/> <source>Options:</source> <translation>Параметри:</translation> </message> <message> - <location line="+23"/> + <location line="+24"/> <source>Specify configuration file (default: bitcoin.conf)</source> <translation>Вкажіть файл конфігурації (типово: bitcoin.conf)</translation> </message> @@ -2195,27 +2226,17 @@ Address: %4 <translation>Вкажіть pid-файл (типово: bitcoind.pid)</translation> </message> <message> - <location line="-48"/> - <source>Generate coins</source> - <translation>Генерувати монети</translation> - </message> - <message> - <location line="-27"/> - <source>Don't generate coins</source> - <translation>Не генерувати монети</translation> - </message> - <message> - <location line="+74"/> + <location line="-1"/> <source>Specify data directory</source> <translation>Вкажіть робочий каталог</translation> </message> <message> - <location line="-8"/> + <location line="-9"/> <source>Set database cache size in megabytes (default: 25)</source> <translation>Встановити розмір кешу бази даних в мегабайтах (типово: 25)</translation> </message> <message> - <location line="-27"/> + <location line="-28"/> <source>Listen for connections on <port> (default: 8333 or testnet: 18333)</source> <translation>Чекати на з'єднання на <port> (типово: 8333 або тестова мережа: 18333)</translation> </message> @@ -2230,7 +2251,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+80"/> + <location line="+82"/> <source>Specify your own public address</source> <translation type="unfinished"/> </message> @@ -2240,22 +2261,22 @@ Address: %4 <translation>Поріг відключення неправильно під'єднаних пірів (типово: 100)</translation> </message> <message> - <location line="-132"/> + <location line="-134"/> <source>Number of seconds to keep misbehaving peers from reconnecting (default: 86400)</source> <translation>Максимальній розмір вхідного буферу на одне з'єднання (типово: 86400)</translation> </message> <message> - <location line="-32"/> + <location line="-29"/> <source>An error occurred while setting up the RPC port %u for listening on IPv4: %s</source> <translation type="unfinished"/> </message> <message> - <location line="+30"/> + <location line="+27"/> <source>Listen for JSON-RPC connections on <port> (default: 8332 or testnet: 18332)</source> <translation>Прослуховувати <port> для JSON-RPC-з'єднань (типово: 8332 або тестова мережа: 18332)</translation> </message> <message> - <location line="+36"/> + <location line="+37"/> <source>Accept command line and JSON-RPC commands</source> <translation>Приймати команди із командного рядка та команди JSON-RPC</translation> </message> @@ -2265,17 +2286,17 @@ Address: %4 <translation>Запустити в фоновому режимі (як демон) та приймати команди</translation> </message> <message> - <location line="+33"/> + <location line="+37"/> <source>Use the test network</source> <translation>Використовувати тестову мережу</translation> </message> <message> - <location line="-108"/> + <location line="-112"/> <source>Accept connections from outside (default: 1 if no -proxy or -connect)</source> <translation type="unfinished"/> </message> <message> - <location line="-82"/> + <location line="-80"/> <source>%s, you must set a rpcpassword in the configuration file: %s It is recommended you use the following random password: @@ -2306,11 +2327,6 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. </message> <message> <location line="+3"/> - <source>Error initializing database environment %s! To recover, BACKUP THAT DIRECTORY, then remove everything from it except for wallet.dat.</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+3"/> <source>Error: The transaction was rejected! This might happen if some of the coins in your wallet were already spent, such as if you used a copy of wallet.dat and coins were spent in the copy but not marked as spent here.</source> <translation>Помилка: транзакцію було відхилено. Це може статись, якщо декілька монет з вашого гаманця вже використані, наприклад, якщо ви використовуєте одну копію гаманця (wallet.dat), а монети були використані з іншої копії, але не позначені як використані в цій.</translation> </message> @@ -2335,12 +2351,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+3"/> - <source>Set the number of script verification threads (1-16, 0=auto, default: 0)</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+2"/> + <location line="+6"/> <source>This is a pre-release test build - use at your own risk - do not use for mining or merchant applications</source> <translation type="unfinished"/> </message> @@ -2380,7 +2391,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+6"/> + <location line="+5"/> <source>Connect only to the specified node(s)</source> <translation>Підключитись лише до вказаного вузла</translation> </message> @@ -2400,7 +2411,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+3"/> + <location line="+2"/> <source>Error initializing block database</source> <translation>Помилка ініціалізації бази даних блоків</translation> </message> @@ -2426,11 +2437,6 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. </message> <message> <location line="+1"/> - <source>Error: Transaction creation failed!</source> - <translation>Помилка: Не вдалося створити транзакцію!</translation> - </message> - <message> - <location line="+1"/> <source>Error: Wallet locked, unable to create transaction!</source> <translation>Помилка: Гаманець заблокований, неможливо створити транзакцію!</translation> </message> @@ -2500,7 +2506,12 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+3"/> + <location line="+1"/> + <source>Generate coins (default: 0)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+2"/> <source>How many blocks to check at startup (default: 288, 0 = all)</source> <translation>Скільки блоків перевіряти під час запуску (типово: 288, 0 = всі)</translation> </message> @@ -2510,7 +2521,12 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+24"/> + <location line="+19"/> + <source>Not enough file descriptors available.</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+8"/> <source>Rebuild block chain index from current blk000??.dat files</source> <translation type="unfinished"/> </message> @@ -2520,7 +2536,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+22"/> + <location line="+26"/> <source>Verifying blocks...</source> <translation type="unfinished"/> </message> @@ -2530,12 +2546,17 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="-62"/> + <location line="-69"/> <source>Imports blocks from external blk000??.dat file</source> <translation>Імпорт блоків з зовнішнього файлу blk000??.dat</translation> </message> <message> - <location line="+1"/> + <location line="-76"/> + <source>Set the number of script verification threads (up to 16, 0 = auto, <0 = leave that many cores free, default: 0)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+77"/> <source>Information</source> <translation>Інформація</translation> </message> @@ -2545,6 +2566,16 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Помилка в адресі -tor: «%s»</translation> </message> <message> + <location line="+1"/> + <source>Invalid amount for -minrelaytxfee=<amount>: '%s'</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Invalid amount for -mintxfee=<amount>: '%s'</source> + <translation type="unfinished"/> + </message> + <message> <location line="+8"/> <source>Maintain a full transaction index (default: 0)</source> <translation type="unfinished"/> @@ -2560,7 +2591,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Максимальній розмір вихідного буферу на одне з'єднання, <n>*1000 байт (типово: 1000)</translation> </message> <message> - <location line="+1"/> + <location line="+2"/> <source>Only accept block chain matching built-in checkpoints (default: 1)</source> <translation type="unfinished"/> </message> @@ -2620,6 +2651,11 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Стискати файл debug.log під час старту клієнта (типово: 1 коли відсутутній параметр -debug)</translation> </message> <message> + <location line="+1"/> + <source>Signing transaction failed</source> + <translation type="unfinished"/> + </message> + <message> <location line="+2"/> <source>Specify connection timeout in milliseconds (default: 5000)</source> <translation>Вказати тайм-аут підключення у мілісекундах (типово: 5000)</translation> @@ -2630,7 +2666,22 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Системна помилка: </translation> </message> <message> - <location line="+10"/> + <location line="+4"/> + <source>Transaction amount too small</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Transaction amounts must be positive</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Transaction too large</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+7"/> <source>Use UPnP to map the listening port (default: 0)</source> <translation>Намагатись використовувати UPnP для відображення порту, що прослуховується на роутері (default: 0)</translation> </message> @@ -2670,7 +2721,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>wallet.dat пошкоджено, відновлення не вдалося</translation> </message> <message> - <location line="-46"/> + <location line="-50"/> <source>Password for JSON-RPC connections</source> <translation>Пароль для JSON-RPC-з'єднань</translation> </message> @@ -2685,17 +2736,17 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Відправляти команди на вузол, запущений на <ip> (типово: 127.0.0.1)</translation> </message> <message> - <location line="-119"/> + <location line="-120"/> <source>Execute command when the best block changes (%s in cmd is replaced by block hash)</source> <translation type="unfinished"/> </message> <message> - <location line="+142"/> + <location line="+147"/> <source>Upgrade wallet to latest format</source> <translation>Модернізувати гаманець до останнього формату</translation> </message> <message> - <location line="-17"/> + <location line="-21"/> <source>Set key pool size to <n> (default: 100)</source> <translation>Встановити розмір пулу ключів <n> (типово: 100)</translation> </message> @@ -2705,12 +2756,12 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Пересканувати ланцюжок блоків, в пошуку втрачених транзакцій</translation> </message> <message> - <location line="+31"/> + <location line="+35"/> <source>Use OpenSSL (https) for JSON-RPC connections</source> <translation>Використовувати OpenSSL (https) для JSON-RPC-з'єднань</translation> </message> <message> - <location line="-22"/> + <location line="-26"/> <source>Server certificate file (default: server.cert)</source> <translation>Файл сертифіката сервера (типово: server.cert)</translation> </message> @@ -2720,37 +2771,37 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Закритий ключ сервера (типово: server.pem)</translation> </message> <message> - <location line="-153"/> + <location line="-151"/> <source>Acceptable ciphers (default: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH)</source> <translation>Допустимі шифри (типово: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH)</translation> </message> <message> - <location line="+166"/> + <location line="+165"/> <source>This help message</source> <translation>Дана довідка</translation> </message> <message> - <location line="+3"/> + <location line="+6"/> <source>Unable to bind to %s on this computer (bind returned error %d, %s)</source> <translation>Неможливо прив'язати до порту %s на цьому комп'ютері (bind returned error %d, %s)</translation> </message> <message> - <location line="-86"/> + <location line="-91"/> <source>Connect through socks proxy</source> <translation>Підключитись через SOCKS-проксі</translation> </message> <message> - <location line="-11"/> + <location line="-10"/> <source>Allow DNS lookups for -addnode, -seednode and -connect</source> <translation>Дозволити пошук в DNS для команд -addnode, -seednode та -connect</translation> </message> <message> - <location line="+56"/> + <location line="+55"/> <source>Loading addresses...</source> <translation>Завантаження адрес...</translation> </message> <message> - <location line="-34"/> + <location line="-35"/> <source>Error loading wallet.dat: Wallet corrupted</source> <translation>Помилка при завантаженні wallet.dat: Гаманець пошкоджено</translation> </message> @@ -2760,22 +2811,22 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Помилка при завантаженні wallet.dat: Гаманець потребує новішої версії Біткоін-клієнта</translation> </message> <message> - <location line="+87"/> + <location line="+93"/> <source>Wallet needed to be rewritten: restart Bitcoin to complete</source> <translation>Потрібно перезаписати гаманець: перезапустіть Біткоін-клієнт для завершення</translation> </message> <message> - <location line="-89"/> + <location line="-95"/> <source>Error loading wallet.dat</source> <translation>Помилка при завантаженні wallet.dat</translation> </message> <message> - <location line="+29"/> + <location line="+28"/> <source>Invalid -proxy address: '%s'</source> <translation>Помилка в адресі проксі-сервера: «%s»</translation> </message> <message> - <location line="+49"/> + <location line="+56"/> <source>Unknown network specified in -onlynet: '%s'</source> <translation>Невідома мережа вказана в -onlynet: «%s»</translation> </message> @@ -2785,7 +2836,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="-91"/> + <location line="-96"/> <source>Cannot resolve -bind address: '%s'</source> <translation type="unfinished"/> </message> @@ -2805,17 +2856,17 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Некоректна кількість</translation> </message> <message> - <location line="-4"/> + <location line="-6"/> <source>Insufficient funds</source> <translation>Недостатньо коштів</translation> </message> <message> - <location line="+8"/> + <location line="+10"/> <source>Loading block index...</source> <translation>Завантаження індексу блоків...</translation> </message> <message> - <location line="-58"/> + <location line="-57"/> <source>Add a node to connect to and attempt to keep the connection open</source> <translation>Додати вузол до підключення і лишити його відкритим</translation> </message> @@ -2825,52 +2876,47 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Неможливо прив'язати до порту %s на цьому комп'ютері. Можливо гаманець вже запущено.</translation> </message> <message> - <location line="+67"/> + <location line="+64"/> <source>Fee per KB to add to transactions you send</source> <translation>Комісія за КБ</translation> </message> <message> - <location line="+17"/> + <location line="+19"/> <source>Loading wallet...</source> <translation>Завантаження гаманця...</translation> </message> <message> - <location line="-53"/> + <location line="-52"/> <source>Cannot downgrade wallet</source> <translation type="unfinished"/> </message> <message> - <location line="+1"/> - <source>Cannot initialize keypool</source> - <translation type="unfinished"/> - </message> - <message> <location line="+3"/> <source>Cannot write default address</source> <translation>Неможливо записати типову адресу</translation> </message> <message> - <location line="+63"/> + <location line="+64"/> <source>Rescanning...</source> <translation>Сканування...</translation> </message> <message> - <location line="-55"/> + <location line="-57"/> <source>Done loading</source> <translation>Завантаження завершене</translation> </message> <message> - <location line="+79"/> + <location line="+82"/> <source>To use the %s option</source> <translation type="unfinished"/> </message> <message> - <location line="-71"/> + <location line="-74"/> <source>Error</source> <translation>Помилка</translation> </message> <message> - <location line="-33"/> + <location line="-31"/> <source>You must set rpcpassword=<password> in the configuration file: %s If the file does not exist, create it with owner-readable-only file permissions.</source> diff --git a/src/qt/locale/bitcoin_zh_CN.ts b/src/qt/locale/bitcoin_zh_CN.ts index 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.</translation> </message> <message> - <location filename="../aboutdialog.cpp" line="+17"/> + <location filename="../aboutdialog.cpp" line="+14"/> <source>Copyright</source> <translation>版权</translation> </message> <message> <location line="+0"/> - <source>2009-%1 The Bitcoin developers</source> - <translation>2009-%1 The Bitcoin developers</translation> + <source>The Bitcoin developers</source> + <translation>Bitcoin-qt 客户端开发团队</translation> </message> </context> <context> @@ -66,7 +66,7 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>&新建地址</translation> </message> <message> - <location filename="../addressbookpage.cpp" line="+59"/> + <location filename="../addressbookpage.cpp" line="+63"/> <source>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.</source> <translation>这是您用来收款的比特币地址。为了标记不同的资金来源，建议为每个付款人保留不同的收款地址。</translation> </message> @@ -96,7 +96,17 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>从列表中删除选中的地址</translation> </message> <message> - <location line="-14"/> + <location line="+27"/> + <source>Export the data in the current tab to a file</source> + <translation>导出当前数据到文件</translation> + </message> + <message> + <location line="+3"/> + <source>&Export</source> + <translation>&导出</translation> + </message> + <message> + <location line="-44"/> <source>Verify a message to ensure it was signed with a specified Bitcoin address</source> <translation>验证消息，确保消息是由指定的比特币地址签名过的。</translation> </message> @@ -318,12 +328,12 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>对&消息签名...</translation> </message> <message> - <location line="+299"/> + <location line="+280"/> <source>Synchronizing with network...</source> <translation>正在与网络同步...</translation> </message> <message> - <location line="-368"/> + <location line="-349"/> <source>&Overview</source> <translation>&概况</translation> </message> @@ -398,7 +408,7 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>&修改密码...</translation> </message> <message> - <location line="+304"/> + <location line="+285"/> <source>Importing blocks from disk...</source> <translation>正在从磁盘导入数据块...</translation> </message> @@ -408,12 +418,7 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>正在为数据块建立索引...</translation> </message> <message> - <location line="-300"/> - <source>&Export...</source> - <translation>&导出...</translation> - </message> - <message> - <location line="-66"/> + <location line="-347"/> <source>Send coins to a Bitcoin address</source> <translation>向一个比特币地址发送比特币</translation> </message> @@ -423,12 +428,7 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>设置选项</translation> </message> <message> - <location line="+18"/> - <source>Export the data in the current tab to a file</source> - <translation>导出当前数据到文件</translation> - </message> - <message> - <location line="-9"/> + <location line="+9"/> <source>Backup wallet to another location</source> <translation>备份钱包到其它文件夹</translation> </message> @@ -438,7 +438,7 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>修改钱包加密口令</translation> </message> <message> - <location line="+9"/> + <location line="+6"/> <source>&Debug window</source> <translation>&调试窗口</translation> </message> @@ -448,23 +448,23 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>在诊断控制台调试</translation> </message> <message> - <location line="-7"/> + <location line="-4"/> <source>&Verify message...</source> <translation>&验证消息...</translation> </message> <message> - <location line="-163"/> - <location line="+541"/> + <location line="-165"/> + <location line="+530"/> <source>Bitcoin</source> <translation>比特币</translation> </message> <message> - <location line="-541"/> + <location line="-530"/> <source>Wallet</source> <translation>钱包</translation> </message> <message> - <location line="+99"/> + <location line="+101"/> <source>&Send</source> <translation>&发送</translation> </message> @@ -509,12 +509,12 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>校验消息，确保该消息是由指定的比特币地址所有者签名的</translation> </message> <message> - <location line="+31"/> + <location line="+28"/> <source>&File</source> <translation>&文件</translation> </message> <message> - <location line="+8"/> + <location line="+7"/> <source>&Settings</source> <translation>&设置</translation> </message> @@ -529,12 +529,7 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>分页工具栏</translation> </message> <message> - <location line="+8"/> - <source>Actions toolbar</source> - <translation>动作工具栏</translation> - </message> - <message> - <location line="+13"/> + <location line="+17"/> <location line="+10"/> <source>[testnet]</source> <translation>[testnet]</translation> @@ -545,12 +540,17 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>比特币客户端</translation> </message> <message numerus="yes"> - <location line="+140"/> + <location line="+141"/> <source>%n active connection(s) to Bitcoin network</source> <translation><numerusform>到比特币网络的连接共有%n条</numerusform></translation> </message> <message> - <location line="+39"/> + <location line="+22"/> + <source>No block source available...</source> + <translation>No block source available...</translation> + </message> + <message> + <location line="+12"/> <source>Processed %1 of %2 (estimated) blocks of transaction history.</source> <translation>%1 / %2 个交易历史的区块已下载</translation> </message> @@ -575,7 +575,7 @@ This product includes software developed by the OpenSSL Project for use in the O <translation><numerusform>%n 周前</numerusform></translation> </message> <message> - <location line="+5"/> + <location line="+4"/> <source>%1 behind</source> <translation>落后 %1 </translation> </message> @@ -590,7 +590,7 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>在此之后的交易尚未可见</translation> </message> <message> - <location line="+21"/> + <location line="+22"/> <source>Error</source> <translation>错误</translation> </message> @@ -605,22 +605,22 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>信息</translation> </message> <message> - <location line="+68"/> + <location line="+70"/> <source>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?</source> <translation>该交易的字节数超标。您可以选择支付%1的交易费给处理您的交易的网络节点，有助于比特币网络的运行。您愿意支付这笔交易费用吗？</translation> </message> <message> - <location line="-138"/> + <location line="-140"/> <source>Up to date</source> <translation>最新状态</translation> </message> <message> - <location line="+32"/> + <location line="+31"/> <source>Catching up...</source> <translation>更新中...</translation> </message> <message> - <location line="+110"/> + <location line="+113"/> <source>Confirm transaction fee</source> <translation>确认交易费</translation> </message> @@ -670,7 +670,7 @@ Address: %4 <translation>钱包已被<b>加密</b>，当前为<b>锁定</b>状态</translation> </message> <message> - <location filename="../bitcoin.cpp" line="+104"/> + <location filename="../bitcoin.cpp" line="+111"/> <source>A fatal error occurred. Bitcoin can no longer continue safely and will quit.</source> <translation>发生严重错误。</translation> </message> @@ -678,7 +678,7 @@ Address: %4 <context> <name>ClientModel</name> <message> - <location filename="../clientmodel.cpp" line="+98"/> + <location filename="../clientmodel.cpp" line="+104"/> <source>Network Alert</source> <translation>网络警报</translation> </message> @@ -810,8 +810,8 @@ Address: %4 </message> <message> <location line="+6"/> - <source>Optional transaction fee per kB that helps make sure your transactions are processed quickly. Most transactions are 1 kB. Fee 0.01 recommended.</source> - <translation>建议支付交易费用，有助于您的交易得到尽快处理. 绝大多数交易的字节数为 1 kB. 建议支付0.01个比特币.</translation> + <source>Optional transaction fee per kB that helps make sure your transactions are processed quickly. Most transactions are 1 kB.</source> + <translation type="unfinished"/> </message> <message> <location line="+15"/> @@ -1060,7 +1060,7 @@ Address: %4 <translation>尚未确认的交易总额, 未计入当前余额</translation> </message> <message> - <location filename="../overviewpage.cpp" line="+115"/> + <location filename="../overviewpage.cpp" line="+116"/> <location line="+1"/> <source>out of sync</source> <translation>数据同步中</translation> @@ -1647,6 +1647,19 @@ Address: %4 </message> </context> <context> + <name>SplashScreen</name> + <message> + <location filename="../splashscreen.cpp" line="+22"/> + <source>The Bitcoin developers</source> + <translation>Bitcoin-qt 客户端开发团队</translation> + </message> + <message> + <location line="+1"/> + <source>[testnet]</source> + <translation>[testnet]</translation> + </message> +</context> +<context> <name>TransactionDesc</name> <message> <location filename="../transactiondesc.cpp" line="+20"/> @@ -2121,9 +2134,27 @@ Address: %4 </message> </context> <context> + <name>WalletModel</name> + <message> + <location filename="../walletmodel.cpp" line="+193"/> + <source>Send Coins</source> + <translation>发送比特币</translation> + </message> +</context> +<context> <name>WalletView</name> <message> - <location filename="../walletview.cpp" line="+247"/> + <location filename="../walletview.cpp" line="+42"/> + <source>&Export</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Export the data in the current tab to a file</source> + <translation>导出当前数据到文件</translation> + </message> + <message> + <location line="+193"/> <source>Backup Wallet</source> <translation>备份钱包</translation> </message> @@ -2156,41 +2187,41 @@ Address: %4 <context> <name>bitcoin-core</name> <message> - <location filename="../bitcoinstrings.cpp" line="+96"/> + <location filename="../bitcoinstrings.cpp" line="+94"/> <source>Bitcoin version</source> <translation>比特币版本</translation> </message> <message> - <location line="+98"/> + <location line="+102"/> <source>Usage:</source> <translation>使用：</translation> </message> <message> - <location line="-25"/> + <location line="-29"/> <source>Send command to -server or bitcoind</source> <translation>发送命令到服务器或者 bitcoind </translation> </message> <message> - <location line="-22"/> + <location line="-23"/> <source>List commands</source> <translation>列出命令 </translation> </message> <message> - <location line="-10"/> + <location line="-12"/> <source>Get help for a command</source> <translation>获得某条命令的帮助 </translation> </message> <message> - <location line="+21"/> + <location line="+24"/> <source>Options:</source> <translation>选项： </translation> </message> <message> - <location line="+23"/> + <location line="+24"/> <source>Specify configuration file (default: bitcoin.conf)</source> <translation>指定配置文件 (默认为 bitcoin.conf) </translation> @@ -2202,30 +2233,18 @@ Address: %4 </translation> </message> <message> - <location line="-48"/> - <source>Generate coins</source> - <translation>生成货币 -</translation> - </message> - <message> - <location line="-27"/> - <source>Don't generate coins</source> - <translation>不要生成货币 -</translation> - </message> - <message> - <location line="+74"/> + <location line="-1"/> <source>Specify data directory</source> <translation>指定数据目录 </translation> </message> <message> - <location line="-8"/> + <location line="-9"/> <source>Set database cache size in megabytes (default: 25)</source> <translation>设置数据库缓冲区大小 (缺省: 25MB)</translation> </message> <message> - <location line="-27"/> + <location line="-28"/> <source>Listen for connections on <port> (default: 8333 or testnet: 18333)</source> <translation>监听端口连接 <port> (缺省: 8333 or testnet: 18333)</translation> </message> @@ -2240,7 +2259,7 @@ Address: %4 <translation>连接一个节点并获取对端地址, 然后断开连接</translation> </message> <message> - <location line="+80"/> + <location line="+82"/> <source>Specify your own public address</source> <translation>指定您的公共地址</translation> </message> @@ -2250,22 +2269,22 @@ Address: %4 <translation>Threshold for disconnecting misbehaving peers (缺省: 100)</translation> </message> <message> - <location line="-132"/> + <location line="-134"/> <source>Number of seconds to keep misbehaving peers from reconnecting (default: 86400)</source> <translation>Number of seconds to keep misbehaving peers from reconnecting (缺省: 86400)</translation> </message> <message> - <location line="-32"/> + <location line="-29"/> <source>An error occurred while setting up the RPC port %u for listening on IPv4: %s</source> <translation>设置RPC监听端口%u时发生错误, IPv4:%s</translation> </message> <message> - <location line="+30"/> + <location line="+27"/> <source>Listen for JSON-RPC connections on <port> (default: 8332 or testnet: 18332)</source> <translation>JSON-RPC连接监听端口<port> (缺省：8332 testnet：18332)</translation> </message> <message> - <location line="+36"/> + <location line="+37"/> <source>Accept command line and JSON-RPC commands</source> <translation>接受命令行和 JSON-RPC 命令 </translation> @@ -2278,18 +2297,18 @@ Address: %4 </translation> </message> <message> - <location line="+33"/> + <location line="+37"/> <source>Use the test network</source> <translation>使用测试网络 </translation> </message> <message> - <location line="-108"/> + <location line="-112"/> <source>Accept connections from outside (default: 1 if no -proxy or -connect)</source> <translation>接受来自外部的连接 (缺省: 如果不带 -proxy or -connect 参数设置为1)</translation> </message> <message> - <location line="-82"/> + <location line="-80"/> <source>%s, you must set a rpcpassword in the configuration file: %s It is recommended you use the following random password: @@ -2330,11 +2349,6 @@ rpcpassword=%s </message> <message> <location line="+3"/> - <source>Error initializing database environment %s! To recover, BACKUP THAT DIRECTORY, then remove everything from it except for wallet.dat.</source> - <translation>数据库环境%s初始化失败！恢复方法：备份该目录，然后删掉除wallet.dat之外的所有文件。</translation> - </message> - <message> - <location line="+3"/> <source>Error: The transaction was rejected! This might happen if some of the coins in your wallet were already spent, such as if you used a copy of wallet.dat and coins were spent in the copy but not marked as spent here.</source> <translation>错误：该交易被拒绝！发生这种错误的原因可能是：钱包中的比特币已经被用掉，有可能您复制了wallet.dat钱包文件，然后用复制的钱包文件支付了比特币，但是这个钱包文件中没有记录。</translation> </message> @@ -2359,12 +2373,7 @@ rpcpassword=%s <translation>Set maximum size of high-priority/low-fee transactions in bytes (default: 27000)</translation> </message> <message> - <location line="+3"/> - <source>Set the number of script verification threads (1-16, 0=auto, default: 0)</source> - <translation>设置Script验证进程数(1-16，0=自动,缺省：0)</translation> - </message> - <message> - <location line="+2"/> + <location line="+6"/> <source>This is a pre-release test build - use at your own risk - do not use for mining or merchant applications</source> <translation>这是测试用的预发布版本 - 请谨慎使用 - 不要用来挖矿，或者在正式商用环境下使用</translation> </message> @@ -2404,7 +2413,7 @@ rpcpassword=%s <translation>数据块创建选项：</translation> </message> <message> - <location line="+6"/> + <location line="+5"/> <source>Connect only to the specified node(s)</source> <translation>仅连接到指定节点</translation> </message> @@ -2424,7 +2433,7 @@ rpcpassword=%s <translation>你想现在就重建块数据库吗？</translation> </message> <message> - <location line="+3"/> + <location line="+2"/> <source>Error initializing block database</source> <translation>初始化数据块数据库出错</translation> </message> @@ -2450,11 +2459,6 @@ rpcpassword=%s </message> <message> <location line="+1"/> - <source>Error: Transaction creation failed!</source> - <translation>错误：创建交易失败！</translation> - </message> - <message> - <location line="+1"/> <source>Error: Wallet locked, unable to create transaction!</source> <translation>错误：钱包被锁定，无法创建交易！</translation> </message> @@ -2524,7 +2528,12 @@ rpcpassword=%s <translation>通过DNS查找节点(缺省：1 除非使用 -connect 选项)</translation> </message> <message> - <location line="+3"/> + <location line="+1"/> + <source>Generate coins (default: 0)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+2"/> <source>How many blocks to check at startup (default: 288, 0 = all)</source> <translation>启动时检测多少个数据块(缺省：288，0=所有)</translation> </message> @@ -2534,7 +2543,12 @@ rpcpassword=%s <translation>How thorough the block verification is (0-4, default: 3)</translation> </message> <message> - <location line="+24"/> + <location line="+19"/> + <source>Not enough file descriptors available.</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+8"/> <source>Rebuild block chain index from current blk000??.dat files</source> <translation>重新为当前的blk000??.dat文件建立索引</translation> </message> @@ -2544,7 +2558,7 @@ rpcpassword=%s <translation>设置使用调用服务 RPC 的线程数量（默认：4）</translation> </message> <message> - <location line="+22"/> + <location line="+26"/> <source>Verifying blocks...</source> <translation>正在验证数据库的完整性...</translation> </message> @@ -2554,12 +2568,17 @@ rpcpassword=%s <translation>正在检测钱包的完整性...</translation> </message> <message> - <location line="-62"/> + <location line="-69"/> <source>Imports blocks from external blk000??.dat file</source> <translation>从blk000??.dat文件导入数据块</translation> </message> <message> - <location line="+1"/> + <location line="-76"/> + <source>Set the number of script verification threads (up to 16, 0 = auto, <0 = leave that many cores free, default: 0)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+77"/> <source>Information</source> <translation>信息</translation> </message> @@ -2569,6 +2588,16 @@ rpcpassword=%s <translation>非法的 -tor 地址：'%s' </translation> </message> <message> + <location line="+1"/> + <source>Invalid amount for -minrelaytxfee=<amount>: '%s'</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Invalid amount for -mintxfee=<amount>: '%s'</source> + <translation type="unfinished"/> + </message> + <message> <location line="+8"/> <source>Maintain a full transaction index (default: 0)</source> <translation>维护一份完整的交易索引(缺省：0)</translation> @@ -2584,7 +2613,7 @@ rpcpassword=%s <translation>每个连接的最大发送缓存，<n>*1000 字节(缺省：1000)</translation> </message> <message> - <location line="+1"/> + <location line="+2"/> <source>Only accept block chain matching built-in checkpoints (default: 1)</source> <translation>仅接受符合客户端检查点设置的数据块文件</translation> </message> @@ -2644,6 +2673,11 @@ rpcpassword=%s <translation>客户端启动时压缩debug.log文件(缺省：no-debug模式时为1)</translation> </message> <message> + <location line="+1"/> + <source>Signing transaction failed</source> + <translation type="unfinished"/> + </message> + <message> <location line="+2"/> <source>Specify connection timeout in milliseconds (default: 5000)</source> <translation>设置连接超时时间(缺省：5000毫秒)</translation> @@ -2654,7 +2688,22 @@ rpcpassword=%s <translation>系统错误：</translation> </message> <message> - <location line="+10"/> + <location line="+4"/> + <source>Transaction amount too small</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Transaction amounts must be positive</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Transaction too large</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+7"/> <source>Use UPnP to map the listening port (default: 0)</source> <translation>使用UPnp映射监听端口(缺省: 0)</translation> </message> @@ -2695,7 +2744,7 @@ rpcpassword=%s <translation>钱包文件wallet.dat损坏，抢救备份失败</translation> </message> <message> - <location line="-46"/> + <location line="-50"/> <source>Password for JSON-RPC connections</source> <translation>JSON-RPC连接密码 </translation> @@ -2713,17 +2762,17 @@ rpcpassword=%s </translation> </message> <message> - <location line="-119"/> + <location line="-120"/> <source>Execute command when the best block changes (%s in cmd is replaced by block hash)</source> <translation>当最佳数据块变化时执行命令 (命令行中的 %s 会被替换成数据块哈希值)</translation> </message> <message> - <location line="+142"/> + <location line="+147"/> <source>Upgrade wallet to latest format</source> <translation>将钱包升级到最新的格式</translation> </message> <message> - <location line="-17"/> + <location line="-21"/> <source>Set key pool size to <n> (default: 100)</source> <translation>设置密钥池大小为 <n> (缺省: 100) </translation> @@ -2735,12 +2784,12 @@ rpcpassword=%s </translation> </message> <message> - <location line="+31"/> + <location line="+35"/> <source>Use OpenSSL (https) for JSON-RPC connections</source> <translation>为 JSON-RPC 连接使用 OpenSSL (https)连接</translation> </message> <message> - <location line="-22"/> + <location line="-26"/> <source>Server certificate file (default: server.cert)</source> <translation>服务器证书 (默认为 server.cert) </translation> @@ -2752,39 +2801,39 @@ rpcpassword=%s </translation> </message> <message> - <location line="-153"/> + <location line="-151"/> <source>Acceptable ciphers (default: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH)</source> <translation>可接受的加密器 (默认为 TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH) </translation> </message> <message> - <location line="+166"/> + <location line="+165"/> <source>This help message</source> <translation>该帮助信息 </translation> </message> <message> - <location line="+3"/> + <location line="+6"/> <source>Unable to bind to %s on this computer (bind returned error %d, %s)</source> <translation>无法绑定本机端口 %s (返回错误消息 %d, %s)</translation> </message> <message> - <location line="-86"/> + <location line="-91"/> <source>Connect through socks proxy</source> <translation>通过 socks 代理连接</translation> </message> <message> - <location line="-11"/> + <location line="-10"/> <source>Allow DNS lookups for -addnode, -seednode and -connect</source> <translation>使用 -addnode, -seednode 和 -connect选项时允许DNS查找</translation> </message> <message> - <location line="+56"/> + <location line="+55"/> <source>Loading addresses...</source> <translation>正在加载地址...</translation> </message> <message> - <location line="-34"/> + <location line="-35"/> <source>Error loading wallet.dat: Wallet corrupted</source> <translation>wallet.dat钱包文件加载错误：钱包损坏</translation> </message> @@ -2794,22 +2843,22 @@ rpcpassword=%s <translation>wallet.dat钱包文件加载错误：请升级到最新Bitcoin客户端</translation> </message> <message> - <location line="+87"/> + <location line="+93"/> <source>Wallet needed to be rewritten: restart Bitcoin to complete</source> <translation>钱包文件需要重写：请退出并重新启动Bitcoin客户端</translation> </message> <message> - <location line="-89"/> + <location line="-95"/> <source>Error loading wallet.dat</source> <translation>wallet.dat钱包文件加载错误</translation> </message> <message> - <location line="+29"/> + <location line="+28"/> <source>Invalid -proxy address: '%s'</source> <translation>非法的代理地址: '%s'</translation> </message> <message> - <location line="+49"/> + <location line="+56"/> <source>Unknown network specified in -onlynet: '%s'</source> <translation>被指定的是未知网络 -onlynet: '%s'</translation> </message> @@ -2819,7 +2868,7 @@ rpcpassword=%s <translation>被指定的是未知socks代理版本: %i</translation> </message> <message> - <location line="-91"/> + <location line="-96"/> <source>Cannot resolve -bind address: '%s'</source> <translation>无法解析 -bind 端口地址: '%s'</translation> </message> @@ -2839,17 +2888,17 @@ rpcpassword=%s <translation>金额不对</translation> </message> <message> - <location line="-4"/> + <location line="-6"/> <source>Insufficient funds</source> <translation>金额不足</translation> </message> <message> - <location line="+8"/> + <location line="+10"/> <source>Loading block index...</source> <translation>加载数据块索引...</translation> </message> <message> - <location line="-58"/> + <location line="-57"/> <source>Add a node to connect to and attempt to keep the connection open</source> <translation>添加节点并与其保持连接</translation> </message> @@ -2859,52 +2908,47 @@ rpcpassword=%s <translation>无法在本机绑定 %s 端口 . 比特币客户端软件可能已经在运行.</translation> </message> <message> - <location line="+67"/> + <location line="+64"/> <source>Fee per KB to add to transactions you send</source> <translation>每发送1KB交易所需的费用</translation> </message> <message> - <location line="+17"/> + <location line="+19"/> <source>Loading wallet...</source> <translation>正在加载钱包...</translation> </message> <message> - <location line="-53"/> + <location line="-52"/> <source>Cannot downgrade wallet</source> <translation>无法降级钱包格式</translation> </message> <message> - <location line="+1"/> - <source>Cannot initialize keypool</source> - <translation>无法初始化 keypool</translation> - </message> - <message> <location line="+3"/> <source>Cannot write default address</source> <translation>无法写入缺省地址</translation> </message> <message> - <location line="+63"/> + <location line="+64"/> <source>Rescanning...</source> <translation>正在重新扫描...</translation> </message> <message> - <location line="-55"/> + <location line="-57"/> <source>Done loading</source> <translation>加载完成</translation> </message> <message> - <location line="+79"/> + <location line="+82"/> <source>To use the %s option</source> <translation>使用 %s 选项</translation> </message> <message> - <location line="-71"/> + <location line="-74"/> <source>Error</source> <translation>错误</translation> </message> <message> - <location line="-33"/> + <location line="-31"/> <source>You must set rpcpassword=<password> in the configuration file: %s If the file does not exist, create it with owner-readable-only file permissions.</source> diff --git a/src/qt/locale/bitcoin_zh_TW.ts b/src/qt/locale/bitcoin_zh_TW.ts index 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 軟體.</translation> </message> <message> - <location filename="../aboutdialog.cpp" line="+17"/> + <location filename="../aboutdialog.cpp" line="+14"/> <source>Copyright</source> <translation>版權</translation> </message> <message> <location line="+0"/> - <source>2009-%1 The Bitcoin developers</source> - <translation>Bitcoin 開發人員自西元 2009 至 %1 年起所有</translation> + <source>The Bitcoin developers</source> + <translation>位元幣開發人員</translation> </message> </context> <context> @@ -66,7 +66,7 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>新增位址</translation> </message> <message> - <location filename="../addressbookpage.cpp" line="+59"/> + <location filename="../addressbookpage.cpp" line="+63"/> <source>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.</source> <translation>這些是你用來收款的位元幣位址. 你可以提供不同的位址給不同的付款人, 來追蹤是誰支付給你.</translation> </message> @@ -83,7 +83,7 @@ This product includes software developed by the OpenSSL Project for use in the O <message> <location line="+11"/> <source>Sign a message to prove you own a Bitcoin address</source> - <translation>簽署一則訊息來證明一個位元幣位址是你的</translation> + <translation>簽署訊息是用來證明位元幣位址是你的</translation> </message> <message> <location line="+3"/> @@ -96,9 +96,19 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>從列表中刪除目前選取的位址</translation> </message> <message> - <location line="-14"/> + <location line="+27"/> + <source>Export the data in the current tab to a file</source> + <translation>將目前分頁的資料匯出存成檔案</translation> + </message> + <message> + <location line="+3"/> + <source>&Export</source> + <translation>匯出</translation> + </message> + <message> + <location line="-44"/> <source>Verify a message to ensure it was signed with a specified Bitcoin address</source> - <translation>驗證一則訊息以確認它是用指定的位元幣位址簽署的</translation> + <translation>驗證訊息是用來確認訊息是用指定的位元幣位址簽署的</translation> </message> <message> <location line="+3"/> @@ -113,7 +123,7 @@ This product includes software developed by the OpenSSL Project for use in the O <message> <location filename="../addressbookpage.cpp" line="-5"/> <source>These are your Bitcoin addresses for sending payments. Always check the amount and the receiving address before sending coins.</source> - <translation type="unfinished"/> + <translation>這是你用來付款的位元幣位址. 在付錢之前, 務必要檢查金額和收款位址是否正確.</translation> </message> <message> <location line="+13"/> @@ -318,12 +328,12 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>訊息簽署...</translation> </message> <message> - <location line="+299"/> + <location line="+280"/> <source>Synchronizing with network...</source> <translation>網路同步中...</translation> </message> <message> - <location line="-368"/> + <location line="-349"/> <source>&Overview</source> <translation>總覽</translation> </message> @@ -398,7 +408,7 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>密碼變更...</translation> </message> <message> - <location line="+304"/> + <location line="+285"/> <source>Importing blocks from disk...</source> <translation>從磁碟匯入區塊中...</translation> </message> @@ -408,14 +418,9 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>重建磁碟區塊索引中...</translation> </message> <message> - <location line="-300"/> - <source>&Export...</source> - <translation>匯出...</translation> - </message> - <message> - <location line="-66"/> + <location line="-347"/> <source>Send coins to a Bitcoin address</source> - <translation>付錢到一個位元幣位址</translation> + <translation>付錢到位元幣位址</translation> </message> <message> <location line="+49"/> @@ -423,12 +428,7 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>修改位元幣的設定選項</translation> </message> <message> - <location line="+18"/> - <source>Export the data in the current tab to a file</source> - <translation>將目前分頁的資料匯出存成檔案</translation> - </message> - <message> - <location line="-9"/> + <location line="+9"/> <source>Backup wallet to another location</source> <translation>將錢包備份到其它地方</translation> </message> @@ -438,7 +438,7 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>變更錢包加密用的密碼</translation> </message> <message> - <location line="+9"/> + <location line="+6"/> <source>&Debug window</source> <translation>除錯視窗</translation> </message> @@ -448,23 +448,23 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>開啓除錯與診斷主控台</translation> </message> <message> - <location line="-7"/> + <location line="-4"/> <source>&Verify message...</source> <translation>驗證訊息...</translation> </message> <message> - <location line="-163"/> - <location line="+541"/> + <location line="-165"/> + <location line="+530"/> <source>Bitcoin</source> <translation>位元幣</translation> </message> <message> - <location line="-541"/> + <location line="-530"/> <source>Wallet</source> <translation>錢包</translation> </message> <message> - <location line="+99"/> + <location line="+101"/> <source>&Send</source> <translation>付出</translation> </message> @@ -506,15 +506,15 @@ This product includes software developed by the OpenSSL Project for use in the O <message> <location line="+2"/> <source>Verify messages to ensure they were signed with specified Bitcoin addresses</source> - <translation>驗證訊息以確認那是用指定的位元幣位址簽署的</translation> + <translation>驗證訊息來確認是用指定的位元幣位址簽署的</translation> </message> <message> - <location line="+31"/> + <location line="+28"/> <source>&File</source> <translation>檔案</translation> </message> <message> - <location line="+8"/> + <location line="+7"/> <source>&Settings</source> <translation>設定</translation> </message> @@ -529,12 +529,7 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>分頁工具列</translation> </message> <message> - <location line="+8"/> - <source>Actions toolbar</source> - <translation>動作工具列</translation> - </message> - <message> - <location line="+13"/> + <location line="+17"/> <location line="+10"/> <source>[testnet]</source> <translation>[testnet]</translation> @@ -545,12 +540,17 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>位元幣客戶端軟體</translation> </message> <message numerus="yes"> - <location line="+140"/> + <location line="+141"/> <source>%n active connection(s) to Bitcoin network</source> <translation><numerusform>與位元幣網路有 %n 個連線在使用中</numerusform></translation> </message> <message> - <location line="+39"/> + <location line="+22"/> + <source>No block source available...</source> + <translation>目前沒有區塊來源...</translation> + </message> + <message> + <location line="+12"/> <source>Processed %1 of %2 (estimated) blocks of transaction history.</source> <translation>已處理了估計全部 %2 個中的 %1 個區塊的交易紀錄.</translation> </message> @@ -575,7 +575,7 @@ This product includes software developed by the OpenSSL Project for use in the O <translation><numerusform>%n 個星期</numerusform></translation> </message> <message> - <location line="+5"/> + <location line="+4"/> <source>%1 behind</source> <translation>落後 %1</translation> </message> @@ -590,7 +590,7 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>會看不見在這之後的交易.</translation> </message> <message> - <location line="+21"/> + <location line="+22"/> <source>Error</source> <translation>錯誤</translation> </message> @@ -605,22 +605,22 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>資訊</translation> </message> <message> - <location line="+68"/> + <location line="+70"/> <source>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?</source> <translation>這筆交易的資料大小超過限制了. 你還是可以付出 %1 的費用來傳送, 這筆費用會付給處理你的交易的節點, 並幫助維持整個網路. 你願意支付這項費用嗎?</translation> </message> <message> - <location line="-138"/> + <location line="-140"/> <source>Up to date</source> <translation>最新狀態</translation> </message> <message> - <location line="+32"/> + <location line="+31"/> <source>Catching up...</source> <translation>進度追趕中...</translation> </message> <message> - <location line="+110"/> + <location line="+113"/> <source>Confirm transaction fee</source> <translation>確認交易手續費</translation> </message> @@ -669,7 +669,7 @@ Address: %4 <translation>錢包<b>已加密</b>並且正<b>上鎖中</b></translation> </message> <message> - <location filename="../bitcoin.cpp" line="+104"/> + <location filename="../bitcoin.cpp" line="+111"/> <source>A fatal error occurred. Bitcoin can no longer continue safely and will quit.</source> <translation>發生了致命的錯誤. 位元幣程式無法再繼續安全執行, 只好結束.</translation> </message> @@ -677,7 +677,7 @@ Address: %4 <context> <name>ClientModel</name> <message> - <location filename="../clientmodel.cpp" line="+98"/> + <location filename="../clientmodel.cpp" line="+104"/> <source>Network Alert</source> <translation>網路警報</translation> </message> @@ -707,7 +707,7 @@ Address: %4 <message> <location line="+10"/> <source>The address associated with this address book entry. This can only be modified for sending addresses.</source> - <translation>與這個位址簿項目關聯的位址. 只能修改付款位址.</translation> + <translation>與這個位址簿項目關聯的位址. 付款位址才能被更改.</translation> </message> <message> <location filename="../editaddressdialog.cpp" line="+21"/> @@ -717,7 +717,7 @@ Address: %4 <message> <location line="+4"/> <source>New sending address</source> - <translation>新付款位址</translation> + <translation>新增付款位址</translation> </message> <message> <location line="+3"/> @@ -809,8 +809,8 @@ Address: %4 </message> <message> <location line="+6"/> - <source>Optional transaction fee per kB that helps make sure your transactions are processed quickly. Most transactions are 1 kB. Fee 0.01 recommended.</source> - <translation>非必要的交易手續費, 以 kB 為計費單位, 且有助於縮短你的交易處理時間. 大部份交易的資料大小是 1 kB. 建議設定為 0.01 元.</translation> + <source>Optional transaction fee per kB that helps make sure your transactions are processed quickly. Most transactions are 1 kB.</source> + <translation>非必要的交易手續費, 以 kB 為計費單位, 且有助於縮短你的交易處理時間. 大部份交易資料的大小是 1 kB.</translation> </message> <message> <location line="+15"/> @@ -1059,7 +1059,7 @@ Address: %4 <translation>尚未確認之交易的總額, 不包含在目前餘額中</translation> </message> <message> - <location filename="../overviewpage.cpp" line="+115"/> + <location filename="../overviewpage.cpp" line="+116"/> <location line="+1"/> <source>out of sync</source> <translation>沒同步</translation> @@ -1375,7 +1375,7 @@ Address: %4 <message> <location line="+6"/> <source>Duplicate address found, can only send to each address once per send operation.</source> - <translation>發現有重複的位址. 在一次付款動作中, 只能付給每個位址一次.</translation> + <translation>發現有重複的位址. 每個付款動作中, 只能付給個別的位址一次.</translation> </message> <message> <location line="+5"/> @@ -1514,7 +1514,7 @@ Address: %4 <message> <location line="+21"/> <source>Sign the message to prove you own this Bitcoin address</source> - <translation>簽署一則訊息來證明一個位元幣位址是你的</translation> + <translation>簽署訊息是用來證明這個位元幣位址是你的</translation> </message> <message> <location line="+3"/> @@ -1550,7 +1550,7 @@ Address: %4 <message> <location line="+40"/> <source>Verify the message to ensure it was signed with the specified Bitcoin address</source> - <translation>驗證這則訊息以確認它是用指定的位元幣位址簽署的</translation> + <translation>驗證訊息是用來確認訊息是用指定的位元幣位址簽署的</translation> </message> <message> <location line="+3"/> @@ -1646,6 +1646,19 @@ Address: %4 </message> </context> <context> + <name>SplashScreen</name> + <message> + <location filename="../splashscreen.cpp" line="+22"/> + <source>The Bitcoin developers</source> + <translation>位元幣開發人員</translation> + </message> + <message> + <location line="+1"/> + <source>[testnet]</source> + <translation>[testnet]</translation> + </message> +</context> +<context> <name>TransactionDesc</name> <message> <location filename="../transactiondesc.cpp" line="+20"/> @@ -2120,9 +2133,27 @@ Address: %4 </message> </context> <context> + <name>WalletModel</name> + <message> + <location filename="../walletmodel.cpp" line="+193"/> + <source>Send Coins</source> + <translation>付錢</translation> + </message> +</context> +<context> <name>WalletView</name> <message> - <location filename="../walletview.cpp" line="+247"/> + <location filename="../walletview.cpp" line="+42"/> + <source>&Export</source> + <translation>匯出</translation> + </message> + <message> + <location line="+1"/> + <source>Export the data in the current tab to a file</source> + <translation>將目前分頁的資料匯出存成檔案</translation> + </message> + <message> + <location line="+193"/> <source>Backup Wallet</source> <translation>錢包備份</translation> </message> @@ -2155,41 +2186,41 @@ Address: %4 <context> <name>bitcoin-core</name> <message> - <location filename="../bitcoinstrings.cpp" line="+96"/> + <location filename="../bitcoinstrings.cpp" line="+94"/> <source>Bitcoin version</source> <translation>位元幣版本</translation> </message> <message> - <location line="+98"/> + <location line="+102"/> <source>Usage:</source> <translation>用法:</translation> </message> <message> - <location line="-25"/> + <location line="-29"/> <source>Send command to -server or bitcoind</source> - <translation>送指令至 -server 或 bitcoind + <translation>送指令給 -server 或 bitcoind </translation> </message> <message> - <location line="-22"/> + <location line="-23"/> <source>List commands</source> <translation>列出指令 </translation> </message> <message> - <location line="-10"/> + <location line="-12"/> <source>Get help for a command</source> <translation>取得指令說明 </translation> </message> <message> - <location line="+21"/> + <location line="+24"/> <source>Options:</source> <translation>選項: </translation> </message> <message> - <location line="+23"/> + <location line="+24"/> <source>Specify configuration file (default: bitcoin.conf)</source> <translation>指定設定檔 (預設: bitcoin.conf) </translation> @@ -2201,30 +2232,18 @@ Address: %4 </translation> </message> <message> - <location line="-48"/> - <source>Generate coins</source> - <translation>生產位元幣 -</translation> - </message> - <message> - <location line="-27"/> - <source>Don't generate coins</source> - <translation>不生產位元幣 -</translation> - </message> - <message> - <location line="+74"/> + <location line="-1"/> <source>Specify data directory</source> <translation>指定資料目錄 </translation> </message> <message> - <location line="-8"/> + <location line="-9"/> <source>Set database cache size in megabytes (default: 25)</source> <translation>設定資料庫快取大小為多少百萬位元組(MB, 預設: 25)</translation> </message> <message> - <location line="-27"/> + <location line="-28"/> <source>Listen for connections on <port> (default: 8333 or testnet: 18333)</source> <translation>在通訊埠 <port> 聽候連線 (預設: 8333, 或若為測試網路: 18333)</translation> </message> @@ -2239,7 +2258,7 @@ Address: %4 <translation>連線到某個節點以取得其它節點的位址, 然後斷線</translation> </message> <message> - <location line="+80"/> + <location line="+82"/> <source>Specify your own public address</source> <translation>指定自己公開的位址</translation> </message> @@ -2249,22 +2268,22 @@ Address: %4 <translation>與亂搞的節點斷線的臨界值 (預設: 100)</translation> </message> <message> - <location line="-132"/> + <location line="-134"/> <source>Number of seconds to keep misbehaving peers from reconnecting (default: 86400)</source> <translation>避免與亂搞的節點連線的秒數 (預設: 86400)</translation> </message> <message> - <location line="-32"/> + <location line="-29"/> <source>An error occurred while setting up the RPC port %u for listening on IPv4: %s</source> <translation>在 IPv4 網路上以通訊埠 %u 聽取 RPC 連線時發生錯誤: %s</translation> </message> <message> - <location line="+30"/> + <location line="+27"/> <source>Listen for JSON-RPC connections on <port> (default: 8332 or testnet: 18332)</source> <translation>在通訊埠 <port> 聽候 JSON-RPC 連線 (預設: 8332, 或若為測試網路: 18332)</translation> </message> <message> - <location line="+36"/> + <location line="+37"/> <source>Accept command line and JSON-RPC commands</source> <translation>接受命令列與 JSON-RPC 指令 </translation> @@ -2275,18 +2294,18 @@ Address: %4 <translation>以背景程式執行並接受指令</translation> </message> <message> - <location line="+33"/> + <location line="+37"/> <source>Use the test network</source> <translation>使用測試網路 </translation> </message> <message> - <location line="-108"/> + <location line="-112"/> <source>Accept connections from outside (default: 1 if no -proxy or -connect)</source> <translation>是否接受外來連線 (預設: 當沒有 -proxy 或 -connect 時預設為 1)</translation> </message> <message> - <location line="-82"/> + <location line="-80"/> <source>%s, you must set a rpcpassword in the configuration file: %s It is recommended you use the following random password: @@ -2328,11 +2347,6 @@ alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com </message> <message> <location line="+3"/> - <source>Error initializing database environment %s! To recover, BACKUP THAT DIRECTORY, then remove everything from it except for wallet.dat.</source> - <translation>資料庫環境 %s 初始化失敗了! 要復原資料, 請*務必先備份該資料夾*, 然後將其中除了錢包檔 wallet.dat 外的東西都刪除掉.</translation> - </message> - <message> - <location line="+3"/> <source>Error: The transaction was rejected! This might happen if some of the coins in your wallet were already spent, such as if you used a copy of wallet.dat and coins were spent in the copy but not marked as spent here.</source> <translation>錯誤: 交易被拒絕了! 有時候會發生這種錯誤, 是因為你錢包中的一些錢已經被花掉了. 比如說你複製了錢包檔 wallet.dat, 然後用複製的錢包花掉了錢, 你現在所用的原來的錢包中卻沒有該筆交易紀錄.</translation> </message> @@ -2357,12 +2371,7 @@ alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com <translation>設定高優先權或低手續費的交易資料大小上限為多少位元組 (預設: 27000)</translation> </message> <message> - <location line="+3"/> - <source>Set the number of script verification threads (1-16, 0=auto, default: 0)</source> - <translation>設定指令碼驗證的執行緒數目 (1 至 16, 0 表示程式自動決定, 預設為 0)</translation> - </message> - <message> - <location line="+2"/> + <location line="+6"/> <source>This is a pre-release test build - use at your own risk - do not use for mining or merchant applications</source> <translation>這是尚未發表的測試版本 - 使用請自負風險 - 請不要用於開採或商業應用</translation> </message> @@ -2402,7 +2411,7 @@ alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com <translation>區塊產生選項:</translation> </message> <message> - <location line="+6"/> + <location line="+5"/> <source>Connect only to the specified node(s)</source> <translation>只連線至指定節點(可多個)</translation> </message> @@ -2422,7 +2431,7 @@ alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com <translation>你要現在重建區塊資料庫嗎?</translation> </message> <message> - <location line="+3"/> + <location line="+2"/> <source>Error initializing block database</source> <translation>初始化區塊資料庫失敗</translation> </message> @@ -2448,11 +2457,6 @@ alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com </message> <message> <location line="+1"/> - <source>Error: Transaction creation failed!</source> - <translation>錯誤: 交易產生失敗!</translation> - </message> - <message> - <location line="+1"/> <source>Error: Wallet locked, unable to create transaction!</source> <translation>錯誤: 錢包被上鎖了, 無法產生新的交易!</translation> </message> @@ -2522,7 +2526,12 @@ alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com <translation>是否允許在找節點時使用域名查詢 (預設: 當沒用 -connect 時為 1)</translation> </message> <message> - <location line="+3"/> + <location line="+1"/> + <source>Generate coins (default: 0)</source> + <translation>生產位元幣 (預設值: 0)</translation> + </message> + <message> + <location line="+2"/> <source>How many blocks to check at startup (default: 288, 0 = all)</source> <translation>啓動時檢查的區塊數 (預設: 288, 指定 0 表示全部)</translation> </message> @@ -2532,17 +2541,22 @@ alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com <translation>區塊檢查的仔細程度 (0 至 4, 預設: 3)</translation> </message> <message> - <location line="+24"/> + <location line="+19"/> + <source>Not enough file descriptors available.</source> + <translation>檔案描述器不足.</translation> + </message> + <message> + <location line="+8"/> <source>Rebuild block chain index from current blk000??.dat files</source> <translation>從目前的區塊檔 blk000??.dat 重建鎖鏈索引</translation> </message> <message> <location line="+16"/> <source>Set the number of threads to service RPC calls (default: 4)</source> - <translation type="unfinished"/> + <translation>設定處理 RPC 服務請求的執行緒數目 (預設為 4)</translation> </message> <message> - <location line="+22"/> + <location line="+26"/> <source>Verifying blocks...</source> <translation>驗證區塊資料中...</translation> </message> @@ -2552,12 +2566,17 @@ alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com <translation>驗證錢包資料中...</translation> </message> <message> - <location line="-62"/> + <location line="-69"/> <source>Imports blocks from external blk000??.dat file</source> <translation>從其它來源的 blk000??.dat 檔匯入區塊</translation> </message> <message> - <location line="+1"/> + <location line="-76"/> + <source>Set the number of script verification threads (up to 16, 0 = auto, <0 = leave that many cores free, default: 0)</source> + <translation>設定指令碼驗證的執行緒數目 (最多為 16, 若為 0 表示程式自動決定, 小於 0 表示保留不用的處理器核心數目, 預設為 0)</translation> + </message> + <message> + <location line="+77"/> <source>Information</source> <translation>資訊</translation> </message> @@ -2567,6 +2586,16 @@ alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com <translation>無效的 -tor 位址: '%s'</translation> </message> <message> + <location line="+1"/> + <source>Invalid amount for -minrelaytxfee=<amount>: '%s'</source> + <translation>設定 -minrelaytxfee=<金額> 的金額無效: '%s'</translation> + </message> + <message> + <location line="+1"/> + <source>Invalid amount for -mintxfee=<amount>: '%s'</source> + <translation>設定 -mintxfee=<amount> 的金額無效: '%s'</translation> + </message> + <message> <location line="+8"/> <source>Maintain a full transaction index (default: 0)</source> <translation>維護全部交易的索引 (預設為 0)</translation> @@ -2582,7 +2611,7 @@ alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com <translation>每個連線的傳送緩衝區大小上限為 <n>*1000 位元組 (預設: 1000)</translation> </message> <message> - <location line="+1"/> + <location line="+2"/> <source>Only accept block chain matching built-in checkpoints (default: 1)</source> <translation>只接受與內建的檢查段點吻合的區塊鎖鏈 (預設: 1)</translation> </message> @@ -2619,7 +2648,7 @@ alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com <message> <location line="+3"/> <source>Send trace/debug info to console instead of debug.log file</source> - <translation>輸出追蹤或除錯資訊至終端機, 而非 debug.log 檔案</translation> + <translation>在終端機顯示追蹤或除錯資訊, 而非寫到 debug.log 檔</translation> </message> <message> <location line="+1"/> @@ -2642,6 +2671,11 @@ alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com <translation>客戶端軟體啓動時將 debug.log 檔縮小 (預設: 當沒有 -debug 時為 1)</translation> </message> <message> + <location line="+1"/> + <source>Signing transaction failed</source> + <translation>簽署交易失敗</translation> + </message> + <message> <location line="+2"/> <source>Specify connection timeout in milliseconds (default: 5000)</source> <translation>指定連線在幾毫秒後逾時 (預設: 5000)</translation> @@ -2652,7 +2686,22 @@ alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com <translation>系統錯誤:</translation> </message> <message> - <location line="+10"/> + <location line="+4"/> + <source>Transaction amount too small</source> + <translation>交易金額太小</translation> + </message> + <message> + <location line="+1"/> + <source>Transaction amounts must be positive</source> + <translation>交易金額必須是正的</translation> + </message> + <message> + <location line="+1"/> + <source>Transaction too large</source> + <translation>交易位元量太大</translation> + </message> + <message> + <location line="+7"/> <source>Use UPnP to map the listening port (default: 0)</source> <translation>是否使用通用即插即用(UPnP)協定來設定聽候連線的通訊埠 (預設: 0)</translation> </message> @@ -2692,7 +2741,7 @@ alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com <translation>錢包檔 weallet.dat 壞掉了, 拯救失敗</translation> </message> <message> - <location line="-46"/> + <location line="-50"/> <source>Password for JSON-RPC connections</source> <translation>JSON-RPC 連線密碼</translation> </message> @@ -2708,17 +2757,17 @@ alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com </translation> </message> <message> - <location line="-119"/> + <location line="-120"/> <source>Execute command when the best block changes (%s in cmd is replaced by block hash)</source> <translation>當最新區塊改變時所要執行的指令 (指令中的 %s 會被取代為區塊的雜湊值)</translation> </message> <message> - <location line="+142"/> + <location line="+147"/> <source>Upgrade wallet to latest format</source> <translation>將錢包升級成最新的格式</translation> </message> <message> - <location line="-17"/> + <location line="-21"/> <source>Set key pool size to <n> (default: 100)</source> <translation>設定密鑰池大小為 <n> (預設: 100) </translation> @@ -2729,13 +2778,13 @@ alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com <translation>重新掃描區塊鎖鏈, 以尋找錢包所遺漏的交易.</translation> </message> <message> - <location line="+31"/> + <location line="+35"/> <source>Use OpenSSL (https) for JSON-RPC connections</source> <translation>於 JSON-RPC 連線使用 OpenSSL (https) </translation> </message> <message> - <location line="-22"/> + <location line="-26"/> <source>Server certificate file (default: server.cert)</source> <translation>伺服器憑證檔 (預設: server.cert) </translation> @@ -2747,39 +2796,39 @@ alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com </translation> </message> <message> - <location line="-153"/> + <location line="-151"/> <source>Acceptable ciphers (default: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH)</source> <translation>可以接受的加密法 (預設: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH) </translation> </message> <message> - <location line="+166"/> + <location line="+165"/> <source>This help message</source> <translation>此協助訊息 </translation> </message> <message> - <location line="+3"/> + <location line="+6"/> <source>Unable to bind to %s on this computer (bind returned error %d, %s)</source> <translation>無法和這台電腦上的 %s 繫結 (繫結回傳錯誤 %d, %s)</translation> </message> <message> - <location line="-86"/> + <location line="-91"/> <source>Connect through socks proxy</source> <translation>透過 SOCKS 代理伺服器連線</translation> </message> <message> - <location line="-11"/> + <location line="-10"/> <source>Allow DNS lookups for -addnode, -seednode and -connect</source> <translation>允許對 -addnode, -seednode, -connect 的參數使用域名查詢 </translation> </message> <message> - <location line="+56"/> + <location line="+55"/> <source>Loading addresses...</source> <translation>載入位址中...</translation> </message> <message> - <location line="-34"/> + <location line="-35"/> <source>Error loading wallet.dat: Wallet corrupted</source> <translation>載入檔案 wallet.dat 失敗: 錢包壞掉了</translation> </message> @@ -2789,22 +2838,22 @@ alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com <translation>載入檔案 wallet.dat 失敗: 此錢包需要新版的 Bitcoin</translation> </message> <message> - <location line="+87"/> + <location line="+93"/> <source>Wallet needed to be rewritten: restart Bitcoin to complete</source> <translation>錢包需要重寫: 請重啟位元幣來完成</translation> </message> <message> - <location line="-89"/> + <location line="-95"/> <source>Error loading wallet.dat</source> <translation>載入檔案 wallet.dat 失敗</translation> </message> <message> - <location line="+29"/> + <location line="+28"/> <source>Invalid -proxy address: '%s'</source> <translation>無效的 -proxy 位址: '%s'</translation> </message> <message> - <location line="+49"/> + <location line="+56"/> <source>Unknown network specified in -onlynet: '%s'</source> <translation>在 -onlynet 指定了不明的網路別: '%s'</translation> </message> @@ -2814,7 +2863,7 @@ alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com <translation>在 -socks 指定了不明的代理協定版本: %i</translation> </message> <message> - <location line="-91"/> + <location line="-96"/> <source>Cannot resolve -bind address: '%s'</source> <translation>無法解析 -bind 位址: '%s'</translation> </message> @@ -2834,17 +2883,17 @@ alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com <translation>無效的金額</translation> </message> <message> - <location line="-4"/> + <location line="-6"/> <source>Insufficient funds</source> <translation>累積金額不足</translation> </message> <message> - <location line="+8"/> + <location line="+10"/> <source>Loading block index...</source> <translation>載入區塊索引中...</translation> </message> <message> - <location line="-58"/> + <location line="-57"/> <source>Add a node to connect to and attempt to keep the connection open</source> <translation>加入一個要連線的節線, 並試著保持對它的連線暢通</translation> </message> @@ -2854,52 +2903,47 @@ alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com <translation>無法和這台電腦上的 %s 繫結. 也許位元幣已經在執行了.</translation> </message> <message> - <location line="+67"/> + <location line="+64"/> <source>Fee per KB to add to transactions you send</source> <translation>交易付款時每 KB 的交易手續費</translation> </message> <message> - <location line="+17"/> + <location line="+19"/> <source>Loading wallet...</source> <translation>載入錢包中...</translation> </message> <message> - <location line="-53"/> + <location line="-52"/> <source>Cannot downgrade wallet</source> <translation>無法將錢包格式降級</translation> </message> <message> - <location line="+1"/> - <source>Cannot initialize keypool</source> - <translation>無法將密鑰池初始化</translation> - </message> - <message> <location line="+3"/> <source>Cannot write default address</source> <translation>無法寫入預設位址</translation> </message> <message> - <location line="+63"/> + <location line="+64"/> <source>Rescanning...</source> <translation>重新掃描中...</translation> </message> <message> - <location line="-55"/> + <location line="-57"/> <source>Done loading</source> <translation>載入完成</translation> </message> <message> - <location line="+79"/> + <location line="+82"/> <source>To use the %s option</source> <translation>為了要使用 %s 選項</translation> </message> <message> - <location line="-71"/> + <location line="-74"/> <source>Error</source> <translation>錯誤</translation> </message> <message> - <location line="-33"/> + <location line="-31"/> <source>You must set rpcpassword=<password> in the configuration file: %s If the file does not exist, create it with owner-readable-only file permissions.</source> diff --git a/src/qt/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 <QMenu> #include <QWidget> - -extern void qt_mac_set_dock_menu(QMenu*); +#include <QTemporaryFile> +#include <QImageWriter> #undef slots #include <Cocoa/Cocoa.h> @@ -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 <QObject> + +/** 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 <Cocoa/Cocoa.h> + +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 <ApplicationServices/ApplicationServices.h> -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 <QLocalServer> #include <QLocalSocket> #include <QStringList> +#if QT_VERSION < 0x050000 #include <QUrl> +#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 <QPixmap> +#if QT_VERSION < 0x050000 #include <QUrl> +#endif #include <qrencode.h> 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 <QTime> #include <QThread> #include <QKeyEvent> +#if QT_VERSION < 0x050000 #include <QUrl> +#endif #include <QScrollBar> #include <openssl/crypto.h> 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("<b>%1</b> to %2 (%3)").arg(BitcoinUnits::formatWithUnit(BitcoinUnits::BTC, rcp.amount), Qt::escape(rcp.label), rcp.address)); +#else + formatted.append(tr("<b>%1</b> 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("<nobr>") + tr("Message verification failed.") + QString("</nobr>")); 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 <QPainter> +#undef loop /* ugh, remove this when the #define loop is gone from util.h */ #include <QApplication> 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 <QVBoxLayout> +#include <QHBoxLayout> #include <QMessageBox> -#include <stdio.h> - 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 QList<SendCoinsRecipie CWalletTx wtx; CReserveKey keyChange(wallet); int64 nFeeRequired = 0; - bool fCreated = wallet->CreateTransaction(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<SendCoinsRecipie { return SendCoinsReturn(AmountWithFeeExceedsBalance, nFeeRequired); } + emit message(tr("Send Coins"), QString::fromStdString(strFailReason), + CClientUIInterface::MSG_ERROR); return TransactionCreationFailed; } if(!uiInterface.ThreadSafeAskFee(nFeeRequired)) diff --git a/src/qt/walletstack.h b/src/qt/walletstack.h index ea4cc121d1..506d595c0f 100644 --- a/src/qt/walletstack.h +++ b/src/qt/walletstack.h @@ -40,6 +40,7 @@ QT_END_NAMESPACE class WalletStack : public QStackedWidget { Q_OBJECT + public: explicit WalletStack(QWidget *parent = 0); ~WalletStack(); diff --git a/src/qt/walletview.cpp b/src/qt/walletview.cpp index 6d44c174b7..277c056693 100644 --- a/src/qt/walletview.cpp +++ b/src/qt/walletview.cpp @@ -21,7 +21,11 @@ #include <QHBoxLayout> #include <QVBoxLayout> #include <QAction> +#if QT_VERSION < 0x050000 #include <QDesktopServices> +#else +#include <QStandardPaths> +#endif #include <QFileDialog> #include <QPushButton> @@ -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<uint256, pair<CBlock*, CScript> > mapNewBlock_t; static mapNewBlock_t mapNewBlock; // FIXME: thread safety static vector<CBlockTemplate*> 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<CKey> pubkeys; + std::vector<CPubKey> 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<uint256> 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<int>::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 <passphrase> <timeout>\n" "Stores the wallet decryption key in memory for <timeout> 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<unsigned char> vchSig, vector<unsigned char> vchPubKey, CScript scriptCode, const CTransaction& txTo, unsigned int nIn, int nHashType, int flags); +bool CheckSig(vector<unsigned char> vchSig, const vector<unsigned char> &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<vector<unsigned char> >& 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<vector<unsigned char> >& 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<vector<unsigned char> >& 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<vector<unsigned char> >& 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<vector<unsigned char> >& 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<vector<unsigned char> >& 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<vector<unsigned char> >& 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<uint256, std::vector<unsigned char>, std::vector<unsigned char> > sigdata_type; + typedef boost::tuple<uint256, std::vector<unsigned char>, CPubKey> sigdata_type; std::set< sigdata_type> setValid; boost::shared_mutex cs_sigcache; public: bool - Get(uint256 hash, const std::vector<unsigned char>& vchSig, const std::vector<unsigned char>& pubKey) + Get(const uint256 &hash, const std::vector<unsigned char>& vchSig, const CPubKey& pubKey) { boost::shared_lock<boost::shared_mutex> lock(cs_sigcache); @@ -1215,7 +1050,7 @@ public: return false; } - void Set(uint256 hash, const std::vector<unsigned char>& vchSig, const std::vector<unsigned char>& pubKey) + void Set(const uint256 &hash, const std::vector<unsigned char>& 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<unsigned char> vchSig, vector<unsigned char> vchPubKey, CScript scriptCode, +bool CheckSig(vector<unsigned char> vchSig, const vector<unsigned char> &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<unsigned char> vchSig, vector<unsigned char> 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<CKey>& keys) +void CScript::SetMultisig(int nRequired, const std::vector<CPubKey>& 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<unsigned char> &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<unsigned char> &out) const memcpy(&out[1], &scriptID, 20); return true; } - std::vector<unsigned char> 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<unsigne return true; case 0x04: case 0x05: - std::vector<unsigned char> 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<unsigned char> 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<CKey>& keys); + void SetMultisig(int nRequired, const std::vector<CPubKey>& keys); void PrintHex() const @@ -619,7 +621,7 @@ protected: // form). bool IsToKeyID(CKeyID &hash) const; bool IsToScriptID(CScriptID &hash) const; - bool IsToPubKey(std::vector<unsigned char> &pubkey) const; + bool IsToPubKey(CPubKey &pubkey) const; bool Compress(std::vector<unsigned char> &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<unsigned char> 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<unsigned char>(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<std::string> 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<unsigned char> 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); - - BOOST_CHECK(secret1 == secret1C); - BOOST_CHECK(secret2 == secret2C); - - 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())); + 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); + + CPubKey pubkey1 = key1. GetPubKey(); + CPubKey pubkey2 = key2. GetPubKey(); + CPubKey pubkey1C = key1C.GetPubKey(); + CPubKey pubkey2C = key2C.GetPubKey(); + + 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<CKey> keys, CTransaction transaction, CScript result; result << OP_0; // CHECKMULTISIG bug workaround - BOOST_FOREACH(CKey key, keys) + BOOST_FOREACH(const CKey &key, keys) { vector<unsigned char> 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,23 +79,44 @@ static Value CallRPC(string args) } } -BOOST_AUTO_TEST_CASE(rpc_rawparams) +BOOST_AUTO_TEST_CASE(rpc_wallet) { - // Test raw transaction API argument handling + // Test RPC calls for various wallet statistics Value r; - BOOST_CHECK_THROW(CallRPC("getrawtransaction"), runtime_error); - 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_THROW(CallRPC("listunspent 0 1 [] extra"), 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_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 + Value r; + + BOOST_CHECK_THROW(CallRPC("getrawtransaction"), runtime_error); + BOOST_CHECK_THROW(CallRPC("getrawtransaction not_hex"), runtime_error); + BOOST_CHECK_THROW(CallRPC("getrawtransaction a3b807410df0b60fcb9736768df5823938b2f838694939ba45f3c0a1bff150ed not_int"), runtime_error); + 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<CKey> keys; + std::vector<CPubKey> 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<CKey>(keys.begin(), keys.begin()+2)); - inner[2].SetMultisig(1, std::vector<CKey>(keys.begin(), keys.begin()+2)); - inner[3].SetMultisig(2, std::vector<CKey>(keys.begin(), keys.begin()+3)); + inner[1].SetMultisig(2, std::vector<CPubKey>(keys.begin(), keys.begin()+2)); + inner[2].SetMultisig(1, std::vector<CPubKey>(keys.begin(), keys.begin()+2)); + inner[3].SetMultisig(2, std::vector<CPubKey>(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<CKey> keys; + vector<CPubKey> 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<CKey> keys, CTransaction transac // and vice-versa) // result << OP_0; - BOOST_FOREACH(CKey key, keys) + BOOST_FOREACH(const CKey &key, keys) { vector<unsigned char> vchSig; BOOST_CHECK(key.Sign(hash, vchSig)); @@ -221,7 +221,7 @@ sign_multisig(CScript scriptPubKey, std::vector<CKey> 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<CKey> keys; keys.push_back(key); @@ -333,11 +333,13 @@ BOOST_AUTO_TEST_CASE(script_combineSigs) // Test the CombineSignatures function CBasicKeyStore keystore; vector<CKey> keys; + vector<CPubKey> 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<CKey> keys; + std::vector<CPubKey> 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<CTransaction> 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<unsigned char>(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<int> 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<void (*)()>, "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<void()> f = boost::bind(&CountWithArg, 11); - threadGroup.create_thread(boost::bind(&LoopForever<boost::function<void()> >, "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<void (*)()>, "count11", &Count)); - threadGroup.join_all(); - BOOST_CHECK_EQUAL(nCounter, 1); - nCounter = 0; -} - -BOOST_AUTO_TEST_CASE(util_threadtrace2) -{ - boost::thread_group threadGroup; - - boost::function<void()> f = boost::bind(&CountWithArg, 11); - threadGroup.create_thread(boost::bind(&TraceThread<boost::function<void()> >, "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<COutput> 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; i<coins.vout.size(); i++) { + const CTxOut &out = coins.vout[i]; + if (!out.IsNull()) { stats.nTransactionOutputs++; + ss << VARINT(i+1); + ss << out; + nTotalAmount += out.nValue; + } } stats.nSerializedSize += 32 + slValue.size(); + ss << VARINT(0); } pcursor->Next(); } 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 <limits.h> #include <stdio.h> #include <string.h> +#include <inttypes.h> #include <string> #include <vector> @@ -20,14 +21,14 @@ inline int Testuint256AdHoc(std::vector<std::string> 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<unsigned int BITS> 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<int64> 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<string, string>& 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<string, string>& mapSettingsRet, if (!streamConfig.good()) return; // No bitcoin.conf file is OK + // clear path cache after loading config file + fCachedPath[0] = fCachedPath[1] = false; + set<string> 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 <stdarg.h> + #ifndef WIN32 #include <sys/types.h> #include <sys/time.h> #include <sys/resource.h> -#else -typedef int pid_t; /* define for Windows compatibility */ #endif #include <map> #include <list> @@ -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<unsigned char>& vch, bool fSpaces=false) +template<typename T> +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<unsigned char return false; } +bool CWallet::LoadCryptedKey(const CPubKey &vchPubKey, const std::vector<unsigned char> &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<pair<const CWalletTx*,unsigned -bool CWallet::CreateTransaction(const vector<pair<CScript, int64> >& vecSend, CWalletTx& wtxNew, CReserveKey& reservekey, int64& nFeeRet) +bool CWallet::CreateTransaction(const vector<pair<CScript, int64> >& 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<pair<CScript, int64> >& 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<pair<const CWalletTx*,unsigned int> > 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<pair<CScript, int64> >& 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<pair<CScript, int64> >& 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<pair<CScript, int64> >& vecSend, CW CScript scriptChange; scriptChange.SetDestination(vchPubKey.GetID()); - // Insert change txn at random position: - vector<CTxOut>::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<CTxOut>::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<pair<CScript, int64> >& 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<pair<CScript, int64> >& 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<CScript, int64> > 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<CTxDestination> > 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<unsigned char> &vchCryptedSecret); // Adds an encrypted key to the store, without saving it to disk (used by LoadWallet) - bool LoadCryptedKey(const CPubKey &vchPubKey, const std::vector<unsigned char> &vchCryptedSecret) { SetMinVersion(FEATURE_WALLETCRYPT); return CCryptoKeyStore::AddCryptedKey(vchPubKey, vchCryptedSecret); } + bool LoadCryptedKey(const CPubKey &vchPubKey, const std::vector<unsigned char> &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<std::pair<CScript, int64> >& vecSend, CWalletTx& wtxNew, CReserveKey& reservekey, int64& nFeeRet); - bool CreateTransaction(CScript scriptPubKey, int64 nValue, CWalletTx& wtxNew, CReserveKey& reservekey, int64& nFeeRet); + bool CreateTransaction(const std::vector<std::pair<CScript, int64> >& 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<unsigned char> vchPubKey; + CPubKey vchPubKey; ssKey >> vchPubKey; + if (!vchPubKey.IsValid()) + { + strErr = "Error reading wallet database: CPubKey corrupt"; + return false; + } CKey key; + CPrivKey pkey; if (strType == "key") - { - 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; - } - } - else - { + 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 (!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)) + 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<unsigned char>& 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) |
