diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2011-10-09 20:26:40 +0200 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2011-10-09 20:26:40 +0200 |
| commit | 8828da5f56313855e19f463ff1c09196812b997b (patch) | |
| tree | e54e27b1a7d5287bbe245189c3044cc1a19ba02b | |
| parent | ba2db7262bec34d45c75c6842c3a1c0cfaba893e (diff) | |
| parent | 4db9705dd839cbb386398b1eb4be2a67357c27c4 (diff) | |
Merge branch 'master' of https://github.com/bitcoin/bitcoin
78 files changed, 4238 insertions, 21016 deletions
diff --git a/bitcoin-qt.pro b/bitcoin-qt.pro index a603549720..1f65d0574f 100644 --- a/bitcoin-qt.pro +++ b/bitcoin-qt.pro @@ -1,6 +1,6 @@ TEMPLATE = app TARGET = -INCLUDEPATH += src src/json src/cryptopp src/qt +INCLUDEPATH += src src/json src/qt DEFINES += QT_GUI CONFIG += no_include_pwd @@ -52,7 +52,7 @@ QMAKE_LFLAGS += -fstack-protector QMAKE_CXXFLAGS_WARN_ON = -fdiagnostics-show-option -Wall -Wno-invalid-offsetof -Wno-unused-variable -Wno-unused-parameter -Wno-sign-compare -Wno-char-subscripts -Wno-unused-value -Wno-sequence-point -Wno-parentheses -Wno-unknown-pragmas -Wno-switch # Input -DEPENDPATH += src/qt src src/cryptopp src json/include +DEPENDPATH += src/qt src src json/include HEADERS += src/qt/bitcoingui.h \ src/qt/transactiontablemodel.h \ src/qt/addresstablemodel.h \ @@ -67,17 +67,6 @@ HEADERS += src/qt/bitcoingui.h \ src/util.h \ src/uint256.h \ src/serialize.h \ - src/cryptopp/stdcpp.h \ - src/cryptopp/smartptr.h \ - src/cryptopp/simple.h \ - src/cryptopp/sha.h \ - src/cryptopp/secblock.h \ - src/cryptopp/pch.h \ - src/cryptopp/misc.h \ - src/cryptopp/iterhash.h \ - src/cryptopp/cryptlib.h \ - src/cryptopp/cpu.h \ - src/cryptopp/config.h \ src/strlcpy.h \ src/main.h \ src/net.h \ @@ -133,8 +122,6 @@ SOURCES += src/qt/bitcoin.cpp src/qt/bitcoingui.cpp \ src/qt/aboutdialog.cpp \ src/qt/editaddressdialog.cpp \ src/qt/bitcoinaddressvalidator.cpp \ - src/cryptopp/sha.cpp \ - src/cryptopp/cpu.cpp \ src/util.cpp \ src/script.cpp \ src/main.cpp \ @@ -231,10 +218,10 @@ isEmpty(BOOST_INCLUDE_PATH) { } windows:LIBS += -lws2_32 -lgdi32 -windows:DEFINES += __WXMSW__ +windows:DEFINES += WIN32 windows:RC_FILE = src/qt/res/bitcoin-qt.rc -macx:DEFINES += __WXMAC_OSX__ MSG_NOSIGNAL=0 BOOST_FILESYSTEM_VERSION=3 +macx:DEFINES += MAC_OSX MSG_NOSIGNAL=0 BOOST_FILESYSTEM_VERSION=3 macx:ICON = src/qt/res/icons/bitcoin.icns macx:TARGET = "Bitcoin Qt" diff --git a/contrib/BitcoinTemplate.dmg b/contrib/BitcoinTemplate.dmg Binary files differdeleted file mode 100644 index ca86308e05..0000000000 --- a/contrib/BitcoinTemplate.dmg +++ /dev/null diff --git a/contrib/bitrpc/bitrpc.py b/contrib/bitrpc/bitrpc.py new file mode 100644 index 0000000000..b02b299177 --- /dev/null +++ b/contrib/bitrpc/bitrpc.py @@ -0,0 +1,324 @@ +from jsonrpc import ServiceProxy +import sys +import string + +# ===== BEGIN USER SETTINGS ===== +# if you do not set these you will be prompted for a password for every command +rpcuser = "" +rpcpass = "" +# ====== END USER SETTINGS ====== + + +if rpcpass == "": + access = ServiceProxy("http://127.0.0.1:8332") +else: + access = ServiceProxy("http://"+rpcuser+":"+rpcpass+"@127.0.0.1:8332") +cmd = sys.argv[1].lower() + +if cmd == "backupwallet": + try: + path = raw_input("Enter destination path/filename: ") + print access.backupwallet(path) + except: + print "\n---An error occurred---\n" + +elif cmd == "getaccount": + try: + addr = raw_input("Enter a Bitcoin address: ") + print access.getaccount(addr) + except: + print "\n---An error occurred---\n" + +elif cmd == "getaccountaddress": + try: + acct = raw_input("Enter an account name: ") + print access.getaccountaddress(acct) + except: + print "\n---An error occurred---\n" + +elif cmd == "getaddressesbyaccount": + try: + acct = raw_input("Enter an account name: ") + print access.getaddressesbyaccount(acct) + except: + print "\n---An error occurred---\n" + +elif cmd == "getbalance": + try: + acct = raw_input("Enter an account (optional): ") + mc = raw_input("Minimum confirmations (optional): ") + try: + print access.getbalance(acct, mc) + except: + print access.getbalance() + except: + print "\n---An error occurred---\n" + +elif cmd == "getblockbycount": + try: + height = raw_input("Height: ") + print access.getblockbycount(height) + except: + print "\n---An error occurred---\n" + +elif cmd == "getblockcount": + try: + print access.getblockcount() + except: + print "\n---An error occurred---\n" + +elif cmd == "getblocknumber": + try: + print access.getblocknumber() + except: + print "\n---An error occurred---\n" + +elif cmd == "getconnectioncount": + try: + print access.getconnectioncount() + except: + print "\n---An error occurred---\n" + +elif cmd == "getdifficulty": + try: + print access.getdifficulty() + except: + print "\n---An error occurred---\n" + +elif cmd == "getgenerate": + try: + print access.getgenerate() + except: + print "\n---An error occurred---\n" + +elif cmd == "gethashespersec": + try: + print access.gethashespersec() + except: + print "\n---An error occurred---\n" + +elif cmd == "getinfo": + try: + print access.getinfo() + except: + print "\n---An error occurred---\n" + +elif cmd == "getnewaddress": + try: + acct = raw_input("Enter an account name: ") + try: + print access.getnewaddress(acct) + except: + print access.getnewaddress() + except: + print "\n---An error occurred---\n" + +elif cmd == "getreceivedbyaccount": + try: + acct = raw_input("Enter an account (optional): ") + mc = raw_input("Minimum confirmations (optional): ") + try: + print access.getreceivedbyaccount(acct, mc) + except: + print access.getreceivedbyaccount() + except: + print "\n---An error occurred---\n" + +elif cmd == "getreceivedbyaddress": + try: + addr = raw_input("Enter a Bitcoin address (optional): ") + mc = raw_input("Minimum confirmations (optional): ") + try: + print access.getreceivedbyaddress(addr, mc) + except: + print access.getreceivedbyaddress() + except: + print "\n---An error occurred---\n" + +elif cmd == "gettransaction": + try: + txid = raw_input("Enter a transaction ID: ") + print access.gettransaction(txid) + except: + print "\n---An error occurred---\n" + +elif cmd == "getwork": + try: + data = raw_input("Data (optional): ") + try: + print access.gettransaction(data) + except: + print access.gettransaction() + except: + print "\n---An error occurred---\n" + +elif cmd == "help": + try: + cmd = raw_input("Command (optional): ") + try: + print access.help(cmd) + except: + print access.help() + except: + print "\n---An error occurred---\n" + +elif cmd == "listaccounts": + try: + mc = raw_input("Minimum confirmations (optional): ") + try: + print access.listaccounts(mc) + except: + print access.listaccounts() + except: + print "\n---An error occurred---\n" + +elif cmd == "listreceivedbyaccount": + try: + mc = raw_input("Minimum confirmations (optional): ") + incemp = raw_input("Include empty? (true/false, optional): ") + try: + print access.listreceivedbyaccount(mc, incemp) + except: + print access.listreceivedbyaccount() + except: + print "\n---An error occurred---\n" + +elif cmd == "listreceivedbyaddress": + try: + mc = raw_input("Minimum confirmations (optional): ") + incemp = raw_input("Include empty? (true/false, optional): ") + try: + print access.listreceivedbyaddress(mc, incemp) + except: + print access.listreceivedbyaddress() + except: + print "\n---An error occurred---\n" + +elif cmd == "listtransactions": + try: + acct = raw_input("Account (optional): ") + count = raw_input("Number of transactions (optional): ") + frm = raw_input("Skip (optional):") + try: + print access.listtransactions(acct, count, frm) + except: + print access.listtransactions() + except: + print "\n---An error occurred---\n" + +elif cmd == "move": + try: + frm = raw_input("From: ") + to = raw_input("To: ") + amt = raw_input("Amount:") + mc = raw_input("Minimum confirmations (optional): ") + comment = raw_input("Comment (optional): ") + try: + print access.move(frm, to, amt, mc, comment) + except: + print access.move(frm, to, amt) + except: + print "\n---An error occurred---\n" + +elif cmd == "sendfrom": + try: + frm = raw_input("From: ") + to = raw_input("To: ") + amt = raw_input("Amount:") + mc = raw_input("Minimum confirmations (optional): ") + comment = raw_input("Comment (optional): ") + commentto = raw_input("Comment-to (optional): ") + try: + print access.sendfrom(frm, to, amt, mc, comment, commentto) + except: + print access.sendfrom(frm, to, amt) + except: + print "\n---An error occurred---\n" + +elif cmd == "sendmany": + try: + frm = raw_input("From: ") + to = raw_input("To (in format address1:amount1,address2:amount2,...): ") + mc = raw_input("Minimum confirmations (optional): ") + comment = raw_input("Comment (optional): ") + try: + print access.sendmany(frm,to,mc,comment) + except: + print access.sendmany(frm,to) + except: + print "\n---An error occurred---\n" + +elif cmd == "sendtoaddress": + try: + to = raw_input("To (in format address1:amount1,address2:amount2,...): ") + amt = raw_input("Amount:") + comment = raw_input("Comment (optional): ") + commentto = raw_input("Comment-to (optional): ") + try: + print access.sendtoaddress(to,amt,comment,commentto) + except: + print access.sendtoaddress(to,amt) + except: + print "\n---An error occurred---\n" + +elif cmd == "setaccount": + try: + addr = raw_input("Address: ") + acct = raw_input("Account:") + print access.setaccount(addr,acct) + except: + print "\n---An error occurred---\n" + +elif cmd == "setgenerate": + try: + gen= raw_input("Generate? (true/false): ") + cpus = raw_input("Max processors/cores (-1 for unlimited, optional):") + try: + print access.setgenerate(gen, cpus) + except: + print access.setgenerate(gen) + except: + print "\n---An error occurred---\n" + +elif cmd == "settxfee": + try: + amt = raw_input("Amount:") + print access.settxfee(amt) + except: + print "\n---An error occurred---\n" + +elif cmd == "stop": + try: + print access.stop() + except: + print "\n---An error occurred---\n" + +elif cmd == "validateaddress": + try: + addr = raw_input("Address: ") + print access.validateaddress(addr) + except: + print "\n---An error occurred---\n" + +elif cmd == "walletpassphrase": + try: + pwd = raw_input("Enter wallet passphrase: ") + access.walletpassphrase(pwd, 60) + print "\n---Wallet unlocked---\n" + except: + print "\n---An error occurred---\n" + +elif cmd == "walletpassphrasechange": + try: + pwd = raw_input("Enter old wallet passphrase: ") + pwd2 = raw_input("Enter new wallet passphrase: ") + access.walletpassphrasechange(pwd, pwd2) + print + print "\n---Passphrase changed---\n" + except: + print + print "\n---An error occurred---\n" + print + +else: + print "Command not found or not supported"
\ No newline at end of file diff --git a/contrib/wallettools/walletchangepass.py b/contrib/wallettools/walletchangepass.py new file mode 100644 index 0000000000..30f3f5b26a --- /dev/null +++ b/contrib/wallettools/walletchangepass.py @@ -0,0 +1,5 @@ +from jsonrpc import ServiceProxy +access = ServiceProxy("http://127.0.0.1:8332") +pwd = raw_input("Enter old wallet passphrase: ") +pwd2 = raw_input("Enter new wallet passphrase: ") +access.walletpassphrasechange(pwd, pwd2)
\ No newline at end of file diff --git a/contrib/wallettools/walletunlock.py b/contrib/wallettools/walletunlock.py new file mode 100644 index 0000000000..f847c6fe61 --- /dev/null +++ b/contrib/wallettools/walletunlock.py @@ -0,0 +1,4 @@ +from jsonrpc import ServiceProxy +access = ServiceProxy("http://127.0.0.1:8332") +pwd = raw_input("Enter wallet passphrase: ") +access.walletpassphrase(pwd, 60)
\ No newline at end of file diff --git a/doc/build-osx.txt b/doc/build-osx.txt index ac67080c3a..a13f8d3ada 100644 --- a/doc/build-osx.txt +++ b/doc/build-osx.txt @@ -1,5 +1,4 @@ -Copyright (c) 2010 Laszlo Hanyecz -Portions Copyright (c) 2011 Douglas Huff +Copyright (c) 2011 Bitcoin Developers Distributed under the MIT/X11 software license, see the accompanying file license.txt or http://www.opensource.org/licenses/mit-license.php. This product includes software developed by the OpenSSL Project for use in the @@ -26,163 +25,29 @@ everything is available in /usr not just /Developer I think it comes on the DVD but you can get the current version from http://developer.apple.com -1. Pick a directory to work inside.. something like ~/bitcoin works. The -structure I use looks like this: +1. Clone the github tree to get the source code: -(~ is your home directory) +git clone git@github.com:bitcoin/bitcoin.git bitcoin -~/bitcoin -~/bitcoin/bitcoin # Upstream source tree -~/bitcoin/src # source code (symlink to ~/bitcoin/bitcoin/src) -~/bitcoin/deps # dependencies.. like libraries and headers needed to compile +2. Download and install MacPorts from http://www.macports.org/ -Just execute: mkdir ~/bitcoin -This will create the top dir for you.. +3. Install dependencies from MacPorts -WARNING: do not use the ~ notation with the configure scripts.. use the full -name of the directory, for example /Users/james/bitcoin/deps for a user named -'james'. In my examples I am using 'macosuser' so make sure you change that. +sudo port install boost db48 openssl -2. Check out the bitcoin code from github: +Install the right version of miniupnpc: +pushd bitcoin/contrib/minipupnpc; sudo port install; popd +(this will be unnecessary soon, you will just port install miniupnpc +along with the rest of the dependencies). -cd ~/bitcoin -git clone https://github.com/bitcoin/bitcoin.git -ln -s bitcoin/src src +4. Now you should be able to build bitcoind: -This will make ~/bitcoin/bitcoin for you with all the files from git. This puts -the actual sources in ~/bitcoin/bitcoin/src and create a symlink src in -~/bitcoin to this location. +cd bitcoin/src +make -f makefile.osx -3. Get and build the dependencies - - -Boost ------ - -Download from http://www.boost.org/users/download/ -I'm assuming it ended up in ~/Downloads.. - -mkdir ~/bitcoin/deps -cd ~/bitcoin/deps -tar xvjf ~/Downloads/boost_1_42_0.tar.bz2 -cd boost_1_42_0 -./bootstrap.sh -./bjam architecture=combined address-model=32_64 macosx-version=10.5 macosx-version-min=10.5 link=static runtime-link=static --toolset=darwin --prefix=/Users/macosuser/bitcoin/deps install - -If you're using Snow Leopard, you will need to specify 10.6 as your Mac OS X -version instead of 10.5. - -This part takes a while.. use your judgement and fix it if something doesn't -build for some reason. - -Change the prefix to whatever your directory is (my username in this example -is macosuser). I'm also running on 10.6 so i have macosx-version=10.6 change -to 10.5 if you're using leopard. - -This is what my output looked like at the end: -...failed updating 2 targets... -...skipped 144 targets... -...updated 8074 targets... - - -OpenSSL -------- - -(System or MacPorts openssl will work fine. Optional.) - -Download from http://www.openssl.org/source/ - -We would like to build this as a 32 bit/64 bit library so we actually build it -2 times and join it together here.. If you downloaded with safari it already -uncompressed it so it will just be a tar not a tar.gz - -cd ~/bitcoin/deps -tar xvf ~/Downloads/openssl-1.0.0.tar -mv openssl-1.0.0 openssl-1.0.0-i386 -tar xvf ~/Downloads/openssl-1.0.0.tar -mv openssl-1.0.0 openssl-1.0.0-x86_64 -# build i386 (32 bit intel) binary -cd openssl-1.0.0-i386 -./Configure --prefix=/Users/macosuser/bitcoin/deps --openssldir=/Users/macosuser/bitcoin/deps/openssl darwin-i386-cc && make -make install # only do this on one of the architectures, to install the headers -cd .. -# build x86_64 (64 bit intel) binary -cd openssl-1.0.0-x86_64 -./Configure --prefix=/Users/macosuser/bitcoin/deps --openssldir=/Users/macosuser/bitcoin/deps/openssl darwin64-x86_64-cc && make -cd .. - -# combine the libs -cd ~/bitcoin/deps -lipo -arch i386 openssl-1.0.0-i386/libcrypto.a -arch x86_64 openssl-1.0.0-x86_64/libcrypto.a -o lib/libcrypto.a -create -lipo -arch i386 openssl-1.0.0-i386/libssl.a -arch x86_64 openssl-1.0.0-x86_64/libssl.a -o lib/libssl.a -create - -Verify your binaries - -file lib/libcrypto.a - -output should look like this: - -lib/libcrypto.a: Mach-O universal binary with 2 architectures -lib/libcrypto.a (for architecture i386): current ar archive random library -lib/libcrypto.a (for architecture x86_64): current ar archive random library - - -miniupnpc ---------- - -(MacPorts miniupnpc package works fine. You will need to modify makefile.) - -The process for miniupnpc (optional) is similar to that of OpenSSL. - -Download from http://miniupnp.tuxfamily.org/files/. - -cd ~/bitcoin/deps -tar xvf ~/Downloads/miniupnpc-1.6.tar -mv miniupnpc-1.6 miniupnpc-1.6-x86_64 -tar xvf ~/Downloads/miniupnpc-1.6.tar -mv miniupnpc-1.6 miniupnpc-1.6-i386 -# build x86_64 (64 bit intel) binary -cd miniupnpc-1.6-x86_64 -export CFLAGS="-arch x86_64" -export LDFLAGS="-arch x86_64" -export PREFIX="/Users/macuser/bitcoin/deps" -make && make install -# build i386 (32 bit intel) binary -cd miniupnpc-1.6-i386 -export CFLAGS="-arch i386" -export LDFLAGS="-arch i386" -export PREFIX="/Users/macuser/bitcoin/deps" -make - -# combine the libs -cd ~/bitcoin/deps -lipo -arch i386 miniupnpc-1.6-i386/libminiupnpc.a -arch x86_64 miniupnpc-1.6-x86_64/libminiupnpc.a -o lib/libminiupnpc.a -create - -Verify your binaries - -file lib/libminiupnpc.a - -output should look like this: - -lib/libminiupnpc.a: Mach-O universal binary with 2 architectures -lib/libminiupnpc.a (for architecture i386): current ar archive random library -lib/libminiupnpc.a (for architecture x86_64): current ar archive random library - - -Berkeley DB ------------ - -(System or MacPorts version work fine.) - -Download from http://freshmeat.net/projects/berkeleydb/ - -cd ~/bitcoin/deps -tar xvf ~/Downloads/db-4.8.30.tar -cd db-4.8.30/build_unix -../dist/configure --prefix=/Users/macosuser/bitcoin/deps --enable-cxx && make && make install - - -Now you should be able to build bitcoind: - -cd ~/bitcoin/src -make -f makefile.osx bitcoind +Run: + ./bitcoind --help # for a list of command-line options. +Run + ./bitcoind -daemon # to start the bitcoin daemon. +Run + ./bitcoind help # When the daemon is running, to get a list of RPC commands diff --git a/doc/build-unix.txt b/doc/build-unix.txt index b7aa7112b4..e47dbf710c 100644 --- a/doc/build-unix.txt +++ b/doc/build-unix.txt @@ -22,38 +22,63 @@ the graphical bitcoin. Dependencies ------------ + + Library Purpose Description + ------- ------- ----------- + libssl SSL Support Secure communications + libdb4.8 Berkeley DB Blockchain & wallet storage + 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 +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 + +Licenses of statically linked libraries: + 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: + GCC 4.3.3 + OpenSSL 0.9.8g + Berkeley DB 4.8.30.NC + Boost 1.37 + miniupnpc 1.6 + + +Dependency Build Instructions: Ubuntu & Debian +---------------------------------------------- sudo apt-get install build-essential sudo apt-get install libssl-dev sudo apt-get install libdb4.8-dev sudo apt-get install libdb4.8++-dev -Boost 1.40+: sudo apt-get install libboost-all-dev -or Boost 1.37: sudo apt-get install libboost1.37-dev + Boost 1.40+: sudo apt-get install libboost-all-dev + or Boost 1.37: sudo apt-get install libboost1.37-dev If using Boost 1.37, append -mt to the boost libraries in the makefile. -Requires miniupnpc for UPnP port mapping. It can be downloaded from -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. -Licenses of statically linked libraries: -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 +Dependency Build Instructions: Gentoo +------------------------------------- +emerge -av boost openssl sys-libs/db -Versions used in this release: -GCC 4.3.3 -OpenSSL 0.9.8g -Berkeley DB 4.8.30.NC -Boost 1.37 -miniupnpc 1.6 +Take the following steps to build (no UPnP support): + cd ${BITCOIN_DIR}/src + sed -i 's/<db_cxx.h>/<db4.8\/db_cxx.h>/' *.h # path fix + sed -i 's/-Bstatic/-Bdynamic/' makefile.unix # dynamic linking + sed -i 's/^USE_UPNP:=0$/USE_UPNP:=/' makefile.unix # disable UPnP + make -f makefile.unix + strip bitcoind Notes ----- -The release is built with GCC and then "strip bitcoin" to strip the debug +The release is built with GCC and then "strip bitcoind" to strip the debug symbols, which reduces the executable size by about 90%. diff --git a/doc/release-process.txt b/doc/release-process.txt index ff00b121fc..4d06627006 100644 --- a/doc/release-process.txt +++ b/doc/release-process.txt @@ -23,16 +23,16 @@ * perform gitian builds - * From a directory containing the bitcoin source, gitian-builder and bitcoin-gitian-sigs + * From a directory containing the bitcoin source, gitian-builder and gitian.sigs $ export VERSION=0.3.23 $ cd ./gitian-builder $ ./bin/gbuild --commit bitcoin=v$VERSION ../bitcoin/contrib/gitian-descriptors/gitian.yml - $ ./bin/gsign --signer (your gitian key, ie bluematt, sipa, etc) --release $VERSION --destination ../bitcoin-gitian-sigs/ ../bitcoin/contrib/gitian-descriptors/gitian.yml + $ ./bin/gsign --signer (your gitian key, ie bluematt, sipa, etc) --release $VERSION --destination ../gitian.sigs/ ../bitcoin/contrib/gitian-descriptors/gitian.yml $ cd build/out $ zip bitcoin-$VERSION-linux-gitian.zip * $ mv bitcoin-$VERSION-linux-gitian.zip ../../ $ ./bin/gbuild --commit bitcoin=v$VERSION ../bitcoin/contrib/gitian-descriptors/gitian-win32.yml - $ ./bin/gsign --signer (your gitian key, ie bluematt, sipa, etc) --release $VERSION-win32 --destination ../bitcoin-gitian-sigs/ ../bitcoin/contrib/gitian-descriptors/gitian-win32.yml + $ ./bin/gsign --signer (your gitian key, ie bluematt, sipa, etc) --release $VERSION-win32 --destination ../gitian.sigs/ ../bitcoin/contrib/gitian-descriptors/gitian-win32.yml $ cd build/out $ zip bitcoin-$VERSION-win32-gitian.zip * $ mv bitcoin-$VERSION-win32-gitian.zip ../../ @@ -40,7 +40,7 @@ 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 bitcoin-gitian-sigs/$VERSION[-win32]/(your gitian key)/ + 3. Gitian signatures (in gitian.sigs/$VERSION[-win32]/(your gitian key)/ * repackage gitian builds for release as stand-alone zip/tar/installer exe @@ -79,15 +79,15 @@ * Collect enough gitian signatures to meet minimum_weight (see contrib/gitian-downloader/*-download-config) - * From a directory containing bitcoin source, bitcoin-gitian-sigs and gitian zips + * From a directory containing bitcoin source, gitian.sigs and gitian zips $ export VERSION=0.3.23 $ mkdir bitcoin-$VERSION-win32-gitian; cd bitcoin-$VERSION-win32-gitian $ unzip ../bitcoin-$VERSION-win32-gitian.zip $ mkdir gitian $ cp ../bitcoin/contrib/gitian-downloader/*.pgp ./gitian/ - $ for file in `ls ../bitcoin-gitian-sigs/$VERSION-win32/`; do - $ cp ../bitcoin-gitian-sigs/$VERSION-win32/$file/bitcoin-build.assert ./gitian/$file-build.assert - $ cp ../bitcoin-gitian-sigs/$VERSION-win32/$file/bitcoin-build.assert.sig ./gitian/$file-build.assert.sig + $ for file in `ls ../gitian.sigs/$VERSION-win32/`; do + $ cp ../gitian.sigs/$VERSION-win32/$file/bitcoin-build.assert ./gitian/$file-build.assert + $ cp ../gitian.sigs/$VERSION-win32/$file/bitcoin-build.assert.sig ./gitian/$file-build.assert.sig $ done $ zip bitcoin-$VERSION-win32-gitian.zip * $ cp bitcoin-$VERSION-win32-gitian.zip ../ @@ -96,9 +96,9 @@ $ unzip ../bitcoin-$VERSION-linux-gitian.zip $ mkdir gitian $ cp ../bitcoin/contrib/gitian-downloader/*.pgp ./gitian/ - $ for file in `ls ../bitcoin-gitian-sigs/$VERSION/`; do - $ cp ../bitcoin-gitian-sigs/$VERSION/$file/bitcoin-build.assert ./gitian/$file-build.assert - $ cp ../bitcoin-gitian-sigs/$VERSION/$file/bitcoin-build.assert.sig ./gitian/$file-build.assert.sig + $ for file in `ls ../gitian.sigs/$VERSION/`; do + $ cp ../gitian.sigs/$VERSION/$file/bitcoin-build.assert ./gitian/$file-build.assert + $ cp ../gitian.sigs/$VERSION/$file/bitcoin-build.assert.sig ./gitian/$file-build.assert.sig $ done $ zip bitcoin-$VERSION-linux-gitian.zip * $ cp bitcoin-$VERSION-linux-gitian.zip ../ diff --git a/locale/cs/LC_MESSAGES/bitcoin.mo b/locale/cs/LC_MESSAGES/bitcoin.mo Binary files differdeleted file mode 100644 index 8b6e444b66..0000000000 --- a/locale/cs/LC_MESSAGES/bitcoin.mo +++ /dev/null diff --git a/locale/cs/LC_MESSAGES/bitcoin.po b/locale/cs/LC_MESSAGES/bitcoin.po deleted file mode 100644 index 2275d901bf..0000000000 --- a/locale/cs/LC_MESSAGES/bitcoin.po +++ /dev/null @@ -1,1079 +0,0 @@ -# This file is distributed under the same license as the Bitcoin package. -# xHire <xhire@mujmalysvet.cz>, 2011. -# -msgid "" -msgstr "" -"Project-Id-Version: \n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-08-16 15:51+0100\n" -"PO-Revision-Date: 2011-08-16 16:03+0100\n" -"Last-Translator: xHire <xhire@mujmalysvet.cz>\n" -"Language-Team: \n" -"Language: cs\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"X-Poedit-KeywordsList: _;gettext;gettext_noop\n" -"X-Poedit-Basepath: .\n" -"X-Poedit-SearchPath-0: ../../..\n" - -#: ../../../src/uibase.cpp:25 -#: ../../../src/ui.cpp:2985 -msgid "E&xit" -msgstr "&Konec" - -#: ../../../src/uibase.cpp:28 -msgid "&File" -msgstr "&Soubor" - -#: ../../../src/uibase.cpp:32 -msgid "&Your Receiving Addresses..." -msgstr "Tvá Bitcoinová &adresa..." - -#: ../../../src/uibase.cpp:35 -msgid "&Encrypt Wallet..." -msgstr "&Zašifruj peněženku..." - -#: ../../../src/uibase.cpp:38 -msgid "&Change Wallet Encryption Passphrase..." -msgstr "Změň &heslo pro šifrování peněženky..." - -#: ../../../src/uibase.cpp:42 -msgid "&Options..." -msgstr "M&ožnosti" - -#: ../../../src/uibase.cpp:45 -msgid "&Settings" -msgstr "Nas&tavení" - -#: ../../../src/uibase.cpp:49 -msgid "&About..." -msgstr "&O programu" - -#: ../../../src/uibase.cpp:52 -msgid "&Help" -msgstr "&Nápověda" - -#: ../../../src/uibase.cpp:61 -#: ../../../src/ui.cpp:2143 -#: ../../../src/ui.cpp:2148 -#: ../../../src/ui.cpp:2153 -#: ../../../src/ui.cpp:2202 -msgid "Send Coins" -msgstr "Pošli mince" - -#: ../../../src/uibase.cpp:62 -msgid "Address Book" -msgstr "Adresář" - -#: ../../../src/uibase.cpp:75 -msgid "Your Bitcoin Address:" -msgstr "Tvá Bitcoinová adresa:" - -#: ../../../src/uibase.cpp:82 -msgid " &New... " -msgstr " &Nová..." - -#: ../../../src/uibase.cpp:85 -#: ../../../src/uibase.cpp:790 -#: ../../../src/uibase.cpp:893 -msgid " &Copy to Clipboard " -msgstr " &Kopírovat do schránky" - -#: ../../../src/uibase.cpp:99 -msgid "Balance:" -msgstr "Stav účtu:" - -#: ../../../src/uibase.cpp:115 -msgid " All" -msgstr " Vše" - -#: ../../../src/uibase.cpp:115 -msgid " Sent" -msgstr " Odeslané" - -#: ../../../src/uibase.cpp:115 -msgid " Received" -msgstr " Přijaté" - -#: ../../../src/uibase.cpp:115 -msgid " In Progress" -msgstr " Pracuje se na tom" - -#: ../../../src/uibase.cpp:136 -msgid "All Transactions" -msgstr "Všechny transakce" - -#: ../../../src/uibase.cpp:147 -msgid "Sent/Received" -msgstr "Odeslané/Přijaté" - -#: ../../../src/uibase.cpp:158 -msgid "Sent" -msgstr "Odeslané" - -#: ../../../src/uibase.cpp:169 -msgid "Received" -msgstr "Přijaté" - -#: ../../../src/uibase.cpp:312 -#: ../../../src/uibase.cpp:453 -#: ../../../src/uibase.cpp:552 -#: ../../../src/uibase.cpp:732 -#: ../../../src/uibase.cpp:793 -#: ../../../src/uibase.cpp:902 -#: ../../../src/uibase.cpp:991 -msgid "OK" -msgstr "&Budiž" - -#: ../../../src/uibase.cpp:355 -msgid "&Start Bitcoin on system startup" -msgstr "&Spustit Bitcoin při startu systému" - -#: ../../../src/uibase.cpp:358 -msgid "&Minimize to the tray instead of the taskbar" -msgstr "&Minimalizovávat do ikony v panelu" - -#: ../../../src/uibase.cpp:361 -msgid "Map port using &UPnP" -msgstr "Namapovat port přes &UPnP" - -#: ../../../src/uibase.cpp:364 -msgid "M&inimize to the tray on close" -msgstr "Zavřením &minimalizovat do ikony" - -#: ../../../src/uibase.cpp:370 -msgid "&Connect through socks4 proxy (requires restart to apply): " -msgstr "&Připojit přes socks4 proxy (vyžaduje restart aplikace):" - -#: ../../../src/uibase.cpp:381 -msgid "Proxy &IP:" -msgstr "&IP adresa proxy:" - -#: ../../../src/uibase.cpp:389 -msgid " &Port:" -msgstr " &Port:" - -#: ../../../src/uibase.cpp:402 -msgid "Optional transaction fee per KB that helps make sure your transactions are processed quickly. Most transactions are 1KB. Fee 0.01 recommended." -msgstr "Dobrovolný transakční poplatek za každý započatý KB napomáhá tomu, aby tvé transakce byly rychle zpracovány. Většina transakcí má do 1 KB. Doporučená výše poplatku je 0.01." - -#: ../../../src/uibase.cpp:409 -msgid "Pay transaction fee:" -msgstr "Výše transakčního poplatku:" - -#: ../../../src/uibase.cpp:430 -msgid "// [don't translate] Test panel 2 for future expansion" -msgstr "" - -#: ../../../src/uibase.cpp:434 -msgid "// [don't translate] Let's not start multiple pages until the first page is filled up" -msgstr "" - -#: ../../../src/uibase.cpp:456 -#: ../../../src/uibase.cpp:678 -#: ../../../src/uibase.cpp:737 -#: ../../../src/uibase.cpp:796 -#: ../../../src/uibase.cpp:905 -#: ../../../src/uibase.cpp:994 -msgid "Cancel" -msgstr "&Zrušit" - -#: ../../../src/uibase.cpp:459 -msgid "&Apply" -msgstr "&Použít" - -#: ../../../src/uibase.cpp:518 -msgid "Bitcoin " -msgstr "Bitcoin" - -#: ../../../src/uibase.cpp:524 -msgid "version" -msgstr "verze" - -#: ../../../src/uibase.cpp:535 -msgid "" -"Copyright (c) 2009-2011 Bitcoin Developers\n" -"\n" -"This is experimental software.\n" -"\n" -"Distributed under the MIT/X11 software license, see the accompanying file \n" -"license.txt or http://www.opensource.org/licenses/mit-license.php.\n" -"\n" -"This product includes software developed by the OpenSSL Project for use in the \n" -"OpenSSL Toolkit (http://www.openssl.org/) and cryptographic software written by \n" -"Eric Young (eay@cryptsoft.com) and UPnP software written by Thomas Bernard." -msgstr "" -"Copyright (c) 2009-2011 Vývojáři Bitcoinu\n" -"\n" -"Tohle je experimentální program.\n" -"\n" -"Šířen pod licencí MIT/X11, viz přiložený soubor license.txt nebo \n" -"http://www.opensource.org/licenses/mit-license.php.\n" -"\n" -"Tento produkt zahrnuje programy vyvinuté OpenSSL Projektem pro použití \n" -"v OpenSSL Toolkitu (http://www.openssl.org/) a kryptografický program od \n" -"Erika Younga (eay@cryptsoft.com) a program UPnP od Thomase Bernarda." - -#: ../../../src/uibase.cpp:591 -msgid "Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)" -msgstr "Vlož Bitcoinovou adresu (např. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)" - -#: ../../../src/uibase.cpp:605 -msgid "Pay &To:" -msgstr "&Komu:" - -#: ../../../src/uibase.cpp:620 -msgid "&Paste" -msgstr "&Vložit" - -#: ../../../src/uibase.cpp:623 -msgid " Address &Book..." -msgstr " &Adresář..." - -#: ../../../src/uibase.cpp:630 -msgid "&Amount:" -msgstr "&Částka" - -#: ../../../src/uibase.cpp:640 -msgid "T&ransfer:" -msgstr "&Převod:" - -#: ../../../src/uibase.cpp:646 -msgid " Standard" -msgstr " Standard" - -#: ../../../src/uibase.cpp:673 -msgid "&Send" -msgstr "&Poslat" - -#: ../../../src/uibase.cpp:721 -msgid "" -"\n" -"\n" -"Connecting..." -msgstr "" -"\n" -"\n" -"Připojuji..." - -#: ../../../src/uibase.cpp:771 -msgid "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. The highlighted address is displayed in the main window." -msgstr "Tohle jsou tvé Bitcoinové adresy na příjem plateb. Asi budeš chtít dát jinou adresu každému odesílateli, abys věděl, kdo ti kolik platil. Označená adresa bude zobrazena v hlavním okně." - -#: ../../../src/uibase.cpp:784 -#: ../../../src/uibase.cpp:896 -msgid "&Edit..." -msgstr "&Upravit..." - -#: ../../../src/uibase.cpp:787 -#: ../../../src/uibase.cpp:899 -msgid " &New Address... " -msgstr " &Nová adresa..." - -#: ../../../src/uibase.cpp:847 -#: ../../../src/ui.cpp:2620 -msgid "Bitcoin Address" -msgstr "Bitcoinová adresa" - -#: ../../../src/uibase.cpp:859 -msgid "Sending" -msgstr "Cizí adresy (pro odesílání)" - -#: ../../../src/uibase.cpp:867 -msgid "These are your Bitcoin addresses for receiving payments. You can give a different one to each sender to keep track of who is paying you. The highlighted address will be displayed in the main window." -msgstr "Tohle jsou tvé Bitcoinové adresy na příjem plateb. Můžeš dát jinou adresu každému odesílateli, abys věděl, kdo ti kolik platil. Označená adresa bude zobrazena v hlavním okně." - -#: ../../../src/uibase.cpp:880 -msgid "Receiving" -msgstr "Tvoje adresy (pro příjem)" - -#: ../../../src/uibase.cpp:890 -msgid "&Delete" -msgstr "&Smazat" - -#: ../../../src/rpc.cpp:2088 -#: ../../../src/rpc.cpp:2090 -#, c-format -msgid "To use the %s option" -msgstr "Pro použití volby %s" - -#: ../../../src/rpc.cpp:2092 -#, c-format -msgid "" -"Warning: %s, you must set rpcpassword=<password>\n" -"in the configuration file: %s\n" -"If the file does not exist, create it with owner-readable-only file permissions.\n" -msgstr "" -"Varování: %s, musíš nastavit rpcpassword=<heslo>\n" -"v konfiguračním souboru: %s\n" -"Pokud tenhle soubor neexistuje, vytvoř ho s oprávněním pro čtení pouze pro vlastníka.\n" - -#: ../../../src/rpc.cpp:2265 -#, c-format -msgid "" -"You must set rpcpassword=<password> in the configuration file:\n" -"%s\n" -"If the file does not exist, create it with owner-readable-only file permissions." -msgstr "" -"Musíš nastavit rpcpassword=<heslo> v konfiguračním souboru:\n" -"%s\n" -"Pokud tenhle soubor neexistuje, vytvoř ho s oprávněním pro čtení pouze pro vlastníka." - -#: ../../../src/util.cpp:870 -msgid "Warning: Please check that your computer's date and time are correct. If your clock is wrong Bitcoin will not work properly." -msgstr "Varování: Prosím zkontroluj, že datum a čas jsou na tvém počítači správně nastaveny. Pokud jsou nastaveny špatně, Bitcoin nebude fungovat správně." - -#: ../../../src/util.cpp:904 -msgid "beta" -msgstr "beta" - -#: ../../../src/wallet.cpp:1084 -msgid "Error: Wallet locked, unable to create transaction " -msgstr "Chyba: Peněženka je zamčená, takže není možné vytvořit transakci" - -#: ../../../src/wallet.cpp:1092 -#, c-format -msgid "Error: This transaction requires a transaction fee of at least %s because of its amount, complexity, or use of recently received funds " -msgstr "Chyba: Tato transakce vyžaduje transakční poplatek nejméně %s kvůli svému objemu, komplexnosti nebo utrácení nedávno přijaté hotovosti" - -#: ../../../src/wallet.cpp:1094 -msgid "Error: Transaction creation failed " -msgstr "Chyba: Vytvoření transakce selhalo" - -#: ../../../src/wallet.cpp:1100 -#: ../../../src/ui.cpp:2176 -#: ../../../src/ui.cpp:2185 -#: ../../../src/ui.cpp:2336 -#: ../../../src/ui.cpp:2500 -msgid "Sending..." -msgstr "Posílám..." - -#: ../../../src/wallet.cpp:1104 -msgid "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." -msgstr "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." - -#: ../../../src/wallet.cpp:1117 -msgid "Invalid amount" -msgstr "Neplatná částka" - -#: ../../../src/wallet.cpp:1119 -#: ../../../src/ui.cpp:2403 -#: ../../../src/ui.cpp:2474 -msgid "Insufficient funds" -msgstr "Nedostatek peněz" - -#: ../../../src/ui.cpp:217 -#, c-format -msgid "This transaction is over the size limit. You can still send it for a fee of %s, which goes to the nodes that process your transaction and helps to support the network. Do you want to pay the fee?" -msgstr "Tahle transakce přesahuje velikostní limit. Pořád ji ale můžeš poslat, pokud za ni zaplatíš poplatek %s, který půjde uzlům, které tvou transakci zpracují, a navíc tak podpoříš síť. Chceš zaplatit poplatek?" - -#: ../../../src/ui.cpp:261 -#: ../../../src/ui.cpp:1247 -msgid "Enter the current passphrase to the wallet." -msgstr "Zadej platné heslo pro peněženku." - -#: ../../../src/ui.cpp:262 -#: ../../../src/ui.cpp:1183 -#: ../../../src/ui.cpp:1200 -#: ../../../src/ui.cpp:1248 -#: ../../../src/ui.cpp:1274 -#: ../../../src/ui.cpp:1294 -msgid "Passphrase" -msgstr "Heslo" - -#: ../../../src/ui.cpp:268 -msgid "Please supply the current wallet decryption passphrase." -msgstr "Zadej platné heslo pro dešifrování peněženky." - -#: ../../../src/ui.cpp:276 -#: ../../../src/ui.cpp:1259 -#: ../../../src/ui.cpp:1316 -msgid "The passphrase entered for the wallet decryption was incorrect." -msgstr "Nezadal jsi správné heslo pro dešifrování peněženky." - -#: ../../../src/ui.cpp:353 -msgid "Status" -msgstr "Stav" - -#: ../../../src/ui.cpp:354 -msgid "Date" -msgstr "Datum" - -#: ../../../src/ui.cpp:355 -msgid "Description" -msgstr "Popis" - -#: ../../../src/ui.cpp:356 -msgid "Debit" -msgstr "Výdaje" - -#: ../../../src/ui.cpp:357 -msgid "Credit" -msgstr "Příjmy" - -#: ../../../src/ui.cpp:568 -#, c-format -msgid "Open for %d blocks" -msgstr "Otevřeno pro %d bloků" - -#: ../../../src/ui.cpp:570 -#, c-format -msgid "Open until %s" -msgstr "Otřevřeno dokud %s" - -#: ../../../src/ui.cpp:576 -#, c-format -msgid "%d/offline?" -msgstr "%d/offline?" - -#: ../../../src/ui.cpp:578 -#, c-format -msgid "%d/unconfirmed" -msgstr "%d/nepotvrzeno" - -#: ../../../src/ui.cpp:580 -#, c-format -msgid "%d confirmations" -msgstr "%d potvrzení" - -#: ../../../src/ui.cpp:665 -msgid "Generated" -msgstr "Vygenerováno" - -#: ../../../src/ui.cpp:673 -#, c-format -msgid "Generated (%s matures in %d more blocks)" -msgstr "Vygenerováno (%s dozraje po %d blocích)" - -#: ../../../src/ui.cpp:677 -msgid "Generated - Warning: This block was not received by any other nodes and will probably not be accepted!" -msgstr "Vygenerovaný - Varování: Tehnle blok nebyl obdržen žádným jiným uzlem a pravděpodobně nebude akceptován!" - -#: ../../../src/ui.cpp:681 -msgid "Generated (not accepted)" -msgstr "Vygenerováno (neakceptováno)" - -#: ../../../src/ui.cpp:691 -msgid "From: " -msgstr "Od: " - -#: ../../../src/ui.cpp:715 -msgid "Received with: " -msgstr "Přijato adresou: " - -#: ../../../src/ui.cpp:760 -msgid "Payment to yourself" -msgstr "Platba pro sebe sama" - -#: ../../../src/ui.cpp:794 -msgid "To: " -msgstr "Pro: " - -#: ../../../src/ui.cpp:1109 -msgid " Generating" -msgstr " Generuji" - -#: ../../../src/ui.cpp:1111 -msgid "(not connected)" -msgstr "(nepřipojen)" - -#: ../../../src/ui.cpp:1114 -#, c-format -msgid " %d connections %d blocks %d transactions" -msgstr " %d spojení %d bloků %d transakcí" - -#: ../../../src/ui.cpp:1171 -msgid "Wallet already encrypted." -msgstr "Peněženka je už zašifrovaná." - -#: ../../../src/ui.cpp:1182 -msgid "" -"Enter the new passphrase to the wallet.\n" -"Please use a passphrase of 10 or more random characters, or eight or more words." -msgstr "" -"Zadej nové heslo pro peněženku.\n" -"Použij alespoň 10 náhodných znaků nebo alespoň 8 slov." - -#: ../../../src/ui.cpp:1189 -#: ../../../src/ui.cpp:1282 -msgid "Error: The supplied passphrase was too short." -msgstr "Chyba: Zadané heslo je příliš krátké." - -#: ../../../src/ui.cpp:1193 -msgid "" -"WARNING: If you encrypt your wallet and lose your passphrase, you will LOSE ALL OF YOUR BITCOINS!\n" -"Are you sure you wish to encrypt your wallet?" -msgstr "" -"VAROVÁNÍ: Pokud zašifruješ peněženku a ztratíš či zapomeneš heslo, PŘIJDEŠ O VŠECHNY BITCOINY!\n" -"Jsi si jistý, že chceš peněženku zašifrovat?" - -#: ../../../src/ui.cpp:1199 -msgid "Please re-enter your new wallet passphrase." -msgstr "Zadej ještě jednou nové heslo pro peněženku." - -#: ../../../src/ui.cpp:1208 -#: ../../../src/ui.cpp:1304 -msgid "Error: the supplied passphrases didn't match." -msgstr "Chyba: zadaná hesla nejsou shodná." - -#: ../../../src/ui.cpp:1218 -msgid "Wallet encryption failed." -msgstr "Zašifrování peněženky selhalo." - -#: ../../../src/ui.cpp:1225 -msgid "" -"Wallet Encrypted.\n" -"Remember that encrypting your wallet cannot fully protect your bitcoins from being stolen by malware infecting your computer." -msgstr "" -"Peněženka je zašifrována.\n" -"Pamatuj, že pouhé šifrování peněženky nemůže plně ochránit tvé bitcoiny před krádeží malwarem, kterým se může počítač nakazit." - -#: ../../../src/ui.cpp:1236 -msgid "Wallet is unencrypted, please encrypt it first." -msgstr "Peněženka není zašifrovaná, musíš ji prvně zašifrovat." - -#: ../../../src/ui.cpp:1273 -msgid "Enter the new passphrase for the wallet." -msgstr "Zadej nové heslo pro peněženku." - -#: ../../../src/ui.cpp:1293 -msgid "Re-enter the new passphrase for the wallet." -msgstr "Zadej ještě jednou nové heslo pro peněženku." - -#: ../../../src/ui.cpp:1325 -msgid "Wallet Passphrase Changed." -msgstr "Heslo peněženky bylo změněno." - -#: ../../../src/ui.cpp:1382 -#: ../../../src/ui.cpp:2815 -msgid "New Receiving Address" -msgstr "Nová Bitcoinová adresa" - -#: ../../../src/ui.cpp:1383 -#: ../../../src/ui.cpp:2816 -msgid "" -"You should use a new address for each payment you receive.\n" -"\n" -"Label" -msgstr "" -"Měl bys vždy použít novou adresu pro každou platbu, kterou přijímáš.\n" -"\n" -"Označení" - -#: ../../../src/ui.cpp:1467 -msgid "<b>Status:</b> " -msgstr "<b>Stav:</b> " - -#: ../../../src/ui.cpp:1472 -msgid ", has not been successfully broadcast yet" -msgstr ", ještě nebylo rozesláno" - -#: ../../../src/ui.cpp:1474 -#, c-format -msgid ", broadcast through %d node" -msgstr ", rozesláno přes %d uzel" - -#: ../../../src/ui.cpp:1476 -#, c-format -msgid ", broadcast through %d nodes" -msgstr ", rozesláno přes %d uzlů" - -#: ../../../src/ui.cpp:1480 -msgid "<b>Date:</b> " -msgstr "<b>Datum:</b> " - -#: ../../../src/ui.cpp:1488 -msgid "<b>Source:</b> Generated<br>" -msgstr "<b>Zdroj:</b> Vygenerováno<br>" - -#: ../../../src/ui.cpp:1494 -#: ../../../src/ui.cpp:1511 -msgid "<b>From:</b> " -msgstr "<b>Od:</b> " - -#: ../../../src/ui.cpp:1511 -msgid "unknown" -msgstr "neznámo" - -#: ../../../src/ui.cpp:1512 -#: ../../../src/ui.cpp:1536 -#: ../../../src/ui.cpp:1595 -msgid "<b>To:</b> " -msgstr "<b>Pro:</b> " - -#: ../../../src/ui.cpp:1515 -msgid " (yours, label: " -msgstr " (tvoje, označení: " - -#: ../../../src/ui.cpp:1517 -msgid " (yours)" -msgstr " (tvoje)" - -#: ../../../src/ui.cpp:1554 -#: ../../../src/ui.cpp:1566 -#: ../../../src/ui.cpp:1612 -#: ../../../src/ui.cpp:1629 -msgid "<b>Credit:</b> " -msgstr "<b>Příjem:</b> " - -#: ../../../src/ui.cpp:1556 -#, c-format -msgid "(%s matures in %d more blocks)" -msgstr "(%s dozraje po %d blocích)" - -#: ../../../src/ui.cpp:1558 -msgid "(not accepted)" -msgstr "(neakceptováno)" - -#: ../../../src/ui.cpp:1603 -#: ../../../src/ui.cpp:1611 -#: ../../../src/ui.cpp:1626 -msgid "<b>Debit:</b> " -msgstr "<b>Výdaj:</b> " - -#: ../../../src/ui.cpp:1617 -msgid "<b>Transaction fee:</b> " -msgstr "<b>Transakční poplatek:</b> " - -#: ../../../src/ui.cpp:1633 -msgid "<b>Net amount:</b> " -msgstr "<b>Čistá částka:</b> " - -#: ../../../src/ui.cpp:1640 -msgid "Message:" -msgstr "Zpráva:" - -#: ../../../src/ui.cpp:1642 -msgid "Comment:" -msgstr "Komentář:" - -#: ../../../src/ui.cpp:1645 -msgid "Generated coins must wait 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, it will change to \"not accepted\" and not be spendable. This may occasionally happen if another node generates a block within a few seconds of yours." -msgstr "Vygenerované mince musí čekat 120 bloků, než mohou být utraceny. Když jsi vygeneroval tenhle blok, tak byl rozposlán do sítě, aby byl přidán do řetězce bloků. Pokud se mu nepodaří dostat se do řetězce, změní se na \"neakceptovaný\" a nebude utratitelný. To se občas může přihodit, pokud jiný uzel vygeneruje blok zhruba ve stejném okamžiku jako ty." - -#: ../../../src/ui.cpp:1825 -msgid "Cannot write autostart/bitcoin.desktop file" -msgstr "Nemohu zapisovat do souboru autostart/bitcoin.desktop" - -#: ../../../src/ui.cpp:1861 -msgid "Main" -msgstr "Hlavní" - -#: ../../../src/ui.cpp:1871 -msgid "&Start Bitcoin on window system startup" -msgstr "&Spustit Bitcoin při startu okenního systému" - -#: ../../../src/ui.cpp:1878 -msgid "&Minimize on close" -msgstr "&Zavřením pouze skrýt" - -#: ../../../src/ui.cpp:2020 -#, c-format -msgid "version %s" -msgstr "verze %s" - -#: ../../../src/ui.cpp:2143 -msgid "Error in amount " -msgstr "Chyba v částce" - -#: ../../../src/ui.cpp:2148 -msgid "Amount exceeds your balance " -msgstr "Částka překračuje stav účtu" - -#: ../../../src/ui.cpp:2153 -msgid "Total exceeds your balance when the " -msgstr "Celková částka přesahuje stav tvého účtu, když " - -#: ../../../src/ui.cpp:2153 -msgid " transaction fee is included " -msgstr " transakční poplatek je zahrnut" - -#: ../../../src/ui.cpp:2176 -msgid "Payment sent " -msgstr "Platba odeslána" - -#: ../../../src/ui.cpp:2202 -msgid "Invalid address " -msgstr "Neplatná adresa" - -#: ../../../src/ui.cpp:2257 -#, c-format -msgid "Sending %s to %s" -msgstr "Posílám %s %s" - -#: ../../../src/ui.cpp:2330 -#: ../../../src/ui.cpp:2363 -msgid "CANCELLED" -msgstr "ZRUŠENO" - -#: ../../../src/ui.cpp:2334 -msgid "Cancelled" -msgstr "Zrušeno" - -#: ../../../src/ui.cpp:2336 -msgid "Transfer cancelled " -msgstr "Převod zrušen" - -#: ../../../src/ui.cpp:2389 -msgid "Error: " -msgstr "Chyba: " - -#: ../../../src/ui.cpp:2408 -msgid "Connecting..." -msgstr "Připojuji..." - -#: ../../../src/ui.cpp:2413 -msgid "Unable to connect" -msgstr "Nemohu se připojit" - -#: ../../../src/ui.cpp:2418 -msgid "Requesting public key..." -msgstr "Požaduji veřejný klíč..." - -#: ../../../src/ui.cpp:2430 -msgid "Received public key..." -msgstr "Přijat veřejný klíč..." - -#: ../../../src/ui.cpp:2444 -msgid "Recipient is not accepting transactions sent by IP address" -msgstr "Příjemce neakceptuje transakce poslané IP adresou" - -#: ../../../src/ui.cpp:2446 -msgid "Transfer was not accepted" -msgstr "Převod nebyl akceptován" - -#: ../../../src/ui.cpp:2455 -msgid "Invalid response received" -msgstr "Přišla neplatná odpověď" - -#: ../../../src/ui.cpp:2470 -msgid "Creating transaction..." -msgstr "Vytvářím transakci..." - -#: ../../../src/ui.cpp:2489 -#, c-format -msgid "This transaction requires a transaction fee of at least %s because of its amount, complexity, or use of recently received funds" -msgstr "Tato transakce vyžaduje transakční poplatek nejméně %s kvůli svému objemu, komplexnosti nebo utrácení nedávno přijaté hotovosti" - -#: ../../../src/ui.cpp:2491 -msgid "Transaction creation failed" -msgstr "Vytvoření transakce selhalo" - -#: ../../../src/ui.cpp:2502 -msgid "Transaction aborted" -msgstr "Transakce zrušena" - -#: ../../../src/ui.cpp:2510 -msgid "Lost connection, transaction cancelled" -msgstr "Spojení se ztratilo, takže transakce byla zrušena" - -#: ../../../src/ui.cpp:2526 -msgid "Sending payment..." -msgstr "Posílám platbu..." - -#: ../../../src/ui.cpp:2532 -msgid "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." -msgstr "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." - -#: ../../../src/ui.cpp:2541 -msgid "Waiting for confirmation..." -msgstr "Čekám na potvrzení..." - -#: ../../../src/ui.cpp:2559 -msgid "" -"The payment was sent, but the recipient was unable to verify it.\n" -"The transaction is recorded and will credit to the recipient,\n" -"but the comment information will be blank." -msgstr "" -"Platba byla poslána, ale příjemce není schopen ji ověřit.\n" -"Transakce je zaznamenána a bude připsána příjemci,\n" -"ale poznámka u platby bude prázdná." - -#: ../../../src/ui.cpp:2568 -msgid "Payment was sent, but an invalid response was received" -msgstr "Platba byla odeslána, ale přišla neplatná odpověď" - -#: ../../../src/ui.cpp:2574 -msgid "Payment completed" -msgstr "Platba je kompletní" - -#: ../../../src/ui.cpp:2616 -#: ../../../src/ui.cpp:2763 -#: ../../../src/ui.cpp:2803 -msgid "Name" -msgstr "Jméno" - -#: ../../../src/ui.cpp:2617 -#: ../../../src/ui.cpp:2763 -#: ../../../src/ui.cpp:2803 -msgid "Address" -msgstr "Adresa" - -#: ../../../src/ui.cpp:2619 -#: ../../../src/ui.cpp:2775 -msgid "Label" -msgstr "Označení" - -#: ../../../src/ui.cpp:2745 -msgid "This is one of your own addresses for receiving payments and cannot be entered in the address book. " -msgstr "Tohle je jedna z tvých vlastních adres pro příjem plateb a nemůže být zadána do adresáře." - -#: ../../../src/ui.cpp:2763 -#: ../../../src/ui.cpp:2769 -msgid "Edit Address" -msgstr "Upravit adresu" - -#: ../../../src/ui.cpp:2775 -msgid "Edit Address Label" -msgstr "Upravit označení adresy" - -#: ../../../src/ui.cpp:2803 -#: ../../../src/ui.cpp:2809 -msgid "Add Address" -msgstr "Přidat adresu" - -#: ../../../src/ui.cpp:2897 -msgid "Bitcoin" -msgstr "Bitcoin" - -#: ../../../src/ui.cpp:2899 -msgid "Bitcoin - Generating" -msgstr "Bitcoin - Generování" - -#: ../../../src/ui.cpp:2901 -msgid "Bitcoin - (not connected)" -msgstr "Bitcoin - (nepřipojen)" - -#: ../../../src/ui.cpp:2980 -msgid "&Open Bitcoin" -msgstr "&Otevřít Bitcoin" - -#: ../../../src/ui.cpp:2981 -msgid "&Send Bitcoins" -msgstr "&Poslat Bitcoiny" - -#: ../../../src/ui.cpp:2982 -msgid "O&ptions..." -msgstr "&Možnosti..." - -#: ../../../src/ui.cpp:3211 -msgid "Program has crashed and will terminate. " -msgstr "Program havaroval a bude ukončen." - -#: ../../../src/init.cpp:163 -msgid "Bitcoin version" -msgstr "Bitcoin verze" - -#: ../../../src/init.cpp:164 -msgid "Usage:" -msgstr "Užití:" - -#: ../../../src/init.cpp:166 -msgid "Send command to -server or bitcoind\n" -msgstr "Poslat příkaz pro -server nebo bitcoind\n" - -#: ../../../src/init.cpp:167 -msgid "List commands\n" -msgstr "Výpis příkazů\n" - -#: ../../../src/init.cpp:168 -msgid "Get help for a command\n" -msgstr "Získat nápovědu pro příkaz\n" - -#: ../../../src/init.cpp:169 -msgid "Options:\n" -msgstr "Možnosti:\n" - -#: ../../../src/init.cpp:170 -msgid "Specify configuration file (default: bitcoin.conf)\n" -msgstr "Konfigurační soubor (výchozí: bitcoin.conf)\n" - -#: ../../../src/init.cpp:171 -msgid "Specify pid file (default: bitcoind.pid)\n" -msgstr "PID soubor (výchozí: bitcoind.pid)\n" - -#: ../../../src/init.cpp:172 -msgid "Generate coins\n" -msgstr "Generovat mince\n" - -#: ../../../src/init.cpp:173 -msgid "Don't generate coins\n" -msgstr "Negenerovat mince\n" - -#: ../../../src/init.cpp:174 -msgid "Start minimized\n" -msgstr "Startovat minimalizovaně\n" - -#: ../../../src/init.cpp:175 -msgid "Specify data directory\n" -msgstr "Adresář pro data\n" - -#: ../../../src/init.cpp:176 -msgid "Specify connection timeout (in milliseconds)\n" -msgstr "Zadej časový limit spojení (v milisekundách)\n" - -#: ../../../src/init.cpp:177 -msgid "Connect through socks4 proxy\n" -msgstr "Připojovat se skrz socks4 proxy\n" - -#: ../../../src/init.cpp:178 -msgid "Allow DNS lookups for addnode and connect\n" -msgstr "Povolit DNS dotazy pro addnode (přidání uzlu) a connect (připojení)\n" - -#: ../../../src/init.cpp:179 -msgid "Add a node to connect to\n" -msgstr "Přidat uzel, ke kterému se připojit\n" - -#: ../../../src/init.cpp:180 -msgid "Connect only to the specified node\n" -msgstr "Připojovat se pouze k udanému uzlu\n" - -#: ../../../src/init.cpp:181 -msgid "Don't accept connections from outside\n" -msgstr "Nepřijímat připojení zvenčí\n" - -#: ../../../src/init.cpp:184 -msgid "Don't attempt to use UPnP to map the listening port\n" -msgstr "Nesnažit se použít UPnP k namapování naslouchacího portu\n" - -#: ../../../src/init.cpp:186 -msgid "Attempt to use UPnP to map the listening port\n" -msgstr "Snažit se použít UPnP k namapování naslouchacího portu\n" - -#: ../../../src/init.cpp:189 -msgid "Fee per KB to add to transactions you send\n" -msgstr "Poplatek za KB, který se přidá ke každé odeslané transakci\n" - -#: ../../../src/init.cpp:191 -msgid "Accept command line and JSON-RPC commands\n" -msgstr "Akceptovat příkazy z příkazové řádky a přes JSON-RPC\n" - -#: ../../../src/init.cpp:194 -msgid "Run in the background as a daemon and accept commands\n" -msgstr "Běžet na pozadí jako démon a akceptovat příkazy\n" - -#: ../../../src/init.cpp:196 -msgid "Use the test network\n" -msgstr "Použít testovací síť\n" - -#: ../../../src/init.cpp:197 -msgid "Username for JSON-RPC connections\n" -msgstr "Uživatelské jméno pro JSON-RPC spojení\n" - -#: ../../../src/init.cpp:198 -msgid "Password for JSON-RPC connections\n" -msgstr "Heslo pro JSON-RPC spojení\n" - -#: ../../../src/init.cpp:199 -msgid "Listen for JSON-RPC connections on <port> (default: 8332)\n" -msgstr "Čekat na JSON-RPC spojení na <portu> (výchozí: 8332)\n" - -#: ../../../src/init.cpp:200 -msgid "Allow JSON-RPC connections from specified IP address\n" -msgstr "Povolit JSON-RPC spojení ze specifikované IP adresy\n" - -#: ../../../src/init.cpp:201 -msgid "Send commands to node running on <ip> (default: 127.0.0.1)\n" -msgstr "Posílat příkazy uzlu běžícím na <ip> (výchozí: 127.0.0.1)\n" - -#: ../../../src/init.cpp:202 -msgid "Set key pool size to <n> (default: 100)\n" -msgstr "Nastavit zásobník klíčů na velikost <n> (výchozí: 100)\n" - -#: ../../../src/init.cpp:203 -msgid "Rescan the block chain for missing wallet transactions\n" -msgstr "Přeskenovat řetězec bloků na chybějící transakce peněženky\n" - -#: ../../../src/init.cpp:207 -msgid "" -"\n" -"SSL options: (see the Bitcoin Wiki for SSL setup instructions)\n" -msgstr "" -"\n" -"Možnosti SSL: (viz instrukce nastavení SSL v Bitcoin Wiki)\n" - -#: ../../../src/init.cpp:208 -msgid "Use OpenSSL (https) for JSON-RPC connections\n" -msgstr "Použít OpenSSL (https) pro JSON-RPC spojení\n" - -#: ../../../src/init.cpp:209 -msgid "Server certificate file (default: server.cert)\n" -msgstr "Soubor se serverovým certifikátem (výchozí: server.cert)\n" - -#: ../../../src/init.cpp:210 -msgid "Server private key (default: server.pem)\n" -msgstr "Soubor se serverovým soukromým klíčem (výchozí: server.pem)\n" - -#: ../../../src/init.cpp:211 -msgid "Acceptable ciphers (default: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH)\n" -msgstr "Akceptovatelné šifry (výchozí: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH)\n" - -#: ../../../src/init.cpp:215 -msgid "This help message\n" -msgstr "Tato nápověda\n" - -#: ../../../src/init.cpp:353 -#, c-format -msgid "Cannot obtain a lock on data directory %s. Bitcoin is probably already running." -msgstr "Nedaří se mi získat zámek na datový adresář %s. Bitcoin pravděpodobně už jednou běží." - -#: ../../../src/init.cpp:379 -msgid "Error loading addr.dat \n" -msgstr "Chyba při načítání addr.dat \n" - -#: ../../../src/init.cpp:385 -msgid "Error loading blkindex.dat \n" -msgstr "Chyba při načítání blkindex.dat \n" - -#: ../../../src/init.cpp:396 -msgid "Error loading wallet.dat: Wallet corrupted \n" -msgstr "Chyba při načítání wallet.dat: peněženka je poškozená \n" - -#: ../../../src/init.cpp:398 -msgid "Error loading wallet.dat: Wallet requires newer version of Bitcoin \n" -msgstr "Chyba při načítání wallet.dat: peněženka vyžaduje novější verzi Bitcoinu \n" - -#: ../../../src/init.cpp:400 -msgid "Error loading wallet.dat \n" -msgstr "Chyba při načítání wallet.dat \n" - -#: ../../../src/init.cpp:489 -msgid "Invalid -proxy address" -msgstr "Neplatná -proxy adresa" - -#: ../../../src/init.cpp:514 -msgid "Invalid amount for -paytxfee=<amount>" -msgstr "Neplatná částka pro -paytxfee=<částka>" - -#: ../../../src/init.cpp:518 -msgid "Warning: -paytxfee is set very high. This is the transaction fee you will pay if you send a transaction." -msgstr "Varování: -paytxfee je nastaveno velmi vysoko. Toto je transakční poplatek, který zaplatíš za každou poslanou transakci." - -#: ../../../src/net.cpp:1622 -#, c-format -msgid "Unable to bind to port %d on this computer. Bitcoin is probably already running." -msgstr "Nedaří se mi připojit na port %d na tomhle počítači. Bitcoin už pravděpodobně jednou běží." - -#: ../../../src/main.cpp:1437 -msgid "Warning: Disk space is low " -msgstr "Upozornění: Na disku je málo místa" - -#: ../../../src/uibase.h:151 -msgid "Transaction Details" -msgstr "Detaily transakce" - -#: ../../../src/uibase.h:203 -msgid "Options" -msgstr "Možnosti" - -#: ../../../src/uibase.h:232 -msgid "About Bitcoin" -msgstr "O Bitcoinu" - -#: ../../../src/uibase.h:341 -msgid "Your Bitcoin Addresses" -msgstr "Tvá Bitcoinová adresa" - -#~ msgid "Invalid bitcoin address" -#~ msgstr "Neplatná Bitcoinová adresa" diff --git a/locale/de/LC_MESSAGES/bitcoin.mo b/locale/de/LC_MESSAGES/bitcoin.mo Binary files differdeleted file mode 100644 index bd03fd27c3..0000000000 --- a/locale/de/LC_MESSAGES/bitcoin.mo +++ /dev/null diff --git a/locale/de/LC_MESSAGES/bitcoin.po b/locale/de/LC_MESSAGES/bitcoin.po deleted file mode 100644 index 59381c11e6..0000000000 --- a/locale/de/LC_MESSAGES/bitcoin.po +++ /dev/null @@ -1,1081 +0,0 @@ -# Jakob Kramer <censored@gmail.com>, 2011. -msgid "" -msgstr "" -"Project-Id-Version: \n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-08-07 01:46+0100\n" -"PO-Revision-Date: 2011-08-07 01:47+0100\n" -"Last-Translator: Michael Bemmerl <mail@mx-server.de>\n" -"Language-Team: German <translation-team-de@lists.sourceforge.net>\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Language: de\n" -"Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Generator: Virtaal 0.6.1\n" -"X-Poedit-KeywordsList: _;gettext;gettext_noop\n" -"X-Poedit-Basepath: .\n" -"X-Poedit-SearchPath-0: ../../..\n" - -#: ../../../src/init.cpp:162 -msgid "Bitcoin version" -msgstr "Bitcoin Version" - -#: ../../../src/init.cpp:163 -msgid "Usage:" -msgstr "Verwendung:" - -#: ../../../src/init.cpp:165 -msgid "Send command to -server or bitcoind\n" -msgstr "Sende Befehl zu -server oder bitcoind\n" - -#: ../../../src/init.cpp:166 -msgid "List commands\n" -msgstr "Liste Befehle auf\n" - -#: ../../../src/init.cpp:167 -msgid "Get help for a command\n" -msgstr "Hilfe für einen Befehl erhalten\n" - -#: ../../../src/init.cpp:168 -msgid "Options:\n" -msgstr "Optionen:\n" - -#: ../../../src/init.cpp:169 -msgid "Specify configuration file (default: bitcoin.conf)\n" -msgstr "Konfigurationsdatei bestimmen (Standard: bitcoin.conf)\n" - -#: ../../../src/init.cpp:170 -msgid "Specify pid file (default: bitcoind.pid)\n" -msgstr "pid-Datei bestimmen (Standard: bitcoind.pid)\n" - -#: ../../../src/init.cpp:171 -msgid "Generate coins\n" -msgstr "Münzen erzeugen\n" - -#: ../../../src/init.cpp:172 -msgid "Don't generate coins\n" -msgstr "Keine Münzen erzeugen\n" - -#: ../../../src/init.cpp:173 -msgid "Start minimized\n" -msgstr "Minimiert starten\n" - -#: ../../../src/init.cpp:174 -msgid "Specify data directory\n" -msgstr "Datenverzeichnis festlegen\n" - -#: ../../../src/init.cpp:175 -msgid "Specify connection timeout (in milliseconds)\n" -msgstr "Verbindungs-Timeout in Milisekunden\n" - -#: ../../../src/init.cpp:176 -msgid "Connect through socks4 proxy\n" -msgstr "Socks4-Proxy verwenden\n" - -#: ../../../src/init.cpp:177 -msgid "Allow DNS lookups for addnode and connect\n" -msgstr "DNS-Auflösung für addnode und connect erlauben\n" - -#: ../../../src/init.cpp:178 -msgid "Add a node to connect to\n" -msgstr "Einen Teilnehmer hinzufügen, zu dem verbunden werden soll\n" - -#: ../../../src/init.cpp:179 -msgid "Connect only to the specified node\n" -msgstr "Nur zu dem angegebenen Teilnehmer verbinden\n" - -#: ../../../src/init.cpp:180 -msgid "Don't accept connections from outside\n" -msgstr "Akzeptiere keine externen Verbindungen\n" - -#: ../../../src/init.cpp:183 -msgid "Don't attempt to use UPnP to map the listening port\n" -msgstr "Versuche nicht, UPnP zur Portweiterleitung zu nutzen\n" - -#: ../../../src/init.cpp:185 -msgid "Attempt to use UPnP to map the listening port\n" -msgstr "Versuche, UPnP zur Portweiterleitung zu nutzen\n" - -#: ../../../src/init.cpp:188 -msgid "Fee per KB to add to transactions you send\n" -msgstr "Gebühr pro KB für Überweisungen, die Sie tätigen\n" - -#: ../../../src/init.cpp:190 -msgid "Accept command line and JSON-RPC commands\n" -msgstr "Akzeptiere Kommandozeile und JSON-RPC-Befehle\n" - -#: ../../../src/init.cpp:193 -msgid "Run in the background as a daemon and accept commands\n" -msgstr "Laufe im Hintergrund als Daemon und akzeptiere Befehle\n" - -#: ../../../src/init.cpp:195 -msgid "Use the test network\n" -msgstr "Nutze das Testnetzwerk\n" - -#: ../../../src/init.cpp:196 -msgid "Username for JSON-RPC connections\n" -msgstr "Benutzername für JSON-RPC-Verbindungen\n" - -#: ../../../src/init.cpp:197 -msgid "Password for JSON-RPC connections\n" -msgstr "Passwort für JSON-RPC-Verbindungen\n" - -#: ../../../src/init.cpp:198 -msgid "Listen for JSON-RPC connections on <port> (default: 8332)\n" -msgstr "Horche für JSON-RPC-Verbindungen auf <port> (Standard: 8332)\n" - -#: ../../../src/init.cpp:199 -msgid "Allow JSON-RPC connections from specified IP address\n" -msgstr "Erlaube JSON-RPC-Verbindungen von bestimmter IP-Adresse\n" - -#: ../../../src/init.cpp:200 -msgid "Send commands to node running on <ip> (default: 127.0.0.1)\n" -msgstr "Sende Befehle zum Knoten mit <ip> (Standard: 127.0.0.1)\n" - -#: ../../../src/init.cpp:201 -msgid "Set key pool size to <n> (default: 100)\n" -msgstr "Setze Key-Pool-Größe auf <n> (Standard: 100)\n" - -#: ../../../src/init.cpp:202 -msgid "Rescan the block chain for missing wallet transactions\n" -msgstr "Frage die Block-Kette nach fehlenden Brieftaschen-Überweisungen ab\n" - -#: ../../../src/init.cpp:206 -msgid "" -"\n" -"SSL options: (see the Bitcoin Wiki for SSL setup instructions)\n" -msgstr "" -"\n" -"SSL-Optionen: (siehe das Bitcoin-Wiki für SSL-Installationsanleitungen)\n" - -#: ../../../src/init.cpp:207 -msgid "Use OpenSSL (https) for JSON-RPC connections\n" -msgstr "Nutze OpenSSL (https) für JSON-RPC-Verbindungen\n" - -#: ../../../src/init.cpp:208 -msgid "Server certificate file (default: server.cert)\n" -msgstr "Server-Zertifikatsdatei (Standard: server.cert)\n" - -#: ../../../src/init.cpp:209 -msgid "Server private key (default: server.pem)\n" -msgstr "Server-Geheimschlüssel (Standard: server.pem)\n" - -#: ../../../src/init.cpp:210 -msgid "Acceptable ciphers (default: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH)\n" -msgstr "Anzunehmende Verschlüsselungen (Standard: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH)\n" - -#: ../../../src/init.cpp:214 -msgid "This help message\n" -msgstr "Diese Anleitung\n" - -#: ../../../src/init.cpp:352 -#, c-format -msgid "Cannot obtain a lock on data directory %s. Bitcoin is probably already running." -msgstr "Erhalte keine Datensperre für das Datenverzeichnis %s. Bitcoin läuft wahrscheinlich bereits." - -#: ../../../src/init.cpp:378 -msgid "Error loading addr.dat \n" -msgstr "Fehler beim Laden von addr.dat \n" - -#: ../../../src/init.cpp:384 -msgid "Error loading blkindex.dat \n" -msgstr "Fehler beim Laden von blkindex.dat \n" - -#: ../../../src/init.cpp:395 -msgid "Error loading wallet.dat: Wallet corrupted \n" -msgstr "Fehler beim Laden von wallet.dat: Brieftasche beschädigt \n" - -#: ../../../src/init.cpp:397 -msgid "Error loading wallet.dat: Wallet requires newer version of Bitcoin \n" -msgstr "Fehler beim Laden von wallet.dat: Die Brieftasche benötigt eine neuere Version von Bitcoin \n" - -#: ../../../src/init.cpp:399 -msgid "Error loading wallet.dat \n" -msgstr "Fehler beim Laden von wallet.dat \n" - -#: ../../../src/init.cpp:488 -msgid "Invalid -proxy address" -msgstr "Ungültige -Proxy Adresse" - -#: ../../../src/init.cpp:513 -msgid "Invalid amount for -paytxfee=<amount>" -msgstr "Ungültiger Betrag für -paytxfee=<amount>" - -#: ../../../src/init.cpp:517 -msgid "Warning: -paytxfee is set very high. This is the transaction fee you will pay if you send a transaction." -msgstr "Warnung: -paytxfee ist sehr hoch gesetzt. Das ist die Überweisungsgebühr, die Sie für das Senden einer Überweisung zahlen." - -#: ../../../src/main.cpp:1427 -msgid "Warning: Disk space is low " -msgstr "Warnung: Festplatte fast voll " - -#: ../../../src/net.cpp:1616 -#, c-format -msgid "Unable to bind to port %d on this computer. Bitcoin is probably already running." -msgstr "Kann nicht zu Port %d auf diesem Computer verbinden. Bitcoin läuft wahrscheinlich bereits." - -#: ../../../src/rpc.cpp:2086 -#: ../../../src/rpc.cpp:2088 -#, c-format -msgid "To use the %s option" -msgstr "Um die %s-Option zu nutzen" - -#: ../../../src/rpc.cpp:2090 -#, c-format -msgid "" -"Warning: %s, you must set rpcpassword=<password>\n" -"in the configuration file: %s\n" -"If the file does not exist, create it with owner-readable-only file permissions.\n" -msgstr "" -"Warnung: %s, müssen Sie rpcpassword=<password>\n" -"in der Konfigurationsdatei %s einstellen.\n" -"Wenn die Datei nicht existiert, erstellen Sie sie mit ausschließlich Besitzer-Leserechten.\n" - -#: ../../../src/rpc.cpp:2263 -#, c-format -msgid "" -"You must set rpcpassword=<password> in the configuration file:\n" -"%s\n" -"If the file does not exist, create it with owner-readable-only file permissions." -msgstr "" -"Sie müssen rpcpassword=<password> in der Konfigurationsdatei\n" -"\"%s\" einstellen.\n" -"Wenn die Datei nicht existiert, erstellen Sie sie mit ausschließlich Besitzer-Leserechten." - -#: ../../../src/ui.cpp:216 -#, c-format -msgid "This transaction is over the size limit. You can still send it for a fee of %s, which goes to the nodes that process your transaction and helps to support the network. Do you want to pay the fee?" -msgstr "Diese Überweisung übersteigt das Betragslimit. Sie können sie trotzdem tätigen, aber es wird eine Gebühr von %s erhoben, die an den Teilnehmer ausgeschüttet wird, der Ihre Überweisung bearbeitet und dadurch hilft, das Netzwerk am laufen zu halten. Möchten Sie die Gebühr entrichten?" - -#: ../../../src/ui.cpp:260 -#: ../../../src/ui.cpp:1246 -msgid "Enter the current passphrase to the wallet." -msgstr "Geben Sie die derzeitige Passphrase der Brieftasche ein." - -# See http://dict.leo.org/forum/viewUnsolvedquery.php?idThread=465865&idForum=2&lp=ende&lang=de -#: ../../../src/ui.cpp:261 -#: ../../../src/ui.cpp:1182 -#: ../../../src/ui.cpp:1199 -#: ../../../src/ui.cpp:1247 -#: ../../../src/ui.cpp:1273 -#: ../../../src/ui.cpp:1293 -msgid "Passphrase" -msgstr "Passphrase" - -#: ../../../src/ui.cpp:267 -msgid "Please supply the current wallet decryption passphrase." -msgstr "Bitte geben Sie die derzeitige Passphrase zur Entschlüsselung der Brieftasche an." - -#: ../../../src/ui.cpp:275 -#: ../../../src/ui.cpp:1258 -#: ../../../src/ui.cpp:1315 -msgid "The passphrase entered for the wallet decryption was incorrect." -msgstr "Die eingegebene Passphrase zur Entschlüsselung der Brieftasche war inkorrekt." - -#: ../../../src/ui.cpp:352 -msgid "Status" -msgstr "Status" - -#: ../../../src/ui.cpp:353 -msgid "Date" -msgstr "Datum" - -#: ../../../src/ui.cpp:354 -msgid "Description" -msgstr "Beschreibung" - -#: ../../../src/ui.cpp:355 -msgid "Debit" -msgstr "Belastungen" - -#: ../../../src/ui.cpp:356 -msgid "Credit" -msgstr "Gutschriften" - -#: ../../../src/ui.cpp:567 -#, c-format -msgid "Open for %d blocks" -msgstr "Offen für %d Blöcke" - -#: ../../../src/ui.cpp:569 -#, c-format -msgid "Open until %s" -msgstr "Offen bis %s" - -#: ../../../src/ui.cpp:575 -#, c-format -msgid "%d/offline?" -msgstr "%d/Offline?" - -#: ../../../src/ui.cpp:577 -#, c-format -msgid "%d/unconfirmed" -msgstr "%d/nicht bestätigt" - -#: ../../../src/ui.cpp:579 -#, c-format -msgid "%d confirmations" -msgstr "%d Bestätigungen" - -#: ../../../src/ui.cpp:664 -msgid "Generated" -msgstr "Erzeugt" - -#: ../../../src/ui.cpp:672 -#, c-format -msgid "Generated (%s matures in %d more blocks)" -msgstr "Erzeugt (%s reifen nach %d weiteren Blöcken)" - -#: ../../../src/ui.cpp:676 -msgid "Generated - Warning: This block was not received by any other nodes and will probably not be accepted!" -msgstr "Erzeugt - Warnung: Dieser Block wurde von keinem anderen Teilnehmer empfangen und wird wahrscheinlich nicht akzeptiert werden!" - -#: ../../../src/ui.cpp:680 -msgid "Generated (not accepted)" -msgstr "Erzeugt (nicht akzeptiert)" - -#: ../../../src/ui.cpp:690 -msgid "From: " -msgstr "Von: " - -#: ../../../src/ui.cpp:714 -msgid "Received with: " -msgstr "Empfangen durch: " - -#: ../../../src/ui.cpp:759 -msgid "Payment to yourself" -msgstr "Überweisung an Sie selbst" - -#: ../../../src/ui.cpp:793 -msgid "To: " -msgstr "An: " - -#: ../../../src/ui.cpp:1108 -msgid " Generating" -msgstr " Erzeugen" - -#: ../../../src/ui.cpp:1110 -msgid "(not connected)" -msgstr "(nicht verbunden)" - -#: ../../../src/ui.cpp:1113 -#, c-format -msgid " %d connections %d blocks %d transactions" -msgstr " %d Verbindungen %d Blöcke %d Überweisungen" - -#: ../../../src/ui.cpp:1170 -msgid "Wallet already encrypted." -msgstr "Brieftasche bereits verschlüsselt." - -#: ../../../src/ui.cpp:1181 -msgid "" -"Enter the new passphrase to the wallet.\n" -"Please use a passphrase of 10 or more random characters, or eight or more words." -msgstr "" -"Geben Sie die neue Passphrase der Brieftasche ein.\n" -"Bitte benutzen Sie eine Passphrase mit zehn oder mehr zufällig gewählten Zeichen, oder acht oder mehr Wörter." - -#: ../../../src/ui.cpp:1188 -#: ../../../src/ui.cpp:1281 -msgid "Error: The supplied passphrase was too short." -msgstr "Fehler: Die angegebene Passphrase war zu kurz. " - -#: ../../../src/ui.cpp:1192 -msgid "" -"WARNING: If you encrypt your wallet and lose your passphrase, you will LOSE ALL OF YOUR BITCOINS!\n" -"Are you sure you wish to encrypt your wallet?" -msgstr "" -"WARNUNG: Wenn Sie Ihre Brieftasche verschlüsseln und die Passphrase verlieren, werden Sie ALLE IHRE BITCOINS VERLIEREN!\n" -"Sind Sie sicher, dass Sie Ihre Brieftasche verschlüsseln wollen?" - -#: ../../../src/ui.cpp:1198 -msgid "Please re-enter your new wallet passphrase." -msgstr "Bitte geben Sie erneut Ihre neue Passphrase der Brieftasche ein." - -#: ../../../src/ui.cpp:1207 -#: ../../../src/ui.cpp:1303 -msgid "Error: the supplied passphrases didn't match." -msgstr "Fehler: Die angegebenen Passphrasen stimmten nicht überein." - -#: ../../../src/ui.cpp:1217 -msgid "Wallet encryption failed." -msgstr "Verschlüsselung der Brieftasche fehlgeschlagen." - -#: ../../../src/ui.cpp:1224 -msgid "" -"Wallet Encrypted.\n" -"Remember that encrypting your wallet cannot fully protect your bitcoins from being stolen by malware infecting your computer." -msgstr "" -"Brieftasche verschlüsselt.\n" -"Beachten Sie, dass das Verschlüsseln der Brieftasche Ihre Bitcoins nicht völlig vor Diebstahl durch Schadprogramme auf Ihrem Computer schützt." - -#: ../../../src/ui.cpp:1235 -msgid "Wallet is unencrypted, please encrypt it first." -msgstr "Die Brieftasche ist nicht verschlüsselt, bitte verschlüsselen Sie sie erst." - -#: ../../../src/ui.cpp:1272 -msgid "Enter the new passphrase for the wallet." -msgstr "Geben Sie die neue Passphrase der Brieftasche ein." - -#: ../../../src/ui.cpp:1292 -msgid "Re-enter the new passphrase for the wallet." -msgstr "Geben Sie erneut die neue Passphrase der Brieftasche ein." - -#: ../../../src/ui.cpp:1324 -msgid "Wallet Passphrase Changed." -msgstr "Die Passphrase der Brieftasche wurde geändert." - -#: ../../../src/ui.cpp:1381 -#: ../../../src/ui.cpp:2814 -msgid "New Receiving Address" -msgstr "&Neue Empfangs-Adresse" - -#: ../../../src/ui.cpp:1382 -#: ../../../src/ui.cpp:2815 -msgid "" -"You should use a new address for each payment you receive.\n" -"\n" -"Label" -msgstr "" -"Am besten verwenden Sie für jede Zahlung, die Sie erhalten, eine neue Adresse.\n" -"\n" -"Beschreibung" - -#: ../../../src/ui.cpp:1466 -msgid "<b>Status:</b> " -msgstr "<b>Status:</b> " - -#: ../../../src/ui.cpp:1471 -msgid ", has not been successfully broadcast yet" -msgstr ", wurde noch nicht erfolgreich übertragen" - -#: ../../../src/ui.cpp:1473 -#, c-format -msgid ", broadcast through %d node" -msgstr ", durch %d Teilnehmer übertragen" - -#: ../../../src/ui.cpp:1475 -#, c-format -msgid ", broadcast through %d nodes" -msgstr ", durch %d Teilnehmer übertragen" - -#: ../../../src/ui.cpp:1479 -msgid "<b>Date:</b> " -msgstr "<b>Datum</b> " - -#: ../../../src/ui.cpp:1487 -msgid "<b>Source:</b> Generated<br>" -msgstr "<b>Quelle:</b> Erzeugt<br>" - -#: ../../../src/ui.cpp:1493 -#: ../../../src/ui.cpp:1510 -msgid "<b>From:</b> " -msgstr "<b>Von:</b> " - -#: ../../../src/ui.cpp:1510 -msgid "unknown" -msgstr "Unbekannt" - -#: ../../../src/ui.cpp:1511 -#: ../../../src/ui.cpp:1535 -#: ../../../src/ui.cpp:1594 -msgid "<b>To:</b> " -msgstr "<b>An:</b> " - -#: ../../../src/ui.cpp:1514 -msgid " (yours, label: " -msgstr " (Eigene, Beschreibung: " - -#: ../../../src/ui.cpp:1516 -msgid " (yours)" -msgstr " (Eigene)" - -#: ../../../src/ui.cpp:1553 -#: ../../../src/ui.cpp:1565 -#: ../../../src/ui.cpp:1611 -#: ../../../src/ui.cpp:1628 -msgid "<b>Credit:</b> " -msgstr "<b>Gutschrift:</b> " - -#: ../../../src/ui.cpp:1555 -#, c-format -msgid "(%s matures in %d more blocks)" -msgstr "(%s reifen nach %d weiteren Blöcken)" - -#: ../../../src/ui.cpp:1557 -msgid "(not accepted)" -msgstr "(nicht akzeptiert)" - -#: ../../../src/ui.cpp:1602 -#: ../../../src/ui.cpp:1610 -#: ../../../src/ui.cpp:1625 -msgid "<b>Debit:</b> " -msgstr "<b>Belastung:</b> " - -#: ../../../src/ui.cpp:1616 -msgid "<b>Transaction fee:</b> " -msgstr "<b>Überweisungsgebühr:</b> " - -#: ../../../src/ui.cpp:1632 -msgid "<b>Net amount:</b> " -msgstr "<b>Nettobetrag:</b> " - -#: ../../../src/ui.cpp:1639 -msgid "Message:" -msgstr "Nachricht:" - -#: ../../../src/ui.cpp:1641 -msgid "Comment:" -msgstr "Kommentar:" - -#: ../../../src/ui.cpp:1644 -msgid "Generated coins must wait 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, it will change to \"not accepted\" and not be spendable. This may occasionally happen if another node generates a block within a few seconds of yours." -msgstr "Erzeugte Münzen müssen 120 Blöcke lang reifen. Als Sie diesen Block erzeugt haben, wurde er an alle Teilnehmer übertragen, damit er zur Block-Kette hinzugefügt werden kann. Falls der Block es nicht in die Block-Kette schafft, wird die Beschreibung zu \"nicht akzeptiert\" geändert, und Sie können die Münzen nicht ausgeben. Dies kann manchmal passieren, wenn Sie und ein anderer Teilnehmer annähernd zeitgleich einen Block erzeugen." - -#: ../../../src/ui.cpp:1824 -msgid "Cannot write autostart/bitcoin.desktop file" -msgstr "Kann Datei autostart/bitcoin.desktop nicht schreiben" - -#: ../../../src/ui.cpp:1860 -msgid "Main" -msgstr "Haupt" - -#: ../../../src/ui.cpp:1870 -msgid "&Start Bitcoin on window system startup" -msgstr "Bitcoin beim &Systemstart ausführen" - -#: ../../../src/ui.cpp:1877 -msgid "&Minimize on close" -msgstr "Beim Schließen &minimieren" - -#: ../../../src/ui.cpp:2019 -#, c-format -msgid "version %s" -msgstr "Version %s" - -#: ../../../src/ui.cpp:2142 -msgid "Error in amount " -msgstr "Fehler in Betrag " - -#: ../../../src/ui.cpp:2142 -#: ../../../src/ui.cpp:2147 -#: ../../../src/ui.cpp:2152 -#: ../../../src/ui.cpp:2201 -#: ../../../src/uibase.cpp:61 -msgid "Send Coins" -msgstr "Überweisen" - -#: ../../../src/ui.cpp:2147 -msgid "Amount exceeds your balance " -msgstr "Der Betrag übersteigt Ihr Guthaben " - -#: ../../../src/ui.cpp:2152 -msgid "Total exceeds your balance when the " -msgstr "Der Betrag übersteigt Ihr Guthaben, wenn man die " - -#: ../../../src/ui.cpp:2152 -msgid " transaction fee is included " -msgstr " Überweisungsgebühr berücksichtigt " - -#: ../../../src/ui.cpp:2175 -msgid "Payment sent " -msgstr "Zahlung überwiesen " - -#: ../../../src/ui.cpp:2175 -#: ../../../src/ui.cpp:2184 -#: ../../../src/ui.cpp:2335 -#: ../../../src/ui.cpp:2499 -#: ../../../src/wallet.cpp:1099 -msgid "Sending..." -msgstr "Überweise ..." - -#: ../../../src/ui.cpp:2201 -msgid "Invalid address " -msgstr "Ungültige Adresse " - -#: ../../../src/ui.cpp:2256 -#, c-format -msgid "Sending %s to %s" -msgstr "Überweise %s an %s" - -#: ../../../src/ui.cpp:2329 -#: ../../../src/ui.cpp:2362 -msgid "CANCELLED" -msgstr "ANNULLIERT" - -#: ../../../src/ui.cpp:2333 -msgid "Cancelled" -msgstr "Annulliert" - -#: ../../../src/ui.cpp:2335 -msgid "Transfer cancelled " -msgstr "Überweisung annulliert " - -#: ../../../src/ui.cpp:2388 -msgid "Error: " -msgstr "Fehler: " - -#: ../../../src/ui.cpp:2402 -#: ../../../src/ui.cpp:2473 -#: ../../../src/wallet.cpp:1118 -msgid "Insufficient funds" -msgstr "Unzureichende Geldmittel" - -#: ../../../src/ui.cpp:2407 -msgid "Connecting..." -msgstr "Verbinde ..." - -#: ../../../src/ui.cpp:2412 -msgid "Unable to connect" -msgstr "Kann nicht verbinden" - -#: ../../../src/ui.cpp:2417 -msgid "Requesting public key..." -msgstr "Fordere öffentlichen Schlüssel an ..." - -#: ../../../src/ui.cpp:2429 -msgid "Received public key..." -msgstr "Öffentlicher Schlüssel empfangen ..." - -#: ../../../src/ui.cpp:2443 -msgid "Recipient is not accepting transactions sent by IP address" -msgstr "Empfänger akzeptiert keine Überweisungen von IP-Adressen" - -#: ../../../src/ui.cpp:2445 -msgid "Transfer was not accepted" -msgstr "Überweisung wurde nicht akzeptiert" - -#: ../../../src/ui.cpp:2454 -msgid "Invalid response received" -msgstr "Ungültige Antwort erhalten" - -#: ../../../src/ui.cpp:2469 -msgid "Creating transaction..." -msgstr "Erstelle Überweisung ..." - -#: ../../../src/ui.cpp:2488 -#, c-format -msgid "This transaction requires a transaction fee of at least %s because of its amount, complexity, or use of recently received funds" -msgstr "Diese Überweisung benötigt eine Überweisungsgebühr von mindestens %s wegen ihres Betrags, Komplexität oder der Benutzung kürzlich erhaltener Geldmittel" - -#: ../../../src/ui.cpp:2490 -msgid "Transaction creation failed" -msgstr "Überweisung konnte nicht erzeugt werden." - -#: ../../../src/ui.cpp:2501 -msgid "Transaction aborted" -msgstr "Überweisung abgebrochen" - -#: ../../../src/ui.cpp:2509 -msgid "Lost connection, transaction cancelled" -msgstr "Verbindung verloren, Überweisungsvorgang abgebrochen" - -#: ../../../src/ui.cpp:2525 -msgid "Sending payment..." -msgstr "Überweise Zahlung ..." - -#: ../../../src/ui.cpp:2531 -msgid "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." -msgstr "Die Überweisung wurde abgelehnt. Das kann passieren, wenn einige der Münzen in Ihrer Brieftasche bereits ausgegeben wurden, z.B. weil Sie eine Kopie der Brieftasche (wallet.dat) gemacht haben. Bitcoins, die mithilfe der Kopie ausgegeben wurden, sind in dieser Brieftasche noch nicht als ausgegeben markiert worden." - -#: ../../../src/ui.cpp:2540 -msgid "Waiting for confirmation..." -msgstr "Warte auf Bestätigung ..." - -#: ../../../src/ui.cpp:2558 -msgid "" -"The payment was sent, but the recipient was unable to verify it.\n" -"The transaction is recorded and will credit to the recipient,\n" -"but the comment information will be blank." -msgstr "" -"Die Zahlung wurde überwiesen, aber der Empfänger konnte sie nicht bestätigen.\n" -"Die Überweisung wurde gespeichert und wird dem Empfänger gutgeschrieben,\n" -"aber die begleitende Nachricht wird leer sein." - -#: ../../../src/ui.cpp:2567 -msgid "Payment was sent, but an invalid response was received" -msgstr "Die Zahlung wurde überwiesen, aber die Antwort war fehlerhaft" - -#: ../../../src/ui.cpp:2573 -msgid "Payment completed" -msgstr "Zahlung ausgeführt" - -#: ../../../src/ui.cpp:2615 -#: ../../../src/ui.cpp:2762 -#: ../../../src/ui.cpp:2802 -msgid "Name" -msgstr "Name" - -#: ../../../src/ui.cpp:2616 -#: ../../../src/ui.cpp:2762 -#: ../../../src/ui.cpp:2802 -msgid "Address" -msgstr "Adresse" - -#: ../../../src/ui.cpp:2618 -#: ../../../src/ui.cpp:2774 -msgid "Label" -msgstr "Beschreibung" - -#: ../../../src/ui.cpp:2619 -#: ../../../src/uibase.cpp:847 -msgid "Bitcoin Address" -msgstr "Bitcoin-Adresse" - -#: ../../../src/ui.cpp:2744 -msgid "This is one of your own addresses for receiving payments and cannot be entered in the address book. " -msgstr "Dies ist eine Ihrer eigenen Adressen für den Zahlungseingang und kann deshalb nicht in das Adressbuch übernommen werden. " - -#: ../../../src/ui.cpp:2762 -#: ../../../src/ui.cpp:2768 -msgid "Edit Address" -msgstr "Adresse bearbeiten" - -#: ../../../src/ui.cpp:2774 -msgid "Edit Address Label" -msgstr "Beschreibung der Adresse bearbeiten" - -#: ../../../src/ui.cpp:2802 -#: ../../../src/ui.cpp:2808 -msgid "Add Address" -msgstr "Adresse hinzufügen" - -#: ../../../src/ui.cpp:2896 -msgid "Bitcoin" -msgstr "Bitcoin" - -#: ../../../src/ui.cpp:2898 -msgid "Bitcoin - Generating" -msgstr "Bitcoin - Erzeuge" - -#: ../../../src/ui.cpp:2900 -msgid "Bitcoin - (not connected)" -msgstr "Bitcoin - (nicht verbunden)" - -#: ../../../src/ui.cpp:2979 -msgid "&Open Bitcoin" -msgstr "Bitcoin ö&ffnen" - -#: ../../../src/ui.cpp:2980 -msgid "&Send Bitcoins" -msgstr "Bitcoins &senden" - -#: ../../../src/ui.cpp:2981 -msgid "O&ptions..." -msgstr "O&ptionen ..." - -#: ../../../src/ui.cpp:2984 -#: ../../../src/uibase.cpp:25 -msgid "E&xit" -msgstr "B&eenden" - -#: ../../../src/ui.cpp:3210 -msgid "Program has crashed and will terminate. " -msgstr "Das Programm ist abgestürzt und wird beendet. " - -#: ../../../src/uibase.cpp:28 -msgid "&File" -msgstr "&Datei" - -#: ../../../src/uibase.cpp:32 -msgid "&Your Receiving Addresses..." -msgstr "&Ihre Empfangs-Adressen..." - -#: ../../../src/uibase.cpp:35 -msgid "&Encrypt Wallet..." -msgstr "Bri&eftasche verschlüsseln..." - -#: ../../../src/uibase.cpp:38 -msgid "&Change Wallet Encryption Passphrase..." -msgstr "Passphrase der Vers&chlüsselung der Brieftasche ändern..." - -#: ../../../src/uibase.cpp:42 -msgid "&Options..." -msgstr "&Optionen..." - -#: ../../../src/uibase.cpp:45 -msgid "&Settings" -msgstr "&Einstellungen" - -#: ../../../src/uibase.cpp:49 -msgid "&About..." -msgstr "Ü&ber..." - -#: ../../../src/uibase.cpp:52 -msgid "&Help" -msgstr "&Hilfe" - -#: ../../../src/uibase.cpp:62 -msgid "Address Book" -msgstr "Adressbuch" - -#: ../../../src/uibase.cpp:75 -msgid "Your Bitcoin Address:" -msgstr "Ihre Bitcoin-Adresse:" - -#: ../../../src/uibase.cpp:82 -msgid " &New... " -msgstr " &Neu... " - -#: ../../../src/uibase.cpp:85 -#: ../../../src/uibase.cpp:790 -#: ../../../src/uibase.cpp:893 -msgid " &Copy to Clipboard " -msgstr " In die Zwischenablage &kopieren " - -#: ../../../src/uibase.cpp:99 -msgid "Balance:" -msgstr "Kontostand:" - -#: ../../../src/uibase.cpp:115 -msgid " All" -msgstr " Alle" - -#: ../../../src/uibase.cpp:115 -msgid " Sent" -msgstr " Überwiesen" - -#: ../../../src/uibase.cpp:115 -msgid " Received" -msgstr " Erhalten" - -#: ../../../src/uibase.cpp:115 -msgid " In Progress" -msgstr " In Bearbeitung" - -#: ../../../src/uibase.cpp:136 -msgid "All Transactions" -msgstr "Alle Überweisungen" - -#: ../../../src/uibase.cpp:147 -msgid "Sent/Received" -msgstr "Überwiesen/Erhalten" - -#: ../../../src/uibase.cpp:158 -msgid "Sent" -msgstr "Überwiesen" - -#: ../../../src/uibase.cpp:169 -msgid "Received" -msgstr "Erhalten" - -#: ../../../src/uibase.cpp:312 -#: ../../../src/uibase.cpp:453 -#: ../../../src/uibase.cpp:552 -#: ../../../src/uibase.cpp:732 -#: ../../../src/uibase.cpp:793 -#: ../../../src/uibase.cpp:902 -#: ../../../src/uibase.cpp:991 -msgid "OK" -msgstr "OK" - -#: ../../../src/uibase.cpp:355 -msgid "&Start Bitcoin on system startup" -msgstr "Bitcoin beim &Systemstart ausführen" - -#: ../../../src/uibase.cpp:358 -msgid "&Minimize to the tray instead of the taskbar" -msgstr "In den Infobereich statt in die Taskleiste &minimieren" - -#: ../../../src/uibase.cpp:361 -msgid "Map port using &UPnP" -msgstr "Portweiterleitung via &UPnP" - -#: ../../../src/uibase.cpp:364 -msgid "M&inimize to the tray on close" -msgstr "Beim Schließen in den Infobereich m&inimieren" - -#: ../../../src/uibase.cpp:370 -msgid "&Connect through socks4 proxy (requires restart to apply): " -msgstr "&Per Socks4-Proxy verbinden (erfordert einen Neustart): " - -#: ../../../src/uibase.cpp:381 -msgid "Proxy &IP:" -msgstr "Proxy-&IP:" - -#: ../../../src/uibase.cpp:389 -msgid " &Port:" -msgstr " &Port:" - -#: ../../../src/uibase.cpp:402 -msgid "Optional transaction fee per KB that helps make sure your transactions are processed quickly. Most transactions are 1KB. Fee 0.01 recommended." -msgstr "Eine freiwillige Überweisungsgebühr pro KB, die dabei hilft, dass Ihre Überweisungen schnell durchgeführt werden. Die meisten Überweisungen sind 1 KB groß. Eine Gebühr von 0,01 ist empfohlen." - -#: ../../../src/uibase.cpp:409 -msgid "Pay transaction fee:" -msgstr "Überweisungsgebühr:" - -#: ../../../src/uibase.cpp:430 -msgid "// [don't translate] Test panel 2 for future expansion" -msgstr "" - -#: ../../../src/uibase.cpp:434 -msgid "// [don't translate] Let's not start multiple pages until the first page is filled up" -msgstr "" - -#: ../../../src/uibase.cpp:456 -#: ../../../src/uibase.cpp:678 -#: ../../../src/uibase.cpp:737 -#: ../../../src/uibase.cpp:796 -#: ../../../src/uibase.cpp:905 -#: ../../../src/uibase.cpp:994 -msgid "Cancel" -msgstr "Abbrechen" - -#: ../../../src/uibase.cpp:459 -msgid "&Apply" -msgstr "&Anwenden" - -#: ../../../src/uibase.cpp:518 -msgid "Bitcoin " -msgstr "Bitcoin " - -#: ../../../src/uibase.cpp:524 -msgid "version" -msgstr "Version" - -#: ../../../src/uibase.cpp:535 -msgid "" -"Copyright (c) 2009-2011 Bitcoin Developers\n" -"\n" -"This is experimental software.\n" -"\n" -"Distributed under the MIT/X11 software license, see the accompanying file \n" -"license.txt or http://www.opensource.org/licenses/mit-license.php.\n" -"\n" -"This product includes software developed by the OpenSSL Project for use in the \n" -"OpenSSL Toolkit (http://www.openssl.org/) and cryptographic software written by \n" -"Eric Young (eay@cryptsoft.com) and UPnP software written by Thomas Bernard." -msgstr "" -"Copyright (c) 2009-2011 Bitcoin Developers\n" -"\n" -"Dies ist experimentelle Software.\n" -"\n" -"Lizensiert unter der MIT/X11 Software-Lizenz. Beachten Sie die beiliegende\n" -"Datei license.txt oder http://www.opensource.org/licenses/mit-license.php.\n" -"\n" -"Dieses Produkt enthält Software, die vom OpenSSL-Projekt zur Nutzung im\n" -"OpenSSL Toolkit (http://www.openssl.org/) geschrieben wurde, sowie\n" -"kryptographische Software von Eric Young (eay@cryptsoft.com)\n" -"und UPnP-Software, entwickelt von Thomas Bernard." - -#: ../../../src/uibase.cpp:591 -msgid "Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)" -msgstr "Geben Sie eine Bitcoin-Adresse ein (z.B. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)" - -#: ../../../src/uibase.cpp:605 -msgid "Pay &To:" -msgstr "Überweisen &An:" - -#: ../../../src/uibase.cpp:620 -msgid "&Paste" -msgstr "&Einfügen" - -#: ../../../src/uibase.cpp:623 -msgid " Address &Book..." -msgstr " Address&buch..." - -#: ../../../src/uibase.cpp:630 -msgid "&Amount:" -msgstr "&Betrag:" - -#: ../../../src/uibase.cpp:640 -msgid "T&ransfer:" -msgstr "Ü&berweisung:" - -#: ../../../src/uibase.cpp:646 -msgid " Standard" -msgstr " Standard" - -#: ../../../src/uibase.cpp:673 -msgid "&Send" -msgstr "Ü&berweisen" - -#: ../../../src/uibase.cpp:721 -msgid "" -"\n" -"\n" -"Connecting..." -msgstr "" -"\n" -"\n" -"Verbinde ..." - -#: ../../../src/uibase.cpp:771 -msgid "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. The highlighted address is displayed in the main window." -msgstr "Dies sind Ihre Bitcoin-Adressen zum Empfang von Zahlungen. Sie sollten vielleicht jedem Überweisenden eine andere Adresse geben um nachvollziehen zu können von wem eine Zahlung stammt. Die markierte Adresse wird im Hauptfenster angezeigt." - -#: ../../../src/uibase.cpp:784 -#: ../../../src/uibase.cpp:896 -msgid "&Edit..." -msgstr "&Bearbeiten..." - -#: ../../../src/uibase.cpp:787 -#: ../../../src/uibase.cpp:899 -msgid " &New Address... " -msgstr " &Neue Adresse... " - -#: ../../../src/uibase.cpp:859 -msgid "Sending" -msgstr "Überweise" - -#: ../../../src/uibase.cpp:867 -msgid "These are your Bitcoin addresses for receiving payments. You can give a different one to each sender to keep track of who is paying you. The highlighted address will be displayed in the main window." -msgstr "Dies sind Ihre Bitcoin-Adressen zum Empfang von Zahlungen. Sie können jedem Überweisenden eine andere Adresse geben um nachvollziehen zu können von wem eine Zahlung stammt. Die markierte Adresse wird im Hauptfenster angezeigt." - -#: ../../../src/uibase.cpp:880 -msgid "Receiving" -msgstr "Empfange" - -#: ../../../src/uibase.cpp:890 -msgid "&Delete" -msgstr "&Löschen" - -#: ../../../src/util.cpp:869 -msgid "Warning: Please check that your computer's date and time are correct. If your clock is wrong Bitcoin will not work properly." -msgstr "Warnung: Bitte überprüfen Sie die Richtigkeit des Datums und der Uhrzeit Ihres Computers. Falls Ihre Uhr falsch läuft, wird Bitcoin nicht richtig funktionieren." - -#: ../../../src/util.cpp:903 -msgid "beta" -msgstr "Beta" - -#: ../../../src/wallet.cpp:1083 -msgid "Error: Wallet locked, unable to create transaction " -msgstr "Fehler: Brieftasche ist verschlossen; Überweisung konnte nicht erstellt werden " - -#: ../../../src/wallet.cpp:1091 -#, c-format -msgid "Error: This transaction requires a transaction fee of at least %s because of its amount, complexity, or use of recently received funds " -msgstr "Fehler: Diese Überweisung benötigt eine Überweisungsgebühr von mindestens %s wegen ihrer Größe, Komplexität oder der Benutzung erst kürzlich erhaltener Geldmittel " - -#: ../../../src/wallet.cpp:1093 -msgid "Error: Transaction creation failed " -msgstr "Fehler: Überweisung konnte nicht erzeugt werden. " - -#: ../../../src/wallet.cpp:1103 -msgid "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." -msgstr "Fehler: Die Überweisung wurde abgelehnt. Das kann passieren, wenn einige der Münzen in Ihrer Brieftasche bereits ausgegeben wurden, z.B. weil Sie eine Kopie der Brieftasche (wallet.dat) gemacht haben. Bitcoins, die mithilfe der Kopie ausgegeben wurden, sind in dieser Brieftasche noch nicht als ausgegeben markiert worden." - -#: ../../../src/wallet.cpp:1116 -msgid "Invalid amount" -msgstr "Ungültiger Betrag" - -#: ../../../src/uibase.h:151 -msgid "Transaction Details" -msgstr "Überweisungsdetails" - -#: ../../../src/uibase.h:203 -msgid "Options" -msgstr "Optionen" - -#: ../../../src/uibase.h:232 -msgid "About Bitcoin" -msgstr "Über Bitcoin" - -#: ../../../src/uibase.h:341 -msgid "Your Bitcoin Addresses" -msgstr "Ihre Bitcoin-Adressen" - -#~ msgid "Invalid bitcoin address" -#~ msgstr "Ungültige Bitcoin-Adresse" diff --git a/locale/eo/LC_MESSAGES/bitcoin.mo b/locale/eo/LC_MESSAGES/bitcoin.mo Binary files differdeleted file mode 100644 index 5f898f2a5d..0000000000 --- a/locale/eo/LC_MESSAGES/bitcoin.mo +++ /dev/null diff --git a/locale/eo/LC_MESSAGES/bitcoin.po b/locale/eo/LC_MESSAGES/bitcoin.po deleted file mode 100644 index e144cd8c76..0000000000 --- a/locale/eo/LC_MESSAGES/bitcoin.po +++ /dev/null @@ -1,1029 +0,0 @@ -#
-# Danube <none>, 2011.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: Bitcoin 0.3.22\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-15 18:18+0100\n"
-"PO-Revision-Date: 2011-05-23 19:47+0200\n"
-"Last-Translator: Danube <none>\n"
-"Language-Team: Esperanto <none>\n"
-"Language: Esperanto\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=utf-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Poedit-KeywordsList: _;gettext;gettext_noop\n"
-"X-Poedit-Basepath: .\n"
-"Plural-Forms: j\n"
-"X-Poedit-Language: Esperanto\n"
-"X-Poedit-SearchPath-0: ../../..\n"
-
-#: ../../../src/net.cpp:1499
-#, c-format
-msgid ""
-"Unable to bind to port %d on this computer. Bitcoin is probably already "
-"running."
-msgstr ""
-"Ne povis alligi al la porton %d ĉe ĉi tiu komputilo. Verŝajne la Bitmonero "
-"jam estas rulanta."
-
-#: ../../../src/ui.cpp:202
-#, c-format
-msgid ""
-"This transaction is over the size limit. You can still send it for a fee of "
-"%s, which goes to the nodes that process your transaction and helps to "
-"support the network. Do you want to pay the fee?"
-msgstr ""
-"Tiu ĉi transakcio transpasas la grandeclimiton. Tamen vi povas sendi ĝin "
-"pagante transakcian koston de %s. Tiun koston ricevas la nodoj, kiuj "
-"realigas vian transakcion kaj kiuj helpas subteni la reton. Ĉu vi volas pagi "
-"la transakcian koston?"
-
-#: ../../../src/ui.cpp:301
-msgid "Status"
-msgstr "Stato"
-
-#: ../../../src/ui.cpp:302
-msgid "Date"
-msgstr "Dato"
-
-#: ../../../src/ui.cpp:303
-msgid "Description"
-msgstr "Priskribo"
-
-#: ../../../src/ui.cpp:304
-msgid "Debit"
-msgstr "Debeto"
-
-#: ../../../src/ui.cpp:305
-msgid "Credit"
-msgstr "Kredito"
-
-#: ../../../src/ui.cpp:511
-#, c-format
-msgid "Open for %d blocks"
-msgstr "Malfermita por %d blokoj"
-
-#: ../../../src/ui.cpp:513
-#, c-format
-msgid "Open until %s"
-msgstr "Malfermita ĝis %s"
-
-#: ../../../src/ui.cpp:519
-#, c-format
-msgid "%d/offline?"
-msgstr "%d/senkonekta?"
-
-#: ../../../src/ui.cpp:521
-#, c-format
-msgid "%d/unconfirmed"
-msgstr "%d/ne konfirmita"
-
-#: ../../../src/ui.cpp:523
-#, c-format
-msgid "%d confirmations"
-msgstr "%d konfirmoj"
-
-#: ../../../src/ui.cpp:608
-msgid "Generated"
-msgstr "Kreita"
-
-#: ../../../src/ui.cpp:616
-#, c-format
-msgid "Generated (%s matures in %d more blocks)"
-msgstr "Kreita (%s maturiĝos post %d blokoj)"
-
-#: ../../../src/ui.cpp:620
-msgid ""
-"Generated - Warning: This block was not received by any other nodes and will "
-"probably not be accepted!"
-msgstr ""
-"Kreita - Averto: Tiu bloko ne estas ricevita de iuj ajn aliaj nodoj! "
-"Verŝajne ĝi ne estos akceptita!"
-
-#: ../../../src/ui.cpp:624
-msgid "Generated (not accepted)"
-msgstr "Kreita (ne akceptita)"
-
-#: ../../../src/ui.cpp:634
-msgid "From: "
-msgstr "De: "
-
-#: ../../../src/ui.cpp:658
-msgid "Received with: "
-msgstr "Ricevita per: "
-
-#: ../../../src/ui.cpp:704
-msgid "Payment to yourself"
-msgstr "Pago al vi mem"
-
-#: ../../../src/ui.cpp:738
-msgid "To: "
-msgstr "Al: "
-
-#: ../../../src/ui.cpp:1053
-msgid " Generating"
-msgstr " Kreanta"
-
-#: ../../../src/ui.cpp:1055
-msgid "(not connected)"
-msgstr "(ne konektita)"
-
-#: ../../../src/ui.cpp:1058
-#, c-format
-msgid " %d connections %d blocks %d transactions"
-msgstr " %d konektoj %d blokoj %d transakcioj"
-
-#: ../../../src/ui.cpp:1163 ../../../src/ui.cpp:2527
-msgid "New Receiving Address"
-msgstr "Nova Ricevadreso"
-
-#: ../../../src/ui.cpp:1164 ../../../src/ui.cpp:2528
-msgid ""
-"You should use a new address for each payment you receive.\n"
-"\n"
-"Label"
-msgstr ""
-"Uzu novan adreson por ĉiu ajn pago kiu vi ricevos.\n"
-"\n"
-"Etikedo"
-
-#: ../../../src/ui.cpp:1233
-msgid "<b>Status:</b> "
-msgstr "<b>Stato:</b> "
-
-#: ../../../src/ui.cpp:1238
-msgid ", has not been successfully broadcast yet"
-msgstr ", ankoraŭ ne estas dissendita sukcese"
-
-#: ../../../src/ui.cpp:1240
-#, c-format
-msgid ", broadcast through %d node"
-msgstr ", estas dissendita per %d nodo"
-
-#: ../../../src/ui.cpp:1242
-#, c-format
-msgid ", broadcast through %d nodes"
-msgstr ", estas dissendita per %d nodoj"
-
-#: ../../../src/ui.cpp:1246
-msgid "<b>Date:</b> "
-msgstr "<b>Dato:</b> "
-
-#: ../../../src/ui.cpp:1254
-msgid "<b>Source:</b> Generated<br>"
-msgstr "<b>Fonto:</b> Kreita<br>"
-
-#: ../../../src/ui.cpp:1260 ../../../src/ui.cpp:1278
-msgid "<b>From:</b> "
-msgstr "<b>De:</b> "
-
-#: ../../../src/ui.cpp:1278
-msgid "unknown"
-msgstr "nekonata"
-
-#: ../../../src/ui.cpp:1279 ../../../src/ui.cpp:1303 ../../../src/ui.cpp:1362
-msgid "<b>To:</b> "
-msgstr "<b>Al:</b> "
-
-#: ../../../src/ui.cpp:1282
-msgid " (yours, label: "
-msgstr " (via, etikedo: "
-
-#: ../../../src/ui.cpp:1284
-msgid " (yours)"
-msgstr " (via)"
-
-#: ../../../src/ui.cpp:1321 ../../../src/ui.cpp:1333 ../../../src/ui.cpp:1379
-#: ../../../src/ui.cpp:1396
-msgid "<b>Credit:</b> "
-msgstr "<b>Кredito:</b> "
-
-#: ../../../src/ui.cpp:1323
-#, c-format
-msgid "(%s matures in %d more blocks)"
-msgstr "(%s maturiĝos post %d blokoj)"
-
-#: ../../../src/ui.cpp:1325
-msgid "(not accepted)"
-msgstr "(ne akceptita)"
-
-#: ../../../src/ui.cpp:1370 ../../../src/ui.cpp:1378 ../../../src/ui.cpp:1393
-msgid "<b>Debit:</b> "
-msgstr "<b>Debeto:</b> "
-
-#: ../../../src/ui.cpp:1384
-msgid "<b>Transaction fee:</b> "
-msgstr "<b>Transakcia kosto:</b> "
-
-#: ../../../src/ui.cpp:1400
-msgid "<b>Net amount:</b> "
-msgstr "<b>Neta kvanto:</b> "
-
-#: ../../../src/ui.cpp:1407
-msgid "Message:"
-msgstr "Mesaĝo:"
-
-#: ../../../src/ui.cpp:1409
-msgid "Comment:"
-msgstr "Komento:"
-
-#: ../../../src/ui.cpp:1412
-msgid ""
-"Generated coins must wait 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, it will change to \"not "
-"accepted\" and not be spendable. This may occasionally happen if another "
-"node generates a block within a few seconds of yours."
-msgstr ""
-"Kreitaj moneroj devas atendi dum 120 blokoj ĝis ili povas esti elspezita. "
-"Kiam vi kreis tiun blokon, ĝi estis dissendita al la reton por esti "
-"inkludita en la blokĉeno. Se ĝi malsukcesos esti inkludita en la ĉeno, ĝi "
-"ŝanĝiĝos al \\\"ne akceptita\\\" kaj estos neelspezebla. Kelkfoje tio povas "
-"okazi se alia nodo kreas blokon samtempe (dum kelkaj sekundoj)."
-
-#: ../../../src/ui.cpp:1592
-msgid "Cannot write autostart/bitcoin.desktop file"
-msgstr "Ne povas skribi la dosieron autostart/bitcoin.desktop"
-
-#: ../../../src/ui.cpp:1628
-msgid "Main"
-msgstr "Ĉefa"
-
-#: ../../../src/ui.cpp:1636
-msgid "&Start Bitcoin on window system startup"
-msgstr "&Lanĉu Bitmoneron kiam vindozo ekas"
-
-#: ../../../src/ui.cpp:1643
-msgid "&Minimize on close"
-msgstr "Nur &kaŝiĝi anstataŭ malfermiĝi"
-
-#: ../../../src/ui.cpp:1785
-#, c-format
-msgid "version %s"
-msgstr "versio %s"
-
-#: ../../../src/ui.cpp:1897
-msgid "Error in amount "
-msgstr "Eraro en kvanto "
-
-#: ../../../src/ui.cpp:1897 ../../../src/ui.cpp:1902 ../../../src/ui.cpp:1907
-#: ../../../src/ui.cpp:1942 ../../../src/uibase.cpp:55
-msgid "Send Coins"
-msgstr "Sendu monerojn"
-
-#: ../../../src/ui.cpp:1902
-msgid "Amount exceeds your balance "
-msgstr "Kvanto transpasas vian bonhavon "
-
-#: ../../../src/ui.cpp:1907
-msgid "Total exceeds your balance when the "
-msgstr "Entuta sumo transpasas vian bonhavon, se la "
-
-#: ../../../src/ui.cpp:1907
-msgid " transaction fee is included "
-msgstr " transakcia kosto estas inkludita "
-
-#: ../../../src/ui.cpp:1925
-msgid "Payment sent "
-msgstr "Pago sendita "
-
-#: ../../../src/ui.cpp:1925 ../../../src/ui.cpp:1930 ../../../src/ui.cpp:2074
-#: ../../../src/ui.cpp:2227 ../../../src/main.cpp:3999
-msgid "Sending..."
-msgstr "Sendanta..."
-
-#: ../../../src/ui.cpp:1942
-msgid "Invalid address "
-msgstr "Malvalida adreso "
-
-#: ../../../src/ui.cpp:1995
-#, c-format
-msgid "Sending %s to %s"
-msgstr "Sendanta %s al %s"
-
-#: ../../../src/ui.cpp:2068 ../../../src/ui.cpp:2101
-msgid "CANCELLED"
-msgstr "MALVALIDIGITA"
-
-#: ../../../src/ui.cpp:2072
-msgid "Cancelled"
-msgstr "Malvalidigita"
-
-#: ../../../src/ui.cpp:2074
-msgid "Transfer cancelled "
-msgstr "Transfero malvalidigita "
-
-#: ../../../src/ui.cpp:2127
-msgid "Error: "
-msgstr "Eraro: "
-
-#: ../../../src/ui.cpp:2141 ../../../src/ui.cpp:2212
-#: ../../../src/main.cpp:4018
-msgid "Insufficient funds"
-msgstr "Malsufiĉa mono"
-
-#: ../../../src/ui.cpp:2146
-msgid "Connecting..."
-msgstr "Konektanta..."
-
-#: ../../../src/ui.cpp:2151
-msgid "Unable to connect"
-msgstr "Ne povas konekti"
-
-#: ../../../src/ui.cpp:2156
-msgid "Requesting public key..."
-msgstr "Postulanta publikan ĉifroŝlosilon..."
-
-#: ../../../src/ui.cpp:2168
-msgid "Received public key..."
-msgstr "Ricevinta publikan ĉifroŝlosilon..."
-
-#: ../../../src/ui.cpp:2182
-msgid "Recipient is not accepting transactions sent by IP address"
-msgstr "Adresato ne akceptas transakciojn senditajn per IP adreso"
-
-#: ../../../src/ui.cpp:2184
-msgid "Transfer was not accepted"
-msgstr "Transfero ne estis akceptita"
-
-#: ../../../src/ui.cpp:2193
-msgid "Invalid response received"
-msgstr "Malvalida respondo ricevita"
-
-#: ../../../src/ui.cpp:2208
-msgid "Creating transaction..."
-msgstr "Kreanta la transakcion..."
-
-#: ../../../src/ui.cpp:2220
-#, c-format
-msgid ""
-"This transaction requires a transaction fee of at least %s because of its "
-"amount, complexity, or use of recently received funds"
-msgstr ""
-"Tiu ĉi transakcio necesas transakcian koston de minimume %s, ĉar ĝia kvanto "
-"aŭ ĝia komplekseco aŭ la uzo de mono lastatempe ricevita."
-
-#: ../../../src/ui.cpp:2222
-msgid "Transaction creation failed"
-msgstr "La transakcio ne funkciis"
-
-#: ../../../src/ui.cpp:2229
-msgid "Transaction aborted"
-msgstr "Transakcio malvalidigita"
-
-#: ../../../src/ui.cpp:2237
-msgid "Lost connection, transaction cancelled"
-msgstr "Perdis la konekton, transakcio malvalidigita"
-
-#: ../../../src/ui.cpp:2253
-msgid "Sending payment..."
-msgstr "Sendanta pagon..."
-
-#: ../../../src/ui.cpp:2259
-msgid ""
-"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."
-msgstr ""
-"La transakcio estas malakceptita. Tio povas okazi se iom da moneroj en via "
-"monujo jam estis elspezata, ekzemple se vi uzis kopion de la monujo wallet."
-"dat kaj moneroj estis elspezita en la kopio, sed ne estas markata kiel "
-"elspezata ĉi tie."
-
-#: ../../../src/ui.cpp:2268
-msgid "Waiting for confirmation..."
-msgstr "Atendanta la konfirmon..."
-
-#: ../../../src/ui.cpp:2286
-msgid ""
-"The payment was sent, but the recipient was unable to verify it.\n"
-"The transaction is recorded and will credit to the recipient,\n"
-"but the comment information will be blank."
-msgstr ""
-"La pago estis sendita, sed la ricevanto ne povis atesti ĝin.\n"
-"La transakcio estas registrita kaj estos skribita en la krediton de la "
-"ricevanto,\n"
-"sed la komenta informo estas malplena."
-
-#: ../../../src/ui.cpp:2295
-msgid "Payment was sent, but an invalid response was received"
-msgstr "Pago estis sendita, sed malvalida respondo estas ricivita"
-
-#: ../../../src/ui.cpp:2301
-msgid "Payment completed"
-msgstr "Pago kompletigita"
-
-#: ../../../src/ui.cpp:2332 ../../../src/ui.cpp:2478 ../../../src/ui.cpp:2515
-msgid "Name"
-msgstr "Nomo"
-
-#: ../../../src/ui.cpp:2333 ../../../src/ui.cpp:2478 ../../../src/ui.cpp:2515
-msgid "Address"
-msgstr "Adreso"
-
-#: ../../../src/ui.cpp:2335 ../../../src/ui.cpp:2490
-msgid "Label"
-msgstr "Etikedo"
-
-#: ../../../src/ui.cpp:2336 ../../../src/uibase.cpp:837
-msgid "Bitcoin Address"
-msgstr "Bitmonera adreso"
-
-#: ../../../src/ui.cpp:2460
-msgid ""
-"This is one of your own addresses for receiving payments and cannot be "
-"entered in the address book. "
-msgstr ""
-"Tiu ĉi estas unu el viaj adresoj mem pro ricevi pagojn. Ĝi ne povas esti "
-"enskribita en la adresaro. "
-
-#: ../../../src/ui.cpp:2478 ../../../src/ui.cpp:2484
-msgid "Edit Address"
-msgstr "Editu adreson"
-
-#: ../../../src/ui.cpp:2490
-msgid "Edit Address Label"
-msgstr "Editu adresan etikedon"
-
-#: ../../../src/ui.cpp:2515 ../../../src/ui.cpp:2521
-msgid "Add Address"
-msgstr "Aldonu adreson"
-
-#: ../../../src/ui.cpp:2598
-msgid "Bitcoin"
-msgstr "Bitmonero"
-
-#: ../../../src/ui.cpp:2600
-msgid "Bitcoin - Generating"
-msgstr "Bitmonero - Kreanta"
-
-#: ../../../src/ui.cpp:2602
-msgid "Bitcoin - (not connected)"
-msgstr "Bitcoin - (ne konektita)"
-
-#: ../../../src/ui.cpp:2681
-msgid "&Open Bitcoin"
-msgstr "&Malfermu Bitmoneron"
-
-#: ../../../src/ui.cpp:2682
-msgid "&Send Bitcoins"
-msgstr "&Sendu bitmonerojn"
-
-#: ../../../src/ui.cpp:2683
-msgid "O&ptions..."
-msgstr "&Opcioj..."
-
-#: ../../../src/ui.cpp:2686 ../../../src/uibase.cpp:25
-msgid "E&xit"
-msgstr "&Fermu"
-
-#: ../../../src/ui.cpp:2902
-msgid "Program has crashed and will terminate. "
-msgstr "La programo kraŝis kaj haltiĝos. "
-
-#: ../../../src/main.cpp:1868
-msgid "Warning: Disk space is low "
-msgstr "Averto: Malmulte da storloko "
-
-#: ../../../src/main.cpp:3992
-#, c-format
-msgid ""
-"Error: This transaction requires a transaction fee of at least %s because of "
-"its amount, complexity, or use of recently received funds "
-msgstr ""
-"Eraro: Tiu ĉi transakcio necesas transakcian koston de minimume %s, ĉar ĝia "
-"kvanto aŭ ĝia komplekseco aŭ la uzo de mono lastatempe ricevitaŭ "
-
-#: ../../../src/main.cpp:3994
-msgid "Error: Transaction creation failed "
-msgstr "Eraro: La kreado de la transakcio ne funkciis "
-
-#: ../../../src/main.cpp:4003
-msgid ""
-"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."
-msgstr ""
-"Eraro: La transakcio estas malakceptita. Tio povas okazi se iom da moneroj "
-"en via monujo jam estas elspezita, ekzemple se vi uzis kopion de la monujo "
-"wallet.dat kaj moneroj estis elspezita en la kopio, sed ne estas markata "
-"kiel elspezata ĉi tie."
-
-#: ../../../src/main.cpp:4016
-msgid "Invalid amount"
-msgstr "Malvalida kvanto"
-
-#: ../../../src/main.cpp:4023
-msgid "Invalid bitcoin address"
-msgstr "Malvalida bitmonera adreso"
-
-#: ../../../src/rpc.cpp:1800 ../../../src/rpc.cpp:1802
-#, c-format
-msgid "To use the %s option"
-msgstr "Por uzi la %s optcion"
-
-#: ../../../src/rpc.cpp:1804
-#, c-format
-msgid ""
-"Warning: %s, you must set rpcpassword=<password>\n"
-"in the configuration file: %s\n"
-"If the file does not exist, create it with owner-readable-only file "
-"permissions.\n"
-msgstr ""
-"Averto: %s, vi devas meti rpcpassword=<pasvorto>\n"
-"en la agorda dosiero: %s\n"
-"Se la doriero ne ekzistas, kreu ĝin nurposedantlegeble.\n"
-
-#: ../../../src/rpc.cpp:1972
-#, c-format
-msgid ""
-"You must set rpcpassword=<password> in the configuration file:\n"
-"%s\n"
-"If the file does not exist, create it with owner-readable-only file "
-"permissions."
-msgstr ""
-"Vi devas meti rpcpassword=<pasvorto> en la agorda dosiero:\n"
-"%s\n"
-"Se la dosiero ne ekzistas, kreu ĝin nurposedantlegeble."
-
-#: ../../../src/util.cpp:865
-msgid ""
-"Warning: Please check that your computer's date and time are correct. If "
-"your clock is wrong Bitcoin will not work properly."
-msgstr ""
-"Averto: Bonvole kontrolu ke la dato kaj la tempo de via komputilo estas "
-"ĝusta. Se viaj horloĝo malĝustas, Bitmonero ne funkcios korekte."
-
-#: ../../../src/util.cpp:898
-msgid "beta"
-msgstr "beta"
-
-#: ../../../src/uibase.cpp:28
-msgid "&File"
-msgstr "&Dosiero"
-
-#: ../../../src/uibase.cpp:32
-msgid "&Your Receiving Addresses..."
-msgstr "&Viaj ricevadresoj..."
-
-#: ../../../src/uibase.cpp:36
-msgid "&Options..."
-msgstr "&Opcioj..."
-
-#: ../../../src/uibase.cpp:39
-msgid "&Settings"
-msgstr "&Agordoj"
-
-#: ../../../src/uibase.cpp:43
-msgid "&About..."
-msgstr "&Pri..."
-
-#: ../../../src/uibase.cpp:46
-msgid "&Help"
-msgstr "&Helpo"
-
-#: ../../../src/uibase.cpp:56
-msgid "Address Book"
-msgstr "Adresaro"
-
-#: ../../../src/uibase.cpp:69
-msgid "Your Bitcoin Address:"
-msgstr "Via bitmonera adreso:"
-
-#: ../../../src/uibase.cpp:76
-msgid " &New... "
-msgstr " &Nova... "
-
-#: ../../../src/uibase.cpp:79 ../../../src/uibase.cpp:780
-#: ../../../src/uibase.cpp:883
-msgid " &Copy to Clipboard "
-msgstr " &Kopiu al la poŝon "
-
-#: ../../../src/uibase.cpp:93
-msgid "Balance:"
-msgstr "Bonhavo:"
-
-#: ../../../src/uibase.cpp:109
-msgid " All"
-msgstr " Ĉiom"
-
-#: ../../../src/uibase.cpp:109
-msgid " Sent"
-msgstr " Sendita"
-
-#: ../../../src/uibase.cpp:109
-msgid " Received"
-msgstr " Ricevita"
-
-#: ../../../src/uibase.cpp:109
-msgid " In Progress"
-msgstr " Progresanta"
-
-#: ../../../src/uibase.cpp:130
-msgid "All Transactions"
-msgstr "Ĉiuj transakcioj"
-
-#: ../../../src/uibase.cpp:141
-msgid "Sent/Received"
-msgstr "Sendita/Ricevita"
-
-#: ../../../src/uibase.cpp:152
-msgid "Sent"
-msgstr "Sendita"
-
-#: ../../../src/uibase.cpp:163
-msgid "Received"
-msgstr "Ricevita"
-
-#: ../../../src/uibase.cpp:302 ../../../src/uibase.cpp:443
-#: ../../../src/uibase.cpp:542 ../../../src/uibase.cpp:722
-#: ../../../src/uibase.cpp:783 ../../../src/uibase.cpp:892
-#: ../../../src/uibase.cpp:981
-msgid "OK"
-msgstr "Bone"
-
-#: ../../../src/uibase.cpp:345
-msgid "&Start Bitcoin on system startup"
-msgstr "&Lanĉigu Bitmoneron kiam la sistemo ekas"
-
-#: ../../../src/uibase.cpp:348
-msgid "&Minimize to the tray instead of the taskbar"
-msgstr "&Kaŝu al la programan pleton anstataŭ al la programan linion"
-
-#: ../../../src/uibase.cpp:351
-msgid "Map port using &UPnP"
-msgstr "Pordplusendo per &UPnP"
-
-#: ../../../src/uibase.cpp:354
-msgid "M&inimize to the tray on close"
-msgstr "K&aŝu al la programan pleton anstataŭ malfermu ĝin"
-
-#: ../../../src/uibase.cpp:360
-msgid "&Connect through socks4 proxy: "
-msgstr "&Konekti per socks4 prokuro: "
-
-#: ../../../src/uibase.cpp:371
-msgid "Proxy &IP:"
-msgstr "Prokura &IP:"
-
-#: ../../../src/uibase.cpp:379
-msgid " &Port:"
-msgstr " &Pordo:"
-
-#: ../../../src/uibase.cpp:392
-msgid ""
-"Optional transaction fee per KB that helps make sure your transactions are "
-"processed quickly. Most transactions are 1KB. Fee 0.01 recommended."
-msgstr ""
-"Volonta transakcia kosto po kilobajto, kiu helpas certigi ke viaj "
-"transakcioj estas plenumita rapide. La plej transacioj estas 1 kilobajto. "
-"Rekomendita transakcia kosto: 0.01"
-
-#: ../../../src/uibase.cpp:399
-msgid "Pay transaction fee:"
-msgstr "Pagu transakcian koston:"
-
-#: ../../../src/uibase.cpp:420
-msgid "// [don't translate] Test panel 2 for future expansion"
-msgstr ""
-
-#: ../../../src/uibase.cpp:424
-msgid ""
-"// [don't translate] Let's not start multiple pages until the first page is "
-"filled up"
-msgstr ""
-
-#: ../../../src/uibase.cpp:446 ../../../src/uibase.cpp:668
-#: ../../../src/uibase.cpp:727 ../../../src/uibase.cpp:786
-#: ../../../src/uibase.cpp:895 ../../../src/uibase.cpp:984
-msgid "Cancel"
-msgstr "Malvalidigu"
-
-#: ../../../src/uibase.cpp:449
-msgid "&Apply"
-msgstr "&Apliku"
-
-#: ../../../src/uibase.cpp:508
-msgid "Bitcoin "
-msgstr "Bitmonero "
-
-#: ../../../src/uibase.cpp:514
-msgid "version"
-msgstr "versio"
-
-#: ../../../src/uibase.cpp:525
-msgid ""
-"Copyright (c) 2009-2011 Bitcoin Developers\n"
-"\n"
-"This is experimental software.\n"
-"\n"
-"Distributed under the MIT/X11 software license, see the accompanying file \n"
-"license.txt or http://www.opensource.org/licenses/mit-license.php.\n"
-"\n"
-"This product includes software developed by the OpenSSL Project for use in "
-"the \n"
-"OpenSSL Toolkit (http://www.openssl.org/) and cryptographic software written "
-"by \n"
-"Eric Young (eay@cryptsoft.com) and UPnP software written by Thomas Bernard."
-msgstr ""
-"Kopirajto (c) 2009-2011 Disvolviĝuloj de Bitmonero\n"
-"\n"
-"Tio ĉi estas eksperimenta softvaro.\n"
-"\n"
-"Distribita laŭ la MIT/X11 softvara licenco. Vidu la kundonitan dosieron \n"
-"license.txt aŭ http://www.opensource.org/licenses/mit-license.php.\n"
-"\n"
-"Tio ĉi produkto inkludas softvaron, kiu estas disvolviĝita de la OpenSSL "
-"projekto por uzo en la \n"
-"OpenSSL Toolkit (http://www.openssl.org/), kaj kriptografia softvaro verkita "
-"de \n"
-"Eric Young (eay@cryptsoft.com) kaj UPnP softvaro verkita de Thomas Bernard."
-
-#: ../../../src/uibase.cpp:581
-msgid "Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)"
-msgstr "Entajpu bitmoneran adreson (ekz. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)"
-
-#: ../../../src/uibase.cpp:595
-msgid "Pay &To:"
-msgstr "Pagu &al:"
-
-#: ../../../src/uibase.cpp:610
-msgid "&Paste"
-msgstr "&Elpoŝigi"
-
-#: ../../../src/uibase.cpp:613
-msgid " Address &Book..."
-msgstr " &Adresaro..."
-
-#: ../../../src/uibase.cpp:620
-msgid "&Amount:"
-msgstr "&Kvanto:"
-
-#: ../../../src/uibase.cpp:630
-msgid "T&ransfer:"
-msgstr "T&ransfero:"
-
-#: ../../../src/uibase.cpp:636
-msgid " Standard"
-msgstr " Normo"
-
-#: ../../../src/uibase.cpp:663
-msgid "&Send"
-msgstr "&Sendu"
-
-#: ../../../src/uibase.cpp:711
-msgid ""
-"\n"
-"\n"
-"Connecting..."
-msgstr ""
-"\n"
-"\n"
-"Konektanta..."
-
-#: ../../../src/uibase.cpp:761
-msgid ""
-"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. The highlighted address is displayed in the main window."
-msgstr ""
-"Tiuj ĉi estas viaj bitmonerajn adresojn por ricevi pagojn. Vi povus voli "
-"doni malsaman adreson al ĉiuj sendanto, por ke vi povas vidi kiu pagis vin. "
-"La markita adreso estas vidigita en la ĉefa fenestro."
-
-#: ../../../src/uibase.cpp:774 ../../../src/uibase.cpp:886
-msgid "&Edit..."
-msgstr "&Redakti..."
-
-#: ../../../src/uibase.cpp:777 ../../../src/uibase.cpp:889
-msgid " &New Address... "
-msgstr " &Nova adreso... "
-
-#: ../../../src/uibase.cpp:849
-msgid "Sending"
-msgstr "Sendanta"
-
-#: ../../../src/uibase.cpp:857
-msgid ""
-"These are your Bitcoin addresses for receiving payments. You can give a "
-"different one to each sender to keep track of who is paying you. The "
-"highlighted address will be displayed in the main window."
-msgstr ""
-"Tiuj estas viaj bitmoneraj adresoj por ricevi pagojn. Vi povas doni malsaman "
-"adreson al ĉiuj sendanto, por ke vi povas vidi kiu pagis vin. La markita "
-"adreso estas vidigita en la ĉefa fenestro."
-
-#: ../../../src/uibase.cpp:870
-msgid "Receiving"
-msgstr "Ricevanta"
-
-#: ../../../src/uibase.cpp:880
-msgid "&Delete"
-msgstr "&Viŝu"
-
-#: ../../../src/init.cpp:147
-msgid "Bitcoin version"
-msgstr "Versio de Bitmonero"
-
-#: ../../../src/init.cpp:148
-msgid "Usage:"
-msgstr "Uzado:"
-
-#: ../../../src/init.cpp:150
-msgid "Send command to -server or bitcoind\n"
-msgstr "Sendu komandon al aŭ -server aŭ bitcoind\n"
-
-#: ../../../src/init.cpp:151
-msgid "List commands\n"
-msgstr "Listigu komandojn\n"
-
-#: ../../../src/init.cpp:152
-msgid "Get help for a command\n"
-msgstr "Ricevu helpon de komando\n"
-
-#: ../../../src/init.cpp:153
-msgid "Options:\n"
-msgstr "Opcioj:\n"
-
-#: ../../../src/init.cpp:154
-msgid "Specify configuration file (default: bitcoin.conf)\n"
-msgstr "Elektu agordan dosieron (defaŭlto: bitcoin.conf)\n"
-
-#: ../../../src/init.cpp:155
-msgid "Specify pid file (default: bitcoind.pid)\n"
-msgstr "Elektu pid dosieron (defaŭlto: bitcoind.pid)\n"
-
-#: ../../../src/init.cpp:156
-msgid "Generate coins\n"
-msgstr "Generate coins\n"
-
-#: ../../../src/init.cpp:157
-msgid "Don't generate coins\n"
-msgstr "Ne kreu monerojn\n"
-
-#: ../../../src/init.cpp:158
-msgid "Start minimized\n"
-msgstr "Lanĉiĝu kaŝe\n"
-
-#: ../../../src/init.cpp:159
-msgid "Specify data directory\n"
-msgstr "Elektu datenara dosierujon\n"
-
-#: ../../../src/init.cpp:160
-msgid "Connect through socks4 proxy\n"
-msgstr "Konektu per socks4 prokuro\n"
-
-#: ../../../src/init.cpp:161
-msgid "Allow DNS lookups for addnode and connect\n"
-msgstr "Permesu DNS solvon por aldoni nodon kaj konekti\n"
-
-#: ../../../src/init.cpp:162
-msgid "Add a node to connect to\n"
-msgstr "Aldonu nodon konektotan\n"
-
-#: ../../../src/init.cpp:163
-msgid "Connect only to the specified node\n"
-msgstr "Konektu nur al specifan nodon\n"
-
-#: ../../../src/init.cpp:164
-msgid "Don't accept connections from outside\n"
-msgstr "Ne akceptu eksterajn konektojn\n"
-
-#: ../../../src/init.cpp:167
-msgid "Don't attempt to use UPnP to map the listening port\n"
-msgstr "Ne provu uzi UPnP-on por la pordplusendo\n"
-
-#: ../../../src/init.cpp:169
-msgid "Attempt to use UPnP to map the listening port\n"
-msgstr "Provu uzi UPnP-on por la pordplusendo\n"
-
-#: ../../../src/init.cpp:172
-msgid "Fee per KB to add to transactions you send\n"
-msgstr "Kosto po kilobajto aldonota al viaj transakcioj sendataj\n"
-
-#: ../../../src/init.cpp:174
-msgid "Accept command line and JSON-RPC commands\n"
-msgstr "Akceptu kaj komandliniajn kaj JSON-RPC-ajn komandojn\n"
-
-#: ../../../src/init.cpp:177
-msgid "Run in the background as a daemon and accept commands\n"
-msgstr "Lanĉigu fone kiel demono kaj akceptu komandojn\n"
-
-#: ../../../src/init.cpp:179
-msgid "Use the test network\n"
-msgstr "Uzu la testreton\n"
-
-#: ../../../src/init.cpp:180
-msgid "Username for JSON-RPC connections\n"
-msgstr "Salutnomo por JSON-RPC-aj konektoj\n"
-
-#: ../../../src/init.cpp:181
-msgid "Password for JSON-RPC connections\n"
-msgstr "Pasvorto por JSON-RPC-aj konektoj\n"
-
-#: ../../../src/init.cpp:182
-msgid "Listen for JSON-RPC connections on <port> (default: 8332)\n"
-msgstr "Aŭskultu JSON-RPC-ajn konektojn ĉe <pordo> (defaŭlto: 8332)\n"
-
-#: ../../../src/init.cpp:183
-msgid "Allow JSON-RPC connections from specified IP address\n"
-msgstr "Permesu JSON-RPC-ajn konektojn el specifa IP-adreso\n"
-
-#: ../../../src/init.cpp:184
-msgid "Send commands to node running on <ip> (default: 127.0.0.1)\n"
-msgstr "Sendu komandojn al nodo rulanta ĉe <ip> (defaŭlto: 127.0.0.1)\n"
-
-#: ../../../src/init.cpp:185
-msgid "Set key pool size to <n> (default: 100)\n"
-msgstr "Difinu la grandecon de la ĉifroŝlosilaro kiel <n> (defaŭlto: 100)\n"
-
-#: ../../../src/init.cpp:186
-msgid "Rescan the block chain for missing wallet transactions\n"
-msgstr "Reskandu la blokĉenon por mankantaj transakcioj en la monujo\n"
-
-#: ../../../src/init.cpp:190
-msgid ""
-"\n"
-"SSL options: (see the Bitcoin Wiki for SSL setup instructions)\n"
-msgstr ""
-"\n"
-"SSL-aj opcioj: (Legu la Vikipedion de Bitmonero pri la agordaĵaj instruoj)\n"
-
-#: ../../../src/init.cpp:191
-msgid "Use OpenSSL (https) for JSON-RPC connections\n"
-msgstr "Uzu OpenSSL (https) por JSON-RPC-aj konektoj\n"
-
-#: ../../../src/init.cpp:192
-msgid "Server certificate file (default: server.cert)\n"
-msgstr "Argorda doesiero de la servilo (defaŭlto: server.cert)\n"
-
-#: ../../../src/init.cpp:193
-msgid "Server private key (default: server.pem)\n"
-msgstr "Privata ĉifroŝlosilo de la servilo (defaŭlto: server.pem)\n"
-
-#: ../../../src/init.cpp:194
-msgid ""
-"Acceptable ciphers (default: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:"
-"@STRENGTH)\n"
-msgstr ""
-"\"Akcepteblaj ĉifroj (defaŭlto: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:"
-"@STRENGTH)\n"
-
-#: ../../../src/init.cpp:198
-msgid "This help message\n"
-msgstr "Ĉi tiu helpa mesaĝo\n"
-
-#: ../../../src/init.cpp:335
-#, c-format
-msgid ""
-"Cannot obtain a lock on data directory %s. Bitcoin is probably already "
-"running."
-msgstr ""
-"Ne povas ŝlosi la datenan dosierujon %s. Verŝajne alia instanco de la "
-"programo Bitmonero jam rulas."
-
-#: ../../../src/init.cpp:361
-msgid "Error loading addr.dat \n"
-msgstr "Eraro ŝarĝante la dosieron addr.dat \n"
-
-#: ../../../src/init.cpp:367
-msgid "Error loading blkindex.dat \n"
-msgstr "Eraro ŝarĝante la dosieron blkindex.dat \n"
-
-#: ../../../src/init.cpp:374
-msgid "Error loading wallet.dat \n"
-msgstr "Eraro ŝarĝante la dosieron wallet.dat \n"
-
-#: ../../../src/init.cpp:454
-msgid "Invalid -proxy address"
-msgstr "Malvalida prokuradreso (-proxy)"
-
-#: ../../../src/init.cpp:477
-msgid "Invalid amount for -paytxfee=<amount>"
-msgstr "Malvalida kvanto de la transakcia kosto (-paytxfee=<kvanto>)"
-
-#: ../../../src/init.cpp:481
-msgid ""
-"Warning: -paytxfee is set very high. This is the transaction fee you will "
-"pay if you send a transaction."
-msgstr ""
-"Averto: La transakcia kosto (-paytxfee) estas tre alta. Tiu ĉi estas la "
-"kosto, kiun vi devos pagi kiam vi sendos transakcion."
-
-#: ../../../src/uibase.h:147
-msgid "Transaction Details"
-msgstr "Detaloj pri transakcio"
-
-#: ../../../src/uibase.h:199
-msgid "Options"
-msgstr "Detaloj pri transakcio"
-
-#: ../../../src/uibase.h:228
-msgid "About Bitcoin"
-msgstr "Pri Bitmonero"
-
-#: ../../../src/uibase.h:337
-msgid "Your Bitcoin Addresses"
-msgstr "Viaj Bitmoneraj adresoj"
diff --git a/locale/es/LC_MESSAGES/bitcoin.mo b/locale/es/LC_MESSAGES/bitcoin.mo Binary files differdeleted file mode 100644 index e22b894c5a..0000000000 --- a/locale/es/LC_MESSAGES/bitcoin.mo +++ /dev/null diff --git a/locale/es/LC_MESSAGES/bitcoin.po b/locale/es/LC_MESSAGES/bitcoin.po deleted file mode 100644 index 1787c4891b..0000000000 --- a/locale/es/LC_MESSAGES/bitcoin.po +++ /dev/null @@ -1,1076 +0,0 @@ -msgid "" -msgstr "" -"Project-Id-Version: \n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-09-06 21:58+0100\n" -"PO-Revision-Date: 2011-09-06 22:19+0100\n" -"Last-Translator: Alex B <paraipanakos@gmail.com>\n" -"Language-Team: \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Language: \n" -"X-Poedit-KeywordsList: _;gettext;gettext_noop\n" -"X-Poedit-Basepath: .\n" -"X-Poedit-SearchPath-0: ../../..\n" - -#: ../../../src/init.cpp:163 -msgid "Bitcoin version" -msgstr "versión Bitcoin" - -#: ../../../src/init.cpp:164 -msgid "Usage:" -msgstr "Uso:" - -#: ../../../src/init.cpp:166 -msgid "Send command to -server or bitcoind\n" -msgstr "Envia comando a bitcoin lanzado con -server u bitcoind\n" - -#: ../../../src/init.cpp:167 -msgid "List commands\n" -msgstr "Muestra comandos\n" - -#: ../../../src/init.cpp:168 -msgid "Get help for a command\n" -msgstr "Recibir ayuda para un comando\n" - -#: ../../../src/init.cpp:169 -msgid "Options:\n" -msgstr "Opciones:\n" - -#: ../../../src/init.cpp:170 -msgid "Specify configuration file (default: bitcoin.conf)\n" -msgstr "Especifica archivo de configuración (predeterminado: bitcoin.conf)\n" - -#: ../../../src/init.cpp:171 -msgid "Specify pid file (default: bitcoind.pid)\n" -msgstr "Especifica archivo pid (predeterminado: bitcoin.pid)\n" - -#: ../../../src/init.cpp:172 -msgid "Generate coins\n" -msgstr "Genera monedas\n" - -#: ../../../src/init.cpp:173 -msgid "Don't generate coins\n" -msgstr "No generar monedas\n" - -#: ../../../src/init.cpp:174 -msgid "Start minimized\n" -msgstr "Arranca minimizado\n" - -#: ../../../src/init.cpp:175 -msgid "Specify data directory\n" -msgstr "Especifica directorio para los datos\n" - -#: ../../../src/init.cpp:176 -msgid "Specify connection timeout (in milliseconds)\n" -msgstr "Especifica tiempo de espera para conexion (en milisegundos)\n" - -#: ../../../src/init.cpp:177 -msgid "Connect through socks4 proxy\n" -msgstr "Conecta mediante proxy socks4\n" - -#: ../../../src/init.cpp:178 -msgid "Allow DNS lookups for addnode and connect\n" -msgstr "Permite búsqueda DNS para addnode y connect\n" - -#: ../../../src/init.cpp:179 -msgid "Add a node to connect to\n" -msgstr "Agrega un nodo para conectarse\n" - -#: ../../../src/init.cpp:180 -msgid "Connect only to the specified node\n" -msgstr "Conecta solo al nodo especificado\n" - -#: ../../../src/init.cpp:181 -msgid "Don't accept connections from outside\n" -msgstr "No aceptar conexiones desde el exterior\n" - -#: ../../../src/init.cpp:184 -msgid "Don't attempt to use UPnP to map the listening port\n" -msgstr "No intentar usar UPnP para mapear el puerto de entrada\n" - -#: ../../../src/init.cpp:186 -msgid "Attempt to use UPnP to map the listening port\n" -msgstr "Intenta usar UPnP para mapear el puerto de escucha.\n" - -#: ../../../src/init.cpp:189 -msgid "Fee per KB to add to transactions you send\n" -msgstr "Comisión por KB para agregar a las transacciones que envias\n" - -#: ../../../src/init.cpp:191 -msgid "Accept command line and JSON-RPC commands\n" -msgstr "Aceptar comandos consola y JSON-RPC\n" - -#: ../../../src/init.cpp:194 -msgid "Run in the background as a daemon and accept commands\n" -msgstr "Correr como demonio y acepta comandos\n" - -#: ../../../src/init.cpp:196 -msgid "Use the test network\n" -msgstr "Usa la red de pruebas\n" - -#: ../../../src/init.cpp:197 -msgid "Username for JSON-RPC connections\n" -msgstr "Usuario para las conexiones JSON-RPC\n" - -#: ../../../src/init.cpp:198 -msgid "Password for JSON-RPC connections\n" -msgstr "Contraseña para las conexiones JSON-RPC\n" - -#: ../../../src/init.cpp:199 -msgid "Listen for JSON-RPC connections on <port> (default: 8332)\n" -msgstr "Escucha conexiones JSON-RPC en el puerto <port> (predeterminado: 8332)\n" - -#: ../../../src/init.cpp:200 -msgid "Allow JSON-RPC connections from specified IP address\n" -msgstr "Permite conexiones JSON-RPC desde la dirección IP especificada\n" - -#: ../../../src/init.cpp:201 -msgid "Send commands to node running on <ip> (default: 127.0.0.1)\n" -msgstr "Envia comando al nodo situado en <ip> (predeterminado: 127.0.0.1)\n" - -#: ../../../src/init.cpp:202 -msgid "Set key pool size to <n> (default: 100)\n" -msgstr "Ajusta el numero de claves en reserva <n> (predeterminado: 100)\n" - -#: ../../../src/init.cpp:203 -msgid "Rescan the block chain for missing wallet transactions\n" -msgstr "Rescanea la cadena de bloques para transacciones perdidas de la cartera\n" - -#: ../../../src/init.cpp:207 -msgid "" -"\n" -"SSL options: (see the Bitcoin Wiki for SSL setup instructions)\n" -msgstr "" -"\n" -"Opciones SSL: (ver la Bitcoin Wiki para instrucciones de configuración SSL)\n" - -#: ../../../src/init.cpp:208 -msgid "Use OpenSSL (https) for JSON-RPC connections\n" -msgstr "Usa OpenSSL (https) para las conexiones JSON-RPC\n" - -#: ../../../src/init.cpp:209 -msgid "Server certificate file (default: server.cert)\n" -msgstr "Archivo de certificado del servidor (Predeterminado: server.cert)\n" - -#: ../../../src/init.cpp:210 -msgid "Server private key (default: server.pem)\n" -msgstr "Clave privada del servidor (Predeterminado: server.pem)\n" - -#: ../../../src/init.cpp:211 -msgid "Acceptable ciphers (default: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH)\n" -msgstr "Cifrados aceptados (Predeterminado: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH)\n" - -#: ../../../src/init.cpp:215 -msgid "This help message\n" -msgstr "Este mensaje de ayuda\n" - -#: ../../../src/init.cpp:353 -#, c-format -msgid "Cannot obtain a lock on data directory %s. Bitcoin is probably already running." -msgstr "No se puede obtener permiso de trabajo en la carpeta de datos %s. Probablemente Bitcoin ya se está ejecutando." - -#: ../../../src/init.cpp:379 -msgid "Error loading addr.dat \n" -msgstr "Error cargando addr.dat \n" - -#: ../../../src/init.cpp:385 -msgid "Error loading blkindex.dat \n" -msgstr "Error cargando blkindex.dat \n" - -#: ../../../src/init.cpp:396 -msgid "Error loading wallet.dat: Wallet corrupted \n" -msgstr "Error cargando wallet.dat: Cartera dañada \n" - -#: ../../../src/init.cpp:398 -msgid "Error loading wallet.dat: Wallet requires newer version of Bitcoin \n" -msgstr "Error cargando el archivo wallet.dat: Se necesita una versión mas nueva de Bitcoin \n" - -#: ../../../src/init.cpp:400 -msgid "Error loading wallet.dat \n" -msgstr "Error cargando wallet.dat \n" - -#: ../../../src/init.cpp:489 -msgid "Invalid -proxy address" -msgstr "Dirección -proxy no valida" - -#: ../../../src/init.cpp:514 -msgid "Invalid amount for -paytxfee=<amount>" -msgstr "Cantidad inválida para -paytxfee=<amount>" - -#: ../../../src/init.cpp:518 -msgid "Warning: -paytxfee is set very high. This is the transaction fee you will pay if you send a transaction." -msgstr "Precaución: -paytxfee es muy alta. Esta es la comisión que pagarás si envias una transacción." - -#: ../../../src/main.cpp:1398 -msgid "Warning: Disk space is low " -msgstr "Cuidado: Poco espacio en el disco duro" - -#: ../../../src/net.cpp:1610 -#, c-format -msgid "Unable to bind to port %d on this computer. Bitcoin is probably already running." -msgstr "No es posible escuchar en el puerto %d en este ordenador. Probablemente Bitcoin ya se está ejecutando." - -#: ../../../src/rpc.cpp:2005 -#: ../../../src/rpc.cpp:2007 -#, c-format -msgid "To use the %s option" -msgstr "Para usar la opción %s" - -#: ../../../src/rpc.cpp:2009 -#, c-format -msgid "" -"Warning: %s, you must set rpcpassword=<password>\n" -"in the configuration file: %s\n" -"If the file does not exist, create it with owner-readable-only file permissions.\n" -msgstr "" -"Precaución: %s, debes especificar rpcpassword=<password>\n" -"en el archivo de configuración: %s\n" -"Si el archivo no existe, debes crearlo con permisos de lectura al autor solamente.\n" - -#: ../../../src/rpc.cpp:2185 -#, c-format -msgid "" -"You must set rpcpassword=<password> in the configuration file:\n" -"%s\n" -"If the file does not exist, create it with owner-readable-only file permissions." -msgstr "" -"Debes especificar rpcpassword=<password> en el archivo de configuración:\n" -"%s\n" -"Si el archivo no existe, debes crearlo con permisos de lectura al autor solamente." - -#: ../../../src/ui.cpp:217 -#, c-format -msgid "This transaction is over the size limit. You can still send it for a fee of %s, which goes to the nodes that process your transaction and helps to support the network. Do you want to pay the fee?" -msgstr "Esta transacción supera el límite. Puedes seguir enviandola incluyendo una comisión de %s que se va a repartir entre los nodos que procesan su transacción y ayudan a mantener la red. ¿Quieres seguir con la transacción?" - -#: ../../../src/ui.cpp:261 -#: ../../../src/ui.cpp:1247 -msgid "Enter the current passphrase to the wallet." -msgstr "Introduce la contraseña actual de la cartera." - -#: ../../../src/ui.cpp:262 -#: ../../../src/ui.cpp:1183 -#: ../../../src/ui.cpp:1200 -#: ../../../src/ui.cpp:1248 -#: ../../../src/ui.cpp:1272 -#: ../../../src/ui.cpp:1292 -msgid "Passphrase" -msgstr "Contraseña" - -#: ../../../src/ui.cpp:268 -msgid "Please supply the current wallet decryption passphrase." -msgstr "Por favor introduce la contraseña actual de la cartera." - -#: ../../../src/ui.cpp:276 -#: ../../../src/ui.cpp:1257 -#: ../../../src/ui.cpp:1314 -msgid "The passphrase entered for the wallet decryption was incorrect." -msgstr "La contraseña introducida para decriptar la cartera es incorrecta." - -#: ../../../src/ui.cpp:353 -msgid "Status" -msgstr "Estado" - -#: ../../../src/ui.cpp:354 -msgid "Date" -msgstr "Fecha" - -#: ../../../src/ui.cpp:355 -msgid "Description" -msgstr "Descripción" - -#: ../../../src/ui.cpp:356 -msgid "Debit" -msgstr "Débito" - -#: ../../../src/ui.cpp:357 -msgid "Credit" -msgstr "Crédito" - -#: ../../../src/ui.cpp:568 -#, c-format -msgid "Open for %d blocks" -msgstr "Abrir para %d bloques" - -#: ../../../src/ui.cpp:570 -#, c-format -msgid "Open until %s" -msgstr "Abrir hasta %s" - -#: ../../../src/ui.cpp:576 -#, c-format -msgid "%d/offline?" -msgstr "%d/desconectado?" - -#: ../../../src/ui.cpp:578 -#, c-format -msgid "%d/unconfirmed" -msgstr "%d/no confirmado" - -#: ../../../src/ui.cpp:580 -#, c-format -msgid "%d confirmations" -msgstr "%d confirmaciones" - -#: ../../../src/ui.cpp:665 -msgid "Generated" -msgstr "Generado" - -#: ../../../src/ui.cpp:673 -#, c-format -msgid "Generated (%s matures in %d more blocks)" -msgstr "Generado (%s madura en %d bloques)" - -#: ../../../src/ui.cpp:677 -msgid "Generated - Warning: This block was not received by any other nodes and will probably not be accepted!" -msgstr "Generado - Cuidado: Este bloque no se recibió de otros nodos y probablemente no sea aceptado!" - -#: ../../../src/ui.cpp:681 -msgid "Generated (not accepted)" -msgstr "Generado (no aceptado)" - -#: ../../../src/ui.cpp:691 -msgid "From: " -msgstr "De: " - -#: ../../../src/ui.cpp:715 -msgid "Received with: " -msgstr "Recibido con: " - -#: ../../../src/ui.cpp:760 -msgid "Payment to yourself" -msgstr "Pago a ti mismo" - -#: ../../../src/ui.cpp:794 -msgid "To: " -msgstr "Para: " - -#: ../../../src/ui.cpp:1109 -msgid " Generating" -msgstr " Generando" - -#: ../../../src/ui.cpp:1111 -msgid "(not connected)" -msgstr "(no conectado)" - -#: ../../../src/ui.cpp:1114 -#, c-format -msgid " %d connections %d blocks %d transactions" -msgstr " %d conexiones %d bloques %d transacciones" - -#: ../../../src/ui.cpp:1171 -msgid "Wallet already encrypted." -msgstr "La cartera ya esta encriptada." - -#: ../../../src/ui.cpp:1182 -msgid "" -"Enter the new passphrase to the wallet.\n" -"Please use a passphrase of 10 or more random characters, or eight or more words." -msgstr "" -"Introduce la nueva contraseña de cartera.\n" -"Por favor utiliza un contraseña de 10 o mas caracteres aleatorios, u ocho o mas palabras." - -#: ../../../src/ui.cpp:1189 -#: ../../../src/ui.cpp:1280 -msgid "Error: The supplied passphrase was too short." -msgstr "Error: La contraseña introducida es demasiado corta." - -#: ../../../src/ui.cpp:1193 -msgid "" -"WARNING: If you encrypt your wallet and lose your passphrase, you will LOSE ALL OF YOUR BITCOINS!\n" -"Are you sure you wish to encrypt your wallet?" -msgstr "" -"ATENCION: ¡Si encriptas tu cartera y pierdes la contraseña perderas TODOS TUS BITCOINS!\n" -"¿Seguro que quieres seguir encriptando la cartera?" - -#: ../../../src/ui.cpp:1199 -msgid "Please re-enter your new wallet passphrase." -msgstr "Por favor vuelve introducir la nueva contraseña." - -#: ../../../src/ui.cpp:1208 -#: ../../../src/ui.cpp:1302 -msgid "Error: the supplied passphrases didn't match." -msgstr "Error: las contraseñas no son identicas." - -#: ../../../src/ui.cpp:1218 -msgid "Wallet encryption failed." -msgstr "Encriptacion de cartera fallida." - -#: ../../../src/ui.cpp:1225 -msgid "" -"Wallet Encrypted.\n" -"Remember that encrypting your wallet cannot fully protect your bitcoins from being stolen by malware infecting your computer." -msgstr "" -"Cartera Encriptada.\n" -"Recuerda que encriptando tu cartera no garantiza mantener a salvo tus bitcoins en caso de tener viruses en el ordenador." - -#: ../../../src/ui.cpp:1236 -msgid "Wallet is unencrypted, please encrypt it first." -msgstr "Cartera no encriptada, intenta encriptar primero." - -#: ../../../src/ui.cpp:1271 -msgid "Enter the new passphrase for the wallet." -msgstr "Introduce la nueva contraseña para la cartera." - -#: ../../../src/ui.cpp:1291 -msgid "Re-enter the new passphrase for the wallet." -msgstr "Reintroduce la nueva contraseña para la cartera." - -#: ../../../src/ui.cpp:1323 -msgid "Wallet Passphrase Changed." -msgstr "Contraseña de cartera cambiada." - -#: ../../../src/ui.cpp:1379 -#: ../../../src/ui.cpp:2825 -msgid "New Receiving Address" -msgstr "Nueva dirección de recepción" - -#: ../../../src/ui.cpp:1380 -#: ../../../src/ui.cpp:2826 -msgid "" -"You should use a new address for each payment you receive.\n" -"\n" -"Label" -msgstr "" -"Debes usar una nueva dirección para cada pago que usted recibe.\n" -"\n" -"Etiqueta" - -#: ../../../src/ui.cpp:1464 -msgid "<b>Status:</b> " -msgstr "<b>Estado:</b> " - -#: ../../../src/ui.cpp:1469 -msgid ", has not been successfully broadcast yet" -msgstr ", no ha sido emitido satisfactoriamente todavía" - -#: ../../../src/ui.cpp:1471 -#, c-format -msgid ", broadcast through %d node" -msgstr ", emitido mediante %d nodo" - -#: ../../../src/ui.cpp:1473 -#, c-format -msgid ", broadcast through %d nodes" -msgstr ", emitido mediante %d nodos" - -#: ../../../src/ui.cpp:1477 -msgid "<b>Date:</b> " -msgstr "<b>Fecha:</b> " - -#: ../../../src/ui.cpp:1485 -msgid "<b>Source:</b> Generated<br>" -msgstr "<b>Fuente:</b> Generado<br>" - -#: ../../../src/ui.cpp:1491 -#: ../../../src/ui.cpp:1508 -msgid "<b>From:</b> " -msgstr "<b>De:</b> " - -#: ../../../src/ui.cpp:1508 -msgid "unknown" -msgstr "desconocido" - -#: ../../../src/ui.cpp:1509 -#: ../../../src/ui.cpp:1533 -#: ../../../src/ui.cpp:1592 -msgid "<b>To:</b> " -msgstr "<b>Para:</b> " - -#: ../../../src/ui.cpp:1512 -msgid " (yours, label: " -msgstr "(tuya, etiqueta: " - -#: ../../../src/ui.cpp:1514 -msgid " (yours)" -msgstr "(tuya)" - -#: ../../../src/ui.cpp:1551 -#: ../../../src/ui.cpp:1563 -#: ../../../src/ui.cpp:1609 -#: ../../../src/ui.cpp:1626 -msgid "<b>Credit:</b> " -msgstr "<b>Crédito:</b> " - -#: ../../../src/ui.cpp:1553 -#, c-format -msgid "(%s matures in %d more blocks)" -msgstr "(%s madura en %d bloques)" - -#: ../../../src/ui.cpp:1555 -msgid "(not accepted)" -msgstr "(no aceptada)" - -#: ../../../src/ui.cpp:1600 -#: ../../../src/ui.cpp:1608 -#: ../../../src/ui.cpp:1623 -msgid "<b>Debit:</b> " -msgstr "<b>Débito:</b> " - -#: ../../../src/ui.cpp:1614 -msgid "<b>Transaction fee:</b> " -msgstr "<b>Comisión transacción:</b> " - -#: ../../../src/ui.cpp:1630 -msgid "<b>Net amount:</b> " -msgstr "<b>Cantidad total:</b> " - -#: ../../../src/ui.cpp:1637 -msgid "Message:" -msgstr "Mensaje:" - -#: ../../../src/ui.cpp:1639 -msgid "Comment:" -msgstr "Comentario:" - -#: ../../../src/ui.cpp:1642 -msgid "Generated coins must wait 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, it will change to \"not accepted\" and not be spendable. This may occasionally happen if another node generates a block within a few seconds of yours." -msgstr "Las monedas generadas deben esperar 120 bloques antes de ser gastadas. Cuando has generado este bloque se emitió a la red para ser agregado en la cadena de bloques. Si falla al incluirse en la cadena, cambiará a \"no aceptado\" y no se podrá gastar. Esto puede ocurrir ocasionalmente si otro nodo genera un bloque casi al mismo tiempo que el tuyo." - -#: ../../../src/ui.cpp:1826 -msgid "Cannot write autostart/bitcoin.desktop file" -msgstr "No se puede escribir el fichero autostart/bitcoin.desktop" - -#: ../../../src/ui.cpp:1862 -msgid "Main" -msgstr "Principal" - -#: ../../../src/ui.cpp:1872 -msgid "&Start Bitcoin on window system startup" -msgstr "&Arranca Bitcoin al iniciar el sistema" - -#: ../../../src/ui.cpp:1879 -msgid "&Minimize on close" -msgstr "&Minimiza al cerrar" - -#: ../../../src/ui.cpp:2021 -#, c-format -msgid "version %s" -msgstr "versión %s" - -#: ../../../src/ui.cpp:2144 -msgid "Error in amount " -msgstr "Error en la cantidad " - -#: ../../../src/ui.cpp:2144 -#: ../../../src/ui.cpp:2149 -#: ../../../src/ui.cpp:2154 -#: ../../../src/ui.cpp:2207 -#: ../../../src/uibase.cpp:61 -msgid "Send Coins" -msgstr "Envia monedas" - -#: ../../../src/ui.cpp:2149 -msgid "Amount exceeds your balance " -msgstr "La cantidad excede su balance " - -#: ../../../src/ui.cpp:2154 -msgid "Total exceeds your balance when the " -msgstr "El total excede su balance cuando el " - -#: ../../../src/ui.cpp:2154 -msgid " transaction fee is included " -msgstr " la comisión de la transacción está incluida " - -#: ../../../src/ui.cpp:2181 -msgid "Payment sent " -msgstr "Pago enviado " - -#: ../../../src/ui.cpp:2181 -#: ../../../src/ui.cpp:2191 -#: ../../../src/ui.cpp:2341 -#: ../../../src/ui.cpp:2506 -#: ../../../src/wallet.cpp:1088 -msgid "Sending..." -msgstr "Enviando..." - -#: ../../../src/ui.cpp:2207 -msgid "Invalid address " -msgstr "Dirección inválida " - -#: ../../../src/ui.cpp:2262 -#, c-format -msgid "Sending %s to %s" -msgstr "Enviando %s a %s" - -#: ../../../src/ui.cpp:2335 -#: ../../../src/ui.cpp:2368 -msgid "CANCELLED" -msgstr "CANCELADO" - -#: ../../../src/ui.cpp:2339 -msgid "Cancelled" -msgstr "Cancelado" - -#: ../../../src/ui.cpp:2341 -msgid "Transfer cancelled " -msgstr "Transferencia cancelada " - -#: ../../../src/ui.cpp:2394 -msgid "Error: " -msgstr "Error: " - -#: ../../../src/ui.cpp:2408 -#: ../../../src/ui.cpp:2477 -#: ../../../src/wallet.cpp:1106 -msgid "Insufficient funds" -msgstr "Fondos insuficientes" - -#: ../../../src/ui.cpp:2413 -msgid "Connecting..." -msgstr "Conectando..." - -#: ../../../src/ui.cpp:2418 -msgid "Unable to connect" -msgstr "No es posible conectar" - -#: ../../../src/ui.cpp:2423 -msgid "Requesting public key..." -msgstr "Pidiendo clave pública..." - -#: ../../../src/ui.cpp:2435 -msgid "Received public key..." -msgstr "Clave pública recibida..." - -#: ../../../src/ui.cpp:2449 -msgid "Recipient is not accepting transactions sent by IP address" -msgstr "El destinatario no accepta transacciones enviadas a direcciones IP" - -#: ../../../src/ui.cpp:2451 -msgid "Transfer was not accepted" -msgstr "La transferencia no fue aceptada" - -#: ../../../src/ui.cpp:2460 -msgid "Invalid response received" -msgstr "Respuesta inválida recibida" - -#: ../../../src/ui.cpp:2473 -msgid "Creating transaction..." -msgstr "Creando transacción..." - -#: ../../../src/ui.cpp:2496 -#, c-format -msgid "This transaction requires a transaction fee of at least %s because of its amount, complexity, or use of recently received funds" -msgstr "Esta transacción requiere una comisión de al menos %s por su cantidad, complejidad o uso de fondos recibidos recientemente" - -#: ../../../src/ui.cpp:2498 -msgid "Transaction creation failed" -msgstr "Fallo al crear la transacción." - -#: ../../../src/ui.cpp:2508 -msgid "Transaction aborted" -msgstr "Transacción abortada" - -#: ../../../src/ui.cpp:2516 -msgid "Lost connection, transaction cancelled" -msgstr "Conexión perdida, transacción cancelada" - -#: ../../../src/ui.cpp:2532 -msgid "Sending payment..." -msgstr "Enviando pago..." - -#: ../../../src/ui.cpp:2544 -msgid "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." -msgstr "La transacción fue rechazada. Esto puede haber ocurrido si alguna de las monedas ya estaba gastada o si ha usado una copia de wallet.dat y las monedas se gastaron en la copia pero no se han marcado como gastadas aqui." - -#: ../../../src/ui.cpp:2553 -msgid "Waiting for confirmation..." -msgstr "Esperando confirmación..." - -#: ../../../src/ui.cpp:2570 -msgid "" -"The payment was sent, but the recipient was unable to verify it.\n" -"The transaction is recorded and will credit to the recipient,\n" -"but the comment information will be blank." -msgstr "" -"El pago se ha enviado, pero el receptor no pudo verificarlo.\n" -"La transacción se grabó y el saldo fue transferido\n" -"pero la información de los comentarios quedará en blanco." - -#: ../../../src/ui.cpp:2579 -msgid "Payment was sent, but an invalid response was received" -msgstr "El pago fue enviado, pero se recibió una respuesta inválida" - -#: ../../../src/ui.cpp:2585 -msgid "Payment completed" -msgstr "Pago completado" - -#: ../../../src/ui.cpp:2627 -#: ../../../src/ui.cpp:2773 -#: ../../../src/ui.cpp:2813 -msgid "Name" -msgstr "Nombre" - -#: ../../../src/ui.cpp:2628 -#: ../../../src/ui.cpp:2773 -#: ../../../src/ui.cpp:2813 -msgid "Address" -msgstr "Dirección" - -#: ../../../src/ui.cpp:2630 -#: ../../../src/ui.cpp:2785 -msgid "Label" -msgstr "Etiqueta" - -#: ../../../src/ui.cpp:2631 -#: ../../../src/uibase.cpp:847 -msgid "Bitcoin Address" -msgstr "Dirección Bitcoin" - -#: ../../../src/ui.cpp:2755 -msgid "This is one of your own addresses for receiving payments and cannot be entered in the address book. " -msgstr "Esta es una de sus direcciones para recibir pagos y no puede incluirse en la libreta de direcciones. " - -#: ../../../src/ui.cpp:2773 -#: ../../../src/ui.cpp:2779 -msgid "Edit Address" -msgstr "Editar dirección" - -#: ../../../src/ui.cpp:2785 -msgid "Edit Address Label" -msgstr "Editar etiqueta dirección" - -#: ../../../src/ui.cpp:2813 -#: ../../../src/ui.cpp:2819 -msgid "Add Address" -msgstr "Agregar dirección" - -#: ../../../src/ui.cpp:2906 -msgid "Bitcoin" -msgstr "Bitcoin" - -#: ../../../src/ui.cpp:2908 -msgid "Bitcoin - Generating" -msgstr "Bitcoin - Generando" - -#: ../../../src/ui.cpp:2910 -msgid "Bitcoin - (not connected)" -msgstr "Bitcoin - (no conectado)" - -#: ../../../src/ui.cpp:2989 -msgid "&Open Bitcoin" -msgstr "&Abrir Bitcoin" - -#: ../../../src/ui.cpp:2990 -msgid "&Send Bitcoins" -msgstr "&Enviar Bitcoin" - -#: ../../../src/ui.cpp:2991 -msgid "O&ptions..." -msgstr "O&pciones" - -#: ../../../src/ui.cpp:2994 -#: ../../../src/uibase.cpp:25 -msgid "E&xit" -msgstr "S&alir" - -#: ../../../src/ui.cpp:3220 -msgid "Program has crashed and will terminate. " -msgstr "El programa ha detectado un error y va a cerrarse. " - -#: ../../../src/uibase.cpp:28 -msgid "&File" -msgstr "&Archivo" - -#: ../../../src/uibase.cpp:32 -msgid "&Your Receiving Addresses..." -msgstr "&Tus direcciones de recepción..." - -#: ../../../src/uibase.cpp:35 -msgid "&Encrypt Wallet..." -msgstr "&Encriptar cartera..." - -#: ../../../src/uibase.cpp:38 -msgid "&Change Wallet Encryption Passphrase..." -msgstr "&Cambiar contraseña de cartera..." - -#: ../../../src/uibase.cpp:42 -msgid "&Options..." -msgstr "&Opciones..." - -#: ../../../src/uibase.cpp:45 -msgid "&Settings" -msgstr "&Configuración" - -#: ../../../src/uibase.cpp:49 -msgid "&About..." -msgstr "&Acerca de..." - -#: ../../../src/uibase.cpp:52 -msgid "&Help" -msgstr "&Ayuda" - -#: ../../../src/uibase.cpp:62 -msgid "Address Book" -msgstr "Libreta de direcciones" - -#: ../../../src/uibase.cpp:75 -msgid "Your Bitcoin Address:" -msgstr "Su dirección Bitcoin:" - -#: ../../../src/uibase.cpp:82 -msgid " &New... " -msgstr " &Nuevo... " - -#: ../../../src/uibase.cpp:85 -#: ../../../src/uibase.cpp:790 -#: ../../../src/uibase.cpp:893 -msgid " &Copy to Clipboard " -msgstr " &Copiar al portapapeles " - -#: ../../../src/uibase.cpp:99 -msgid "Balance:" -msgstr "Balance:" - -#: ../../../src/uibase.cpp:115 -msgid " All" -msgstr " Todo" - -#: ../../../src/uibase.cpp:115 -msgid " Sent" -msgstr " Enviado" - -#: ../../../src/uibase.cpp:115 -msgid " Received" -msgstr " Recibido" - -#: ../../../src/uibase.cpp:115 -msgid " In Progress" -msgstr " En progreso" - -#: ../../../src/uibase.cpp:136 -msgid "All Transactions" -msgstr "Todas las transacciones" - -#: ../../../src/uibase.cpp:147 -msgid "Sent/Received" -msgstr "Enviado/Recibido" - -#: ../../../src/uibase.cpp:158 -msgid "Sent" -msgstr "Enviado" - -#: ../../../src/uibase.cpp:169 -msgid "Received" -msgstr "Recibido" - -#: ../../../src/uibase.cpp:312 -#: ../../../src/uibase.cpp:453 -#: ../../../src/uibase.cpp:552 -#: ../../../src/uibase.cpp:732 -#: ../../../src/uibase.cpp:793 -#: ../../../src/uibase.cpp:902 -#: ../../../src/uibase.cpp:991 -msgid "OK" -msgstr "OK" - -#: ../../../src/uibase.cpp:355 -msgid "&Start Bitcoin on system startup" -msgstr "&Arranca Bitcoin al iniciar el sistema" - -#: ../../../src/uibase.cpp:358 -msgid "&Minimize to the tray instead of the taskbar" -msgstr "&Minimiza a la bandeja en vez de a la barra de tareas" - -#: ../../../src/uibase.cpp:361 -msgid "Map port using &UPnP" -msgstr "Mapea el puerto usando &UPnP" - -#: ../../../src/uibase.cpp:364 -msgid "M&inimize to the tray on close" -msgstr "M&inimiza a la bandeja al cerrar" - -#: ../../../src/uibase.cpp:370 -msgid "&Connect through socks4 proxy (requires restart to apply): " -msgstr "&Conecta usando un proxy socks4 (necesita reinicio): " - -#: ../../../src/uibase.cpp:381 -msgid "Proxy &IP:" -msgstr "&IP proxy:" - -#: ../../../src/uibase.cpp:389 -msgid " &Port:" -msgstr " &Puerto:" - -#: ../../../src/uibase.cpp:402 -msgid "Optional transaction fee per KB that helps make sure your transactions are processed quickly. Most transactions are 1KB. Fee 0.01 recommended." -msgstr "Comisión opcional a las transacciones por KB que ayuda a asegurar que tus transacciones son procesadas rápidamente. La mayoría de las transacciones son de 1KB. Se recomienda una comisión de 0.01." - -#: ../../../src/uibase.cpp:409 -msgid "Pay transaction fee:" -msgstr "Comisión de la transacción:" - -#: ../../../src/uibase.cpp:430 -msgid "// [don't translate] Test panel 2 for future expansion" -msgstr "" - -#: ../../../src/uibase.cpp:434 -msgid "// [don't translate] Let's not start multiple pages until the first page is filled up" -msgstr "" - -#: ../../../src/uibase.cpp:456 -#: ../../../src/uibase.cpp:678 -#: ../../../src/uibase.cpp:737 -#: ../../../src/uibase.cpp:796 -#: ../../../src/uibase.cpp:905 -#: ../../../src/uibase.cpp:994 -msgid "Cancel" -msgstr "Cancelar" - -#: ../../../src/uibase.cpp:459 -msgid "&Apply" -msgstr "&Aplicar" - -#: ../../../src/uibase.cpp:518 -msgid "Bitcoin " -msgstr "Bitcoin " - -#: ../../../src/uibase.cpp:524 -msgid "version" -msgstr "versión" - -#: ../../../src/uibase.cpp:535 -msgid "" -"Copyright (c) 2009-2011 Bitcoin Developers\n" -"\n" -"This is experimental software.\n" -"\n" -"Distributed under the MIT/X11 software license, see the accompanying file \n" -"license.txt or http://www.opensource.org/licenses/mit-license.php.\n" -"\n" -"This product includes software developed by the OpenSSL Project for use in the \n" -"OpenSSL Toolkit (http://www.openssl.org/) and cryptographic software written by \n" -"Eric Young (eay@cryptsoft.com) and UPnP software written by Thomas Bernard." -msgstr "" -"Copyright (c) 2009-2010 Bitcoin Developers\n" -"\n" -"Este es un software experimental.\n" -"\n" -"Distribuido bajo la licencia MIT/X11, vea el archivo adjunto \n" -"license.txt o http://www.opensource.org/licenses/mit-license.php.\n" -"\n" -"Este producto incluye software desarrollado por OpenSSL Project para su uso en el\n" -"OpenSSL Toolkit (http://www.openssl.org/) y software criptográfico escrito por \n" -"Eric Young (eay@cryptsoft.com) y UPnP software escrito por Thomas Bernard." - -#: ../../../src/uibase.cpp:591 -msgid "Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)" -msgstr "Introduce una dirección Bitcoin (ejemplo: 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)" - -#: ../../../src/uibase.cpp:605 -msgid "Pay &To:" -msgstr "Pagar &A:" - -#: ../../../src/uibase.cpp:620 -msgid "&Paste" -msgstr "&Pegar" - -#: ../../../src/uibase.cpp:623 -msgid " Address &Book..." -msgstr " Libreta &Direcciones..." - -#: ../../../src/uibase.cpp:630 -msgid "&Amount:" -msgstr "&Cantidad:" - -#: ../../../src/uibase.cpp:640 -msgid "T&ransfer:" -msgstr "T&ransferir:" - -#: ../../../src/uibase.cpp:646 -msgid " Standard" -msgstr " Estándar" - -#: ../../../src/uibase.cpp:673 -msgid "&Send" -msgstr "&Envia" - -#: ../../../src/uibase.cpp:721 -msgid "" -"\n" -"\n" -"Connecting..." -msgstr "" -"\n" -"\n" -"Conenctando..." - -#: ../../../src/uibase.cpp:771 -msgid "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. The highlighted address is displayed in the main window." -msgstr "Estas son tus direcciones Bitcoin para recibir pagos. Puedes darle una diferente a cada emisor para saber quien te está pagando. La dirección resaltada se muestra en la ventana principal." - -#: ../../../src/uibase.cpp:784 -#: ../../../src/uibase.cpp:896 -msgid "&Edit..." -msgstr "&Edita..." - -#: ../../../src/uibase.cpp:787 -#: ../../../src/uibase.cpp:899 -msgid " &New Address... " -msgstr " &Nueva dirección... " - -#: ../../../src/uibase.cpp:859 -msgid "Sending" -msgstr "Enviando" - -#: ../../../src/uibase.cpp:867 -msgid "These are your Bitcoin addresses for receiving payments. You can give a different one to each sender to keep track of who is paying you. The highlighted address will be displayed in the main window." -msgstr "Estas son tus direcciones Bitcoin para recibir pagos. Puedes darle una diferente a cada emisor para saber quien te está pagando. La dirección resaltada se muestra en la ventana principal." - -#: ../../../src/uibase.cpp:880 -msgid "Receiving" -msgstr "Recibiendo" - -#: ../../../src/uibase.cpp:890 -msgid "&Delete" -msgstr "&Borra" - -#: ../../../src/util.cpp:870 -msgid "Warning: Please check that your computer's date and time are correct. If your clock is wrong Bitcoin will not work properly." -msgstr "Precaución: Por favor revisa que la fecha y hora de tu ordenador son correctas. Si tu reloj está mal Bitcoin no funcionará correctamente." - -#: ../../../src/util.cpp:904 -msgid "beta" -msgstr "beta" - -#: ../../../src/wallet.cpp:1073 -msgid "Error: Wallet locked, unable to create transaction " -msgstr "Error: Cartera bloqueada, no se puede crear la transacción" - -#: ../../../src/wallet.cpp:1081 -#, c-format -msgid "Error: This transaction requires a transaction fee of at least %s because of its amount, complexity, or use of recently received funds " -msgstr "Error: Esta transacción requiere de una comisión de al menos %s por su cantidad, complejidad o uso de fondos recibidos recientemente " - -#: ../../../src/wallet.cpp:1083 -msgid "Error: Transaction creation failed " -msgstr "Error: La creación de la transacción falló " - -#: ../../../src/wallet.cpp:1092 -msgid "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." -msgstr "Error: La transacción fue rechazada. Esto puede haber ocurrido si alguna de las monedas ya estaba gastada o si ha usado una copia de wallet.dat y las monedas se gastaron en la copia pero no se han marcado como gastadas aqui." - -#: ../../../src/wallet.cpp:1104 -msgid "Invalid amount" -msgstr "Cantidad erronea" - -#: ../../../src/uibase.h:151 -msgid "Transaction Details" -msgstr "Detalles de la transacción" - -#: ../../../src/uibase.h:203 -msgid "Options" -msgstr "Opciones" - -#: ../../../src/uibase.h:232 -msgid "About Bitcoin" -msgstr "Acerca de Bitcoin" - -#: ../../../src/uibase.h:341 -msgid "Your Bitcoin Addresses" -msgstr "Sus direcciones Bitcoin" - -#~ msgid "Invalid bitcoin address" -#~ msgstr "Dirección Bitcoin inválida" diff --git a/locale/fr/LC_MESSAGES/bitcoin.mo b/locale/fr/LC_MESSAGES/bitcoin.mo Binary files differdeleted file mode 100644 index f60e15bd62..0000000000 --- a/locale/fr/LC_MESSAGES/bitcoin.mo +++ /dev/null diff --git a/locale/fr/LC_MESSAGES/bitcoin.po b/locale/fr/LC_MESSAGES/bitcoin.po deleted file mode 100644 index a714e01026..0000000000 --- a/locale/fr/LC_MESSAGES/bitcoin.po +++ /dev/null @@ -1,849 +0,0 @@ -msgid "" -msgstr "" -"Project-Id-Version: \n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-05-26 22:02-0000\n" -"PO-Revision-Date: 2010-07-15 02:48+0100\n" -"Last-Translator: aidos\n" -"Language-Team: \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"X-Poedit-KeywordsList: _;gettext;gettext_noop\n" -"X-Poedit-Basepath: .\n" -"X-Poedit-SearchPath-0: ../../..\n" - -#: ../../../init.cpp:174 -msgid "Cannot write autostart/bitcoin.desktop file" -msgstr "" - -#: ../../../init.cpp:388 -#, fuzzy -msgid "Usage:" -msgstr "" - -#: ../../../init.cpp:390 -msgid "Send command to bitcoin running with -server or -daemon\n" -msgstr "" - -#: ../../../init.cpp:391 -msgid "Get help for a command\n" -msgstr "" - -#: ../../../init.cpp:392 -msgid "List commands\n" -msgstr "" - -#: ../../../init.cpp:393 -msgid "Options:\n" -msgstr "Options:\n" - -#: ../../../init.cpp:394 -msgid "Generate coins\n" -msgstr "Générer des pièces\n" - -#: ../../../init.cpp:395 -msgid "Don't generate coins\n" -msgstr "Ne pas générer de pièce\n" - -#: ../../../init.cpp:396 -msgid "Start minimized\n" -msgstr "Démarrer réduit\n" - -#: ../../../init.cpp:397 -msgid "Specify data directory\n" -msgstr "Spécifier le repertoire de donnée\n" - -#: ../../../init.cpp:398 -msgid "Connect through socks4 proxy\n" -msgstr "Connection à travers un proxy SOCKS4\n" - -#: ../../../init.cpp:399 -msgid "Add a node to connect to\n" -msgstr "Ajouter un nœud auquel se connecter\n" - -#: ../../../init.cpp:400 -msgid "Connect only to the specified node\n" -msgstr "Se connecter uniquement au nœud spécifié\n" - -#: ../../../init.cpp:401 -msgid "Accept command line and JSON-RPC commands\n" -msgstr "" - -#: ../../../init.cpp:402 -msgid "Run in the background as a daemon and accept commands\n" -msgstr "" - -#: ../../../init.cpp:403 -msgid "This help message\n" -msgstr "Ce message d'aide\n" - -#: ../../../init.cpp:503 -msgid "Error loading addr.dat \n" -msgstr "Erreur lors du chargement de addr.dat \n" - -#: ../../../init.cpp:509 -msgid "Error loading blkindex.dat \n" -msgstr "Erreur lors du chargement de blkindex.dat \n" - -#: ../../../init.cpp:516 -msgid "Error loading wallet.dat \n" -msgstr "Erreur lors du chargement de wallet.dat \n" - -#: ../../../init.cpp:584 -msgid "Invalid -proxy address" -msgstr "Adresse -proxy invalide" - -#: ../../../init.cpp:677 -msgid "Program has crashed and will terminate. " -msgstr "Le programme a planté et va s'arrêter. " - -#: ../../../main.cpp:1480 -#: ../../../main.cpp:1482 -msgid "Warning: Disk space is low " -msgstr "Attention: L'espace disque est presque épuisé " - -#: ../../../main.cpp:3094 -#, c-format -msgid "Error: This is an oversized transaction that requires a transaction fee of %s " -msgstr "Erreur: Ceci est une transaction de taille excessive qui nécessite %s de frais de transaction " - -#: ../../../main.cpp:3096 -msgid "Error: Transaction creation failed " -msgstr "Erreur: La création de la transaction a échouée " - -#: ../../../main.cpp:3101 -#: ../../../ui.cpp:1776 -#: ../../../ui.cpp:1778 -#: ../../../ui.cpp:1919 -#: ../../../ui.cpp:2068 -msgid "Sending..." -msgstr "Envoi..." - -#: ../../../main.cpp:3105 -msgid "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." -msgstr "Erreur: La transaction a été rejetée. Ceci peut arriver si une partie des pièces de votre porte-monnaie ont déjà été dépensées, par exemple si vous avez utilisé une copie de wallet.dat et que les pièces ont été dépensées dans la copie mais pas marquées comme telles ici." - -#: ../../../main.cpp:3117 -msgid "Invalid amount" -msgstr "Quantité invalide" - -#: ../../../main.cpp:3119 -#: ../../../ui.cpp:1986 -#: ../../../ui.cpp:2053 -msgid "Insufficient funds" -msgstr "Fonds insuffisants" - -#: ../../../main.cpp:3124 -msgid "Invalid bitcoin address" -msgstr "Adresse bitcoin incorrecte" - -#: ../../../ui.cpp:189 -#, c-format -msgid "This transaction is over the size limit. You can still send it for a fee of %s, which goes to the nodes that process your transaction and helps to support the network. Do you want to pay the fee?" -msgstr "Cette transaction est au delà de la limite de taille. Vous pouvez tout de même l'envoyer moyennant des frais de %s, qui ira au noeud gérant votre transaction, et qui aidera à soutenir le réseau. Acceptez-vous de payer ces frais ?" - -#: ../../../ui.cpp:286 -msgid "Status" -msgstr "État" - -#: ../../../ui.cpp:287 -msgid "Date" -msgstr "Date" - -#: ../../../ui.cpp:288 -msgid "Description" -msgstr "Description" - -#: ../../../ui.cpp:289 -msgid "Debit" -msgstr "Débit" - -#: ../../../ui.cpp:290 -msgid "Credit" -msgstr "Crédit" - -#: ../../../ui.cpp:489 -#, c-format -msgid "Open for %d blocks" -msgstr "Ouvert pour %d blocks" - -#: ../../../ui.cpp:491 -#, c-format -msgid "Open until %s" -msgstr "Ouvert jusqu'au %s" - -#: ../../../ui.cpp:497 -#, c-format -msgid "%d/offline?" -msgstr "%d/hors-ligne?" - -#: ../../../ui.cpp:499 -#, c-format -msgid "%d/unconfirmed" -msgstr "%d/non confirmé" - -#: ../../../ui.cpp:501 -#, c-format -msgid "%d confirmations" -msgstr "%d confirmations" - -#: ../../../ui.cpp:584 -msgid "Generated" -msgstr "Généré" - -#: ../../../ui.cpp:592 -#, c-format -msgid "Generated (%s matures in %d more blocks)" -msgstr "Généré (%s mûrira dans %d blocks)" - -#: ../../../ui.cpp:596 -msgid "Generated - Warning: This block was not received by any other nodes and will probably not be accepted!" -msgstr "Généré - Attention: Ce block n'a été reçu par aucun autre nœud et ne sera probablement pas accepté!" - -#: ../../../ui.cpp:600 -msgid "Generated (not accepted)" -msgstr "Généré (pas accepté)" - -#: ../../../ui.cpp:610 -msgid "From: " -msgstr "De: " - -#: ../../../ui.cpp:634 -msgid "Received with: " -msgstr "Reçu depuis: " - -#: ../../../ui.cpp:676 -msgid "Payment to yourself" -msgstr "Paiement à vous-même" - -#: ../../../ui.cpp:713 -msgid "To: " -msgstr "À: " - -#: ../../../ui.cpp:1009 -msgid " Generating" -msgstr " Génération en cours" - -#: ../../../ui.cpp:1011 -msgid "(not connected)" -msgstr "(non connecté)" - -#: ../../../ui.cpp:1014 -#, c-format -msgid " %d connections %d blocks %d transactions" -msgstr " %d connexions %d blocks %d transactions" - -#: ../../../ui.cpp:1128 -#: ../../../ui.cpp:2368 -msgid "New Receiving Address" -msgstr "Nouvelle adresse de reception" - -#: ../../../ui.cpp:1129 -#: ../../../ui.cpp:2369 -msgid "" -"You should use a new address for each payment you receive.\n" -"\n" -"Label" -msgstr "" -"C'est une bonne politique d'utiliser une nouvelle adresse pour \n" -"chaque paiement reçu.\n" -"\n" -"Intitulé" - -#: ../../../ui.cpp:1198 -msgid "<b>Status:</b> " -msgstr "<b>État:</b> " - -#: ../../../ui.cpp:1203 -msgid ", has not been successfully broadcast yet" -msgstr ", n'a pas encore été diffusé avec succès" - -#: ../../../ui.cpp:1205 -#, c-format -msgid ", broadcast through %d node" -msgstr ", diffusé à travers %d nœud" - -#: ../../../ui.cpp:1207 -#, c-format -msgid ", broadcast through %d nodes" -msgstr ", diffusé à travers %d nœuds" - -#: ../../../ui.cpp:1211 -msgid "<b>Date:</b> " -msgstr "<b>Date:</b> " - -#: ../../../ui.cpp:1219 -msgid "<b>Source:</b> Generated<br>" -msgstr "<b>Source:</b> Généré<br>" - -#: ../../../ui.cpp:1225 -#: ../../../ui.cpp:1243 -msgid "<b>From:</b> " -msgstr "<b>De:</b> " - -#: ../../../ui.cpp:1243 -msgid "unknown" -msgstr "inconnu" - -#: ../../../ui.cpp:1244 -#: ../../../ui.cpp:1268 -#: ../../../ui.cpp:1327 -msgid "<b>To:</b> " -msgstr "<b>À:</b> " - -#: ../../../ui.cpp:1247 -msgid " (yours, label: " -msgstr " (vous, intitulé: " - -#: ../../../ui.cpp:1249 -msgid " (yours)" -msgstr " (vous)" - -#: ../../../ui.cpp:1286 -#: ../../../ui.cpp:1298 -#: ../../../ui.cpp:1361 -msgid "<b>Credit:</b> " -msgstr "<b>Crédit:</b> " - -#: ../../../ui.cpp:1288 -#, c-format -msgid "(%s matures in %d more blocks)" -msgstr "(%s mûrira dans %d blocks)" - -#: ../../../ui.cpp:1290 -msgid "(not accepted)" -msgstr "(pas accepté)" - -#: ../../../ui.cpp:1335 -#: ../../../ui.cpp:1358 -msgid "<b>Debit:</b> " -msgstr "<b>Débit:</b> " - -#: ../../../ui.cpp:1349 -msgid "<b>Transaction fee:</b> " -msgstr "<b>Redevance de transaction :</b> " - -#: ../../../ui.cpp:1365 -msgid "<b>Net amount:</b> " -msgstr "<b>Montant net:</b> " - -#: ../../../ui.cpp:1372 -msgid "Message:" -msgstr "Message:" - -#: ../../../ui.cpp:1375 -msgid "Generated coins must wait 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, it will change to \"not accepted\" and not be spendable. This may occasionally happen if another node generates a block within a few seconds of yours." -msgstr "Les pièces générées doivent attendrent 120 blocks avant de pouvoir être dépensées. Quand vous avez généré ce block, il a été diffusé au réseau pour être ajouté à la chaîne de block. Si il échoue à être intégré à la chaîne, il changera à \"pas accepté\" et ne sera pas dépensable. Ceci peut parfois arriver si un autre nœud génère un block à quelques secondes du vôtre." - -#: ../../../ui.cpp:1442 -msgid "Main" -msgstr "Général" - -#: ../../../ui.cpp:1447 -#, fuzzy -msgid "&Start Bitcoin on window system startup" -msgstr "&Lancer Bitcoin au démarrage du système" - -#: ../../../ui.cpp:1454 -msgid "&Minimize on close" -msgstr "&Réduire à la fermeture" - -#: ../../../ui.cpp:1610 -#, c-format -msgid "version %s%s BETA" -msgstr "version %s%s BETA" - -#: ../../../ui.cpp:1696 -msgid "Will appear as \"From: Unknown\"" -msgstr "Apparaîtra ainsi \"De: Inconnu\"" - -#: ../../../ui.cpp:1681 -msgid "n/a" -msgstr "Inconnu" - -#: ../../../ui.cpp:1681 -msgid "Unknown" -msgstr "Inconnu" - -#: ../../../ui.cpp:1697 -msgid "Can't include a message when sending to a Bitcoin address" -msgstr "Impossible d'inclure un message lors d'un envoi à une adresse Bitcoin" - -#: ../../../ui.cpp:1750 -msgid "Error in amount " -msgstr "Erreur dans le montant " - -#: ../../../ui.cpp:1750 -#: ../../../ui.cpp:1755 -#: ../../../ui.cpp:1760 -#: ../../../ui.cpp:1786 -#: ../../../uibase.cpp:59 -msgid "Send Coins" -msgstr "Envoyer des pièces" - -#: ../../../ui.cpp:1755 -msgid "Amount exceeds your balance " -msgstr "Le montant dépasse votre solde " - -#: ../../../ui.cpp:1760 -msgid "Total exceeds your balance when the " -msgstr "Le total dépasse votre solde quand les " - -#: ../../../ui.cpp:1760 -msgid " transaction fee is included " -msgstr " de frais de transaction sont ajoutés " - -#: ../../../ui.cpp:1776 -msgid "Payment sent " -msgstr "Paiement envoyé " - -#: ../../../ui.cpp:1786 -msgid "Invalid address " -msgstr "Adresse invalide " - -#: ../../../ui.cpp:1840 -#, c-format -msgid "Sending %s to %s" -msgstr "Envoi de %s à %s" - -#: ../../../ui.cpp:1913 -#: ../../../ui.cpp:1946 -msgid "CANCELLED" -msgstr "ANNULÉ" - -#: ../../../ui.cpp:1917 -msgid "Cancelled" -msgstr "Annulé" - -#: ../../../ui.cpp:1919 -msgid "Transfer cancelled " -msgstr "Transfert annulé " - -#: ../../../ui.cpp:1972 -msgid "Error: " -msgstr "Erreur: " - -#: ../../../ui.cpp:1991 -msgid "Connecting..." -msgstr "Connexion..." - -#: ../../../ui.cpp:1996 -msgid "Unable to connect" -msgstr "Impossible de se connecter" - -#: ../../../ui.cpp:2001 -msgid "Requesting public key..." -msgstr "Requête de la clef publique..." - -#: ../../../ui.cpp:2013 -msgid "Received public key..." -msgstr "Clef publique reçue..." - -#: ../../../ui.cpp:2025 -msgid "Transfer was not accepted" -msgstr "Le transfer n'a pas été accepté" - -#: ../../../ui.cpp:2034 -msgid "Invalid response received" -msgstr "Réponse invalide reçue" - -#: ../../../ui.cpp:2049 -msgid "Creating transaction..." -msgstr "Création de la transaction..." - -#: ../../../ui.cpp:2061 -#, c-format -msgid "This is an oversized transaction that requires a transaction fee of %s" -msgstr "Ceci est une transaction de taille excessive qui nécessite des frais de transaction de %s" - -#: ../../../ui.cpp:2063 -msgid "Transaction creation failed" -msgstr "La création de la transaction a échouée" - -#: ../../../ui.cpp:2070 -msgid "Transaction aborted" -msgstr "Transaction interrompue" - -#: ../../../ui.cpp:2078 -msgid "Lost connection, transaction cancelled" -msgstr "Connexion perdue, transaction annulée" - -#: ../../../ui.cpp:2094 -msgid "Sending payment..." -msgstr "Envoi du paiement..." - -#: ../../../ui.cpp:2100 -msgid "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." -msgstr "La transaction a été rejetée. Ceci peut arriver si une partie des pièces de votre porte-monnaie ont déjà été dépensées, par exemple si vous avez utilisé une copie de wallet.dat et que les pièces ont été dépensées dans la copie mais pas marquées comme telles ici." - -#: ../../../ui.cpp:2109 -msgid "Waiting for confirmation..." -msgstr "Attente de confirmation..." - -#: ../../../ui.cpp:2127 -msgid "" -"The payment was sent, but the recipient was unable to verify it.\n" -"The transaction is recorded and will credit to the recipient,\n" -"but the comment information will be blank." -msgstr "" -"Le paiement a été envoyé, mais le destinataire n'a pas pû le vérifier.\n" -"La transaction est enregistrée et sera créditée au destinataire,\n" -"mais le commentaire sera vide." - -#: ../../../ui.cpp:2136 -msgid "Payment was sent, but an invalid response was received" -msgstr "Le paiement a été envoyé, mais une réponse invalide a été reçue" - -#: ../../../ui.cpp:2142 -msgid "Payment completed" -msgstr "Paiement terminé" - -#: ../../../ui.cpp:2173 -#: ../../../ui.cpp:2319 -#: ../../../ui.cpp:2356 -msgid "Name" -msgstr "Nom" - -#: ../../../ui.cpp:2174 -#: ../../../ui.cpp:2319 -#: ../../../ui.cpp:2356 -msgid "Address" -msgstr "Adresse" - -#: ../../../ui.cpp:2176 -#: ../../../ui.cpp:2331 -msgid "Label" -msgstr "Intitulé" - -#: ../../../ui.cpp:2177 -#: ../../../uibase.cpp:902 -msgid "Bitcoin Address" -msgstr "Adresse Bitcoin" - -#: ../../../ui.cpp:2301 -msgid "This is one of your own addresses for receiving payments and cannot be entered in the address book. " -msgstr "Ceci est une de vos adresses de reception de paiement, et ne peut être ajoutée au carnet d'adresse. " - -#: ../../../ui.cpp:2319 -#: ../../../ui.cpp:2325 -msgid "Edit Address" -msgstr "Modifier l'adresse" - -#: ../../../ui.cpp:2331 -msgid "Edit Address Label" -msgstr "Modifier l'intitulé de l'adresse" - -#: ../../../ui.cpp:2356 -#: ../../../ui.cpp:2362 -msgid "Add Address" -msgstr "Ajouter une adresse" - -#: ../../../ui.cpp:2438 -msgid "Bitcoin" -msgstr "Bitcoin" - -#: ../../../ui.cpp:2440 -msgid "Bitcoin - Generating" -msgstr "Bitcoin - Génération" - -#: ../../../ui.cpp:2442 -msgid "Bitcoin - (not connected)" -msgstr "Bitcoin - (non connecté)" - -#: ../../../ui.cpp:2519 -msgid "&Open Bitcoin" -msgstr "&Ouvrir Bitcoin" - -#: ../../../ui.cpp:2520 -msgid "O&ptions..." -msgstr "O&ptions..." - -#: ../../../ui.cpp:2524 -#: ../../../uibase.cpp:25 -msgid "E&xit" -msgstr "&Quitter" - -#: ../../../uibase.cpp:28 -msgid "&File" -msgstr "&Fichier" - -#: ../../../uibase.cpp:36 -msgid "&Your Receiving Addresses..." -msgstr "&Vos adresses de reception..." - -#: ../../../uibase.cpp:40 -msgid "&Options..." -msgstr "&Options..." - -#: ../../../uibase.cpp:43 -msgid "&Settings" -msgstr "&Préférences" - -#: ../../../uibase.cpp:47 -msgid "&About..." -msgstr "&À propos..." - -#: ../../../uibase.cpp:50 -msgid "&Help" -msgstr "&Aide" - -#: ../../../uibase.cpp:60 -msgid "Address Book" -msgstr "Carnet d'adresse" - -#: ../../../uibase.cpp:75 -msgid "Your Bitcoin Address:" -msgstr "Votre adresse Bitcoin :" - -#: ../../../uibase.cpp:82 -msgid " &New... " -msgstr " &Nouvelle... " - -#: ../../../uibase.cpp:85 -#: ../../../uibase.cpp:845 -#: ../../../uibase.cpp:948 -msgid " &Copy to Clipboard " -msgstr " &Copier dans le presse-papier " - -#: ../../../uibase.cpp:99 -msgid "Balance:" -msgstr "Solde :" - -#: ../../../uibase.cpp:115 -msgid " All" -msgstr " Tout" - -#: ../../../uibase.cpp:115 -msgid " Sent" -msgstr " Envoyés" - -#: ../../../uibase.cpp:115 -msgid " Received" -msgstr " Reçus" - -#: ../../../uibase.cpp:115 -msgid " In Progress" -msgstr " En cours" - -#: ../../../uibase.cpp:136 -msgid "All Transactions" -msgstr "Toutes les transactions" - -#: ../../../uibase.cpp:147 -msgid "Sent/Received" -msgstr "Envoyées/Reçues" - -#: ../../../uibase.cpp:158 -msgid "Sent" -msgstr "Envoyées" - -#: ../../../uibase.cpp:169 -msgid "Received" -msgstr "Reçues" - -#: ../../../uibase.cpp:312 -#: ../../../uibase.cpp:473 -#: ../../../uibase.cpp:574 -#: ../../../uibase.cpp:787 -#: ../../../uibase.cpp:848 -#: ../../../uibase.cpp:957 -#: ../../../uibase.cpp:1046 -msgid "OK" -msgstr "OK" - -#: ../../../uibase.cpp:355 -msgid "Optional transaction fee you give to the nodes that process your transactions." -msgstr "Frais de transaction optionel que vous donnez au nœud qui traite vos transactions." - -#: ../../../uibase.cpp:364 -msgid "Transaction fee:" -msgstr "Frais de transaction :" - -#: ../../../uibase.cpp:380 -msgid "&Limit coin generation to" -msgstr "&Limiter la génération de pièce à" - -#: ../../../uibase.cpp:387 -msgid "processors" -msgstr "processeurs" - -#: ../../../uibase.cpp:393 -msgid "&Start Bitcoin on system startup" -msgstr "&Lancer Bitcoin au démarrage du système" - -#: ../../../uibase.cpp:397 -msgid "&Minimize to the tray instead of the taskbar" -msgstr "" -"&Réduire dans la zone de notification\n" -"plutôt que dans la barre des tâches" - -#: ../../../uibase.cpp:401 -msgid "M&inimize to the tray on close" -msgstr "Ré&duire dans la zone de notification" - -#: ../../../uibase.cpp:408 -msgid "&Connect through socks4 proxy: " -msgstr "Se &connecter à travers un proxy SOCKS4: " - -#: ../../../uibase.cpp:420 -msgid "Proxy &IP:" -msgstr "&IP du proxy :" - -#: ../../../uibase.cpp:428 -msgid " &Port:" -msgstr " Port :" - -#: ../../../uibase.cpp:450 -msgid "// [don't translate] Test panel 2 for future expansion" -msgstr "" - -#: ../../../uibase.cpp:454 -msgid "// [don't translate] Let's not start multiple pages until the first page is filled up" -msgstr "" - -#: ../../../uibase.cpp:476 -#: ../../../uibase.cpp:729 -#: ../../../uibase.cpp:792 -#: ../../../uibase.cpp:851 -#: ../../../uibase.cpp:960 -#: ../../../uibase.cpp:1049 -msgid "Cancel" -msgstr "Annuler" - -#: ../../../uibase.cpp:479 -msgid "&Apply" -msgstr "&Appliquer" - -#: ../../../uibase.cpp:540 -msgid "Bitcoin " -msgstr "Bitcoin " - -#: ../../../uibase.cpp:546 -msgid "version" -msgstr "version" - -#: ../../../uibase.cpp:557 -msgid "" -"Copyright (c) 2009-2010 Bitcoin Developers\n" -"\n" -"This is experimental software.\n" -"\n" -"Distributed under the MIT/X11 software license, see the accompanying file \n" -"license.txt or http://www.opensource.org/licenses/mit-license.php.\n" -"\n" -"This product includes software developed by the OpenSSL Project for use in the \n" -"OpenSSL Toolkit (http://www.openssl.org/) and cryptographic software written by \n" -"Eric Young (eay@cryptsoft.com) and UPnP software written by Thomas Bernard." -msgstr "" -"Copyright (c) 2009-2010 Bitcoin Developers\n" -"\n" -"Ceci est un logiciel expérimental.\n" -"\n" -"Distribué sous la licence logicielle MIT/X11, voir le fichier joint \n" -"license.txt ou http://www.opensource.org/licenses/mit-license.php.\n" -"\n" -"Ce produit comprend des composants logiciels développés pour le Projet OpenSSL \n" -"OpenSSL Toolkit (http://www.openssl.org/) ainsi que des composants cryptographiques \n" -"écrits par Eric Young (eay@cryptsoft.com) et des logiciels UPnP écrits par Thomas Bernard.." - -#: ../../../uibase.cpp:613 -msgid "Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJED9L) or IP address (e.g. 123.45.6.7)" -msgstr "" -"Entrez une adresse Bitcoin (par exemple : 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJED9L)\n" -" ou une adresse IP (par exemple : 123.45.6.7)" - -#: ../../../uibase.cpp:627 -msgid "Pay &To:" -msgstr "&Payable à:" - -#: ../../../uibase.cpp:642 -msgid "&Paste" -msgstr "&Coller" - -#: ../../../uibase.cpp:645 -msgid " Address &Book..." -msgstr " Carnet d'&adresse..." - -#: ../../../uibase.cpp:652 -msgid "&Amount:" -msgstr "&Montant :" - -#: ../../../uibase.cpp:662 -msgid "T&ransfer:" -msgstr "T&ransfert :" - -#: ../../../uibase.cpp:668 -msgid " Standard" -msgstr " Standard" - -#: ../../../uibase.cpp:690 -msgid "&From:" -msgstr "&De :" - -#: ../../../uibase.cpp:707 -msgid "&Message:" -msgstr "&Message:" - -#: ../../../uibase.cpp:724 -msgid "&Send" -msgstr "&Envoyer" - -#: ../../../uibase.cpp:776 -msgid "" -"\n" -"\n" -"Connecting..." -msgstr "" -"\n" -"\n" -"Connexion..." - -#: ../../../uibase.cpp:826 -msgid "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. The highlighted address is displayed in the main window." -msgstr "Voici vos adresses Bitcoin de reception de paiement. Il peut être judicieux d'en fournir une différente à chaque émetteur afin de pouvoir suivre qui vous paie. L'adresse surlignée est affichée dans la fenêtre principale." - -#: ../../../uibase.cpp:839 -#: ../../../uibase.cpp:951 -msgid "&Edit..." -msgstr "&Modifier..." - -#: ../../../uibase.cpp:842 -#: ../../../uibase.cpp:954 -msgid " &New Address... " -msgstr " &Nouvelle adresse... " - -#: ../../../uibase.cpp:914 -msgid "Sending" -msgstr "Envoi" - -#: ../../../uibase.cpp:922 -msgid "These are your Bitcoin addresses for receiving payments. You can give a different one to each sender to keep track of who is paying you. The highlighted address will be displayed in the main window." -msgstr "Voici vos adresses Bitcoin de reception de paiement. Vous pouvez en fournir une différente à chaque émetteur afin de pouvoir suivre qui vous paie. L'adresse surlignée sera affichée dans la fenêtre principale." - -#: ../../../uibase.cpp:935 -msgid "Receiving" -msgstr "Reception" - -#: ../../../uibase.cpp:945 -msgid "&Delete" -msgstr "&Supprimer" - -#: ../../../uibase.h:149 -msgid "Transaction Details" -msgstr "Détails de la transaction" - -#: ../../../uibase.h:202 -msgid "Options" -msgstr "Options" - -#: ../../../uibase.h:230 -msgid "About Bitcoin" -msgstr "À propos de Bitcoin" - -#: ../../../uibase.h:340 -msgid "Your Bitcoin Addresses" -msgstr "Votre adresse Bitcoin" - -#~ msgid "Usage: bitcoin [options]" -#~ msgstr "Usage: bitcoin [options]" diff --git a/locale/it/LC_MESSAGES/bitcoin.mo b/locale/it/LC_MESSAGES/bitcoin.mo Binary files differdeleted file mode 100644 index 12386bc87e..0000000000 --- a/locale/it/LC_MESSAGES/bitcoin.mo +++ /dev/null diff --git a/locale/it/LC_MESSAGES/bitcoin.po b/locale/it/LC_MESSAGES/bitcoin.po deleted file mode 100644 index c041b1e3a8..0000000000 --- a/locale/it/LC_MESSAGES/bitcoin.po +++ /dev/null @@ -1,967 +0,0 @@ -msgid "" -msgstr "" -"Project-Id-Version: \n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-05-15 18:22+0100\n" -"PO-Revision-Date: 2011-05-26 09:46+0100\n" -"Last-Translator: Joozero <hostfat@gmail.com>\n" -"Language-Team: \n" -"Language: Italian\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"X-Poedit-KeywordsList: _;gettext;gettext_noop\n" -"X-Poedit-Basepath: .\n" -"X-Poedit-SearchPath-0: ../../..\n" - -#: ../../../src/net.cpp:1499 -#, c-format -msgid "Unable to bind to port %d on this computer. Bitcoin is probably already running." -msgstr "Impossibile utilizzare la porta %d su questo computer. Bitcoin probabilmente e' gia' in esecuzione" - -#: ../../../src/ui.cpp:202 -#, c-format -msgid "This transaction is over the size limit. You can still send it for a fee of %s, which goes to the nodes that process your transaction and helps to support the network. Do you want to pay the fee?" -msgstr "Questo trasferimento supera le dimensioni massime. Puoi comunque inviarlo per un costo aggiuntivo di %s, che andrà ai nodi che effettueranno il processo della tua operazione e che supportano il network. Vuoi pagare il costo aggiuntivo?" - -#: ../../../src/ui.cpp:301 -msgid "Status" -msgstr "Stato" - -#: ../../../src/ui.cpp:302 -msgid "Date" -msgstr "Data" - -#: ../../../src/ui.cpp:303 -msgid "Description" -msgstr "Descrizione" - -#: ../../../src/ui.cpp:304 -msgid "Debit" -msgstr "Debito" - -#: ../../../src/ui.cpp:305 -msgid "Credit" -msgstr "Credito" - -#: ../../../src/ui.cpp:511 -#, c-format -msgid "Open for %d blocks" -msgstr "Aperto per %d blocchi" - -#: ../../../src/ui.cpp:513 -#, c-format -msgid "Open until %s" -msgstr "Aperto fino a %s" - -#: ../../../src/ui.cpp:519 -#, c-format -msgid "%d/offline?" -msgstr "%d/disconnesso?" - -#: ../../../src/ui.cpp:521 -#, c-format -msgid "%d/unconfirmed" -msgstr "%d/non confermato" - -#: ../../../src/ui.cpp:523 -#, c-format -msgid "%d confirmations" -msgstr "%d conferme" - -#: ../../../src/ui.cpp:608 -msgid "Generated" -msgstr "Generato" - -#: ../../../src/ui.cpp:616 -#, c-format -msgid "Generated (%s matures in %d more blocks)" -msgstr "Generato (%s matureranno in %d altri blocchi)" - -#: ../../../src/ui.cpp:620 -msgid "Generated - Warning: This block was not received by any other nodes and will probably not be accepted!" -msgstr "Generato - Attenzione: Questo blocco non è stato ricevuto da nessun altro nodo e probabilmente non sarà accettato!" - -#: ../../../src/ui.cpp:624 -msgid "Generated (not accepted)" -msgstr "Generato (non accettato)" - -#: ../../../src/ui.cpp:634 -msgid "From: " -msgstr "Da: " - -#: ../../../src/ui.cpp:658 -msgid "Received with: " -msgstr "Ricevuto con: " - -#: ../../../src/ui.cpp:704 -msgid "Payment to yourself" -msgstr "Pagamento a te stesso" - -#: ../../../src/ui.cpp:738 -msgid "To: " -msgstr "A: " - -#: ../../../src/ui.cpp:1053 -msgid " Generating" -msgstr " Generando" - -#: ../../../src/ui.cpp:1055 -msgid "(not connected)" -msgstr "(non connesso)" - -#: ../../../src/ui.cpp:1058 -#, c-format -msgid " %d connections %d blocks %d transactions" -msgstr " %d connessioni %d blocchi %d trasferimenti" - -#: ../../../src/ui.cpp:1163 -#: ../../../src/ui.cpp:2527 -msgid "New Receiving Address" -msgstr "Nuovo indirizzo di ricezione" - -#: ../../../src/ui.cpp:1164 -#: ../../../src/ui.cpp:2528 -msgid "" -"You should use a new address for each payment you receive.\n" -"\n" -"Label" -msgstr "" -"Si dovrebbe usare un nuovo indirizzo per ogni pagamento che ricevi.\n" -"\n" -"Label" - -#: ../../../src/ui.cpp:1233 -msgid "<b>Status:</b> " -msgstr "<b>Stato:</b> " - -#: ../../../src/ui.cpp:1238 -msgid ", has not been successfully broadcast yet" -msgstr ", non è ancora stato trasmesso correttamente" - -#: ../../../src/ui.cpp:1240 -#, c-format -msgid ", broadcast through %d node" -msgstr ", trasmissione attraverso %d nodo" - -#: ../../../src/ui.cpp:1242 -#, c-format -msgid ", broadcast through %d nodes" -msgstr ", trasmissione attraverso %d nodi" - -#: ../../../src/ui.cpp:1246 -msgid "<b>Date:</b> " -msgstr "<b>Data:</b> " - -#: ../../../src/ui.cpp:1254 -msgid "<b>Source:</b> Generated<br>" -msgstr "<b>Sorgente:</b> Generato<br>" - -#: ../../../src/ui.cpp:1260 -#: ../../../src/ui.cpp:1278 -msgid "<b>From:</b> " -msgstr "<b>Da:</b> " - -#: ../../../src/ui.cpp:1278 -msgid "unknown" -msgstr "sconosciuto" - -#: ../../../src/ui.cpp:1279 -#: ../../../src/ui.cpp:1303 -#: ../../../src/ui.cpp:1362 -msgid "<b>To:</b> " -msgstr "<b>A:</b> " - -#: ../../../src/ui.cpp:1282 -msgid " (yours, label: " -msgstr " (vostro, label: " - -#: ../../../src/ui.cpp:1284 -msgid " (yours)" -msgstr " (vostro)" - -#: ../../../src/ui.cpp:1321 -#: ../../../src/ui.cpp:1333 -#: ../../../src/ui.cpp:1379 -#: ../../../src/ui.cpp:1396 -msgid "<b>Credit:</b> " -msgstr "<b>Credito:</b> " - -#: ../../../src/ui.cpp:1323 -#, c-format -msgid "(%s matures in %d more blocks)" -msgstr "(%s matureranno in %d altri blocchi)" - -#: ../../../src/ui.cpp:1325 -msgid "(not accepted)" -msgstr "(non accettato)" - -#: ../../../src/ui.cpp:1370 -#: ../../../src/ui.cpp:1378 -#: ../../../src/ui.cpp:1393 -msgid "<b>Debit:</b> " -msgstr "<b>Debito:</b> " - -#: ../../../src/ui.cpp:1384 -msgid "<b>Transaction fee:</b> " -msgstr "<b>Costo del trasferimento :</b> " - -#: ../../../src/ui.cpp:1400 -msgid "<b>Net amount:</b> " -msgstr "<b>Quantità del network:</b> " - -#: ../../../src/ui.cpp:1407 -msgid "Message:" -msgstr "Messaggio:" - -#: ../../../src/ui.cpp:1409 -msgid "Comment:" -msgstr "Commento:" - -#: ../../../src/ui.cpp:1412 -msgid "Generated coins must wait 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, it will change to \"not accepted\" and not be spendable. This may occasionally happen if another node generates a block within a few seconds of yours." -msgstr "Le monete generate devono aspettare 120 blocchi prima di poter essere spese. Quando hai generato questo blocco, è stato diffuso sul network per essere aggiunto alla catena dei blocchi. Se fallirà l'entrata nella catena, cambierà in \"non accettato\" e non spendibile. Questo può capitare se un altro nodo genera un blocco pochi secondi prima del tuo." - -#: ../../../src/ui.cpp:1592 -msgid "Cannot write autostart/bitcoin.desktop file" -msgstr "Impossibile creare il file autostart/bitcoin.desktop" - -#: ../../../src/ui.cpp:1628 -msgid "Main" -msgstr "Principale" - -#: ../../../src/ui.cpp:1636 -msgid "&Start Bitcoin on window system startup" -msgstr "&Avvia Bitcoin all'avvio del sistema" - -#: ../../../src/ui.cpp:1643 -msgid "&Minimize on close" -msgstr "&Minimizza se chiuso" - -#: ../../../src/ui.cpp:1785 -#, c-format -msgid "version %s" -msgstr "versione %s" - -#: ../../../src/ui.cpp:1897 -msgid "Error in amount " -msgstr "Errore nell'ammontare " - -#: ../../../src/ui.cpp:1897 -#: ../../../src/ui.cpp:1902 -#: ../../../src/ui.cpp:1907 -#: ../../../src/ui.cpp:1942 -#: ../../../src/uibase.cpp:55 -msgid "Send Coins" -msgstr "Invia monete" - -#: ../../../src/ui.cpp:1902 -msgid "Amount exceeds your balance " -msgstr "L'ammontare è andato oltre i tuoi capitali " - -#: ../../../src/ui.cpp:1907 -msgid "Total exceeds your balance when the " -msgstr "Il totale supera il tuo bilancio quando il " - -#: ../../../src/ui.cpp:1907 -msgid " transaction fee is included " -msgstr " il costo del trasferimento è incluso " - -#: ../../../src/ui.cpp:1925 -msgid "Payment sent " -msgstr "Pagamento inviato " - -#: ../../../src/ui.cpp:1925 -#: ../../../src/ui.cpp:1930 -#: ../../../src/ui.cpp:2074 -#: ../../../src/ui.cpp:2227 -#: ../../../src/main.cpp:3999 -msgid "Sending..." -msgstr "Invio in corso..." - -#: ../../../src/ui.cpp:1942 -msgid "Invalid address " -msgstr "Indirizzo non valido " - -#: ../../../src/ui.cpp:1995 -#, c-format -msgid "Sending %s to %s" -msgstr "Inviando %s a %s" - -#: ../../../src/ui.cpp:2068 -#: ../../../src/ui.cpp:2101 -msgid "CANCELLED" -msgstr "CANCELLATO" - -#: ../../../src/ui.cpp:2072 -msgid "Cancelled" -msgstr "Cancellato" - -#: ../../../src/ui.cpp:2074 -msgid "Transfer cancelled " -msgstr "Operazione cancellata " - -#: ../../../src/ui.cpp:2127 -msgid "Error: " -msgstr "Errore: " - -#: ../../../src/ui.cpp:2141 -#: ../../../src/ui.cpp:2212 -#: ../../../src/main.cpp:4018 -msgid "Insufficient funds" -msgstr "Fondi insufficenti" - -#: ../../../src/ui.cpp:2146 -msgid "Connecting..." -msgstr "Connessione in corso..." - -#: ../../../src/ui.cpp:2151 -msgid "Unable to connect" -msgstr "Impossibile connettersi" - -#: ../../../src/ui.cpp:2156 -msgid "Requesting public key..." -msgstr "Richiesta chiave pubblica..." - -#: ../../../src/ui.cpp:2168 -msgid "Received public key..." -msgstr "Ricezione chiave pubblica..." - -#: ../../../src/ui.cpp:2182 -msgid "Recipient is not accepting transactions sent by IP address" -msgstr "Il destinatario non accetta transazioni effettuate tramite questo IP" - -#: ../../../src/ui.cpp:2184 -msgid "Transfer was not accepted" -msgstr "Trasferimento non accettato" - -#: ../../../src/ui.cpp:2193 -msgid "Invalid response received" -msgstr "Risposta non valida ricevuta" - -#: ../../../src/ui.cpp:2208 -msgid "Creating transaction..." -msgstr "Creo transazione..." - -#: ../../../src/ui.cpp:2220 -#, c-format -msgid "This transaction requires a transaction fee of at least %s because of its amount, complexity, or use of recently received funds" -msgstr "Questa transazione richiede un costo di transazione di almeno %s a causa della sua quantità, complessità, o per l'uso di fondi recentemente ricevuti" - -#: ../../../src/ui.cpp:2222 -msgid "Transaction creation failed" -msgstr "Creazione trasferimento fallita" - -#: ../../../src/ui.cpp:2229 -msgid "Transaction aborted" -msgstr "Trasferimento bloccato" - -#: ../../../src/ui.cpp:2237 -msgid "Lost connection, transaction cancelled" -msgstr "Connessione persa, trasferimento cancellato" - -#: ../../../src/ui.cpp:2253 -msgid "Sending payment..." -msgstr "Invio del pagamento..." - -#: ../../../src/ui.cpp:2259 -msgid "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." -msgstr "Il trasferimento è stato respinto. Questo può accadere se alcune delle monete nel tuo portafoglio erano già state spese, o anche se hai usato una copia di wallet.dat e le monete erano già state spese nella copia originale ma non segnate in quest'ultima." - -#: ../../../src/ui.cpp:2268 -msgid "Waiting for confirmation..." -msgstr "In attesa di conferma..." - -#: ../../../src/ui.cpp:2286 -msgid "" -"The payment was sent, but the recipient was unable to verify it.\n" -"The transaction is recorded and will credit to the recipient,\n" -"but the comment information will be blank." -msgstr "" -"Il pagamento è stato inviato, ma il destinatario non è stato in grado di verificarlo.\n" -"Il trasferimento è registrato e sarà accreditato al destinatario,\n" -"ma il commento informativo verrà mostrato come vuoto." - -#: ../../../src/ui.cpp:2295 -msgid "Payment was sent, but an invalid response was received" -msgstr "Il pagamento è stato inviato, ma è arrivata un risposta invalida" - -#: ../../../src/ui.cpp:2301 -msgid "Payment completed" -msgstr "Pagamento completato" - -#: ../../../src/ui.cpp:2332 -#: ../../../src/ui.cpp:2478 -#: ../../../src/ui.cpp:2515 -msgid "Name" -msgstr "Nome" - -#: ../../../src/ui.cpp:2333 -#: ../../../src/ui.cpp:2478 -#: ../../../src/ui.cpp:2515 -msgid "Address" -msgstr "Indirizzo" - -#: ../../../src/ui.cpp:2335 -#: ../../../src/ui.cpp:2490 -msgid "Label" -msgstr "Label" - -#: ../../../src/ui.cpp:2336 -#: ../../../src/uibase.cpp:837 -msgid "Bitcoin Address" -msgstr "Indirizzo Bitcoin" - -#: ../../../src/ui.cpp:2460 -msgid "This is one of your own addresses for receiving payments and cannot be entered in the address book. " -msgstr "Questo qui è uno dei tuoi indirizzi personali per ricevere pagamenti e non può essere inserito nella rubrica indirizzi. " - -#: ../../../src/ui.cpp:2478 -#: ../../../src/ui.cpp:2484 -msgid "Edit Address" -msgstr "Modifica indirizzo" - -#: ../../../src/ui.cpp:2490 -msgid "Edit Address Label" -msgstr "Modifica spazio indirizzo" - -#: ../../../src/ui.cpp:2515 -#: ../../../src/ui.cpp:2521 -msgid "Add Address" -msgstr "Aggiungi indirizzo" - -#: ../../../src/ui.cpp:2598 -msgid "Bitcoin" -msgstr "Bitcoin" - -#: ../../../src/ui.cpp:2600 -msgid "Bitcoin - Generating" -msgstr "Bitcoin - Generando" - -#: ../../../src/ui.cpp:2602 -msgid "Bitcoin - (not connected)" -msgstr "Bitcoin - (non connesso)" - -#: ../../../src/ui.cpp:2681 -msgid "&Open Bitcoin" -msgstr "&Apri Bitcoin" - -#: ../../../src/ui.cpp:2682 -msgid "&Send Bitcoins" -msgstr "&Apri Bitcoin" - -#: ../../../src/ui.cpp:2683 -msgid "O&ptions..." -msgstr "&Opzioni..." - -#: ../../../src/ui.cpp:2686 -#: ../../../src/uibase.cpp:25 -msgid "E&xit" -msgstr "&Esci" - -#: ../../../src/ui.cpp:2902 -msgid "Program has crashed and will terminate. " -msgstr "Il programma è crashato e sarà terminato. " - -#: ../../../src/main.cpp:1868 -msgid "Warning: Disk space is low " -msgstr "Attenzione: c'è poco spazio sul disco " - -#: ../../../src/main.cpp:3992 -#, c-format -msgid "Error: This transaction requires a transaction fee of at least %s because of its amount, complexity, or use of recently received funds " -msgstr "Errore: Questa transazione richiede un costo di transazione di almeno %s a causa della sua quantità, complessità, o per l'uso di fondi recentemente ricevuti" - -#: ../../../src/main.cpp:3994 -msgid "Error: Transaction creation failed " -msgstr "Errore: Creazione del trasferimento fallito " - -#: ../../../src/main.cpp:4003 -msgid "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." -msgstr "Errore: Il trasferimento è stato respinto. Questo può accadere se alcune delle monete nel tuo portafoglio erano già state spese, o anche se hai usato una copia di wallet.dat e le monete erano già state spese nella copia originale ma non segnate in quest'ultima." - -#: ../../../src/main.cpp:4016 -msgid "Invalid amount" -msgstr "Quantità non valida" - -#: ../../../src/main.cpp:4023 -msgid "Invalid bitcoin address" -msgstr "Indirizzo bitcoin non valido" - -#: ../../../src/rpc.cpp:1800 -#: ../../../src/rpc.cpp:1802 -#, c-format -msgid "To use the %s option" -msgstr "Usare l'opzione %s" - -#: ../../../src/rpc.cpp:1804 -#, c-format -msgid "" -"Warning: %s, you must set rpcpassword=<password>\n" -"in the configuration file: %s\n" -"If the file does not exist, create it with owner-readable-only file permissions.\n" -msgstr "" -"Attenzione: %s, devi impostare rpcpassword=<password>\n" -"nel file di configurazione: %s\n" -"Se questo file non esiste, puoi crearlo come un file di sola lettura.\n" - -#: ../../../src/rpc.cpp:1972 -#, c-format -msgid "" -"You must set rpcpassword=<password> in the configuration file:\n" -"%s\n" -"If the file does not exist, create it with owner-readable-only file permissions." -msgstr "" -"Devi settare rpcpassword=<password> nel file di configurazione:\n" -"%s\n" -"Se questo file non esiste, puoi crearlo come un file di sola lettura" - -#: ../../../src/util.cpp:865 -msgid "Warning: Please check that your computer's date and time are correct. If your clock is wrong Bitcoin will not work properly." -msgstr "Attenzione: Controlla che data/ora del tuo computer siano corrette. Se il tuo orologio è sbagliato bitcoin non funzionerà correttamente" - -#: ../../../src/util.cpp:898 -msgid "beta" -msgstr "beta" - -#: ../../../src/uibase.cpp:28 -msgid "&File" -msgstr "&File" - -#: ../../../src/uibase.cpp:32 -msgid "&Your Receiving Addresses..." -msgstr "&Il tuo indirizzo di ricezione..." - -#: ../../../src/uibase.cpp:36 -msgid "&Options..." -msgstr "&Opzioni..." - -#: ../../../src/uibase.cpp:39 -msgid "&Settings" -msgstr "I&mpostazioni" - -#: ../../../src/uibase.cpp:43 -msgid "&About..." -msgstr "&Info..." - -#: ../../../src/uibase.cpp:46 -msgid "&Help" -msgstr "&Aiuto" - -#: ../../../src/uibase.cpp:56 -msgid "Address Book" -msgstr "Rubrica indirizzi" - -#: ../../../src/uibase.cpp:69 -msgid "Your Bitcoin Address:" -msgstr "Il tuo indirizzo Bitcoin:" - -#: ../../../src/uibase.cpp:76 -msgid " &New... " -msgstr " &Nuovo... " - -#: ../../../src/uibase.cpp:79 -#: ../../../src/uibase.cpp:780 -#: ../../../src/uibase.cpp:883 -msgid " &Copy to Clipboard " -msgstr " &Copia nella Clipboard " - -#: ../../../src/uibase.cpp:93 -msgid "Balance:" -msgstr "Bilancio:" - -#: ../../../src/uibase.cpp:109 -msgid " All" -msgstr " Tutte" - -#: ../../../src/uibase.cpp:109 -msgid " Sent" -msgstr " Inviato" - -#: ../../../src/uibase.cpp:109 -msgid " Received" -msgstr " Ricevuto" - -#: ../../../src/uibase.cpp:109 -msgid " In Progress" -msgstr " In lavorazione" - -#: ../../../src/uibase.cpp:130 -msgid "All Transactions" -msgstr "Tutte le transazioni" - -#: ../../../src/uibase.cpp:141 -msgid "Sent/Received" -msgstr "Inviato/Ricevuto" - -#: ../../../src/uibase.cpp:152 -msgid "Sent" -msgstr "Inviato" - -#: ../../../src/uibase.cpp:163 -msgid "Received" -msgstr "Ricevuto" - -#: ../../../src/uibase.cpp:302 -#: ../../../src/uibase.cpp:443 -#: ../../../src/uibase.cpp:542 -#: ../../../src/uibase.cpp:722 -#: ../../../src/uibase.cpp:783 -#: ../../../src/uibase.cpp:892 -#: ../../../src/uibase.cpp:981 -msgid "OK" -msgstr "OK" - -#: ../../../src/uibase.cpp:345 -msgid "&Start Bitcoin on system startup" -msgstr "&Avvia Bitcoin all'avvio del sistema" - -#: ../../../src/uibase.cpp:348 -msgid "&Minimize to the tray instead of the taskbar" -msgstr "&Minimizza nella tray invece che nella barra" - -#: ../../../src/uibase.cpp:351 -msgid "Map port using &UPnP" -msgstr "Imposta le porte del firewall utilizzando &UPnP" - -#: ../../../src/uibase.cpp:354 -msgid "&Minimize to the tray on close" -msgstr "&Minimizza nella tray alla chiusura" - -#: ../../../src/uibase.cpp:360 -msgid "&Connect through socks4 proxy: " -msgstr "&Connesso attraverso proxy socks4: " - -#: ../../../src/uibase.cpp:371 -msgid "Proxy &IP:" -msgstr "Proxy &IP:" - -#: ../../../src/uibase.cpp:379 -msgid " &Port:" -msgstr " &Porta:" - -#: ../../../src/uibase.cpp:392 -msgid "Optional transaction fee per KB that helps make sure your transactions are processed quickly. Most transactions are 1KB. Fee 0.01 recommended." -msgstr "Tassa di transazione per ogni KB opzionale che consente di assicurarsi che le transazioni siano trattate con rapidità. La maggior parte delle operazioni sono 1KB. Quota 0,01 raccomandata." - -#: ../../../src/uibase.cpp:399 -msgid "Pay transaction fee:" -msgstr "Costo trasferimento:" - -#: ../../../src/uibase.cpp:420 -msgid "// [don't translate] Test panel 2 for future expansion" -msgstr "" - -#: ../../../src/uibase.cpp:424 -msgid "// [don't translate] Let's not start multiple pages until the first page is filled up" -msgstr "" - -#: ../../../src/uibase.cpp:446 -#: ../../../src/uibase.cpp:668 -#: ../../../src/uibase.cpp:727 -#: ../../../src/uibase.cpp:786 -#: ../../../src/uibase.cpp:895 -#: ../../../src/uibase.cpp:984 -msgid "Cancel" -msgstr "Cancella" - -#: ../../../src/uibase.cpp:449 -msgid "&Apply" -msgstr "&Accetta" - -#: ../../../src/uibase.cpp:508 -msgid "Bitcoin " -msgstr "Bitcoin " - -#: ../../../src/uibase.cpp:514 -msgid "version" -msgstr "versione" - -#: ../../../src/uibase.cpp:525 -msgid "" -"Copyright (c) 2009-2011 Bitcoin Developers\n" -"\n" -"This is experimental software.\n" -"\n" -"Distributed under the MIT/X11 software license, see the accompanying file \n" -"license.txt or http://www.opensource.org/licenses/mit-license.php.\n" -"\n" -"This product includes software developed by the OpenSSL Project for use in the \n" -"OpenSSL Toolkit (http://www.openssl.org/) and cryptographic software written by \n" -"Eric Young (eay@cryptsoft.com) and UPnP software written by Thomas Bernard." -msgstr "" -"Copyright (c) 2009-2010 Bitcoin Developers\n" -"\n" -"Questo è un software sperimentale.\n" -"\n" -"Distribuito sotto la licenza software MIT/X11, guarda il file license.txt\n" -"incluso oppure su http://www.opensource.org/licenses/mit-license.php.\n" -"\n" -"Questo prodotto include software sviluppato dal progetto OpenSSL per\n" -"l'uso del (http://www.openssl.org/) e il software criptografico scritto\n" -"da Eric Young (eay@cryptsoft.com) e UPnP software scritto da Thomas Bernard." - -#: ../../../src/uibase.cpp:581 -msgid "Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)" -msgstr "Inserisci un indirizzo Bitcoin (es. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)" - -#: ../../../src/uibase.cpp:595 -msgid "Pay &To:" -msgstr "Paga &a:" - -#: ../../../src/uibase.cpp:610 -msgid "&Paste" -msgstr "&Incolla" - -#: ../../../src/uibase.cpp:613 -msgid " Address &Book..." -msgstr " &Rubrica degli indirizzi..." - -#: ../../../src/uibase.cpp:620 -msgid "&Amount:" -msgstr "&Quantità" - -#: ../../../src/uibase.cpp:630 -msgid "&Transfer:" -msgstr "&Trasferimento:" - -#: ../../../src/uibase.cpp:636 -msgid " Standard" -msgstr " Standard" - -#: ../../../src/uibase.cpp:663 -msgid "&Send" -msgstr "&Invia" - -#: ../../../src/uibase.cpp:711 -msgid "" -"\n" -"\n" -"Connecting..." -msgstr "" -"\n" -"\n" -"Connessione in corso..." - -#: ../../../src/uibase.cpp:761 -msgid "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. The highlighted address is displayed in the main window." -msgstr "Questi sono i tuoi indirizzi Bitcoin per ricevere pagamenti. Potrai darne uno diverso ad ognuno per cosi tenere traccia di chi ti sta pagando. L'indirizzo selezionato sarà quello mostrato nella finestra principale." - -#: ../../../src/uibase.cpp:774 -#: ../../../src/uibase.cpp:886 -msgid "&Edit..." -msgstr "&Cambia..." - -#: ../../../src/uibase.cpp:777 -#: ../../../src/uibase.cpp:889 -msgid " &New Address... " -msgstr " &Nuovo indirizzo... " - -#: ../../../src/uibase.cpp:849 -msgid "Sending" -msgstr "Invio in corso.." - -#: ../../../src/uibase.cpp:857 -msgid "These are your Bitcoin addresses for receiving payments. You can give a different one to each sender to keep track of who is paying you. The highlighted address will be displayed in the main window." -msgstr "Questi sono i tuoi indirizzi Bitcoin per ricevere pagamenti. Potrai darne uno diverso ad ognuno per cosi tenere traccia di chi ti sta pagando. L'indirizzo selezionato sarà quello mostrato nella finestra principale." - -#: ../../../src/uibase.cpp:870 -msgid "Receiving" -msgstr "Ricevendo" - -#: ../../../src/uibase.cpp:880 -msgid "&Delete" -msgstr "&Cancella" - -#: ../../../src/init.cpp:147 -msgid "Bitcoin version" -msgstr "Versione Bitcoin " - -#: ../../../src/init.cpp:148 -msgid "Usage:" -msgstr "Uso:" - -#: ../../../src/init.cpp:150 -msgid "Send command to -server or bitcoind\n" -msgstr "Invia comando a -server o a bitcoin\n" - -#: ../../../src/init.cpp:151 -msgid "List commands\n" -msgstr "Lista comandi\n" - -#: ../../../src/init.cpp:152 -msgid "Get help for a command\n" -msgstr "Chiedi aiuto per i comandi\n" - -#: ../../../src/init.cpp:153 -msgid "Options:\n" -msgstr "Opzioni:\n" - -#: ../../../src/init.cpp:154 -msgid "Specify configuration file (default: bitcoin.conf)\n" -msgstr "Specifica il file di configurazione (normalmente e': bitcoin.conf)\n" - -#: ../../../src/init.cpp:155 -msgid "Specify pid file (default: bitcoind.pid)\n" -msgstr "Specifica il fil pid (normalmente: bitcoin.pid)\n" - -#: ../../../src/init.cpp:156 -msgid "Generate coins\n" -msgstr "Genera monete\n" - -#: ../../../src/init.cpp:157 -msgid "Don't generate coins\n" -msgstr "Non generare monete\n" - -#: ../../../src/init.cpp:158 -msgid "Start minimized\n" -msgstr "Avvia minimizzato\n" - -#: ../../../src/init.cpp:159 -msgid "Specify data directory\n" -msgstr "Indica la cartella per i dati\n" - -#: ../../../src/init.cpp:160 -msgid "Connect through socks4 proxy\n" -msgstr "Connetti attraverso proxy socks4\n" - -#: ../../../src/init.cpp:161 -msgid "Allow DNS lookups for addnode and connect\n" -msgstr "Permetti DNS lookups per aggiungere un nodo e collegarsi\n" - -#: ../../../src/init.cpp:162 -msgid "Add a node to connect to\n" -msgstr "Aggiungi un nodoper la connessione a\n" - -#: ../../../src/init.cpp:163 -msgid "Connect only to the specified node\n" -msgstr "Collegati solo al nodo specificato\n" - -#: ../../../src/init.cpp:164 -msgid "Don't accept connections from outside\n" -msgstr "Non accettare connessioni dall'esterno\n" - -#: ../../../src/init.cpp:167 -msgid "Don't attempt to use UPnP to map the listening port\n" -msgstr "Non provare a usare UPnP per mappare le porte in ascolto\n" - -#: ../../../src/init.cpp:169 -msgid "Attempt to use UPnP to map the listening port\n" -msgstr "Prova ad usare l' UPnP per mappare la porte in ascolto\n" - -#: ../../../src/init.cpp:172 -msgid "Fee per KB to add to transactions you send\n" -msgstr "Tassa per KB da aggiungere alle operazioni di invio\n" - -#: ../../../src/init.cpp:174 -msgid "Accept command line and JSON-RPC commands\n" -msgstr "Accetta linea di comando e i comando JSON-RPC\n" - -#: ../../../src/init.cpp:177 -msgid "Run in the background as a daemon and accept commands\n" -msgstr "Avvia in background come processo e accetta i comandi\n" - -#: ../../../src/init.cpp:179 -msgid "Use the test network\n" -msgstr "Usa il network test\n" - -#: ../../../src/init.cpp:180 -msgid "Username for JSON-RPC connections\n" -msgstr "Username per le connessioni JSON-RPC\n" - -#: ../../../src/init.cpp:181 -msgid "Password for JSON-RPC connections\n" -msgstr "Password per le connessioni JSON-RPC\n" - -#: ../../../src/init.cpp:182 -msgid "Listen for JSON-RPC connections on <port> (default: 8332)\n" -msgstr "In ascolta per connessioni JSON-RPC sulla porta <port> (default: 8332)\n" - -#: ../../../src/init.cpp:183 -msgid "Allow JSON-RPC connections from specified IP address\n" -msgstr "Permetti connessioni JSON-RPC da un indirizzo IP specifico\n" - -#: ../../../src/init.cpp:184 -msgid "Send commands to node running on <ip> (default: 127.0.0.1)\n" -msgstr "Invia comandi al nodo in esecuzione su <ip> (default: 127.0.0.1)\n" - -#: ../../../src/init.cpp:185 -msgid "Set key pool size to <n> (default: 100)\n" -msgstr "Imposta la dimensione della key pool a <n> (default: 100)\n" - -#: ../../../src/init.cpp:186 -msgid "Rescan the block chain for missing wallet transactions\n" -msgstr "Ricontrolla il blocco della catena transazioni del portafoglio mancate\n" - -#: ../../../src/init.cpp:190 -msgid "" -"\n" -"SSL options: (see the Bitcoin Wiki for SSL setup instructions)\n" -msgstr "" -"\n" -"opzioni SSL: (Consulta Bitcoin Wiki per le istruzioni di configurazione dell' SSL)\n" - -#: ../../../src/init.cpp:191 -msgid "Use OpenSSL (https) for JSON-RPC connections\n" -msgstr "Usa OpenSSL (https) per connessioni JSON-RPC\n" - -#: ../../../src/init.cpp:192 -msgid "Server certificate file (default: server.cert)\n" -msgstr "File del certificato del server (default: server.cert)\n" - -#: ../../../src/init.cpp:193 -msgid "Server private key (default: server.pem)\n" -msgstr "Chiave del server privata ((default: server.pem)\n" - -#: ../../../src/init.cpp:194 -msgid "Acceptable ciphers (default: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH)\n" -msgstr "Cifrari accettati (default: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH)\n" - -#: ../../../src/init.cpp:198 -msgid "This help message\n" -msgstr "Questo messaggio di aiuto\n" - -#: ../../../src/init.cpp:335 -#, c-format -msgid "Cannot obtain a lock on data directory %s. Bitcoin is probably already running." -msgstr "Impossibile ottenere un blocco sulla directory %s. Bitcoin e' probabilmente gia' in esecuzione" - -#: ../../../src/init.cpp:361 -msgid "Error loading addr.dat \n" -msgstr "Errore nel caricamento addr.dat \n" - -#: ../../../src/init.cpp:367 -msgid "Error loading blkindex.dat \n" -msgstr "Errore nel caricamento blkindex.dat \n" - -#: ../../../src/init.cpp:374 -msgid "Error loading wallet.dat \n" -msgstr "Errore nel caricamento wallet.dat \n" - -#: ../../../src/init.cpp:454 -msgid "Invalid -proxy address" -msgstr "Indirizzo proxy non valido" - -#: ../../../src/init.cpp:477 -msgid "Invalid amount for -paytxfee=<amount>" -msgstr "Quantita' non valida per -paytxfee=<amount>" - -#: ../../../src/init.cpp:481 -msgid "Warning: -paytxfee is set very high. This is the transaction fee you will pay if you send a transaction." -msgstr "Attenzione: -paytxfee e' molto alta. Questo e' la tassa che pagherai se invii la transazione" - -#: ../../../src/uibase.h:147 -msgid "Transaction Details" -msgstr "Dettagli transazione" - -#: ../../../src/uibase.h:199 -msgid "Options" -msgstr "Opzioni" - -#: ../../../src/uibase.h:228 -msgid "About Bitcoin" -msgstr "Info Bitcoin" - -#: ../../../src/uibase.h:337 -msgid "Your Bitcoin Addresses" -msgstr "Il tuo indirizzo Bitcoin" diff --git a/locale/lt/LC_MESSAGES/bitcoin.mo b/locale/lt/LC_MESSAGES/bitcoin.mo Binary files differdeleted file mode 100644 index bba16a857f..0000000000 --- a/locale/lt/LC_MESSAGES/bitcoin.mo +++ /dev/null diff --git a/locale/lt/LC_MESSAGES/bitcoin.po b/locale/lt/LC_MESSAGES/bitcoin.po deleted file mode 100644 index b0decb26cb..0000000000 --- a/locale/lt/LC_MESSAGES/bitcoin.po +++ /dev/null @@ -1,971 +0,0 @@ -msgid "" -msgstr "" -"Project-Id-Version: \n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-05-17 14:07+0100\n" -"PO-Revision-Date: 2011-05-17 14:09+0100\n" -"Last-Translator: Anonymous <anon@none>\n" -"Language-Team: \n" -"Language: \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"X-Poedit-KeywordsList: _;gettext;gettext_noop\n" -"X-Poedit-Basepath: .\n" -"X-Poedit-SearchPath-0: ../../..\n" - -#: ../../../src/net.cpp:1503 -#, c-format -msgid "Unable to bind to port %d on this computer. Bitcoin is probably already running." -msgstr "Neįmanoma prisijungti prie šio kompiuterio porto %d. Bitcoin programa tikriausiai jau yra paleista" - -#: ../../../src/ui.cpp:204 -#, c-format -msgid "This transaction is over the size limit. You can still send it for a fee of %s, which goes to the nodes that process your transaction and helps to support the network. Do you want to pay the fee?" -msgstr "Šis pervedimas viršija dydžio limitą. Jūs galite siūsti šią suma sumokėję %s mokestį, kuris bus skirtas nodams už persiuntimą ir padėti tinklui. Ar sutinkate pridėti ši mokestį?" - -#: ../../../src/ui.cpp:303 -msgid "Status" -msgstr "Būklė" - -#: ../../../src/ui.cpp:304 -msgid "Date" -msgstr "Data" - -#: ../../../src/ui.cpp:305 -msgid "Description" -msgstr "Apibūdinimas" - -#: ../../../src/ui.cpp:306 -msgid "Debit" -msgstr "Debetas" - -#: ../../../src/ui.cpp:307 -msgid "Credit" -msgstr "Kreditas" - -#: ../../../src/ui.cpp:513 -#, c-format -msgid "Open for %d blocks" -msgstr "Atidaryta %d blokams" - -#: ../../../src/ui.cpp:515 -#, c-format -msgid "Open until %s" -msgstr "Atidaryta iki %s" - -#: ../../../src/ui.cpp:521 -#, c-format -msgid "%d/offline?" -msgstr "%d/neprisijunges?" - -#: ../../../src/ui.cpp:523 -#, c-format -msgid "%d/unconfirmed" -msgstr "%d/ nepatvirtinta" - -#: ../../../src/ui.cpp:525 -#, c-format -msgid "%d confirmations" -msgstr "%d patvirtinta" - -#: ../../../src/ui.cpp:610 -msgid "Generated" -msgstr "Sugeneruota" - -#: ../../../src/ui.cpp:618 -#, c-format -msgid "Generated (%s matures in %d more blocks)" -msgstr "Sugeneruota (%s bus galima naudoti už %d blokų)" - -#: ../../../src/ui.cpp:622 -msgid "Generated - Warning: This block was not received by any other nodes and will probably not be accepted!" -msgstr "Sugeneruota - Perspėjimas: Šio bloko negavo kiti nodai ir jis tikriausiai nebus priimtas!" - -#: ../../../src/ui.cpp:626 -msgid "Generated (not accepted)" -msgstr "Sugeneruota (nepriimta)" - -#: ../../../src/ui.cpp:636 -msgid "From: " -msgstr "Nuo: " - -#: ../../../src/ui.cpp:660 -msgid "Received with: " -msgstr "Priimta su: " - -#: ../../../src/ui.cpp:706 -msgid "Payment to yourself" -msgstr "Pervedimas sau" - -#: ../../../src/ui.cpp:740 -msgid "To: " -msgstr "Kam: " - -#: ../../../src/ui.cpp:1055 -msgid " Generating" -msgstr " Generuojama" - -#: ../../../src/ui.cpp:1057 -msgid "(not connected)" -msgstr "(neprijungta)" - -#: ../../../src/ui.cpp:1060 -#, c-format -msgid " %d connections %d blocks %d transactions" -msgstr " %d Jungtys %d Blokai %d pervedimai" - -#: ../../../src/ui.cpp:1165 -#: ../../../src/ui.cpp:2529 -msgid "New Receiving Address" -msgstr "Naujas priėmimo adresas" - -#: ../../../src/ui.cpp:1166 -#: ../../../src/ui.cpp:2530 -msgid "" -"You should use a new address for each payment you receive.\n" -"\n" -"Label" -msgstr "" -"Naudokite naują adresas kiekvienam pervedimui.\n" -"\n" -"Pavadinimas" - -#: ../../../src/ui.cpp:1235 -msgid "<b>Status:</b> " -msgstr "<b>Būklė:</b> " - -#: ../../../src/ui.cpp:1240 -msgid ", has not been successfully broadcast yet" -msgstr ", dar nėra paskelbta" - -#: ../../../src/ui.cpp:1242 -#, c-format -msgid ", broadcast through %d node" -msgstr ", paskelbta per %d nodą" - -#: ../../../src/ui.cpp:1244 -#, c-format -msgid ", broadcast through %d nodes" -msgstr ", paskelbta per %d nodus" - -#: ../../../src/ui.cpp:1248 -msgid "<b>Date:</b> " -msgstr "<b>Data:</b> " - -#: ../../../src/ui.cpp:1256 -msgid "<b>Source:</b> Generated<br>" -msgstr "<b>Iš:</b> Sugeneruota<br>" - -#: ../../../src/ui.cpp:1262 -#: ../../../src/ui.cpp:1280 -msgid "<b>From:</b> " -msgstr "<b>Nuo:</b> " - -#: ../../../src/ui.cpp:1280 -msgid "unknown" -msgstr "nežinomas" - -#: ../../../src/ui.cpp:1281 -#: ../../../src/ui.cpp:1305 -#: ../../../src/ui.cpp:1364 -msgid "<b>To:</b> " -msgstr "<b>Kam:</b> " - -#: ../../../src/ui.cpp:1284 -msgid " (yours, label: " -msgstr " (jūsų, pavadinimas: " - -#: ../../../src/ui.cpp:1286 -msgid " (yours)" -msgstr " (jūsų)" - -#: ../../../src/ui.cpp:1323 -#: ../../../src/ui.cpp:1335 -#: ../../../src/ui.cpp:1381 -#: ../../../src/ui.cpp:1398 -msgid "<b>Credit:</b> " -msgstr "<b>Kreditas:</b> " - -#: ../../../src/ui.cpp:1325 -#, c-format -msgid "(%s matures in %d more blocks)" -msgstr "(%s bus galima naudoti už %d blokų)" - -#: ../../../src/ui.cpp:1327 -msgid "(not accepted)" -msgstr "(nepriimta)" - -#: ../../../src/ui.cpp:1372 -#: ../../../src/ui.cpp:1380 -#: ../../../src/ui.cpp:1395 -msgid "<b>Debit:</b> " -msgstr "<b>Debetas:</b> " - -#: ../../../src/ui.cpp:1386 -msgid "<b>Transaction fee:</b> " -msgstr "<b>Pervedimo mokestis:</b> " - -#: ../../../src/ui.cpp:1402 -msgid "<b>Net amount:</b> " -msgstr "<b>Neto suma:</b> " - -#: ../../../src/ui.cpp:1409 -msgid "Message:" -msgstr "Žinutė:" - -#: ../../../src/ui.cpp:1411 -msgid "Comment:" -msgstr "Komentaras:" - -#: ../../../src/ui.cpp:1414 -msgid "Generated coins must wait 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, it will change to \"not accepted\" and not be spendable. This may occasionally happen if another node generates a block within a few seconds of yours." -msgstr "Turite palaukti 120 blokų, kol galėsite išleisti sugeneruotas monetas. Kai sugeneravotė šį blokai, jis buvo paskelbtas tinklui ir bus pridėtas į blokų grandinę. Jei šio bloko tinklas nepriims i grandinė, jis pasikeis į \"nepriimtas\" ir negali būti išleidžiamas. Tai gali kartais nutikti jei kitas nodas sugeneravo bloką keliom sekundėm anksčiau." - -#: ../../../src/ui.cpp:1594 -msgid "Cannot write autostart/bitcoin.desktop file" -msgstr "Nepavyksta įrašyti į autostart/bitcoin.desktop failą" - -#: ../../../src/ui.cpp:1630 -msgid "Main" -msgstr "Pagrindinis" - -#: ../../../src/ui.cpp:1638 -msgid "&Start Bitcoin on window system startup" -msgstr "&Paleisti Bitcoin kai pasileižia operacinė sistema" - -#: ../../../src/ui.cpp:1645 -msgid "&Minimize on close" -msgstr "&Sumažinti kai uždaroma" - -#: ../../../src/ui.cpp:1787 -#, c-format -msgid "version %s" -msgstr "versija %s" - -#: ../../../src/ui.cpp:1899 -msgid "Error in amount " -msgstr "Klaidinga suma" - -#: ../../../src/ui.cpp:1899 -#: ../../../src/ui.cpp:1904 -#: ../../../src/ui.cpp:1909 -#: ../../../src/ui.cpp:1944 -#: ../../../src/uibase.cpp:55 -msgid "Send Coins" -msgstr "Siūsti monetas" - -#: ../../../src/ui.cpp:1904 -msgid "Amount exceeds your balance " -msgstr "Suma viršija jūsų balasą" - -#: ../../../src/ui.cpp:1909 -msgid "Total exceeds your balance when the " -msgstr "Bendra suma viršija jūsu balansą kai" - -#: ../../../src/ui.cpp:1909 -msgid " transaction fee is included " -msgstr "pervedimo suma įskaičiuota" - -#: ../../../src/ui.cpp:1927 -msgid "Payment sent " -msgstr "Mokestis išsiųstas" - -#: ../../../src/ui.cpp:1927 -#: ../../../src/ui.cpp:1932 -#: ../../../src/ui.cpp:2076 -#: ../../../src/ui.cpp:2229 -#: ../../../src/main.cpp:3997 -msgid "Sending..." -msgstr "Siunčia..." - -#: ../../../src/ui.cpp:1944 -msgid "Invalid address " -msgstr "Klaidingas adresas" - -#: ../../../src/ui.cpp:1997 -#, c-format -msgid "Sending %s to %s" -msgstr "Siunčia %s į %s" - -#: ../../../src/ui.cpp:2070 -#: ../../../src/ui.cpp:2103 -msgid "CANCELLED" -msgstr "NUTRAUKTA" - -#: ../../../src/ui.cpp:2074 -msgid "Cancelled" -msgstr "Nutraukta" - -#: ../../../src/ui.cpp:2076 -msgid "Transfer cancelled " -msgstr "Siuntimas nutrauktas" - -#: ../../../src/ui.cpp:2129 -msgid "Error: " -msgstr "Klaida:" - -#: ../../../src/ui.cpp:2143 -#: ../../../src/ui.cpp:2214 -#: ../../../src/main.cpp:4016 -msgid "Insufficient funds" -msgstr "Nepakankamai monetų" - -#: ../../../src/ui.cpp:2148 -msgid "Connecting..." -msgstr "Jungiasi..." - -#: ../../../src/ui.cpp:2153 -msgid "Unable to connect" -msgstr "Negali prisijungti" - -#: ../../../src/ui.cpp:2158 -msgid "Requesting public key..." -msgstr "Prašo \"viešojo rakto\"(public key)..." - -#: ../../../src/ui.cpp:2170 -msgid "Received public key..." -msgstr "Gautas \"viešasis raktas\"(public key)..." - -#: ../../../src/ui.cpp:2184 -msgid "Recipient is not accepting transactions sent by IP address" -msgstr "Gavėjas nepriima pervedimų siunčiamų iš IP adresų" - -#: ../../../src/ui.cpp:2186 -msgid "Transfer was not accepted" -msgstr "Persiuntimas nepriimtas" - -#: ../../../src/ui.cpp:2195 -msgid "Invalid response received" -msgstr "Gautas klaidingas atsakymas" - -#: ../../../src/ui.cpp:2210 -msgid "Creating transaction..." -msgstr "Kuriamas pervedimas..." - -#: ../../../src/ui.cpp:2222 -#, c-format -msgid "This transaction requires a transaction fee of at least %s because of its amount, complexity, or use of recently received funds" -msgstr "Šis pervedimas reikalauja %s mokesčio dėl jo sumos, sudėtingumo arba dėl to, kad šie pinigai buvo neseniai gauti" - -#: ../../../src/ui.cpp:2224 -msgid "Transaction creation failed" -msgstr "Pervedimo sukurti nepavyko" - -#: ../../../src/ui.cpp:2231 -msgid "Transaction aborted" -msgstr "Pervedimas nutrauktas" - -#: ../../../src/ui.cpp:2239 -msgid "Lost connection, transaction cancelled" -msgstr "Prarastas ryšys, pervedimas nutrauktas" - -#: ../../../src/ui.cpp:2255 -msgid "Sending payment..." -msgstr "Monetos siunčiamos..." - -#: ../../../src/ui.cpp:2261 -msgid "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." -msgstr "Pervedimas buvo atmestas. Tai galėjo atsitikti jei dalis jūsų monetų jau buvo išleista. Pvz.: Jei nodojote kopija wallet.dat kitame kliente ir monetos buvo išleistos ten, bet nepažymėtos kaip išleistos čia." - -#: ../../../src/ui.cpp:2270 -msgid "Waiting for confirmation..." -msgstr "Laukia patvirtinimo..." - -#: ../../../src/ui.cpp:2288 -msgid "" -"The payment was sent, but the recipient was unable to verify it.\n" -"The transaction is recorded and will credit to the recipient,\n" -"but the comment information will be blank." -msgstr "" -"Pervedimas išsiūstas, bet gavėjas negalėjo jo patvirtinti.\n" -"Pervedimas įrašytas ir suma bus kredituojama gavėjui,\n" -"bet komentaro informacija nebus rodoma." - -#: ../../../src/ui.cpp:2297 -msgid "Payment was sent, but an invalid response was received" -msgstr "Pervedimas išsiūstas, bet klaidingas atsakymas gautas" - -#: ../../../src/ui.cpp:2303 -msgid "Payment completed" -msgstr "Pervedimas pavyko" - -#: ../../../src/ui.cpp:2334 -#: ../../../src/ui.cpp:2480 -#: ../../../src/ui.cpp:2517 -msgid "Name" -msgstr "Vardas" - -#: ../../../src/ui.cpp:2335 -#: ../../../src/ui.cpp:2480 -#: ../../../src/ui.cpp:2517 -msgid "Address" -msgstr "Adresas" - -#: ../../../src/ui.cpp:2337 -#: ../../../src/ui.cpp:2492 -msgid "Label" -msgstr "Pavadinimas" - -#: ../../../src/ui.cpp:2338 -#: ../../../src/uibase.cpp:837 -msgid "Bitcoin Address" -msgstr "Bitcoin Adresas" - -#: ../../../src/ui.cpp:2462 -msgid "This is one of your own addresses for receiving payments and cannot be entered in the address book. " -msgstr "Tai vienas iš jūsų adresų priimti pervedimams ir negali būti įvestas i adresų knygą" - -#: ../../../src/ui.cpp:2480 -#: ../../../src/ui.cpp:2486 -msgid "Edit Address" -msgstr "Pakeisti Adresą" - -#: ../../../src/ui.cpp:2492 -msgid "Edit Address Label" -msgstr "Pakeisti adreso pavadinimą" - -#: ../../../src/ui.cpp:2517 -#: ../../../src/ui.cpp:2523 -msgid "Add Address" -msgstr "Pridėti adresą" - -#: ../../../src/ui.cpp:2600 -msgid "Bitcoin" -msgstr "Bitcoin" - -#: ../../../src/ui.cpp:2602 -msgid "Bitcoin - Generating" -msgstr "Bitcoin - Generuoja" - -#: ../../../src/ui.cpp:2604 -msgid "Bitcoin - (not connected)" -msgstr "Bitcoin - (neprijungta)" - -#: ../../../src/ui.cpp:2683 -msgid "&Open Bitcoin" -msgstr "&Atidaryti Bitcoin" - -#: ../../../src/ui.cpp:2684 -#, fuzzy -msgid "&Send Bitcoins" -msgstr "&Atidaryti Bitcoin" - -#: ../../../src/ui.cpp:2685 -msgid "O&ptions..." -msgstr "P&arametrai..." - -#: ../../../src/ui.cpp:2688 -#: ../../../src/uibase.cpp:25 -msgid "E&xit" -msgstr "&Išeiti" - -#: ../../../src/ui.cpp:2904 -msgid "Program has crashed and will terminate. " -msgstr "Programa neveikia ir bus uždaryta" - -#: ../../../src/main.cpp:1866 -msgid "Warning: Disk space is low " -msgstr "Perspėjimas: Diske trūksta vietos" - -#: ../../../src/main.cpp:3990 -#, c-format -msgid "Error: This transaction requires a transaction fee of at least %s because of its amount, complexity, or use of recently received funds " -msgstr "Klaida: Šis pervedimas reikalauja %s mokesčio dėl jo sumos, sudėtingumo arba dėl to, kad šie pinigai buvo neseniai gauti " - -#: ../../../src/main.cpp:3992 -msgid "Error: Transaction creation failed " -msgstr "Klaida: Pervedimo sukurti nepavyko " - -#: ../../../src/main.cpp:4001 -msgid "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." -msgstr "Klaida: Pervedimas nepavyko. Tai galėjo atsitikti jei dalis jūsų monetų jau buvo išleista. Pvz.: Jei nodojote kopija wallet.dat kitame kliente ir monetos buvo išleistos ten, bet nepažymėtos kaip išleistos čia." - -#: ../../../src/main.cpp:4014 -msgid "Invalid amount" -msgstr "Neteisinga suma" - -#: ../../../src/main.cpp:4021 -msgid "Invalid bitcoin address" -msgstr "Klaidingas bitcoin adresas" - -#: ../../../src/rpc.cpp:1802 -#: ../../../src/rpc.cpp:1804 -#, c-format -msgid "To use the %s option" -msgstr "Kad naudoti %s parametrą" - -#: ../../../src/rpc.cpp:1806 -#, c-format -msgid "" -"Warning: %s, you must set rpcpassword=<password>\n" -"in the configuration file: %s\n" -"If the file does not exist, create it with owner-readable-only file permissions.\n" -msgstr "" -"Perspėjimas: %s, jūs privalote nustatyti rpcpassword=<slaptažodis>\n" -"Konfiguracijos faile: %s\n" -"Jei failas neegzistuoja, sukurkite jį su owner-readable-only failo teisėmis.\n" - -#: ../../../src/rpc.cpp:1974 -#, c-format -msgid "" -"You must set rpcpassword=<password> in the configuration file:\n" -"%s\n" -"If the file does not exist, create it with owner-readable-only file permissions." -msgstr "" -"Jūs privalote nustatyti rpcpassword=<slaptažodis> Konfiguracijos faile:\n" -"%s\n" -"Jei failas neegzistuoja, sukurkite jį su owner-readable-only failo teisėm." - -#: ../../../src/util.cpp:866 -msgid "Warning: Please check that your computer's date and time are correct. If your clock is wrong Bitcoin will not work properly." -msgstr "Perspėjimas: Prašome patikrinti kompiuterio laiką ir datą. Jei laikas neteisingai nustatytas, Bitcoin neveiks." - -#: ../../../src/util.cpp:899 -msgid "beta" -msgstr "beta" - -#: ../../../src/uibase.cpp:28 -msgid "&File" -msgstr "&Byla" - -#: ../../../src/uibase.cpp:32 -msgid "&Your Receiving Addresses..." -msgstr "&Jūsų priimantys adresai..." - -#: ../../../src/uibase.cpp:36 -msgid "&Options..." -msgstr "&Parametrai" - -#: ../../../src/uibase.cpp:39 -msgid "&Settings" -msgstr "N&ustatymai" - -#: ../../../src/uibase.cpp:43 -msgid "&About..." -msgstr "&О Apie..." - -#: ../../../src/uibase.cpp:46 -msgid "&Help" -msgstr "&Pagalba" - -#: ../../../src/uibase.cpp:56 -msgid "Address Book" -msgstr "Adresų knyga" - -#: ../../../src/uibase.cpp:69 -msgid "Your Bitcoin Address:" -msgstr "Jūsų Bitcoin Adresas:" - -#: ../../../src/uibase.cpp:76 -msgid " &New... " -msgstr " &Naujas... " - -#: ../../../src/uibase.cpp:79 -#: ../../../src/uibase.cpp:780 -#: ../../../src/uibase.cpp:883 -msgid " &Copy to Clipboard " -msgstr "&Kopijuoti" - -#: ../../../src/uibase.cpp:93 -msgid "Balance:" -msgstr "Balansas:" - -#: ../../../src/uibase.cpp:109 -msgid " All" -msgstr "Visi" - -#: ../../../src/uibase.cpp:109 -msgid " Sent" -msgstr "Išsiūsta" - -#: ../../../src/uibase.cpp:109 -msgid " Received" -msgstr "Priimta" - -#: ../../../src/uibase.cpp:109 -msgid " In Progress" -msgstr "Progrese" - -#: ../../../src/uibase.cpp:130 -msgid "All Transactions" -msgstr "Visi pervedimai" - -#: ../../../src/uibase.cpp:141 -msgid "Sent/Received" -msgstr "Išsiųsti/Priimti" - -#: ../../../src/uibase.cpp:152 -msgid "Sent" -msgstr "Išsiūsti" - -#: ../../../src/uibase.cpp:163 -msgid "Received" -msgstr "Priimti" - -#: ../../../src/uibase.cpp:302 -#: ../../../src/uibase.cpp:443 -#: ../../../src/uibase.cpp:542 -#: ../../../src/uibase.cpp:722 -#: ../../../src/uibase.cpp:783 -#: ../../../src/uibase.cpp:892 -#: ../../../src/uibase.cpp:981 -msgid "OK" -msgstr "Gerai" - -#: ../../../src/uibase.cpp:345 -msgid "&Start Bitcoin on system startup" -msgstr "&Paleisti Bitcoin kai pasileidžia operacinė sistema" - -#: ../../../src/uibase.cpp:348 -msgid "&Minimize to the tray instead of the taskbar" -msgstr "&Sumažinti į \"tray\" vietoj \"taskbar\"" - -#: ../../../src/uibase.cpp:351 -msgid "Map port using &UPnP" -msgstr "Peradresuoti porta naudojant &UPnP" - -#: ../../../src/uibase.cpp:354 -msgid "M&inimize to the tray on close" -msgstr "Su&mažinti į \"tray\" kai uždaroma" - -#: ../../../src/uibase.cpp:360 -msgid "&Connect through socks4 proxy: " -msgstr "&Prisijungti per socks4 proksį: " - -#: ../../../src/uibase.cpp:371 -msgid "Proxy &IP:" -msgstr "P&roksio IP:" - -#: ../../../src/uibase.cpp:379 -msgid " &Port:" -msgstr " &Portas" - -#: ../../../src/uibase.cpp:392 -msgid "Optional transaction fee per KB that helps make sure your transactions are processed quickly. Most transactions are 1KB. Fee 0.01 recommended." -msgstr "Pasirintinis pervedimo mokestis per KB, kuris padeda jį ivykdyti greičiau. Dauguma pervedimų yra 1KB. Rekomencuojamas mokestis 0.01." - -#: ../../../src/uibase.cpp:399 -#, fuzzy -msgid "Pay transaction fee:" -msgstr "Pervedimo mokestis:" - -#: ../../../src/uibase.cpp:420 -msgid "// [don't translate] Test panel 2 for future expansion" -msgstr "" - -#: ../../../src/uibase.cpp:424 -msgid "// [don't translate] Let's not start multiple pages until the first page is filled up" -msgstr "" - -#: ../../../src/uibase.cpp:446 -#: ../../../src/uibase.cpp:668 -#: ../../../src/uibase.cpp:727 -#: ../../../src/uibase.cpp:786 -#: ../../../src/uibase.cpp:895 -#: ../../../src/uibase.cpp:984 -msgid "Cancel" -msgstr "Nutraukti" - -#: ../../../src/uibase.cpp:449 -msgid "&Apply" -msgstr "&Nustatyti" - -#: ../../../src/uibase.cpp:508 -msgid "Bitcoin " -msgstr "Bitcoin " - -#: ../../../src/uibase.cpp:514 -msgid "version" -msgstr "versija" - -#: ../../../src/uibase.cpp:525 -#, fuzzy -msgid "" -"Copyright (c) 2009-2011 Bitcoin Developers\n" -"\n" -"This is experimental software.\n" -"\n" -"Distributed under the MIT/X11 software license, see the accompanying file \n" -"license.txt or http://www.opensource.org/licenses/mit-license.php.\n" -"\n" -"This product includes software developed by the OpenSSL Project for use in the \n" -"OpenSSL Toolkit (http://www.openssl.org/) and cryptographic software written by \n" -"Eric Young (eay@cryptsoft.com) and UPnP software written by Thomas Bernard." -msgstr "" -"Autorinė teisė (c) 2009-2010 Bitcoin Developers\n" -"\n" -"Ši programa yra eksperimentinė.\n" -"\n" -"Išleista ir teisės saugomos pagal MIT/X11 programų licenziją, kuri detaliau aprašyra faile \n" -"license.txt ir http://www.opensource.org/licenses/mit-license.php.\n" -"\n" -"Šis produktas turi programą iš OpenSSL projekto, kuri naudojamas \n" -"OpenSSL Toolkit (http://www.openssl.org/), kriptografinę programą parašyta \n" -"Eric Young (eay@cryptsoft.com) ir UPnP programą parašyta Thomas Bernard." - -#: ../../../src/uibase.cpp:581 -msgid "Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)" -msgstr "Įveskite Bitcoin adresą (pvz.: 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)" - -#: ../../../src/uibase.cpp:595 -msgid "Pay &To:" -msgstr "&Kam:" - -#: ../../../src/uibase.cpp:610 -msgid "&Paste" -msgstr "&Įrašyti" - -#: ../../../src/uibase.cpp:613 -msgid " Address &Book..." -msgstr " &Adresų knyga..." - -#: ../../../src/uibase.cpp:620 -msgid "&Amount:" -msgstr "S&uma:" - -#: ../../../src/uibase.cpp:630 -msgid "T&ransfer:" -msgstr "&Pervedimas:" - -#: ../../../src/uibase.cpp:636 -msgid " Standard" -msgstr "Standartinis" - -#: ../../../src/uibase.cpp:663 -msgid "&Send" -msgstr "&Siūsti" - -#: ../../../src/uibase.cpp:711 -msgid "" -"\n" -"\n" -"Connecting..." -msgstr "" -"\n" -"\n" -"Jungiasi..." - -#: ../../../src/uibase.cpp:761 -msgid "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. The highlighted address is displayed in the main window." -msgstr "Tai yra jūsų Bitcoin adresai priimti pervedimus. Galite duoti skirtinga adresa kiekvienam siuntėjui, kad žinotumėte kas jums moka. Pažymėtas adresas bus rodomas pagrindiniame lange." - -#: ../../../src/uibase.cpp:774 -#: ../../../src/uibase.cpp:886 -msgid "&Edit..." -msgstr "&Pakeisti..." - -#: ../../../src/uibase.cpp:777 -#: ../../../src/uibase.cpp:889 -msgid " &New Address... " -msgstr " &Naujas Adresas... " - -#: ../../../src/uibase.cpp:849 -msgid "Sending" -msgstr "Siunčiama" - -#: ../../../src/uibase.cpp:857 -msgid "These are your Bitcoin addresses for receiving payments. You can give a different one to each sender to keep track of who is paying you. The highlighted address will be displayed in the main window." -msgstr "Tai yra jūsų Bitcoin adresai priimti pervedimus. Galite duoti skirtinga adresa kiekvienam siuntėjui, kad žinotumėte kas jums moka. Pažymėtas adresas bus rodomas pagrindiniame lange." - -#: ../../../src/uibase.cpp:870 -msgid "Receiving" -msgstr "Priėmimo" - -#: ../../../src/uibase.cpp:880 -msgid "&Delete" -msgstr "&Ištrinti" - -#: ../../../src/init.cpp:142 -msgid "Bitcoin version" -msgstr "Bitcoin version" - -#: ../../../src/init.cpp:143 -msgid "Usage:" -msgstr "Komandų vartojimas:" - -#: ../../../src/init.cpp:145 -msgid "Send command to -server or bitcoind\n" -msgstr "Siūsti komandą i -server arba bitcoind\n" - -#: ../../../src/init.cpp:146 -msgid "List commands\n" -msgstr "Parodyti visas komandas\n" - -#: ../../../src/init.cpp:147 -msgid "Get help for a command\n" -msgstr "Komandos paaiškinimas\n" - -#: ../../../src/init.cpp:148 -msgid "Options:\n" -msgstr "Parametrai\n" - -#: ../../../src/init.cpp:149 -msgid "Specify configuration file (default: bitcoin.conf)\n" -msgstr "Nurodyti konfiguracijos failą (pagal nutylėjimą: bitcoin.conf)\n" - -#: ../../../src/init.cpp:150 -#, fuzzy -msgid "Specify pid file (default: bitcoind.pid)\n" -msgstr "Nurodyti konfiguracijos failą (pagal nutylėjimą: bitcoin.conf)\n" - -#: ../../../src/init.cpp:151 -msgid "Generate coins\n" -msgstr "Generuoti monetas\n" - -#: ../../../src/init.cpp:152 -msgid "Don't generate coins\n" -msgstr "Negeneruoti monetų\n" - -#: ../../../src/init.cpp:153 -msgid "Start minimized\n" -msgstr "Paleisti minimizuotą klientą\n" - -#: ../../../src/init.cpp:154 -msgid "Specify data directory\n" -msgstr "Nurodyti duomenų direktoriją\n" - -#: ../../../src/init.cpp:155 -msgid "Connect through socks4 proxy\n" -msgstr "Prisijungti per socks4 proksį\n" - -#: ../../../src/init.cpp:156 -msgid "Allow DNS lookups for addnode and connect\n" -msgstr "Leisti DNS lookups addnode ir connect komandoms\n" - -#: ../../../src/init.cpp:157 -msgid "Add a node to connect to\n" -msgstr "Pridėti nodą prie kurio bus jungiamasi\n" - -#: ../../../src/init.cpp:158 -msgid "Connect only to the specified node\n" -msgstr "Prisijungti tik prie šio nodo\n" - -#: ../../../src/init.cpp:159 -msgid "Don't accept connections from outside\n" -msgstr "Neleisti prisijungti iš išorės\n" - -#: ../../../src/init.cpp:162 -msgid "Don't attempt to use UPnP to map the listening port\n" -msgstr "Nenaudoti UPnP klausančio porto peradresavimui\n" - -#: ../../../src/init.cpp:164 -msgid "Attempt to use UPnP to map the listening port\n" -msgstr "Pamėginti naudoti UPnP klausančio porto peradresavimui\n" - -#: ../../../src/init.cpp:167 -msgid "Fee per KB to add to transactions you send\n" -msgstr "Mokestis per KB pridedamas prie siunčiamo pervedimo\n" - -#: ../../../src/init.cpp:169 -msgid "Accept command line and JSON-RPC commands\n" -msgstr "Priimti komandas iš terminalo ir JSON-RPC\n" - -#: ../../../src/init.cpp:172 -msgid "Run in the background as a daemon and accept commands\n" -msgstr "Paleisti daemon\n" - -#: ../../../src/init.cpp:174 -msgid "Use the test network\n" -msgstr "Naudoti bandomajį tinklą\n" - -#: ../../../src/init.cpp:175 -msgid "Username for JSON-RPC connections\n" -msgstr "Naudotojo vardas JSON-RPC prisijungimui\n" - -#: ../../../src/init.cpp:176 -msgid "Password for JSON-RPC connections\n" -msgstr "Slaptažodis JSON-RPC prisijungimui\n" - -#: ../../../src/init.cpp:177 -msgid "Listen for JSON-RPC connections on <port> (default: 8332)\n" -msgstr "Klausyti JSON-RPC prisijungimų ant <port> (pagal nutylėjimą: 8332)\n" - -#: ../../../src/init.cpp:178 -msgid "Allow JSON-RPC connections from specified IP address\n" -msgstr "Leisti JSON-RPC prisijungimą iš tam tikrų IP adresų\n" - -#: ../../../src/init.cpp:179 -msgid "Send commands to node running on <ip> (default: 127.0.0.1)\n" -msgstr "Siūsti komandas į nodą kuris yra <ip> (pagal nutylėjimą: 127.0.0.1)\n" - -#: ../../../src/init.cpp:180 -msgid "Set key pool size to <n> (default: 100)\n" -msgstr "Nustatyti kiek raktų skaičių <n> (pagal nutylėjimą: 100)\n" - -#: ../../../src/init.cpp:181 -msgid "Rescan the block chain for missing wallet transactions\n" -msgstr "Perskanuoti blokų grandinę dėl trūkstamų pervedimų\n" - -#: ../../../src/init.cpp:185 -msgid "" -"\n" -"SSL options: (see the Bitcoin Wiki for SSL setup instructions)\n" -msgstr "" -"\n" -"SSL parametrai: (aplankykite Bitcoin Wiki dėl SSL nustatymų)\n" - -#: ../../../src/init.cpp:186 -msgid "Use OpenSSL (https) for JSON-RPC connections\n" -msgstr "Naudoti OpenSSL (https) JSON-RPC prisijungimui\n" - -#: ../../../src/init.cpp:187 -msgid "Server certificate file (default: server.cert)\n" -msgstr "Serverio sertifikato failas (pagal nutylėjimą: server.cert)\n" - -#: ../../../src/init.cpp:188 -msgid "Server private key (default: server.pem)\n" -msgstr "Serverio privatus raktas (pagal nutylėjimą: server.pem)\n" - -#: ../../../src/init.cpp:189 -msgid "Acceptable ciphers (default: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH)\n" -msgstr "Priimtinas šifras (pagal nutylėjimą: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH)\n" - -#: ../../../src/init.cpp:193 -msgid "This help message\n" -msgstr "Ši pagalbos žinutė\n" - -#: ../../../src/init.cpp:330 -#, c-format -msgid "Cannot obtain a lock on data directory %s. Bitcoin is probably already running." -msgstr "Neranda duomenų directorijos %s. Bitcoin programa tikriausiai jau paleista." - -#: ../../../src/init.cpp:356 -msgid "Error loading addr.dat \n" -msgstr "Klaida nuskaitant addr.dat \n" - -#: ../../../src/init.cpp:362 -msgid "Error loading blkindex.dat \n" -msgstr "Klaida nuskaitant blkindex.dat \n" - -#: ../../../src/init.cpp:369 -msgid "Error loading wallet.dat \n" -msgstr "Klaida nuskaitant wallet.dat \n" - -#: ../../../src/init.cpp:449 -msgid "Invalid -proxy address" -msgstr "Klaidingas -proxy adresas" - -#: ../../../src/init.cpp:472 -msgid "Invalid amount for -paytxfee=<amount>" -msgstr "Klaidinga suma -paytxfee=<amount>" - -#: ../../../src/init.cpp:476 -msgid "Warning: -paytxfee is set very high. This is the transaction fee you will pay if you send a transaction." -msgstr "Perspėjimas: -paytxfee yra nustatyta labai aukšta suma. Ši suma bus nuskaičiuota kaip mokestis darant pervedimą" - -#: ../../../src/uibase.h:147 -msgid "Transaction Details" -msgstr "Pervedimų detalės" - -#: ../../../src/uibase.h:199 -msgid "Options" -msgstr "Parametrai" - -#: ../../../src/uibase.h:228 -msgid "About Bitcoin" -msgstr "Apie Bitcoin" - -#: ../../../src/uibase.h:337 -msgid "Your Bitcoin Addresses" -msgstr "Jūsų Bitcoin Adresas" diff --git a/locale/nl/LC_MESSAGES/bitcoin.mo b/locale/nl/LC_MESSAGES/bitcoin.mo Binary files differdeleted file mode 100644 index 13467f225b..0000000000 --- a/locale/nl/LC_MESSAGES/bitcoin.mo +++ /dev/null diff --git a/locale/nl/LC_MESSAGES/bitcoin.po b/locale/nl/LC_MESSAGES/bitcoin.po deleted file mode 100644 index 5074f21828..0000000000 --- a/locale/nl/LC_MESSAGES/bitcoin.po +++ /dev/null @@ -1,1195 +0,0 @@ -msgid "" -msgstr "" -"Project-Id-Version: \n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-09-22 19:03+0100\n" -"PO-Revision-Date: 2011-09-22 19:19+0100\n" -"Last-Translator: Pieter Wuille <pieter.wuille@gmail.com>\n" -"Language-Team: \n" -"Language: \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"X-Poedit-KeywordsList: _;gettext;gettext_noop\n" -"X-Poedit-Basepath: .\n" -"X-Poedit-Language: Dutch\n" -"X-Poedit-SearchPath-0: ../../..\n" - -#: ../../../src/init.cpp:163 -msgid "Bitcoin version" -msgstr "Bitcoin versie" - -#: ../../../src/init.cpp:164 -msgid "Usage:" -msgstr "Mededeling:" - -#: ../../../src/init.cpp:166 -msgid "Send command to -server or bitcoind\n" -msgstr "Zend commando naar -server of bitcoind\n" - -#: ../../../src/init.cpp:167 -msgid "List commands\n" -msgstr "List van commando's\n" - -#: ../../../src/init.cpp:168 -msgid "Get help for a command\n" -msgstr "Toon hulp voor een commando\n" - -#: ../../../src/init.cpp:169 -msgid "Options:\n" -msgstr "Opties:\n" - -#: ../../../src/init.cpp:170 -msgid "Specify configuration file (default: bitcoin.conf)\n" -msgstr "Specifieer configuratiebestand (standaard: bitcoin.conf)\n" - -#: ../../../src/init.cpp:171 -msgid "Specify pid file (default: bitcoind.pid)\n" -msgstr "Specifieer pid-bestand (standaard: bitcoind.pid)\n" - -#: ../../../src/init.cpp:172 -msgid "Generate coins\n" -msgstr "Genereer coins\n" - -#: ../../../src/init.cpp:173 -msgid "Don't generate coins\n" -msgstr "Genereer geen coins\n" - -#: ../../../src/init.cpp:174 -msgid "Start minimized\n" -msgstr "Geminimaliseerd starten\n" - -#: ../../../src/init.cpp:175 -msgid "Specify data directory\n" -msgstr "Stel datamap in\n" - -#: ../../../src/init.cpp:176 -msgid "Specify connection timeout (in milliseconds)\n" -msgstr "Gelieve de time-out tijd te specifieren (in milliseconden)\n" - -#: ../../../src/init.cpp:177 -msgid "Connect through socks4 proxy\n" -msgstr "Verbind via socks4 proxy\n" - -#: ../../../src/init.cpp:178 -msgid "Allow DNS lookups for addnode and connect\n" -msgstr "Sta DNS-opzoeking toe voor addnode en connect\n" - -#: ../../../src/init.cpp:179 -msgid "Add a node to connect to\n" -msgstr "Voeg een node toe om mee te verbinden\n" - -#: ../../../src/init.cpp:180 -msgid "Connect only to the specified node\n" -msgstr "Verbind alleen met deze node\n" - -#: ../../../src/init.cpp:181 -msgid "Don't accept connections from outside\n" -msgstr "Sta geen verbindingen van buitenaf toe\n" - -#: ../../../src/init.cpp:184 -msgid "Don't attempt to use UPnP to map the listening port\n" -msgstr "Probeer geen UPnP te gebruiken om de poort waarop geluisterd wordt te mappen\n" - -#: ../../../src/init.cpp:186 -msgid "Attempt to use UPnP to map the listening port\n" -msgstr "Probeer UPnP te gebruiken om de poort waarop geluisterd wordt te mappen\n" - -#: ../../../src/init.cpp:189 -msgid "Fee per KB to add to transactions you send\n" -msgstr "Fooi per KB om aan transacties die gezonden worden toe te voegen\n" - -#: ../../../src/init.cpp:191 -msgid "Accept command line and JSON-RPC commands\n" -msgstr "Aanvaard commandolijn en JSON-RPC commando's\n" - -#: ../../../src/init.cpp:194 -msgid "Run in the background as a daemon and accept commands\n" -msgstr "Draai in de achtergrond als daemon en aanvaard commando's\n" - -#: ../../../src/init.cpp:196 -msgid "Use the test network\n" -msgstr "Gebruik het test-netwerk\n" - -#: ../../../src/init.cpp:197 -msgid "Username for JSON-RPC connections\n" -msgstr "Gebruikersnaam voor JSON-RPC verbindingen\n" - -#: ../../../src/init.cpp:198 -msgid "Password for JSON-RPC connections\n" -msgstr "Wachtwoord voor JSON-RPC verbindingen\n" - -#: ../../../src/init.cpp:199 -msgid "Listen for JSON-RPC connections on <port> (default: 8332)\n" -msgstr "Luister voor JSON-RPC verbindingen op <poort> (standaard: 8332)\n" - -#: ../../../src/init.cpp:200 -msgid "Allow JSON-RPC connections from specified IP address\n" -msgstr "Enkel JSON-RPC verbindingen van opgegeven IP adres toestaan\n" - -#: ../../../src/init.cpp:201 -msgid "Send commands to node running on <ip> (default: 127.0.0.1)\n" -msgstr "Zend commando's naar proces dat op <ip> draait (standaard: 127.0.0.1)\n" - -#: ../../../src/init.cpp:202 -msgid "Set key pool size to <n> (default: 100)\n" -msgstr "Stel sleutelpoelgrootte in op <n> (standaard: 100)\n" - -#: ../../../src/init.cpp:203 -msgid "Rescan the block chain for missing wallet transactions\n" -msgstr "Doorzoek de blokken database voor ontbrekende portefeuille-transacties\n" - -#: ../../../src/init.cpp:207 -msgid "" -"\n" -"SSL options: (see the Bitcoin Wiki for SSL setup instructions)\n" -msgstr "" -"\n" -"SSL opties: (zie de Bitcoin wiki voor SSL instructies)\n" - -#: ../../../src/init.cpp:208 -msgid "Use OpenSSL (https) for JSON-RPC connections\n" -msgstr "Gebruik OpenSSL (https) voor JSON-RPC verbindingen\n" - -#: ../../../src/init.cpp:209 -msgid "Server certificate file (default: server.cert)\n" -msgstr "Certificaat-bestand voor server (standaard: server.cert)\n" - -#: ../../../src/init.cpp:210 -msgid "Server private key (default: server.pem)\n" -msgstr "Geheime sleutel voor server (standaard: server.pem)\n" - -#: ../../../src/init.cpp:211 -msgid "Acceptable ciphers (default: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH)\n" -msgstr "Aanvaardbare ciphers (standaard: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH)\n" - -#: ../../../src/init.cpp:215 -msgid "This help message\n" -msgstr "Dit helpbericht\n" - -#: ../../../src/init.cpp:353 -#, c-format -msgid "Cannot obtain a lock on data directory %s. Bitcoin is probably already running." -msgstr "Kan geen lock op de gegevensdirectory %s verkrijgen. Bitcoin draait vermoedelijk reeds." - -#: ../../../src/init.cpp:379 -msgid "Error loading addr.dat \n" -msgstr "Fout bij laden van bestand addr.dat \n" - -#: ../../../src/init.cpp:385 -msgid "Error loading blkindex.dat \n" -msgstr "Fout bij laden van bestand blkindex.dat \n" - -#: ../../../src/init.cpp:396 -msgid "Error loading wallet.dat: Wallet corrupted \n" -msgstr "Fout bij laden van bestand wallet.dat: portefeuille beschadigd \n" - -#: ../../../src/init.cpp:398 -msgid "Error loading wallet.dat: Wallet requires newer version of Bitcoin \n" -msgstr "Fout bij laden van bestand wallet.dat: portefeuille vereist nieuwere versie van Bitcoin\n" - -#: ../../../src/init.cpp:400 -msgid "Error loading wallet.dat \n" -msgstr "Fout bij laden van bestand wallet.dat \n" - -#: ../../../src/init.cpp:489 -msgid "Invalid -proxy address" -msgstr "Foutief -proxy adres" - -#: ../../../src/init.cpp:514 -msgid "Invalid amount for -paytxfee=<amount>" -msgstr "Ongeldig bedrag voor -paytxfee=<bedrag>" - -#: ../../../src/init.cpp:518 -msgid "Warning: -paytxfee is set very high. This is the transaction fee you will pay if you send a transaction." -msgstr "Waarschuwing: -paytxfee is zeer hoog ingesteld. Dit is de fooi die betaald wordt bij het zenden van een transactie." - -#: ../../../src/rpc.cpp:2035 -#: ../../../src/rpc.cpp:2037 -#, c-format -msgid "To use the %s option" -msgstr "Om de %s optie te gebruiken" - -#: ../../../src/rpc.cpp:2039 -#, c-format -msgid "" -"Warning: %s, you must set rpcpassword=<password>\n" -"in the configuration file: %s\n" -"If the file does not exist, create it with owner-readable-only file permissions.\n" -msgstr "" -"Waarschuwing: %s, rpcpassword=<password> moet ingesteld zijn\n" -"in het configuratie bestand: %s\n" -"Als het bestand nog niet bestaat, maak het dan aan met enkel-leesbaar-door-eigenaar rechten.\n" - -#: ../../../src/rpc.cpp:2215 -#, c-format -msgid "" -"You must set rpcpassword=<password> in the configuration file:\n" -"%s\n" -"If the file does not exist, create it with owner-readable-only file permissions." -msgstr "" -"rpcpassword=<password> moet ingesteld in het configuratie bestand:\n" -"%s\n" -"Als het bestand nog niet bestaat, maak het dan aan met enkel-leesbaar-door-eigenaar rechten." - -#: ../../../src/net.cpp:1616 -#, c-format -msgid "Unable to bind to port %d on this computer. Bitcoin is probably already running." -msgstr "Kan niet binden met poort %d op deze computer. Bitcoin draait vermoedelijk reeds." - -#: ../../../src/util.cpp:1008 -msgid "Warning: Please check that your computer's date and time are correct. If your clock is wrong Bitcoin will not work properly." -msgstr "Waarschuwing: Controleer of uw computers datum en tijd correct ingesteld zijn. Als uw klok fout staat zal Bitcoin niet correct werken." - -#: ../../../src/util.cpp:1042 -msgid "beta" -msgstr "beta" - -#: ../../../src/wallet.cpp:1073 -msgid "Error: Wallet locked, unable to create transaction " -msgstr "Fout: portefeuille is op slot, kan geen transactie aanmaken" - -#: ../../../src/wallet.cpp:1081 -#, c-format -msgid "Error: This transaction requires a transaction fee of at least %s because of its amount, complexity, or use of recently received funds " -msgstr "Fout: Deze transactie vergt een fooi van ten minste %s omwille van zijn bedrag, complexiteit, of gebruik van recent ontvangen fonden " - -#: ../../../src/wallet.cpp:1083 -msgid "Error: Transaction creation failed " -msgstr "Fout: Aanmaken van transactie mislukt " - -#: ../../../src/wallet.cpp:1088 -msgid "Sending..." -msgstr "Versturen..." - -#: ../../../src/wallet.cpp:1092 -msgid "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." -msgstr "Fout: De transactie is afgekeurd. Dit kan gebeuren als bepaalde coins in je Portefeuille al zijn uitgegeven. Dit kan veroorzaakt worden doordat je een kopie van wallet.dat gebruikt hebt en enkel daar je uitgave geregistreerd is." - -#: ../../../src/wallet.cpp:1104 -msgid "Invalid amount" -msgstr "Foutieve hoeveelheid" - -#: ../../../src/wallet.cpp:1106 -msgid "Insufficient funds" -msgstr "Onvoldoende saldo" - -#: ../../../src/main.cpp:1398 -#: ../../../src/bak/main.cpp:1414 -msgid "Warning: Disk space is low " -msgstr "Waarschuwing: Weinig schijfruimte over " - -#: ../../../src/ui.cpp:217 -#: ../../../src/bak/ui.cpp:216 -#, c-format -msgid "This transaction is over the size limit. You can still send it for a fee of %s, which goes to the nodes that process your transaction and helps to support the network. Do you want to pay the fee?" -msgstr "Deze transactie overschrijdt de limiet. Om de transactie alsnog te verwerken kun je een fooi betalen van %s. Deze zal betaald worden aan de node die uw transactie verwerkt. Wil je doorgaan en deze fooi betalen?" - -#: ../../../src/ui.cpp:261 -#: ../../../src/ui.cpp:1247 -msgid "Enter the current passphrase to the wallet." -msgstr "Geef het huidige wachtwoord voor de portefeuille." - -#: ../../../src/ui.cpp:262 -#: ../../../src/ui.cpp:1183 -#: ../../../src/ui.cpp:1200 -#: ../../../src/ui.cpp:1248 -#: ../../../src/ui.cpp:1272 -#: ../../../src/ui.cpp:1292 -msgid "Passphrase" -msgstr "Wachtwoord" - -#: ../../../src/ui.cpp:268 -msgid "Please supply the current wallet decryption passphrase." -msgstr "Geef het huidige wachtwoord voor de portefeille" - -#: ../../../src/ui.cpp:276 -#: ../../../src/ui.cpp:1257 -#: ../../../src/ui.cpp:1314 -msgid "The passphrase entered for the wallet decryption was incorrect." -msgstr "Het wachtwoord voor het openen van de portefeulle is foutief." - -#: ../../../src/ui.cpp:353 -#: ../../../src/bak/ui.cpp:316 -msgid "Status" -msgstr "Status" - -#: ../../../src/ui.cpp:354 -#: ../../../src/bak/ui.cpp:317 -msgid "Date" -msgstr "Datum" - -#: ../../../src/ui.cpp:355 -#: ../../../src/bak/ui.cpp:318 -msgid "Description" -msgstr "Beschrijving" - -#: ../../../src/ui.cpp:356 -#: ../../../src/bak/ui.cpp:319 -msgid "Debit" -msgstr "Debet" - -#: ../../../src/ui.cpp:357 -#: ../../../src/bak/ui.cpp:320 -msgid "Credit" -msgstr "Credit" - -#: ../../../src/ui.cpp:568 -#: ../../../src/bak/ui.cpp:526 -#, c-format -msgid "Open for %d blocks" -msgstr "Open gedurende %d blokken" - -#: ../../../src/ui.cpp:570 -#: ../../../src/bak/ui.cpp:528 -#, c-format -msgid "Open until %s" -msgstr "Open tot %s" - -#: ../../../src/ui.cpp:576 -#: ../../../src/bak/ui.cpp:534 -#, c-format -msgid "%d/offline?" -msgstr "%d/offline?" - -#: ../../../src/ui.cpp:578 -#: ../../../src/bak/ui.cpp:536 -#, c-format -msgid "%d/unconfirmed" -msgstr "%d/niet bevestigd" - -#: ../../../src/ui.cpp:580 -#: ../../../src/bak/ui.cpp:538 -#, c-format -msgid "%d confirmations" -msgstr "%d bevestigingen" - -#: ../../../src/ui.cpp:665 -#: ../../../src/bak/ui.cpp:623 -msgid "Generated" -msgstr "Gegenereerd" - -#: ../../../src/ui.cpp:673 -#: ../../../src/bak/ui.cpp:631 -#, c-format -msgid "Generated (%s matures in %d more blocks)" -msgstr "Gegenereerd (%s wordt volwassen over %d blokken)" - -#: ../../../src/ui.cpp:677 -#: ../../../src/bak/ui.cpp:635 -msgid "Generated - Warning: This block was not received by any other nodes and will probably not be accepted!" -msgstr "Gegenereerd - Waarschuwing: Dit blok is niet ontvangen door andere nodes en zal waarschijnlijk niet geaccepteerd worden!" - -#: ../../../src/ui.cpp:681 -#: ../../../src/bak/ui.cpp:639 -msgid "Generated (not accepted)" -msgstr "Gegenereerd (niet geaccepteerd)" - -#: ../../../src/ui.cpp:691 -#: ../../../src/bak/ui.cpp:649 -msgid "From: " -msgstr "Van: " - -#: ../../../src/ui.cpp:715 -#: ../../../src/bak/ui.cpp:673 -msgid "Received with: " -msgstr "Ontvangen met: " - -#: ../../../src/ui.cpp:760 -#: ../../../src/bak/ui.cpp:719 -msgid "Payment to yourself" -msgstr "Betaling aan uzelf" - -#: ../../../src/ui.cpp:794 -#: ../../../src/bak/ui.cpp:753 -msgid "To: " -msgstr "Naar: " - -#: ../../../src/ui.cpp:1109 -#: ../../../src/bak/ui.cpp:1068 -msgid " Generating" -msgstr " Genereren..." - -#: ../../../src/ui.cpp:1111 -#: ../../../src/bak/ui.cpp:1070 -msgid "(not connected)" -msgstr "(niet verbonden)" - -#: ../../../src/ui.cpp:1114 -#: ../../../src/bak/ui.cpp:1073 -#, c-format -msgid " %d connections %d blocks %d transactions" -msgstr " %d verbindingen %d blokken %d transacties" - -#: ../../../src/ui.cpp:1171 -msgid "Wallet already encrypted." -msgstr "Portefeuille reeds versleuteld." - -#: ../../../src/ui.cpp:1182 -msgid "" -"Enter the new passphrase to the wallet.\n" -"Please use a passphrase of 10 or more random characters, or eight or more words." -msgstr "" -"Geef het nieuwe wachtwoord voor de portefeuille.\n" -"Gebruik een wachtwoord van 10 of meer willekeurige characters, of 8 of meer woorden." - -#: ../../../src/ui.cpp:1189 -#: ../../../src/ui.cpp:1280 -msgid "Error: The supplied passphrase was too short." -msgstr "Fout: het wachtwoord is kort." - -#: ../../../src/ui.cpp:1193 -msgid "" -"WARNING: If you encrypt your wallet and lose your passphrase, you will LOSE ALL OF YOUR BITCOINS!\n" -"Are you sure you wish to encrypt your wallet?" -msgstr "" -"WAARSCHUWING: Indien u uw portefeuille versleutelt en het wachtwoord verliest, zal u AL UW BITCOINS VERLIEZEN!\n" -"Bent u zeker dat u de portfeuille wenst te versleutelen?" - -#: ../../../src/ui.cpp:1199 -msgid "Please re-enter your new wallet passphrase." -msgstr "Voer uw portefeuille-wachtwoord opnieuw in." - -#: ../../../src/ui.cpp:1208 -#: ../../../src/ui.cpp:1302 -msgid "Error: the supplied passphrases didn't match." -msgstr "Fout: de ingevoerde wachtwoorden komen niet overeen." - -#: ../../../src/ui.cpp:1218 -msgid "Wallet encryption failed." -msgstr "Versleutelen van de portefeuille mislukt." - -#: ../../../src/ui.cpp:1225 -msgid "" -"Wallet Encrypted.\n" -"Remember that encrypting your wallet cannot fully protect your bitcoins from being stolen by malware infecting your computer." -msgstr "" -"Portefeuille versleuteld.\n" -"Denk eraan dat uw portefeuille versleutelen geen volledige bescherming biedt tegen malware die uw computer zou geinfecteerd hebben." - -#: ../../../src/ui.cpp:1236 -msgid "Wallet is unencrypted, please encrypt it first." -msgstr "Portefeuille is onversleuteld. Versleutel ze eerst." - -#: ../../../src/ui.cpp:1271 -msgid "Enter the new passphrase for the wallet." -msgstr "Voer nieuw wachtwoord voor de portefeuille in." - -#: ../../../src/ui.cpp:1291 -msgid "Re-enter the new passphrase for the wallet." -msgstr "Voer nieuw wachtwoord voor de portefeuille opnieuw in." - -#: ../../../src/ui.cpp:1323 -msgid "Wallet Passphrase Changed." -msgstr "Portefeuille-wachtwoord gewijzigd." - -#: ../../../src/ui.cpp:1379 -#: ../../../src/ui.cpp:2825 -#: ../../../src/bak/ui.cpp:1178 -#: ../../../src/bak/ui.cpp:2571 -msgid "New Receiving Address" -msgstr "Nieuw Ontvangstadres" - -#: ../../../src/ui.cpp:1380 -#: ../../../src/ui.cpp:2826 -#: ../../../src/bak/ui.cpp:1179 -#: ../../../src/bak/ui.cpp:2572 -msgid "" -"You should use a new address for each payment you receive.\n" -"\n" -"Label" -msgstr "" -"Het is een goede gewoonte om voor iedere betaling die je ontvangt een nieuw adres te gebruiken.\n" -"\n" -"Label" - -#: ../../../src/ui.cpp:1464 -#: ../../../src/bak/ui.cpp:1251 -msgid "<b>Status:</b> " -msgstr "<b>Status:</b> " - -#: ../../../src/ui.cpp:1469 -#: ../../../src/bak/ui.cpp:1256 -msgid ", has not been successfully broadcast yet" -msgstr ", is nog niet succesvol verstuurd naar het netwerk" - -#: ../../../src/ui.cpp:1471 -#: ../../../src/bak/ui.cpp:1258 -#, c-format -msgid ", broadcast through %d node" -msgstr ", verstuurd via %d node" - -#: ../../../src/ui.cpp:1473 -#: ../../../src/bak/ui.cpp:1260 -#, c-format -msgid ", broadcast through %d nodes" -msgstr ", verstuurd via %d nodes" - -#: ../../../src/ui.cpp:1477 -#: ../../../src/bak/ui.cpp:1264 -msgid "<b>Date:</b> " -msgstr "<b>Datum:</b> " - -#: ../../../src/ui.cpp:1485 -#: ../../../src/bak/ui.cpp:1272 -msgid "<b>Source:</b> Generated<br>" -msgstr "<b>Bron:</b> Gegenereerd<br>" - -#: ../../../src/ui.cpp:1491 -#: ../../../src/ui.cpp:1508 -#: ../../../src/bak/ui.cpp:1278 -#: ../../../src/bak/ui.cpp:1296 -msgid "<b>From:</b> " -msgstr "<b>Van:</b> " - -#: ../../../src/ui.cpp:1508 -#: ../../../src/bak/ui.cpp:1296 -msgid "unknown" -msgstr "onbekend" - -#: ../../../src/ui.cpp:1509 -#: ../../../src/ui.cpp:1533 -#: ../../../src/ui.cpp:1592 -#: ../../../src/bak/ui.cpp:1297 -#: ../../../src/bak/ui.cpp:1321 -#: ../../../src/bak/ui.cpp:1380 -msgid "<b>To:</b> " -msgstr "<b>Naar:</b> " - -#: ../../../src/ui.cpp:1512 -#: ../../../src/bak/ui.cpp:1300 -msgid " (yours, label: " -msgstr " (van jou, label: " - -#: ../../../src/ui.cpp:1514 -#: ../../../src/bak/ui.cpp:1302 -msgid " (yours)" -msgstr " (van jou)" - -#: ../../../src/ui.cpp:1551 -#: ../../../src/ui.cpp:1563 -#: ../../../src/ui.cpp:1609 -#: ../../../src/ui.cpp:1626 -#: ../../../src/bak/ui.cpp:1339 -#: ../../../src/bak/ui.cpp:1351 -#: ../../../src/bak/ui.cpp:1397 -#: ../../../src/bak/ui.cpp:1414 -msgid "<b>Credit:</b> " -msgstr "<b>Credit:</b>" - -#: ../../../src/ui.cpp:1553 -#: ../../../src/bak/ui.cpp:1341 -#, c-format -msgid "(%s matures in %d more blocks)" -msgstr "(%s wordt volwassen over %d blokken)" - -#: ../../../src/ui.cpp:1555 -#: ../../../src/bak/ui.cpp:1343 -msgid "(not accepted)" -msgstr "(niet geaccepteerd)" - -#: ../../../src/ui.cpp:1600 -#: ../../../src/ui.cpp:1608 -#: ../../../src/ui.cpp:1623 -#: ../../../src/bak/ui.cpp:1388 -#: ../../../src/bak/ui.cpp:1396 -#: ../../../src/bak/ui.cpp:1411 -msgid "<b>Debit:</b> " -msgstr "<b>Debet:</b>" - -#: ../../../src/ui.cpp:1614 -#: ../../../src/bak/ui.cpp:1402 -msgid "<b>Transaction fee:</b> " -msgstr "<b>Transactiefooi:</b> " - -#: ../../../src/ui.cpp:1630 -#: ../../../src/bak/ui.cpp:1418 -msgid "<b>Net amount:</b> " -msgstr "<b>Nettobedrag:</b> " - -#: ../../../src/ui.cpp:1637 -#: ../../../src/bak/ui.cpp:1425 -msgid "Message:" -msgstr "Mededeling:" - -#: ../../../src/ui.cpp:1639 -#: ../../../src/bak/ui.cpp:1427 -msgid "Comment:" -msgstr "Commentaar:" - -#: ../../../src/ui.cpp:1642 -#: ../../../src/bak/ui.cpp:1430 -msgid "Generated coins must wait 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, it will change to \"not accepted\" and not be spendable. This may occasionally happen if another node generates a block within a few seconds of yours." -msgstr "Gegenereerde coins mogen pas na een wachttijd van 120 blokken uitgegeven worden. Op het moment dat dit blok gegenereerd werd, is het naar het netwerk verzonden om aan de blokkenreeks toegevoegd te worden. Als het niet succesvol in de blokkenreeks opgenomen kan worden verandert de status in \"niet geaccepteerd\" en kan het niet uitegegeven worden. Dit kan soms gebeuren als een andere node op ongeveer hetzelfde moment een blok genereert." - -#: ../../../src/ui.cpp:1826 -#: ../../../src/bak/ui.cpp:1610 -msgid "Cannot write autostart/bitcoin.desktop file" -msgstr "Kan niet schrijven naar het bestand autostart/bitcoin.desktop" - -#: ../../../src/ui.cpp:1862 -#: ../../../src/bak/ui.cpp:1646 -msgid "Main" -msgstr "Algemeen" - -#: ../../../src/ui.cpp:1872 -#: ../../../src/bak/ui.cpp:1656 -msgid "&Start Bitcoin on window system startup" -msgstr "&Start Bitcoin wanneer het systeem opstart" - -#: ../../../src/ui.cpp:1879 -#: ../../../src/bak/ui.cpp:1663 -msgid "&Minimize on close" -msgstr "&Minimaliseer bij sluiten van het venster" - -#: ../../../src/ui.cpp:2021 -#: ../../../src/bak/ui.cpp:1805 -#, c-format -msgid "version %s" -msgstr "versie %s" - -#: ../../../src/ui.cpp:2144 -#: ../../../src/bak/ui.cpp:1928 -msgid "Error in amount " -msgstr "Fout in hoeveelheid " - -#: ../../../src/ui.cpp:2144 -#: ../../../src/ui.cpp:2149 -#: ../../../src/ui.cpp:2154 -#: ../../../src/ui.cpp:2207 -#: ../../../src/uibase.cpp:61 -#: ../../../src/bak/ui.cpp:1928 -#: ../../../src/bak/ui.cpp:1933 -#: ../../../src/bak/ui.cpp:1938 -#: ../../../src/bak/ui.cpp:1973 -msgid "Send Coins" -msgstr "Verstuur coins" - -#: ../../../src/ui.cpp:2149 -#: ../../../src/bak/ui.cpp:1933 -msgid "Amount exceeds your balance " -msgstr "Hoeveelheid overschrijdt uw huidige balans " - -#: ../../../src/ui.cpp:2154 -#: ../../../src/bak/ui.cpp:1938 -msgid "Total exceeds your balance when the " -msgstr "Totaal overschrijdt uw huidige balans wanneer de " - -#: ../../../src/ui.cpp:2154 -#: ../../../src/bak/ui.cpp:1938 -msgid " transaction fee is included " -msgstr " transactiefooi is meegerekend " - -#: ../../../src/ui.cpp:2181 -#: ../../../src/bak/ui.cpp:1956 -msgid "Payment sent " -msgstr "Betaling verzonden " - -#: ../../../src/ui.cpp:2207 -#: ../../../src/bak/ui.cpp:1973 -msgid "Invalid address " -msgstr "Foutief adres " - -#: ../../../src/ui.cpp:2262 -#: ../../../src/bak/ui.cpp:2028 -#, c-format -msgid "Sending %s to %s" -msgstr "%s versturen naar %s" - -#: ../../../src/ui.cpp:2335 -#: ../../../src/ui.cpp:2368 -#: ../../../src/bak/ui.cpp:2101 -#: ../../../src/bak/ui.cpp:2134 -msgid "CANCELLED" -msgstr "GEANNULEERD" - -#: ../../../src/ui.cpp:2339 -#: ../../../src/bak/ui.cpp:2105 -msgid "Cancelled" -msgstr "Geannuleerd" - -#: ../../../src/ui.cpp:2341 -#: ../../../src/bak/ui.cpp:2107 -msgid "Transfer cancelled " -msgstr "Transactie geannuleerd " - -#: ../../../src/ui.cpp:2394 -#: ../../../src/bak/ui.cpp:2160 -msgid "Error: " -msgstr "Fout: " - -#: ../../../src/ui.cpp:2413 -#: ../../../src/bak/ui.cpp:2179 -msgid "Connecting..." -msgstr "Verbinden..." - -#: ../../../src/ui.cpp:2418 -#: ../../../src/bak/ui.cpp:2184 -msgid "Unable to connect" -msgstr "Kan niet verbinden" - -#: ../../../src/ui.cpp:2423 -#: ../../../src/bak/ui.cpp:2189 -msgid "Requesting public key..." -msgstr "Aanvragen van publieke sleutel..." - -#: ../../../src/ui.cpp:2435 -#: ../../../src/bak/ui.cpp:2201 -msgid "Received public key..." -msgstr "Publieke sleutel ontvangen..." - -#: ../../../src/ui.cpp:2449 -#: ../../../src/bak/ui.cpp:2215 -msgid "Recipient is not accepting transactions sent by IP address" -msgstr "Ontvanger aanvaardt geen transacties via IP adres" - -#: ../../../src/ui.cpp:2451 -#: ../../../src/bak/ui.cpp:2217 -msgid "Transfer was not accepted" -msgstr "Transactie niet geaccepteerd" - -#: ../../../src/ui.cpp:2460 -#: ../../../src/bak/ui.cpp:2226 -msgid "Invalid response received" -msgstr "Foutief antwoord ontvangen" - -#: ../../../src/ui.cpp:2473 -#: ../../../src/bak/ui.cpp:2241 -msgid "Creating transaction..." -msgstr "Transactie aanmaken..." - -#: ../../../src/ui.cpp:2496 -#: ../../../src/bak/ui.cpp:2253 -#, c-format -msgid "This transaction requires a transaction fee of at least %s because of its amount, complexity, or use of recently received funds" -msgstr "Deze transactie vergt een fooi van ten minste %s omwille van zijn bedrag, complexiteit, of gebruik van recent ontvangen fonden" - -#: ../../../src/ui.cpp:2498 -#: ../../../src/bak/ui.cpp:2255 -msgid "Transaction creation failed" -msgstr "Aanmaken van transactie mislukt" - -#: ../../../src/ui.cpp:2508 -#: ../../../src/bak/ui.cpp:2262 -msgid "Transaction aborted" -msgstr "Transactie geannuleerd" - -#: ../../../src/ui.cpp:2516 -#: ../../../src/bak/ui.cpp:2270 -msgid "Lost connection, transaction cancelled" -msgstr "Verbinding verloren, transactie geannuleerd" - -#: ../../../src/ui.cpp:2532 -#: ../../../src/bak/ui.cpp:2286 -msgid "Sending payment..." -msgstr "Betaling versturen..." - -#: ../../../src/ui.cpp:2544 -#: ../../../src/bak/ui.cpp:2292 -msgid "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." -msgstr "Fout: De transactie is afgekeurd. Dit kan gebeuren als bepaalde coins in je Portefeuille al zijn uitgegeven. Dit kan veroorzaakt worden doordat je een kopie van wallet.dat gebruikt hebt en enkel daar je uitgave geregistreerd is." - -#: ../../../src/ui.cpp:2553 -#: ../../../src/bak/ui.cpp:2301 -msgid "Waiting for confirmation..." -msgstr "Wachten op bevestiging..." - -#: ../../../src/ui.cpp:2570 -#: ../../../src/bak/ui.cpp:2319 -msgid "" -"The payment was sent, but the recipient was unable to verify it.\n" -"The transaction is recorded and will credit to the recipient,\n" -"but the comment information will be blank." -msgstr "" -"De betaling is verstuurd, maar de ontvanger kon hem niet verifiëren.\n" -"De transactie is opgenomen en wordt uitbetaald aan de ontvanger,\n" -"maar het mededelings-veld blijft blanco." - -#: ../../../src/ui.cpp:2579 -#: ../../../src/bak/ui.cpp:2328 -msgid "Payment was sent, but an invalid response was received" -msgstr "Betaling is verstuurd, maar een foutief antword is ontvangen." - -#: ../../../src/ui.cpp:2585 -#: ../../../src/bak/ui.cpp:2334 -msgid "Payment completed" -msgstr "Betaling voltooid" - -#: ../../../src/ui.cpp:2627 -#: ../../../src/ui.cpp:2773 -#: ../../../src/ui.cpp:2813 -#: ../../../src/bak/ui.cpp:2376 -#: ../../../src/bak/ui.cpp:2522 -#: ../../../src/bak/ui.cpp:2559 -msgid "Name" -msgstr "Naam" - -#: ../../../src/ui.cpp:2628 -#: ../../../src/ui.cpp:2773 -#: ../../../src/ui.cpp:2813 -#: ../../../src/bak/ui.cpp:2377 -#: ../../../src/bak/ui.cpp:2522 -#: ../../../src/bak/ui.cpp:2559 -msgid "Address" -msgstr "Adres" - -#: ../../../src/ui.cpp:2630 -#: ../../../src/ui.cpp:2785 -#: ../../../src/bak/ui.cpp:2379 -#: ../../../src/bak/ui.cpp:2534 -msgid "Label" -msgstr "Label" - -#: ../../../src/ui.cpp:2631 -#: ../../../src/uibase.cpp:847 -#: ../../../src/bak/ui.cpp:2380 -msgid "Bitcoin Address" -msgstr "Bitcoin-adres" - -#: ../../../src/ui.cpp:2755 -#: ../../../src/bak/ui.cpp:2504 -msgid "This is one of your own addresses for receiving payments and cannot be entered in the address book. " -msgstr "Dit is een van uw eigen adressen voor het ontvangen van betalingen, en kan niet worden toegevoegd aan uw adresboek. " - -#: ../../../src/ui.cpp:2773 -#: ../../../src/ui.cpp:2779 -#: ../../../src/bak/ui.cpp:2522 -#: ../../../src/bak/ui.cpp:2528 -msgid "Edit Address" -msgstr "Bewerk adres" - -#: ../../../src/ui.cpp:2785 -#: ../../../src/bak/ui.cpp:2534 -msgid "Edit Address Label" -msgstr "Bewerk adreslabel" - -#: ../../../src/ui.cpp:2813 -#: ../../../src/ui.cpp:2819 -#: ../../../src/bak/ui.cpp:2559 -#: ../../../src/bak/ui.cpp:2565 -msgid "Add Address" -msgstr "Adres toevoegen" - -#: ../../../src/ui.cpp:2906 -#: ../../../src/bak/ui.cpp:2642 -msgid "Bitcoin" -msgstr "Bitcoin" - -#: ../../../src/ui.cpp:2908 -#: ../../../src/bak/ui.cpp:2644 -msgid "Bitcoin - Generating" -msgstr "Bitcoin - Genereren..." - -#: ../../../src/ui.cpp:2910 -#: ../../../src/bak/ui.cpp:2646 -msgid "Bitcoin - (not connected)" -msgstr "Bitcoin - (niet verbonden)" - -#: ../../../src/ui.cpp:2989 -#: ../../../src/bak/ui.cpp:2725 -msgid "&Open Bitcoin" -msgstr "&Open Bitcoin" - -#: ../../../src/ui.cpp:2990 -#: ../../../src/bak/ui.cpp:2726 -msgid "&Send Bitcoins" -msgstr "&Verstuur Bitcoins" - -#: ../../../src/ui.cpp:2991 -#: ../../../src/bak/ui.cpp:2727 -msgid "O&ptions..." -msgstr "O&pties" - -#: ../../../src/ui.cpp:2994 -#: ../../../src/uibase.cpp:25 -#: ../../../src/bak/ui.cpp:2730 -msgid "E&xit" -msgstr "A&fsluiten" - -#: ../../../src/ui.cpp:3220 -#: ../../../src/bak/ui.cpp:2956 -msgid "Program has crashed and will terminate. " -msgstr "Het programma is gecrasht en wordt afgesloten. " - -#: ../../../src/uibase.cpp:28 -msgid "&File" -msgstr "&Bestand" - -#: ../../../src/uibase.cpp:32 -msgid "&Your Receiving Addresses..." -msgstr "&Uw ontvangstadressen..." - -#: ../../../src/uibase.cpp:35 -msgid "&Encrypt Wallet..." -msgstr "&Versleutel portefeuille..." - -#: ../../../src/uibase.cpp:38 -msgid "&Change Wallet Encryption Passphrase..." -msgstr "&Wijzig portefeuille-wachtwoord..." - -#: ../../../src/uibase.cpp:42 -msgid "&Options..." -msgstr "&Opties..." - -#: ../../../src/uibase.cpp:45 -msgid "&Settings" -msgstr "&Eigenschappen" - -#: ../../../src/uibase.cpp:49 -msgid "&About..." -msgstr "&Over..." - -#: ../../../src/uibase.cpp:52 -msgid "&Help" -msgstr "&Help" - -#: ../../../src/uibase.cpp:62 -msgid "Address Book" -msgstr "Adresboek" - -#: ../../../src/uibase.cpp:75 -msgid "Your Bitcoin Address:" -msgstr "Uw bitcoin-adres:" - -#: ../../../src/uibase.cpp:82 -msgid " &New... " -msgstr " &Nieuw... " - -#: ../../../src/uibase.cpp:85 -#: ../../../src/uibase.cpp:790 -#: ../../../src/uibase.cpp:893 -msgid " &Copy to Clipboard " -msgstr " &Kopieer naar plakbord " - -#: ../../../src/uibase.cpp:99 -msgid "Balance:" -msgstr "Balans:" - -#: ../../../src/uibase.cpp:115 -msgid " All" -msgstr " Alles" - -#: ../../../src/uibase.cpp:115 -msgid " Sent" -msgstr " Verstuurd" - -#: ../../../src/uibase.cpp:115 -msgid " Received" -msgstr " Ontvangen" - -#: ../../../src/uibase.cpp:115 -msgid " In Progress" -msgstr " Wordt verwerkt" - -#: ../../../src/uibase.cpp:136 -msgid "All Transactions" -msgstr "Alle transacties" - -#: ../../../src/uibase.cpp:147 -msgid "Sent/Received" -msgstr "Verstuurd/Ontvangen" - -#: ../../../src/uibase.cpp:158 -msgid "Sent" -msgstr "Verstuurd" - -#: ../../../src/uibase.cpp:169 -msgid "Received" -msgstr "Ontvangen" - -#: ../../../src/uibase.cpp:312 -#: ../../../src/uibase.cpp:453 -#: ../../../src/uibase.cpp:552 -#: ../../../src/uibase.cpp:732 -#: ../../../src/uibase.cpp:793 -#: ../../../src/uibase.cpp:902 -#: ../../../src/uibase.cpp:991 -msgid "OK" -msgstr "OK" - -#: ../../../src/uibase.cpp:355 -msgid "&Start Bitcoin on system startup" -msgstr "&Start Bitcoin wanneer het systeem opstart" - -#: ../../../src/uibase.cpp:358 -msgid "&Minimize to the tray instead of the taskbar" -msgstr "&Minimaliseer tot systeemvak in plaats van de taakbalk" - -#: ../../../src/uibase.cpp:361 -msgid "Map port using &UPnP" -msgstr "Portmapping via &UPnP" - -#: ../../../src/uibase.cpp:364 -msgid "M&inimize to the tray on close" -msgstr "M&inimaliseer tot taakbalk bij sluiten" - -#: ../../../src/uibase.cpp:370 -msgid "&Connect through socks4 proxy (requires restart to apply): " -msgstr "&Verbind via socks4 proxy (vereist herstart):" - -#: ../../../src/uibase.cpp:381 -msgid "Proxy &IP:" -msgstr "Proxy &IP:" - -#: ../../../src/uibase.cpp:389 -msgid " &Port:" -msgstr " &Poort:" - -#: ../../../src/uibase.cpp:402 -msgid "Optional transaction fee per KB that helps make sure your transactions are processed quickly. Most transactions are 1KB. Fee 0.01 recommended." -msgstr "Optionele transactiefooi per KB die helpt ervoor zorgen dat uw transacties snel verwerkt worden. De meeste transacties zijn 1KB. Fooi 0.01 is aangeraden." - -#: ../../../src/uibase.cpp:409 -msgid "Pay transaction fee:" -msgstr "Transactiefooi:" - -#: ../../../src/uibase.cpp:430 -msgid "// [don't translate] Test panel 2 for future expansion" -msgstr "" - -#: ../../../src/uibase.cpp:434 -msgid "// [don't translate] Let's not start multiple pages until the first page is filled up" -msgstr "" - -#: ../../../src/uibase.cpp:456 -#: ../../../src/uibase.cpp:678 -#: ../../../src/uibase.cpp:737 -#: ../../../src/uibase.cpp:796 -#: ../../../src/uibase.cpp:905 -#: ../../../src/uibase.cpp:994 -msgid "Cancel" -msgstr "Annuleren" - -#: ../../../src/uibase.cpp:459 -msgid "&Apply" -msgstr "&Toepassen" - -#: ../../../src/uibase.cpp:518 -msgid "Bitcoin " -msgstr "Bitcoin " - -#: ../../../src/uibase.cpp:524 -msgid "version" -msgstr "versie" - -#: ../../../src/uibase.cpp:535 -msgid "" -"Copyright (c) 2009-2011 Bitcoin Developers\n" -"\n" -"This is experimental software.\n" -"\n" -"Distributed under the MIT/X11 software license, see the accompanying file \n" -"license.txt or http://www.opensource.org/licenses/mit-license.php.\n" -"\n" -"This product includes software developed by the OpenSSL Project for use in the \n" -"OpenSSL Toolkit (http://www.openssl.org/) and cryptographic software written by \n" -"Eric Young (eay@cryptsoft.com) and UPnP software written by Thomas Bernard." -msgstr "" -"Copyright (c) 2009-2011 Bitcoin-ontwikkelaars\n" -"\n" -"Dit is experimentele software.\n" -"\n" -"Gedistributeerd onder de MIT/X11 software licentie, zie het bijgevoegde bestand \n" -"license.txt of kijk op http://www.opensource.org/licenses/mit-license.php.\n" -"\n" -"Dit product bevat software ontwikkeld door het OpenSSL project for gebruik \n" -"in de OpenSSL Toolkit (http://www.openssl.org/), en cryptografische \n" -"software geschreven door Eric Young (eay@cryptsoft.com)) en UPnP software geschreven\n" -"door Thomas Bernard." - -#: ../../../src/uibase.cpp:591 -msgid "Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)" -msgstr "Voer een bitcoin-adres (bijvoorbeeld: 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)" - -#: ../../../src/uibase.cpp:605 -msgid "Pay &To:" -msgstr "Betaal &aan:" - -#: ../../../src/uibase.cpp:620 -msgid "&Paste" -msgstr "&Plakken" - -#: ../../../src/uibase.cpp:623 -msgid " Address &Book..." -msgstr " Adres&boek..." - -#: ../../../src/uibase.cpp:630 -msgid "&Amount:" -msgstr "&Hoeveelheid:" - -#: ../../../src/uibase.cpp:640 -msgid "T&ransfer:" -msgstr "O&verdracht:" - -#: ../../../src/uibase.cpp:646 -msgid " Standard" -msgstr " Standaard" - -#: ../../../src/uibase.cpp:673 -msgid "&Send" -msgstr "&Versturen" - -#: ../../../src/uibase.cpp:721 -msgid "" -"\n" -"\n" -"Connecting..." -msgstr "" -"\n" -"\n" -"Verbinden..." - -#: ../../../src/uibase.cpp:771 -msgid "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. The highlighted address is displayed in the main window." -msgstr "Dit zijn je bitcoin-adressen voor het ontvangen van betalingen. Het is een goed idee iedere afzender een ander adres te geven zodat je bij kunt houden wie je een betaling stuurt. Het geselecteerde adres is zichtbaar in het hoofdscherm." - -#: ../../../src/uibase.cpp:784 -#: ../../../src/uibase.cpp:896 -msgid "&Edit..." -msgstr "&Bewerken..." - -#: ../../../src/uibase.cpp:787 -#: ../../../src/uibase.cpp:899 -msgid " &New Address... " -msgstr " &Nieuw adres... " - -#: ../../../src/uibase.cpp:859 -msgid "Sending" -msgstr "Versturen..." - -#: ../../../src/uibase.cpp:867 -msgid "These are your Bitcoin addresses for receiving payments. You can give a different one to each sender to keep track of who is paying you. The highlighted address will be displayed in the main window." -msgstr "Dit zijn je bitcoin-adressen voor het ontvangen van betalingen. Het is een goed idee iedere afzender een ander adres te geven zodat je bij kunt houden wie je een betaling stuurt. Het geselecteerde adres is zichtbaar in het hoofdscherm." - -#: ../../../src/uibase.cpp:880 -msgid "Receiving" -msgstr "Ontvangen..." - -#: ../../../src/uibase.cpp:890 -msgid "&Delete" -msgstr "&Verwijderen" - -#: ../../../src/bak/wallet.cpp:957 -msgid "Invalid bitcoin address" -msgstr "Foutief bitcoin-adres" - -#: ../../../src/bak/uibase.cpp:360 -msgid "&Connect through socks4 proxy: " -msgstr "&Verbind via socks4 proxy: " - -#: ../../../src/uibase.h:151 -msgid "Transaction Details" -msgstr "Transactiedetails" - -#: ../../../src/uibase.h:203 -msgid "Options" -msgstr "Opties" - -#: ../../../src/uibase.h:232 -msgid "About Bitcoin" -msgstr "Over Bitcoin" - -#: ../../../src/uibase.h:341 -msgid "Your Bitcoin Addresses" -msgstr "Uw bitcoin-adressen" - diff --git a/locale/pl/LC_MESSAGES/bitcoin.po b/locale/pl/LC_MESSAGES/bitcoin.po deleted file mode 100644 index 17b5f10468..0000000000 --- a/locale/pl/LC_MESSAGES/bitcoin.po +++ /dev/null @@ -1,978 +0,0 @@ -msgid "" -msgstr "" -"Project-Id-Version: Bitcoin\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-06-28 20:11+0100\n" -"PO-Revision-Date: \n" -"Last-Translator: Krystian Maksymowicz <krystian.maksymowicz@gmail.com>\n" -"Language-Team: Spiechu <spiechu@gmail.com>, Krystian Maksymowicz <krystian.maksymowicz@gmail.com>\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Language: \n" -"X-Poedit-Language: Polish\n" -"X-Poedit-Country: POLAND\n" -"X-Poedit-SourceCharset: utf-8\n" -"X-Poedit-KeywordsList: _;gettext;gettext_noop\n" -"X-Poedit-Basepath: .\n" -"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n" -"X-Poedit-SearchPath-0: ../../..\n" - -#: ../../../src/net.cpp:1590 -#, c-format -msgid "Unable to bind to port %d on this computer. Bitcoin is probably already running." -msgstr "Powiązanie z portem %d nie powiodło się. Prawdopodobnie Bitcoin jest już uruchomiony." - -#: ../../../src/init.cpp:162 -msgid "Bitcoin version" -msgstr "Wersja Bitcoin" - -#: ../../../src/init.cpp:163 -msgid "Usage:" -msgstr "Zastosowanie:" - -#: ../../../src/init.cpp:165 -msgid "Send command to -server or bitcoind\n" -msgstr "Wyślij polecenie do -server lub bitcoind\n" - -#: ../../../src/init.cpp:166 -msgid "List commands\n" -msgstr "Lista komend\n" - -#: ../../../src/init.cpp:167 -msgid "Get help for a command\n" -msgstr "Wyświetl pomoc dla komendy\n" - -#: ../../../src/init.cpp:168 -msgid "Options:\n" -msgstr "Opcje:\n" - -#: ../../../src/init.cpp:169 -msgid "Specify configuration file (default: bitcoin.conf)\n" -msgstr "Określ plik konfiguracyjny (domyślnie: bitcoin.conf)\n" - -#: ../../../src/init.cpp:170 -msgid "Specify pid file (default: bitcoind.pid)\n" -msgstr "Określ plik pid (domyślnie: bitcoind.pid)\n" - -#: ../../../src/init.cpp:171 -msgid "Generate coins\n" -msgstr "Generuj monety\n" - -#: ../../../src/init.cpp:172 -msgid "Don't generate coins\n" -msgstr "Nie generuj monet\n" - -#: ../../../src/init.cpp:173 -msgid "Start minimized\n" -msgstr "Uruchom zminimalizowany\n" - -#: ../../../src/init.cpp:174 -msgid "Specify data directory\n" -msgstr "Określ katalog danych\n" - -#: ../../../src/init.cpp:175 -msgid "Specify connection timeout (in milliseconds)\n" -msgstr "Ustaw limit czasu połączenia (w milisekundach)\n" - -#: ../../../src/init.cpp:176 -msgid "Connect through socks4 proxy\n" -msgstr "Połącz przez proxy socks4\n" - -# 2do -#: ../../../src/init.cpp:177 -msgid "Allow DNS lookups for addnode and connect\n" -msgstr "Umożliwiaj wyszukiwanie DNS przy dodawaniu węzła i połączenia\n" - -# 2do -#: ../../../src/init.cpp:178 -msgid "Add a node to connect to\n" -msgstr "Dodaj węzeł do którego połączyć\n" - -#: ../../../src/init.cpp:179 -msgid "Connect only to the specified node\n" -msgstr "Łącz tylko z wybranym węzłem\n" - -#: ../../../src/init.cpp:180 -msgid "Don't accept connections from outside\n" -msgstr "Nie akceptuj połączeń z zewnątrz\n" - -#: ../../../src/init.cpp:183 -msgid "Don't attempt to use UPnP to map the listening port\n" -msgstr "Nie próbuj użyć UPnP dla mapowania portu nasłuchu\n" - -#: ../../../src/init.cpp:185 -msgid "Attempt to use UPnP to map the listening port\n" -msgstr "Próbuj użyć UPnP dla mapowania portu nasłuchu\n" - -#: ../../../src/init.cpp:188 -msgid "Fee per KB to add to transactions you send\n" -msgstr "Prowizja na KB dodawana do transakcji, które wysyłasz\n" - -#: ../../../src/init.cpp:190 -msgid "Accept command line and JSON-RPC commands\n" -msgstr "Akceptuj polecenia linii poleceń i JSON-RPC\n" - -#: ../../../src/init.cpp:193 -msgid "Run in the background as a daemon and accept commands\n" -msgstr "Uruchom w tle (daemon) i akceptuj komendy\n" - -#: ../../../src/init.cpp:195 -msgid "Use the test network\n" -msgstr "Użyj sieci testowej\n" - -#: ../../../src/init.cpp:196 -msgid "Username for JSON-RPC connections\n" -msgstr "Nazwa użytkownika dla połączeń JSON-RPC\n" - -#: ../../../src/init.cpp:197 -msgid "Password for JSON-RPC connections\n" -msgstr "Hasło dla połączeń JSON-RPC\n" - -#: ../../../src/init.cpp:198 -msgid "Listen for JSON-RPC connections on <port> (default: 8332)\n" -msgstr "Nasłuch dla połączeń JSON-RPC na porcie <port> (domyślnie: 8332)\n" - -#: ../../../src/init.cpp:199 -msgid "Allow JSON-RPC connections from specified IP address\n" -msgstr "Zezwól na połączenia JSON-RPC z adresu IP\n" - -#: ../../../src/init.cpp:200 -msgid "Send commands to node running on <ip> (default: 127.0.0.1)\n" -msgstr "Wysyłaj polecenia do węzła działającego na <ip> (domyślnie: 127.0.0.1)\n" - -#: ../../../src/init.cpp:201 -msgid "Set key pool size to <n> (default: 100)\n" -msgstr "Ustaw pulę kluczy na <n> (domyślnie: 100)\n" - -#: ../../../src/init.cpp:202 -msgid "Rescan the block chain for missing wallet transactions\n" -msgstr "Przeszukaj łańcuch bloków w poszukiwaniu zaginionych transakcji\n" - -#: ../../../src/init.cpp:206 -msgid "" -"\n" -"SSL options: (see the Bitcoin Wiki for SSL setup instructions)\n" -msgstr "" -"\n" -"Opcje SSL: (zobacz instrukcje na Bitcoin Wiki dla ustawień SSL)\n" - -#: ../../../src/init.cpp:207 -msgid "Use OpenSSL (https) for JSON-RPC connections\n" -msgstr "Użyj OpenSSL (https) dla połączeń JSON-RPC\n" - -#: ../../../src/init.cpp:208 -msgid "Server certificate file (default: server.cert)\n" -msgstr "Plik certyfikacji serwera (domyślnie: server.cert)\n" - -#: ../../../src/init.cpp:209 -msgid "Server private key (default: server.pem)\n" -msgstr "Klucz prywatny serwera (domyślnie: server.pem)\n" - -#: ../../../src/init.cpp:210 -msgid "Acceptable ciphers (default: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH)\n" -msgstr "Akceptowalne szyfry (domyślnie: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH)\n" - -#: ../../../src/init.cpp:214 -msgid "This help message\n" -msgstr "Ta wiadomość pomocy\n" - -#: ../../../src/init.cpp:351 -#, c-format -msgid "Cannot obtain a lock on data directory %s. Bitcoin is probably already running." -msgstr "Nie można korzystać z katalogu %s z danymi. Bitcoin prawdopodobnie już jest uruchomiony." - -#: ../../../src/init.cpp:377 -msgid "Error loading addr.dat \n" -msgstr "Błąd ładowania addr.dat \n" - -#: ../../../src/init.cpp:383 -msgid "Error loading blkindex.dat \n" -msgstr "Błąd ładowania blkindex.dat \n" - -#: ../../../src/init.cpp:391 -msgid "Error loading wallet.dat \n" -msgstr "Błąd ładowania wallet.dat \n" - -#: ../../../src/init.cpp:481 -msgid "Invalid -proxy address" -msgstr "Niewłaściwy adres -proxy" - -#: ../../../src/init.cpp:504 -msgid "Invalid amount for -paytxfee=<amount>" -msgstr "Nieprawidłowa kwota w -paytxfee=<amount>" - -#: ../../../src/init.cpp:508 -msgid "Warning: -paytxfee is set very high. This is the transaction fee you will pay if you send a transaction." -msgstr "Ostrzeżenie: ustawienie -paytxfee jest bardzo wysokie. To jest prowizja transakcji, którą zapłacisz jeżeli wyślesz transakcję." - -#: ../../../src/rpc.cpp:1822 -#: ../../../src/rpc.cpp:1824 -#, c-format -msgid "To use the %s option" -msgstr "Użycie opcji %s" - -#: ../../../src/rpc.cpp:1826 -#, c-format -msgid "" -"Warning: %s, you must set rpcpassword=<password>\n" -"in the configuration file: %s\n" -"If the file does not exist, create it with owner-readable-only file permissions.\n" -msgstr "" -"Ostrzeżenie: %s, musisz ustawić rpcpassword=<password>\n" -"w pliku konfiguracyjnym: %s\n" -"Jeżeli plik nie istnieje, utwórz go z uprawnieniami tylko do odczytu dla właściciela.\n" - -#: ../../../src/rpc.cpp:1994 -#, c-format -msgid "" -"You must set rpcpassword=<password> in the configuration file:\n" -"%s\n" -"If the file does not exist, create it with owner-readable-only file permissions." -msgstr "" -"Musisz ustawić rpcpassword=<password> w pliku konfiguracyjnym:\n" -"%s\n" -"Jeżeli plik nie istnieje, utwórz go z uprawnieniami tylko do odczytu dla właściciela." - -#: ../../../src/util.cpp:874 -msgid "Warning: Please check that your computer's date and time are correct. If your clock is wrong Bitcoin will not work properly." -msgstr "Ostrzeżenie: Sprawdź czy ustawienia daty i czasu komputera są prawidłowe. Jeżeli zegar jest źle ustawiony, Bitcoin nie będzie działał poprawnie." - -#: ../../../src/util.cpp:908 -msgid "beta" -msgstr "beta" - -#: ../../../src/ui.cpp:216 -#, c-format -msgid "This transaction is over the size limit. You can still send it for a fee of %s, which goes to the nodes that process your transaction and helps to support the network. Do you want to pay the fee?" -msgstr "Ta transakcja przekracza limit wielkości. W dalszym ciągu możesz ją wysłać z prowizją %s, która dotrze do węzłów przetwarzających twoją transakcję i pomoże utrzymać całą sieć. Chcesz zapłacić prowizję?" - -#: ../../../src/ui.cpp:316 -msgid "Status" -msgstr "Stan" - -#: ../../../src/ui.cpp:317 -msgid "Date" -msgstr "Data" - -#: ../../../src/ui.cpp:318 -msgid "Description" -msgstr "Opis" - -#: ../../../src/ui.cpp:319 -msgid "Debit" -msgstr "Debet" - -#: ../../../src/ui.cpp:320 -msgid "Credit" -msgstr "Kredyt" - -#: ../../../src/ui.cpp:526 -#, c-format -msgid "Open for %d blocks" -msgstr "Otwórz na %d bloków" - -#: ../../../src/ui.cpp:528 -#, c-format -msgid "Open until %s" -msgstr "Otwarte dopóki %s" - -#: ../../../src/ui.cpp:534 -#, c-format -msgid "%d/offline?" -msgstr "%d/offline?" - -#: ../../../src/ui.cpp:536 -#, c-format -msgid "%d/unconfirmed" -msgstr "%d/niepotwierdzona" - -#: ../../../src/ui.cpp:538 -#, c-format -msgid "%d confirmations" -msgstr "%d potwierdzeń" - -#: ../../../src/ui.cpp:623 -msgid "Generated" -msgstr "Wygenerowano" - -#: ../../../src/ui.cpp:631 -#, c-format -msgid "Generated (%s matures in %d more blocks)" -msgstr "Wygenerowano (%s dojrzałych w %d więcej bloków)" - -#: ../../../src/ui.cpp:635 -msgid "Generated - Warning: This block was not received by any other nodes and will probably not be accepted!" -msgstr "Wygenerowano - Ostrzeżenie: Ten blok nie został otrzymany przez żaden inny węzeł i prawdopodobnie nie zostanie zaakceptowany!" - -#: ../../../src/ui.cpp:639 -msgid "Generated (not accepted)" -msgstr "Wygenerowano (nie zaakceptowano)" - -#: ../../../src/ui.cpp:649 -msgid "From: " -msgstr "Od:" - -#: ../../../src/ui.cpp:673 -msgid "Received with: " -msgstr "Otrzymano z:" - -#: ../../../src/ui.cpp:719 -msgid "Payment to yourself" -msgstr "Płatność dla siebie samego" - -#: ../../../src/ui.cpp:753 -msgid "To: " -msgstr "Do:" - -#: ../../../src/ui.cpp:1068 -msgid " Generating" -msgstr " Generowanie" - -#: ../../../src/ui.cpp:1070 -msgid "(not connected)" -msgstr "(nie połączony)" - -#: ../../../src/ui.cpp:1073 -#, c-format -msgid " %d connections %d blocks %d transactions" -msgstr " %d połączeń %d bloków %d transakcji" - -#: ../../../src/ui.cpp:1178 -#: ../../../src/ui.cpp:2571 -msgid "New Receiving Address" -msgstr "Nowy adres odbiorczy" - -#: ../../../src/ui.cpp:1179 -#: ../../../src/ui.cpp:2572 -msgid "" -"You should use a new address for each payment you receive.\n" -"\n" -"Label" -msgstr "" -"Powinieneś używać nowych adresów dla każdej otrzymywanej płatności.\n" -"\n" -"Etykieta" - -#: ../../../src/ui.cpp:1251 -msgid "<b>Status:</b> " -msgstr "<b>Status:</b>" - -#: ../../../src/ui.cpp:1256 -msgid ", has not been successfully broadcast yet" -msgstr ", nie został jeszcze prawidłowo rozgłoszony" - -#: ../../../src/ui.cpp:1258 -#, c-format -msgid ", broadcast through %d node" -msgstr ", rozgłasza przez %d węzeł" - -#: ../../../src/ui.cpp:1260 -#, c-format -msgid ", broadcast through %d nodes" -msgstr ", rozgłasza przez %d węzłów" - -#: ../../../src/ui.cpp:1264 -msgid "<b>Date:</b> " -msgstr "<b>Data:</b>" - -#: ../../../src/ui.cpp:1272 -msgid "<b>Source:</b> Generated<br>" -msgstr "<b>Źródło:</b> Wygenerowano<br>" - -#: ../../../src/ui.cpp:1278 -#: ../../../src/ui.cpp:1296 -msgid "<b>From:</b> " -msgstr "<b>Od:</b>" - -#: ../../../src/ui.cpp:1296 -msgid "unknown" -msgstr "nieznany" - -#: ../../../src/ui.cpp:1297 -#: ../../../src/ui.cpp:1321 -#: ../../../src/ui.cpp:1380 -msgid "<b>To:</b> " -msgstr "<b>Do:</b>" - -#: ../../../src/ui.cpp:1300 -msgid " (yours, label: " -msgstr " (twoja, etykieta: " - -#: ../../../src/ui.cpp:1302 -msgid " (yours)" -msgstr " (twoja)" - -#: ../../../src/ui.cpp:1339 -#: ../../../src/ui.cpp:1351 -#: ../../../src/ui.cpp:1397 -#: ../../../src/ui.cpp:1414 -msgid "<b>Credit:</b> " -msgstr "<b>Kredyt:</b>" - -#: ../../../src/ui.cpp:1341 -#, c-format -msgid "(%s matures in %d more blocks)" -msgstr "(%s dojrzałych w %d więcej bloków)" - -#: ../../../src/ui.cpp:1343 -msgid "(not accepted)" -msgstr "(nie zaakceptowano)" - -#: ../../../src/ui.cpp:1388 -#: ../../../src/ui.cpp:1396 -#: ../../../src/ui.cpp:1411 -msgid "<b>Debit:</b> " -msgstr "<b>Debet:</b>" - -#: ../../../src/ui.cpp:1402 -msgid "<b>Transaction fee:</b> " -msgstr "<b>Prowizja transakcji:</b>" - -#: ../../../src/ui.cpp:1418 -msgid "<b>Net amount:</b> " -msgstr "<b>Kwota netto:</b>" - -#: ../../../src/ui.cpp:1425 -msgid "Message:" -msgstr "Wiadomość:" - -#: ../../../src/ui.cpp:1427 -msgid "Comment:" -msgstr "Komentarz:" - -#: ../../../src/ui.cpp:1430 -msgid "Generated coins must wait 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, it will change to \"not accepted\" and not be spendable. This may occasionally happen if another node generates a block within a few seconds of yours." -msgstr "Wygenerowane monety muszą poczekać 120 bloków zanim będą mogły być wydane. Wygenerowany blok został został rozgłoszony w sieci z przeznaczeniem dodawania nowych bloków do łańcucha. Jeżeli nie uda się go dodać do łańcucha, zostanie oznaczony jako \"nie zaakceptowany\" i nie będzie mógł być wydany. Sporadycznie dzieje się tak jeżeli inny węzeł wygeneruje blok nie dalej niż kilka sekund od ciebie." - -#: ../../../src/ui.cpp:1610 -msgid "Cannot write autostart/bitcoin.desktop file" -msgstr "Nie mogę zapisać pliku autostart/bitcoin.desktop" - -#: ../../../src/ui.cpp:1646 -msgid "Main" -msgstr "Główne" - -#: ../../../src/ui.cpp:1656 -msgid "&Start Bitcoin on window system startup" -msgstr "&Uruchom Bitcoin przy starcie systemu" - -#: ../../../src/ui.cpp:1663 -msgid "&Minimize on close" -msgstr "&Minimalizuj przy zamknięciu" - -#: ../../../src/ui.cpp:1805 -#, c-format -msgid "version %s" -msgstr "wersja %s" - -#: ../../../src/ui.cpp:1928 -msgid "Error in amount " -msgstr "Nieprawidłowa kwota" - -#: ../../../src/ui.cpp:1928 -#: ../../../src/ui.cpp:1933 -#: ../../../src/ui.cpp:1938 -#: ../../../src/ui.cpp:1973 -#: ../../../src/uibase.cpp:55 -msgid "Send Coins" -msgstr "Wyślij Monety" - -#: ../../../src/ui.cpp:1933 -msgid "Amount exceeds your balance " -msgstr "Kwota przekracza twój stan konta" - -#: ../../../src/ui.cpp:1938 -msgid "Total exceeds your balance when the " -msgstr "Przekroczenie twojego stanu konta gdy" - -#: ../../../src/ui.cpp:1938 -msgid " transaction fee is included " -msgstr " prowizja jest wliczona" - -#: ../../../src/ui.cpp:1956 -msgid "Payment sent " -msgstr "Wysłano płatność" - -#: ../../../src/ui.cpp:1956 -#: ../../../src/ui.cpp:1961 -#: ../../../src/ui.cpp:2107 -#: ../../../src/ui.cpp:2260 -#: ../../../src/wallet.cpp:924 -msgid "Sending..." -msgstr "Wysyłanie..." - -#: ../../../src/ui.cpp:1973 -msgid "Invalid address " -msgstr "Nieprawidłowy adres" - -#: ../../../src/ui.cpp:2028 -#, c-format -msgid "Sending %s to %s" -msgstr "Wysyłanie %s do %s" - -#: ../../../src/ui.cpp:2101 -#: ../../../src/ui.cpp:2134 -msgid "CANCELLED" -msgstr "ANULOWANO" - -#: ../../../src/ui.cpp:2105 -msgid "Cancelled" -msgstr "Anulowano" - -#: ../../../src/ui.cpp:2107 -msgid "Transfer cancelled " -msgstr "Transfer anulowany" - -#: ../../../src/ui.cpp:2160 -msgid "Error: " -msgstr "Błąd:" - -#: ../../../src/ui.cpp:2174 -#: ../../../src/ui.cpp:2245 -#: ../../../src/wallet.cpp:943 -msgid "Insufficient funds" -msgstr "Niewystarczające fundusze" - -#: ../../../src/ui.cpp:2179 -msgid "Connecting..." -msgstr "Łączenie..." - -#: ../../../src/ui.cpp:2184 -msgid "Unable to connect" -msgstr "Nie można połączyć" - -#: ../../../src/ui.cpp:2189 -msgid "Requesting public key..." -msgstr "Żądanie klucza publicznego..." - -#: ../../../src/ui.cpp:2201 -msgid "Received public key..." -msgstr "Otrzymano klucz publiczny..." - -#: ../../../src/ui.cpp:2215 -msgid "Recipient is not accepting transactions sent by IP address" -msgstr "Adresat nie akceptuje transakcji wysyłanych przez adres IP" - -#: ../../../src/ui.cpp:2217 -msgid "Transfer was not accepted" -msgstr "Transfer nie został zaakceptowany" - -#: ../../../src/ui.cpp:2226 -msgid "Invalid response received" -msgstr "Otrzymano niepoprawną odpowiedź" - -#: ../../../src/ui.cpp:2241 -msgid "Creating transaction..." -msgstr "Tworzenie transakcji..." - -#: ../../../src/ui.cpp:2253 -#, c-format -msgid "This transaction requires a transaction fee of at least %s because of its amount, complexity, or use of recently received funds" -msgstr "Ta transakcja wymaga prowizji co najmniej %s z uwagi na jej kwotę, złożoność lub wykorzystanie niedawno otrzymanych funduszy" - -#: ../../../src/ui.cpp:2255 -msgid "Transaction creation failed" -msgstr "Błąd tworzenia transakcji " - -#: ../../../src/ui.cpp:2262 -msgid "Transaction aborted" -msgstr "Przerwano transakcję" - -#: ../../../src/ui.cpp:2270 -msgid "Lost connection, transaction cancelled" -msgstr "Utracono połączenie, transakcja anulowana" - -#: ../../../src/ui.cpp:2286 -msgid "Sending payment..." -msgstr "Wysyłanie płatności..." - -#: ../../../src/ui.cpp:2292 -msgid "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." -msgstr "Transakcja została odrzucona. Może się tak zdarzyć jeżeli część monet w twoim portfelu zostało wydanych, np. gdy użyto kopii pliku wallet.dat i monety zostały wydane w kopii, a tutaj nie zostały oznaczone jako wydane." - -#: ../../../src/ui.cpp:2301 -msgid "Waiting for confirmation..." -msgstr "Oczekiwanie na potwierdzenie..." - -#: ../../../src/ui.cpp:2319 -msgid "" -"The payment was sent, but the recipient was unable to verify it.\n" -"The transaction is recorded and will credit to the recipient,\n" -"but the comment information will be blank." -msgstr "" -"Płatność została wysłana, ale odbiorca nie mógł jej zweryfikować.\n" -"Transakcja została zarejestrowana i zostanie przypisana do odbiorcy,\n" -"ale informacja w komentarzu będzie pusta." - -#: ../../../src/ui.cpp:2328 -msgid "Payment was sent, but an invalid response was received" -msgstr "Płatność została wysłana, ale otrzymano nieprawidłową odpowiedź" - -#: ../../../src/ui.cpp:2334 -msgid "Payment completed" -msgstr "Płatność zakończona" - -#: ../../../src/ui.cpp:2376 -#: ../../../src/ui.cpp:2522 -#: ../../../src/ui.cpp:2559 -msgid "Name" -msgstr "Nazwa" - -#: ../../../src/ui.cpp:2377 -#: ../../../src/ui.cpp:2522 -#: ../../../src/ui.cpp:2559 -msgid "Address" -msgstr "Adres" - -#: ../../../src/ui.cpp:2379 -#: ../../../src/ui.cpp:2534 -msgid "Label" -msgstr "Etykieta" - -#: ../../../src/ui.cpp:2380 -#: ../../../src/uibase.cpp:837 -msgid "Bitcoin Address" -msgstr "Adres Bitcoin" - -#: ../../../src/ui.cpp:2504 -msgid "This is one of your own addresses for receiving payments and cannot be entered in the address book. " -msgstr "To jest jeden z twoich adresów na otrzymywane płatności i nie może zostać wpisany do książki adresowej." - -#: ../../../src/ui.cpp:2522 -#: ../../../src/ui.cpp:2528 -msgid "Edit Address" -msgstr "Edytuj adres" - -#: ../../../src/ui.cpp:2534 -msgid "Edit Address Label" -msgstr "Edytuj etykietę adresu" - -#: ../../../src/ui.cpp:2559 -#: ../../../src/ui.cpp:2565 -msgid "Add Address" -msgstr "Dodaj adres" - -#: ../../../src/ui.cpp:2642 -msgid "Bitcoin" -msgstr "Bitcoin" - -#: ../../../src/ui.cpp:2644 -msgid "Bitcoin - Generating" -msgstr "Bitcoin - Generowanie" - -#: ../../../src/ui.cpp:2646 -msgid "Bitcoin - (not connected)" -msgstr "Bitcoin - (nie połączony)" - -#: ../../../src/ui.cpp:2725 -msgid "&Open Bitcoin" -msgstr "&Otwórz Bitcoin" - -#: ../../../src/ui.cpp:2726 -msgid "&Send Bitcoins" -msgstr "&Wyślij Bitcoiny" - -#: ../../../src/ui.cpp:2727 -msgid "O&ptions..." -msgstr "O&pcje..." - -#: ../../../src/ui.cpp:2730 -#: ../../../src/uibase.cpp:25 -msgid "E&xit" -msgstr "W&yjście" - -#: ../../../src/ui.cpp:2956 -msgid "Program has crashed and will terminate. " -msgstr "Program uległ awarii i zostanie zamknięty." - -#: ../../../src/main.cpp:1430 -msgid "Warning: Disk space is low " -msgstr "Ostrzeżenie: Mało miejsca na dysku" - -#: ../../../src/uibase.cpp:28 -msgid "&File" -msgstr "&Plik" - -#: ../../../src/uibase.cpp:32 -msgid "&Your Receiving Addresses..." -msgstr "&Twój adres odbiorczy..." - -#: ../../../src/uibase.cpp:36 -msgid "&Options..." -msgstr "&Opcje..." - -#: ../../../src/uibase.cpp:39 -msgid "&Settings" -msgstr "&Ustawienia" - -#: ../../../src/uibase.cpp:43 -msgid "&About..." -msgstr "&O programie..." - -#: ../../../src/uibase.cpp:46 -msgid "&Help" -msgstr "&Pomoc" - -#: ../../../src/uibase.cpp:56 -msgid "Address Book" -msgstr "Książka adresowa" - -#: ../../../src/uibase.cpp:69 -msgid "Your Bitcoin Address:" -msgstr "Twój adres Bitcoin:" - -#: ../../../src/uibase.cpp:76 -msgid " &New... " -msgstr " &Nowy..." - -#: ../../../src/uibase.cpp:79 -#: ../../../src/uibase.cpp:780 -#: ../../../src/uibase.cpp:883 -msgid " &Copy to Clipboard " -msgstr " &Kopiuj do schowka " - -#: ../../../src/uibase.cpp:93 -msgid "Balance:" -msgstr "Saldo:" - -#: ../../../src/uibase.cpp:109 -msgid " All" -msgstr " Wszystko" - -#: ../../../src/uibase.cpp:109 -msgid " Sent" -msgstr " Wysłano" - -#: ../../../src/uibase.cpp:109 -msgid " Received" -msgstr " Otrzymano" - -#: ../../../src/uibase.cpp:109 -msgid " In Progress" -msgstr "W realizacji" - -#: ../../../src/uibase.cpp:130 -msgid "All Transactions" -msgstr "Wszystkie transakcje" - -#: ../../../src/uibase.cpp:141 -msgid "Sent/Received" -msgstr "Wysłane/Otrzymane" - -#: ../../../src/uibase.cpp:152 -msgid "Sent" -msgstr "Wysłane" - -#: ../../../src/uibase.cpp:163 -msgid "Received" -msgstr "Otrzymane" - -#: ../../../src/uibase.cpp:302 -#: ../../../src/uibase.cpp:443 -#: ../../../src/uibase.cpp:542 -#: ../../../src/uibase.cpp:722 -#: ../../../src/uibase.cpp:783 -#: ../../../src/uibase.cpp:892 -#: ../../../src/uibase.cpp:981 -msgid "OK" -msgstr "OK" - -#: ../../../src/uibase.cpp:345 -msgid "&Start Bitcoin on system startup" -msgstr "&Uruchom Bitcoin wraz ze startem systemu" - -#: ../../../src/uibase.cpp:348 -msgid "&Minimize to the tray instead of the taskbar" -msgstr "&Minimalizuj do obszaru powiadomień zamiast paska zadań" - -#: ../../../src/uibase.cpp:351 -msgid "Map port using &UPnP" -msgstr "Mapuj port używając &UPnP" - -#: ../../../src/uibase.cpp:354 -msgid "M&inimize to the tray on close" -msgstr "M&inimalizuj do obszaru powiadomień przy zamknięciu" - -#: ../../../src/uibase.cpp:360 -msgid "&Connect through socks4 proxy: " -msgstr "&Połącz przez proxy socks4:" - -#: ../../../src/uibase.cpp:371 -msgid "Proxy &IP:" -msgstr "Proxy &IP:" - -#: ../../../src/uibase.cpp:379 -msgid " &Port:" -msgstr " &Port:" - -#: ../../../src/uibase.cpp:392 -msgid "Optional transaction fee per KB that helps make sure your transactions are processed quickly. Most transactions are 1KB. Fee 0.01 recommended." -msgstr "Opcjonalna prowizja określona na każdy KB transakcji, zapewniająca szybkie przetworzenie. Większość transakcji to 1KB. Rekomendowana prowizja to 0.01." - -#: ../../../src/uibase.cpp:399 -msgid "Pay transaction fee:" -msgstr "Płać prowizję od transakcji:" - -#: ../../../src/uibase.cpp:420 -msgid "// [don't translate] Test panel 2 for future expansion" -msgstr "" - -#: ../../../src/uibase.cpp:424 -msgid "// [don't translate] Let's not start multiple pages until the first page is filled up" -msgstr "" - -#: ../../../src/uibase.cpp:446 -#: ../../../src/uibase.cpp:668 -#: ../../../src/uibase.cpp:727 -#: ../../../src/uibase.cpp:786 -#: ../../../src/uibase.cpp:895 -#: ../../../src/uibase.cpp:984 -msgid "Cancel" -msgstr "Anuluj" - -#: ../../../src/uibase.cpp:449 -msgid "&Apply" -msgstr "&Zastosuj" - -#: ../../../src/uibase.cpp:508 -msgid "Bitcoin " -msgstr "Bitcoin " - -#: ../../../src/uibase.cpp:514 -msgid "version" -msgstr "wersja" - -#: ../../../src/uibase.cpp:525 -msgid "" -"Copyright (c) 2009-2011 Bitcoin Developers\n" -"\n" -"This is experimental software.\n" -"\n" -"Distributed under the MIT/X11 software license, see the accompanying file \n" -"license.txt or http://www.opensource.org/licenses/mit-license.php.\n" -"\n" -"This product includes software developed by the OpenSSL Project for use in the \n" -"OpenSSL Toolkit (http://www.openssl.org/) and cryptographic software written by \n" -"Eric Young (eay@cryptsoft.com) and UPnP software written by Thomas Bernard." -msgstr "" -"Copyright (c) 2009-2011 Bitcoin Developers\n" -"\n" -"To oprogramowanie jest eksperymentalne.\n" -"\n" -"Dystrybuowane na licencji MIT/X11, zobacz towarzyszący plik \n" -"license.txt lub http://www.opensource.org/licenses/mit-license.php.\n" -"\n" -"Ten produkt zawiera oprogramowanie rozwijane przez OpenSSL Project w \n" -"OpenSSL Toolkit (http://www.openssl.org/) i oprogramowanie kryptograficzne napisane przez \n" -"Erica Younga (eay@cryptsoft.com) oraz oprogramowanie UPnP napisane przez Thomasa Bernarda." - -#: ../../../src/uibase.cpp:581 -msgid "Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)" -msgstr "Wprowadź adres Bitcoin (np. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)" - -#: ../../../src/uibase.cpp:595 -msgid "Pay &To:" -msgstr "Wpłać &dla:" - -#: ../../../src/uibase.cpp:610 -msgid "&Paste" -msgstr "&Wklej" - -#: ../../../src/uibase.cpp:613 -msgid " Address &Book..." -msgstr " Książka &adresowa..." - -#: ../../../src/uibase.cpp:620 -msgid "&Amount:" -msgstr "&Saldo:" - -#: ../../../src/uibase.cpp:630 -msgid "T&ransfer:" -msgstr "T&ransfer:" - -#: ../../../src/uibase.cpp:636 -msgid " Standard" -msgstr " Standard" - -#: ../../../src/uibase.cpp:663 -msgid "&Send" -msgstr "&Wyślij" - -#: ../../../src/uibase.cpp:711 -msgid "" -"\n" -"\n" -"Connecting..." -msgstr "" -"\n" -"\n" -"Łączenie..." - -#: ../../../src/uibase.cpp:761 -msgid "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. The highlighted address is displayed in the main window." -msgstr "To są twoje adresy Bitcoin dla otrzymywania płatności. Możesz chcieć podawać inny dla każdego płacącego aby kontrolować kto ci płaci. Wyróżniony adres będzie wyświetlany w oknie głównym." - -#: ../../../src/uibase.cpp:774 -#: ../../../src/uibase.cpp:886 -msgid "&Edit..." -msgstr "&Edytuj..." - -#: ../../../src/uibase.cpp:777 -#: ../../../src/uibase.cpp:889 -msgid " &New Address... " -msgstr " &Nowy adres..." - -#: ../../../src/uibase.cpp:849 -msgid "Sending" -msgstr "Wysyłanie" - -#: ../../../src/uibase.cpp:857 -msgid "These are your Bitcoin addresses for receiving payments. You can give a different one to each sender to keep track of who is paying you. The highlighted address will be displayed in the main window." -msgstr "To są twoje adresy Bitcoin dla otrzymywania płatności. Możesz podać różne dla każdego płacącego aby kontrolować kto ci płaci. Wyróżniony adres będzie wyświetlany w oknie głównym." - -#: ../../../src/uibase.cpp:870 -msgid "Receiving" -msgstr "Otrzymywanie" - -#: ../../../src/uibase.cpp:880 -msgid "&Delete" -msgstr "&Usuń" - -#: ../../../src/wallet.cpp:917 -#, c-format -msgid "Error: This transaction requires a transaction fee of at least %s because of its amount, complexity, or use of recently received funds " -msgstr "Błąd: Ta transakcja wymaga prowizji co najmniej %s z uwagi na kwotę, złożoność lub użycie niedawno otrzymanych funduszy" - -#: ../../../src/wallet.cpp:919 -msgid "Error: Transaction creation failed " -msgstr "Błąd: Nie udało się utworzyć transakcji" - -#: ../../../src/wallet.cpp:928 -msgid "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." -msgstr "Błąd: Transakcja została odrzucona. Może się tak zdarzyć jeżeli część monet w twoim portfelu zostało wydanych, np. gdy użyto kopii pliku wallet.dat i monety zostały wydane w kopii, a tutaj nie zostały oznaczone jako wydane." - -#: ../../../src/wallet.cpp:941 -msgid "Invalid amount" -msgstr "Niewłaściwa kwota" - -#: ../../../src/wallet.cpp:948 -msgid "Invalid bitcoin address" -msgstr "Niewłaściwy adres bitcoin" - -#: ../../../src/uibase.h:147 -msgid "Transaction Details" -msgstr "Szczegóły transakcji" - -#: ../../../src/uibase.h:199 -msgid "Options" -msgstr "Opcje" - -#: ../../../src/uibase.h:228 -msgid "About Bitcoin" -msgstr "O Bitcoin" - -#: ../../../src/uibase.h:337 -msgid "Your Bitcoin Addresses" -msgstr "Twoje adresy bitcoin" - diff --git a/locale/pt/LC_MESSAGES/bitcoin.mo b/locale/pt/LC_MESSAGES/bitcoin.mo Binary files differdeleted file mode 100644 index 35a3fd7bc9..0000000000 --- a/locale/pt/LC_MESSAGES/bitcoin.mo +++ /dev/null diff --git a/locale/pt/LC_MESSAGES/bitcoin.po b/locale/pt/LC_MESSAGES/bitcoin.po deleted file mode 100644 index 040fb1da68..0000000000 --- a/locale/pt/LC_MESSAGES/bitcoin.po +++ /dev/null @@ -1,811 +0,0 @@ -msgid ""
-msgstr ""
-"Project-Id-Version: \n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-05-26 22:02-0000\n"
-"PO-Revision-Date: 2010-07-05 09:06+0100\n"
-"Last-Translator: Tiago Faria\n"
-"Language-Team: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Poedit-KeywordsList: _;gettext;gettext_noop\n"
-"X-Poedit-Basepath: .\n"
-"X-Poedit-SearchPath-0: ../../..\n"
-
-#: ../../../init.cpp:342
-msgid "Usage: bitcoin [options]"
-msgstr "Utilização Bitcoin [opções]"
-
-#: ../../../init.cpp:343
-msgid "Options:\n"
-msgstr "Opções:\n"
-
-#: ../../../init.cpp:344
-msgid "Generate coins\n"
-msgstr "Gerar moedas\n"
-
-#: ../../../init.cpp:345
-msgid "Don't generate coins\n"
-msgstr "Não gerar moedas\n"
-
-#: ../../../init.cpp:346
-msgid "Start minimized\n"
-msgstr "Iniciar minimizado\n"
-
-#: ../../../init.cpp:347
-msgid "Specify data directory\n"
-msgstr "Especificar localização dos dados\n"
-
-#: ../../../init.cpp:348
-msgid "Connect through socks4 proxy\n"
-msgstr "Ligar através de um proxy socks4\n"
-
-#: ../../../init.cpp:349
-msgid "Add a node to connect to\n"
-msgstr "Adicionar um nó para efectuar ligação\n"
-
-#: ../../../init.cpp:350
-msgid "Connect only to the specified node\n"
-msgstr "Ligar apenas ao nó especificado\n"
-
-#: ../../../init.cpp:351
-msgid "This help message\n"
-msgstr "Esta mensagem de ajuda\n"
-
-#: ../../../init.cpp:455
-msgid "Error loading addr.dat \n"
-msgstr "Erro ao carregar addr.dat \n"
-
-#: ../../../init.cpp:461
-msgid "Error loading blkindex.dat \n"
-msgstr "Erro ao carregar blkindex.dat \n"
-
-#: ../../../init.cpp:468
-msgid "Error loading wallet.dat \n"
-msgstr "Erro ao carregar wallet.dat \n"
-
-#: ../../../init.cpp:536
-msgid "Invalid -proxy address"
-msgstr "Endereço -proxy inválido"
-
-#: ../../../init.cpp:629
-msgid "Program has crashed and will terminate. "
-msgstr "A aplicação bloqueou e vai terminar. "
-
-#: ../../../main.cpp:1465
-msgid "Warning: Disk space is low "
-msgstr "Aviso: Espaço em disco limitado "
-
-#: ../../../main.cpp:2994
-#, c-format
-msgid "Error: This is an oversized transaction that requires a transaction fee of %s "
-msgstr "Erro: Esta transacção necessita de uma percentagem de transferência no valor de %s "
-
-#: ../../../main.cpp:2996
-msgid "Error: Transaction creation failed "
-msgstr "Erro: Criação da transacção falhou "
-
-#: ../../../main.cpp:3001
-#: ../../../ui.cpp:1761
-#: ../../../ui.cpp:1763
-#: ../../../ui.cpp:1904
-#: ../../../ui.cpp:2053
-msgid "Sending..."
-msgstr "A enviar ..."
-
-#: ../../../main.cpp:3005
-msgid "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."
-msgstr "Erro: A transacção foi rejeitada. Isto pode acontecer se algumas das moedas na sua carteira já tenham sido gastas, como por exemplo na utilização de uma cópia do wallet.dat onde as moedas foram gastas na cópia mas não aqui."
-
-#: ../../../main.cpp:3017
-msgid "Invalid amount"
-msgstr "Montante inválido"
-
-#: ../../../main.cpp:3019
-#: ../../../ui.cpp:1971
-#: ../../../ui.cpp:2038
-msgid "Insufficient funds"
-msgstr "Fundos insuficientes"
-
-#: ../../../main.cpp:3024
-msgid "Invalid bitcoin address"
-msgstr "Endereço Bitcoin inválido"
-
-#: ../../../ui.cpp:189
-#, c-format
-msgid "This transaction is over the size limit. You can still send it for a fee of %s, which goes to the nodes that process your transaction and helps to support the network. Do you want to pay the fee?"
-msgstr "Esta transacção ultrapassa o limite. Pode, mesmo assim, efectuá-la, no entanto, uma percentagem de %s será enviada para os nós da rede que processam este pagamento. Quer pagar a percentagem?"
-
-#: ../../../ui.cpp:285
-msgid "Status"
-msgstr "Estado"
-
-#: ../../../ui.cpp:286
-msgid "Date"
-msgstr "Data"
-
-#: ../../../ui.cpp:287
-msgid "Description"
-msgstr "Descrição"
-
-#: ../../../ui.cpp:288
-msgid "Debit"
-msgstr "Débito"
-
-#: ../../../ui.cpp:289
-msgid "Credit"
-msgstr "Crédito"
-
-#: ../../../ui.cpp:489
-#, c-format
-msgid "Open for %d blocks"
-msgstr "Aberto para %d blocos"
-
-#: ../../../ui.cpp:491
-#, c-format
-msgid "Open until %s"
-msgstr "Aberto até %s"
-
-#: ../../../ui.cpp:497
-#, c-format
-msgid "%d/offline?"
-msgstr "%d/offline?"
-
-#: ../../../ui.cpp:499
-#, c-format
-msgid "%d/unconfirmed"
-msgstr "%d/não confirmado"
-
-#: ../../../ui.cpp:501
-#, c-format
-msgid "%d confirmations"
-msgstr "%d confirmados"
-
-#: ../../../ui.cpp:584
-msgid "Generated"
-msgstr "Gerado"
-
-#: ../../../ui.cpp:592
-#, c-format
-msgid "Generated (%s matures in %d more blocks)"
-msgstr "Gerado (%s maduras em mais %d blocos)"
-
-#: ../../../ui.cpp:596
-msgid "Generated - Warning: This block was not received by any other nodes and will probably not be accepted!"
-msgstr "Gerado - Aviso: Este bloco não foi recebido por mais nenhum nó da rede e provavelmente não será aceite."
-
-#: ../../../ui.cpp:600
-msgid "Generated (not accepted)"
-msgstr "Gerado (não aceite)"
-
-#: ../../../ui.cpp:610
-msgid "From: "
-msgstr "Remetente: "
-
-#: ../../../ui.cpp:634
-msgid "Received with: "
-msgstr "Recebido por: "
-
-#: ../../../ui.cpp:676
-msgid "Payment to yourself"
-msgstr "Pagamento ao próprio"
-
-#: ../../../ui.cpp:713
-msgid "To: "
-msgstr "Destinatário: "
-
-#: ../../../ui.cpp:1009
-msgid " Generating"
-msgstr " A gerar"
-
-#: ../../../ui.cpp:1011
-msgid "(not connected)"
-msgstr "(sem ligação)"
-
-#: ../../../ui.cpp:1014
-#, c-format
-msgid " %d connections %d blocks %d transactions"
-msgstr " %d ligações %d blocos %d transacções"
-
-#: ../../../ui.cpp:1123
-#: ../../../ui.cpp:2351
-msgid "New Receiving Address"
-msgstr "Novo Endereço de Recepção"
-
-#: ../../../ui.cpp:1124
-#: ../../../ui.cpp:2352
-msgid ""
-"You should use a new address for each payment you receive.\n"
-"\n"
-"Label"
-msgstr ""
-"É uma boa política utilizar um endereço diferente para cada pagamento que recebe.\n"
-"\n"
-"Etiqueta"
-
-#: ../../../ui.cpp:1193
-msgid "<b>Status:</b> "
-msgstr "<b>Estado:</b> "
-
-#: ../../../ui.cpp:1198
-msgid ", has not been successfully broadcast yet"
-msgstr ", ainda não foram anunciadas com sucesso"
-
-#: ../../../ui.cpp:1200
-#, c-format
-msgid ", broadcast through %d node"
-msgstr ", anunciar por %d nó"
-
-#: ../../../ui.cpp:1202
-#, c-format
-msgid ", broadcast through %d nodes"
-msgstr ", anunciar por %d nós"
-
-#: ../../../ui.cpp:1206
-msgid "<b>Date:</b> "
-msgstr "<b>Data:</b> "
-
-#: ../../../ui.cpp:1214
-msgid "<b>Source:</b> Generated<br>"
-msgstr "<b>Fonte:</b> Gerado<br>"
-
-#: ../../../ui.cpp:1220
-#: ../../../ui.cpp:1238
-msgid "<b>From:</b> "
-msgstr "<b>Remetente:</b> "
-
-#: ../../../ui.cpp:1238
-msgid "unknown"
-msgstr "desconhecido"
-
-#: ../../../ui.cpp:1239
-#: ../../../ui.cpp:1263
-#: ../../../ui.cpp:1322
-msgid "<b>To:</b> "
-msgstr "<b>Destinatário:</b> "
-
-#: ../../../ui.cpp:1242
-msgid " (yours, label: "
-msgstr " (seu, etiqueta: "
-
-#: ../../../ui.cpp:1244
-msgid " (yours)"
-msgstr " (seu)"
-
-#: ../../../ui.cpp:1281
-#: ../../../ui.cpp:1293
-#: ../../../ui.cpp:1356
-msgid "<b>Credit:</b> "
-msgstr "<b>Crédito:</b> "
-
-#: ../../../ui.cpp:1283
-#, c-format
-msgid "(%s matures in %d more blocks)"
-msgstr "(%s maduras em mais %d blocos)"
-
-#: ../../../ui.cpp:1285
-msgid "(not accepted)"
-msgstr "(não aceite)"
-
-#: ../../../ui.cpp:1330
-#: ../../../ui.cpp:1353
-msgid "<b>Debit:</b> "
-msgstr "<b>Débito:</b> "
-
-#: ../../../ui.cpp:1344
-msgid "<b>Transaction fee:</b> "
-msgstr "<b>Percentagem da transacção:</b> "
-
-#: ../../../ui.cpp:1360
-msgid "<b>Net amount:</b> "
-msgstr "<b>Quantia Net:</b> "
-
-#: ../../../ui.cpp:1367
-msgid "Message:"
-msgstr "Mensagem:"
-
-#: ../../../ui.cpp:1370
-msgid "Generated coins must wait 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, it will change to \"not accepted\" and not be spendable. This may occasionally happen if another node generates a block within a few seconds of yours."
-msgstr "As moedas geradas necessitam de 120 blocos para que possam ser gastas. Quando gera um bloco, ele será anunciado pela rede para ser adicionado à cadeia de blocos. Se falhar, mudará para \"não aceite\" e não será possível utilizá-lo. Isto pode acontecer se um nó gerar outro bloco após alguns segundos do seu."
-
-#: ../../../ui.cpp:1437
-msgid "Main"
-msgstr "Principal"
-
-#: ../../../ui.cpp:1442
-msgid "&Minimize on close"
-msgstr "&Minimizar ao fechar"
-
-#: ../../../ui.cpp:1595
-#, c-format
-msgid "version %s%s BETA"
-msgstr "versão %s%s BETA"
-
-#: ../../../ui.cpp:1681
-msgid "Will appear as \"From: Unknown\""
-msgstr "Irá aparecer como \"De: Desconhecido\""
-
-#: ../../../ui.cpp:1681
-msgid "n/a"
-msgstr "Desconhecido"
-
-#: ../../../ui.cpp:1681
-msgid "Unknown"
-msgstr "Desconhecido"
-
-#: ../../../ui.cpp:1682
-msgid "Can't include a message when sending to a Bitcoin address"
-msgstr "Não é possível incluir uma mensagem ao enviar para um endereço Bitcoin"
-
-#: ../../../ui.cpp:1735
-msgid "Error in amount "
-msgstr "Erro na quantia "
-
-#: ../../../ui.cpp:1735
-#: ../../../ui.cpp:1740
-#: ../../../ui.cpp:1745
-#: ../../../ui.cpp:1771
-#: ../../../uibase.cpp:61
-msgid "Send Coins"
-msgstr "Enviar Moedas"
-
-#: ../../../ui.cpp:1740
-msgid "Amount exceeds your balance "
-msgstr "A quantia excede o seu saldo "
-
-#: ../../../ui.cpp:1745
-msgid "Total exceeds your balance when the "
-msgstr "O total excede o seu saldo quando a "
-
-#: ../../../ui.cpp:1745
-msgid " transaction fee is included "
-msgstr " taxa de transacção for incluída "
-
-#: ../../../ui.cpp:1761
-msgid "Payment sent "
-msgstr "Pagamento enviado "
-
-#: ../../../ui.cpp:1771
-msgid "Invalid address "
-msgstr "Endereço inválido "
-
-#: ../../../ui.cpp:1825
-#, c-format
-msgid "Sending %s to %s"
-msgstr "A enviar %s para %s"
-
-#: ../../../ui.cpp:1898
-#: ../../../ui.cpp:1931
-msgid "CANCELLED"
-msgstr "CANCELADO"
-
-#: ../../../ui.cpp:1902
-msgid "Cancelled"
-msgstr "Cancelado"
-
-#: ../../../ui.cpp:1904
-msgid "Transfer cancelled "
-msgstr "Transferência cancelada "
-
-#: ../../../ui.cpp:1957
-msgid "Error: "
-msgstr "Erro: "
-
-#: ../../../ui.cpp:1976
-msgid "Connecting..."
-msgstr "A estabelecer ligação ..."
-
-#: ../../../ui.cpp:1981
-msgid "Unable to connect"
-msgstr "Impossível estabelecer ligação"
-
-#: ../../../ui.cpp:1986
-msgid "Requesting public key..."
-msgstr "A requisitar a chave pública ..."
-
-#: ../../../ui.cpp:1998
-msgid "Received public key..."
-msgstr "Chave pública recebida"
-
-#: ../../../ui.cpp:2010
-msgid "Transfer was not accepted"
-msgstr "A transferência não foi aceite"
-
-#: ../../../ui.cpp:2019
-msgid "Invalid response received"
-msgstr "Resposta inválida recebida"
-
-#: ../../../ui.cpp:2034
-msgid "Creating transaction..."
-msgstr "A criar a transacção ..."
-
-#: ../../../ui.cpp:2046
-#, c-format
-msgid "This is an oversized transaction that requires a transaction fee of %s"
-msgstr "Esta transferência requer o pagamento de uma taxa de transacção de %s"
-
-#: ../../../ui.cpp:2048
-msgid "Transaction creation failed"
-msgstr "A criação da transacção falhou"
-
-#: ../../../ui.cpp:2055
-msgid "Transaction aborted"
-msgstr "Transacção cancelada"
-
-#: ../../../ui.cpp:2063
-msgid "Lost connection, transaction cancelled"
-msgstr "Perca de ligação, transacção cancelada"
-
-#: ../../../ui.cpp:2079
-msgid "Sending payment..."
-msgstr "A enviar pagamento ..."
-
-#: ../../../ui.cpp:2085
-msgid "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."
-msgstr "A transacção foi rejeitada. Isto pode acontecer se algumas das moedas na sua carteira já foram utilizadas, como na utilização de uma cópia do wallet.dat, onde as moedas foram utilizadas na cópia do ficheiro e essas alterações não reflectem o estado desta carteira."
-
-#: ../../../ui.cpp:2092
-msgid "Waiting for confirmation..."
-msgstr "A aguardar confirmação ..."
-
-#: ../../../ui.cpp:2110
-msgid ""
-"The payment was sent, but the recipient was unable to verify it.\n"
-"The transaction is recorded and will credit to the recipient,\n"
-"but the comment information will be blank."
-msgstr ""
-"O pagamento foi enviado, mas o remetente não consegiu verificar o seu pagamento.\n"
-"A transacção foi entregue, e o remetente receberá as modeas,\n"
-"no entanto, o comentário de transacção estará vazio."
-
-#: ../../../ui.cpp:2119
-msgid "Payment was sent, but an invalid response was received"
-msgstr "O pagamento foi enviado, mas foi recebida uma resposta inválida"
-
-#: ../../../ui.cpp:2125
-msgid "Payment completed"
-msgstr "Pagamento completo"
-
-#: ../../../ui.cpp:2156
-#: ../../../ui.cpp:2302
-#: ../../../ui.cpp:2339
-msgid "Name"
-msgstr "Nome"
-
-#: ../../../ui.cpp:2157
-#: ../../../ui.cpp:2302
-#: ../../../ui.cpp:2339
-msgid "Address"
-msgstr "Endereço"
-
-#: ../../../ui.cpp:2159
-#: ../../../ui.cpp:2314
-msgid "Label"
-msgstr "Nota"
-
-#: ../../../ui.cpp:2160
-#: ../../../uibase.cpp:908
-msgid "Bitcoin Address"
-msgstr "Endereço Bitcoin"
-
-#: ../../../ui.cpp:2284
-msgid "This is one of your own addresses for receiving payments and cannot be entered in the address book. "
-msgstr "Este endereço é seu (onde recebe pagamentos) e não pode ser introduzido no seu livros de endereços. "
-
-#: ../../../ui.cpp:2302
-#: ../../../ui.cpp:2308
-msgid "Edit Address"
-msgstr "Editar endereço"
-
-#: ../../../ui.cpp:2314
-msgid "Edit Address Label"
-msgstr "Editar nota de endereço"
-
-#: ../../../ui.cpp:2339
-#: ../../../ui.cpp:2345
-msgid "Add Address"
-msgstr "Adicionar endereço"
-
-#: ../../../ui.cpp:2421
-msgid "Bitcoin"
-msgstr "Bitcoin"
-
-#: ../../../ui.cpp:2423
-msgid "Bitcoin - Generating"
-msgstr "Bitcoin - A gerar"
-
-#: ../../../ui.cpp:2425
-msgid "Bitcoin - (not connected)"
-msgstr "Bitcoin - (sem ligação)"
-
-#: ../../../ui.cpp:2500
-msgid "&Open Bitcoin"
-msgstr "&Abrir Bitcoin"
-
-#: ../../../ui.cpp:2501
-msgid "O&ptions..."
-msgstr "O&pções"
-
-#: ../../../ui.cpp:2505
-#: ../../../uibase.cpp:27
-msgid "E&xit"
-msgstr "S&air"
-
-#: ../../../uibase.cpp:30
-msgid "&File"
-msgstr "&Ficheiro"
-
-#: ../../../uibase.cpp:38
-msgid "&Your Receiving Addresses..."
-msgstr "&Os seus endereços"
-
-#: ../../../uibase.cpp:42
-msgid "&Options..."
-msgstr "&Opções ..."
-
-#: ../../../uibase.cpp:45
-msgid "&Settings"
-msgstr "&Definições"
-
-#: ../../../uibase.cpp:49
-msgid "&About..."
-msgstr "&Sobre ..."
-
-#: ../../../uibase.cpp:52
-msgid "&Help"
-msgstr "&Ajuda"
-
-#: ../../../uibase.cpp:62
-msgid "Address Book"
-msgstr "Livro de Endereços"
-
-#: ../../../uibase.cpp:77
-msgid "Your Bitcoin Address:"
-msgstr "O seu endereço Bitcoin:"
-
-#: ../../../uibase.cpp:84
-msgid " &New... "
-msgstr " &Novo ... "
-
-#: ../../../uibase.cpp:87
-#: ../../../uibase.cpp:851
-#: ../../../uibase.cpp:954
-msgid " &Copy to Clipboard "
-msgstr " &Copiar para o Clipboard "
-
-#: ../../../uibase.cpp:102
-msgid "Balance:"
-msgstr "Saldo:"
-
-#: ../../../uibase.cpp:121
-msgid " All"
-msgstr " Todos"
-
-#: ../../../uibase.cpp:121
-msgid " Sent"
-msgstr " Enviado"
-
-#: ../../../uibase.cpp:121
-msgid " Received"
-msgstr " Recebido"
-
-#: ../../../uibase.cpp:121
-msgid " In Progress"
-msgstr " Em progresso"
-
-#: ../../../uibase.cpp:142
-msgid "All Transactions"
-msgstr "Todas as transacções"
-
-#: ../../../uibase.cpp:153
-msgid "Sent/Received"
-msgstr "Enviadas/Recebidas"
-
-#: ../../../uibase.cpp:164
-msgid "Sent"
-msgstr "Enviado"
-
-#: ../../../uibase.cpp:175
-msgid "Received"
-msgstr "Recebido"
-
-#: ../../../uibase.cpp:318
-#: ../../../uibase.cpp:479
-#: ../../../uibase.cpp:580
-#: ../../../uibase.cpp:793
-#: ../../../uibase.cpp:854
-#: ../../../uibase.cpp:963
-#: ../../../uibase.cpp:1052
-msgid "OK"
-msgstr "OK"
-
-#: ../../../uibase.cpp:361
-msgid "Optional transaction fee you give to the nodes that process your transactions."
-msgstr "Pagamento de taxa de transacção opcional que é entregue aos nós que ajudam a processar o seu pagamento"
-
-#: ../../../uibase.cpp:370
-msgid "Transaction fee:"
-msgstr "Taxa de transacção:"
-
-#: ../../../uibase.cpp:386
-msgid "&Limit coin generation to"
-msgstr "&Limitar a geração de moedas a"
-
-#: ../../../uibase.cpp:393
-msgid "processors"
-msgstr "processadores"
-
-#: ../../../uibase.cpp:399
-msgid "&Start Bitcoin on system startup"
-msgstr "&Iniciar o Bitcoin no arranque do sistema"
-
-#: ../../../uibase.cpp:403
-msgid "&Minimize to the tray instead of the taskbar"
-msgstr "&Minimizar para a zona do relógio em vez da barra de janelas"
-
-#: ../../../uibase.cpp:407
-msgid "M&inimize to the tray on close"
-msgstr "M&inimizar para a zona do relógio ao fechar"
-
-#: ../../../uibase.cpp:414
-msgid "&Connect through socks4 proxy: "
-msgstr "&Ligar através de um prozy socks4: "
-
-#: ../../../uibase.cpp:426
-msgid "Proxy &IP:"
-msgstr "Proxy &IP:"
-
-#: ../../../uibase.cpp:434
-msgid " &Port:"
-msgstr " &Porto:"
-
-#: ../../../uibase.cpp:456
-msgid "// [don't translate] Test panel 2 for future expansion"
-msgstr ""
-
-#: ../../../uibase.cpp:460
-msgid "// [don't translate] Let's not start multiple pages until the first page is filled up"
-msgstr ""
-
-#: ../../../uibase.cpp:482
-#: ../../../uibase.cpp:735
-#: ../../../uibase.cpp:798
-#: ../../../uibase.cpp:857
-#: ../../../uibase.cpp:966
-#: ../../../uibase.cpp:1055
-msgid "Cancel"
-msgstr "Cancelar"
-
-#: ../../../uibase.cpp:485
-msgid "&Apply"
-msgstr "&Aplicar"
-
-#: ../../../uibase.cpp:546
-msgid "Bitcoin "
-msgstr "Bitcoin "
-
-#: ../../../uibase.cpp:552
-msgid "version"
-msgstr "versão"
-
-#: ../../../uibase.cpp:563
-msgid ""
-"Copyright (c) 2009-2010 Bitcoin Developers\n"
-"\n"
-"This is experimental software.\n"
-"\n"
-"Distributed under the MIT/X11 software license, see the accompanying file \n"
-"license.txt or http://www.opensource.org/licenses/mit-license.php.\n"
-"\n"
-"This product includes software developed by the OpenSSL Project for use in the \n"
-"OpenSSL Toolkit (http://www.openssl.org/) and cryptographic software written by \n"
-"Eric Young (eay@cryptsoft.com) and UPnP software written by Thomas Bernard."
-msgstr ""
-"Copyright (c) 2009-2010 Bitcoin Developers\n"
-"\n"
-"Este software é experimental.\n"
-"\n"
-"Distribuído sob a licença de software MIT/X11. Veja os seguintes ficheiros \n"
-"para mais informações license.txt ou \n"
-"http://www.opensource.org/licenses/mit-license.php.\n"
-"Este producto inclui software desenvolvido pelo projecto OpenSSL, para \n"
-"ser utilizado no OpenSSL Toolkit (http://www.openssl.org) e software de \n"
-"criptografia desenvolvido por Eric Young (eay@cryptsoft.com)\n"
-"e UPnP software escrito por Thomas Bernard."
-
-#: ../../../uibase.cpp:619
-msgid "Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJED9L) or IP address (e.g. 123.45.6.7)"
-msgstr "Introduza um endereço Bitcoin (exemplo: 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJED9L) ou um endereço de IP (exemplo: 123.45.6.7)"
-
-#: ../../../uibase.cpp:633
-msgid "Pay &To:"
-msgstr "Pagar &a:"
-
-#: ../../../uibase.cpp:648
-msgid "&Paste"
-msgstr "&Colar"
-
-#: ../../../uibase.cpp:651
-msgid " Address &Book..."
-msgstr " Livro de endereços ..."
-
-#: ../../../uibase.cpp:658
-msgid "&Amount:"
-msgstr "&Quantia:"
-
-#: ../../../uibase.cpp:668
-msgid "T&ransfer:"
-msgstr "T&ransferência:"
-
-#: ../../../uibase.cpp:674
-msgid " Standard"
-msgstr " Standard"
-
-#: ../../../uibase.cpp:696
-msgid "&From:"
-msgstr "&De:"
-
-#: ../../../uibase.cpp:713
-msgid "&Message:"
-msgstr "&Mensagem:"
-
-#: ../../../uibase.cpp:730
-msgid "&Send"
-msgstr "&Enviar"
-
-#: ../../../uibase.cpp:782
-msgid ""
-"\n"
-"\n"
-"Connecting..."
-msgstr ""
-"\n"
-"\n"
-"A estabelecer ligação ..."
-
-#: ../../../uibase.cpp:832
-msgid "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. The highlighted address is displayed in the main window."
-msgstr "Estes são os seus endereços de Bitcoin onde poderá receber os seus pagamentos. Pode dar um endereço diferente a cada pessoa ou identidade para ter uma melhor ideia sobre quem o está a pagar. O endereço seleccionado será o que aparecerá na janela principal."
-
-#: ../../../uibase.cpp:845
-#: ../../../uibase.cpp:957
-msgid "&Edit..."
-msgstr "&Editar ..."
-
-#: ../../../uibase.cpp:848
-#: ../../../uibase.cpp:960
-msgid " &New Address... "
-msgstr " &Novo endereço ... "
-
-#: ../../../uibase.cpp:920
-msgid "Sending"
-msgstr "A enviar"
-
-#: ../../../uibase.cpp:928
-msgid "These are your Bitcoin addresses for receiving payments. You can give a different one to each sender to keep track of who is paying you. The highlighted address will be displayed in the main window."
-msgstr "Estes são os seus endereços de Bitcoin onde poderá receber os seus pagamentos. Pode dar um endereço diferente a cada pessoa ou identidade para ter uma melhor ideia sobre quem o está a pagar. O endereço seleccionado será o que aparecerá na janela principal."
-
-#: ../../../uibase.cpp:941
-msgid "Receiving"
-msgstr "A receber"
-
-#: ../../../uibase.cpp:951
-msgid "&Delete"
-msgstr "&Remover"
-
-#: ../../../uibase.h:150
-msgid "Transaction Details"
-msgstr "Detalhes da transacção"
-
-#: ../../../uibase.h:203
-msgid "Options"
-msgstr "Opções"
-
-#: ../../../uibase.h:231
-msgid "About Bitcoin"
-msgstr "Sobre o Bitcoin"
-
-#: ../../../uibase.h:341
-msgid "Your Bitcoin Addresses"
-msgstr "O seu endereço de Bitcoin"
diff --git a/locale/readme.txt b/locale/readme.txt deleted file mode 100644 index 4019bf43c9..0000000000 --- a/locale/readme.txt +++ /dev/null @@ -1,7 +0,0 @@ -put bitcoin.po and bitcoin.mo files at:
-locale/<langcode>/LC_MESSAGES/bitcoin.mo and .po
-
-.po is the sourcefile
-.mo is the compiled translation
-
-Note: pull requests should only include the .po file. Do not include .mo file
\ No newline at end of file diff --git a/locale/ro/LC_MESSAGES/bitcoin.mo b/locale/ro/LC_MESSAGES/bitcoin.mo Binary files differdeleted file mode 100644 index 0eb994bcbe..0000000000 --- a/locale/ro/LC_MESSAGES/bitcoin.mo +++ /dev/null diff --git a/locale/ro/LC_MESSAGES/bitcoin.po b/locale/ro/LC_MESSAGES/bitcoin.po deleted file mode 100644 index e906e97566..0000000000 --- a/locale/ro/LC_MESSAGES/bitcoin.po +++ /dev/null @@ -1,1078 +0,0 @@ -msgid "" -msgstr "" -"Project-Id-Version: \n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-09-06 03:47+0100\n" -"PO-Revision-Date: 2011-09-06 06:36+0100\n" -"Last-Translator: Alex B <paraipanakos@gmail.com>\n" -"Language-Team: \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Language: \n" -"X-Poedit-KeywordsList: _;gettext;gettext_noop\n" -"X-Poedit-Basepath: .\n" -"X-Poedit-Language: Romanian\n" -"X-Poedit-SourceCharset: iso-8859-2\n" -"X-Poedit-SearchPath-0: ../../..\n" - -#: ../../../src/init.cpp:163 -msgid "Bitcoin version" -msgstr "versiune Bitcoin" - -#: ../../../src/init.cpp:164 -msgid "Usage:" -msgstr "Uz:" - -#: ../../../src/init.cpp:166 -msgid "Send command to -server or bitcoind\n" -msgstr "Trimite comanda la bitcoin lansat cu -server sau bitcoind\n" - -#: ../../../src/init.cpp:167 -msgid "List commands\n" -msgstr "Listeaza comenzi\n" - -#: ../../../src/init.cpp:168 -msgid "Get help for a command\n" -msgstr "Ajutor pentru o comanda\n" - -#: ../../../src/init.cpp:169 -msgid "Options:\n" -msgstr "Optiuni:\n" - -#: ../../../src/init.cpp:170 -msgid "Specify configuration file (default: bitcoin.conf)\n" -msgstr "Specifica fisier de configuratie (predeterminat: bitcoin.conf)\n" - -#: ../../../src/init.cpp:171 -msgid "Specify pid file (default: bitcoind.pid)\n" -msgstr "Specifica fisier pid (predeterminat: bitcoin.pid)\n" - -#: ../../../src/init.cpp:172 -msgid "Generate coins\n" -msgstr "Genereaza monede\n" - -#: ../../../src/init.cpp:173 -msgid "Don't generate coins\n" -msgstr "Nu genera monede\n" - -#: ../../../src/init.cpp:174 -msgid "Start minimized\n" -msgstr "Porneste minimizat\n" - -#: ../../../src/init.cpp:175 -msgid "Specify data directory\n" -msgstr "Specifica directorul de date\n" - -#: ../../../src/init.cpp:176 -msgid "Specify connection timeout (in milliseconds)\n" -msgstr "Specifica timpul maxim de conexiune (in milisecunde)\n" - -#: ../../../src/init.cpp:177 -msgid "Connect through socks4 proxy\n" -msgstr "Conecteaza prin proxy socks4\n" - -#: ../../../src/init.cpp:178 -msgid "Allow DNS lookups for addnode and connect\n" -msgstr "Permite cautare DNS pentru addnode si connect\n" - -#: ../../../src/init.cpp:179 -msgid "Add a node to connect to\n" -msgstr "Adauga un nod de conectare\n" - -#: ../../../src/init.cpp:180 -msgid "Connect only to the specified node\n" -msgstr "Conecteaza numai la nodul specificat\n" - -#: ../../../src/init.cpp:181 -msgid "Don't accept connections from outside\n" -msgstr "Nu accepta conexiuni din exterior\n" - -#: ../../../src/init.cpp:184 -msgid "Don't attempt to use UPnP to map the listening port\n" -msgstr "Nu utiliza UPnP pentru deschiderea portul de ascultare\n" - -#: ../../../src/init.cpp:186 -msgid "Attempt to use UPnP to map the listening port\n" -msgstr "Incearca sa utilizezi UPnP pentru deschiderea portului de ascultare.\n" - -#: ../../../src/init.cpp:189 -msgid "Fee per KB to add to transactions you send\n" -msgstr "Comision per KB ce se adauga la tranzactiile transmise\n" - -#: ../../../src/init.cpp:191 -msgid "Accept command line and JSON-RPC commands\n" -msgstr "Accepta comenzi de consola si JSON-RPC\n" - -#: ../../../src/init.cpp:194 -msgid "Run in the background as a daemon and accept commands\n" -msgstr "Executa ca daemon si accepta comenzi\n" - -#: ../../../src/init.cpp:196 -msgid "Use the test network\n" -msgstr "Utilizeaza reteaua de probe\n" - -#: ../../../src/init.cpp:197 -msgid "Username for JSON-RPC connections\n" -msgstr "Utilizator pentru conexiuni JSON-RPC\n" - -#: ../../../src/init.cpp:198 -msgid "Password for JSON-RPC connections\n" -msgstr "Parola pentru conexiuni JSON-RPC\n" - -#: ../../../src/init.cpp:199 -msgid "Listen for JSON-RPC connections on <port> (default: 8332)\n" -msgstr "Asculta conexiuni JSON-RPC pe portul <puerto> (predeterminat: 8332)\n" - -#: ../../../src/init.cpp:200 -msgid "Allow JSON-RPC connections from specified IP address\n" -msgstr "Permite conexiuni JSON-RPC de la adresa IP specifica\n" - -#: ../../../src/init.cpp:201 -msgid "Send commands to node running on <ip> (default: 127.0.0.1)\n" -msgstr "Trimite comanda la nod existent la <ip> (predeterminat: 127.0.0.1)\n" - -#: ../../../src/init.cpp:202 -msgid "Set key pool size to <n> (default: 100)\n" -msgstr "Ajusteaza numarul de chei in rezerva (predeterminat: 100)\n" - -#: ../../../src/init.cpp:203 -msgid "Rescan the block chain for missing wallet transactions\n" -msgstr "Rescaneza lantul de blocuri in cautare de tranzacti lipsa din portofel\n" - -#: ../../../src/init.cpp:207 -msgid "" -"\n" -"SSL options: (see the Bitcoin Wiki for SSL setup instructions)\n" -msgstr "" -"\n" -"Optiuni SSL: (vezi la Wiki Bitcoin pentru instructiuni detaliate)\n" - -#: ../../../src/init.cpp:208 -msgid "Use OpenSSL (https) for JSON-RPC connections\n" -msgstr "Utilizeaza OpenSSL (https) pentru conexiunile JSON-RPC\n" - -#: ../../../src/init.cpp:209 -msgid "Server certificate file (default: server.cert)\n" -msgstr "Arhiva certificat de server (predeterminat: server.cert)\n" - -#: ../../../src/init.cpp:210 -msgid "Server private key (default: server.pem)\n" -msgstr "Cheie privata de server (predeterminat: server.pem)\n" - -#: ../../../src/init.cpp:211 -msgid "Acceptable ciphers (default: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH)\n" -msgstr "Tipuri de cifrare acceptate (predeterminat: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH)\n" - -#: ../../../src/init.cpp:215 -msgid "This help message\n" -msgstr "Acest mesaj de ajutor\n" - -#: ../../../src/init.cpp:353 -#, c-format -msgid "Cannot obtain a lock on data directory %s. Bitcoin is probably already running." -msgstr "Nu se poate obtine permis de lucru in directorul de date %s. E posibil ca Bitcoin sa fie deja in executie." - -#: ../../../src/init.cpp:379 -msgid "Error loading addr.dat \n" -msgstr "Eroare la incarcare addr.dat \n" - -#: ../../../src/init.cpp:385 -msgid "Error loading blkindex.dat \n" -msgstr "Eroare la incarcare blkindex.dat \n" - -#: ../../../src/init.cpp:396 -msgid "Error loading wallet.dat: Wallet corrupted \n" -msgstr "Eroare la incarcare wallet.dat \n" - -#: ../../../src/init.cpp:398 -msgid "Error loading wallet.dat: Wallet requires newer version of Bitcoin \n" -msgstr "Eroare la incarcare wallet.dat: E necesare o versiune mai noua de Bitcoin \n" - -#: ../../../src/init.cpp:400 -msgid "Error loading wallet.dat \n" -msgstr "Eroare la incarcare wallet.dat \n" - -#: ../../../src/init.cpp:489 -msgid "Invalid -proxy address" -msgstr "Adresa -proxy invalida" - -#: ../../../src/init.cpp:514 -msgid "Invalid amount for -paytxfee=<amount>" -msgstr "Cantitate invalida pentru -paytxfee=<amount>" - -#: ../../../src/init.cpp:518 -msgid "Warning: -paytxfee is set very high. This is the transaction fee you will pay if you send a transaction." -msgstr "Atentie: -paytxfee este prea mare. Acesta este comisionul platit la fiecare tranzactie." - -#: ../../../src/main.cpp:1398 -msgid "Warning: Disk space is low " -msgstr "Atentie: Spatiul pe hard disk este redus" - -#: ../../../src/net.cpp:1610 -#, c-format -msgid "Unable to bind to port %d on this computer. Bitcoin is probably already running." -msgstr "Nu e posibila ascultarea pe portul %d in acest calculator. Probabil clientul Bitcoin este deja in executie." - -#: ../../../src/rpc.cpp:2005 -#: ../../../src/rpc.cpp:2007 -#, c-format -msgid "To use the %s option" -msgstr "Pentru a utiliza optiunea %s" - -#: ../../../src/rpc.cpp:2009 -#, c-format -msgid "" -"Warning: %s, you must set rpcpassword=<password>\n" -"in the configuration file: %s\n" -"If the file does not exist, create it with owner-readable-only file permissions.\n" -msgstr "" -"Atentie: %s, trebuie sa specifici rpcpassword=<password>\n" -"in fisierul de configuratie: %s\n" -"Daca fisierul nu exista trebuie creat cu permisiuni de citire numai pentru autor.\n" - -#: ../../../src/rpc.cpp:2185 -#, c-format -msgid "" -"You must set rpcpassword=<password> in the configuration file:\n" -"%s\n" -"If the file does not exist, create it with owner-readable-only file permissions." -msgstr "" -"Trebuie sa specifici rpcpassword=<password> in fisierul de configuratie:\n" -"%s\n" -"Daca fisierul nu exista trebuie creat cu permisiuni de citire numai pentru autor." - -#: ../../../src/ui.cpp:217 -#, c-format -msgid "This transaction is over the size limit. You can still send it for a fee of %s, which goes to the nodes that process your transaction and helps to support the network. Do you want to pay the fee?" -msgstr "Aceasta tranzactie trece peste limita de dimensiune. O poti trimite in continuare pentru %s, care taxa se imparte intre nodurile ce receptioneaza tranzactia si ajuta la mentinerea retelei. Continui tranzactia?" - -#: ../../../src/ui.cpp:261 -#: ../../../src/ui.cpp:1247 -msgid "Enter the current passphrase to the wallet." -msgstr "Introduce parola actuala de portofel" - -#: ../../../src/ui.cpp:262 -#: ../../../src/ui.cpp:1183 -#: ../../../src/ui.cpp:1200 -#: ../../../src/ui.cpp:1248 -#: ../../../src/ui.cpp:1272 -#: ../../../src/ui.cpp:1292 -msgid "Passphrase" -msgstr "Parola" - -#: ../../../src/ui.cpp:268 -msgid "Please supply the current wallet decryption passphrase." -msgstr "Introduce parola actuala para decriptarea portofelului." - -#: ../../../src/ui.cpp:276 -#: ../../../src/ui.cpp:1257 -#: ../../../src/ui.cpp:1314 -msgid "The passphrase entered for the wallet decryption was incorrect." -msgstr "Parola introdusa pentru decriptarea portofelului nu este corecta." - -#: ../../../src/ui.cpp:353 -msgid "Status" -msgstr "Stare" - -#: ../../../src/ui.cpp:354 -msgid "Date" -msgstr "Data" - -#: ../../../src/ui.cpp:355 -msgid "Description" -msgstr "Descriere" - -#: ../../../src/ui.cpp:356 -msgid "Debit" -msgstr "Debit" - -#: ../../../src/ui.cpp:357 -msgid "Credit" -msgstr "Credit" - -#: ../../../src/ui.cpp:568 -#, c-format -msgid "Open for %d blocks" -msgstr "Deschis pentru %d blocuri" - -#: ../../../src/ui.cpp:570 -#, c-format -msgid "Open until %s" -msgstr "Deschis pana la %s" - -#: ../../../src/ui.cpp:576 -#, c-format -msgid "%d/offline?" -msgstr "%d/desconectat?" - -#: ../../../src/ui.cpp:578 -#, c-format -msgid "%d/unconfirmed" -msgstr "%d/neconfirmat" - -#: ../../../src/ui.cpp:580 -#, c-format -msgid "%d confirmations" -msgstr "%d confirmari" - -#: ../../../src/ui.cpp:665 -msgid "Generated" -msgstr "Generat" - -#: ../../../src/ui.cpp:673 -#, c-format -msgid "Generated (%s matures in %d more blocks)" -msgstr "Generat (%s matureaza in %d blocuri)" - -#: ../../../src/ui.cpp:677 -msgid "Generated - Warning: This block was not received by any other nodes and will probably not be accepted!" -msgstr "Generat - Atentie: Acest block nu se a receptionat de la alte noduri si probabil nu va fi acceptat!" - -#: ../../../src/ui.cpp:681 -msgid "Generated (not accepted)" -msgstr "Generat (neaceptat)" - -#: ../../../src/ui.cpp:691 -msgid "From: " -msgstr "De: " - -#: ../../../src/ui.cpp:715 -msgid "Received with: " -msgstr "Receptionat cu: " - -#: ../../../src/ui.cpp:760 -msgid "Payment to yourself" -msgstr "Plata proprie" - -#: ../../../src/ui.cpp:794 -msgid "To: " -msgstr "Pentru: " - -#: ../../../src/ui.cpp:1109 -msgid " Generating" -msgstr " Genereaza" - -#: ../../../src/ui.cpp:1111 -msgid "(not connected)" -msgstr "(neconectat)" - -#: ../../../src/ui.cpp:1114 -#, c-format -msgid " %d connections %d blocks %d transactions" -msgstr " %d conexiuni %d blocuri %d tranzactii" - -#: ../../../src/ui.cpp:1171 -msgid "Wallet already encrypted." -msgstr "Portofel deja encriptat." - -#: ../../../src/ui.cpp:1182 -msgid "" -"Enter the new passphrase to the wallet.\n" -"Please use a passphrase of 10 or more random characters, or eight or more words." -msgstr "" -"Introduce noua parola de portofel.\n" -"Te rugam sa utilizezi o parola de 10 sau mai multe caracter aleatoare sau minimum opt cuvinte." - -#: ../../../src/ui.cpp:1189 -#: ../../../src/ui.cpp:1280 -msgid "Error: The supplied passphrase was too short." -msgstr "Eroare: Parola introdusa este prea scurta." - -#: ../../../src/ui.cpp:1193 -msgid "" -"WARNING: If you encrypt your wallet and lose your passphrase, you will LOSE ALL OF YOUR BITCOINS!\n" -"Are you sure you wish to encrypt your wallet?" -msgstr "" -"ATENTIE: Daca encriptezi portofelul si uiti parola vei pierde TOATE MONEDELE!\n" -"Esti sigur ca vrei sa encriptezi portofelul?" - -#: ../../../src/ui.cpp:1199 -msgid "Please re-enter your new wallet passphrase." -msgstr "Reintroduce noua parola de portofel." - -#: ../../../src/ui.cpp:1208 -#: ../../../src/ui.cpp:1302 -msgid "Error: the supplied passphrases didn't match." -msgstr "Eroare: parolele introduse nu sunt identice." - -#: ../../../src/ui.cpp:1218 -msgid "Wallet encryption failed." -msgstr "Encriptare portofel esuata." - -#: ../../../src/ui.cpp:1225 -msgid "" -"Wallet Encrypted.\n" -"Remember that encrypting your wallet cannot fully protect your bitcoins from being stolen by malware infecting your computer." -msgstr "" -"Portofel encriptat.\n" -"Retine ca encriptarea portofelului nu iti poate proteja complet monedele daca pc-ul este infectat de malware." - -#: ../../../src/ui.cpp:1236 -msgid "Wallet is unencrypted, please encrypt it first." -msgstr "Portofelul nu este encriptat, incearca sa-l encriptezi inainte." - -#: ../../../src/ui.cpp:1271 -msgid "Enter the new passphrase for the wallet." -msgstr "Introduce noua parola de portofel." - -#: ../../../src/ui.cpp:1291 -msgid "Re-enter the new passphrase for the wallet." -msgstr "Reintroduce noua parola de portofel." - -#: ../../../src/ui.cpp:1323 -msgid "Wallet Passphrase Changed." -msgstr "Parola de portofel schimbata." - -#: ../../../src/ui.cpp:1379 -#: ../../../src/ui.cpp:2821 -msgid "New Receiving Address" -msgstr "Adresa Noua de Primire" - -#: ../../../src/ui.cpp:1380 -#: ../../../src/ui.cpp:2822 -msgid "" -"You should use a new address for each payment you receive.\n" -"\n" -"Label" -msgstr "" -"Cel mai indicat e sa utilizezi a adresa noua pentru fiecare plata primita.\n" -"\n" -"Eticheta" - -#: ../../../src/ui.cpp:1464 -msgid "<b>Status:</b> " -msgstr "<b>Stare:</b> " - -#: ../../../src/ui.cpp:1469 -msgid ", has not been successfully broadcast yet" -msgstr ", inca nu a fost trimisa cu succes" - -#: ../../../src/ui.cpp:1471 -#, c-format -msgid ", broadcast through %d node" -msgstr ", emis prin nod %d" - -#: ../../../src/ui.cpp:1473 -#, c-format -msgid ", broadcast through %d nodes" -msgstr ", emis prin noduri %d" - -#: ../../../src/ui.cpp:1477 -msgid "<b>Date:</b> " -msgstr "<b>Data:</b> " - -#: ../../../src/ui.cpp:1485 -msgid "<b>Source:</b> Generated<br>" -msgstr "<b>Sursa:</b> Generat<br>" - -#: ../../../src/ui.cpp:1491 -#: ../../../src/ui.cpp:1508 -msgid "<b>From:</b> " -msgstr "<b>De:</b> " - -#: ../../../src/ui.cpp:1508 -msgid "unknown" -msgstr "necunoscut" - -#: ../../../src/ui.cpp:1509 -#: ../../../src/ui.cpp:1533 -#: ../../../src/ui.cpp:1592 -msgid "<b>To:</b> " -msgstr "<b>Pentru:</b> " - -#: ../../../src/ui.cpp:1512 -msgid " (yours, label: " -msgstr "(tau, eticheta: " - -#: ../../../src/ui.cpp:1514 -msgid " (yours)" -msgstr "(tau)" - -#: ../../../src/ui.cpp:1551 -#: ../../../src/ui.cpp:1563 -#: ../../../src/ui.cpp:1609 -#: ../../../src/ui.cpp:1626 -msgid "<b>Credit:</b> " -msgstr "<b>Credit:</b> " - -#: ../../../src/ui.cpp:1553 -#, c-format -msgid "(%s matures in %d more blocks)" -msgstr "(%s matureaza in %d blocuri)" - -#: ../../../src/ui.cpp:1555 -msgid "(not accepted)" -msgstr "(neaceptat)" - -#: ../../../src/ui.cpp:1600 -#: ../../../src/ui.cpp:1608 -#: ../../../src/ui.cpp:1623 -msgid "<b>Debit:</b> " -msgstr "<b>Debit:</b> " - -#: ../../../src/ui.cpp:1614 -msgid "<b>Transaction fee:</b> " -msgstr "<b>Comision tranzactie:</b> " - -#: ../../../src/ui.cpp:1630 -msgid "<b>Net amount:</b> " -msgstr "<b>Cantitate neta:</b> " - -#: ../../../src/ui.cpp:1637 -msgid "Message:" -msgstr "Mesaj:" - -#: ../../../src/ui.cpp:1639 -msgid "Comment:" -msgstr "Comentariu:" - -#: ../../../src/ui.cpp:1642 -msgid "Generated coins must wait 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, it will change to \"not accepted\" and not be spendable. This may occasionally happen if another node generates a block within a few seconds of yours." -msgstr "Monedele generate trebuie sa astepte 120 de blocuri inainte sa poata fi cheltuite. Cand ai generat acest block, s-a transmis in retea pentru a fi incul in lantul de blocuri. Daca nu este acceptat in lant, se va schimba in \"neaceptat\" si nu se va putea cheltui. Acest lucru se poate intampla rareori cand alt nod genereaza un bloc in acelasi moment cu al tau ." - -#: ../../../src/ui.cpp:1822 -msgid "Cannot write autostart/bitcoin.desktop file" -msgstr "Nu se poate scrie in fisierul autostart/bitcoin.desktop" - -#: ../../../src/ui.cpp:1858 -msgid "Main" -msgstr "Principal" - -#: ../../../src/ui.cpp:1868 -msgid "&Start Bitcoin on window system startup" -msgstr "&Porneste Bitcoin odata cu sistemul" - -#: ../../../src/ui.cpp:1875 -msgid "&Minimize on close" -msgstr "&Minimizeaza la inchidere" - -#: ../../../src/ui.cpp:2017 -#, c-format -msgid "version %s" -msgstr "versiune %s" - -#: ../../../src/ui.cpp:2140 -msgid "Error in amount " -msgstr "Eroare in cantitate " - -#: ../../../src/ui.cpp:2140 -#: ../../../src/ui.cpp:2145 -#: ../../../src/ui.cpp:2150 -#: ../../../src/ui.cpp:2203 -#: ../../../src/uibase.cpp:61 -msgid "Send Coins" -msgstr "Trimite Monede" - -#: ../../../src/ui.cpp:2145 -msgid "Amount exceeds your balance " -msgstr "Cantitatea trece peste limita disponibila" - -#: ../../../src/ui.cpp:2150 -msgid "Total exceeds your balance when the " -msgstr "Totalul trece peste limita cand" - -#: ../../../src/ui.cpp:2150 -msgid " transaction fee is included " -msgstr "comisionul de tranzactie este inclus" - -#: ../../../src/ui.cpp:2177 -msgid "Payment sent " -msgstr "Plata trimisa" - -#: ../../../src/ui.cpp:2177 -#: ../../../src/ui.cpp:2187 -#: ../../../src/ui.cpp:2337 -#: ../../../src/ui.cpp:2502 -#: ../../../src/wallet.cpp:1088 -msgid "Sending..." -msgstr "Se trimite..." - -#: ../../../src/ui.cpp:2203 -msgid "Invalid address " -msgstr "Adresa incorecta" - -#: ../../../src/ui.cpp:2258 -#, c-format -msgid "Sending %s to %s" -msgstr "Se trimite %s la %s" - -#: ../../../src/ui.cpp:2331 -#: ../../../src/ui.cpp:2364 -msgid "CANCELLED" -msgstr "ANULAT" - -#: ../../../src/ui.cpp:2335 -msgid "Cancelled" -msgstr "Anulat" - -#: ../../../src/ui.cpp:2337 -msgid "Transfer cancelled " -msgstr "Transfer anulat" - -#: ../../../src/ui.cpp:2390 -msgid "Error: " -msgstr "Eroare: " - -#: ../../../src/ui.cpp:2404 -#: ../../../src/ui.cpp:2473 -#: ../../../src/wallet.cpp:1106 -msgid "Insufficient funds" -msgstr "Fonduri insuficiente" - -#: ../../../src/ui.cpp:2409 -msgid "Connecting..." -msgstr "Se conecteaza..." - -#: ../../../src/ui.cpp:2414 -msgid "Unable to connect" -msgstr "Conectare imposibila" - -#: ../../../src/ui.cpp:2419 -msgid "Requesting public key..." -msgstr "Se cere cheia publica..." - -#: ../../../src/ui.cpp:2431 -msgid "Received public key..." -msgstr "Cheia publica primita..." - -#: ../../../src/ui.cpp:2445 -msgid "Recipient is not accepting transactions sent by IP address" -msgstr "Destinatarul nu accepta tranzacti trimise la adresa IP" - -#: ../../../src/ui.cpp:2447 -msgid "Transfer was not accepted" -msgstr "Transferul nu a fost acceptat" - -#: ../../../src/ui.cpp:2456 -msgid "Invalid response received" -msgstr "Raspuns invalid receptionat" - -#: ../../../src/ui.cpp:2469 -msgid "Creating transaction..." -msgstr "Se creeaza tranzactia..." - -#: ../../../src/ui.cpp:2492 -#, c-format -msgid "This transaction requires a transaction fee of at least %s because of its amount, complexity, or use of recently received funds" -msgstr "Aceasta tranzactie necesita un comision de cel putin %s datorita cantitatii, complexitatii sau uzului de fonduri primite recent" - -#: ../../../src/ui.cpp:2494 -msgid "Transaction creation failed" -msgstr "Crearea tranzactiei a esuat." - -#: ../../../src/ui.cpp:2504 -msgid "Transaction aborted" -msgstr "Tranzactie anulata" - -#: ../../../src/ui.cpp:2512 -msgid "Lost connection, transaction cancelled" -msgstr "Conexiune pierduta, tranzactie anulata" - -#: ../../../src/ui.cpp:2528 -msgid "Sending payment..." -msgstr "Se trimite plata..." - -#: ../../../src/ui.cpp:2540 -msgid "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." -msgstr "Tranzactia a fost respinsa. Acest lucru se poate intampla daca vreuna din monede a fost cheltuita sau s-a folosit o copie de portofel (wallet.dat) si monedele a fost cheltuite in copie dar nu s-au marcat cheltuite aici." - -#: ../../../src/ui.cpp:2549 -msgid "Waiting for confirmation..." -msgstr "Se asteapta confirmare..." - -#: ../../../src/ui.cpp:2566 -msgid "" -"The payment was sent, but the recipient was unable to verify it.\n" -"The transaction is recorded and will credit to the recipient,\n" -"but the comment information will be blank." -msgstr "" -"Plata a fost trimisa dar destinatarul nu a putut sa o verifice.\n" -"Tranzactia a fost inregistrata si creditul trimis la desinatar,\n" -"dar informatia de comentarii va ramane in alb." - -#: ../../../src/ui.cpp:2575 -msgid "Payment was sent, but an invalid response was received" -msgstr "Plata a fost trimisa dar s-a receptionat un raspuns incorect" - -#: ../../../src/ui.cpp:2581 -msgid "Payment completed" -msgstr "Plata completa" - -#: ../../../src/ui.cpp:2623 -#: ../../../src/ui.cpp:2769 -#: ../../../src/ui.cpp:2809 -msgid "Name" -msgstr "Nume" - -#: ../../../src/ui.cpp:2624 -#: ../../../src/ui.cpp:2769 -#: ../../../src/ui.cpp:2809 -msgid "Address" -msgstr "Adresa" - -#: ../../../src/ui.cpp:2626 -#: ../../../src/ui.cpp:2781 -msgid "Label" -msgstr "Eticheta" - -#: ../../../src/ui.cpp:2627 -#: ../../../src/uibase.cpp:847 -msgid "Bitcoin Address" -msgstr "Adresa Bitcoin" - -#: ../../../src/ui.cpp:2751 -msgid "This is one of your own addresses for receiving payments and cannot be entered in the address book. " -msgstr "Aceasta este o adresa pentru primire de plati de aceea nu se poate introduce manual in agenda" - -#: ../../../src/ui.cpp:2769 -#: ../../../src/ui.cpp:2775 -msgid "Edit Address" -msgstr "Editeaza adresa" - -#: ../../../src/ui.cpp:2781 -msgid "Edit Address Label" -msgstr "Editeaza eticheta de adresa" - -#: ../../../src/ui.cpp:2809 -#: ../../../src/ui.cpp:2815 -msgid "Add Address" -msgstr "Adauga adresa" - -#: ../../../src/ui.cpp:2902 -msgid "Bitcoin" -msgstr "Bitcoin" - -#: ../../../src/ui.cpp:2904 -msgid "Bitcoin - Generating" -msgstr "Bitcoin - Se genereaza" - -#: ../../../src/ui.cpp:2906 -msgid "Bitcoin - (not connected)" -msgstr "Bitcoin - (neconectat)" - -#: ../../../src/ui.cpp:2985 -msgid "&Open Bitcoin" -msgstr "&Deschide Bitcoin" - -#: ../../../src/ui.cpp:2986 -msgid "&Send Bitcoins" -msgstr "&Trimite Bitcoin" - -#: ../../../src/ui.cpp:2987 -msgid "O&ptions..." -msgstr "O&ptiuni" - -#: ../../../src/ui.cpp:2990 -#: ../../../src/uibase.cpp:25 -msgid "E&xit" -msgstr "I&esire" - -#: ../../../src/ui.cpp:3216 -msgid "Program has crashed and will terminate. " -msgstr "Programul a detectat o eroare si se va inchide." - -#: ../../../src/uibase.cpp:28 -msgid "&File" -msgstr "&Arhiva" - -#: ../../../src/uibase.cpp:32 -msgid "&Your Receiving Addresses..." -msgstr "&Adresele de primire..." - -#: ../../../src/uibase.cpp:35 -msgid "&Encrypt Wallet..." -msgstr "&Encripteaza portofel..." - -#: ../../../src/uibase.cpp:38 -msgid "&Change Wallet Encryption Passphrase..." -msgstr "&Schimba parola de encriptare portofel..." - -#: ../../../src/uibase.cpp:42 -msgid "&Options..." -msgstr "&Optiuni..." - -#: ../../../src/uibase.cpp:45 -msgid "&Settings" -msgstr "&Cnfiguratie" - -#: ../../../src/uibase.cpp:49 -msgid "&About..." -msgstr "&Despre..." - -#: ../../../src/uibase.cpp:52 -msgid "&Help" -msgstr "&Ajutor" - -#: ../../../src/uibase.cpp:62 -msgid "Address Book" -msgstr "Agenda cu adrese" - -#: ../../../src/uibase.cpp:75 -msgid "Your Bitcoin Address:" -msgstr "Adresa Ta Bitcoin:" - -#: ../../../src/uibase.cpp:82 -msgid " &New... " -msgstr " &Nou... " - -#: ../../../src/uibase.cpp:85 -#: ../../../src/uibase.cpp:790 -#: ../../../src/uibase.cpp:893 -msgid " &Copy to Clipboard " -msgstr " &Copiaza in Clipboard" - -#: ../../../src/uibase.cpp:99 -msgid "Balance:" -msgstr "Balant:" - -#: ../../../src/uibase.cpp:115 -msgid " All" -msgstr "Tot" - -#: ../../../src/uibase.cpp:115 -msgid " Sent" -msgstr "Trimis" - -#: ../../../src/uibase.cpp:115 -msgid " Received" -msgstr "Primit" - -#: ../../../src/uibase.cpp:115 -msgid " In Progress" -msgstr "In Curs" - -#: ../../../src/uibase.cpp:136 -msgid "All Transactions" -msgstr "Toate Tranzactiile" - -#: ../../../src/uibase.cpp:147 -msgid "Sent/Received" -msgstr "Trimis/Primit" - -#: ../../../src/uibase.cpp:158 -msgid "Sent" -msgstr "Trimis" - -#: ../../../src/uibase.cpp:169 -msgid "Received" -msgstr "Primit" - -#: ../../../src/uibase.cpp:312 -#: ../../../src/uibase.cpp:453 -#: ../../../src/uibase.cpp:552 -#: ../../../src/uibase.cpp:732 -#: ../../../src/uibase.cpp:793 -#: ../../../src/uibase.cpp:902 -#: ../../../src/uibase.cpp:991 -msgid "OK" -msgstr "OK" - -#: ../../../src/uibase.cpp:355 -msgid "&Start Bitcoin on system startup" -msgstr "&Porneste Bitcoin odata cu sistemul" - -#: ../../../src/uibase.cpp:358 -msgid "&Minimize to the tray instead of the taskbar" -msgstr "&Minimizeaza in tray nu in bara de aplicatii" - -#: ../../../src/uibase.cpp:361 -msgid "Map port using &UPnP" -msgstr "Reserva portul utilizand &UPnP" - -#: ../../../src/uibase.cpp:364 -msgid "M&inimize to the tray on close" -msgstr "M&inimizeaza in tray la inchidere" - -#: ../../../src/uibase.cpp:370 -msgid "&Connect through socks4 proxy (requires restart to apply): " -msgstr "&Conecteaza prin proxy socks4 (repornire apl. necesara): " - -#: ../../../src/uibase.cpp:381 -msgid "Proxy &IP:" -msgstr "&IP de proxy:" - -#: ../../../src/uibase.cpp:389 -msgid " &Port:" -msgstr " &Port:" - -#: ../../../src/uibase.cpp:402 -msgid "Optional transaction fee per KB that helps make sure your transactions are processed quickly. Most transactions are 1KB. Fee 0.01 recommended." -msgstr "Comision optional per KB ce asigura ca tranzactiile tale sunt procesate rapid. Majoritatea tranzactiilor sunt de 1KB. Se recomanda un comision de 0.01." - -#: ../../../src/uibase.cpp:409 -msgid "Pay transaction fee:" -msgstr "Comision de tranzactie:" - -#: ../../../src/uibase.cpp:430 -msgid "// [don't translate] Test panel 2 for future expansion" -msgstr "" - -#: ../../../src/uibase.cpp:434 -msgid "// [don't translate] Let's not start multiple pages until the first page is filled up" -msgstr "" - -#: ../../../src/uibase.cpp:456 -#: ../../../src/uibase.cpp:678 -#: ../../../src/uibase.cpp:737 -#: ../../../src/uibase.cpp:796 -#: ../../../src/uibase.cpp:905 -#: ../../../src/uibase.cpp:994 -msgid "Cancel" -msgstr "Anuleaza" - -#: ../../../src/uibase.cpp:459 -msgid "&Apply" -msgstr "&Aplica" - -#: ../../../src/uibase.cpp:518 -msgid "Bitcoin " -msgstr "Bitcoin " - -#: ../../../src/uibase.cpp:524 -msgid "version" -msgstr "versiune" - -#: ../../../src/uibase.cpp:535 -msgid "" -"Copyright (c) 2009-2011 Bitcoin Developers\n" -"\n" -"This is experimental software.\n" -"\n" -"Distributed under the MIT/X11 software license, see the accompanying file \n" -"license.txt or http://www.opensource.org/licenses/mit-license.php.\n" -"\n" -"This product includes software developed by the OpenSSL Project for use in the \n" -"OpenSSL Toolkit (http://www.openssl.org/) and cryptographic software written by \n" -"Eric Young (eay@cryptsoft.com) and UPnP software written by Thomas Bernard." -msgstr "" -"Copyright (c) 2009-2011 Bitcoin Developers\n" -"\n" -"Acesta este un program experimental.\n" -"\n" -"Distribuit sub licenta MIT/X11, cauta fisierul adaugat de licenta \n" -"license.txt sau http://www.opensource.org/licenses/mit-license.php.\n" -"\n" -"Acest produs contine software creat deOpenSSL Project pentru uz in \n" -"OpenSSL Toolkit (http://www.openssl.org/), software cryptografic scris de \n" -"Eric Young (eay@cryptsoft.com) si software UPnP scris de Thomas Bernard." - -#: ../../../src/uibase.cpp:591 -msgid "Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)" -msgstr "Introduce o a adresa Bitcoin (exemplu: 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)" - -#: ../../../src/uibase.cpp:605 -msgid "Pay &To:" -msgstr "Plateste &la:" - -#: ../../../src/uibase.cpp:620 -msgid "&Paste" -msgstr "&Lipeste (paste)" - -#: ../../../src/uibase.cpp:623 -msgid " Address &Book..." -msgstr "Agenda de &adrese..." - -#: ../../../src/uibase.cpp:630 -msgid "&Amount:" -msgstr "&Cantitate:" - -#: ../../../src/uibase.cpp:640 -msgid "T&ransfer:" -msgstr "T&ransfera:" - -#: ../../../src/uibase.cpp:646 -msgid " Standard" -msgstr "Standard" - -#: ../../../src/uibase.cpp:673 -msgid "&Send" -msgstr "&Trimite" - -#: ../../../src/uibase.cpp:721 -msgid "" -"\n" -"\n" -"Connecting..." -msgstr "" -"\n" -"\n" -"Se conecteaza..." - -#: ../../../src/uibase.cpp:771 -msgid "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. The highlighted address is displayed in the main window." -msgstr "Acestea sunt adresele tale pentru primit plati. Poti sa folosesti o adresa diferita pentru fiecare persoana care iti trimite pentru a putea tine cont de unde vin platile. Adresa selectionata este afisata in fereastra principala." - -#: ../../../src/uibase.cpp:784 -#: ../../../src/uibase.cpp:896 -msgid "&Edit..." -msgstr "&Editeaza..." - -#: ../../../src/uibase.cpp:787 -#: ../../../src/uibase.cpp:899 -msgid " &New Address... " -msgstr " &Adresa noua... " - -#: ../../../src/uibase.cpp:859 -msgid "Sending" -msgstr "Se trimite" - -#: ../../../src/uibase.cpp:867 -msgid "These are your Bitcoin addresses for receiving payments. You can give a different one to each sender to keep track of who is paying you. The highlighted address will be displayed in the main window." -msgstr "Acestea sunt adresele tale pentru primit plati. Poti sa folosesti o adresa diferita pentru fiecare persoana care iti trimite pentru a putea tine cont de unde vin platile. Adresa selectionata este afisata in fereastra principala." - -#: ../../../src/uibase.cpp:880 -msgid "Receiving" -msgstr "Se receptioneaza" - -#: ../../../src/uibase.cpp:890 -msgid "&Delete" -msgstr "&Sterge" - -#: ../../../src/util.cpp:870 -msgid "Warning: Please check that your computer's date and time are correct. If your clock is wrong Bitcoin will not work properly." -msgstr "Atentie: Regleaza corect hora si data calculatorului pentru ca Bitcoin sa functioneze corect." - -#: ../../../src/util.cpp:904 -msgid "beta" -msgstr "beta" - -#: ../../../src/wallet.cpp:1073 -msgid "Error: Wallet locked, unable to create transaction " -msgstr "Eroare: Portofel blocat, nu se poate crea tranzactia" - -#: ../../../src/wallet.cpp:1081 -#, c-format -msgid "Error: This transaction requires a transaction fee of at least %s because of its amount, complexity, or use of recently received funds " -msgstr "Eroare: Aceasta tranzactie necesita un comision de cel putin %s datorita cantitatii, complexitatii sau uzului de fonduri primite recent" - -#: ../../../src/wallet.cpp:1083 -msgid "Error: Transaction creation failed " -msgstr "Eroare: Crearea tranzactiei a esuat" - -#: ../../../src/wallet.cpp:1092 -msgid "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." -msgstr "Error: Tranzactia a fost respinsa. Acest lucru se poate intampla daca vreuna din monede a fost cheltuita sau s-a folosit o copie de portofel (wallet.dat) si monedele a fost cheltuite in copie dar nu s-au marcat cheltuite aici." - -#: ../../../src/wallet.cpp:1104 -msgid "Invalid amount" -msgstr "Cantitate incorecta" - -#: ../../../src/uibase.h:151 -msgid "Transaction Details" -msgstr "Detalii de Tranzactie" - -#: ../../../src/uibase.h:203 -msgid "Options" -msgstr "Optiuni" - -#: ../../../src/uibase.h:232 -msgid "About Bitcoin" -msgstr "Despre Bitcoin" - -#: ../../../src/uibase.h:341 -msgid "Your Bitcoin Addresses" -msgstr "Adresele Tale Bitcoin" - -#~ msgid "Invalid bitcoin address" -#~ msgstr "Dirección Bitcoin inválida" diff --git a/locale/ru/LC_MESSAGES/bitcoin.mo b/locale/ru/LC_MESSAGES/bitcoin.mo Binary files differdeleted file mode 100644 index 4175fc47d1..0000000000 --- a/locale/ru/LC_MESSAGES/bitcoin.mo +++ /dev/null diff --git a/locale/ru/LC_MESSAGES/bitcoin.po b/locale/ru/LC_MESSAGES/bitcoin.po deleted file mode 100644 index 266e76825a..0000000000 --- a/locale/ru/LC_MESSAGES/bitcoin.po +++ /dev/null @@ -1,1021 +0,0 @@ -msgid "" -msgstr "" -"Project-Id-Version: \n" -"Report-Msgid-Bugs-To: m0Ray <m0ray@nm.ru>\n" -"POT-Creation-Date: 2011-05-15 18:24+0100\n" -"PO-Revision-Date: 2011-07-17 04:18+0100\n" -"Last-Translator: Michael Bemmerl <mail@mx-server.de>\n" -"Language-Team: \n" -"Language: \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"X-Poedit-KeywordsList: _;gettext;gettext_noop\n" -"X-Poedit-Basepath: .\n" -"X-Poedit-SearchPath-0: ../../..\n" - -#: ../../../src/net.cpp:1499 -#, c-format -msgid "Unable to bind to port %d on this computer. Bitcoin is probably already running." -msgstr "Не могу открыть порт %d. Возможно, Bitcoin уже запущен." - -#: ../../../src/ui.cpp:202 -#, c-format -msgid "This transaction is over the size limit. You can still send it for a fee of %s, which goes to the nodes that process your transaction and helps to support the network. Do you want to pay the fee?" -msgstr "Этот перевод превышает допустимый лимит. Вы можете провести его с комиссией %s, которую получат узлы, обрабатывающие перевод, и поможет поддерживать сеть. Вы хотите заплатить комиссию?" - -#: ../../../src/ui.cpp:301 -msgid "Status" -msgstr "Статус" - -#: ../../../src/ui.cpp:302 -msgid "Date" -msgstr "Дата" - -#: ../../../src/ui.cpp:303 -msgid "Description" -msgstr "Описание" - -#: ../../../src/ui.cpp:304 -msgid "Debit" -msgstr "Расход" - -#: ../../../src/ui.cpp:305 -msgid "Credit" -msgstr "Приход" - -#: ../../../src/ui.cpp:511 -#, c-format -msgid "Open for %d blocks" -msgstr "Открыто на %d блоков" - -#: ../../../src/ui.cpp:513 -#, c-format -msgid "Open until %s" -msgstr "Открыто до %s" - -#: ../../../src/ui.cpp:519 -#, c-format -msgid "%d/offline?" -msgstr "%d/оффлайн?" - -#: ../../../src/ui.cpp:521 -#, c-format -msgid "%d/unconfirmed" -msgstr "%d/не подтверждено" - -#: ../../../src/ui.cpp:523 -#, c-format -msgid "%d confirmations" -msgstr "%d подтверждений" - -#: ../../../src/ui.cpp:608 -msgid "Generated" -msgstr "Сгенерировано" - -#: ../../../src/ui.cpp:616 -#, c-format -msgid "Generated (%s matures in %d more blocks)" -msgstr "Сгенерировано (%s станет доступно через %d блоков)" - -#: ../../../src/ui.cpp:620 -msgid "Generated - Warning: This block was not received by any other nodes and will probably not be accepted!" -msgstr "Сгенерировано - Внимание: этот блок не был получен ни одним узлом и, скорее всего, не будет принят!" - -#: ../../../src/ui.cpp:624 -msgid "Generated (not accepted)" -msgstr "Сгенерировано (не принято)" - -#: ../../../src/ui.cpp:634 -msgid "From: " -msgstr "От: " - -#: ../../../src/ui.cpp:658 -msgid "Received with: " -msgstr "Получено для: " - -#: ../../../src/ui.cpp:704 -msgid "Payment to yourself" -msgstr "Платёж самому себе" - -#: ../../../src/ui.cpp:738 -msgid "To: " -msgstr "Кому: " - -#: ../../../src/ui.cpp:1053 -msgid " Generating" -msgstr " Генерация" - -#: ../../../src/ui.cpp:1055 -msgid "(not connected)" -msgstr "(не подключен)" - -#: ../../../src/ui.cpp:1058 -#, c-format -msgid " %d connections %d blocks %d transactions" -msgstr " %d подключений %d блоков %d переводов" - -#: ../../../src/ui.cpp:1163 -#: ../../../src/ui.cpp:2527 -msgid "New Receiving Address" -msgstr "Новый адрес получения" - -#: ../../../src/ui.cpp:1164 -#: ../../../src/ui.cpp:2528 -msgid "" -"You should use a new address for each payment you receive.\n" -"\n" -"Label" -msgstr "" -"Рекомендуется использовать новый адрес для каждого получаемого платежа.\n" -"\n" -"Метка" - -#: ../../../src/ui.cpp:1233 -msgid "<b>Status:</b> " -msgstr "<b>Статус:</b> " - -#: ../../../src/ui.cpp:1238 -msgid ", has not been successfully broadcast yet" -msgstr ", ещё не был успешно разослан" - -#: ../../../src/ui.cpp:1240 -#, c-format -msgid ", broadcast through %d node" -msgstr ", рассылка через %d узел" - -#: ../../../src/ui.cpp:1242 -#, c-format -msgid ", broadcast through %d nodes" -msgstr ", рассылка через %d узлов" - -#: ../../../src/ui.cpp:1246 -msgid "<b>Date:</b> " -msgstr "<b>Дата:</b> " - -#: ../../../src/ui.cpp:1254 -msgid "<b>Source:</b> Generated<br>" -msgstr "<b>Источник:</b> Сгенерировано<br>" - -#: ../../../src/ui.cpp:1260 -#: ../../../src/ui.cpp:1278 -msgid "<b>From:</b> " -msgstr "<b>От:</b> " - -#: ../../../src/ui.cpp:1278 -msgid "unknown" -msgstr "аноним" - -#: ../../../src/ui.cpp:1279 -#: ../../../src/ui.cpp:1303 -#: ../../../src/ui.cpp:1362 -msgid "<b>To:</b> " -msgstr "<b>Кому:</b> " - -#: ../../../src/ui.cpp:1282 -msgid " (yours, label: " -msgstr " (ваш, метка: " - -#: ../../../src/ui.cpp:1284 -msgid " (yours)" -msgstr " (ваш)" - -#: ../../../src/ui.cpp:1321 -#: ../../../src/ui.cpp:1333 -#: ../../../src/ui.cpp:1379 -#: ../../../src/ui.cpp:1396 -msgid "<b>Credit:</b> " -msgstr "<b>Приход:</b> " - -#: ../../../src/ui.cpp:1323 -#, c-format -msgid "(%s matures in %d more blocks)" -msgstr "(%s станет доступно через %d блоков)" - -#: ../../../src/ui.cpp:1325 -msgid "(not accepted)" -msgstr "(не принято)" - -#: ../../../src/ui.cpp:1370 -#: ../../../src/ui.cpp:1378 -#: ../../../src/ui.cpp:1393 -msgid "<b>Debit:</b> " -msgstr "<b>Расход:</b> " - -#: ../../../src/ui.cpp:1384 -msgid "<b>Transaction fee:</b> " -msgstr "<b>Комиссия:</b> " - -#: ../../../src/ui.cpp:1400 -msgid "<b>Net amount:</b> " -msgstr "<b>Чистая сумма:</b> " - -#: ../../../src/ui.cpp:1407 -msgid "Message:" -msgstr "Сообщение:" - -#: ../../../src/ui.cpp:1409 -msgid "Comment:" -msgstr "Комментарий:" - -#: ../../../src/ui.cpp:1412 -msgid "Generated coins must wait 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, it will change to \"not accepted\" and not be spendable. This may occasionally happen if another node generates a block within a few seconds of yours." -msgstr "Сгенерированные монеты должны ждать 120 блоков, прежде чем они могут быть потрачены. Когда вы сгенерировали этот блок, он был разослан в сети для добавления в цепь блоков. Если не удалось добавить этот блок в цепь, он будет обозначен как \"не принятый\" и не может быть потрачен. Такое может случиться, если другой узел сгенерировал блок примерно в то же время, что и вы." - -#: ../../../src/ui.cpp:1592 -msgid "Cannot write autostart/bitcoin.desktop file" -msgstr "Не удаётся записать файл autostart/bitcoin.desktop" - -#: ../../../src/ui.cpp:1628 -msgid "Main" -msgstr "Основные" - -#: ../../../src/ui.cpp:1636 -msgid "&Start Bitcoin on window system startup" -msgstr "&Запускать Bitcoin при запуске оконной системы" - -#: ../../../src/ui.cpp:1643 -msgid "&Minimize on close" -msgstr "&Сворачивать при закрытии" - -#: ../../../src/ui.cpp:1785 -#, c-format -msgid "version %s" -msgstr "версия %s" - -#: ../../../src/ui.cpp:1897 -msgid "Error in amount " -msgstr "Ошибка в количестве " - -#: ../../../src/ui.cpp:1897 -#: ../../../src/ui.cpp:1902 -#: ../../../src/ui.cpp:1907 -#: ../../../src/ui.cpp:1942 -#: ../../../src/uibase.cpp:55 -msgid "Send Coins" -msgstr "Отправить монеты" - -#: ../../../src/ui.cpp:1902 -msgid "Amount exceeds your balance " -msgstr "Количество превышает ваш баланс " - -#: ../../../src/ui.cpp:1907 -msgid "Total exceeds your balance when the " -msgstr "Общая сумма превышает ваш баланс, когда " - -#: ../../../src/ui.cpp:1907 -msgid " transaction fee is included " -msgstr " комиссия включена " - -#: ../../../src/ui.cpp:1925 -msgid "Payment sent " -msgstr "Платёж отправлен " - -#: ../../../src/ui.cpp:1925 -#: ../../../src/ui.cpp:1930 -#: ../../../src/ui.cpp:2074 -#: ../../../src/ui.cpp:2227 -#: ../../../src/main.cpp:3999 -msgid "Sending..." -msgstr "Отправка..." - -#: ../../../src/ui.cpp:1942 -msgid "Invalid address " -msgstr "Неверный адрес " - -#: ../../../src/ui.cpp:1995 -#, c-format -msgid "Sending %s to %s" -msgstr "Отправка %s для %s" - -#: ../../../src/ui.cpp:2068 -#: ../../../src/ui.cpp:2101 -msgid "CANCELLED" -msgstr "ОТМЕНЕНО" - -#: ../../../src/ui.cpp:2072 -msgid "Cancelled" -msgstr "Отменено" - -#: ../../../src/ui.cpp:2074 -msgid "Transfer cancelled " -msgstr "Передача отменена " - -#: ../../../src/ui.cpp:2127 -msgid "Error: " -msgstr "Ошибка: " - -#: ../../../src/ui.cpp:2141 -#: ../../../src/ui.cpp:2212 -#: ../../../src/main.cpp:4018 -msgid "Insufficient funds" -msgstr "Недостаточно средств" - -#: ../../../src/ui.cpp:2146 -msgid "Connecting..." -msgstr "Подключение..." - -#: ../../../src/ui.cpp:2151 -msgid "Unable to connect" -msgstr "Невозможно подключиться" - -#: ../../../src/ui.cpp:2156 -msgid "Requesting public key..." -msgstr "Запрос публичного ключа..." - -#: ../../../src/ui.cpp:2168 -msgid "Received public key..." -msgstr "Получен публичный ключ..." - -#: ../../../src/ui.cpp:2182 -msgid "Recipient is not accepting transactions sent by IP address" -msgstr "Получатель не принимает переводы на IP-адрес" - -#: ../../../src/ui.cpp:2184 -msgid "Transfer was not accepted" -msgstr "Передача не принята" - -#: ../../../src/ui.cpp:2193 -msgid "Invalid response received" -msgstr "Получен неверный отклик" - -#: ../../../src/ui.cpp:2208 -msgid "Creating transaction..." -msgstr "Создание перевода..." - -#: ../../../src/ui.cpp:2220 -#, c-format -msgid "This transaction requires a transaction fee of at least %s because of its amount, complexity, or use of recently received funds" -msgstr "Этот перевод требует уплаты комиссии минимум в %s, так как имеет большой объём, сложность или использует недавно полученные средства" - -#: ../../../src/ui.cpp:2222 -msgid "Transaction creation failed" -msgstr "Не удалось создать перевод" - -#: ../../../src/ui.cpp:2229 -msgid "Transaction aborted" -msgstr "Перевод прерван" - -#: ../../../src/ui.cpp:2237 -msgid "Lost connection, transaction cancelled" -msgstr "Соединение разорвано, перевод отменён" - -#: ../../../src/ui.cpp:2253 -msgid "Sending payment..." -msgstr "Отправка платежа..." - -#: ../../../src/ui.cpp:2259 -msgid "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." -msgstr "Перевод был отклонён. Это могло произойти, если некоторые из монет в вашем кошельке уже были потрачены, например, если вы использовали копию wallet.dat, и монеты были потрачены в копии, но не отмечены израсходованными здесь." - -#: ../../../src/ui.cpp:2268 -msgid "Waiting for confirmation..." -msgstr "Ожидание подтверждения..." - -#: ../../../src/ui.cpp:2286 -msgid "" -"The payment was sent, but the recipient was unable to verify it.\n" -"The transaction is recorded and will credit to the recipient,\n" -"but the comment information will be blank." -msgstr "" -"Платёж был отправлен, но получатель не смог проверить его.\n" -"Перевод был записан и будет начислен получателю,\n" -"но поле комментария будет пустое." - -#: ../../../src/ui.cpp:2295 -msgid "Payment was sent, but an invalid response was received" -msgstr "Платёж отправлен, но был получен неверный отклик" - -#: ../../../src/ui.cpp:2301 -msgid "Payment completed" -msgstr "Платёж проведён" - -#: ../../../src/ui.cpp:2332 -#: ../../../src/ui.cpp:2478 -#: ../../../src/ui.cpp:2515 -msgid "Name" -msgstr "Имя" - -#: ../../../src/ui.cpp:2333 -#: ../../../src/ui.cpp:2478 -#: ../../../src/ui.cpp:2515 -msgid "Address" -msgstr "Адрес" - -#: ../../../src/ui.cpp:2335 -#: ../../../src/ui.cpp:2490 -msgid "Label" -msgstr "Метка" - -#: ../../../src/ui.cpp:2336 -#: ../../../src/uibase.cpp:837 -msgid "Bitcoin Address" -msgstr "Адрес Bitcoin" - -#: ../../../src/ui.cpp:2460 -msgid "This is one of your own addresses for receiving payments and cannot be entered in the address book. " -msgstr "Это один из ваших собственных адресов для получения платежей, он не может быть внесён в адресную книгу. " - -#: ../../../src/ui.cpp:2478 -#: ../../../src/ui.cpp:2484 -msgid "Edit Address" -msgstr "Правка адреса" - -#: ../../../src/ui.cpp:2490 -msgid "Edit Address Label" -msgstr "Правка метки адреса" - -#: ../../../src/ui.cpp:2515 -#: ../../../src/ui.cpp:2521 -msgid "Add Address" -msgstr "Добавить адрес" - -#: ../../../src/ui.cpp:2598 -msgid "Bitcoin" -msgstr "Bitcoin" - -#: ../../../src/ui.cpp:2600 -msgid "Bitcoin - Generating" -msgstr "Bitcoin - Генерация" - -#: ../../../src/ui.cpp:2602 -msgid "Bitcoin - (not connected)" -msgstr "Bitcoin - (не подключен)" - -#: ../../../src/ui.cpp:2681 -msgid "&Open Bitcoin" -msgstr "&Открыть Bitcoin" - -#: ../../../src/ui.cpp:2682 -msgid "&Send Bitcoins" -msgstr "&Отправить Bitcoins" - -#: ../../../src/ui.cpp:2683 -msgid "O&ptions..." -msgstr "О&пции..." - -#: ../../../src/ui.cpp:2686 -#: ../../../src/uibase.cpp:25 -msgid "E&xit" -msgstr "&Выход" - -#: ../../../src/ui.cpp:2902 -msgid "Program has crashed and will terminate. " -msgstr "Сбой программы, завершение. " - -#: ../../../src/main.cpp:1868 -msgid "Warning: Disk space is low " -msgstr "Внимание: мало места на диске " - -#: ../../../src/main.cpp:3992 -#, c-format -msgid "Error: This transaction requires a transaction fee of at least %s because of its amount, complexity, or use of recently received funds " -msgstr "Ошибка: Этот перевод требует уплаты комиссии минимум в %s, так как имеет большой объём, сложность или использует недавно полученные средства " - -#: ../../../src/main.cpp:3994 -msgid "Error: Transaction creation failed " -msgstr "Ошибка: не удалось создать перевод " - -#: ../../../src/main.cpp:4003 -msgid "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." -msgstr "Перевод был отклонен. Это могло произойти, если некоторые из монет в вашем кошельке уже были потрачены, например, если вы использовали копию wallet.dat, и монеты были потрачены в копии, но не отмечены израсходованными здесь." - -#: ../../../src/main.cpp:4016 -msgid "Invalid amount" -msgstr "Неверное количество" - -#: ../../../src/main.cpp:4023 -msgid "Invalid bitcoin address" -msgstr "Неверный адрес bitcoin" - -#: ../../../src/rpc.cpp:1800 -#: ../../../src/rpc.cpp:1802 -#, c-format -msgid "To use the %s option" -msgstr "Чтобы использовать опцию %s" - -#: ../../../src/rpc.cpp:1804 -#, c-format -msgid "" -"Warning: %s, you must set rpcpassword=<password>\n" -"in the configuration file: %s\n" -"If the file does not exist, create it with owner-readable-only file permissions.\n" -msgstr "" -"Внимание: %s, вы должны установить rpcpassword=<пароль>\n" -"в конфигурационном файле: %s\n" -"Если файл не существует, создайте его с правами \"чтение только владельцем\".\n" - -#: ../../../src/rpc.cpp:1972 -#, c-format -msgid "" -"You must set rpcpassword=<password> in the configuration file:\n" -"%s\n" -"If the file does not exist, create it with owner-readable-only file permissions." -msgstr "" -"Вы должны установить rpcpassword=<пароль> в конфигурационном файле:\n" -"%s\n" -"Если файл не существует, создайте его с правами \"чтение только владельцем\"." - -#: ../../../src/util.cpp:865 -msgid "Warning: Please check that your computer's date and time are correct. If your clock is wrong Bitcoin will not work properly." -msgstr "Внимание: пожалуйста, проверьте дату и время на вашем компьютере. Если часы идут неверно, Bitcoin не будет работать правильно." - -#: ../../../src/util.cpp:898 -msgid "beta" -msgstr "beta" - -#: ../../../src/uibase.cpp:28 -msgid "&File" -msgstr "&Файл" - -#: ../../../src/uibase.cpp:32 -msgid "&Your Receiving Addresses..." -msgstr "&Ваши адреса получения..." - -#: ../../../src/uibase.cpp:36 -msgid "&Options..." -msgstr "&Опции" - -#: ../../../src/uibase.cpp:39 -msgid "&Settings" -msgstr "&Настройки" - -#: ../../../src/uibase.cpp:43 -msgid "&About..." -msgstr "&О программе..." - -#: ../../../src/uibase.cpp:46 -msgid "&Help" -msgstr "&Справка" - -#: ../../../src/uibase.cpp:56 -msgid "Address Book" -msgstr "Адресная книга" - -#: ../../../src/uibase.cpp:69 -msgid "Your Bitcoin Address:" -msgstr "Ваш адрес Bitcoin:" - -#: ../../../src/uibase.cpp:76 -msgid " &New... " -msgstr " &Новый... " - -#: ../../../src/uibase.cpp:79 -#: ../../../src/uibase.cpp:780 -#: ../../../src/uibase.cpp:883 -msgid " &Copy to Clipboard " -msgstr " &Копировать в буфер обмена " - -#: ../../../src/uibase.cpp:93 -msgid "Balance:" -msgstr "Баланс:" - -#: ../../../src/uibase.cpp:109 -msgid " All" -msgstr " Все" - -#: ../../../src/uibase.cpp:109 -msgid " Sent" -msgstr " Отправленные" - -#: ../../../src/uibase.cpp:109 -msgid " Received" -msgstr " Полученные" - -#: ../../../src/uibase.cpp:109 -msgid " In Progress" -msgstr " В процессе" - -#: ../../../src/uibase.cpp:130 -msgid "All Transactions" -msgstr "Все переводы" - -#: ../../../src/uibase.cpp:141 -msgid "Sent/Received" -msgstr "Отправленные/Полученные" - -#: ../../../src/uibase.cpp:152 -msgid "Sent" -msgstr "Отправленные" - -#: ../../../src/uibase.cpp:163 -msgid "Received" -msgstr "Полученные" - -#: ../../../src/uibase.cpp:302 -#: ../../../src/uibase.cpp:443 -#: ../../../src/uibase.cpp:542 -#: ../../../src/uibase.cpp:722 -#: ../../../src/uibase.cpp:783 -#: ../../../src/uibase.cpp:892 -#: ../../../src/uibase.cpp:981 -msgid "OK" -msgstr "ОК" - -#: ../../../src/uibase.cpp:345 -msgid "&Start Bitcoin on system startup" -msgstr "&Запускать Bitcoin при старте системы" - -#: ../../../src/uibase.cpp:348 -msgid "&Minimize to the tray instead of the taskbar" -msgstr "&Сворачивать в трей вместо панели задач" - -#: ../../../src/uibase.cpp:351 -msgid "Map port using &UPnP" -msgstr "Использовать &UPnP" - -#: ../../../src/uibase.cpp:354 -msgid "M&inimize to the tray on close" -msgstr "С&ворачивать в трей при закрытии" - -#: ../../../src/uibase.cpp:360 -msgid "&Connect through socks4 proxy: " -msgstr "&Подключаться через socks4 прокси: " - -#: ../../../src/uibase.cpp:371 -msgid "Proxy &IP:" -msgstr "IP п&рокси-сервера:" - -#: ../../../src/uibase.cpp:379 -msgid " &Port:" -msgstr " &Порт" - -#: ../../../src/uibase.cpp:392 -msgid "Optional transaction fee per KB that helps make sure your transactions are processed quickly. Most transactions are 1KB. Fee 0.01 recommended." -msgstr "Необязательная комиссия за килобайт обеспечивает приоритет обработки перевода. Большинство транзакций имеют размер в 1КБ. Рекомендуется значение в 0.01." - -#: ../../../src/uibase.cpp:399 -msgid "Pay transaction fee:" -msgstr "Комиссия:" - -#: ../../../src/uibase.cpp:420 -msgid "// [don't translate] Test panel 2 for future expansion" -msgstr "" - -#: ../../../src/uibase.cpp:424 -msgid "// [don't translate] Let's not start multiple pages until the first page is filled up" -msgstr "" - -#: ../../../src/uibase.cpp:446 -#: ../../../src/uibase.cpp:668 -#: ../../../src/uibase.cpp:727 -#: ../../../src/uibase.cpp:786 -#: ../../../src/uibase.cpp:895 -#: ../../../src/uibase.cpp:984 -msgid "Cancel" -msgstr "Отмена" - -#: ../../../src/uibase.cpp:449 -msgid "&Apply" -msgstr "&Применить" - -#: ../../../src/uibase.cpp:508 -msgid "Bitcoin " -msgstr "Bitcoin " - -#: ../../../src/uibase.cpp:514 -msgid "version" -msgstr "версия" - -#: ../../../src/uibase.cpp:525 -msgid "" -"Copyright (c) 2009-2011 Bitcoin Developers\n" -"\n" -"This is experimental software.\n" -"\n" -"Distributed under the MIT/X11 software license, see the accompanying file \n" -"license.txt or http://www.opensource.org/licenses/mit-license.php.\n" -"\n" -"This product includes software developed by the OpenSSL Project for use in the \n" -"OpenSSL Toolkit (http://www.openssl.org/) and cryptographic software written by \n" -"Eric Young (eay@cryptsoft.com) and UPnP software written by Thomas Bernard." -msgstr "" -"Все права защищены (c) 2009-2010 Bitcoin Developers\n" -"\n" -"Это экспериментальное ПО.\n" -"\n" -"Распространяется под лицензией MIT/X11, см. файл\n" -"license.txt или http://www.opensource.org/licenses/mit-license.php.\n" -"\n" -"Этот продукт включает ПО, разработанное проектом OpenSSL для использования в\n" -"OpenSSL Toolkit (http://www.openssl.org/), и криптографическое ПО, написанное\n" -"Eric Young (eay@cryptsoft.com) и UPnP программного обеспечения, написанного Thomas Bernard." - -#: ../../../src/uibase.cpp:581 -msgid "Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)" -msgstr "Введите адрес Bitcoin (напр. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)" - -#: ../../../src/uibase.cpp:595 -msgid "Pay &To:" -msgstr "&Кому:" - -#: ../../../src/uibase.cpp:610 -msgid "&Paste" -msgstr "&Вставить" - -#: ../../../src/uibase.cpp:613 -msgid " Address &Book..." -msgstr " А&дресная книга..." - -#: ../../../src/uibase.cpp:620 -msgid "&Amount:" -msgstr "К&оличество:" - -#: ../../../src/uibase.cpp:630 -msgid "T&ransfer:" -msgstr "&Передача:" - -#: ../../../src/uibase.cpp:636 -msgid " Standard" -msgstr " Стандарт" - -#: ../../../src/uibase.cpp:663 -msgid "&Send" -msgstr "Отп&равить" - -#: ../../../src/uibase.cpp:711 -msgid "" -"\n" -"\n" -"Connecting..." -msgstr "" -"\n" -"\n" -"Подключение..." - -#: ../../../src/uibase.cpp:761 -msgid "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. The highlighted address is displayed in the main window." -msgstr "Это ваши адреса для получения платежей. Вы можете использовать разные для каждого отправителя, чтобы отслеживать, кто вам платит. Выделенный адрес отображается в главном окне." - -#: ../../../src/uibase.cpp:774 -#: ../../../src/uibase.cpp:886 -msgid "&Edit..." -msgstr "&Правка..." - -#: ../../../src/uibase.cpp:777 -#: ../../../src/uibase.cpp:889 -msgid " &New Address... " -msgstr " &Новый адрес... " - -#: ../../../src/uibase.cpp:849 -msgid "Sending" -msgstr "Отправка" - -#: ../../../src/uibase.cpp:857 -msgid "These are your Bitcoin addresses for receiving payments. You can give a different one to each sender to keep track of who is paying you. The highlighted address will be displayed in the main window." -msgstr "Это ваши адреса для получения платежей. Вы можете использовать разные для каждого отправителя, чтобы отслеживать, кто вам платит. Выделенный адрес отображается в главном окне." - -#: ../../../src/uibase.cpp:870 -msgid "Receiving" -msgstr "Получение" - -#: ../../../src/uibase.cpp:880 -msgid "&Delete" -msgstr "&Удалить" - -#: ../../../src/init.cpp:147 -msgid "Bitcoin version" -msgstr "Bitcoin версия" - -#: ../../../src/init.cpp:148 -msgid "Usage:" -msgstr "Использование" - -#: ../../../src/init.cpp:150 -msgid "Send command to -server or bitcoind\n" -msgstr "Отправить команду bitcoin, запущенному с -server\n" - -#: ../../../src/init.cpp:151 -msgid "List commands\n" -msgstr "Список команд\n" - -#: ../../../src/init.cpp:152 -msgid "Get help for a command\n" -msgstr "Получить помощь для команды\n" - -#: ../../../src/init.cpp:153 -msgid "Options:\n" -msgstr "Параметры:\n" - -#: ../../../src/init.cpp:154 -msgid "Specify configuration file (default: bitcoin.conf)\n" -msgstr "Укажите конфигурационный файл (по умолчанию: bitcoin.conf)\n" - -#: ../../../src/init.cpp:155 -msgid "Specify pid file (default: bitcoind.pid)\n" -msgstr "Укажите конфигурационный файл (по умолчанию: bitcoin.conf)\n" - -#: ../../../src/init.cpp:156 -msgid "Generate coins\n" -msgstr "Генерировать монеты\n" - -#: ../../../src/init.cpp:157 -msgid "Don't generate coins\n" -msgstr "Не генерировать монеты\n" - -#: ../../../src/init.cpp:158 -msgid "Start minimized\n" -msgstr "Запускать свёрнутым\n" - -#: ../../../src/init.cpp:159 -msgid "Specify data directory\n" -msgstr "Указать каталог данных\n" - -#: ../../../src/init.cpp:160 -msgid "Connect through socks4 proxy\n" -msgstr "Подключаться через socks4 прокси\n" - -#: ../../../src/init.cpp:161 -msgid "Allow DNS lookups for addnode and connect\n" -msgstr "Использовать DNS для добавления узлов и соединения\n" - -#: ../../../src/init.cpp:162 -msgid "Add a node to connect to\n" -msgstr "Добавить узел для подключения\n" - -#: ../../../src/init.cpp:163 -msgid "Connect only to the specified node\n" -msgstr "Подключаться только к указанному узлу\n" - -#: ../../../src/init.cpp:164 -msgid "Don't accept connections from outside\n" -msgstr "Не принимать входящие соединения\n" - -#: ../../../src/init.cpp:167 -msgid "Don't attempt to use UPnP to map the listening port\n" -msgstr "Не использовать UPnP для отображения порта входящих соединений\n" - -#: ../../../src/init.cpp:169 -msgid "Attempt to use UPnP to map the listening port\n" -msgstr "Использовать UPnP для отображения порта входящих соединений\n" - -#: ../../../src/init.cpp:172 -msgid "Fee per KB to add to transactions you send\n" -msgstr "Комиссия за 1 килобайт отправляемых транзакций\n" - -#: ../../../src/init.cpp:174 -msgid "Accept command line and JSON-RPC commands\n" -msgstr "Принимать команды из командной строки и через JSON-RPC\n" - -#: ../../../src/init.cpp:177 -msgid "Run in the background as a daemon and accept commands\n" -msgstr "Запустить в фоне как демон и принимать команды\n" - -#: ../../../src/init.cpp:179 -msgid "Use the test network\n" -msgstr "Использовать тестовую сеть (testnet)\n" - -#: ../../../src/init.cpp:180 -msgid "Username for JSON-RPC connections\n" -msgstr "Имя пользователя для JSON-RPC\n" - -#: ../../../src/init.cpp:181 -msgid "Password for JSON-RPC connections\n" -msgstr "Пароль для JSON-RPC\n" - -#: ../../../src/init.cpp:182 -msgid "Listen for JSON-RPC connections on <port> (default: 8332)\n" -msgstr "Порт входящих соединений JSON-RPC (по умолчанию 8332)\n" - -#: ../../../src/init.cpp:183 -msgid "Allow JSON-RPC connections from specified IP address\n" -msgstr "Разрешить соединения JSON-RPC со следующих IP-адресов\n" - -#: ../../../src/init.cpp:184 -msgid "Send commands to node running on <ip> (default: 127.0.0.1)\n" -msgstr "Посылать команды узлу с указанным адресом (по умолчанию 127.0.0.1)\n" - -#: ../../../src/init.cpp:185 -msgid "Set key pool size to <n> (default: 100)\n" -msgstr "Установить размер пула адресов (по умолчанию 100)\n" - -#: ../../../src/init.cpp:181 -msgid "Rescan the block chain for missing wallet transactions\n" -msgstr "Просканировать цепочку блоков в поисках утерянных переводов\n" - -#: ../../../src/init.cpp:182 -msgid "Purge all transactions from wallet and rescan\n" -msgstr "Удалить все транзакции из кошелька и пересканировать цепочку блоков в поисках транзакций\n" - -#: ../../../src/init.cpp:190 -msgid "" -"\n" -"SSL options: (see the Bitcoin Wiki for SSL setup instructions)\n" -msgstr "" -"\n" -"Опции SSL: (прочтите документацию для правильной настройки)\n" - -#: ../../../src/init.cpp:191 -msgid "Use OpenSSL (https) for JSON-RPC connections\n" -msgstr "Использовать OpenSSL (протокол https) для соединений JSON-RPC\n" - -#: ../../../src/init.cpp:192 -msgid "Server certificate file (default: server.cert)\n" -msgstr "Файл сертификата сервера (по умолчанию server.cert)\n" - -#: ../../../src/init.cpp:193 -msgid "Server private key (default: server.pem)\n" -msgstr "Приватный ключ сервера (по умолчанию server.pem)\n" - -#: ../../../src/init.cpp:194 -msgid "Acceptable ciphers (default: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH)\n" -msgstr "Приемлемые шифры (по умолчанию TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH)\n" - -#: ../../../src/init.cpp:198 -msgid "This help message\n" -msgstr "Эта справка\n" - -#: ../../../src/init.cpp:335 -#, c-format -msgid "Cannot obtain a lock on data directory %s. Bitcoin is probably already running." -msgstr "Не удаётся получить блокировку каталога с данными %s. Возможно, Bitcoin уже запущен." - -#: ../../../src/init.cpp:361 -msgid "Error loading addr.dat \n" -msgstr "Ошибка загрузки addr.dat \n" - -#: ../../../src/init.cpp:367 -msgid "Error loading blkindex.dat \n" -msgstr "Ошибка загрузки blkindex.dat \n" - -#: ../../../src/init.cpp:374 -msgid "Error loading wallet.dat \n" -msgstr "Ошибка загрузки wallet.dat \n" - -#: ../../../src/init.cpp:454 -msgid "Invalid -proxy address" -msgstr "Неверный адрес -proxy" - -#: ../../../src/init.cpp:477 -msgid "Invalid amount for -paytxfee=<amount>" -msgstr "Неверное значение для -paytxfee=<amount>" - -#: ../../../src/init.cpp:481 -msgid "Warning: -paytxfee is set very high. This is the transaction fee you will pay if you send a transaction." -msgstr "Внимание: -paytxfee установлено в очень большое значение. Это комиссия, которую вы будете платить при переводе." - -#: ../../../src/uibase.h:147 -msgid "Transaction Details" -msgstr "Подробности транзакции" - -#: ../../../src/uibase.h:199 -msgid "Options" -msgstr "Опции" - -#: ../../../src/uibase.h:228 -msgid "About Bitcoin" -msgstr "О Bitcoin" - -#: ../../../src/uibase.h:337 -msgid "Your Bitcoin Addresses" -msgstr "Ваш адрес Bitcoin" - -#~ msgid "" -#~ "Error: This is an oversized transaction that requires a transaction fee " -#~ "of %s " -#~ msgstr "" -#~ "Ошибка: этот перевод слишком большого размера, который требует комиссию " -#~ "%s " - -#~ msgid "version %s%s BETA" -#~ msgstr "версия %s%s бета" - -#~ msgid "n/a" -#~ msgstr "н/д" - -#~ msgid "Can't include a message when sending to a Bitcoin address" -#~ msgstr "Не удаётся включить сообщение при отправке на адрес Bitcoin" - -#~ msgid "" -#~ "This is an oversized transaction that requires a transaction fee of %s" -#~ msgstr "Это слишком большой перевод, который требует комиссию в размере %s" - -#~ msgid "" -#~ "Optional transaction fee you give to the nodes that process your " -#~ "transactions." -#~ msgstr "" -#~ "Необязательная комиссия, которую вы даёте узлам, проводящим ваш перевод." - -#~ msgid "&Limit coin generation to" -#~ msgstr "&Ограничить генерацию монет до" - -#~ msgid "processors" -#~ msgstr "процессоров" - -#~ msgid "&From:" -#~ msgstr "О&т:" - -#~ msgid "&Message:" -#~ msgstr "&Сообщение:" - -#~ msgid "" -#~ "It's good policy to use a new address for each payment you receive.\n" -#~ "\n" -#~ "Label" -#~ msgstr "" -#~ "Неплохо будет использовать новый адрес для каждого получаемого платежа.\n" -#~ "\n" -#~ "Метка" - -#~ msgid "Will appear as \"From: Unknown\"" -#~ msgstr "Будет отображаться как \"От: Аноним\"" diff --git a/locale/sv/LC_MESSAGES/bitcoin.mo b/locale/sv/LC_MESSAGES/bitcoin.mo Binary files differdeleted file mode 100644 index b61914cb4b..0000000000 --- a/locale/sv/LC_MESSAGES/bitcoin.mo +++ /dev/null diff --git a/locale/sv/LC_MESSAGES/bitcoin.po b/locale/sv/LC_MESSAGES/bitcoin.po deleted file mode 100644 index dc635f3139..0000000000 --- a/locale/sv/LC_MESSAGES/bitcoin.po +++ /dev/null @@ -1,973 +0,0 @@ -msgid "" -msgstr "" -"Project-Id-Version: \n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-07-03 10:40+0100\n" -"PO-Revision-Date: 2011-07-03 15:13+0100\n" -"Last-Translator: Codler <github>\n" -"Language-Team: \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"X-Poedit-KeywordsList: _;gettext;gettext_noop\n" -"X-Poedit-Basepath: .\n" -"X-Poedit-SearchPath-0: ../../..\n" - -#: ../../../init.cpp:162 -msgid "Bitcoin version" -msgstr "Bitcoin version" - -#: ../../../init.cpp:163 -msgid "Usage:" -msgstr "Användning:" - -#: ../../../init.cpp:165 -msgid "Send command to -server or bitcoind\n" -msgstr "Skicka kommando till -server eller bitcoind\n" - -#: ../../../init.cpp:166 -msgid "List commands\n" -msgstr "Lista kommandon\n" - -#: ../../../init.cpp:167 -msgid "Get help for a command\n" -msgstr "Få hjälp om kommandon\n" - -#: ../../../init.cpp:168 -msgid "Options:\n" -msgstr "Val:\n" - -#: ../../../init.cpp:169 -msgid "Specify configuration file (default: bitcoin.conf)\n" -msgstr "Ange konfigurationsfil (standard: bitcoin.conf)\n" - -#: ../../../init.cpp:170 -msgid "Specify pid file (default: bitcoind.pid)\n" -msgstr "Ange pid-fil (standard: bitcoind.pid)\n" - -#: ../../../init.cpp:171 -msgid "Generate coins\n" -msgstr "Generera mynt\n" - -#: ../../../init.cpp:172 -msgid "Don't generate coins\n" -msgstr "Generera inte mynt\n" - -#: ../../../init.cpp:173 -msgid "Start minimized\n" -msgstr "Starta minimerad\n" - -#: ../../../init.cpp:174 -msgid "Specify data directory\n" -msgstr "Ange data mappen\n" - -#: ../../../init.cpp:175 -msgid "Specify connection timeout (in milliseconds)\n" -msgstr "Ange timeout för anslutning (i millisekunder)\n" - -#: ../../../init.cpp:176 -msgid "Connect through socks4 proxy\n" -msgstr "Anslut via socks4 proxy\n" - -#: ../../../init.cpp:177 -msgid "Allow DNS lookups for addnode and connect\n" -msgstr "Tillåt DNS uppslagningar för addnode och connect\n" - -#: ../../../init.cpp:178 -msgid "Add a node to connect to\n" -msgstr "Lägg till en nod att ansluta till\n" - -#: ../../../init.cpp:179 -msgid "Connect only to the specified node\n" -msgstr "Anslut endast till specifik nod\n" - -#: ../../../init.cpp:180 -msgid "Don't accept connections from outside\n" -msgstr "Acceptera ej anslutningar från utsidan\n" - -#: ../../../init.cpp:183 -msgid "Don't attempt to use UPnP to map the listening port\n" -msgstr "Försöker inte använda UPnP till avslyssningsport\n" - -#: ../../../init.cpp:185 -msgid "Attempt to use UPnP to map the listening port\n" -msgstr "Försöker använda UPnP till avlyssningsport\n" - -#: ../../../init.cpp:188 -msgid "Fee per KB to add to transactions you send\n" -msgstr "Avgift per KB som läggs på transaktionen när du sänder\n" - -#: ../../../init.cpp:190 -msgid "Accept command line and JSON-RPC commands\n" -msgstr "Accepterar kommandorad och JSON-RPC kommando\n" - -#: ../../../init.cpp:193 -msgid "Run in the background as a daemon and accept commands\n" -msgstr "Kör i bakgrund som daemon och accepterar kommando\n" - -#: ../../../init.cpp:195 -msgid "Use the test network\n" -msgstr "Använd test nätverk\n" - -#: ../../../init.cpp:196 -msgid "Username for JSON-RPC connections\n" -msgstr "Användarnamn till JSON-RPC anslutning\n" - -#: ../../../init.cpp:197 -msgid "Password for JSON-RPC connections\n" -msgstr "Lösenord till JSON-RPC anslutning\n" - -#: ../../../init.cpp:198 -msgid "Listen for JSON-RPC connections on <port> (default: 8332)\n" -msgstr "Lyssnar på JSON-RPC anslutningar på <port> (standard: 8332)\n" - -#: ../../../init.cpp:199 -msgid "Allow JSON-RPC connections from specified IP address\n" -msgstr "Tillåt JSON-RPC anslutningar från specifik IP-adress\n" - -#: ../../../init.cpp:200 -msgid "Send commands to node running on <ip> (default: 127.0.0.1)\n" -msgstr "Skicka kommando till noden som körs på <ip> (standard: 127.0.0.1)\n" - -#: ../../../init.cpp:201 -msgid "Set key pool size to <n> (default: 100)\n" -msgstr "Sätt nyckel pool storlek till <n> (standard: 100)\n" - -#: ../../../init.cpp:202 -msgid "Rescan the block chain for missing wallet transactions\n" -msgstr "Scanna om block kedja efter saknade plånbokstransaktioner\n" - -#: ../../../init.cpp:206 -msgid "" -"\n" -"SSL options: (see the Bitcoin Wiki for SSL setup instructions)\n" -msgstr "" -"\n" -"SSL val: (Se på Bitcoin Wiki för SSL installation instruktioner)\n" - -#: ../../../init.cpp:207 -msgid "Use OpenSSL (https) for JSON-RPC connections\n" -msgstr "Använd OpenSSL (https) till JSON-RPC anslutningar\n" - -#: ../../../init.cpp:208 -msgid "Server certificate file (default: server.cert)\n" -msgstr "Server certifikatfil (standard: server.cert)\n" - -#: ../../../init.cpp:209 -msgid "Server private key (default: server.pem)\n" -msgstr "Server privat nyckel (standard: server.pem)\n" - -#: ../../../init.cpp:210 -msgid "Acceptable ciphers (default: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH)\n" -msgstr "Acceptabla krypteringar (standard: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH)\n" - -#: ../../../init.cpp:214 -msgid "This help message\n" -msgstr "Detta hjälpmeddelande\n" - -#: ../../../init.cpp:351 -#, c-format -msgid "Cannot obtain a lock on data directory %s. Bitcoin is probably already running." -msgstr "Kan inte sätta lås på data mappen %s. Bitcoin körs troligen redan." - -#: ../../../init.cpp:377 -msgid "Error loading addr.dat \n" -msgstr "Fel vid laddning av addr.dat \n" - -#: ../../../init.cpp:383 -msgid "Error loading blkindex.dat \n" -msgstr "Fel vid laddning av blkindex.dat \n" - -#: ../../../init.cpp:391 -msgid "Error loading wallet.dat \n" -msgstr "Fel vid laddning av wallet.dat \n" - -#: ../../../init.cpp:481 -msgid "Invalid -proxy address" -msgstr "Ogiltig -proxy adress" - -#: ../../../init.cpp:506 -msgid "Invalid amount for -paytxfee=<amount>" -msgstr "Ogiltig belopp på -paytxfee=<belopp>" - -#: ../../../init.cpp:510 -msgid "Warning: -paytxfee is set very high. This is the transaction fee you will pay if you send a transaction." -msgstr "Varning: -paytxfee är satt väldigt högt. Denna är transaktionsavgiften som du kommer att betala om du skickar en transaktion." - -#: ../../../main.cpp:1430 -msgid "Warning: Disk space is low " -msgstr "Varning: Diskutrymme är låg " - -#: ../../../net.cpp:1598 -#, c-format -msgid "Unable to bind to port %d on this computer. Bitcoin is probably already running." -msgstr "Det gick inte att binda till port %d på denna dator. Bitcoin körs troligen redan." - -#: ../../../rpc.cpp:1828 -#: ../../../rpc.cpp:1830 -#, c-format -msgid "To use the %s option" -msgstr "För att använda %s val" - -#: ../../../rpc.cpp:1832 -#, c-format -msgid "" -"Warning: %s, you must set rpcpassword=<password>\n" -"in the configuration file: %s\n" -"If the file does not exist, create it with owner-readable-only file permissions.\n" -msgstr "" -"Varning: %s, du måste sätta rpcpassword=<lösenord>\n" -"i konfigurationsfilen: %s\n" -"Om filen inte existerar, skapa med ägare med filbehörigheten -readable-only.\n" - -#: ../../../rpc.cpp:2005 -#, c-format -msgid "" -"You must set rpcpassword=<password> in the configuration file:\n" -"%s\n" -"If the file does not exist, create it with owner-readable-only file permissions." -msgstr "" -"Du måste sätta rpcpassword=<lösenord> i konfigurationsfilen:\n" -"%s\n" -"Om filen inte existerar, skapa med ägare med filbehörighete -readable-only." - -#: ../../../ui.cpp:216 -#, c-format -msgid "This transaction is over the size limit. You can still send it for a fee of %s, which goes to the nodes that process your transaction and helps to support the network. Do you want to pay the fee?" -msgstr "Denna transaktion är över storleksbegränsningen. Du kan fortfarande skicka mot en avgift på %s, som går till noderna som bearbetar din transaktion och hjälper att stödja nätverket. Vill du fortfarande betala avgiften?" - -#: ../../../ui.cpp:316 -msgid "Status" -msgstr "Status" - -#: ../../../ui.cpp:317 -msgid "Date" -msgstr "Datum" - -#: ../../../ui.cpp:318 -msgid "Description" -msgstr "Beskrivning" - -#: ../../../ui.cpp:319 -msgid "Debit" -msgstr "Debet" - -#: ../../../ui.cpp:320 -msgid "Credit" -msgstr "Kredit" - -#: ../../../ui.cpp:526 -#, c-format -msgid "Open for %d blocks" -msgstr "Öppen för %d block" - -#: ../../../ui.cpp:528 -#, c-format -msgid "Open until %s" -msgstr "Öppen tills %s" - -#: ../../../ui.cpp:534 -#, c-format -msgid "%d/offline?" -msgstr "%d/offline?" - -#: ../../../ui.cpp:536 -#, c-format -msgid "%d/unconfirmed" -msgstr "%d/obekräftade" - -#: ../../../ui.cpp:538 -#, c-format -msgid "%d confirmations" -msgstr "%d bekräftelser" - -#: ../../../ui.cpp:623 -msgid "Generated" -msgstr "Genererad" - -#: ../../../ui.cpp:631 -#, c-format -msgid "Generated (%s matures in %d more blocks)" -msgstr "Genererad (%s mognar om %d block)" - -#: ../../../ui.cpp:635 -msgid "Generated - Warning: This block was not received by any other nodes and will probably not be accepted!" -msgstr "Genererad - Varning: Denna block har inte blivit mottagen av någon annan nod och kommer troligtvis inte bli accepterad" - -#: ../../../ui.cpp:639 -msgid "Generated (not accepted)" -msgstr "Genererad (ej accepterad)" - -#: ../../../ui.cpp:649 -msgid "From: " -msgstr "Från: " - -#: ../../../ui.cpp:673 -msgid "Received with: " -msgstr "Mottagen med: " - -#: ../../../ui.cpp:719 -msgid "Payment to yourself" -msgstr "Betalning till dig själv" - -#: ../../../ui.cpp:753 -msgid "To: " -msgstr "Till: " - -#: ../../../ui.cpp:1068 -msgid " Generating" -msgstr " Generering" - -#: ../../../ui.cpp:1070 -msgid "(not connected)" -msgstr "(inte ansluten)" - -#: ../../../ui.cpp:1073 -#, c-format -msgid " %d connections %d blocks %d transactions" -msgstr " %d anslutningar %d block %d transaktioner" - -#: ../../../ui.cpp:1178 -#: ../../../ui.cpp:2577 -msgid "New Receiving Address" -msgstr "Ny Mottagningsadress" - -#: ../../../ui.cpp:1179 -#: ../../../ui.cpp:2578 -msgid "" -"You should use a new address for each payment you receive.\n" -"\n" -"Label" -msgstr "" -"Du borde använda en ny adress för varje betalning som du mottagit.\n" -"\n" -"Etikett" - -#: ../../../ui.cpp:1252 -msgid "<b>Status:</b> " -msgstr "<b>Status:</b> " - -#: ../../../ui.cpp:1257 -msgid ", has not been successfully broadcast yet" -msgstr ", har inte lyckats broadcast än" - -#: ../../../ui.cpp:1259 -#, c-format -msgid ", broadcast through %d node" -msgstr ", broadcast genom %d nod" - -#: ../../../ui.cpp:1261 -#, c-format -msgid ", broadcast through %d nodes" -msgstr ", broadcast genom %d noder" - -#: ../../../ui.cpp:1265 -msgid "<b>Date:</b> " -msgstr "<b>Datum:</b> " - -#: ../../../ui.cpp:1273 -msgid "<b>Source:</b> Generated<br>" -msgstr "<b>Källa:</b> Genererad<br>" - -#: ../../../ui.cpp:1279 -#: ../../../ui.cpp:1297 -msgid "<b>From:</b> " -msgstr "<b>Från:</b> " - -#: ../../../ui.cpp:1297 -msgid "unknown" -msgstr "okänd" - -#: ../../../ui.cpp:1298 -#: ../../../ui.cpp:1322 -#: ../../../ui.cpp:1381 -msgid "<b>To:</b> " -msgstr "<b>Till:</b> " - -#: ../../../ui.cpp:1301 -msgid " (yours, label: " -msgstr " (din, etikett: " - -#: ../../../ui.cpp:1303 -msgid " (yours)" -msgstr " (ditt)" - -#: ../../../ui.cpp:1340 -#: ../../../ui.cpp:1352 -#: ../../../ui.cpp:1398 -#: ../../../ui.cpp:1415 -msgid "<b>Credit:</b> " -msgstr "<b>Kredit:</b> " - -#: ../../../ui.cpp:1342 -#, c-format -msgid "(%s matures in %d more blocks)" -msgstr "(%s mognar om %d block)" - -#: ../../../ui.cpp:1344 -msgid "(not accepted)" -msgstr "(ej accepterad)" - -#: ../../../ui.cpp:1389 -#: ../../../ui.cpp:1397 -#: ../../../ui.cpp:1412 -msgid "<b>Debit:</b> " -msgstr "<b>Debet:</b> " - -#: ../../../ui.cpp:1403 -msgid "<b>Transaction fee:</b> " -msgstr "<b>Transaktionsavgift:</b> " - -#: ../../../ui.cpp:1419 -msgid "<b>Net amount:</b> " -msgstr "<b>Nät belopp:</b> " - -#: ../../../ui.cpp:1426 -msgid "Message:" -msgstr "Meddelande:" - -#: ../../../ui.cpp:1428 -msgid "Comment:" -msgstr "Kommentar:" - -#: ../../../ui.cpp:1431 -msgid "Generated coins must wait 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, it will change to \"not accepted\" and not be spendable. This may occasionally happen if another node generates a block within a few seconds of yours." -msgstr "Genererad mynt måste vänta 120 block innan dem kan användas.När du genererat denna block, skickades en broadcast till nätet och lades till block kedjan. Om den misslyckas att lägga till kedjan så kommer det ändras till \"not accepted\" och är icke brukbar. Detta kan hända om en annan nod genererat en block några sekunder efter din." - -#: ../../../ui.cpp:1611 -msgid "Cannot write autostart/bitcoin.desktop file" -msgstr "Kan inte skriva autostart/bitcoin.desktop fil" - -#: ../../../ui.cpp:1647 -msgid "Main" -msgstr "Allmänt" - -#: ../../../ui.cpp:1657 -msgid "&Start Bitcoin on window system startup" -msgstr "&Starta Bitcoin vid system uppstart" - -#: ../../../ui.cpp:1664 -msgid "&Minimize on close" -msgstr "&Minimera vid stängning" - -#: ../../../ui.cpp:1806 -#, c-format -msgid "version %s" -msgstr "version %s" - -#: ../../../ui.cpp:1929 -msgid "Error in amount " -msgstr "Fel i belopp " - -#: ../../../ui.cpp:1929 -#: ../../../ui.cpp:1934 -#: ../../../ui.cpp:1939 -#: ../../../ui.cpp:1974 -#: ../../../uibase.cpp:55 -msgid "Send Coins" -msgstr "Skicka mynt" - -#: ../../../ui.cpp:1934 -msgid "Amount exceeds your balance " -msgstr "Belopp överskrider din balans " - -#: ../../../ui.cpp:1939 -msgid "Total exceeds your balance when the " -msgstr "Totalt överskrider din balans när " - -#: ../../../ui.cpp:1939 -msgid " transaction fee is included " -msgstr " transaktionsavgift är inkluderad " - -#: ../../../ui.cpp:1957 -msgid "Payment sent " -msgstr "Betalning skickad " - -#: ../../../ui.cpp:1957 -#: ../../../ui.cpp:1962 -#: ../../../ui.cpp:2108 -#: ../../../ui.cpp:2261 -#: ../../../wallet.cpp:924 -msgid "Sending..." -msgstr "Skickar..." - -#: ../../../ui.cpp:1974 -msgid "Invalid address " -msgstr "Ogiltig adress " - -#: ../../../ui.cpp:2029 -#, c-format -msgid "Sending %s to %s" -msgstr "Skickar %s till %s" - -#: ../../../ui.cpp:2102 -#: ../../../ui.cpp:2135 -msgid "CANCELLED" -msgstr "AVBRUTEN" - -#: ../../../ui.cpp:2106 -msgid "Cancelled" -msgstr "Avbruten" - -#: ../../../ui.cpp:2108 -msgid "Transfer cancelled " -msgstr "Överföring avbruten " - -#: ../../../ui.cpp:2161 -msgid "Error: " -msgstr "Fel: " - -#: ../../../ui.cpp:2175 -#: ../../../ui.cpp:2246 -#: ../../../wallet.cpp:943 -msgid "Insufficient funds" -msgstr "Otillräckligt med pengar" - -#: ../../../ui.cpp:2180 -msgid "Connecting..." -msgstr "Ansluter..." - -#: ../../../ui.cpp:2185 -msgid "Unable to connect" -msgstr "Det gick inte att ansluta" - -#: ../../../ui.cpp:2190 -msgid "Requesting public key..." -msgstr "Efterfrågar publik nyckel..." - -#: ../../../ui.cpp:2202 -msgid "Received public key..." -msgstr "Mottagen publik nyckel..." - -#: ../../../ui.cpp:2216 -msgid "Recipient is not accepting transactions sent by IP address" -msgstr "Mottagaren accepterar inte transaktioner skickat från IP adress" - -#: ../../../ui.cpp:2218 -msgid "Transfer was not accepted" -msgstr "Överföringen var inte accepterad" - -#: ../../../ui.cpp:2227 -msgid "Invalid response received" -msgstr "Ogiltig respons mottagen" - -#: ../../../ui.cpp:2242 -msgid "Creating transaction..." -msgstr "Skapar transation..." - -#: ../../../ui.cpp:2254 -#, c-format -msgid "This transaction requires a transaction fee of at least %s because of its amount, complexity, or use of recently received funds" -msgstr "Denna transaktion kräver en transaktionsavgift minst %s för dess belopp, komplexitet, eller användning av nyligen mottagna pengar" - -#: ../../../ui.cpp:2256 -msgid "Transaction creation failed" -msgstr "Misslyckades skapa transaktion" - -#: ../../../ui.cpp:2263 -msgid "Transaction aborted" -msgstr "Transaktion avbruten" - -#: ../../../ui.cpp:2271 -msgid "Lost connection, transaction cancelled" -msgstr "Förlorad anslutning, transaktionen avbruten" - -#: ../../../ui.cpp:2287 -msgid "Sending payment..." -msgstr "Skickar betalning..." - -#: ../../../ui.cpp:2293 -msgid "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." -msgstr "Transaktionen blev nekad. Detta kan hända om några av dina mynt i din plånbok var redan spenderad. Till exempel om du använde en kopia av wallet.dat och mynten var redan spenderad i kopian, men som inte var markerad som spenderad här." - -#: ../../../ui.cpp:2302 -msgid "Waiting for confirmation..." -msgstr "Väntar på bekräftelse..." - -#: ../../../ui.cpp:2320 -msgid "" -"The payment was sent, but the recipient was unable to verify it.\n" -"The transaction is recorded and will credit to the recipient,\n" -"but the comment information will be blank." -msgstr "" -"Betalning var skickat, men mottagaren kunde inte verifiera det.\n" -"Transaktionen är registrerad och kommer att kreditera mottagaren,\n" -"men kommentar informationen kommer att vara tom." - -#: ../../../ui.cpp:2329 -msgid "Payment was sent, but an invalid response was received" -msgstr "Betalning var skickad, men en ogiltig respons var mottagen" - -#: ../../../ui.cpp:2335 -msgid "Payment completed" -msgstr "Betalning slutförd" - -#: ../../../ui.cpp:2377 -#: ../../../ui.cpp:2525 -#: ../../../ui.cpp:2565 -msgid "Name" -msgstr "Namn" - -#: ../../../ui.cpp:2378 -#: ../../../ui.cpp:2525 -#: ../../../ui.cpp:2565 -msgid "Address" -msgstr "Adress" - -#: ../../../ui.cpp:2380 -#: ../../../ui.cpp:2537 -msgid "Label" -msgstr "Etikett" - -#: ../../../ui.cpp:2381 -#: ../../../uibase.cpp:837 -msgid "Bitcoin Address" -msgstr "Bitcoin Adress" - -#: ../../../ui.cpp:2507 -msgid "This is one of your own addresses for receiving payments and cannot be entered in the address book. " -msgstr "Denna är en av dina egna adresser för mottagning av betalningar och kan inte slås in i adressboken. " - -#: ../../../ui.cpp:2525 -#: ../../../ui.cpp:2531 -msgid "Edit Address" -msgstr "Ändra Adress" - -#: ../../../ui.cpp:2537 -msgid "Edit Address Label" -msgstr "Ändra Address Etikett" - -#: ../../../ui.cpp:2565 -#: ../../../ui.cpp:2571 -msgid "Add Address" -msgstr "Lägg till Adress" - -#: ../../../ui.cpp:2649 -msgid "Bitcoin" -msgstr "Bitcoin" - -#: ../../../ui.cpp:2651 -msgid "Bitcoin - Generating" -msgstr "Bitcoin - Genererar" - -#: ../../../ui.cpp:2653 -msgid "Bitcoin - (not connected)" -msgstr "Bitcoin - (ej ansluten)" - -#: ../../../ui.cpp:2732 -msgid "&Open Bitcoin" -msgstr "&Öppna Bitcoin" - -#: ../../../ui.cpp:2733 -msgid "&Send Bitcoins" -msgstr "&Skicka Bitcoins" - -#: ../../../ui.cpp:2734 -msgid "O&ptions..." -msgstr "&Inställningar..." - -#: ../../../ui.cpp:2737 -#: ../../../uibase.cpp:25 -msgid "E&xit" -msgstr "&Avsluta" - -#: ../../../ui.cpp:2963 -msgid "Program has crashed and will terminate. " -msgstr "Programmet har krachat och kommer att avslutas. " - -#: ../../../uibase.cpp:28 -msgid "&File" -msgstr "&Fil" - -#: ../../../uibase.cpp:32 -msgid "&Your Receiving Addresses..." -msgstr "&Dina Mottagningsadresser..." - -#: ../../../uibase.cpp:36 -msgid "&Options..." -msgstr "&Inställningar..." - -#: ../../../uibase.cpp:39 -msgid "&Settings" -msgstr "&Inställningar" - -#: ../../../uibase.cpp:43 -msgid "&About..." -msgstr "&Om..." - -#: ../../../uibase.cpp:46 -msgid "&Help" -msgstr "&Hjälp" - -#: ../../../uibase.cpp:56 -msgid "Address Book" -msgstr "Adressbok" - -#: ../../../uibase.cpp:69 -msgid "Your Bitcoin Address:" -msgstr "Din Bitcoin Adress:" - -#: ../../../uibase.cpp:76 -msgid " &New... " -msgstr " &Nytt... " - -#: ../../../uibase.cpp:79 -#: ../../../uibase.cpp:780 -#: ../../../uibase.cpp:883 -msgid " &Copy to Clipboard " -msgstr " &Kopiera till Urklipp " - -#: ../../../uibase.cpp:93 -msgid "Balance:" -msgstr "Balans:" - -#: ../../../uibase.cpp:109 -msgid " All" -msgstr " Alla" - -#: ../../../uibase.cpp:109 -msgid " Sent" -msgstr " Skickat" - -#: ../../../uibase.cpp:109 -msgid " Received" -msgstr " Mottagen" - -#: ../../../uibase.cpp:109 -msgid " In Progress" -msgstr " Pågående" - -#: ../../../uibase.cpp:130 -msgid "All Transactions" -msgstr "Alla Transaktioner" - -#: ../../../uibase.cpp:141 -msgid "Sent/Received" -msgstr "Skickat/Mottagen" - -#: ../../../uibase.cpp:152 -msgid "Sent" -msgstr "Skickat" - -#: ../../../uibase.cpp:163 -msgid "Received" -msgstr "Mottagen" - -#: ../../../uibase.cpp:302 -#: ../../../uibase.cpp:443 -#: ../../../uibase.cpp:542 -#: ../../../uibase.cpp:722 -#: ../../../uibase.cpp:783 -#: ../../../uibase.cpp:892 -#: ../../../uibase.cpp:981 -msgid "OK" -msgstr "OK" - -#: ../../../uibase.cpp:345 -msgid "&Start Bitcoin on system startup" -msgstr "&Starta Bitcoin vid system uppstart" - -#: ../../../uibase.cpp:348 -msgid "&Minimize to the tray instead of the taskbar" -msgstr "&Minimerar till systemfältet istället för aktivitetsfält" - -#: ../../../uibase.cpp:351 -msgid "Map port using &UPnP" -msgstr "Mapp port använder &UPnP" - -#: ../../../uibase.cpp:354 -msgid "M&inimize to the tray on close" -msgstr "M&inimera till systemfältet vid stängning" - -#: ../../../uibase.cpp:360 -msgid "&Connect through socks4 proxy: " -msgstr "&Anslut via socks4 proxy: " - -#: ../../../uibase.cpp:371 -msgid "Proxy &IP:" -msgstr "Proxy &IP:" - -#: ../../../uibase.cpp:379 -msgid " &Port:" -msgstr " &Port:" - -#: ../../../uibase.cpp:392 -msgid "Optional transaction fee per KB that helps make sure your transactions are processed quickly. Most transactions are 1KB. Fee 0.01 recommended." -msgstr "Frivillig transaktionsavgift per KB som garanterar att din transaktion bearbetas snabbt. Flesta transaktioner är 1KB. Avgift 0.01 rekommenderas." - -#: ../../../uibase.cpp:399 -msgid "Pay transaction fee:" -msgstr "Betala transaktionsavgift:" - -#: ../../../uibase.cpp:420 -msgid "// [don't translate] Test panel 2 for future expansion" -msgstr "" - -#: ../../../uibase.cpp:424 -msgid "// [don't translate] Let's not start multiple pages until the first page is filled up" -msgstr "" - -#: ../../../uibase.cpp:446 -#: ../../../uibase.cpp:668 -#: ../../../uibase.cpp:727 -#: ../../../uibase.cpp:786 -#: ../../../uibase.cpp:895 -#: ../../../uibase.cpp:984 -msgid "Cancel" -msgstr "Avbryt" - -#: ../../../uibase.cpp:449 -msgid "&Apply" -msgstr "&Använd" - -#: ../../../uibase.cpp:508 -msgid "Bitcoin " -msgstr "Bitcoin " - -#: ../../../uibase.cpp:514 -msgid "version" -msgstr "version" - -#: ../../../uibase.cpp:525 -msgid "" -"Copyright (c) 2009-2011 Bitcoin Developers\n" -"\n" -"This is experimental software.\n" -"\n" -"Distributed under the MIT/X11 software license, see the accompanying file \n" -"license.txt or http://www.opensource.org/licenses/mit-license.php.\n" -"\n" -"This product includes software developed by the OpenSSL Project for use in the \n" -"OpenSSL Toolkit (http://www.openssl.org/) and cryptographic software written by \n" -"Eric Young (eay@cryptsoft.com) and UPnP software written by Thomas Bernard." -msgstr "" -"Copyright (c) 2009-2011 Bitcoin Developers\n" -"\n" -"Detta är en experimentell mjukvara.\n" -"\n" -"Distribuerad under MIT/X11 mjukvarulicens, se medföljande fil \n" -"license.txt eller http://www.opensource.org/licenses/mit-license.php.\n" -"\n" -"Denna produkt inkluderar mjukvara utvecklad av OpenSSL Project för användning i \n" -"OpenSSL Toolkit (http://www.openssl.org/) och kryptografisk mjukvara skriven av \n" -"Eric Young (eay@cryptsoft.com) och UPnP mjukvara skriven av Thomas Bernard.\n" -"\n" -"Översatt av Han Lin Yap." - -#: ../../../uibase.cpp:581 -msgid "Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)" -msgstr "Ange en Bitcoin adress (t.ex. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)" - -#: ../../../uibase.cpp:595 -msgid "Pay &To:" -msgstr "Betala &Till:" - -#: ../../../uibase.cpp:610 -msgid "&Paste" -msgstr "&Klistra in" - -#: ../../../uibase.cpp:613 -msgid " Address &Book..." -msgstr " Adress&bok..." - -#: ../../../uibase.cpp:620 -msgid "&Amount:" -msgstr "&Belopp:" - -#: ../../../uibase.cpp:630 -msgid "T&ransfer:" -msgstr "&Överföring:" - -#: ../../../uibase.cpp:636 -msgid " Standard" -msgstr " Standard" - -#: ../../../uibase.cpp:663 -msgid "&Send" -msgstr "&Skicka" - -#: ../../../uibase.cpp:711 -msgid "" -"\n" -"\n" -"Connecting..." -msgstr "" -"\n" -"\n" -"Ansluter..." - -#: ../../../uibase.cpp:761 -msgid "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. The highlighted address is displayed in the main window." -msgstr "Dessa är dina Bitcoin adresser för mottagning av betalningar. Du rekommenderas att ge olika till varje avsändare så du kan ha koll på vem som betalar dig. Den markerade adressen visas i huvudfönstret." - -#: ../../../uibase.cpp:774 -#: ../../../uibase.cpp:886 -msgid "&Edit..." -msgstr "&Redigera..." - -#: ../../../uibase.cpp:777 -#: ../../../uibase.cpp:889 -msgid " &New Address... " -msgstr " &Ny Adress... " - -#: ../../../uibase.cpp:849 -msgid "Sending" -msgstr "Skickar" - -#: ../../../uibase.cpp:857 -msgid "These are your Bitcoin addresses for receiving payments. You can give a different one to each sender to keep track of who is paying you. The highlighted address will be displayed in the main window." -msgstr "Dessa är dina Bitcoin adresser för mottagning av betalningar. Du kan ge olika till varje avsändare så du kan ha koll på vem som betalar dig. Den markerade adressen visas i huvudfönstret." - -#: ../../../uibase.cpp:870 -msgid "Receiving" -msgstr "Mottagning" - -#: ../../../uibase.cpp:880 -msgid "&Delete" -msgstr "&Ta bort" - -#: ../../../util.cpp:874 -msgid "Warning: Please check that your computer's date and time are correct. If your clock is wrong Bitcoin will not work properly." -msgstr "Varning: Var god och kolla att din dator har rätt datum och klockslag. Om din klocka är fel så kommer Bitcoin inte att fungera ordentligt." - -#: ../../../util.cpp:908 -msgid "beta" -msgstr "beta" - -#: ../../../wallet.cpp:917 -#, c-format -msgid "Error: This transaction requires a transaction fee of at least %s because of its amount, complexity, or use of recently received funds " -msgstr "Fel: Denna transaktion kräver en transaktionsavgift minst %s för dess belopp, komplexitet, eller användning av nyligen mottagna pengar " - -#: ../../../wallet.cpp:919 -msgid "Error: Transaction creation failed " -msgstr "Fel: Misslyckades att skapa transaktion " - -#: ../../../wallet.cpp:928 -msgid "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." -msgstr "Fel: Transaktionen blev nekad. Detta kan hända om några av dina mynt i din plånbok var redan spenderad. Till exempel om du använde en kopia av wallet.dat och mynten var redan spenderad i kopian, men som inte var markerad som spenderad här." - -#: ../../../wallet.cpp:941 -msgid "Invalid amount" -msgstr "Ogiltig belopp" - -#: ../../../wallet.cpp:948 -msgid "Invalid bitcoin address" -msgstr "Ogiltig bitcoin adress" - -#: ../../../uibase.h:147 -msgid "Transaction Details" -msgstr "Transaktion detaljer" - -#: ../../../uibase.h:199 -msgid "Options" -msgstr "Inställningar" - -#: ../../../uibase.h:228 -msgid "About Bitcoin" -msgstr "Om Bitcoin" - -#: ../../../uibase.h:337 -msgid "Your Bitcoin Addresses" -msgstr "Dina Bitcoin Adresser" - diff --git a/locale/zh_cn/LC_MESSAGES/bitcoin.mo b/locale/zh_cn/LC_MESSAGES/bitcoin.mo Binary files differdeleted file mode 100644 index 87538f01df..0000000000 --- a/locale/zh_cn/LC_MESSAGES/bitcoin.mo +++ /dev/null diff --git a/locale/zh_cn/LC_MESSAGES/bitcoin.po b/locale/zh_cn/LC_MESSAGES/bitcoin.po deleted file mode 100644 index f53367e34c..0000000000 --- a/locale/zh_cn/LC_MESSAGES/bitcoin.po +++ /dev/null @@ -1,1076 +0,0 @@ -msgid "" -msgstr "" -"Project-Id-Version: \n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-09-06 21:58+0100\n" -"PO-Revision-Date: 2011-09-17 19:08+0800\n" -"Last-Translator: Dean Lee <xslidian@gmail.com>\n" -"Language-Team: \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"X-Poedit-KeywordsList: _;gettext;gettext_noop\n" -"X-Poedit-Basepath: .\n" -"Plural-Forms: nplurals=1; plural=0;\n" -"X-Language: zh_CN\n" -"X-Source-Language: C\n" -"X-Poedit-Bookmarks: 77,-1,-1,-1,-1,-1,-1,-1,-1,-1\n" -"X-Poedit-SearchPath-0: ../../..\n" - -#: ../../../src/init.cpp:163 -msgid "Bitcoin version" -msgstr "Bitcoin 版本" - -#: ../../../src/init.cpp:164 -msgid "Usage:" -msgstr "用法:" - -#: ../../../src/init.cpp:166 -msgid "Send command to -server or bitcoind\n" -msgstr "发送命令给 -server 或 bitcoin\n" - -#: ../../../src/init.cpp:167 -msgid "List commands\n" -msgstr "列出命令\n" - -#: ../../../src/init.cpp:168 -msgid "Get help for a command\n" -msgstr "获取命令的帮助\n" - -#: ../../../src/init.cpp:169 -msgid "Options:\n" -msgstr "选项:\n" - -#: ../../../src/init.cpp:170 -msgid "Specify configuration file (default: bitcoin.conf)\n" -msgstr "指定配置文件 (默认: bitcoin.conf)\n" - -#: ../../../src/init.cpp:171 -msgid "Specify pid file (default: bitcoind.pid)\n" -msgstr "指定 pid 文件 (默认: bitcoin.pid)\n" - -#: ../../../src/init.cpp:172 -msgid "Generate coins\n" -msgstr "生成货币\n" - -#: ../../../src/init.cpp:173 -msgid "Don't generate coins\n" -msgstr "不要生成货币\n" - -#: ../../../src/init.cpp:174 -msgid "Start minimized\n" -msgstr "启动时最小化\n" - -#: ../../../src/init.cpp:175 -msgid "Specify data directory\n" -msgstr "指定数据目录\n" - -#: ../../../src/init.cpp:176 -msgid "Specify connection timeout (in milliseconds)\n" -msgstr "指定连接超时时间 (毫秒)\n" - -#: ../../../src/init.cpp:177 -msgid "Connect through socks4 proxy\n" -msgstr "通过 socks4 代理连接\n" - -#: ../../../src/init.cpp:178 -msgid "Allow DNS lookups for addnode and connect\n" -msgstr "允许 DNS 查找新增结点和连接\n" - -#: ../../../src/init.cpp:179 -msgid "Add a node to connect to\n" -msgstr "添加一个连接结点\n" - -#: ../../../src/init.cpp:180 -msgid "Connect only to the specified node\n" -msgstr "只连接特定结点\n" - -#: ../../../src/init.cpp:181 -msgid "Don't accept connections from outside\n" -msgstr "不要接受外部传来的连接\n" - -#: ../../../src/init.cpp:184 -msgid "Don't attempt to use UPnP to map the listening port\n" -msgstr "不要尝试使用 UPnP 映射监听端口\n" - -#: ../../../src/init.cpp:186 -msgid "Attempt to use UPnP to map the listening port\n" -msgstr "尝试使用 UPnP 映射监听端口\n" - -#: ../../../src/init.cpp:189 -msgid "Fee per KB to add to transactions you send\n" -msgstr "您为每 KB 支付所增加的交易佣金\n" - -#: ../../../src/init.cpp:191 -msgid "Accept command line and JSON-RPC commands\n" -msgstr "允许命令行和 JSON-RPC 控制\n" - -#: ../../../src/init.cpp:194 -msgid "Run in the background as a daemon and accept commands\n" -msgstr "在后台运行并接收命令\n" - -#: ../../../src/init.cpp:196 -msgid "Use the test network\n" -msgstr "使用测试网络\n" - -#: ../../../src/init.cpp:197 -msgid "Username for JSON-RPC connections\n" -msgstr "JSON-RPC 连接的用户名\n" - -#: ../../../src/init.cpp:198 -msgid "Password for JSON-RPC connections\n" -msgstr "JSON-RPC 连接的密码\n" - -#: ../../../src/init.cpp:199 -msgid "Listen for JSON-RPC connections on <port> (default: 8332)\n" -msgstr "在端口 <port> 监听 JSON-RPC 连接 (默认: 8332)\n" - -#: ../../../src/init.cpp:200 -msgid "Allow JSON-RPC connections from specified IP address\n" -msgstr "允许来自特定 IP 地址的 JSON-RPC 连接\n" - -#: ../../../src/init.cpp:201 -msgid "Send commands to node running on <ip> (default: 127.0.0.1)\n" -msgstr "发送命令给运行的结点，IP 地址 <ip> (默认: 127.0.0.1)\n" - -#: ../../../src/init.cpp:202 -msgid "Set key pool size to <n> (default: 100)\n" -msgstr "设置密钥池大小为 <n> (默认: 100)\n" - -#: ../../../src/init.cpp:203 -msgid "Rescan the block chain for missing wallet transactions\n" -msgstr "重新扫描货币包链来检测丢失的钱包交易\n" - -#: ../../../src/init.cpp:207 -msgid "" -"\n" -"SSL options: (see the Bitcoin Wiki for SSL setup instructions)\n" -msgstr "" -"\n" -"SSL 选项: (SSL 设置步骤请参见 Bitcoin Wiki)\n" - -#: ../../../src/init.cpp:208 -msgid "Use OpenSSL (https) for JSON-RPC connections\n" -msgstr "使用 OpenSSL (https) 进行 JSON-RPC 连接\n" - -#: ../../../src/init.cpp:209 -msgid "Server certificate file (default: server.cert)\n" -msgstr "服务器证书 (默认: server.cert)\n" - -#: ../../../src/init.cpp:210 -msgid "Server private key (default: server.pem)\n" -msgstr "服务器私有密钥 (默认: server.pem)\n" - -#: ../../../src/init.cpp:211 -msgid "Acceptable ciphers (default: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH)\n" -msgstr "许可密码 (默认: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH)\n" - -#: ../../../src/init.cpp:215 -msgid "This help message\n" -msgstr "本帮助信息\n" - -#: ../../../src/init.cpp:353 -#, c-format -msgid "Cannot obtain a lock on data directory %s. Bitcoin is probably already running." -msgstr "无法获取数据目录 %s 的锁。 Bitcoin 可能已经启动。" - -#: ../../../src/init.cpp:379 -msgid "Error loading addr.dat \n" -msgstr "加载 addr.dat 出错 \n" - -#: ../../../src/init.cpp:385 -msgid "Error loading blkindex.dat \n" -msgstr "加载 blkindex.dat 出错 \n" - -#: ../../../src/init.cpp:396 -msgid "Error loading wallet.dat: Wallet corrupted \n" -msgstr "加载 wallet.dat 出错: 钱包已损坏 \n" - -#: ../../../src/init.cpp:398 -msgid "Error loading wallet.dat: Wallet requires newer version of Bitcoin \n" -msgstr "加载 wallet.dat 出错: 钱包要求更高版本的 Bitcoin \n" - -#: ../../../src/init.cpp:400 -msgid "Error loading wallet.dat \n" -msgstr "加载 wallet.dat 出错 \n" - -#: ../../../src/init.cpp:489 -msgid "Invalid -proxy address" -msgstr "无效 -proxy 地址" - -#: ../../../src/init.cpp:514 -msgid "Invalid amount for -paytxfee=<amount>" -msgstr "无效的金额 -paytxfee=<amount>" - -#: ../../../src/init.cpp:518 -msgid "Warning: -paytxfee is set very high. This is the transaction fee you will pay if you send a transaction." -msgstr "警告: -paytxfee 设置得过高。 这个参数是您发送一笔交易要支付的佣金。" - -#: ../../../src/main.cpp:1398 -msgid "Warning: Disk space is low " -msgstr "警告: 磁盘空间不足" - -#: ../../../src/net.cpp:1610 -#, c-format -msgid "Unable to bind to port %d on this computer. Bitcoin is probably already running." -msgstr "无法在这台电脑上绑定 %d 端口。 Bitcoin 可能已经在运行。" - -#: ../../../src/rpc.cpp:2005 -#: ../../../src/rpc.cpp:2007 -#, c-format -msgid "To use the %s option" -msgstr "使用 %s 选项" - -#: ../../../src/rpc.cpp:2009 -#, c-format -msgid "" -"Warning: %s, you must set rpcpassword=<password>\n" -"in the configuration file: %s\n" -"If the file does not exist, create it with owner-readable-only file permissions.\n" -msgstr "" -"警告: %s，您必须在配置文件中设置 rpcpassword=<password>\n" -"配置文件为: %s\n" -"如果文件不存在，请创建文件并只给创建者提供只读访问权限。\n" - -#: ../../../src/rpc.cpp:2185 -#, c-format -msgid "" -"You must set rpcpassword=<password> in the configuration file:\n" -"%s\n" -"If the file does not exist, create it with owner-readable-only file permissions." -msgstr "" -"您必须在配置文件中设置 rpcpassword=<password> :\n" -"%s\n" -"如果文件不存在，请创建文件并只给创建者提供只读访问权限。" - -#: ../../../src/ui.cpp:217 -#, c-format -msgid "This transaction is over the size limit. You can still send it for a fee of %s, which goes to the nodes that process your transaction and helps to support the network. Do you want to pay the fee?" -msgstr "这笔交易超过了大小限制。 您依然可以通过支付 %s 的佣金来进行，佣金用来支付为您的交易计算的结点来帮助支撑网络。 您是否要支付佣金?" - -#: ../../../src/ui.cpp:261 -#: ../../../src/ui.cpp:1247 -msgid "Enter the current passphrase to the wallet." -msgstr "输入钱包当前的口令。" - -#: ../../../src/ui.cpp:262 -#: ../../../src/ui.cpp:1183 -#: ../../../src/ui.cpp:1200 -#: ../../../src/ui.cpp:1248 -#: ../../../src/ui.cpp:1272 -#: ../../../src/ui.cpp:1292 -msgid "Passphrase" -msgstr "口令" - -#: ../../../src/ui.cpp:268 -msgid "Please supply the current wallet decryption passphrase." -msgstr "请输入钱包当前的解密口令。" - -#: ../../../src/ui.cpp:276 -#: ../../../src/ui.cpp:1257 -#: ../../../src/ui.cpp:1314 -msgid "The passphrase entered for the wallet decryption was incorrect." -msgstr "钱包解密口令不正确。" - -#: ../../../src/ui.cpp:353 -msgid "Status" -msgstr "状态" - -#: ../../../src/ui.cpp:354 -msgid "Date" -msgstr "日期" - -#: ../../../src/ui.cpp:355 -msgid "Description" -msgstr "描述" - -#: ../../../src/ui.cpp:356 -msgid "Debit" -msgstr "付款人" - -#: ../../../src/ui.cpp:357 -msgid "Credit" -msgstr "信用" - -#: ../../../src/ui.cpp:568 -#, c-format -msgid "Open for %d blocks" -msgstr "%d 个货币包开放" - -#: ../../../src/ui.cpp:570 -#, c-format -msgid "Open until %s" -msgstr "开放直到 %s" - -#: ../../../src/ui.cpp:576 -#, c-format -msgid "%d/offline?" -msgstr "%d/离线?" - -#: ../../../src/ui.cpp:578 -#, c-format -msgid "%d/unconfirmed" -msgstr "%d/未确认" - -#: ../../../src/ui.cpp:580 -#, c-format -msgid "%d confirmations" -msgstr "%d 确认" - -#: ../../../src/ui.cpp:665 -msgid "Generated" -msgstr "已生成" - -#: ../../../src/ui.cpp:673 -#, c-format -msgid "Generated (%s matures in %d more blocks)" -msgstr "已生成 (%s 成熟 %d 新增货币包)" - -#: ../../../src/ui.cpp:677 -msgid "Generated - Warning: This block was not received by any other nodes and will probably not be accepted!" -msgstr "已生成 - 警告: 这个货币包没有被任何其他结点收到，因此很可能不会被接受!" - -#: ../../../src/ui.cpp:681 -msgid "Generated (not accepted)" -msgstr "已生成 (未被接受)" - -#: ../../../src/ui.cpp:691 -msgid "From: " -msgstr "来自: " - -#: ../../../src/ui.cpp:715 -msgid "Received with: " -msgstr "伴随接收: " - -#: ../../../src/ui.cpp:760 -msgid "Payment to yourself" -msgstr "支付给您自己" - -#: ../../../src/ui.cpp:794 -msgid "To: " -msgstr "到: " - -#: ../../../src/ui.cpp:1109 -msgid " Generating" -msgstr " 生成中" - -#: ../../../src/ui.cpp:1111 -msgid "(not connected)" -msgstr "(未连接)" - -#: ../../../src/ui.cpp:1114 -#, c-format -msgid " %d connections %d blocks %d transactions" -msgstr " %d 个连接 %d 个货币包 %d 个交易 " - -#: ../../../src/ui.cpp:1171 -msgid "Wallet already encrypted." -msgstr "钱包已加密。" - -#: ../../../src/ui.cpp:1182 -msgid "" -"Enter the new passphrase to the wallet.\n" -"Please use a passphrase of 10 or more random characters, or eight or more words." -msgstr "" -"输入钱包的新口令。\n" -"请使用 10 个或更多字符，或 8 个或更多单词的口令。" - -#: ../../../src/ui.cpp:1189 -#: ../../../src/ui.cpp:1280 -msgid "Error: The supplied passphrase was too short." -msgstr "错误: 所输口令太短。" - -#: ../../../src/ui.cpp:1193 -msgid "" -"WARNING: If you encrypt your wallet and lose your passphrase, you will LOSE ALL OF YOUR BITCOINS!\n" -"Are you sure you wish to encrypt your wallet?" -msgstr "" -"警告: 如果您加密钱包又丢失口令，将失去全部 BITCOINS!\n" -"是否确实想加密钱包?" - -#: ../../../src/ui.cpp:1199 -msgid "Please re-enter your new wallet passphrase." -msgstr "请重新输入新的钱包口令。" - -#: ../../../src/ui.cpp:1208 -#: ../../../src/ui.cpp:1302 -msgid "Error: the supplied passphrases didn't match." -msgstr "错误: 所输口令不匹配。" - -#: ../../../src/ui.cpp:1218 -msgid "Wallet encryption failed." -msgstr "钱包加密失败。" - -#: ../../../src/ui.cpp:1225 -msgid "" -"Wallet Encrypted.\n" -"Remember that encrypting your wallet cannot fully protect your bitcoins from being stolen by malware infecting your computer." -msgstr "" -"钱包已加密。\n" -"请记住，加密钱包无法完全保护您的 bitcoins 不被计算机感染的恶意软件窃取。" - -#: ../../../src/ui.cpp:1236 -msgid "Wallet is unencrypted, please encrypt it first." -msgstr "钱包未加密，请先加密。" - -#: ../../../src/ui.cpp:1271 -msgid "Enter the new passphrase for the wallet." -msgstr "输入钱包的新口令。" - -#: ../../../src/ui.cpp:1291 -msgid "Re-enter the new passphrase for the wallet." -msgstr "重新输入钱包的新口令。" - -#: ../../../src/ui.cpp:1323 -msgid "Wallet Passphrase Changed." -msgstr "钱包口令已更改。" - -#: ../../../src/ui.cpp:1379 -#: ../../../src/ui.cpp:2825 -msgid "New Receiving Address" -msgstr "新建接收地址" - -#: ../../../src/ui.cpp:1380 -#: ../../../src/ui.cpp:2826 -msgid "" -"You should use a new address for each payment you receive.\n" -"\n" -"Label" -msgstr "" -"您应该为您收到的每次付款使用不同的地址。\n" -"\n" -"标签" - -#: ../../../src/ui.cpp:1464 -msgid "<b>Status:</b> " -msgstr "<b>状态:</b> " - -#: ../../../src/ui.cpp:1469 -msgid ", has not been successfully broadcast yet" -msgstr "，尚未被成功广播" - -#: ../../../src/ui.cpp:1471 -#, c-format -msgid ", broadcast through %d node" -msgstr "，通过 %d 个结点广播" - -#: ../../../src/ui.cpp:1473 -#, c-format -msgid ", broadcast through %d nodes" -msgstr "，通过 %d 个结点广播" - -#: ../../../src/ui.cpp:1477 -msgid "<b>Date:</b> " -msgstr "<b>日期:</b>" - -#: ../../../src/ui.cpp:1485 -msgid "<b>Source:</b> Generated<br>" -msgstr "<b>来源:</b> 生成<br>" - -#: ../../../src/ui.cpp:1491 -#: ../../../src/ui.cpp:1508 -msgid "<b>From:</b> " -msgstr "<b>从:</b> " - -#: ../../../src/ui.cpp:1508 -msgid "unknown" -msgstr "未知" - -#: ../../../src/ui.cpp:1509 -#: ../../../src/ui.cpp:1533 -#: ../../../src/ui.cpp:1592 -msgid "<b>To:</b> " -msgstr "<b>到:</b> " - -#: ../../../src/ui.cpp:1512 -msgid " (yours, label: " -msgstr " (您的标签: " - -#: ../../../src/ui.cpp:1514 -msgid " (yours)" -msgstr " (您的)" - -#: ../../../src/ui.cpp:1551 -#: ../../../src/ui.cpp:1563 -#: ../../../src/ui.cpp:1609 -#: ../../../src/ui.cpp:1626 -msgid "<b>Credit:</b> " -msgstr "<b>信用:</b> " - -#: ../../../src/ui.cpp:1553 -#, c-format -msgid "(%s matures in %d more blocks)" -msgstr "(%s 收获在 %d 更多的货币包)" - -#: ../../../src/ui.cpp:1555 -msgid "(not accepted)" -msgstr "(未被接受)" - -#: ../../../src/ui.cpp:1600 -#: ../../../src/ui.cpp:1608 -#: ../../../src/ui.cpp:1623 -msgid "<b>Debit:</b> " -msgstr "<b>付款人:</b> " - -#: ../../../src/ui.cpp:1614 -msgid "<b>Transaction fee:</b> " -msgstr "<b>交易佣金:</b> " - -#: ../../../src/ui.cpp:1630 -msgid "<b>Net amount:</b> " -msgstr "<b>网络金额:</b> " - -#: ../../../src/ui.cpp:1637 -msgid "Message:" -msgstr "消息:" - -#: ../../../src/ui.cpp:1639 -msgid "Comment:" -msgstr "评论" - -#: ../../../src/ui.cpp:1642 -msgid "Generated coins must wait 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, it will change to \"not accepted\" and not be spendable. This may occasionally happen if another node generates a block within a few seconds of yours." -msgstr "生成的货币必须等待 120 个货币包之后才能够使用。 当您生成了一个货币包后，它被广播给网络来加入货币包链中。 如果它无法加入货币包链中，他将会标记为\"不被接受\"且不能被支付。 这种情况可能因为在您生成这个货币包之后的几秒钟内有别人也生成了货币包而发生。" - -#: ../../../src/ui.cpp:1826 -msgid "Cannot write autostart/bitcoin.desktop file" -msgstr "无法写入 autostart/bitcoin.desktop 文件" - -#: ../../../src/ui.cpp:1862 -msgid "Main" -msgstr "主要" - -#: ../../../src/ui.cpp:1872 -msgid "&Start Bitcoin on window system startup" -msgstr "开机自动启动 Bitcoin(&S)" - -#: ../../../src/ui.cpp:1879 -msgid "&Minimize on close" -msgstr "关闭时最小化(&M)" - -#: ../../../src/ui.cpp:2021 -#, c-format -msgid "version %s" -msgstr "版本 %s" - -#: ../../../src/ui.cpp:2144 -msgid "Error in amount " -msgstr "金额有误 " - -#: ../../../src/ui.cpp:2144 -#: ../../../src/ui.cpp:2149 -#: ../../../src/ui.cpp:2154 -#: ../../../src/ui.cpp:2207 -#: ../../../src/uibase.cpp:61 -msgid "Send Coins" -msgstr "发送货币" - -#: ../../../src/ui.cpp:2149 -msgid "Amount exceeds your balance " -msgstr "金额超出您的账户余额" - -#: ../../../src/ui.cpp:2154 -msgid "Total exceeds your balance when the " -msgstr "总费用超出您的账户余额当 " - -#: ../../../src/ui.cpp:2154 -msgid " transaction fee is included " -msgstr " 交易佣金已包括" - -#: ../../../src/ui.cpp:2181 -msgid "Payment sent " -msgstr "付款已发送" - -#: ../../../src/ui.cpp:2181 -#: ../../../src/ui.cpp:2191 -#: ../../../src/ui.cpp:2341 -#: ../../../src/ui.cpp:2506 -#: ../../../src/wallet.cpp:1088 -msgid "Sending..." -msgstr "正在发送..." - -#: ../../../src/ui.cpp:2207 -msgid "Invalid address " -msgstr "无效地址 " - -#: ../../../src/ui.cpp:2262 -#, c-format -msgid "Sending %s to %s" -msgstr "发送 %s 给 %s" - -#: ../../../src/ui.cpp:2335 -#: ../../../src/ui.cpp:2368 -msgid "CANCELLED" -msgstr "已取消" - -#: ../../../src/ui.cpp:2339 -msgid "Cancelled" -msgstr "已取消" - -#: ../../../src/ui.cpp:2341 -msgid "Transfer cancelled " -msgstr "传输已取消 " - -#: ../../../src/ui.cpp:2394 -msgid "Error: " -msgstr "错误: " - -#: ../../../src/ui.cpp:2408 -#: ../../../src/ui.cpp:2477 -#: ../../../src/wallet.cpp:1106 -msgid "Insufficient funds" -msgstr "余额不足" - -#: ../../../src/ui.cpp:2413 -msgid "Connecting..." -msgstr "正在连接..." - -#: ../../../src/ui.cpp:2418 -msgid "Unable to connect" -msgstr "无法连接" - -#: ../../../src/ui.cpp:2423 -msgid "Requesting public key..." -msgstr "正在请求公共密钥..." - -#: ../../../src/ui.cpp:2435 -msgid "Received public key..." -msgstr "收到公共密钥..." - -#: ../../../src/ui.cpp:2449 -msgid "Recipient is not accepting transactions sent by IP address" -msgstr "收款人不接受来自 IP 地址的交易" - -#: ../../../src/ui.cpp:2451 -msgid "Transfer was not accepted" -msgstr "传输没有被接受" - -#: ../../../src/ui.cpp:2460 -msgid "Invalid response received" -msgstr "接收到无效回复" - -#: ../../../src/ui.cpp:2473 -msgid "Creating transaction..." -msgstr "正在创建交易..." - -#: ../../../src/ui.cpp:2496 -#, c-format -msgid "This transaction requires a transaction fee of at least %s because of its amount, complexity, or use of recently received funds" -msgstr "这笔交易因为它最近收到的付款的数量，交易难度或者使用情况，需要至少 %s 交易佣金" - -#: ../../../src/ui.cpp:2498 -msgid "Transaction creation failed" -msgstr "交易创建失败" - -#: ../../../src/ui.cpp:2508 -msgid "Transaction aborted" -msgstr "交易中止" - -#: ../../../src/ui.cpp:2516 -msgid "Lost connection, transaction cancelled" -msgstr "失去连接，交易已取消" - -#: ../../../src/ui.cpp:2532 -msgid "Sending payment..." -msgstr "正在发送付款..." - -#: ../../../src/ui.cpp:2544 -msgid "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." -msgstr "交易被拒绝。 这可能是因为您账户中的一部分货币已经被使用，比如您使用了一个复制的 wallet.dat 文件，而且货币在另一个副本里支付但没有在这里标记。" - -#: ../../../src/ui.cpp:2553 -msgid "Waiting for confirmation..." -msgstr "正在等待确认..." - -#: ../../../src/ui.cpp:2570 -msgid "" -"The payment was sent, but the recipient was unable to verify it.\n" -"The transaction is recorded and will credit to the recipient,\n" -"but the comment information will be blank." -msgstr "" -"付款已发送，但是收款人无法进行确认。\n" -"交易已经被记录，并且支付给收款人，\n" -"但是评论信息可能是空的。" - -#: ../../../src/ui.cpp:2579 -msgid "Payment was sent, but an invalid response was received" -msgstr "支付已发送，但是收到无效回复" - -#: ../../../src/ui.cpp:2585 -msgid "Payment completed" -msgstr "付款完成" - -#: ../../../src/ui.cpp:2627 -#: ../../../src/ui.cpp:2773 -#: ../../../src/ui.cpp:2813 -msgid "Name" -msgstr "姓名" - -#: ../../../src/ui.cpp:2628 -#: ../../../src/ui.cpp:2773 -#: ../../../src/ui.cpp:2813 -msgid "Address" -msgstr "地址" - -#: ../../../src/ui.cpp:2630 -#: ../../../src/ui.cpp:2785 -msgid "Label" -msgstr "标签" - -#: ../../../src/ui.cpp:2631 -#: ../../../src/uibase.cpp:847 -msgid "Bitcoin Address" -msgstr "Bitcoin 地址" - -#: ../../../src/ui.cpp:2755 -msgid "This is one of your own addresses for receiving payments and cannot be entered in the address book. " -msgstr "这是您拥有的接收付款的地址之一，它不能够进入这个地址簿。 " - -#: ../../../src/ui.cpp:2773 -#: ../../../src/ui.cpp:2779 -msgid "Edit Address" -msgstr "编辑地址" - -#: ../../../src/ui.cpp:2785 -msgid "Edit Address Label" -msgstr "编辑地址标签" - -#: ../../../src/ui.cpp:2813 -#: ../../../src/ui.cpp:2819 -msgid "Add Address" -msgstr "添加地址" - -#: ../../../src/ui.cpp:2906 -msgid "Bitcoin" -msgstr "Bitcoin" - -#: ../../../src/ui.cpp:2908 -msgid "Bitcoin - Generating" -msgstr "Bitcoin - 生成中" - -#: ../../../src/ui.cpp:2910 -msgid "Bitcoin - (not connected)" -msgstr "Bitcoin - (未连接)" - -#: ../../../src/ui.cpp:2989 -msgid "&Open Bitcoin" -msgstr "打开 Bitcoin(&O)" - -#: ../../../src/ui.cpp:2990 -msgid "&Send Bitcoins" -msgstr "发送 Bitcoins(&S)" - -#: ../../../src/ui.cpp:2991 -msgid "O&ptions..." -msgstr "选项(&P)..." - -#: ../../../src/ui.cpp:2994 -#: ../../../src/uibase.cpp:25 -msgid "E&xit" -msgstr "退出(&X)" - -#: ../../../src/ui.cpp:3220 -msgid "Program has crashed and will terminate. " -msgstr "程序崩溃，即将关闭。 " - -#: ../../../src/uibase.cpp:28 -msgid "&File" -msgstr "文件(&F)" - -#: ../../../src/uibase.cpp:32 -msgid "&Your Receiving Addresses..." -msgstr "您的接收地址(&Y)..." - -#: ../../../src/uibase.cpp:35 -msgid "&Encrypt Wallet..." -msgstr "加密钱包(&E)..." - -#: ../../../src/uibase.cpp:38 -msgid "&Change Wallet Encryption Passphrase..." -msgstr "更改钱包加密口令(&C)..." - -#: ../../../src/uibase.cpp:42 -msgid "&Options..." -msgstr "选项(&O)..." - -#: ../../../src/uibase.cpp:45 -msgid "&Settings" -msgstr "设置(&S)" - -#: ../../../src/uibase.cpp:49 -msgid "&About..." -msgstr "关于(&A)..." - -#: ../../../src/uibase.cpp:52 -msgid "&Help" -msgstr "帮助(&H)" - -#: ../../../src/uibase.cpp:62 -msgid "Address Book" -msgstr "地址簿" - -#: ../../../src/uibase.cpp:75 -msgid "Your Bitcoin Address:" -msgstr "您的 Bitcoin 地址:" - -#: ../../../src/uibase.cpp:82 -msgid " &New... " -msgstr " 新建(&N)... " - -#: ../../../src/uibase.cpp:85 -#: ../../../src/uibase.cpp:790 -#: ../../../src/uibase.cpp:893 -msgid " &Copy to Clipboard " -msgstr " 复制到剪贴板(&C)" - -#: ../../../src/uibase.cpp:99 -msgid "Balance:" -msgstr "账户余额:" - -#: ../../../src/uibase.cpp:115 -msgid " All" -msgstr "全部" - -#: ../../../src/uibase.cpp:115 -msgid " Sent" -msgstr " 已发送" - -#: ../../../src/uibase.cpp:115 -msgid " Received" -msgstr " 已接收" - -#: ../../../src/uibase.cpp:115 -msgid " In Progress" -msgstr "处理中" - -#: ../../../src/uibase.cpp:136 -msgid "All Transactions" -msgstr "所有交易" - -#: ../../../src/uibase.cpp:147 -msgid "Sent/Received" -msgstr "已发送/已接收" - -#: ../../../src/uibase.cpp:158 -msgid "Sent" -msgstr "已发送" - -#: ../../../src/uibase.cpp:169 -msgid "Received" -msgstr "已接收" - -#: ../../../src/uibase.cpp:312 -#: ../../../src/uibase.cpp:453 -#: ../../../src/uibase.cpp:552 -#: ../../../src/uibase.cpp:732 -#: ../../../src/uibase.cpp:793 -#: ../../../src/uibase.cpp:902 -#: ../../../src/uibase.cpp:991 -msgid "OK" -msgstr "确定" - -#: ../../../src/uibase.cpp:355 -msgid "&Start Bitcoin on system startup" -msgstr "开机自动启动(&S)" - -#: ../../../src/uibase.cpp:358 -msgid "&Minimize to the tray instead of the taskbar" -msgstr "最小化到系统托盘(&M)" - -#: ../../../src/uibase.cpp:361 -msgid "Map port using &UPnP" -msgstr "使用 &UPnP 映射端口" - -#: ../../../src/uibase.cpp:364 -msgid "M&inimize to the tray on close" -msgstr "关闭时最小化到托盘(&I)" - -#: ../../../src/uibase.cpp:370 -msgid "&Connect through socks4 proxy (requires restart to apply): " -msgstr "通过 socks4 代理连接 (重启生效) (&C): " - -#: ../../../src/uibase.cpp:381 -msgid "Proxy &IP:" -msgstr "代理服务器(&I):" - -#: ../../../src/uibase.cpp:389 -msgid " &Port:" -msgstr " 端口(&P):" - -#: ../../../src/uibase.cpp:402 -msgid "Optional transaction fee per KB that helps make sure your transactions are processed quickly. Most transactions are 1KB. Fee 0.01 recommended." -msgstr "可以选择按照KB支付交易佣金来确保您的交易得到迅速处理。 大多数交易需要 1KB。 建议支付 0.01。" - -#: ../../../src/uibase.cpp:409 -msgid "Pay transaction fee:" -msgstr "支付交易佣金:" - -#: ../../../src/uibase.cpp:430 -msgid "// [don't translate] Test panel 2 for future expansion" -msgstr "" - -#: ../../../src/uibase.cpp:434 -msgid "// [don't translate] Let's not start multiple pages until the first page is filled up" -msgstr "" - -#: ../../../src/uibase.cpp:456 -#: ../../../src/uibase.cpp:678 -#: ../../../src/uibase.cpp:737 -#: ../../../src/uibase.cpp:796 -#: ../../../src/uibase.cpp:905 -#: ../../../src/uibase.cpp:994 -msgid "Cancel" -msgstr "取消" - -#: ../../../src/uibase.cpp:459 -msgid "&Apply" -msgstr "应用(&A)" - -#: ../../../src/uibase.cpp:518 -msgid "Bitcoin " -msgstr "Bitcoin " - -#: ../../../src/uibase.cpp:524 -msgid "version" -msgstr "版本" - -#: ../../../src/uibase.cpp:535 -msgid "" -"Copyright (c) 2009-2011 Bitcoin Developers\n" -"\n" -"This is experimental software.\n" -"\n" -"Distributed under the MIT/X11 software license, see the accompanying file \n" -"license.txt or http://www.opensource.org/licenses/mit-license.php.\n" -"\n" -"This product includes software developed by the OpenSSL Project for use in the \n" -"OpenSSL Toolkit (http://www.openssl.org/) and cryptographic software written by \n" -"Eric Young (eay@cryptsoft.com) and UPnP software written by Thomas Bernard." -msgstr "" -"版权所有 (c) 2009-2010 Bitcoin 开发人员\n" -"这是一个实验软件。\n" -"分发遵循 MIT/X11 软件许可协议，请参见附带的 license.txt 文件或访问\n" -"http://www.opensource.org/licenses/mit-license.php。\n" -"本产品使用了 OpenSSL Project 开发的 OpenSSL Toolkit\n" -"(http://www.openssl.org/)，以及 Eric Young(eay@cryptsoft.com)\n" -"编写的加密软件和 Thomas Bernard 编写的 UPnP 软件。" - -#: ../../../src/uibase.cpp:591 -msgid "Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)" -msgstr "输入 Bitcoin 地址 (比如 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)" - -#: ../../../src/uibase.cpp:605 -msgid "Pay &To:" -msgstr "付款给(&T):" - -#: ../../../src/uibase.cpp:620 -msgid "&Paste" -msgstr "粘贴(&P)" - -#: ../../../src/uibase.cpp:623 -msgid " Address &Book..." -msgstr " 地址簿(&B)..." - -#: ../../../src/uibase.cpp:630 -msgid "&Amount:" -msgstr "数量(&A):" - -#: ../../../src/uibase.cpp:640 -msgid "T&ransfer:" -msgstr "传输(&R):" - -#: ../../../src/uibase.cpp:646 -msgid " Standard" -msgstr "标准" - -#: ../../../src/uibase.cpp:673 -msgid "&Send" -msgstr "发送(&S)" - -#: ../../../src/uibase.cpp:721 -msgid "" -"\n" -"\n" -"Connecting..." -msgstr "" -"\n" -"\n" -"正在连接..." - -#: ../../../src/uibase.cpp:771 -msgid "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. The highlighted address is displayed in the main window." -msgstr "这些是您用来接收付款的 Bitcoin 地址。 您可能需要给每一个付款人一个不同的地址从而可以最终每一笔交易是谁支付的。 下面高亮的地址是您的主窗口正在使用的地址。" - -#: ../../../src/uibase.cpp:784 -#: ../../../src/uibase.cpp:896 -msgid "&Edit..." -msgstr "编辑(&E)..." - -#: ../../../src/uibase.cpp:787 -#: ../../../src/uibase.cpp:899 -msgid " &New Address... " -msgstr " 新建地址(&N)..." - -#: ../../../src/uibase.cpp:859 -msgid "Sending" -msgstr "发送人地址" - -#: ../../../src/uibase.cpp:867 -msgid "These are your Bitcoin addresses for receiving payments. You can give a different one to each sender to keep track of who is paying you. The highlighted address will be displayed in the main window." -msgstr "这些是您用来接收付款的 Bitcoin 地址。 您可以给每一个付款人一个不同的地址从而可以最终每一笔交易是谁支付的。 下面高亮的地址是您的主窗口正在使用的地址。" - -#: ../../../src/uibase.cpp:880 -msgid "Receiving" -msgstr "我的接收地址" - -#: ../../../src/uibase.cpp:890 -msgid "&Delete" -msgstr "删除(&D)" - -#: ../../../src/util.cpp:870 -msgid "Warning: Please check that your computer's date and time are correct. If your clock is wrong Bitcoin will not work properly." -msgstr "警告: 请检查您的电脑日期和时间是否正确。 如果您的时钟不正确 Bitcoin 将无法正常工作。" - -#: ../../../src/util.cpp:904 -msgid "beta" -msgstr "测试版" - -#: ../../../src/wallet.cpp:1073 -msgid "Error: Wallet locked, unable to create transaction " -msgstr "错误: 钱包已锁定，无法创建交易 " - -#: ../../../src/wallet.cpp:1081 -#, c-format -msgid "Error: This transaction requires a transaction fee of at least %s because of its amount, complexity, or use of recently received funds " -msgstr "错误: 这个交易因为近期收到支付的数量，难度或者使用而需要支付至少 %s 交易佣金 " - -#: ../../../src/wallet.cpp:1083 -msgid "Error: Transaction creation failed " -msgstr "错误: 交易创建失败" - -#: ../../../src/wallet.cpp:1092 -msgid "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." -msgstr "错误: 交易被拒绝。 这可能是因为您账户里的一些货币应经被使用，比如您使用了一个复制的 wallet.dat 文件，一些货币在另一个副本里支付了但是没有在这里更新。" - -#: ../../../src/wallet.cpp:1104 -msgid "Invalid amount" -msgstr "无效金额" - -#: ../../../src/uibase.h:151 -msgid "Transaction Details" -msgstr "交易详情" - -#: ../../../src/uibase.h:203 -msgid "Options" -msgstr "选项" - -#: ../../../src/uibase.h:232 -msgid "About Bitcoin" -msgstr "关于 Bitcoin" - -#: ../../../src/uibase.h:341 -msgid "Your Bitcoin Addresses" -msgstr "您的 Bitcoin 地址" - -#~ msgid "Invalid bitcoin address" -#~ msgstr "无效 bitcoin 地址" diff --git a/src/bitcoinrpc.cpp b/src/bitcoinrpc.cpp index 1e7ffe6310..6e2eac5a7e 100644 --- a/src/bitcoinrpc.cpp +++ b/src/bitcoinrpc.cpp @@ -4,7 +4,6 @@ // file license.txt or http://www.opensource.org/licenses/mit-license.php. #include "headers.h" -#include "cryptopp/sha.h" #include "db.h" #include "net.h" #include "init.h" @@ -1258,6 +1257,70 @@ Value listaccounts(const Array& params, bool fHelp) return ret; } +Value listsinceblock(const Array& params, bool fHelp) +{ + if (fHelp) + throw runtime_error( + "listsinceblock [blockid] [target-confirmations]\n" + "Get all transactions in blocks since block [blockid], or all transactions if omitted"); + + CBlockIndex *pindex = NULL; + int target_confirms = 1; + + if (params.size() > 0) + { + uint256 blockId = 0; + + blockId.SetHex(params[0].get_str()); + pindex = CBlockLocator(blockId).GetBlockIndex(); + } + + if (params.size() > 1) + { + target_confirms = params[1].get_int(); + + if (target_confirms < 1) + throw JSONRPCError(-8, "Invalid parameter"); + } + + int depth = pindex ? (1 + nBestHeight - pindex->nHeight) : -1; + + Array transactions; + + for (map<uint256, CWalletTx>::iterator it = pwalletMain->mapWallet.begin(); it != pwalletMain->mapWallet.end(); it++) + { + CWalletTx tx = (*it).second; + + if (depth == -1 || tx.GetDepthInMainChain() < depth) + ListTransactions(tx, "*", 0, true, transactions); + } + + uint256 lastblock; + + if (target_confirms == 1) + { + printf("oops!\n"); + lastblock = hashBestChain; + } + else + { + int target_height = pindexBest->nHeight + 1 - target_confirms; + + CBlockIndex *block; + for (block = pindexBest; + block && block->nHeight > target_height; + block = block->pprev); + + lastblock = block ? block->GetBlockHash() : 0; + } + + Object ret; + ret.push_back(Pair("transactions", transactions)); + ret.push_back(Pair("lastblock", lastblock.GetHex())); + + return ret; +} + Value gettransaction(const Array& params, bool fHelp) { if (fHelp || params.size() != 1) @@ -1628,7 +1691,7 @@ Value getwork(const Array& params, bool fHelp) // Byte reverse for (int i = 0; i < 128/4; i++) - ((unsigned int*)pdata)[i] = CryptoPP::ByteReverse(((unsigned int*)pdata)[i]); + ((unsigned int*)pdata)[i] = ByteReverse(((unsigned int*)pdata)[i]); // Get saved block if (!mapNewBlock.count(pdata->hashMerkleRoot)) @@ -1645,6 +1708,93 @@ Value getwork(const Array& params, bool fHelp) } +Value getmemorypool(const Array& params, bool fHelp) +{ + if (fHelp || params.size() > 1) + throw runtime_error( + "getmemorypool [data]\n" + "If [data] is not specified, returns data needed to construct a block to work on:\n" + " \"version\" : block version\n" + " \"previousblockhash\" : hash of current highest block\n" + " \"transactions\" : contents of non-coinbase transactions that should be included in the next block\n" + " \"coinbasevalue\" : maximum allowable input to coinbase transaction, including the generation award and transaction fees\n" + " \"time\" : timestamp appropriate for next block\n" + " \"bits\" : compressed target of next block\n" + "If [data] is specified, tries to solve the block and returns true if it was successful."); + + if (params.size() == 0) + { + if (vNodes.empty()) + throw JSONRPCError(-9, "Bitcoin is not connected!"); + + if (IsInitialBlockDownload()) + throw JSONRPCError(-10, "Bitcoin is downloading blocks..."); + + static CReserveKey reservekey(pwalletMain); + + // Update block + static unsigned int nTransactionsUpdatedLast; + static CBlockIndex* pindexPrev; + static int64 nStart; + static CBlock* pblock; + if (pindexPrev != pindexBest || + (nTransactionsUpdated != nTransactionsUpdatedLast && GetTime() - nStart > 5)) + { + nTransactionsUpdatedLast = nTransactionsUpdated; + pindexPrev = pindexBest; + nStart = GetTime(); + + // Create new block + if(pblock) + delete pblock; + pblock = CreateNewBlock(reservekey); + if (!pblock) + throw JSONRPCError(-7, "Out of memory"); + } + + // Update nTime + pblock->nTime = max(pindexPrev->GetMedianTimePast()+1, GetAdjustedTime()); + pblock->nNonce = 0; + + Array transactions; + BOOST_FOREACH(CTransaction tx, pblock->vtx) { + if(tx.IsCoinBase()) + continue; + + CDataStream ssTx; + ssTx << tx; + + transactions.push_back(HexStr(ssTx.begin(), ssTx.end())); + } + + Object result; + result.push_back(Pair("version", pblock->nVersion)); + result.push_back(Pair("previousblockhash", pblock->hashPrevBlock.GetHex())); + result.push_back(Pair("transactions", transactions)); + result.push_back(Pair("coinbasevalue", (int64_t)pblock->vtx[0].vout[0].nValue)); + result.push_back(Pair("time", (int64_t)pblock->nTime)); + + union { + int32_t nBits; + char cBits[4]; + } uBits; + uBits.nBits = htonl((int32_t)pblock->nBits); + result.push_back(Pair("bits", HexStr(BEGIN(uBits.cBits), END(uBits.cBits)))); + + return result; + } + else + { + // Parse parameters + CDataStream ssBlock(ParseHex(params[0].get_str())); + CBlock pblock; + ssBlock >> pblock; + + return ProcessBlock(NULL, &pblock); + } +} + + @@ -1698,6 +1848,8 @@ pair<string, rpcfn_type> pCallTable[] = make_pair("getwork", &getwork), make_pair("listaccounts", &listaccounts), make_pair("settxfee", &settxfee), + make_pair("getmemorypool", &getmemorypool), + make_pair("listsinceblock", &listsinceblock), }; map<string, rpcfn_type> mapCallTable(pCallTable, pCallTable + sizeof(pCallTable)/sizeof(pCallTable[0])); @@ -1723,6 +1875,7 @@ string pAllowInSafeMode[] = "walletlock", "validateaddress", "getwork", + "getmemorypool", }; set<string> setAllowInSafeMode(pAllowInSafeMode, pAllowInSafeMode + sizeof(pAllowInSafeMode)/sizeof(pAllowInSafeMode[0])); @@ -1744,6 +1897,7 @@ string HTTPPost(const string& strMsg, const map<string,string>& mapRequestHeader << "Host: 127.0.0.1\r\n" << "Content-Type: application/json\r\n" << "Content-Length: " << strMsg.size() << "\r\n" + << "Connection: close\r\n" << "Accept: application/json\r\n"; BOOST_FOREACH(const PAIRTYPE(string, string)& item, mapRequestHeaders) s << item.first << ": " << item.second << "\r\n"; @@ -1784,12 +1938,13 @@ static string HTTPReply(int nStatus, const string& strMsg) "</HEAD>\r\n" "<BODY><H1>401 Unauthorized.</H1></BODY>\r\n" "</HTML>\r\n", rfc1123Time().c_str(), FormatFullVersion().c_str()); - string strStatus; - if (nStatus == 200) strStatus = "OK"; - else if (nStatus == 400) strStatus = "Bad Request"; - else if (nStatus == 403) strStatus = "Forbidden"; - else if (nStatus == 404) strStatus = "Not Found"; - else if (nStatus == 500) strStatus = "Internal Server Error"; + const char *cStatus; + if (nStatus == 200) cStatus = "OK"; + else if (nStatus == 400) cStatus = "Bad Request"; + else if (nStatus == 403) cStatus = "Forbidden"; + else if (nStatus == 404) cStatus = "Not Found"; + else if (nStatus == 500) cStatus = "Internal Server Error"; + else cStatus = ""; return strprintf( "HTTP/1.1 %d %s\r\n" "Date: %s\r\n" @@ -1800,7 +1955,7 @@ static string HTTPReply(int nStatus, const string& strMsg) "\r\n" "%s", nStatus, - strStatus.c_str(), + cStatus, rfc1123Time().c_str(), strMsg.size(), FormatFullVersion().c_str(), @@ -2138,7 +2293,7 @@ void ThreadRPCServer2(void* parg) if (valMethod.type() != str_type) throw JSONRPCError(-32600, "Method must be a string"); string strMethod = valMethod.get_str(); - if (strMethod != "getwork") + if (strMethod != "getwork" && strMethod != "getmemorypool") printf("ThreadRPCServer method=%s\n", strMethod.c_str()); // Parse params @@ -2319,6 +2474,7 @@ int CommandLineRPC(int argc, char *argv[]) if (strMethod == "listtransactions" && n > 2) ConvertTo<boost::int64_t>(params[2]); if (strMethod == "listaccounts" && n > 0) ConvertTo<boost::int64_t>(params[0]); if (strMethod == "walletpassphrase" && n > 1) ConvertTo<boost::int64_t>(params[1]); + if (strMethod == "listsinceblock" && n > 1) ConvertTo<boost::int64_t>(params[1]); if (strMethod == "sendmany" && n > 1) { string s = params[1].get_str(); diff --git a/src/crypter.cpp b/src/crypter.cpp index 9a8e6ca89a..bee7a3624b 100644 --- a/src/crypter.cpp +++ b/src/crypter.cpp @@ -7,7 +7,7 @@ #include <vector> #include <string> #include "headers.h" -#ifdef __WXMSW__ +#ifdef WIN32 #include <windows.h> #endif diff --git a/src/cryptopp/License.txt b/src/cryptopp/License.txt deleted file mode 100644 index fc3f054693..0000000000 --- a/src/cryptopp/License.txt +++ /dev/null @@ -1,67 +0,0 @@ -Compilation Copyright (c) 1995-2009 by Wei Dai. All rights reserved. -This copyright applies only to this software distribution package -as a compilation, and does not imply a copyright on any particular -file in the package. - -The following files are copyrighted by their respective original authors, -and their use is subject to additional licenses included in these files. - -mars.cpp - Copyright 1998 Brian Gladman. - -All other files in this compilation are placed in the public domain by -Wei Dai and other contributors. - -I would like to thank the following authors for placing their works into -the public domain: - -Joan Daemen - 3way.cpp -Leonard Janke - cast.cpp, seal.cpp -Steve Reid - cast.cpp -Phil Karn - des.cpp -Andrew M. Kuchling - md2.cpp, md4.cpp -Colin Plumb - md5.cpp -Seal Woods - rc6.cpp -Chris Morgan - rijndael.cpp -Paulo Baretto - rijndael.cpp, skipjack.cpp, square.cpp -Richard De Moliner - safer.cpp -Matthew Skala - twofish.cpp -Kevin Springle - camellia.cpp, shacal2.cpp, ttmac.cpp, whrlpool.cpp, ripemd.cpp - -Permission to use, copy, modify, and distribute this compilation for -any purpose, including commercial applications, is hereby granted -without fee, subject to the following restrictions: - -1. Any copy or modification of this compilation in any form, except -in object code form as part of an application software, must include -the above copyright notice and this license. - -2. Users of this software agree that any modification or extension -they provide to Wei Dai will be considered public domain and not -copyrighted unless it includes an explicit copyright notice. - -3. Wei Dai makes no warranty or representation that the operation of the -software in this compilation will be error-free, and Wei Dai is under no -obligation to provide any services, by way of maintenance, update, or -otherwise. THE SOFTWARE AND ANY DOCUMENTATION ARE PROVIDED "AS IS" -WITHOUT EXPRESS OR IMPLIED WARRANTY INCLUDING, BUT NOT LIMITED TO, -THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR -PURPOSE. IN NO EVENT WILL WEI DAI OR ANY OTHER CONTRIBUTOR BE LIABLE FOR -DIRECT, INCIDENTAL OR CONSEQUENTIAL DAMAGES, EVEN IF -ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. - -4. Users will not use Wei Dai or any other contributor's name in any -publicity or advertising, without prior written consent in each case. - -5. Export of this software from the United States may require a -specific license from the United States Government. It is the -responsibility of any person or organization contemplating export -to obtain such a license before exporting. - -6. Certain parts of this software may be protected by patents. It -is the users' responsibility to obtain the appropriate -licenses before using those parts. - -If this compilation is used in object code form in an application -software, acknowledgement of the author is not required but would be -appreciated. The contribution of any useful modifications or extensions -to Wei Dai is not required but would also be appreciated. diff --git a/src/cryptopp/Readme.txt b/src/cryptopp/Readme.txt deleted file mode 100644 index 861c036c68..0000000000 --- a/src/cryptopp/Readme.txt +++ /dev/null @@ -1,429 +0,0 @@ -Crypto++: a C++ Class Library of Cryptographic Schemes -Version 5.6.0 (3/15/2009) - -Crypto++ Library is a free C++ class library of cryptographic schemes. -Currently the library contains the following algorithms: - - algorithm type name - - authenticated encryption schemes GCM, CCM, EAX - - high speed stream ciphers Panama, Sosemanuk, Salsa20, XSalsa20 - - AES and AES candidates AES (Rijndael), RC6, MARS, Twofish, Serpent, - CAST-256 - - IDEA, Triple-DES (DES-EDE2 and DES-EDE3), - other block ciphers Camellia, SEED, RC5, Blowfish, TEA, XTEA, - Skipjack, SHACAL-2 - - block cipher modes of operation ECB, CBC, CBC ciphertext stealing (CTS), - CFB, OFB, counter mode (CTR) - - message authentication codes VMAC, HMAC, CMAC, CBC-MAC, DMAC, - Two-Track-MAC - - SHA-1, SHA-2 (SHA-224, SHA-256, SHA-384, and - hash functions SHA-512), Tiger, WHIRLPOOL, RIPEMD-128, - RIPEMD-256, RIPEMD-160, RIPEMD-320 - - RSA, DSA, ElGamal, Nyberg-Rueppel (NR), - public-key cryptography Rabin, Rabin-Williams (RW), LUC, LUCELG, - DLIES (variants of DHAES), ESIGN - - padding schemes for public-key PKCS#1 v2.0, OAEP, PSS, PSSR, IEEE P1363 - systems EMSA2 and EMSA5 - - Diffie-Hellman (DH), Unified Diffie-Hellman - key agreement schemes (DH2), Menezes-Qu-Vanstone (MQV), LUCDIF, - XTR-DH - - elliptic curve cryptography ECDSA, ECNR, ECIES, ECDH, ECMQV - - insecure or obsolescent MD2, MD4, MD5, Panama Hash, DES, ARC4, SEAL -algorithms retained for backwards 3.0, WAKE, WAKE-OFB, DESX (DES-XEX3), RC2, - compatibility and historical SAFER, 3-WAY, GOST, SHARK, CAST-128, Square - value - -Other features include: - - * pseudo random number generators (PRNG): ANSI X9.17 appendix C, RandomPool - * password based key derivation functions: PBKDF1 and PBKDF2 from PKCS #5, - PBKDF from PKCS #12 appendix B - * Shamir's secret sharing scheme and Rabin's information dispersal algorithm - (IDA) - * fast multi-precision integer (bignum) and polynomial operations - * finite field arithmetics, including GF(p) and GF(2^n) - * prime number generation and verification - * useful non-cryptographic algorithms - + DEFLATE (RFC 1951) compression/decompression with gzip (RFC 1952) and - zlib (RFC 1950) format support - + hex, base-32, and base-64 coding/decoding - + 32-bit CRC and Adler32 checksum - * class wrappers for these operating system features (optional): - + high resolution timers on Windows, Unix, and Mac OS - + Berkeley and Windows style sockets - + Windows named pipes - + /dev/random, /dev/urandom, /dev/srandom - + Microsoft's CryptGenRandom on Windows - * A high level interface for most of the above, using a filter/pipeline - metaphor - * benchmarks and validation testing - * x86, x86-64 (x64), MMX, and SSE2 assembly code for the most commonly used - algorithms, with run-time CPU feature detection and code selection - * some versions are available in FIPS 140-2 validated form - -You are welcome to use it for any purpose without paying me, but see -License.txt for the fine print. - -The following compilers are supported for this release. Please visit -http://www.cryptopp.com the most up to date build instructions and porting notes. - - * MSVC 6.0 - 2008 - * GCC 3.3 - 4.3 - * C++Builder 2009 - * Intel C++ Compiler 9 - 11 - * Sun Studio 12 (CC 5.9) - -*** Important Usage Notes *** - -1. If a constructor for A takes a pointer to an object B (except primitive -types such as int and char), then A owns B and will delete B at A's -destruction. If a constructor for A takes a reference to an object B, -then the caller retains ownership of B and should not destroy it until -A no longer needs it. - -2. Crypto++ is thread safe at the class level. This means you can use -Crypto++ safely in a multithreaded application, but you must provide -synchronization when multiple threads access a common Crypto++ object. - -*** MSVC-Specific Information *** - -On Windows, Crypto++ can be compiled into 3 forms: a static library -including all algorithms, a DLL with only FIPS Approved algorithms, and -a static library with only algorithms not in the DLL. -(FIPS Approved means Approved according to the FIPS 140-2 standard.) -The DLL may be used by itself, or it may be used together with the second -form of the static library. MSVC project files are included to build -all three forms, and sample applications using each of the three forms -are also included. - -To compile Crypto++ with MSVC, open the "cryptest.dsw" (for MSVC 6 and MSVC .NET -2003) or "cryptest.sln" (for MSVC .NET 2005) workspace file and build one or -more of the following projects: - -cryptdll - This builds the DLL. Please note that if you wish to use Crypto++ - as a FIPS validated module, you must use a pre-built DLL that has undergone - the FIPS validation process instead of building your own. -dlltest - This builds a sample application that only uses the DLL. -cryptest Non-DLL-Import Configuration - This builds the full static library - along with a full test driver. -cryptest DLL-Import Configuration - This builds a static library containing - only algorithms not in the DLL, along with a full test driver that uses - both the DLL and the static library. - -To use the Crypto++ DLL in your application, #include "dll.h" before including -any other Crypto++ header files, and place the DLL in the same directory as -your .exe file. dll.h includes the line #pragma comment(lib, "cryptopp") -so you don't have to explicitly list the import library in your project -settings. To use a static library form of Crypto++, specify it as -an additional library to link with in your project settings. -In either case you should check the compiler options to -make sure that the library and your application are using the same C++ -run-time libraries and calling conventions. - -*** DLL Memory Management *** - -Because it's possible for the Crypto++ DLL to delete objects allocated -by the calling application, they must use the same C++ memory heap. Three -methods are provided to achieve this. -1. The calling application can tell Crypto++ what heap to use. This method - is required when the calling application uses a non-standard heap. -2. Crypto++ can tell the calling application what heap to use. This method - is required when the calling application uses a statically linked C++ Run - Time Library. (Method 1 does not work in this case because the Crypto++ DLL - is initialized before the calling application's heap is initialized.) -3. Crypto++ can automatically use the heap provided by the calling application's - dynamically linked C++ Run Time Library. The calling application must - make sure that the dynamically linked C++ Run Time Library is initialized - before Crypto++ is loaded. (At this time it is not clear if it is possible - to control the order in which DLLs are initialized on Windows 9x machines, - so it might be best to avoid using this method.) - -When Crypto++ attaches to a new process, it searches all modules loaded -into the process space for exported functions "GetNewAndDeleteForCryptoPP" -and "SetNewAndDeleteFromCryptoPP". If one of these functions is found, -Crypto++ uses methods 1 or 2, respectively, by calling the function. -Otherwise, method 3 is used. - -*** GCC-Specific Information *** - -A makefile is included for you to compile Crypto++ with GCC. Make sure -you are using GNU Make and GNU ld. The make process will produce two files, -libcryptopp.a and cryptest.exe. Run "cryptest.exe v" for the validation -suite. - -*** Documentation and Support *** - -Crypto++ is documented through inline comments in header files, which are -processed through Doxygen to produce an HTML reference manual. You can find -a link to the manual from http://www.cryptopp.com. Also at that site is -the Crypto++ FAQ, which you should browse through before attempting to -use this library, because it will likely answer many of questions that -may come up. - -If you run into any problems, please try the Crypto++ mailing list. -The subscription information and the list archive are available on -http://www.cryptopp.com. You can also email me directly by visiting -http://www.weidai.com, but you will probably get a faster response through -the mailing list. - -*** History *** - -1.0 - First public release. Withdrawn at the request of RSA DSI. - - included Blowfish, BBS, DES, DH, Diamond, DSA, ElGamal, IDEA, - MD5, RC4, RC5, RSA, SHA, WAKE, secret sharing, DEFLATE compression - - had a serious bug in the RSA key generation code. - -1.1 - Removed RSA, RC4, RC5 - - Disabled calls to RSAREF's non-public functions - - Minor bugs fixed - -2.0 - a completely new, faster multiprecision integer class - - added MD5-MAC, HAVAL, 3-WAY, TEA, SAFER, LUC, Rabin, BlumGoldwasser, - elliptic curve algorithms - - added the Lucas strong probable primality test - - ElGamal encryption and signature schemes modified to avoid weaknesses - - Diamond changed to Diamond2 because of key schedule weakness - - fixed bug in WAKE key setup - - SHS class renamed to SHA - - lots of miscellaneous optimizations - -2.1 - added Tiger, HMAC, GOST, RIPE-MD160, LUCELG, LUCDIF, XOR-MAC, - OAEP, PSSR, SHARK - - added precomputation to DH, ElGamal, DSA, and elliptic curve algorithms - - added back RC5 and a new RSA - - optimizations in elliptic curves over GF(p) - - changed Rabin to use OAEP and PSSR - - changed many classes to allow copy constructors to work correctly - - improved exception generation and handling - -2.2 - added SEAL, CAST-128, Square - - fixed bug in HAVAL (padding problem) - - fixed bug in triple-DES (decryption order was reversed) - - fixed bug in RC5 (couldn't handle key length not a multiple of 4) - - changed HMAC to conform to RFC-2104 (which is not compatible - with the original HMAC) - - changed secret sharing and information dispersal to use GF(2^32) - instead of GF(65521) - - removed zero knowledge prover/verifier for graph isomorphism - - removed several utility classes in favor of the C++ standard library - -2.3 - ported to EGCS - - fixed incomplete workaround of min/max conflict in MSVC - -3.0 - placed all names into the "CryptoPP" namespace - - added MD2, RC2, RC6, MARS, RW, DH2, MQV, ECDHC, CBC-CTS - - added abstract base classes PK_SimpleKeyAgreementDomain and - PK_AuthenticatedKeyAgreementDomain - - changed DH and LUCDIF to implement the PK_SimpleKeyAgreementDomain - interface and to perform domain parameter and key validation - - changed interfaces of PK_Signer and PK_Verifier to sign and verify - messages instead of message digests - - changed OAEP to conform to PKCS#1 v2.0 - - changed benchmark code to produce HTML tables as output - - changed PSSR to track IEEE P1363a - - renamed ElGamalSignature to NR and changed it to track IEEE P1363 - - renamed ECKEP to ECMQVC and changed it to track IEEE P1363 - - renamed several other classes for clarity - - removed support for calling RSAREF - - removed option to compile old SHA (SHA-0) - - removed option not to throw exceptions - -3.1 - added ARC4, Rijndael, Twofish, Serpent, CBC-MAC, DMAC - - added interface for querying supported key lengths of symmetric ciphers - and MACs - - added sample code for RSA signature and verification - - changed CBC-CTS to be compatible with RFC 2040 - - updated SEAL to version 3.0 of the cipher specification - - optimized multiprecision squaring and elliptic curves over GF(p) - - fixed bug in MARS key setup - - fixed bug with attaching objects to Deflator - -3.2 - added DES-XEX3, ECDSA, DefaultEncryptorWithMAC - - renamed DES-EDE to DES-EDE2 and TripleDES to DES-EDE3 - - optimized ARC4 - - generalized DSA to allow keys longer than 1024 bits - - fixed bugs in GF2N and ModularArithmetic that can cause calculation errors - - fixed crashing bug in Inflator when given invalid inputs - - fixed endian bug in Serpent - - fixed padding bug in Tiger - -4.0 - added Skipjack, CAST-256, Panama, SHA-2 (SHA-256, SHA-384, and SHA-512), - and XTR-DH - - added a faster variant of Rabin's Information Dispersal Algorithm (IDA) - - added class wrappers for these operating system features: - - high resolution timers on Windows, Unix, and MacOS - - Berkeley and Windows style sockets - - Windows named pipes - - /dev/random and /dev/urandom on Linux and FreeBSD - - Microsoft's CryptGenRandom on Windows - - added support for SEC 1 elliptic curve key format and compressed points - - added support for X.509 public key format (subjectPublicKeyInfo) for - RSA, DSA, and elliptic curve schemes - - added support for DER and OpenPGP signature format for DSA - - added support for ZLIB compressed data format (RFC 1950) - - changed elliptic curve encryption to use ECIES (as defined in SEC 1) - - changed MARS key schedule to reflect the latest specification - - changed BufferedTransformation interface to support multiple channels - and messages - - changed CAST and SHA-1 implementations to use public domain source code - - fixed bug in StringSource - - optmized multi-precision integer code for better performance - -4.1 - added more support for the recommended elliptic curve parameters in SEC 2 - - added Panama MAC, MARC4 - - added IV stealing feature to CTS mode - - added support for PKCS #8 private key format for RSA, DSA, and elliptic - curve schemes - - changed Deflate, MD5, Rijndael, and Twofish to use public domain code - - fixed a bug with flushing compressed streams - - fixed a bug with decompressing stored blocks - - fixed a bug with EC point decompression using non-trinomial basis - - fixed a bug in NetworkSource::GeneralPump() - - fixed a performance issue with EC over GF(p) decryption - - fixed syntax to allow GCC to compile without -fpermissive - - relaxed some restrictions in the license - -4.2 - added support for longer HMAC keys - - added MD4 (which is not secure so use for compatibility purposes only) - - added compatibility fixes/workarounds for STLport 4.5, GCC 3.0.2, - and MSVC 7.0 - - changed MD2 to use public domain code - - fixed a bug with decompressing multiple messages with the same object - - fixed a bug in CBC-MAC with MACing multiple messages with the same object - - fixed a bug in RC5 and RC6 with zero-length keys - - fixed a bug in Adler32 where incorrect checksum may be generated - -5.0 - added ESIGN, DLIES, WAKE-OFB, PBKDF1 and PBKDF2 from PKCS #5 - - added key validation for encryption and signature public/private keys - - renamed StreamCipher interface to SymmetricCipher, which is now implemented - by both stream ciphers and block cipher modes including ECB and CBC - - added keying interfaces to support resetting of keys and IVs without - having to destroy and recreate objects - - changed filter interface to support non-blocking input/output - - changed SocketSource and SocketSink to use overlapped I/O on Microsoft Windows - - grouped related classes inside structs to help templates, for example - AESEncryption and AESDecryption are now AES::Encryption and AES::Decryption - - where possible, typedefs have been added to improve backwards - compatibility when the CRYPTOPP_MAINTAIN_BACKWARDS_COMPATIBILITY macro is defined - - changed Serpent, HAVAL and IDEA to use public domain code - - implemented SSE2 optimizations for Integer operations - - fixed a bug in HMAC::TruncatedFinal() - - fixed SKIPJACK byte ordering following NIST clarification dated 5/9/02 - -5.01 - added known answer test for X9.17 RNG in FIPS 140 power-up self test - - submitted to NIST/CSE, but not publicly released - -5.02 - changed EDC test to MAC integrity check using HMAC/SHA1 - - improved performance of integrity check - - added blinding to defend against RSA timing attack - -5.03 - created DLL version of Crypto++ for FIPS 140-2 validation - - fixed vulnerabilities in GetNextIV for CTR and OFB modes - -5.0.4 - Removed DES, SHA-256, SHA-384, SHA-512 from DLL - -5.1 - added PSS padding and changed PSSR to track IEEE P1363a draft standard - - added blinding for RSA and Rabin to defend against timing attacks - on decryption operations - - changed signing and decryption APIs to support the above - - changed WaitObjectContainer to allow waiting for more than 64 - objects at a time on Win32 platforms - - fixed a bug in CBC and ECB modes with processing non-aligned data - - fixed standard conformance bugs in DLIES (DHAES mode) and RW/EMSA2 - signature scheme (these fixes are not backwards compatible) - - fixed a number of compiler warnings, minor bugs, and portability problems - - removed Sapphire - -5.2 - merged in changes for 5.01 - 5.0.4 - - added support for using encoding parameters and key derivation parameters - with public key encryption (implemented by OAEP and DL/ECIES) - - added Camellia, SHACAL-2, Two-Track-MAC, Whirlpool, RIPEMD-320, - RIPEMD-128, RIPEMD-256, Base-32 coding, FIPS variant of CFB mode - - added ThreadUserTimer for timing thread CPU usage - - added option for password-based key derivation functions - to iterate until a mimimum elapsed thread CPU time is reached - - added option (on by default) for DEFLATE compression to detect - uncompressible files and process them more quickly - - improved compatibility and performance on 64-bit platforms, - including Alpha, IA-64, x86-64, PPC64, Sparc64, and MIPS64 - - fixed ONE_AND_ZEROS_PADDING to use 0x80 instead 0x01 as padding. - - fixed encoding/decoding of PKCS #8 privateKeyInfo to properly - handle optional attributes - -5.2.1 - fixed bug in the "dlltest" DLL testing program - - fixed compiling with STLport using VC .NET - - fixed compiling with -fPIC using GCC - - fixed compiling with -msse2 on systems without memalign() - - fixed inability to instantiate PanamaMAC - - fixed problems with inline documentation - -5.2.2 - added SHA-224 - - put SHA-256, SHA-384, SHA-512, RSASSA-PSS into DLL - -5.2.3 - fixed issues with FIPS algorithm test vectors - - put RSASSA-ISO into DLL - -5.3 - ported to MSVC 2005 with support for x86-64 - - added defense against AES timing attacks, and more AES test vectors - - changed StaticAlgorithmName() of Rijndael to "AES", CTR to "CTR" - -5.4 - added Salsa20 - - updated Whirlpool to version 3.0 - - ported to GCC 4.1, Sun C++ 5.8, and Borland C++Builder 2006 - -5.5 - added VMAC and Sosemanuk (with x86-64 and SSE2 assembly) - - improved speed of integer arithmetic, AES, SHA-512, Tiger, Salsa20, - Whirlpool, and PANAMA cipher using assembly (x86-64, MMX, SSE2) - - optimized Camellia and added defense against timing attacks - - updated benchmarks code to show cycles per byte and to time key/IV setup - - started using OpenMP for increased multi-core speed - - enabled GCC optimization flags by default in GNUmakefile - - added blinding and computational error checking for RW signing - - changed RandomPool, X917RNG, GetNextIV, DSA/NR/ECDSA/ECNR to reduce - the risk of reusing random numbers and IVs after virtual machine state - rollback - - changed default FIPS mode RNG from AutoSeededX917RNG<DES_EDE3> to - AutoSeededX917RNG<AES> - - fixed PANAMA cipher interface to accept 256-bit key and 256-bit IV - - moved MD2, MD4, MD5, PanamaHash, ARC4, WAKE_CFB into the namespace "Weak" - - removed HAVAL, MD5-MAC, XMAC - -5.5.1 - fixed VMAC validation failure on 32-bit big-endian machines - -5.5.2 - ported x64 assembly language code for AES, Salsa20, Sosemanuk, and Panama - to MSVC 2005 (using MASM since MSVC doesn't support inline assembly on x64) - - fixed Salsa20 initialization crash on non-SSE2 machines - - fixed Whirlpool crash on Pentium 2 machines - - fixed possible branch prediction analysis (BPA) vulnerability in - MontgomeryReduce(), which may affect security of RSA, RW, LUC - - fixed link error with MSVC 2003 when using "debug DLL" form of runtime library - - fixed crash in SSE2_Add on P4 machines when compiled with - MSVC 6.0 SP5 with Processor Pack - - ported to MSVC 2008, GCC 4.2, Sun CC 5.9, Intel C++ Compiler 10.0, - and Borland C++Builder 2007 - -5.6 - added AuthenticatedSymmetricCipher interface class and Filter wrappers - - added CCM, GCM (with SSE2 assembly), EAX, CMAC, XSalsa20, and SEED - - added support for variable length IVs - - improved AES and SHA-256 speed on x86 and x64 - - fixed incorrect VMAC computation on message lengths - that are >64 mod 128 (x86 assembly version is not affected) - - fixed compiler error in vmac.cpp on x86 with GCC -fPIC - - fixed run-time validation error on x86-64 with GCC 4.3.2 -O2 - - fixed HashFilter bug when putMessage=true - - removed WORD64_AVAILABLE; compiler support for 64-bit int is now required - - ported to GCC 4.3, C++Builder 2009, Sun CC 5.10, Intel C++ Compiler 11 - -Written by Wei Dai diff --git a/src/cryptopp/config.h b/src/cryptopp/config.h deleted file mode 100644 index 0737027f41..0000000000 --- a/src/cryptopp/config.h +++ /dev/null @@ -1,462 +0,0 @@ -#ifndef CRYPTOPP_CONFIG_H -#define CRYPTOPP_CONFIG_H - -//// Bitcoin: disable SSE2 on 32-bit -#if !defined(_M_X64) && !defined(__x86_64__) -#define CRYPTOPP_DISABLE_SSE2 1 -#endif -//////////// end of Bitcoin changes - - -// ***************** Important Settings ******************** - -// define this if running on a big-endian CPU -#if !defined(IS_LITTLE_ENDIAN) && (defined(__BIG_ENDIAN__) || defined(__sparc) || defined(__sparc__) || defined(__hppa__) || defined(__mips__) || (defined(__MWERKS__) && !defined(__INTEL__))) -# define IS_BIG_ENDIAN -#endif - -// define this if running on a little-endian CPU -// big endian will be assumed if IS_LITTLE_ENDIAN is not defined -#ifndef IS_BIG_ENDIAN -# define IS_LITTLE_ENDIAN -#endif - -// define this if you want to disable all OS-dependent features, -// such as sockets and OS-provided random number generators -// #define NO_OS_DEPENDENCE - -// Define this to use features provided by Microsoft's CryptoAPI. -// Currently the only feature used is random number generation. -// This macro will be ignored if NO_OS_DEPENDENCE is defined. -#define USE_MS_CRYPTOAPI - -// Define this to 1 to enforce the requirement in FIPS 186-2 Change Notice 1 that only 1024 bit moduli be used -#ifndef DSA_1024_BIT_MODULUS_ONLY -# define DSA_1024_BIT_MODULUS_ONLY 1 -#endif - -// ***************** Less Important Settings *************** - -// define this to retain (as much as possible) old deprecated function and class names -// #define CRYPTOPP_MAINTAIN_BACKWARDS_COMPATIBILITY - -#define GZIP_OS_CODE 0 - -// Try this if your CPU has 256K internal cache or a slow multiply instruction -// and you want a (possibly) faster IDEA implementation using log tables -// #define IDEA_LARGECACHE - -// Define this if, for the linear congruential RNG, you want to use -// the original constants as specified in S.K. Park and K.W. Miller's -// CACM paper. -// #define LCRNG_ORIGINAL_NUMBERS - -// choose which style of sockets to wrap (mostly useful for cygwin which has both) -#define PREFER_BERKELEY_STYLE_SOCKETS -// #define PREFER_WINDOWS_STYLE_SOCKETS - -// set the name of Rijndael cipher, was "Rijndael" before version 5.3 -#define CRYPTOPP_RIJNDAEL_NAME "AES" - -// ***************** Important Settings Again ******************** -// But the defaults should be ok. - -// namespace support is now required -#ifdef NO_NAMESPACE -# error namespace support is now required -#endif - -// Define this to workaround a Microsoft CryptoAPI bug where -// each call to CryptAcquireContext causes a 100 KB memory leak. -// Defining this will cause Crypto++ to make only one call to CryptAcquireContext. -#define WORKAROUND_MS_BUG_Q258000 - -#ifdef CRYPTOPP_DOXYGEN_PROCESSING -// Avoid putting "CryptoPP::" in front of everything in Doxygen output -# define CryptoPP -# define NAMESPACE_BEGIN(x) -# define NAMESPACE_END -// Get Doxygen to generate better documentation for these typedefs -# define DOCUMENTED_TYPEDEF(x, y) class y : public x {}; -#else -# define NAMESPACE_BEGIN(x) namespace x { -# define NAMESPACE_END } -# define DOCUMENTED_TYPEDEF(x, y) typedef x y; -#endif -#define ANONYMOUS_NAMESPACE_BEGIN namespace { -#define USING_NAMESPACE(x) using namespace x; -#define DOCUMENTED_NAMESPACE_BEGIN(x) namespace x { -#define DOCUMENTED_NAMESPACE_END } - -// What is the type of the third parameter to bind? -// For Unix, the new standard is ::socklen_t (typically unsigned int), and the old standard is int. -// Unfortunately there is no way to tell whether or not socklen_t is defined. -// To work around this, TYPE_OF_SOCKLEN_T is a macro so that you can change it from the makefile. -#ifndef TYPE_OF_SOCKLEN_T -# if defined(_WIN32) || defined(__CYGWIN__) -# define TYPE_OF_SOCKLEN_T int -# else -# define TYPE_OF_SOCKLEN_T ::socklen_t -# endif -#endif - -#if defined(__CYGWIN__) && defined(PREFER_WINDOWS_STYLE_SOCKETS) -# define __USE_W32_SOCKETS -#endif - -typedef unsigned char byte; // put in global namespace to avoid ambiguity with other byte typedefs - -NAMESPACE_BEGIN(CryptoPP) - -typedef unsigned short word16; -typedef unsigned int word32; - -#if defined(_MSC_VER) || defined(__BORLANDC__) - typedef unsigned __int64 word64; - #define W64LIT(x) x##ui64 -#else - typedef unsigned long long word64; - #define W64LIT(x) x##ULL -#endif - -// define large word type, used for file offsets and such -typedef word64 lword; -const lword LWORD_MAX = W64LIT(0xffffffffffffffff); - -#ifdef __GNUC__ - #define CRYPTOPP_GCC_VERSION (__GNUC__ * 10000 + __GNUC_MINOR__ * 100 + __GNUC_PATCHLEVEL__) -#endif - -// define hword, word, and dword. these are used for multiprecision integer arithmetic -// Intel compiler won't have _umul128 until version 10.0. See http://softwarecommunity.intel.com/isn/Community/en-US/forums/thread/30231625.aspx -#if (defined(_MSC_VER) && (!defined(__INTEL_COMPILER) || __INTEL_COMPILER >= 1000) && (defined(_M_X64) || defined(_M_IA64))) || (defined(__DECCXX) && defined(__alpha__)) || (defined(__INTEL_COMPILER) && defined(__x86_64__)) || (defined(__SUNPRO_CC) && defined(__x86_64__)) - typedef word32 hword; - typedef word64 word; -#else - #define CRYPTOPP_NATIVE_DWORD_AVAILABLE - #if defined(__alpha__) || defined(__ia64__) || defined(_ARCH_PPC64) || defined(__x86_64__) || defined(__mips64) || defined(__sparc64__) - #if defined(__GNUC__) && !defined(__INTEL_COMPILER) && !(CRYPTOPP_GCC_VERSION == 40001 && defined(__APPLE__)) && CRYPTOPP_GCC_VERSION >= 30400 - // GCC 4.0.1 on MacOS X is missing __umodti3 and __udivti3 - // mode(TI) division broken on amd64 with GCC earlier than GCC 3.4 - typedef word32 hword; - typedef word64 word; - typedef __uint128_t dword; - typedef __uint128_t word128; - #define CRYPTOPP_WORD128_AVAILABLE - #else - // if we're here, it means we're on a 64-bit CPU but we don't have a way to obtain 128-bit multiplication results - typedef word16 hword; - typedef word32 word; - typedef word64 dword; - #endif - #else - // being here means the native register size is probably 32 bits or less - #define CRYPTOPP_BOOL_SLOW_WORD64 1 - typedef word16 hword; - typedef word32 word; - typedef word64 dword; - #endif -#endif -#ifndef CRYPTOPP_BOOL_SLOW_WORD64 - #define CRYPTOPP_BOOL_SLOW_WORD64 0 -#endif - -const unsigned int WORD_SIZE = sizeof(word); -const unsigned int WORD_BITS = WORD_SIZE * 8; - -NAMESPACE_END - -#ifndef CRYPTOPP_L1_CACHE_LINE_SIZE - // This should be a lower bound on the L1 cache line size. It's used for defense against timing attacks. - #if defined(_M_X64) || defined(__x86_64__) - #define CRYPTOPP_L1_CACHE_LINE_SIZE 64 - #else - // L1 cache line size is 32 on Pentium III and earlier - #define CRYPTOPP_L1_CACHE_LINE_SIZE 32 - #endif -#endif - -#if defined(_MSC_VER) - #if _MSC_VER == 1200 - #include <malloc.h> - #endif - #if _MSC_VER > 1200 || defined(_mm_free) - #define CRYPTOPP_MSVC6PP_OR_LATER // VC 6 processor pack or later - #else - #define CRYPTOPP_MSVC6_NO_PP // VC 6 without processor pack - #endif -#endif - -#ifndef CRYPTOPP_ALIGN_DATA - #if defined(CRYPTOPP_MSVC6PP_OR_LATER) - #define CRYPTOPP_ALIGN_DATA(x) __declspec(align(x)) - #elif defined(__GNUC__) - #define CRYPTOPP_ALIGN_DATA(x) __attribute__((aligned(x))) - #else - #define CRYPTOPP_ALIGN_DATA(x) - #endif -#endif - -#ifndef CRYPTOPP_SECTION_ALIGN16 - #if defined(__GNUC__) && !defined(__APPLE__) - // the alignment attribute doesn't seem to work without this section attribute when -fdata-sections is turned on - #define CRYPTOPP_SECTION_ALIGN16 __attribute__((section ("CryptoPP_Align16"))) - #else - #define CRYPTOPP_SECTION_ALIGN16 - #endif -#endif - -#if defined(_MSC_VER) || defined(__fastcall) - #define CRYPTOPP_FASTCALL __fastcall -#else - #define CRYPTOPP_FASTCALL -#endif - -// VC60 workaround: it doesn't allow typename in some places -#if defined(_MSC_VER) && (_MSC_VER < 1300) -#define CPP_TYPENAME -#else -#define CPP_TYPENAME typename -#endif - -// VC60 workaround: can't cast unsigned __int64 to float or double -#if defined(_MSC_VER) && !defined(CRYPTOPP_MSVC6PP_OR_LATER) -#define CRYPTOPP_VC6_INT64 (__int64) -#else -#define CRYPTOPP_VC6_INT64 -#endif - -#ifdef _MSC_VER -#define CRYPTOPP_NO_VTABLE __declspec(novtable) -#else -#define CRYPTOPP_NO_VTABLE -#endif - -#ifdef _MSC_VER - // 4231: nonstandard extension used : 'extern' before template explicit instantiation - // 4250: dominance - // 4251: member needs to have dll-interface - // 4275: base needs to have dll-interface - // 4660: explicitly instantiating a class that's already implicitly instantiated - // 4661: no suitable definition provided for explicit template instantiation request - // 4786: identifer was truncated in debug information - // 4355: 'this' : used in base member initializer list - // 4910: '__declspec(dllexport)' and 'extern' are incompatible on an explicit instantiation -# pragma warning(disable: 4231 4250 4251 4275 4660 4661 4786 4355 4910) -#endif - -#ifdef __BORLANDC__ -// 8037: non-const function called for const object. needed to work around BCB2006 bug -# pragma warn -8037 -#endif - -#if (defined(_MSC_VER) && _MSC_VER <= 1300) || defined(__MWERKS__) || defined(_STLPORT_VERSION) -#define CRYPTOPP_DISABLE_UNCAUGHT_EXCEPTION -#endif - -#ifndef CRYPTOPP_DISABLE_UNCAUGHT_EXCEPTION -#define CRYPTOPP_UNCAUGHT_EXCEPTION_AVAILABLE -#endif - -#ifdef CRYPTOPP_DISABLE_X86ASM // for backwards compatibility: this macro had both meanings -#define CRYPTOPP_DISABLE_ASM -#define CRYPTOPP_DISABLE_SSE2 -#endif - -#if !defined(CRYPTOPP_DISABLE_ASM) && ((defined(_MSC_VER) && defined(_M_IX86)) || (defined(__GNUC__) && (defined(__i386__) || defined(__x86_64__)))) - #define CRYPTOPP_X86_ASM_AVAILABLE - - #if !defined(CRYPTOPP_DISABLE_SSE2) && (defined(CRYPTOPP_MSVC6PP_OR_LATER) || CRYPTOPP_GCC_VERSION >= 30300) - #define CRYPTOPP_BOOL_SSE2_ASM_AVAILABLE 1 - #else - #define CRYPTOPP_BOOL_SSE2_ASM_AVAILABLE 0 - #endif - - // SSSE3 was actually introduced in GNU as 2.17, which was released 6/23/2006, but we can't tell what version of binutils is installed. - // GCC 4.1.2 was released on 2/13/2007, so we'll use that as a proxy for the binutils version. - #if !defined(CRYPTOPP_DISABLE_SSSE3) && (_MSC_VER >= 1400 || CRYPTOPP_GCC_VERSION >= 40102) - #define CRYPTOPP_BOOL_SSSE3_ASM_AVAILABLE 1 - #else - #define CRYPTOPP_BOOL_SSSE3_ASM_AVAILABLE 0 - #endif -#endif - -#if !defined(CRYPTOPP_DISABLE_ASM) && defined(_MSC_VER) && defined(_M_X64) - #define CRYPTOPP_X64_MASM_AVAILABLE -#endif - -#if !defined(CRYPTOPP_DISABLE_ASM) && defined(__GNUC__) && defined(__x86_64__) - #define CRYPTOPP_X64_ASM_AVAILABLE -#endif - -#if !defined(CRYPTOPP_DISABLE_SSE2) && (defined(CRYPTOPP_MSVC6PP_OR_LATER) || defined(__SSE2__)) - #define CRYPTOPP_BOOL_SSE2_INTRINSICS_AVAILABLE 1 -#else - #define CRYPTOPP_BOOL_SSE2_INTRINSICS_AVAILABLE 0 -#endif - -#if CRYPTOPP_BOOL_SSE2_INTRINSICS_AVAILABLE || CRYPTOPP_BOOL_SSE2_ASM_AVAILABLE || defined(CRYPTOPP_X64_MASM_AVAILABLE) - #define CRYPTOPP_BOOL_ALIGN16_ENABLED 1 -#else - #define CRYPTOPP_BOOL_ALIGN16_ENABLED 0 -#endif - -// how to allocate 16-byte aligned memory (for SSE2) -#if defined(CRYPTOPP_MSVC6PP_OR_LATER) - #define CRYPTOPP_MM_MALLOC_AVAILABLE -#elif defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) - #define CRYPTOPP_MALLOC_ALIGNMENT_IS_16 -#elif defined(__linux__) || defined(__sun__) || defined(__CYGWIN__) - #define CRYPTOPP_MEMALIGN_AVAILABLE -#else - #define CRYPTOPP_NO_ALIGNED_ALLOC -#endif - -// how to disable inlining -#if defined(_MSC_VER) && _MSC_VER >= 1300 -# define CRYPTOPP_NOINLINE_DOTDOTDOT -# define CRYPTOPP_NOINLINE __declspec(noinline) -#elif defined(__GNUC__) -# define CRYPTOPP_NOINLINE_DOTDOTDOT -# define CRYPTOPP_NOINLINE __attribute__((noinline)) -#else -# define CRYPTOPP_NOINLINE_DOTDOTDOT ... -# define CRYPTOPP_NOINLINE -#endif - -// how to declare class constants -#if (defined(_MSC_VER) && _MSC_VER <= 1300) || defined(__INTEL_COMPILER) -# define CRYPTOPP_CONSTANT(x) enum {x}; -#else -# define CRYPTOPP_CONSTANT(x) static const int x; -#endif - -#if defined(_M_X64) || defined(__x86_64__) - #define CRYPTOPP_BOOL_X64 1 -#else - #define CRYPTOPP_BOOL_X64 0 -#endif - -// see http://predef.sourceforge.net/prearch.html -#if defined(_M_IX86) || defined(__i386__) || defined(__i386) || defined(_X86_) || defined(__I86__) || defined(__INTEL__) - #define CRYPTOPP_BOOL_X86 1 -#else - #define CRYPTOPP_BOOL_X86 0 -#endif - -#if CRYPTOPP_BOOL_X64 || CRYPTOPP_BOOL_X86 || defined(__powerpc__) - #define CRYPTOPP_ALLOW_UNALIGNED_DATA_ACCESS -#endif - -#define CRYPTOPP_VERSION 560 - -// ***************** determine availability of OS features ******************** - -#ifndef NO_OS_DEPENDENCE - -#if defined(_WIN32) || defined(__CYGWIN__) -#define CRYPTOPP_WIN32_AVAILABLE -#endif - -#if defined(__unix__) || defined(__MACH__) || defined(__NetBSD__) || defined(__sun) -#define CRYPTOPP_UNIX_AVAILABLE -#endif - -#if defined(CRYPTOPP_WIN32_AVAILABLE) || defined(CRYPTOPP_UNIX_AVAILABLE) -# define HIGHRES_TIMER_AVAILABLE -#endif - -#ifdef CRYPTOPP_UNIX_AVAILABLE -# define HAS_BERKELEY_STYLE_SOCKETS -#endif - -#ifdef CRYPTOPP_WIN32_AVAILABLE -# define HAS_WINDOWS_STYLE_SOCKETS -#endif - -#if defined(HIGHRES_TIMER_AVAILABLE) && (defined(HAS_BERKELEY_STYLE_SOCKETS) || defined(HAS_WINDOWS_STYLE_SOCKETS)) -# define SOCKETS_AVAILABLE -#endif - -#if defined(HAS_WINDOWS_STYLE_SOCKETS) && (!defined(HAS_BERKELEY_STYLE_SOCKETS) || defined(PREFER_WINDOWS_STYLE_SOCKETS)) -# define USE_WINDOWS_STYLE_SOCKETS -#else -# define USE_BERKELEY_STYLE_SOCKETS -#endif - -#if defined(HIGHRES_TIMER_AVAILABLE) && defined(CRYPTOPP_WIN32_AVAILABLE) && !defined(USE_BERKELEY_STYLE_SOCKETS) -# define WINDOWS_PIPES_AVAILABLE -#endif - -#if defined(CRYPTOPP_WIN32_AVAILABLE) && defined(USE_MS_CRYPTOAPI) -# define NONBLOCKING_RNG_AVAILABLE -# define OS_RNG_AVAILABLE -#endif - -#if defined(CRYPTOPP_UNIX_AVAILABLE) || defined(CRYPTOPP_DOXYGEN_PROCESSING) -# define NONBLOCKING_RNG_AVAILABLE -# define BLOCKING_RNG_AVAILABLE -# define OS_RNG_AVAILABLE -# define HAS_PTHREADS -# define THREADS_AVAILABLE -#endif - -#ifdef CRYPTOPP_WIN32_AVAILABLE -# define HAS_WINTHREADS -# define THREADS_AVAILABLE -#endif - -#endif // NO_OS_DEPENDENCE - -// ***************** DLL related ******************** - -#ifdef CRYPTOPP_WIN32_AVAILABLE - -#ifdef CRYPTOPP_EXPORTS -#define CRYPTOPP_IS_DLL -#define CRYPTOPP_DLL __declspec(dllexport) -#elif defined(CRYPTOPP_IMPORTS) -#define CRYPTOPP_IS_DLL -#define CRYPTOPP_DLL __declspec(dllimport) -#else -#define CRYPTOPP_DLL -#endif - -#define CRYPTOPP_API __cdecl - -#else // CRYPTOPP_WIN32_AVAILABLE - -#define CRYPTOPP_DLL -#define CRYPTOPP_API - -#endif // CRYPTOPP_WIN32_AVAILABLE - -#if defined(__MWERKS__) -#define CRYPTOPP_EXTERN_DLL_TEMPLATE_CLASS extern class CRYPTOPP_DLL -#elif defined(__BORLANDC__) || defined(__SUNPRO_CC) -#define CRYPTOPP_EXTERN_DLL_TEMPLATE_CLASS template class CRYPTOPP_DLL -#else -#define CRYPTOPP_EXTERN_DLL_TEMPLATE_CLASS extern template class CRYPTOPP_DLL -#endif - -#if defined(CRYPTOPP_MANUALLY_INSTANTIATE_TEMPLATES) && !defined(CRYPTOPP_IMPORTS) -#define CRYPTOPP_DLL_TEMPLATE_CLASS template class CRYPTOPP_DLL -#else -#define CRYPTOPP_DLL_TEMPLATE_CLASS CRYPTOPP_EXTERN_DLL_TEMPLATE_CLASS -#endif - -#if defined(__MWERKS__) -#define CRYPTOPP_EXTERN_STATIC_TEMPLATE_CLASS extern class -#elif defined(__BORLANDC__) || defined(__SUNPRO_CC) -#define CRYPTOPP_EXTERN_STATIC_TEMPLATE_CLASS template class -#else -#define CRYPTOPP_EXTERN_STATIC_TEMPLATE_CLASS extern template class -#endif - -#if defined(CRYPTOPP_MANUALLY_INSTANTIATE_TEMPLATES) && !defined(CRYPTOPP_EXPORTS) -#define CRYPTOPP_STATIC_TEMPLATE_CLASS template class -#else -#define CRYPTOPP_STATIC_TEMPLATE_CLASS CRYPTOPP_EXTERN_STATIC_TEMPLATE_CLASS -#endif - -#endif diff --git a/src/cryptopp/cpu.cpp b/src/cryptopp/cpu.cpp deleted file mode 100644 index 8789dc3176..0000000000 --- a/src/cryptopp/cpu.cpp +++ /dev/null @@ -1,199 +0,0 @@ -// cpu.cpp - written and placed in the public domain by Wei Dai - -#include "pch.h" - -#ifndef CRYPTOPP_IMPORTS - -#include "cpu.h" -#include "misc.h" -#include <algorithm> - -#ifdef __GNUC__ -#include <signal.h> -#include <setjmp.h> -#endif - -#ifdef CRYPTOPP_MSVC6PP_OR_LATER -#include <emmintrin.h> -#endif - -NAMESPACE_BEGIN(CryptoPP) - -#ifdef CRYPTOPP_X86_ASM_AVAILABLE - -#ifndef _MSC_VER -typedef void (*SigHandler)(int); - -static jmp_buf s_jmpNoCPUID; -static void SigIllHandlerCPUID(int) -{ - longjmp(s_jmpNoCPUID, 1); -} -#endif - -bool CpuId(word32 input, word32 *output) -{ -#ifdef _MSC_VER - __try - { - __asm - { - mov eax, input - cpuid - mov edi, output - mov [edi], eax - mov [edi+4], ebx - mov [edi+8], ecx - mov [edi+12], edx - } - } - __except (1) - { - return false; - } - return true; -#else - SigHandler oldHandler = signal(SIGILL, SigIllHandlerCPUID); - if (oldHandler == SIG_ERR) - return false; - - bool result = true; - if (setjmp(s_jmpNoCPUID)) - result = false; - else - { - __asm__ - ( - // save ebx in case -fPIC is being used -#if CRYPTOPP_BOOL_X86 - "push %%ebx; cpuid; mov %%ebx, %%edi; pop %%ebx" -#else - "pushq %%rbx; cpuid; mov %%ebx, %%edi; popq %%rbx" -#endif - : "=a" (output[0]), "=D" (output[1]), "=c" (output[2]), "=d" (output[3]) - : "a" (input) - ); - } - - signal(SIGILL, oldHandler); - return result; -#endif -} - -#if !CRYPTOPP_BOOL_X64 && !defined(_MSC_VER) && defined(__GNUC__) -static jmp_buf s_jmpNoSSE2; -static void SigIllHandlerSSE2(int) -{ - longjmp(s_jmpNoSSE2, 1); -} -#endif - -#elif _MSC_VER >= 1400 && CRYPTOPP_BOOL_X64 - -bool CpuId(word32 input, word32 *output) -{ - __cpuid((int *)output, input); - return true; -} - -#endif - -#ifdef CRYPTOPP_CPUID_AVAILABLE - -static bool TrySSE2() -{ -#if CRYPTOPP_BOOL_X64 - return true; -#elif defined(_MSC_VER) - __try - { -#if CRYPTOPP_BOOL_SSE2_ASM_AVAILABLE - AS2(por xmm0, xmm0) // executing SSE2 instruction -#elif CRYPTOPP_BOOL_SSE2_INTRINSICS_AVAILABLE - __mm128i x = _mm_setzero_si128(); - return _mm_cvtsi128_si32(x) == 0; -#endif - } - __except (1) - { - return false; - } - return true; -#elif defined(__GNUC__) - SigHandler oldHandler = signal(SIGILL, SigIllHandlerSSE2); - if (oldHandler == SIG_ERR) - return false; - - bool result = true; - if (setjmp(s_jmpNoSSE2)) - result = false; - else - { -#if CRYPTOPP_BOOL_SSE2_ASM_AVAILABLE - __asm __volatile ("por %xmm0, %xmm0"); -#elif CRYPTOPP_BOOL_SSE2_INTRINSICS_AVAILABLE - __mm128i x = _mm_setzero_si128(); - result = _mm_cvtsi128_si32(x) == 0; -#endif - } - - signal(SIGILL, oldHandler); - return result; -#else - return false; -#endif -} - -bool g_x86DetectionDone = false; -bool g_hasISSE = false, g_hasSSE2 = false, g_hasSSSE3 = false, g_hasMMX = false, g_isP4 = false; -word32 g_cacheLineSize = CRYPTOPP_L1_CACHE_LINE_SIZE; - -void DetectX86Features() -{ - word32 cpuid[4], cpuid1[4]; - if (!CpuId(0, cpuid)) - return; - if (!CpuId(1, cpuid1)) - return; - - g_hasMMX = (cpuid1[3] & (1 << 23)) != 0; - if ((cpuid1[3] & (1 << 26)) != 0) - g_hasSSE2 = TrySSE2(); - g_hasSSSE3 = g_hasSSE2 && (cpuid1[2] & (1<<9)); - - if ((cpuid1[3] & (1 << 25)) != 0) - g_hasISSE = true; - else - { - word32 cpuid2[4]; - CpuId(0x080000000, cpuid2); - if (cpuid2[0] >= 0x080000001) - { - CpuId(0x080000001, cpuid2); - g_hasISSE = (cpuid2[3] & (1 << 22)) != 0; - } - } - - std::swap(cpuid[2], cpuid[3]); - if (memcmp(cpuid+1, "GenuineIntel", 12) == 0) - { - g_isP4 = ((cpuid1[0] >> 8) & 0xf) == 0xf; - g_cacheLineSize = 8 * GETBYTE(cpuid1[1], 1); - } - else if (memcmp(cpuid+1, "AuthenticAMD", 12) == 0) - { - CpuId(0x80000005, cpuid); - g_cacheLineSize = GETBYTE(cpuid[2], 0); - } - - if (!g_cacheLineSize) - g_cacheLineSize = CRYPTOPP_L1_CACHE_LINE_SIZE; - - g_x86DetectionDone = true; -} - -#endif - -NAMESPACE_END - -#endif diff --git a/src/cryptopp/cpu.h b/src/cryptopp/cpu.h deleted file mode 100644 index 7f01dad852..0000000000 --- a/src/cryptopp/cpu.h +++ /dev/null @@ -1,263 +0,0 @@ -#ifndef CRYPTOPP_CPU_H -#define CRYPTOPP_CPU_H - -#ifdef CRYPTOPP_GENERATE_X64_MASM - -#define CRYPTOPP_X86_ASM_AVAILABLE -#define CRYPTOPP_BOOL_X64 1 -#define CRYPTOPP_BOOL_SSE2_ASM_AVAILABLE 1 -#define NAMESPACE_END - -#else - -#include "config.h" - -#ifdef CRYPTOPP_MSVC6PP_OR_LATER - #include <emmintrin.h> -#endif - -NAMESPACE_BEGIN(CryptoPP) - -#if defined(CRYPTOPP_X86_ASM_AVAILABLE) || (_MSC_VER >= 1400 && CRYPTOPP_BOOL_X64) - -#define CRYPTOPP_CPUID_AVAILABLE - -// these should not be used directly -extern CRYPTOPP_DLL bool g_x86DetectionDone; -extern CRYPTOPP_DLL bool g_hasSSE2; -extern CRYPTOPP_DLL bool g_hasISSE; -extern CRYPTOPP_DLL bool g_hasMMX; -extern CRYPTOPP_DLL bool g_hasSSSE3; -extern CRYPTOPP_DLL bool g_isP4; -extern CRYPTOPP_DLL word32 g_cacheLineSize; -CRYPTOPP_DLL void CRYPTOPP_API DetectX86Features(); - -CRYPTOPP_DLL bool CRYPTOPP_API CpuId(word32 input, word32 *output); - -#if CRYPTOPP_BOOL_X64 -inline bool HasSSE2() {return true;} -inline bool HasISSE() {return true;} -inline bool HasMMX() {return true;} -#else - -inline bool HasSSE2() -{ - if (!g_x86DetectionDone) - DetectX86Features(); - return g_hasSSE2; -} - -inline bool HasISSE() -{ - if (!g_x86DetectionDone) - DetectX86Features(); - return g_hasISSE; -} - -inline bool HasMMX() -{ - if (!g_x86DetectionDone) - DetectX86Features(); - return g_hasMMX; -} - -#endif - -inline bool HasSSSE3() -{ - if (!g_x86DetectionDone) - DetectX86Features(); - return g_hasSSSE3; -} - -inline bool IsP4() -{ - if (!g_x86DetectionDone) - DetectX86Features(); - return g_isP4; -} - -inline int GetCacheLineSize() -{ - if (!g_x86DetectionDone) - DetectX86Features(); - return g_cacheLineSize; -} - -#else - -inline int GetCacheLineSize() -{ - return CRYPTOPP_L1_CACHE_LINE_SIZE; -} - -inline bool HasSSSE3() {return false;} -inline bool IsP4() {return false;} - -// assume MMX and SSE2 if intrinsics are enabled -#if CRYPTOPP_BOOL_SSE2_INTRINSICS_AVAILABLE || CRYPTOPP_BOOL_X64 -inline bool HasSSE2() {return true;} -inline bool HasISSE() {return true;} -inline bool HasMMX() {return true;} -#else -inline bool HasSSE2() {return false;} -inline bool HasISSE() {return false;} -inline bool HasMMX() {return false;} -#endif - -#endif // #ifdef CRYPTOPP_X86_ASM_AVAILABLE || _MSC_VER >= 1400 - -#endif - -#ifdef CRYPTOPP_GENERATE_X64_MASM - #define AS1(x) x*newline* - #define AS2(x, y) x, y*newline* - #define AS3(x, y, z) x, y, z*newline* - #define ASS(x, y, a, b, c, d) x, y, a*64+b*16+c*4+d*newline* - #define ASL(x) label##x:*newline* - #define ASJ(x, y, z) x label##y*newline* - #define ASC(x, y) x label##y*newline* - #define AS_HEX(y) 0##y##h -#elif defined(__GNUC__) - // define these in two steps to allow arguments to be expanded - #define GNU_AS1(x) #x ";" - #define GNU_AS2(x, y) #x ", " #y ";" - #define GNU_AS3(x, y, z) #x ", " #y ", " #z ";" - #define GNU_ASL(x) "\n" #x ":" - #define GNU_ASJ(x, y, z) #x " " #y #z ";" - #define AS1(x) GNU_AS1(x) - #define AS2(x, y) GNU_AS2(x, y) - #define AS3(x, y, z) GNU_AS3(x, y, z) - #define ASS(x, y, a, b, c, d) #x ", " #y ", " #a "*64+" #b "*16+" #c "*4+" #d ";" - #define ASL(x) GNU_ASL(x) - #define ASJ(x, y, z) GNU_ASJ(x, y, z) - #define ASC(x, y) #x " " #y ";" - #define CRYPTOPP_NAKED - #define AS_HEX(y) 0x##y -#else - #define AS1(x) __asm {x} - #define AS2(x, y) __asm {x, y} - #define AS3(x, y, z) __asm {x, y, z} - #define ASS(x, y, a, b, c, d) __asm {x, y, _MM_SHUFFLE(a, b, c, d)} - #define ASL(x) __asm {label##x:} - #define ASJ(x, y, z) __asm {x label##y} - #define ASC(x, y) __asm {x label##y} - #define CRYPTOPP_NAKED __declspec(naked) - #define AS_HEX(y) 0x##y -#endif - -#define IF0(y) -#define IF1(y) y - -#ifdef CRYPTOPP_GENERATE_X64_MASM -#define ASM_MOD(x, y) ((x) MOD (y)) -#define XMMWORD_PTR XMMWORD PTR -#else -// GNU assembler doesn't seem to have mod operator -#define ASM_MOD(x, y) ((x)-((x)/(y))*(y)) -// GAS 2.15 doesn't support XMMWORD PTR. it seems necessary only for MASM -#define XMMWORD_PTR -#endif - -#if CRYPTOPP_BOOL_X86 - #define AS_REG_1 ecx - #define AS_REG_2 edx - #define AS_REG_3 esi - #define AS_REG_4 edi - #define AS_REG_5 eax - #define AS_REG_6 ebx - #define AS_REG_7 ebp - #define AS_REG_1d ecx - #define AS_REG_2d edx - #define AS_REG_3d esi - #define AS_REG_4d edi - #define AS_REG_5d eax - #define AS_REG_6d ebx - #define AS_REG_7d ebp - #define WORD_SZ 4 - #define WORD_REG(x) e##x - #define WORD_PTR DWORD PTR - #define AS_PUSH_IF86(x) AS1(push e##x) - #define AS_POP_IF86(x) AS1(pop e##x) - #define AS_JCXZ jecxz -#elif CRYPTOPP_BOOL_X64 - #ifdef CRYPTOPP_GENERATE_X64_MASM - #define AS_REG_1 rcx - #define AS_REG_2 rdx - #define AS_REG_3 r8 - #define AS_REG_4 r9 - #define AS_REG_5 rax - #define AS_REG_6 r10 - #define AS_REG_7 r11 - #define AS_REG_1d ecx - #define AS_REG_2d edx - #define AS_REG_3d r8d - #define AS_REG_4d r9d - #define AS_REG_5d eax - #define AS_REG_6d r10d - #define AS_REG_7d r11d - #else - #define AS_REG_1 rdi - #define AS_REG_2 rsi - #define AS_REG_3 rdx - #define AS_REG_4 rcx - #define AS_REG_5 r8 - #define AS_REG_6 r9 - #define AS_REG_7 r10 - #define AS_REG_1d edi - #define AS_REG_2d esi - #define AS_REG_3d edx - #define AS_REG_4d ecx - #define AS_REG_5d r8d - #define AS_REG_6d r9d - #define AS_REG_7d r10d - #endif - #define WORD_SZ 8 - #define WORD_REG(x) r##x - #define WORD_PTR QWORD PTR - #define AS_PUSH_IF86(x) - #define AS_POP_IF86(x) - #define AS_JCXZ jrcxz -#endif - -// helper macro for stream cipher output -#define AS_XMM_OUTPUT4(labelPrefix, inputPtr, outputPtr, x0, x1, x2, x3, t, p0, p1, p2, p3, increment)\ - AS2( test inputPtr, inputPtr)\ - ASC( jz, labelPrefix##3)\ - AS2( test inputPtr, 15)\ - ASC( jnz, labelPrefix##7)\ - AS2( pxor xmm##x0, [inputPtr+p0*16])\ - AS2( pxor xmm##x1, [inputPtr+p1*16])\ - AS2( pxor xmm##x2, [inputPtr+p2*16])\ - AS2( pxor xmm##x3, [inputPtr+p3*16])\ - AS2( add inputPtr, increment*16)\ - ASC( jmp, labelPrefix##3)\ - ASL(labelPrefix##7)\ - AS2( movdqu xmm##t, [inputPtr+p0*16])\ - AS2( pxor xmm##x0, xmm##t)\ - AS2( movdqu xmm##t, [inputPtr+p1*16])\ - AS2( pxor xmm##x1, xmm##t)\ - AS2( movdqu xmm##t, [inputPtr+p2*16])\ - AS2( pxor xmm##x2, xmm##t)\ - AS2( movdqu xmm##t, [inputPtr+p3*16])\ - AS2( pxor xmm##x3, xmm##t)\ - AS2( add inputPtr, increment*16)\ - ASL(labelPrefix##3)\ - AS2( test outputPtr, 15)\ - ASC( jnz, labelPrefix##8)\ - AS2( movdqa [outputPtr+p0*16], xmm##x0)\ - AS2( movdqa [outputPtr+p1*16], xmm##x1)\ - AS2( movdqa [outputPtr+p2*16], xmm##x2)\ - AS2( movdqa [outputPtr+p3*16], xmm##x3)\ - ASC( jmp, labelPrefix##9)\ - ASL(labelPrefix##8)\ - AS2( movdqu [outputPtr+p0*16], xmm##x0)\ - AS2( movdqu [outputPtr+p1*16], xmm##x1)\ - AS2( movdqu [outputPtr+p2*16], xmm##x2)\ - AS2( movdqu [outputPtr+p3*16], xmm##x3)\ - ASL(labelPrefix##9)\ - AS2( add outputPtr, increment*16) - -NAMESPACE_END - -#endif diff --git a/src/cryptopp/cryptlib.h b/src/cryptopp/cryptlib.h deleted file mode 100644 index 15cd6dad67..0000000000 --- a/src/cryptopp/cryptlib.h +++ /dev/null @@ -1,1668 +0,0 @@ -// cryptlib.h - written and placed in the public domain by Wei Dai -/*! \file - This file contains the declarations for the abstract base - classes that provide a uniform interface to this library. -*/ - -/*! \mainpage Crypto++ Library 5.6.0 API Reference -<dl> -<dt>Abstract Base Classes<dd> - cryptlib.h -<dt>Authenticated Encryption<dd> - AuthenticatedSymmetricCipherDocumentation -<dt>Symmetric Ciphers<dd> - SymmetricCipherDocumentation -<dt>Hash Functions<dd> - SHA1, SHA224, SHA256, SHA384, SHA512, Tiger, Whirlpool, RIPEMD160, RIPEMD320, RIPEMD128, RIPEMD256, Weak1::MD2, Weak1::MD4, Weak1::MD5 -<dt>Non-Cryptographic Checksums<dd> - CRC32, Adler32 -<dt>Message Authentication Codes<dd> - VMAC, HMAC, CBC_MAC, CMAC, DMAC, TTMAC, GCM (GMAC) -<dt>Random Number Generators<dd> - NullRNG(), LC_RNG, RandomPool, BlockingRng, NonblockingRng, AutoSeededRandomPool, AutoSeededX917RNG, DefaultAutoSeededRNG -<dt>Password-based Cryptography<dd> - PasswordBasedKeyDerivationFunction -<dt>Public Key Cryptosystems<dd> - DLIES, ECIES, LUCES, RSAES, RabinES, LUC_IES -<dt>Public Key Signature Schemes<dd> - DSA, GDSA, ECDSA, NR, ECNR, LUCSS, RSASS, RSASS_ISO, RabinSS, RWSS, ESIGN -<dt>Key Agreement<dd> - #DH, DH2, #MQV, ECDH, ECMQV, XTR_DH -<dt>Algebraic Structures<dd> - Integer, PolynomialMod2, PolynomialOver, RingOfPolynomialsOver, - ModularArithmetic, MontgomeryRepresentation, GFP2_ONB, - GF2NP, GF256, GF2_32, EC2N, ECP -<dt>Secret Sharing and Information Dispersal<dd> - SecretSharing, SecretRecovery, InformationDispersal, InformationRecovery -<dt>Compression<dd> - Deflator, Inflator, Gzip, Gunzip, ZlibCompressor, ZlibDecompressor -<dt>Input Source Classes<dd> - StringSource, ArraySource, FileSource, SocketSource, WindowsPipeSource, RandomNumberSource -<dt>Output Sink Classes<dd> - StringSinkTemplate, ArraySink, FileSink, SocketSink, WindowsPipeSink, RandomNumberSink -<dt>Filter Wrappers<dd> - StreamTransformationFilter, HashFilter, HashVerificationFilter, SignerFilter, SignatureVerificationFilter -<dt>Binary to Text Encoders and Decoders<dd> - HexEncoder, HexDecoder, Base64Encoder, Base64Decoder, Base32Encoder, Base32Decoder -<dt>Wrappers for OS features<dd> - Timer, Socket, WindowsHandle, ThreadLocalStorage, ThreadUserTimer -<dt>FIPS 140 related<dd> - fips140.h -</dl> - -In the FIPS 140-2 validated DLL version of Crypto++, only the following implementation class are available. -<dl> -<dt>Block Ciphers<dd> - AES, DES_EDE2, DES_EDE3, SKIPJACK -<dt>Cipher Modes (replace template parameter BC with one of the block ciphers above)<dd> - ECB_Mode\<BC\>, CTR_Mode\<BC\>, CBC_Mode\<BC\>, CFB_FIPS_Mode\<BC\>, OFB_Mode\<BC\> -<dt>Hash Functions<dd> - SHA1, SHA224, SHA256, SHA384, SHA512 -<dt>Public Key Signature Schemes (replace template parameter H with one of the hash functions above)<dd> - RSASS\<PKCS1v15, H\>, RSASS\<PSS, H\>, RSASS_ISO\<H\>, RWSS\<P1363_EMSA2, H\>, DSA, ECDSA\<ECP, H\>, ECDSA\<EC2N, H\> -<dt>Message Authentication Codes (replace template parameter H with one of the hash functions above)<dd> - HMAC\<H\>, CBC_MAC\<DES_EDE2\>, CBC_MAC\<DES_EDE3\> -<dt>Random Number Generators<dd> - DefaultAutoSeededRNG (AutoSeededX917RNG\<AES\>) -<dt>Key Agreement<dd> - #DH -<dt>Public Key Cryptosystems<dd> - RSAES\<OAEP\<SHA1\> \> -</dl> - -<p>This reference manual is a work in progress. Some classes are still lacking detailed descriptions. -<p>Click <a href="CryptoPPRef.zip">here</a> to download a zip archive containing this manual. -<p>Thanks to Ryan Phillips for providing the Doxygen configuration file -and getting me started with this manual. -*/ - -#ifndef CRYPTOPP_CRYPTLIB_H -#define CRYPTOPP_CRYPTLIB_H - -#include "config.h" -#include "stdcpp.h" - -NAMESPACE_BEGIN(CryptoPP) - -// forward declarations -class Integer; -class RandomNumberGenerator; -class BufferedTransformation; - -//! used to specify a direction for a cipher to operate in (encrypt or decrypt) -enum CipherDir {ENCRYPTION, DECRYPTION}; - -//! used to represent infinite time -const unsigned long INFINITE_TIME = ULONG_MAX; - -// VC60 workaround: using enums as template parameters causes problems -template <typename ENUM_TYPE, int VALUE> -struct EnumToType -{ - static ENUM_TYPE ToEnum() {return (ENUM_TYPE)VALUE;} -}; - -enum ByteOrder {LITTLE_ENDIAN_ORDER = 0, BIG_ENDIAN_ORDER = 1}; -typedef EnumToType<ByteOrder, LITTLE_ENDIAN_ORDER> LittleEndian; -typedef EnumToType<ByteOrder, BIG_ENDIAN_ORDER> BigEndian; - -//! base class for all exceptions thrown by Crypto++ -class CRYPTOPP_DLL Exception : public std::exception -{ -public: - //! error types - enum ErrorType { - //! a method is not implemented - NOT_IMPLEMENTED, - //! invalid function argument - INVALID_ARGUMENT, - //! BufferedTransformation received a Flush(true) signal but can't flush buffers - CANNOT_FLUSH, - //! data integerity check (such as CRC or MAC) failed - DATA_INTEGRITY_CHECK_FAILED, - //! received input data that doesn't conform to expected format - INVALID_DATA_FORMAT, - //! error reading from input device or writing to output device - IO_ERROR, - //! some error not belong to any of the above categories - OTHER_ERROR - }; - - explicit Exception(ErrorType errorType, const std::string &s) : m_errorType(errorType), m_what(s) {} - virtual ~Exception() throw() {} - const char *what() const throw() {return (m_what.c_str());} - const std::string &GetWhat() const {return m_what;} - void SetWhat(const std::string &s) {m_what = s;} - ErrorType GetErrorType() const {return m_errorType;} - void SetErrorType(ErrorType errorType) {m_errorType = errorType;} - -private: - ErrorType m_errorType; - std::string m_what; -}; - -//! exception thrown when an invalid argument is detected -class CRYPTOPP_DLL InvalidArgument : public Exception -{ -public: - explicit InvalidArgument(const std::string &s) : Exception(INVALID_ARGUMENT, s) {} -}; - -//! exception thrown when input data is received that doesn't conform to expected format -class CRYPTOPP_DLL InvalidDataFormat : public Exception -{ -public: - explicit InvalidDataFormat(const std::string &s) : Exception(INVALID_DATA_FORMAT, s) {} -}; - -//! exception thrown by decryption filters when trying to decrypt an invalid ciphertext -class CRYPTOPP_DLL InvalidCiphertext : public InvalidDataFormat -{ -public: - explicit InvalidCiphertext(const std::string &s) : InvalidDataFormat(s) {} -}; - -//! exception thrown by a class if a non-implemented method is called -class CRYPTOPP_DLL NotImplemented : public Exception -{ -public: - explicit NotImplemented(const std::string &s) : Exception(NOT_IMPLEMENTED, s) {} -}; - -//! exception thrown by a class when Flush(true) is called but it can't completely flush its buffers -class CRYPTOPP_DLL CannotFlush : public Exception -{ -public: - explicit CannotFlush(const std::string &s) : Exception(CANNOT_FLUSH, s) {} -}; - -//! error reported by the operating system -class CRYPTOPP_DLL OS_Error : public Exception -{ -public: - OS_Error(ErrorType errorType, const std::string &s, const std::string& operation, int errorCode) - : Exception(errorType, s), m_operation(operation), m_errorCode(errorCode) {} - ~OS_Error() throw() {} - - // the operating system API that reported the error - const std::string & GetOperation() const {return m_operation;} - // the error code return by the operating system - int GetErrorCode() const {return m_errorCode;} - -protected: - std::string m_operation; - int m_errorCode; -}; - -//! used to return decoding results -struct CRYPTOPP_DLL DecodingResult -{ - explicit DecodingResult() : isValidCoding(false), messageLength(0) {} - explicit DecodingResult(size_t len) : isValidCoding(true), messageLength(len) {} - - bool operator==(const DecodingResult &rhs) const {return isValidCoding == rhs.isValidCoding && messageLength == rhs.messageLength;} - bool operator!=(const DecodingResult &rhs) const {return !operator==(rhs);} - - bool isValidCoding; - size_t messageLength; - -#ifdef CRYPTOPP_MAINTAIN_BACKWARDS_COMPATIBILITY - operator size_t() const {return isValidCoding ? messageLength : 0;} -#endif -}; - -//! interface for retrieving values given their names -/*! \note This class is used to safely pass a variable number of arbitrarily typed arguments to functions - and to read values from keys and crypto parameters. - \note To obtain an object that implements NameValuePairs for the purpose of parameter - passing, use the MakeParameters() function. - \note To get a value from NameValuePairs, you need to know the name and the type of the value. - Call GetValueNames() on a NameValuePairs object to obtain a list of value names that it supports. - Then look at the Name namespace documentation to see what the type of each value is, or - alternatively, call GetIntValue() with the value name, and if the type is not int, a - ValueTypeMismatch exception will be thrown and you can get the actual type from the exception object. -*/ -class CRYPTOPP_NO_VTABLE NameValuePairs -{ -public: - virtual ~NameValuePairs() {} - - //! exception thrown when trying to retrieve a value using a different type than expected - class CRYPTOPP_DLL ValueTypeMismatch : public InvalidArgument - { - public: - ValueTypeMismatch(const std::string &name, const std::type_info &stored, const std::type_info &retrieving) - : InvalidArgument("NameValuePairs: type mismatch for '" + name + "', stored '" + stored.name() + "', trying to retrieve '" + retrieving.name() + "'") - , m_stored(stored), m_retrieving(retrieving) {} - - const std::type_info & GetStoredTypeInfo() const {return m_stored;} - const std::type_info & GetRetrievingTypeInfo() const {return m_retrieving;} - - private: - const std::type_info &m_stored; - const std::type_info &m_retrieving; - }; - - //! get a copy of this object or a subobject of it - template <class T> - bool GetThisObject(T &object) const - { - return GetValue((std::string("ThisObject:")+typeid(T).name()).c_str(), object); - } - - //! get a pointer to this object, as a pointer to T - template <class T> - bool GetThisPointer(T *&p) const - { - return GetValue((std::string("ThisPointer:")+typeid(T).name()).c_str(), p); - } - - //! get a named value, returns true if the name exists - template <class T> - bool GetValue(const char *name, T &value) const - { - return GetVoidValue(name, typeid(T), &value); - } - - //! get a named value, returns the default if the name doesn't exist - template <class T> - T GetValueWithDefault(const char *name, T defaultValue) const - { - GetValue(name, defaultValue); - return defaultValue; - } - - //! get a list of value names that can be retrieved - CRYPTOPP_DLL std::string GetValueNames() const - {std::string result; GetValue("ValueNames", result); return result;} - - //! get a named value with type int - /*! used to ensure we don't accidentally try to get an unsigned int - or some other type when we mean int (which is the most common case) */ - CRYPTOPP_DLL bool GetIntValue(const char *name, int &value) const - {return GetValue(name, value);} - - //! get a named value with type int, with default - CRYPTOPP_DLL int GetIntValueWithDefault(const char *name, int defaultValue) const - {return GetValueWithDefault(name, defaultValue);} - - //! used by derived classes to check for type mismatch - CRYPTOPP_DLL static void CRYPTOPP_API ThrowIfTypeMismatch(const char *name, const std::type_info &stored, const std::type_info &retrieving) - {if (stored != retrieving) throw ValueTypeMismatch(name, stored, retrieving);} - - template <class T> - void GetRequiredParameter(const char *className, const char *name, T &value) const - { - if (!GetValue(name, value)) - throw InvalidArgument(std::string(className) + ": missing required parameter '" + name + "'"); - } - - CRYPTOPP_DLL void GetRequiredIntParameter(const char *className, const char *name, int &value) const - { - if (!GetIntValue(name, value)) - throw InvalidArgument(std::string(className) + ": missing required parameter '" + name + "'"); - } - - //! to be implemented by derived classes, users should use one of the above functions instead - CRYPTOPP_DLL virtual bool GetVoidValue(const char *name, const std::type_info &valueType, void *pValue) const =0; -}; - -//! namespace containing value name definitions -/*! value names, types and semantics: - - ThisObject:ClassName (ClassName, copy of this object or a subobject) - ThisPointer:ClassName (const ClassName *, pointer to this object or a subobject) -*/ -DOCUMENTED_NAMESPACE_BEGIN(Name) -// more names defined in argnames.h -DOCUMENTED_NAMESPACE_END - -//! empty set of name-value pairs -class CRYPTOPP_DLL NullNameValuePairs : public NameValuePairs -{ -public: - bool GetVoidValue(const char *name, const std::type_info &valueType, void *pValue) const {return false;} -}; - -//! _ -extern CRYPTOPP_DLL const NullNameValuePairs g_nullNameValuePairs; - -// ******************************************************** - -//! interface for cloning objects, this is not implemented by most classes yet -class CRYPTOPP_DLL CRYPTOPP_NO_VTABLE Clonable -{ -public: - virtual ~Clonable() {} - //! this is not implemented by most classes yet - virtual Clonable* Clone() const {throw NotImplemented("Clone() is not implemented yet.");} // TODO: make this =0 -}; - -//! interface for all crypto algorithms - -class CRYPTOPP_DLL CRYPTOPP_NO_VTABLE Algorithm : public Clonable -{ -public: - /*! When FIPS 140-2 compliance is enabled and checkSelfTestStatus == true, - this constructor throws SelfTestFailure if the self test hasn't been run or fails. */ - Algorithm(bool checkSelfTestStatus = true); - //! returns name of this algorithm, not universally implemented yet - virtual std::string AlgorithmName() const {return "unknown";} -}; - -//! keying interface for crypto algorithms that take byte strings as keys -class CRYPTOPP_DLL CRYPTOPP_NO_VTABLE SimpleKeyingInterface -{ -public: - virtual ~SimpleKeyingInterface() {} - - //! returns smallest valid key length in bytes */ - virtual size_t MinKeyLength() const =0; - //! returns largest valid key length in bytes */ - virtual size_t MaxKeyLength() const =0; - //! returns default (recommended) key length in bytes */ - virtual size_t DefaultKeyLength() const =0; - - //! returns the smallest valid key length in bytes that is >= min(n, GetMaxKeyLength()) - virtual size_t GetValidKeyLength(size_t n) const =0; - - //! returns whether n is a valid key length - virtual bool IsValidKeyLength(size_t n) const - {return n == GetValidKeyLength(n);} - - //! set or reset the key of this object - /*! \param params is used to specify Rounds, BlockSize, etc. */ - virtual void SetKey(const byte *key, size_t length, const NameValuePairs ¶ms = g_nullNameValuePairs); - - //! calls SetKey() with an NameValuePairs object that just specifies "Rounds" - void SetKeyWithRounds(const byte *key, size_t length, int rounds); - - //! calls SetKey() with an NameValuePairs object that just specifies "IV" - void SetKeyWithIV(const byte *key, size_t length, const byte *iv, size_t ivLength); - - //! calls SetKey() with an NameValuePairs object that just specifies "IV" - void SetKeyWithIV(const byte *key, size_t length, const byte *iv) - {SetKeyWithIV(key, length, iv, IVSize());} - - enum IV_Requirement {UNIQUE_IV = 0, RANDOM_IV, UNPREDICTABLE_RANDOM_IV, INTERNALLY_GENERATED_IV, NOT_RESYNCHRONIZABLE}; - //! returns the minimal requirement for secure IVs - virtual IV_Requirement IVRequirement() const =0; - - //! returns whether this object can be resynchronized (i.e. supports initialization vectors) - /*! If this function returns true, and no IV is passed to SetKey() and CanUseStructuredIVs()==true, an IV of all 0's will be assumed. */ - bool IsResynchronizable() const {return IVRequirement() < NOT_RESYNCHRONIZABLE;} - //! returns whether this object can use random IVs (in addition to ones returned by GetNextIV) - bool CanUseRandomIVs() const {return IVRequirement() <= UNPREDICTABLE_RANDOM_IV;} - //! returns whether this object can use random but possibly predictable IVs (in addition to ones returned by GetNextIV) - bool CanUsePredictableIVs() const {return IVRequirement() <= RANDOM_IV;} - //! returns whether this object can use structured IVs, for example a counter (in addition to ones returned by GetNextIV) - bool CanUseStructuredIVs() const {return IVRequirement() <= UNIQUE_IV;} - - virtual unsigned int IVSize() const {throw NotImplemented(GetAlgorithm().AlgorithmName() + ": this object doesn't support resynchronization");} - //! returns default length of IVs accepted by this object - unsigned int DefaultIVLength() const {return IVSize();} - //! returns minimal length of IVs accepted by this object - virtual unsigned int MinIVLength() const {return IVSize();} - //! returns maximal length of IVs accepted by this object - virtual unsigned int MaxIVLength() const {return IVSize();} - //! resynchronize with an IV. ivLength=-1 means use IVSize() - virtual void Resynchronize(const byte *iv, int ivLength=-1) {throw NotImplemented(GetAlgorithm().AlgorithmName() + ": this object doesn't support resynchronization");} - //! get a secure IV for the next message - /*! This method should be called after you finish encrypting one message and are ready to start the next one. - After calling it, you must call SetKey() or Resynchronize() before using this object again. - This method is not implemented on decryption objects. */ - virtual void GetNextIV(RandomNumberGenerator &rng, byte *IV); - -protected: - virtual const Algorithm & GetAlgorithm() const =0; - virtual void UncheckedSetKey(const byte *key, unsigned int length, const NameValuePairs ¶ms) =0; - - void ThrowIfInvalidKeyLength(size_t length); - void ThrowIfResynchronizable(); // to be called when no IV is passed - void ThrowIfInvalidIV(const byte *iv); // check for NULL IV if it can't be used - size_t ThrowIfInvalidIVLength(int size); - const byte * GetIVAndThrowIfInvalid(const NameValuePairs ¶ms, size_t &size); - inline void AssertValidKeyLength(size_t length) const - {assert(IsValidKeyLength(length));} -}; - -//! interface for the data processing part of block ciphers - -/*! Classes derived from BlockTransformation are block ciphers - in ECB mode (for example the DES::Encryption class), which are stateless. - These classes should not be used directly, but only in combination with - a mode class (see CipherModeDocumentation in modes.h). -*/ -class CRYPTOPP_DLL CRYPTOPP_NO_VTABLE BlockTransformation : public Algorithm -{ -public: - //! encrypt or decrypt inBlock, xor with xorBlock, and write to outBlock - virtual void ProcessAndXorBlock(const byte *inBlock, const byte *xorBlock, byte *outBlock) const =0; - - //! encrypt or decrypt one block - /*! \pre size of inBlock and outBlock == BlockSize() */ - void ProcessBlock(const byte *inBlock, byte *outBlock) const - {ProcessAndXorBlock(inBlock, NULL, outBlock);} - - //! encrypt or decrypt one block in place - void ProcessBlock(byte *inoutBlock) const - {ProcessAndXorBlock(inoutBlock, NULL, inoutBlock);} - - //! block size of the cipher in bytes - virtual unsigned int BlockSize() const =0; - - //! returns how inputs and outputs should be aligned for optimal performance - virtual unsigned int OptimalDataAlignment() const; - - //! returns true if this is a permutation (i.e. there is an inverse transformation) - virtual bool IsPermutation() const {return true;} - - //! returns true if this is an encryption object - virtual bool IsForwardTransformation() const =0; - - //! return number of blocks that can be processed in parallel, for bit-slicing implementations - virtual unsigned int OptimalNumberOfParallelBlocks() const {return 1;} - - enum {BT_InBlockIsCounter=1, BT_DontIncrementInOutPointers=2, BT_XorInput=4, BT_ReverseDirection=8} FlagsForAdvancedProcessBlocks; - - //! encrypt and xor blocks according to flags (see FlagsForAdvancedProcessBlocks) - /*! /note If BT_InBlockIsCounter is set, last byte of inBlocks may be modified. */ - virtual size_t AdvancedProcessBlocks(const byte *inBlocks, const byte *xorBlocks, byte *outBlocks, size_t length, word32 flags) const; - - inline CipherDir GetCipherDirection() const {return IsForwardTransformation() ? ENCRYPTION : DECRYPTION;} -}; - -//! interface for the data processing part of stream ciphers - -class CRYPTOPP_DLL CRYPTOPP_NO_VTABLE StreamTransformation : public Algorithm -{ -public: - //! return a reference to this object, - /*! This function is useful for passing a temporary StreamTransformation object to a - function that takes a non-const reference. */ - StreamTransformation& Ref() {return *this;} - - //! returns block size, if input must be processed in blocks, otherwise 1 - virtual unsigned int MandatoryBlockSize() const {return 1;} - - //! returns the input block size that is most efficient for this cipher - /*! \note optimal input length is n * OptimalBlockSize() - GetOptimalBlockSizeUsed() for any n > 0 */ - virtual unsigned int OptimalBlockSize() const {return MandatoryBlockSize();} - //! returns how much of the current block is used up - virtual unsigned int GetOptimalBlockSizeUsed() const {return 0;} - - //! returns how input should be aligned for optimal performance - virtual unsigned int OptimalDataAlignment() const; - - //! encrypt or decrypt an array of bytes of specified length - /*! \note either inString == outString, or they don't overlap */ - virtual void ProcessData(byte *outString, const byte *inString, size_t length) =0; - - //! for ciphers where the last block of data is special, encrypt or decrypt the last block of data - /*! For now the only use of this function is for CBC-CTS mode. */ - virtual void ProcessLastBlock(byte *outString, const byte *inString, size_t length); - //! returns the minimum size of the last block, 0 indicating the last block is not special - virtual unsigned int MinLastBlockSize() const {return 0;} - - //! same as ProcessData(inoutString, inoutString, length) - inline void ProcessString(byte *inoutString, size_t length) - {ProcessData(inoutString, inoutString, length);} - //! same as ProcessData(outString, inString, length) - inline void ProcessString(byte *outString, const byte *inString, size_t length) - {ProcessData(outString, inString, length);} - //! implemented as {ProcessData(&input, &input, 1); return input;} - inline byte ProcessByte(byte input) - {ProcessData(&input, &input, 1); return input;} - - //! returns whether this cipher supports random access - virtual bool IsRandomAccess() const =0; - //! for random access ciphers, seek to an absolute position - virtual void Seek(lword n) - { - assert(!IsRandomAccess()); - throw NotImplemented("StreamTransformation: this object doesn't support random access"); - } - - //! returns whether this transformation is self-inverting (e.g. xor with a keystream) - virtual bool IsSelfInverting() const =0; - //! returns whether this is an encryption object - virtual bool IsForwardTransformation() const =0; -}; - -//! interface for hash functions and data processing part of MACs - -/*! HashTransformation objects are stateful. They are created in an initial state, - change state as Update() is called, and return to the initial - state when Final() is called. This interface allows a large message to - be hashed in pieces by calling Update() on each piece followed by - calling Final(). -*/ -class CRYPTOPP_DLL CRYPTOPP_NO_VTABLE HashTransformation : public Algorithm -{ -public: - //! return a reference to this object, - /*! This function is useful for passing a temporary HashTransformation object to a - function that takes a non-const reference. */ - HashTransformation& Ref() {return *this;} - - //! process more input - virtual void Update(const byte *input, size_t length) =0; - - //! request space to write input into - virtual byte * CreateUpdateSpace(size_t &size) {size=0; return NULL;} - - //! compute hash for current message, then restart for a new message - /*! \pre size of digest == DigestSize(). */ - virtual void Final(byte *digest) - {TruncatedFinal(digest, DigestSize());} - - //! discard the current state, and restart with a new message - virtual void Restart() - {TruncatedFinal(NULL, 0);} - - //! size of the hash/digest/MAC returned by Final() - virtual unsigned int DigestSize() const =0; - - //! same as DigestSize() - unsigned int TagSize() const {return DigestSize();} - - - //! block size of underlying compression function, or 0 if not block based - virtual unsigned int BlockSize() const {return 0;} - - //! input to Update() should have length a multiple of this for optimal speed - virtual unsigned int OptimalBlockSize() const {return 1;} - - //! returns how input should be aligned for optimal performance - virtual unsigned int OptimalDataAlignment() const; - - //! use this if your input is in one piece and you don't want to call Update() and Final() separately - virtual void CalculateDigest(byte *digest, const byte *input, size_t length) - {Update(input, length); Final(digest);} - - //! verify that digest is a valid digest for the current message, then reinitialize the object - /*! Default implementation is to call Final() and do a bitwise comparison - between its output and digest. */ - virtual bool Verify(const byte *digest) - {return TruncatedVerify(digest, DigestSize());} - - //! use this if your input is in one piece and you don't want to call Update() and Verify() separately - virtual bool VerifyDigest(const byte *digest, const byte *input, size_t length) - {Update(input, length); return Verify(digest);} - - //! truncated version of Final() - virtual void TruncatedFinal(byte *digest, size_t digestSize) =0; - - //! truncated version of CalculateDigest() - virtual void CalculateTruncatedDigest(byte *digest, size_t digestSize, const byte *input, size_t length) - {Update(input, length); TruncatedFinal(digest, digestSize);} - - //! truncated version of Verify() - virtual bool TruncatedVerify(const byte *digest, size_t digestLength); - - //! truncated version of VerifyDigest() - virtual bool VerifyTruncatedDigest(const byte *digest, size_t digestLength, const byte *input, size_t length) - {Update(input, length); return TruncatedVerify(digest, digestLength);} - -protected: - void ThrowIfInvalidTruncatedSize(size_t size) const; -}; - -typedef HashTransformation HashFunction; - -//! interface for one direction (encryption or decryption) of a block cipher -/*! \note These objects usually should not be used directly. See BlockTransformation for more details. */ -class CRYPTOPP_DLL CRYPTOPP_NO_VTABLE BlockCipher : public SimpleKeyingInterface, public BlockTransformation -{ -protected: - const Algorithm & GetAlgorithm() const {return *this;} -}; - -//! interface for one direction (encryption or decryption) of a stream cipher or cipher mode -class CRYPTOPP_DLL CRYPTOPP_NO_VTABLE SymmetricCipher : public SimpleKeyingInterface, public StreamTransformation -{ -protected: - const Algorithm & GetAlgorithm() const {return *this;} -}; - -//! interface for message authentication codes -class CRYPTOPP_DLL CRYPTOPP_NO_VTABLE MessageAuthenticationCode : public SimpleKeyingInterface, public HashTransformation -{ -protected: - const Algorithm & GetAlgorithm() const {return *this;} -}; - -//! interface for for one direction (encryption or decryption) of a stream cipher or block cipher mode with authentication -/*! The StreamTransformation part of this interface is used to encrypt/decrypt the data, and the MessageAuthenticationCode part of this - interface is used to input additional authenticated data (AAD, which is MAC'ed but not encrypted), and to generate/verify the MAC. */ -class CRYPTOPP_DLL CRYPTOPP_NO_VTABLE AuthenticatedSymmetricCipher : public MessageAuthenticationCode, public StreamTransformation -{ -public: - //! this indicates that a member function was called in the wrong state, for example trying to encrypt a message before having set the key or IV - class BadState : public Exception - { - public: - explicit BadState(const std::string &name, const char *message) : Exception(OTHER_ERROR, name + ": " + message) {} - explicit BadState(const std::string &name, const char *function, const char *state) : Exception(OTHER_ERROR, name + ": " + function + " was called before " + state) {} - }; - - //! the maximum length of AAD that can be input before the encrypted data - virtual lword MaxHeaderLength() const =0; - //! the maximum length of encrypted data - virtual lword MaxMessageLength() const =0; - //! the maximum length of AAD that can be input after the encrypted data - virtual lword MaxFooterLength() const {return 0;} - //! if this function returns true, SpecifyDataLengths() must be called before attempting to input data - /*! This is the case for some schemes, such as CCM. */ - virtual bool NeedsPrespecifiedDataLengths() const {return false;} - //! this function only needs to be called if NeedsPrespecifiedDataLengths() returns true - void SpecifyDataLengths(lword headerLength, lword messageLength, lword footerLength=0); - //! encrypt and generate MAC in one call. will truncate MAC if macSize < TagSize() - virtual void EncryptAndAuthenticate(byte *ciphertext, byte *mac, size_t macSize, const byte *iv, int ivLength, const byte *header, size_t headerLength, const byte *message, size_t messageLength); - //! decrypt and verify MAC in one call, returning true iff MAC is valid. will assume MAC is truncated if macLength < TagSize() - virtual bool DecryptAndVerify(byte *message, const byte *mac, size_t macLength, const byte *iv, int ivLength, const byte *header, size_t headerLength, const byte *ciphertext, size_t ciphertextLength); - - // redeclare this to avoid compiler ambiguity errors - virtual std::string AlgorithmName() const =0; - -protected: - const Algorithm & GetAlgorithm() const {return *static_cast<const MessageAuthenticationCode *>(this);} - virtual void UncheckedSpecifyDataLengths(lword headerLength, lword messageLength, lword footerLength) {} -}; - -#ifdef CRYPTOPP_MAINTAIN_BACKWARDS_COMPATIBILITY -typedef SymmetricCipher StreamCipher; -#endif - -//! interface for random number generators -/*! All return values are uniformly distributed over the range specified. -*/ -class CRYPTOPP_DLL CRYPTOPP_NO_VTABLE RandomNumberGenerator : public Algorithm -{ -public: - //! update RNG state with additional unpredictable values - virtual void IncorporateEntropy(const byte *input, size_t length) {throw NotImplemented("RandomNumberGenerator: IncorporateEntropy not implemented");} - - //! returns true if IncorporateEntropy is implemented - virtual bool CanIncorporateEntropy() const {return false;} - - //! generate new random byte and return it - virtual byte GenerateByte(); - - //! generate new random bit and return it - /*! Default implementation is to call GenerateByte() and return its lowest bit. */ - virtual unsigned int GenerateBit(); - - //! generate a random 32 bit word in the range min to max, inclusive - virtual word32 GenerateWord32(word32 a=0, word32 b=0xffffffffL); - - //! generate random array of bytes - virtual void GenerateBlock(byte *output, size_t size); - - //! generate and discard n bytes - virtual void DiscardBytes(size_t n); - - //! generate random bytes as input to a BufferedTransformation - virtual void GenerateIntoBufferedTransformation(BufferedTransformation &target, const std::string &channel, lword length); - - //! randomly shuffle the specified array, resulting permutation is uniformly distributed - template <class IT> void Shuffle(IT begin, IT end) - { - for (; begin != end; ++begin) - std::iter_swap(begin, begin + GenerateWord32(0, end-begin-1)); - } - -#ifdef CRYPTOPP_MAINTAIN_BACKWARDS_COMPATIBILITY - byte GetByte() {return GenerateByte();} - unsigned int GetBit() {return GenerateBit();} - word32 GetLong(word32 a=0, word32 b=0xffffffffL) {return GenerateWord32(a, b);} - word16 GetShort(word16 a=0, word16 b=0xffff) {return (word16)GenerateWord32(a, b);} - void GetBlock(byte *output, size_t size) {GenerateBlock(output, size);} -#endif -}; - -//! returns a reference that can be passed to functions that ask for a RNG but doesn't actually use it -CRYPTOPP_DLL RandomNumberGenerator & CRYPTOPP_API NullRNG(); - -class WaitObjectContainer; -class CallStack; - -//! interface for objects that you can wait for - -class CRYPTOPP_NO_VTABLE Waitable -{ -public: - virtual ~Waitable() {} - - //! maximum number of wait objects that this object can return - virtual unsigned int GetMaxWaitObjectCount() const =0; - //! put wait objects into container - /*! \param callStack is used for tracing no wait loops, example: - something.GetWaitObjects(c, CallStack("my func after X", 0)); - - or in an outer GetWaitObjects() method that itself takes a callStack parameter: - innerThing.GetWaitObjects(c, CallStack("MyClass::GetWaitObjects at X", &callStack)); */ - virtual void GetWaitObjects(WaitObjectContainer &container, CallStack const& callStack) =0; - //! wait on this object - /*! same as creating an empty container, calling GetWaitObjects(), and calling Wait() on the container */ - bool Wait(unsigned long milliseconds, CallStack const& callStack); -}; - -//! the default channel for BufferedTransformation, equal to the empty string -extern CRYPTOPP_DLL const std::string DEFAULT_CHANNEL; - -//! channel for additional authenticated data, equal to "AAD" -extern CRYPTOPP_DLL const std::string AAD_CHANNEL; - -//! interface for buffered transformations - -/*! BufferedTransformation is a generalization of BlockTransformation, - StreamTransformation, and HashTransformation. - - A buffered transformation is an object that takes a stream of bytes - as input (this may be done in stages), does some computation on them, and - then places the result into an internal buffer for later retrieval. Any - partial result already in the output buffer is not modified by further - input. - - If a method takes a "blocking" parameter, and you - pass "false" for it, the method will return before all input has been processed if - the input cannot be processed without waiting (for network buffers to become available, for example). - In this case the method will return true - or a non-zero integer value. When this happens you must continue to call the method with the same - parameters until it returns false or zero, before calling any other method on it or - attached BufferedTransformation. The integer return value in this case is approximately - the number of bytes left to be processed, and can be used to implement a progress bar. - - For functions that take a "propagation" parameter, propagation != 0 means pass on the signal to attached - BufferedTransformation objects, with propagation decremented at each step until it reaches 0. - -1 means unlimited propagation. - - \nosubgrouping -*/ -class CRYPTOPP_DLL CRYPTOPP_NO_VTABLE BufferedTransformation : public Algorithm, public Waitable -{ -public: - // placed up here for CW8 - static const std::string &NULL_CHANNEL; // same as DEFAULT_CHANNEL, for backwards compatibility - - BufferedTransformation() : Algorithm(false) {} - - //! return a reference to this object - /*! This function is useful for passing a temporary BufferedTransformation object to a - function that takes a non-const reference. */ - BufferedTransformation& Ref() {return *this;} - - //! \name INPUT - //@{ - //! input a byte for processing - size_t Put(byte inByte, bool blocking=true) - {return Put(&inByte, 1, blocking);} - //! input multiple bytes - size_t Put(const byte *inString, size_t length, bool blocking=true) - {return Put2(inString, length, 0, blocking);} - - //! input a 16-bit word - size_t PutWord16(word16 value, ByteOrder order=BIG_ENDIAN_ORDER, bool blocking=true); - //! input a 32-bit word - size_t PutWord32(word32 value, ByteOrder order=BIG_ENDIAN_ORDER, bool blocking=true); - - //! request space which can be written into by the caller, and then used as input to Put() - /*! \param size is requested size (as a hint) for input, and size of the returned space for output */ - /*! \note The purpose of this method is to help avoid doing extra memory allocations. */ - virtual byte * CreatePutSpace(size_t &size) {size=0; return NULL;} - - virtual bool CanModifyInput() const {return false;} - - //! input multiple bytes that may be modified by callee - size_t PutModifiable(byte *inString, size_t length, bool blocking=true) - {return PutModifiable2(inString, length, 0, blocking);} - - bool MessageEnd(int propagation=-1, bool blocking=true) - {return !!Put2(NULL, 0, propagation < 0 ? -1 : propagation+1, blocking);} - size_t PutMessageEnd(const byte *inString, size_t length, int propagation=-1, bool blocking=true) - {return Put2(inString, length, propagation < 0 ? -1 : propagation+1, blocking);} - - //! input multiple bytes for blocking or non-blocking processing - /*! \param messageEnd means how many filters to signal MessageEnd to, including this one */ - virtual size_t Put2(const byte *inString, size_t length, int messageEnd, bool blocking) =0; - //! input multiple bytes that may be modified by callee for blocking or non-blocking processing - /*! \param messageEnd means how many filters to signal MessageEnd to, including this one */ - virtual size_t PutModifiable2(byte *inString, size_t length, int messageEnd, bool blocking) - {return Put2(inString, length, messageEnd, blocking);} - - //! thrown by objects that have not implemented nonblocking input processing - struct BlockingInputOnly : public NotImplemented - {BlockingInputOnly(const std::string &s) : NotImplemented(s + ": Nonblocking input is not implemented by this object.") {}}; - //@} - - //! \name WAITING - //@{ - unsigned int GetMaxWaitObjectCount() const; - void GetWaitObjects(WaitObjectContainer &container, CallStack const& callStack); - //@} - - //! \name SIGNALS - //@{ - virtual void IsolatedInitialize(const NameValuePairs ¶meters) {throw NotImplemented("BufferedTransformation: this object can't be reinitialized");} - virtual bool IsolatedFlush(bool hardFlush, bool blocking) =0; - virtual bool IsolatedMessageSeriesEnd(bool blocking) {return false;} - - //! initialize or reinitialize this object - virtual void Initialize(const NameValuePairs ¶meters=g_nullNameValuePairs, int propagation=-1); - //! flush buffered input and/or output - /*! \param hardFlush is used to indicate whether all data should be flushed - \note Hard flushes must be used with care. It means try to process and output everything, even if - there may not be enough data to complete the action. For example, hard flushing a HexDecoder would - cause an error if you do it after inputing an odd number of hex encoded characters. - For some types of filters, for example ZlibDecompressor, hard flushes can only - be done at "synchronization points". These synchronization points are positions in the data - stream that are created by hard flushes on the corresponding reverse filters, in this - example ZlibCompressor. This is useful when zlib compressed data is moved across a - network in packets and compression state is preserved across packets, as in the ssh2 protocol. - */ - virtual bool Flush(bool hardFlush, int propagation=-1, bool blocking=true); - //! mark end of a series of messages - /*! There should be a MessageEnd immediately before MessageSeriesEnd. */ - virtual bool MessageSeriesEnd(int propagation=-1, bool blocking=true); - - //! set propagation of automatically generated and transferred signals - /*! propagation == 0 means do not automaticly generate signals */ - virtual void SetAutoSignalPropagation(int propagation) {} - - //! - virtual int GetAutoSignalPropagation() const {return 0;} -public: - -#ifdef CRYPTOPP_MAINTAIN_BACKWARDS_COMPATIBILITY - void Close() {MessageEnd();} -#endif - //@} - - //! \name RETRIEVAL OF ONE MESSAGE - //@{ - //! returns number of bytes that is currently ready for retrieval - /*! All retrieval functions return the actual number of bytes - retrieved, which is the lesser of the request number and - MaxRetrievable(). */ - virtual lword MaxRetrievable() const; - - //! returns whether any bytes are currently ready for retrieval - virtual bool AnyRetrievable() const; - - //! try to retrieve a single byte - virtual size_t Get(byte &outByte); - //! try to retrieve multiple bytes - virtual size_t Get(byte *outString, size_t getMax); - - //! peek at the next byte without removing it from the output buffer - virtual size_t Peek(byte &outByte) const; - //! peek at multiple bytes without removing them from the output buffer - virtual size_t Peek(byte *outString, size_t peekMax) const; - - //! try to retrieve a 16-bit word - size_t GetWord16(word16 &value, ByteOrder order=BIG_ENDIAN_ORDER); - //! try to retrieve a 32-bit word - size_t GetWord32(word32 &value, ByteOrder order=BIG_ENDIAN_ORDER); - - //! try to peek at a 16-bit word - size_t PeekWord16(word16 &value, ByteOrder order=BIG_ENDIAN_ORDER) const; - //! try to peek at a 32-bit word - size_t PeekWord32(word32 &value, ByteOrder order=BIG_ENDIAN_ORDER) const; - - //! move transferMax bytes of the buffered output to target as input - lword TransferTo(BufferedTransformation &target, lword transferMax=LWORD_MAX, const std::string &channel=DEFAULT_CHANNEL) - {TransferTo2(target, transferMax, channel); return transferMax;} - - //! discard skipMax bytes from the output buffer - virtual lword Skip(lword skipMax=LWORD_MAX); - - //! copy copyMax bytes of the buffered output to target as input - lword CopyTo(BufferedTransformation &target, lword copyMax=LWORD_MAX, const std::string &channel=DEFAULT_CHANNEL) const - {return CopyRangeTo(target, 0, copyMax, channel);} - - //! copy copyMax bytes of the buffered output, starting at position (relative to current position), to target as input - lword CopyRangeTo(BufferedTransformation &target, lword position, lword copyMax=LWORD_MAX, const std::string &channel=DEFAULT_CHANNEL) const - {lword i = position; CopyRangeTo2(target, i, i+copyMax, channel); return i-position;} - -#ifdef CRYPTOPP_MAINTAIN_BACKWARDS_COMPATIBILITY - unsigned long MaxRetrieveable() const {return MaxRetrievable();} -#endif - //@} - - //! \name RETRIEVAL OF MULTIPLE MESSAGES - //@{ - //! - virtual lword TotalBytesRetrievable() const; - //! number of times MessageEnd() has been received minus messages retrieved or skipped - virtual unsigned int NumberOfMessages() const; - //! returns true if NumberOfMessages() > 0 - virtual bool AnyMessages() const; - //! start retrieving the next message - /*! - Returns false if no more messages exist or this message - is not completely retrieved. - */ - virtual bool GetNextMessage(); - //! skip count number of messages - virtual unsigned int SkipMessages(unsigned int count=UINT_MAX); - //! - unsigned int TransferMessagesTo(BufferedTransformation &target, unsigned int count=UINT_MAX, const std::string &channel=DEFAULT_CHANNEL) - {TransferMessagesTo2(target, count, channel); return count;} - //! - unsigned int CopyMessagesTo(BufferedTransformation &target, unsigned int count=UINT_MAX, const std::string &channel=DEFAULT_CHANNEL) const; - - //! - virtual void SkipAll(); - //! - void TransferAllTo(BufferedTransformation &target, const std::string &channel=DEFAULT_CHANNEL) - {TransferAllTo2(target, channel);} - //! - void CopyAllTo(BufferedTransformation &target, const std::string &channel=DEFAULT_CHANNEL) const; - - virtual bool GetNextMessageSeries() {return false;} - virtual unsigned int NumberOfMessagesInThisSeries() const {return NumberOfMessages();} - virtual unsigned int NumberOfMessageSeries() const {return 0;} - //@} - - //! \name NON-BLOCKING TRANSFER OF OUTPUT - //@{ - //! upon return, byteCount contains number of bytes that have finished being transfered, and returns the number of bytes left in the current transfer block - virtual size_t TransferTo2(BufferedTransformation &target, lword &byteCount, const std::string &channel=DEFAULT_CHANNEL, bool blocking=true) =0; - //! upon return, begin contains the start position of data yet to be finished copying, and returns the number of bytes left in the current transfer block - virtual size_t CopyRangeTo2(BufferedTransformation &target, lword &begin, lword end=LWORD_MAX, const std::string &channel=DEFAULT_CHANNEL, bool blocking=true) const =0; - //! upon return, messageCount contains number of messages that have finished being transfered, and returns the number of bytes left in the current transfer block - size_t TransferMessagesTo2(BufferedTransformation &target, unsigned int &messageCount, const std::string &channel=DEFAULT_CHANNEL, bool blocking=true); - //! returns the number of bytes left in the current transfer block - size_t TransferAllTo2(BufferedTransformation &target, const std::string &channel=DEFAULT_CHANNEL, bool blocking=true); - //@} - - //! \name CHANNELS - //@{ - struct NoChannelSupport : public NotImplemented - {NoChannelSupport(const std::string &name) : NotImplemented(name + ": this object doesn't support multiple channels") {}}; - struct InvalidChannelName : public InvalidArgument - {InvalidChannelName(const std::string &name, const std::string &channel) : InvalidArgument(name + ": unexpected channel name \"" + channel + "\"") {}}; - - size_t ChannelPut(const std::string &channel, byte inByte, bool blocking=true) - {return ChannelPut(channel, &inByte, 1, blocking);} - size_t ChannelPut(const std::string &channel, const byte *inString, size_t length, bool blocking=true) - {return ChannelPut2(channel, inString, length, 0, blocking);} - - size_t ChannelPutModifiable(const std::string &channel, byte *inString, size_t length, bool blocking=true) - {return ChannelPutModifiable2(channel, inString, length, 0, blocking);} - - size_t ChannelPutWord16(const std::string &channel, word16 value, ByteOrder order=BIG_ENDIAN_ORDER, bool blocking=true); - size_t ChannelPutWord32(const std::string &channel, word32 value, ByteOrder order=BIG_ENDIAN_ORDER, bool blocking=true); - - bool ChannelMessageEnd(const std::string &channel, int propagation=-1, bool blocking=true) - {return !!ChannelPut2(channel, NULL, 0, propagation < 0 ? -1 : propagation+1, blocking);} - size_t ChannelPutMessageEnd(const std::string &channel, const byte *inString, size_t length, int propagation=-1, bool blocking=true) - {return ChannelPut2(channel, inString, length, propagation < 0 ? -1 : propagation+1, blocking);} - - virtual byte * ChannelCreatePutSpace(const std::string &channel, size_t &size); - - virtual size_t ChannelPut2(const std::string &channel, const byte *begin, size_t length, int messageEnd, bool blocking); - virtual size_t ChannelPutModifiable2(const std::string &channel, byte *begin, size_t length, int messageEnd, bool blocking); - - virtual bool ChannelFlush(const std::string &channel, bool hardFlush, int propagation=-1, bool blocking=true); - virtual bool ChannelMessageSeriesEnd(const std::string &channel, int propagation=-1, bool blocking=true); - - virtual void SetRetrievalChannel(const std::string &channel); - //@} - - //! \name ATTACHMENT - /*! Some BufferedTransformation objects (e.g. Filter objects) - allow other BufferedTransformation objects to be attached. When - this is done, the first object instead of buffering its output, - sents that output to the attached object as input. The entire - attachment chain is deleted when the anchor object is destructed. - */ - //@{ - //! returns whether this object allows attachment - virtual bool Attachable() {return false;} - //! returns the object immediately attached to this object or NULL for no attachment - virtual BufferedTransformation *AttachedTransformation() {assert(!Attachable()); return 0;} - //! - virtual const BufferedTransformation *AttachedTransformation() const - {return const_cast<BufferedTransformation *>(this)->AttachedTransformation();} - //! delete the current attachment chain and replace it with newAttachment - virtual void Detach(BufferedTransformation *newAttachment = 0) - {assert(!Attachable()); throw NotImplemented("BufferedTransformation: this object is not attachable");} - //! add newAttachment to the end of attachment chain - virtual void Attach(BufferedTransformation *newAttachment); - //@} - -protected: - static int DecrementPropagation(int propagation) - {return propagation != 0 ? propagation - 1 : 0;} - -private: - byte m_buf[4]; // for ChannelPutWord16 and ChannelPutWord32, to ensure buffer isn't deallocated before non-blocking operation completes -}; - -//! returns a reference to a BufferedTransformation object that discards all input -BufferedTransformation & TheBitBucket(); - -//! interface for crypto material, such as public and private keys, and crypto parameters - -class CRYPTOPP_DLL CRYPTOPP_NO_VTABLE CryptoMaterial : public NameValuePairs -{ -public: - //! exception thrown when invalid crypto material is detected - class CRYPTOPP_DLL InvalidMaterial : public InvalidDataFormat - { - public: - explicit InvalidMaterial(const std::string &s) : InvalidDataFormat(s) {} - }; - - //! assign values from source to this object - /*! \note This function can be used to create a public key from a private key. */ - virtual void AssignFrom(const NameValuePairs &source) =0; - - //! check this object for errors - /*! \param level denotes the level of thoroughness: - 0 - using this object won't cause a crash or exception (rng is ignored) - 1 - this object will probably function (encrypt, sign, etc.) correctly (but may not check for weak keys and such) - 2 - make sure this object will function correctly, and do reasonable security checks - 3 - do checks that may take a long time - \return true if the tests pass */ - virtual bool Validate(RandomNumberGenerator &rng, unsigned int level) const =0; - - //! throws InvalidMaterial if this object fails Validate() test - virtual void ThrowIfInvalid(RandomNumberGenerator &rng, unsigned int level) const - {if (!Validate(rng, level)) throw InvalidMaterial("CryptoMaterial: this object contains invalid values");} - -// virtual std::vector<std::string> GetSupportedFormats(bool includeSaveOnly=false, bool includeLoadOnly=false); - - //! save key into a BufferedTransformation - virtual void Save(BufferedTransformation &bt) const - {throw NotImplemented("CryptoMaterial: this object does not support saving");} - - //! load key from a BufferedTransformation - /*! \throws KeyingErr if decode fails - \note Generally does not check that the key is valid. - Call ValidateKey() or ThrowIfInvalidKey() to check that. */ - virtual void Load(BufferedTransformation &bt) - {throw NotImplemented("CryptoMaterial: this object does not support loading");} - - //! \return whether this object supports precomputation - virtual bool SupportsPrecomputation() const {return false;} - //! do precomputation - /*! The exact semantics of Precompute() is varies, but - typically it means calculate a table of n objects - that can be used later to speed up computation. */ - virtual void Precompute(unsigned int n) - {assert(!SupportsPrecomputation()); throw NotImplemented("CryptoMaterial: this object does not support precomputation");} - //! retrieve previously saved precomputation - virtual void LoadPrecomputation(BufferedTransformation &storedPrecomputation) - {assert(!SupportsPrecomputation()); throw NotImplemented("CryptoMaterial: this object does not support precomputation");} - //! save precomputation for later use - virtual void SavePrecomputation(BufferedTransformation &storedPrecomputation) const - {assert(!SupportsPrecomputation()); throw NotImplemented("CryptoMaterial: this object does not support precomputation");} - - // for internal library use - void DoQuickSanityCheck() const {ThrowIfInvalid(NullRNG(), 0);} - -#if (defined(__SUNPRO_CC) && __SUNPRO_CC < 0x590) - // Sun Studio 11/CC 5.8 workaround: it generates incorrect code when casting to an empty virtual base class - char m_sunCCworkaround; -#endif -}; - -//! interface for generatable crypto material, such as private keys and crypto parameters - -class CRYPTOPP_DLL CRYPTOPP_NO_VTABLE GeneratableCryptoMaterial : virtual public CryptoMaterial -{ -public: - //! generate a random key or crypto parameters - /*! \throws KeyingErr if algorithm parameters are invalid, or if a key can't be generated - (e.g., if this is a public key object) */ - virtual void GenerateRandom(RandomNumberGenerator &rng, const NameValuePairs ¶ms = g_nullNameValuePairs) - {throw NotImplemented("GeneratableCryptoMaterial: this object does not support key/parameter generation");} - - //! calls the above function with a NameValuePairs object that just specifies "KeySize" - void GenerateRandomWithKeySize(RandomNumberGenerator &rng, unsigned int keySize); -}; - -//! interface for public keys - -class CRYPTOPP_DLL CRYPTOPP_NO_VTABLE PublicKey : virtual public CryptoMaterial -{ -}; - -//! interface for private keys - -class CRYPTOPP_DLL CRYPTOPP_NO_VTABLE PrivateKey : public GeneratableCryptoMaterial -{ -}; - -//! interface for crypto prameters - -class CRYPTOPP_DLL CRYPTOPP_NO_VTABLE CryptoParameters : public GeneratableCryptoMaterial -{ -}; - -//! interface for asymmetric algorithms - -class CRYPTOPP_DLL CRYPTOPP_NO_VTABLE AsymmetricAlgorithm : public Algorithm -{ -public: - //! returns a reference to the crypto material used by this object - virtual CryptoMaterial & AccessMaterial() =0; - //! returns a const reference to the crypto material used by this object - virtual const CryptoMaterial & GetMaterial() const =0; - - //! for backwards compatibility, calls AccessMaterial().Load(bt) - void BERDecode(BufferedTransformation &bt) - {AccessMaterial().Load(bt);} - //! for backwards compatibility, calls GetMaterial().Save(bt) - void DEREncode(BufferedTransformation &bt) const - {GetMaterial().Save(bt);} -}; - -//! interface for asymmetric algorithms using public keys - -class CRYPTOPP_DLL CRYPTOPP_NO_VTABLE PublicKeyAlgorithm : public AsymmetricAlgorithm -{ -public: - // VC60 workaround: no co-variant return type - CryptoMaterial & AccessMaterial() {return AccessPublicKey();} - const CryptoMaterial & GetMaterial() const {return GetPublicKey();} - - virtual PublicKey & AccessPublicKey() =0; - virtual const PublicKey & GetPublicKey() const {return const_cast<PublicKeyAlgorithm *>(this)->AccessPublicKey();} -}; - -//! interface for asymmetric algorithms using private keys - -class CRYPTOPP_DLL CRYPTOPP_NO_VTABLE PrivateKeyAlgorithm : public AsymmetricAlgorithm -{ -public: - CryptoMaterial & AccessMaterial() {return AccessPrivateKey();} - const CryptoMaterial & GetMaterial() const {return GetPrivateKey();} - - virtual PrivateKey & AccessPrivateKey() =0; - virtual const PrivateKey & GetPrivateKey() const {return const_cast<PrivateKeyAlgorithm *>(this)->AccessPrivateKey();} -}; - -//! interface for key agreement algorithms - -class CRYPTOPP_DLL CRYPTOPP_NO_VTABLE KeyAgreementAlgorithm : public AsymmetricAlgorithm -{ -public: - CryptoMaterial & AccessMaterial() {return AccessCryptoParameters();} - const CryptoMaterial & GetMaterial() const {return GetCryptoParameters();} - - virtual CryptoParameters & AccessCryptoParameters() =0; - virtual const CryptoParameters & GetCryptoParameters() const {return const_cast<KeyAgreementAlgorithm *>(this)->AccessCryptoParameters();} -}; - -//! interface for public-key encryptors and decryptors - -/*! This class provides an interface common to encryptors and decryptors - for querying their plaintext and ciphertext lengths. -*/ -class CRYPTOPP_DLL CRYPTOPP_NO_VTABLE PK_CryptoSystem -{ -public: - virtual ~PK_CryptoSystem() {} - - //! maximum length of plaintext for a given ciphertext length - /*! \note This function returns 0 if ciphertextLength is not valid (too long or too short). */ - virtual size_t MaxPlaintextLength(size_t ciphertextLength) const =0; - - //! calculate length of ciphertext given length of plaintext - /*! \note This function returns 0 if plaintextLength is not valid (too long). */ - virtual size_t CiphertextLength(size_t plaintextLength) const =0; - - //! this object supports the use of the parameter with the given name - /*! some possible parameter names: EncodingParameters, KeyDerivationParameters */ - virtual bool ParameterSupported(const char *name) const =0; - - //! return fixed ciphertext length, if one exists, otherwise return 0 - /*! \note "Fixed" here means length of ciphertext does not depend on length of plaintext. - It usually does depend on the key length. */ - virtual size_t FixedCiphertextLength() const {return 0;} - - //! return maximum plaintext length given the fixed ciphertext length, if one exists, otherwise return 0 - virtual size_t FixedMaxPlaintextLength() const {return 0;} - -#ifdef CRYPTOPP_MAINTAIN_BACKWARDS_COMPATIBILITY - size_t MaxPlainTextLength(size_t cipherTextLength) const {return MaxPlaintextLength(cipherTextLength);} - size_t CipherTextLength(size_t plainTextLength) const {return CiphertextLength(plainTextLength);} -#endif -}; - -//! interface for public-key encryptors -class CRYPTOPP_DLL CRYPTOPP_NO_VTABLE PK_Encryptor : public PK_CryptoSystem, public PublicKeyAlgorithm -{ -public: - //! exception thrown when trying to encrypt plaintext of invalid length - class CRYPTOPP_DLL InvalidPlaintextLength : public Exception - { - public: - InvalidPlaintextLength() : Exception(OTHER_ERROR, "PK_Encryptor: invalid plaintext length") {} - }; - - //! encrypt a byte string - /*! \pre CiphertextLength(plaintextLength) != 0 (i.e., plaintext isn't too long) - \pre size of ciphertext == CiphertextLength(plaintextLength) - */ - virtual void Encrypt(RandomNumberGenerator &rng, - const byte *plaintext, size_t plaintextLength, - byte *ciphertext, const NameValuePairs ¶meters = g_nullNameValuePairs) const =0; - - //! create a new encryption filter - /*! \note The caller is responsible for deleting the returned pointer. - \note Encoding parameters should be passed in the "EP" channel. - */ - virtual BufferedTransformation * CreateEncryptionFilter(RandomNumberGenerator &rng, - BufferedTransformation *attachment=NULL, const NameValuePairs ¶meters = g_nullNameValuePairs) const; -}; - -//! interface for public-key decryptors - -class CRYPTOPP_DLL CRYPTOPP_NO_VTABLE PK_Decryptor : public PK_CryptoSystem, public PrivateKeyAlgorithm -{ -public: - //! decrypt a byte string, and return the length of plaintext - /*! \pre size of plaintext == MaxPlaintextLength(ciphertextLength) bytes. - \return the actual length of the plaintext, indication that decryption failed. - */ - virtual DecodingResult Decrypt(RandomNumberGenerator &rng, - const byte *ciphertext, size_t ciphertextLength, - byte *plaintext, const NameValuePairs ¶meters = g_nullNameValuePairs) const =0; - - //! create a new decryption filter - /*! \note caller is responsible for deleting the returned pointer - */ - virtual BufferedTransformation * CreateDecryptionFilter(RandomNumberGenerator &rng, - BufferedTransformation *attachment=NULL, const NameValuePairs ¶meters = g_nullNameValuePairs) const; - - //! decrypt a fixed size ciphertext - DecodingResult FixedLengthDecrypt(RandomNumberGenerator &rng, const byte *ciphertext, byte *plaintext, const NameValuePairs ¶meters = g_nullNameValuePairs) const - {return Decrypt(rng, ciphertext, FixedCiphertextLength(), plaintext, parameters);} -}; - -#ifdef CRYPTOPP_MAINTAIN_BACKWARDS_COMPATIBILITY -typedef PK_CryptoSystem PK_FixedLengthCryptoSystem; -typedef PK_Encryptor PK_FixedLengthEncryptor; -typedef PK_Decryptor PK_FixedLengthDecryptor; -#endif - -//! interface for public-key signers and verifiers - -/*! This class provides an interface common to signers and verifiers - for querying scheme properties. -*/ -class CRYPTOPP_DLL CRYPTOPP_NO_VTABLE PK_SignatureScheme -{ -public: - //! invalid key exception, may be thrown by any function in this class if the private or public key has a length that can't be used - class CRYPTOPP_DLL InvalidKeyLength : public Exception - { - public: - InvalidKeyLength(const std::string &message) : Exception(OTHER_ERROR, message) {} - }; - - //! key too short exception, may be thrown by any function in this class if the private or public key is too short to sign or verify anything - class CRYPTOPP_DLL KeyTooShort : public InvalidKeyLength - { - public: - KeyTooShort() : InvalidKeyLength("PK_Signer: key too short for this signature scheme") {} - }; - - virtual ~PK_SignatureScheme() {} - - //! signature length if it only depends on the key, otherwise 0 - virtual size_t SignatureLength() const =0; - - //! maximum signature length produced for a given length of recoverable message part - virtual size_t MaxSignatureLength(size_t recoverablePartLength = 0) const {return SignatureLength();} - - //! length of longest message that can be recovered, or 0 if this signature scheme does not support message recovery - virtual size_t MaxRecoverableLength() const =0; - - //! length of longest message that can be recovered from a signature of given length, or 0 if this signature scheme does not support message recovery - virtual size_t MaxRecoverableLengthFromSignatureLength(size_t signatureLength) const =0; - - //! requires a random number generator to sign - /*! if this returns false, NullRNG() can be passed to functions that take RandomNumberGenerator & */ - virtual bool IsProbabilistic() const =0; - - //! whether or not a non-recoverable message part can be signed - virtual bool AllowNonrecoverablePart() const =0; - - //! if this function returns true, during verification you must input the signature before the message, otherwise you can input it at anytime */ - virtual bool SignatureUpfront() const {return false;} - - //! whether you must input the recoverable part before the non-recoverable part during signing - virtual bool RecoverablePartFirst() const =0; -}; - -//! interface for accumulating messages to be signed or verified -/*! Only Update() should be called - on this class. No other functions inherited from HashTransformation should be called. -*/ -class CRYPTOPP_DLL CRYPTOPP_NO_VTABLE PK_MessageAccumulator : public HashTransformation -{ -public: - //! should not be called on PK_MessageAccumulator - unsigned int DigestSize() const - {throw NotImplemented("PK_MessageAccumulator: DigestSize() should not be called");} - //! should not be called on PK_MessageAccumulator - void TruncatedFinal(byte *digest, size_t digestSize) - {throw NotImplemented("PK_MessageAccumulator: TruncatedFinal() should not be called");} -}; - -//! interface for public-key signers - -class CRYPTOPP_DLL CRYPTOPP_NO_VTABLE PK_Signer : public PK_SignatureScheme, public PrivateKeyAlgorithm -{ -public: - //! create a new HashTransformation to accumulate the message to be signed - virtual PK_MessageAccumulator * NewSignatureAccumulator(RandomNumberGenerator &rng) const =0; - - virtual void InputRecoverableMessage(PK_MessageAccumulator &messageAccumulator, const byte *recoverableMessage, size_t recoverableMessageLength) const =0; - - //! sign and delete messageAccumulator (even in case of exception thrown) - /*! \pre size of signature == MaxSignatureLength() - \return actual signature length - */ - virtual size_t Sign(RandomNumberGenerator &rng, PK_MessageAccumulator *messageAccumulator, byte *signature) const; - - //! sign and restart messageAccumulator - /*! \pre size of signature == MaxSignatureLength() - \return actual signature length - */ - virtual size_t SignAndRestart(RandomNumberGenerator &rng, PK_MessageAccumulator &messageAccumulator, byte *signature, bool restart=true) const =0; - - //! sign a message - /*! \pre size of signature == MaxSignatureLength() - \return actual signature length - */ - virtual size_t SignMessage(RandomNumberGenerator &rng, const byte *message, size_t messageLen, byte *signature) const; - - //! sign a recoverable message - /*! \pre size of signature == MaxSignatureLength(recoverableMessageLength) - \return actual signature length - */ - virtual size_t SignMessageWithRecovery(RandomNumberGenerator &rng, const byte *recoverableMessage, size_t recoverableMessageLength, - const byte *nonrecoverableMessage, size_t nonrecoverableMessageLength, byte *signature) const; -}; - -//! interface for public-key signature verifiers -/*! The Recover* functions throw NotImplemented if the signature scheme does not support - message recovery. - The Verify* functions throw InvalidDataFormat if the scheme does support message - recovery and the signature contains a non-empty recoverable message part. The - Recovery* functions should be used in that case. -*/ -class CRYPTOPP_DLL CRYPTOPP_NO_VTABLE PK_Verifier : public PK_SignatureScheme, public PublicKeyAlgorithm -{ -public: - //! create a new HashTransformation to accumulate the message to be verified - virtual PK_MessageAccumulator * NewVerificationAccumulator() const =0; - - //! input signature into a message accumulator - virtual void InputSignature(PK_MessageAccumulator &messageAccumulator, const byte *signature, size_t signatureLength) const =0; - - //! check whether messageAccumulator contains a valid signature and message, and delete messageAccumulator (even in case of exception thrown) - virtual bool Verify(PK_MessageAccumulator *messageAccumulator) const; - - //! check whether messageAccumulator contains a valid signature and message, and restart messageAccumulator - virtual bool VerifyAndRestart(PK_MessageAccumulator &messageAccumulator) const =0; - - //! check whether input signature is a valid signature for input message - virtual bool VerifyMessage(const byte *message, size_t messageLen, - const byte *signature, size_t signatureLength) const; - - //! recover a message from its signature - /*! \pre size of recoveredMessage == MaxRecoverableLengthFromSignatureLength(signatureLength) - */ - virtual DecodingResult Recover(byte *recoveredMessage, PK_MessageAccumulator *messageAccumulator) const; - - //! recover a message from its signature - /*! \pre size of recoveredMessage == MaxRecoverableLengthFromSignatureLength(signatureLength) - */ - virtual DecodingResult RecoverAndRestart(byte *recoveredMessage, PK_MessageAccumulator &messageAccumulator) const =0; - - //! recover a message from its signature - /*! \pre size of recoveredMessage == MaxRecoverableLengthFromSignatureLength(signatureLength) - */ - virtual DecodingResult RecoverMessage(byte *recoveredMessage, - const byte *nonrecoverableMessage, size_t nonrecoverableMessageLength, - const byte *signature, size_t signatureLength) const; -}; - -//! interface for domains of simple key agreement protocols - -/*! A key agreement domain is a set of parameters that must be shared - by two parties in a key agreement protocol, along with the algorithms - for generating key pairs and deriving agreed values. -*/ -class CRYPTOPP_DLL CRYPTOPP_NO_VTABLE SimpleKeyAgreementDomain : public KeyAgreementAlgorithm -{ -public: - //! return length of agreed value produced - virtual unsigned int AgreedValueLength() const =0; - //! return length of private keys in this domain - virtual unsigned int PrivateKeyLength() const =0; - //! return length of public keys in this domain - virtual unsigned int PublicKeyLength() const =0; - //! generate private key - /*! \pre size of privateKey == PrivateKeyLength() */ - virtual void GeneratePrivateKey(RandomNumberGenerator &rng, byte *privateKey) const =0; - //! generate public key - /*! \pre size of publicKey == PublicKeyLength() */ - virtual void GeneratePublicKey(RandomNumberGenerator &rng, const byte *privateKey, byte *publicKey) const =0; - //! generate private/public key pair - /*! \note equivalent to calling GeneratePrivateKey() and then GeneratePublicKey() */ - virtual void GenerateKeyPair(RandomNumberGenerator &rng, byte *privateKey, byte *publicKey) const; - //! derive agreed value from your private key and couterparty's public key, return false in case of failure - /*! \note If you have previously validated the public key, use validateOtherPublicKey=false to save time. - \pre size of agreedValue == AgreedValueLength() - \pre length of privateKey == PrivateKeyLength() - \pre length of otherPublicKey == PublicKeyLength() - */ - virtual bool Agree(byte *agreedValue, const byte *privateKey, const byte *otherPublicKey, bool validateOtherPublicKey=true) const =0; - -#ifdef CRYPTOPP_MAINTAIN_BACKWARDS_COMPATIBILITY - bool ValidateDomainParameters(RandomNumberGenerator &rng) const - {return GetCryptoParameters().Validate(rng, 2);} -#endif -}; - -//! interface for domains of authenticated key agreement protocols - -/*! In an authenticated key agreement protocol, each party has two - key pairs. The long-lived key pair is called the static key pair, - and the short-lived key pair is called the ephemeral key pair. -*/ -class CRYPTOPP_DLL CRYPTOPP_NO_VTABLE AuthenticatedKeyAgreementDomain : public KeyAgreementAlgorithm -{ -public: - //! return length of agreed value produced - virtual unsigned int AgreedValueLength() const =0; - - //! return length of static private keys in this domain - virtual unsigned int StaticPrivateKeyLength() const =0; - //! return length of static public keys in this domain - virtual unsigned int StaticPublicKeyLength() const =0; - //! generate static private key - /*! \pre size of privateKey == PrivateStaticKeyLength() */ - virtual void GenerateStaticPrivateKey(RandomNumberGenerator &rng, byte *privateKey) const =0; - //! generate static public key - /*! \pre size of publicKey == PublicStaticKeyLength() */ - virtual void GenerateStaticPublicKey(RandomNumberGenerator &rng, const byte *privateKey, byte *publicKey) const =0; - //! generate private/public key pair - /*! \note equivalent to calling GenerateStaticPrivateKey() and then GenerateStaticPublicKey() */ - virtual void GenerateStaticKeyPair(RandomNumberGenerator &rng, byte *privateKey, byte *publicKey) const; - - //! return length of ephemeral private keys in this domain - virtual unsigned int EphemeralPrivateKeyLength() const =0; - //! return length of ephemeral public keys in this domain - virtual unsigned int EphemeralPublicKeyLength() const =0; - //! generate ephemeral private key - /*! \pre size of privateKey == PrivateEphemeralKeyLength() */ - virtual void GenerateEphemeralPrivateKey(RandomNumberGenerator &rng, byte *privateKey) const =0; - //! generate ephemeral public key - /*! \pre size of publicKey == PublicEphemeralKeyLength() */ - virtual void GenerateEphemeralPublicKey(RandomNumberGenerator &rng, const byte *privateKey, byte *publicKey) const =0; - //! generate private/public key pair - /*! \note equivalent to calling GenerateEphemeralPrivateKey() and then GenerateEphemeralPublicKey() */ - virtual void GenerateEphemeralKeyPair(RandomNumberGenerator &rng, byte *privateKey, byte *publicKey) const; - - //! derive agreed value from your private keys and couterparty's public keys, return false in case of failure - /*! \note The ephemeral public key will always be validated. - If you have previously validated the static public key, use validateStaticOtherPublicKey=false to save time. - \pre size of agreedValue == AgreedValueLength() - \pre length of staticPrivateKey == StaticPrivateKeyLength() - \pre length of ephemeralPrivateKey == EphemeralPrivateKeyLength() - \pre length of staticOtherPublicKey == StaticPublicKeyLength() - \pre length of ephemeralOtherPublicKey == EphemeralPublicKeyLength() - */ - virtual bool Agree(byte *agreedValue, - const byte *staticPrivateKey, const byte *ephemeralPrivateKey, - const byte *staticOtherPublicKey, const byte *ephemeralOtherPublicKey, - bool validateStaticOtherPublicKey=true) const =0; - -#ifdef CRYPTOPP_MAINTAIN_BACKWARDS_COMPATIBILITY - bool ValidateDomainParameters(RandomNumberGenerator &rng) const - {return GetCryptoParameters().Validate(rng, 2);} -#endif -}; - -// interface for password authenticated key agreement protocols, not implemented yet -#if 0 -//! interface for protocol sessions -/*! The methods should be called in the following order: - - InitializeSession(rng, parameters); // or call initialize method in derived class - while (true) - { - if (OutgoingMessageAvailable()) - { - length = GetOutgoingMessageLength(); - GetOutgoingMessage(message); - ; // send outgoing message - } - - if (LastMessageProcessed()) - break; - - ; // receive incoming message - ProcessIncomingMessage(message); - } - ; // call methods in derived class to obtain result of protocol session -*/ -class ProtocolSession -{ -public: - //! exception thrown when an invalid protocol message is processed - class ProtocolError : public Exception - { - public: - ProtocolError(ErrorType errorType, const std::string &s) : Exception(errorType, s) {} - }; - - //! exception thrown when a function is called unexpectedly - /*! for example calling ProcessIncomingMessage() when ProcessedLastMessage() == true */ - class UnexpectedMethodCall : public Exception - { - public: - UnexpectedMethodCall(const std::string &s) : Exception(OTHER_ERROR, s) {} - }; - - ProtocolSession() : m_rng(NULL), m_throwOnProtocolError(true), m_validState(false) {} - virtual ~ProtocolSession() {} - - virtual void InitializeSession(RandomNumberGenerator &rng, const NameValuePairs ¶meters) =0; - - bool GetThrowOnProtocolError() const {return m_throwOnProtocolError;} - void SetThrowOnProtocolError(bool throwOnProtocolError) {m_throwOnProtocolError = throwOnProtocolError;} - - bool HasValidState() const {return m_validState;} - - virtual bool OutgoingMessageAvailable() const =0; - virtual unsigned int GetOutgoingMessageLength() const =0; - virtual void GetOutgoingMessage(byte *message) =0; - - virtual bool LastMessageProcessed() const =0; - virtual void ProcessIncomingMessage(const byte *message, unsigned int messageLength) =0; - -protected: - void HandleProtocolError(Exception::ErrorType errorType, const std::string &s) const; - void CheckAndHandleInvalidState() const; - void SetValidState(bool valid) {m_validState = valid;} - - RandomNumberGenerator *m_rng; - -private: - bool m_throwOnProtocolError, m_validState; -}; - -class KeyAgreementSession : public ProtocolSession -{ -public: - virtual unsigned int GetAgreedValueLength() const =0; - virtual void GetAgreedValue(byte *agreedValue) const =0; -}; - -class PasswordAuthenticatedKeyAgreementSession : public KeyAgreementSession -{ -public: - void InitializePasswordAuthenticatedKeyAgreementSession(RandomNumberGenerator &rng, - const byte *myId, unsigned int myIdLength, - const byte *counterPartyId, unsigned int counterPartyIdLength, - const byte *passwordOrVerifier, unsigned int passwordOrVerifierLength); -}; - -class PasswordAuthenticatedKeyAgreementDomain : public KeyAgreementAlgorithm -{ -public: - //! return whether the domain parameters stored in this object are valid - virtual bool ValidateDomainParameters(RandomNumberGenerator &rng) const - {return GetCryptoParameters().Validate(rng, 2);} - - virtual unsigned int GetPasswordVerifierLength(const byte *password, unsigned int passwordLength) const =0; - virtual void GeneratePasswordVerifier(RandomNumberGenerator &rng, const byte *userId, unsigned int userIdLength, const byte *password, unsigned int passwordLength, byte *verifier) const =0; - - enum RoleFlags {CLIENT=1, SERVER=2, INITIATOR=4, RESPONDER=8}; - - virtual bool IsValidRole(unsigned int role) =0; - virtual PasswordAuthenticatedKeyAgreementSession * CreateProtocolSession(unsigned int role) const =0; -}; -#endif - -//! BER Decode Exception Class, may be thrown during an ASN1 BER decode operation -class CRYPTOPP_DLL BERDecodeErr : public InvalidArgument -{ -public: - BERDecodeErr() : InvalidArgument("BER decode error") {} - BERDecodeErr(const std::string &s) : InvalidArgument(s) {} -}; - -//! interface for encoding and decoding ASN1 objects -class CRYPTOPP_DLL CRYPTOPP_NO_VTABLE ASN1Object -{ -public: - virtual ~ASN1Object() {} - //! decode this object from a BufferedTransformation, using BER (Basic Encoding Rules) - virtual void BERDecode(BufferedTransformation &bt) =0; - //! encode this object into a BufferedTransformation, using DER (Distinguished Encoding Rules) - virtual void DEREncode(BufferedTransformation &bt) const =0; - //! encode this object into a BufferedTransformation, using BER - /*! this may be useful if DEREncode() would be too inefficient */ - virtual void BEREncode(BufferedTransformation &bt) const {DEREncode(bt);} -}; - -#ifdef CRYPTOPP_MAINTAIN_BACKWARDS_COMPATIBILITY -typedef PK_SignatureScheme PK_SignatureSystem; -typedef SimpleKeyAgreementDomain PK_SimpleKeyAgreementDomain; -typedef AuthenticatedKeyAgreementDomain PK_AuthenticatedKeyAgreementDomain; -#endif - -NAMESPACE_END - -#endif diff --git a/src/cryptopp/iterhash.h b/src/cryptopp/iterhash.h deleted file mode 100644 index 2f5895e2d3..0000000000 --- a/src/cryptopp/iterhash.h +++ /dev/null @@ -1,29 +0,0 @@ -#ifndef CRYPTOPP_ITERHASH_H -#define CRYPTOPP_ITERHASH_H - -#include "secblock.h" - -NAMESPACE_BEGIN(CryptoPP) - -// *** trimmed down dependency from iterhash.h *** -template <class T_HashWordType, class T_Endianness, unsigned int T_BlockSize, unsigned int T_StateSize, class T_Transform, unsigned int T_DigestSize = 0, bool T_StateAligned = false> -class CRYPTOPP_NO_VTABLE IteratedHashWithStaticTransform -{ -public: - CRYPTOPP_CONSTANT(DIGESTSIZE = T_DigestSize ? T_DigestSize : T_StateSize) - unsigned int DigestSize() const {return DIGESTSIZE;}; - typedef T_HashWordType HashWordType; - CRYPTOPP_CONSTANT(BLOCKSIZE = T_BlockSize) - -protected: - IteratedHashWithStaticTransform() {this->Init();} - void HashEndianCorrectedBlock(const T_HashWordType *data) {T_Transform::Transform(this->m_state, data);} - void Init() {T_Transform::InitState(this->m_state);} - - T_HashWordType* StateBuf() {return this->m_state;} - FixedSizeAlignedSecBlock<T_HashWordType, T_BlockSize/sizeof(T_HashWordType), T_StateAligned> m_state; -}; - -NAMESPACE_END - -#endif diff --git a/src/cryptopp/misc.h b/src/cryptopp/misc.h deleted file mode 100644 index de8037bf61..0000000000 --- a/src/cryptopp/misc.h +++ /dev/null @@ -1,1134 +0,0 @@ -#ifndef CRYPTOPP_MISC_H -#define CRYPTOPP_MISC_H - -#include "cryptlib.h" -#include "smartptr.h" -#include <string.h> // for memcpy and memmove - -#ifdef _MSC_VER - #include <stdlib.h> - #if _MSC_VER >= 1400 - // VC2005 workaround: disable declarations that conflict with winnt.h - #define _interlockedbittestandset CRYPTOPP_DISABLED_INTRINSIC_1 - #define _interlockedbittestandreset CRYPTOPP_DISABLED_INTRINSIC_2 - #define _interlockedbittestandset64 CRYPTOPP_DISABLED_INTRINSIC_3 - #define _interlockedbittestandreset64 CRYPTOPP_DISABLED_INTRINSIC_4 - #include <intrin.h> - #undef _interlockedbittestandset - #undef _interlockedbittestandreset - #undef _interlockedbittestandset64 - #undef _interlockedbittestandreset64 - #define CRYPTOPP_FAST_ROTATE(x) 1 - #elif _MSC_VER >= 1300 - #define CRYPTOPP_FAST_ROTATE(x) ((x) == 32 | (x) == 64) - #else - #define CRYPTOPP_FAST_ROTATE(x) ((x) == 32) - #endif -#elif (defined(__MWERKS__) && TARGET_CPU_PPC) || \ - (defined(__GNUC__) && (defined(_ARCH_PWR2) || defined(_ARCH_PWR) || defined(_ARCH_PPC) || defined(_ARCH_PPC64) || defined(_ARCH_COM))) - #define CRYPTOPP_FAST_ROTATE(x) ((x) == 32) -#elif defined(__GNUC__) && (CRYPTOPP_BOOL_X64 || CRYPTOPP_BOOL_X86) // depend on GCC's peephole optimization to generate rotate instructions - #define CRYPTOPP_FAST_ROTATE(x) 1 -#else - #define CRYPTOPP_FAST_ROTATE(x) 0 -#endif - -#ifdef __BORLANDC__ -#include <mem.h> -#endif - -#if defined(__GNUC__) && defined(__linux__) -#define CRYPTOPP_BYTESWAP_AVAILABLE -#include <byteswap.h> -#endif - -NAMESPACE_BEGIN(CryptoPP) - -// ************** compile-time assertion *************** - -template <bool b> -struct CompileAssert -{ - static char dummy[2*b-1]; -}; - -#define CRYPTOPP_COMPILE_ASSERT(assertion) CRYPTOPP_COMPILE_ASSERT_INSTANCE(assertion, __LINE__) -#if defined(CRYPTOPP_EXPORTS) || defined(CRYPTOPP_IMPORTS) -#define CRYPTOPP_COMPILE_ASSERT_INSTANCE(assertion, instance) -#else -#define CRYPTOPP_COMPILE_ASSERT_INSTANCE(assertion, instance) static CompileAssert<(assertion)> CRYPTOPP_ASSERT_JOIN(cryptopp_assert_, instance) -#endif -#define CRYPTOPP_ASSERT_JOIN(X, Y) CRYPTOPP_DO_ASSERT_JOIN(X, Y) -#define CRYPTOPP_DO_ASSERT_JOIN(X, Y) X##Y - -// ************** misc classes *************** - -class CRYPTOPP_DLL Empty -{ -}; - -//! _ -template <class BASE1, class BASE2> -class CRYPTOPP_NO_VTABLE TwoBases : public BASE1, public BASE2 -{ -}; - -//! _ -template <class BASE1, class BASE2, class BASE3> -class CRYPTOPP_NO_VTABLE ThreeBases : public BASE1, public BASE2, public BASE3 -{ -}; - -template <class T> -class ObjectHolder -{ -protected: - T m_object; -}; - -class NotCopyable -{ -public: - NotCopyable() {} -private: - NotCopyable(const NotCopyable &); - void operator=(const NotCopyable &); -}; - -template <class T> -struct NewObject -{ - T* operator()() const {return new T;} -}; - -/*! This function safely initializes a static object in a multithreaded environment without using locks. - It may leak memory when two threads try to initialize the static object at the same time - but this should be acceptable since each static object is only initialized once per session. -*/ -template <class T, class F = NewObject<T>, int instance=0> -class Singleton -{ -public: - Singleton(F objectFactory = F()) : m_objectFactory(objectFactory) {} - - // prevent this function from being inlined - CRYPTOPP_NOINLINE const T & Ref(CRYPTOPP_NOINLINE_DOTDOTDOT) const; - -private: - F m_objectFactory; -}; - -template <class T, class F, int instance> -const T & Singleton<T, F, instance>::Ref(CRYPTOPP_NOINLINE_DOTDOTDOT) const -{ - static simple_ptr<T> s_pObject; - static char s_objectState = 0; - -retry: - switch (s_objectState) - { - case 0: - s_objectState = 1; - try - { - s_pObject.m_p = m_objectFactory(); - } - catch(...) - { - s_objectState = 0; - throw; - } - s_objectState = 2; - break; - case 1: - goto retry; - default: - break; - } - return *s_pObject.m_p; -} - -// ************** misc functions *************** - -#if (!__STDC_WANT_SECURE_LIB__) -inline void memcpy_s(void *dest, size_t sizeInBytes, const void *src, size_t count) -{ - if (count > sizeInBytes) - throw InvalidArgument("memcpy_s: buffer overflow"); - memcpy(dest, src, count); -} - -inline void memmove_s(void *dest, size_t sizeInBytes, const void *src, size_t count) -{ - if (count > sizeInBytes) - throw InvalidArgument("memmove_s: buffer overflow"); - memmove(dest, src, count); -} -#endif - -inline void * memset_z(void *ptr, int value, size_t num) -{ -// avoid extranous warning on GCC 4.3.2 Ubuntu 8.10 -#if CRYPTOPP_GCC_VERSION >= 30001 - if (__builtin_constant_p(num) && num==0) - return ptr; -#endif - return memset(ptr, value, num); -} - -// can't use std::min or std::max in MSVC60 or Cygwin 1.1.0 -template <class T> inline const T& STDMIN(const T& a, const T& b) -{ - return b < a ? b : a; -} - -template <class T1, class T2> inline const T1 UnsignedMin(const T1& a, const T2& b) -{ - CRYPTOPP_COMPILE_ASSERT((sizeof(T1)<=sizeof(T2) && T2(-1)>0) || (sizeof(T1)>sizeof(T2) && T1(-1)>0)); - assert(a==0 || a>0); // GCC workaround: get rid of the warning "comparison is always true due to limited range of data type" - assert(b>=0); - - if (sizeof(T1)<=sizeof(T2)) - return b < (T2)a ? (T1)b : a; - else - return (T1)b < a ? (T1)b : a; -} - -template <class T> inline const T& STDMAX(const T& a, const T& b) -{ - return a < b ? b : a; -} - -#define RETURN_IF_NONZERO(x) size_t returnedValue = x; if (returnedValue) return returnedValue - -// this version of the macro is fastest on Pentium 3 and Pentium 4 with MSVC 6 SP5 w/ Processor Pack -#define GETBYTE(x, y) (unsigned int)byte((x)>>(8*(y))) -// these may be faster on other CPUs/compilers -// #define GETBYTE(x, y) (unsigned int)(((x)>>(8*(y)))&255) -// #define GETBYTE(x, y) (((byte *)&(x))[y]) - -#define CRYPTOPP_GET_BYTE_AS_BYTE(x, y) byte((x)>>(8*(y))) - -template <class T> -unsigned int Parity(T value) -{ - for (unsigned int i=8*sizeof(value)/2; i>0; i/=2) - value ^= value >> i; - return (unsigned int)value&1; -} - -template <class T> -unsigned int BytePrecision(const T &value) -{ - if (!value) - return 0; - - unsigned int l=0, h=8*sizeof(value); - - while (h-l > 8) - { - unsigned int t = (l+h)/2; - if (value >> t) - l = t; - else - h = t; - } - - return h/8; -} - -template <class T> -unsigned int BitPrecision(const T &value) -{ - if (!value) - return 0; - - unsigned int l=0, h=8*sizeof(value); - - while (h-l > 1) - { - unsigned int t = (l+h)/2; - if (value >> t) - l = t; - else - h = t; - } - - return h; -} - -template <class T> -inline T Crop(T value, size_t size) -{ - if (size < 8*sizeof(value)) - return T(value & ((T(1) << size) - 1)); - else - return value; -} - -template <class T1, class T2> -inline bool SafeConvert(T1 from, T2 &to) -{ - to = (T2)from; - if (from != to || (from > 0) != (to > 0)) - return false; - return true; -} - -inline size_t BitsToBytes(size_t bitCount) -{ - return ((bitCount+7)/(8)); -} - -inline size_t BytesToWords(size_t byteCount) -{ - return ((byteCount+WORD_SIZE-1)/WORD_SIZE); -} - -inline size_t BitsToWords(size_t bitCount) -{ - return ((bitCount+WORD_BITS-1)/(WORD_BITS)); -} - -inline size_t BitsToDwords(size_t bitCount) -{ - return ((bitCount+2*WORD_BITS-1)/(2*WORD_BITS)); -} - -CRYPTOPP_DLL void CRYPTOPP_API xorbuf(byte *buf, const byte *mask, size_t count); -CRYPTOPP_DLL void CRYPTOPP_API xorbuf(byte *output, const byte *input, const byte *mask, size_t count); - -CRYPTOPP_DLL bool CRYPTOPP_API VerifyBufsEqual(const byte *buf1, const byte *buf2, size_t count); - -template <class T> -inline bool IsPowerOf2(const T &n) -{ - return n > 0 && (n & (n-1)) == 0; -} - -template <class T1, class T2> -inline T2 ModPowerOf2(const T1 &a, const T2 &b) -{ - assert(IsPowerOf2(b)); - return T2(a) & (b-1); -} - -template <class T1, class T2> -inline T1 RoundDownToMultipleOf(const T1 &n, const T2 &m) -{ - if (IsPowerOf2(m)) - return n - ModPowerOf2(n, m); - else - return n - n%m; -} - -template <class T1, class T2> -inline T1 RoundUpToMultipleOf(const T1 &n, const T2 &m) -{ - if (n+m-1 < n) - throw InvalidArgument("RoundUpToMultipleOf: integer overflow"); - return RoundDownToMultipleOf(n+m-1, m); -} - -template <class T> -inline unsigned int GetAlignmentOf(T *dummy=NULL) // VC60 workaround -{ -#ifdef CRYPTOPP_ALLOW_UNALIGNED_DATA_ACCESS - if (sizeof(T) < 16) - return 1; -#endif - -#if (_MSC_VER >= 1300) - return __alignof(T); -#elif defined(__GNUC__) - return __alignof__(T); -#elif CRYPTOPP_BOOL_SLOW_WORD64 - return UnsignedMin(4U, sizeof(T)); -#else - return sizeof(T); -#endif -} - -inline bool IsAlignedOn(const void *p, unsigned int alignment) -{ - return alignment==1 || (IsPowerOf2(alignment) ? ModPowerOf2((size_t)p, alignment) == 0 : (size_t)p % alignment == 0); -} - -template <class T> -inline bool IsAligned(const void *p, T *dummy=NULL) // VC60 workaround -{ - return IsAlignedOn(p, GetAlignmentOf<T>()); -} - -#ifdef IS_LITTLE_ENDIAN - typedef LittleEndian NativeByteOrder; -#else - typedef BigEndian NativeByteOrder; -#endif - -inline ByteOrder GetNativeByteOrder() -{ - return NativeByteOrder::ToEnum(); -} - -inline bool NativeByteOrderIs(ByteOrder order) -{ - return order == GetNativeByteOrder(); -} - -template <class T> -std::string IntToString(T a, unsigned int base = 10) -{ - if (a == 0) - return "0"; - bool negate = false; - if (a < 0) - { - negate = true; - a = 0-a; // VC .NET does not like -a - } - std::string result; - while (a > 0) - { - T digit = a % base; - result = char((digit < 10 ? '0' : ('a' - 10)) + digit) + result; - a /= base; - } - if (negate) - result = "-" + result; - return result; -} - -template <class T1, class T2> -inline T1 SaturatingSubtract(const T1 &a, const T2 &b) -{ - return T1((a > b) ? (a - b) : 0); -} - -template <class T> -inline CipherDir GetCipherDir(const T &obj) -{ - return obj.IsForwardTransformation() ? ENCRYPTION : DECRYPTION; -} - -CRYPTOPP_DLL void CRYPTOPP_API CallNewHandler(); - -inline void IncrementCounterByOne(byte *inout, unsigned int s) -{ - for (int i=s-1, carry=1; i>=0 && carry; i--) - carry = !++inout[i]; -} - -inline void IncrementCounterByOne(byte *output, const byte *input, unsigned int s) -{ - int i, carry; - for (i=s-1, carry=1; i>=0 && carry; i--) - carry = ((output[i] = input[i]+1) == 0); - memcpy_s(output, s, input, i+1); -} - -// ************** rotate functions *************** - -template <class T> inline T rotlFixed(T x, unsigned int y) -{ - assert(y < sizeof(T)*8); - return T((x<<y) | (x>>(sizeof(T)*8-y))); -} - -template <class T> inline T rotrFixed(T x, unsigned int y) -{ - assert(y < sizeof(T)*8); - return T((x>>y) | (x<<(sizeof(T)*8-y))); -} - -template <class T> inline T rotlVariable(T x, unsigned int y) -{ - assert(y < sizeof(T)*8); - return T((x<<y) | (x>>(sizeof(T)*8-y))); -} - -template <class T> inline T rotrVariable(T x, unsigned int y) -{ - assert(y < sizeof(T)*8); - return T((x>>y) | (x<<(sizeof(T)*8-y))); -} - -template <class T> inline T rotlMod(T x, unsigned int y) -{ - y %= sizeof(T)*8; - return T((x<<y) | (x>>(sizeof(T)*8-y))); -} - -template <class T> inline T rotrMod(T x, unsigned int y) -{ - y %= sizeof(T)*8; - return T((x>>y) | (x<<(sizeof(T)*8-y))); -} - -#ifdef _MSC_VER - -template<> inline word32 rotlFixed<word32>(word32 x, unsigned int y) -{ - assert(y < 8*sizeof(x)); - return y ? _lrotl(x, y) : x; -} - -template<> inline word32 rotrFixed<word32>(word32 x, unsigned int y) -{ - assert(y < 8*sizeof(x)); - return y ? _lrotr(x, y) : x; -} - -template<> inline word32 rotlVariable<word32>(word32 x, unsigned int y) -{ - assert(y < 8*sizeof(x)); - return _lrotl(x, y); -} - -template<> inline word32 rotrVariable<word32>(word32 x, unsigned int y) -{ - assert(y < 8*sizeof(x)); - return _lrotr(x, y); -} - -template<> inline word32 rotlMod<word32>(word32 x, unsigned int y) -{ - return _lrotl(x, y); -} - -template<> inline word32 rotrMod<word32>(word32 x, unsigned int y) -{ - return _lrotr(x, y); -} - -#endif // #ifdef _MSC_VER - -#if _MSC_VER >= 1300 && !defined(__INTEL_COMPILER) -// Intel C++ Compiler 10.0 calls a function instead of using the rotate instruction when using these instructions - -template<> inline word64 rotlFixed<word64>(word64 x, unsigned int y) -{ - assert(y < 8*sizeof(x)); - return y ? _rotl64(x, y) : x; -} - -template<> inline word64 rotrFixed<word64>(word64 x, unsigned int y) -{ - assert(y < 8*sizeof(x)); - return y ? _rotr64(x, y) : x; -} - -template<> inline word64 rotlVariable<word64>(word64 x, unsigned int y) -{ - assert(y < 8*sizeof(x)); - return _rotl64(x, y); -} - -template<> inline word64 rotrVariable<word64>(word64 x, unsigned int y) -{ - assert(y < 8*sizeof(x)); - return _rotr64(x, y); -} - -template<> inline word64 rotlMod<word64>(word64 x, unsigned int y) -{ - return _rotl64(x, y); -} - -template<> inline word64 rotrMod<word64>(word64 x, unsigned int y) -{ - return _rotr64(x, y); -} - -#endif // #if _MSC_VER >= 1310 - -#if _MSC_VER >= 1400 && !defined(__INTEL_COMPILER) -// Intel C++ Compiler 10.0 gives undefined externals with these - -template<> inline word16 rotlFixed<word16>(word16 x, unsigned int y) -{ - assert(y < 8*sizeof(x)); - return y ? _rotl16(x, y) : x; -} - -template<> inline word16 rotrFixed<word16>(word16 x, unsigned int y) -{ - assert(y < 8*sizeof(x)); - return y ? _rotr16(x, y) : x; -} - -template<> inline word16 rotlVariable<word16>(word16 x, unsigned int y) -{ - assert(y < 8*sizeof(x)); - return _rotl16(x, y); -} - -template<> inline word16 rotrVariable<word16>(word16 x, unsigned int y) -{ - assert(y < 8*sizeof(x)); - return _rotr16(x, y); -} - -template<> inline word16 rotlMod<word16>(word16 x, unsigned int y) -{ - return _rotl16(x, y); -} - -template<> inline word16 rotrMod<word16>(word16 x, unsigned int y) -{ - return _rotr16(x, y); -} - -template<> inline byte rotlFixed<byte>(byte x, unsigned int y) -{ - assert(y < 8*sizeof(x)); - return y ? _rotl8(x, y) : x; -} - -template<> inline byte rotrFixed<byte>(byte x, unsigned int y) -{ - assert(y < 8*sizeof(x)); - return y ? _rotr8(x, y) : x; -} - -template<> inline byte rotlVariable<byte>(byte x, unsigned int y) -{ - assert(y < 8*sizeof(x)); - return _rotl8(x, y); -} - -template<> inline byte rotrVariable<byte>(byte x, unsigned int y) -{ - assert(y < 8*sizeof(x)); - return _rotr8(x, y); -} - -template<> inline byte rotlMod<byte>(byte x, unsigned int y) -{ - return _rotl8(x, y); -} - -template<> inline byte rotrMod<byte>(byte x, unsigned int y) -{ - return _rotr8(x, y); -} - -#endif // #if _MSC_VER >= 1400 - -#if (defined(__MWERKS__) && TARGET_CPU_PPC) - -template<> inline word32 rotlFixed<word32>(word32 x, unsigned int y) -{ - assert(y < 32); - return y ? __rlwinm(x,y,0,31) : x; -} - -template<> inline word32 rotrFixed<word32>(word32 x, unsigned int y) -{ - assert(y < 32); - return y ? __rlwinm(x,32-y,0,31) : x; -} - -template<> inline word32 rotlVariable<word32>(word32 x, unsigned int y) -{ - assert(y < 32); - return (__rlwnm(x,y,0,31)); -} - -template<> inline word32 rotrVariable<word32>(word32 x, unsigned int y) -{ - assert(y < 32); - return (__rlwnm(x,32-y,0,31)); -} - -template<> inline word32 rotlMod<word32>(word32 x, unsigned int y) -{ - return (__rlwnm(x,y,0,31)); -} - -template<> inline word32 rotrMod<word32>(word32 x, unsigned int y) -{ - return (__rlwnm(x,32-y,0,31)); -} - -#endif // #if (defined(__MWERKS__) && TARGET_CPU_PPC) - -// ************** endian reversal *************** - -template <class T> -inline unsigned int GetByte(ByteOrder order, T value, unsigned int index) -{ - if (order == LITTLE_ENDIAN_ORDER) - return GETBYTE(value, index); - else - return GETBYTE(value, sizeof(T)-index-1); -} - -inline byte ByteReverse(byte value) -{ - return value; -} - -inline word16 ByteReverse(word16 value) -{ -#ifdef CRYPTOPP_BYTESWAP_AVAILABLE - return bswap_16(value); -#elif defined(_MSC_VER) && _MSC_VER >= 1300 - return _byteswap_ushort(value); -#else - return rotlFixed(value, 8U); -#endif -} - -inline word32 ByteReverse(word32 value) -{ -#if defined(__GNUC__) && defined(CRYPTOPP_X86_ASM_AVAILABLE) - __asm__ ("bswap %0" : "=r" (value) : "0" (value)); - return value; -#elif defined(CRYPTOPP_BYTESWAP_AVAILABLE) - return bswap_32(value); -#elif defined(__MWERKS__) && TARGET_CPU_PPC - return (word32)__lwbrx(&value,0); -#elif _MSC_VER >= 1400 || (_MSC_VER >= 1300 && !defined(_DLL)) - return _byteswap_ulong(value); -#elif CRYPTOPP_FAST_ROTATE(32) - // 5 instructions with rotate instruction, 9 without - return (rotrFixed(value, 8U) & 0xff00ff00) | (rotlFixed(value, 8U) & 0x00ff00ff); -#else - // 6 instructions with rotate instruction, 8 without - value = ((value & 0xFF00FF00) >> 8) | ((value & 0x00FF00FF) << 8); - return rotlFixed(value, 16U); -#endif -} - -inline word64 ByteReverse(word64 value) -{ -#if defined(__GNUC__) && defined(CRYPTOPP_X86_ASM_AVAILABLE) && defined(__x86_64__) - __asm__ ("bswap %0" : "=r" (value) : "0" (value)); - return value; -#elif defined(CRYPTOPP_BYTESWAP_AVAILABLE) - return bswap_64(value); -#elif defined(_MSC_VER) && _MSC_VER >= 1300 - return _byteswap_uint64(value); -#elif CRYPTOPP_BOOL_SLOW_WORD64 - return (word64(ByteReverse(word32(value))) << 32) | ByteReverse(word32(value>>32)); -#else - value = ((value & W64LIT(0xFF00FF00FF00FF00)) >> 8) | ((value & W64LIT(0x00FF00FF00FF00FF)) << 8); - value = ((value & W64LIT(0xFFFF0000FFFF0000)) >> 16) | ((value & W64LIT(0x0000FFFF0000FFFF)) << 16); - return rotlFixed(value, 32U); -#endif -} - -inline byte BitReverse(byte value) -{ - value = ((value & 0xAA) >> 1) | ((value & 0x55) << 1); - value = ((value & 0xCC) >> 2) | ((value & 0x33) << 2); - return rotlFixed(value, 4U); -} - -inline word16 BitReverse(word16 value) -{ - value = ((value & 0xAAAA) >> 1) | ((value & 0x5555) << 1); - value = ((value & 0xCCCC) >> 2) | ((value & 0x3333) << 2); - value = ((value & 0xF0F0) >> 4) | ((value & 0x0F0F) << 4); - return ByteReverse(value); -} - -inline word32 BitReverse(word32 value) -{ - value = ((value & 0xAAAAAAAA) >> 1) | ((value & 0x55555555) << 1); - value = ((value & 0xCCCCCCCC) >> 2) | ((value & 0x33333333) << 2); - value = ((value & 0xF0F0F0F0) >> 4) | ((value & 0x0F0F0F0F) << 4); - return ByteReverse(value); -} - -inline word64 BitReverse(word64 value) -{ -#if CRYPTOPP_BOOL_SLOW_WORD64 - return (word64(BitReverse(word32(value))) << 32) | BitReverse(word32(value>>32)); -#else - value = ((value & W64LIT(0xAAAAAAAAAAAAAAAA)) >> 1) | ((value & W64LIT(0x5555555555555555)) << 1); - value = ((value & W64LIT(0xCCCCCCCCCCCCCCCC)) >> 2) | ((value & W64LIT(0x3333333333333333)) << 2); - value = ((value & W64LIT(0xF0F0F0F0F0F0F0F0)) >> 4) | ((value & W64LIT(0x0F0F0F0F0F0F0F0F)) << 4); - return ByteReverse(value); -#endif -} - -template <class T> -inline T BitReverse(T value) -{ - if (sizeof(T) == 1) - return (T)BitReverse((byte)value); - else if (sizeof(T) == 2) - return (T)BitReverse((word16)value); - else if (sizeof(T) == 4) - return (T)BitReverse((word32)value); - else - { - assert(sizeof(T) == 8); - return (T)BitReverse((word64)value); - } -} - -template <class T> -inline T ConditionalByteReverse(ByteOrder order, T value) -{ - return NativeByteOrderIs(order) ? value : ByteReverse(value); -} - -template <class T> -void ByteReverse(T *out, const T *in, size_t byteCount) -{ - assert(byteCount % sizeof(T) == 0); - size_t count = byteCount/sizeof(T); - for (size_t i=0; i<count; i++) - out[i] = ByteReverse(in[i]); -} - -template <class T> -inline void ConditionalByteReverse(ByteOrder order, T *out, const T *in, size_t byteCount) -{ - if (!NativeByteOrderIs(order)) - ByteReverse(out, in, byteCount); - else if (in != out) - memcpy_s(out, byteCount, in, byteCount); -} - -template <class T> -inline void GetUserKey(ByteOrder order, T *out, size_t outlen, const byte *in, size_t inlen) -{ - const size_t U = sizeof(T); - assert(inlen <= outlen*U); - memcpy_s(out, outlen*U, in, inlen); - memset_z((byte *)out+inlen, 0, outlen*U-inlen); - ConditionalByteReverse(order, out, out, RoundUpToMultipleOf(inlen, U)); -} - -#ifndef CRYPTOPP_ALLOW_UNALIGNED_DATA_ACCESS -inline byte UnalignedGetWordNonTemplate(ByteOrder order, const byte *block, const byte *) -{ - return block[0]; -} - -inline word16 UnalignedGetWordNonTemplate(ByteOrder order, const byte *block, const word16 *) -{ - return (order == BIG_ENDIAN_ORDER) - ? block[1] | (block[0] << 8) - : block[0] | (block[1] << 8); -} - -inline word32 UnalignedGetWordNonTemplate(ByteOrder order, const byte *block, const word32 *) -{ - return (order == BIG_ENDIAN_ORDER) - ? word32(block[3]) | (word32(block[2]) << 8) | (word32(block[1]) << 16) | (word32(block[0]) << 24) - : word32(block[0]) | (word32(block[1]) << 8) | (word32(block[2]) << 16) | (word32(block[3]) << 24); -} - -inline word64 UnalignedGetWordNonTemplate(ByteOrder order, const byte *block, const word64 *) -{ - return (order == BIG_ENDIAN_ORDER) - ? - (word64(block[7]) | - (word64(block[6]) << 8) | - (word64(block[5]) << 16) | - (word64(block[4]) << 24) | - (word64(block[3]) << 32) | - (word64(block[2]) << 40) | - (word64(block[1]) << 48) | - (word64(block[0]) << 56)) - : - (word64(block[0]) | - (word64(block[1]) << 8) | - (word64(block[2]) << 16) | - (word64(block[3]) << 24) | - (word64(block[4]) << 32) | - (word64(block[5]) << 40) | - (word64(block[6]) << 48) | - (word64(block[7]) << 56)); -} - -inline void UnalignedPutWordNonTemplate(ByteOrder order, byte *block, byte value, const byte *xorBlock) -{ - block[0] = xorBlock ? (value ^ xorBlock[0]) : value; -} - -inline void UnalignedPutWordNonTemplate(ByteOrder order, byte *block, word16 value, const byte *xorBlock) -{ - if (order == BIG_ENDIAN_ORDER) - { - if (xorBlock) - { - block[0] = xorBlock[0] ^ CRYPTOPP_GET_BYTE_AS_BYTE(value, 1); - block[1] = xorBlock[1] ^ CRYPTOPP_GET_BYTE_AS_BYTE(value, 0); - } - else - { - block[0] = CRYPTOPP_GET_BYTE_AS_BYTE(value, 1); - block[1] = CRYPTOPP_GET_BYTE_AS_BYTE(value, 0); - } - } - else - { - if (xorBlock) - { - block[0] = xorBlock[0] ^ CRYPTOPP_GET_BYTE_AS_BYTE(value, 0); - block[1] = xorBlock[1] ^ CRYPTOPP_GET_BYTE_AS_BYTE(value, 1); - } - else - { - block[0] = CRYPTOPP_GET_BYTE_AS_BYTE(value, 0); - block[1] = CRYPTOPP_GET_BYTE_AS_BYTE(value, 1); - } - } -} - -inline void UnalignedPutWordNonTemplate(ByteOrder order, byte *block, word32 value, const byte *xorBlock) -{ - if (order == BIG_ENDIAN_ORDER) - { - if (xorBlock) - { - block[0] = xorBlock[0] ^ CRYPTOPP_GET_BYTE_AS_BYTE(value, 3); - block[1] = xorBlock[1] ^ CRYPTOPP_GET_BYTE_AS_BYTE(value, 2); - block[2] = xorBlock[2] ^ CRYPTOPP_GET_BYTE_AS_BYTE(value, 1); - block[3] = xorBlock[3] ^ CRYPTOPP_GET_BYTE_AS_BYTE(value, 0); - } - else - { - block[0] = CRYPTOPP_GET_BYTE_AS_BYTE(value, 3); - block[1] = CRYPTOPP_GET_BYTE_AS_BYTE(value, 2); - block[2] = CRYPTOPP_GET_BYTE_AS_BYTE(value, 1); - block[3] = CRYPTOPP_GET_BYTE_AS_BYTE(value, 0); - } - } - else - { - if (xorBlock) - { - block[0] = xorBlock[0] ^ CRYPTOPP_GET_BYTE_AS_BYTE(value, 0); - block[1] = xorBlock[1] ^ CRYPTOPP_GET_BYTE_AS_BYTE(value, 1); - block[2] = xorBlock[2] ^ CRYPTOPP_GET_BYTE_AS_BYTE(value, 2); - block[3] = xorBlock[3] ^ CRYPTOPP_GET_BYTE_AS_BYTE(value, 3); - } - else - { - block[0] = CRYPTOPP_GET_BYTE_AS_BYTE(value, 0); - block[1] = CRYPTOPP_GET_BYTE_AS_BYTE(value, 1); - block[2] = CRYPTOPP_GET_BYTE_AS_BYTE(value, 2); - block[3] = CRYPTOPP_GET_BYTE_AS_BYTE(value, 3); - } - } -} - -inline void UnalignedPutWordNonTemplate(ByteOrder order, byte *block, word64 value, const byte *xorBlock) -{ - if (order == BIG_ENDIAN_ORDER) - { - if (xorBlock) - { - block[0] = xorBlock[0] ^ CRYPTOPP_GET_BYTE_AS_BYTE(value, 7); - block[1] = xorBlock[1] ^ CRYPTOPP_GET_BYTE_AS_BYTE(value, 6); - block[2] = xorBlock[2] ^ CRYPTOPP_GET_BYTE_AS_BYTE(value, 5); - block[3] = xorBlock[3] ^ CRYPTOPP_GET_BYTE_AS_BYTE(value, 4); - block[4] = xorBlock[4] ^ CRYPTOPP_GET_BYTE_AS_BYTE(value, 3); - block[5] = xorBlock[5] ^ CRYPTOPP_GET_BYTE_AS_BYTE(value, 2); - block[6] = xorBlock[6] ^ CRYPTOPP_GET_BYTE_AS_BYTE(value, 1); - block[7] = xorBlock[7] ^ CRYPTOPP_GET_BYTE_AS_BYTE(value, 0); - } - else - { - block[0] = CRYPTOPP_GET_BYTE_AS_BYTE(value, 7); - block[1] = CRYPTOPP_GET_BYTE_AS_BYTE(value, 6); - block[2] = CRYPTOPP_GET_BYTE_AS_BYTE(value, 5); - block[3] = CRYPTOPP_GET_BYTE_AS_BYTE(value, 4); - block[4] = CRYPTOPP_GET_BYTE_AS_BYTE(value, 3); - block[5] = CRYPTOPP_GET_BYTE_AS_BYTE(value, 2); - block[6] = CRYPTOPP_GET_BYTE_AS_BYTE(value, 1); - block[7] = CRYPTOPP_GET_BYTE_AS_BYTE(value, 0); - } - } - else - { - if (xorBlock) - { - block[0] = xorBlock[0] ^ CRYPTOPP_GET_BYTE_AS_BYTE(value, 0); - block[1] = xorBlock[1] ^ CRYPTOPP_GET_BYTE_AS_BYTE(value, 1); - block[2] = xorBlock[2] ^ CRYPTOPP_GET_BYTE_AS_BYTE(value, 2); - block[3] = xorBlock[3] ^ CRYPTOPP_GET_BYTE_AS_BYTE(value, 3); - block[4] = xorBlock[4] ^ CRYPTOPP_GET_BYTE_AS_BYTE(value, 4); - block[5] = xorBlock[5] ^ CRYPTOPP_GET_BYTE_AS_BYTE(value, 5); - block[6] = xorBlock[6] ^ CRYPTOPP_GET_BYTE_AS_BYTE(value, 6); - block[7] = xorBlock[7] ^ CRYPTOPP_GET_BYTE_AS_BYTE(value, 7); - } - else - { - block[0] = CRYPTOPP_GET_BYTE_AS_BYTE(value, 0); - block[1] = CRYPTOPP_GET_BYTE_AS_BYTE(value, 1); - block[2] = CRYPTOPP_GET_BYTE_AS_BYTE(value, 2); - block[3] = CRYPTOPP_GET_BYTE_AS_BYTE(value, 3); - block[4] = CRYPTOPP_GET_BYTE_AS_BYTE(value, 4); - block[5] = CRYPTOPP_GET_BYTE_AS_BYTE(value, 5); - block[6] = CRYPTOPP_GET_BYTE_AS_BYTE(value, 6); - block[7] = CRYPTOPP_GET_BYTE_AS_BYTE(value, 7); - } - } -} -#endif // #ifndef CRYPTOPP_ALLOW_UNALIGNED_DATA_ACCESS - -template <class T> -inline T GetWord(bool assumeAligned, ByteOrder order, const byte *block) -{ -#ifndef CRYPTOPP_ALLOW_UNALIGNED_DATA_ACCESS - if (!assumeAligned) - return UnalignedGetWordNonTemplate(order, block, (T*)NULL); - assert(IsAligned<T>(block)); -#endif - return ConditionalByteReverse(order, *reinterpret_cast<const T *>(block)); -} - -template <class T> -inline void GetWord(bool assumeAligned, ByteOrder order, T &result, const byte *block) -{ - result = GetWord<T>(assumeAligned, order, block); -} - -template <class T> -inline void PutWord(bool assumeAligned, ByteOrder order, byte *block, T value, const byte *xorBlock = NULL) -{ -#ifndef CRYPTOPP_ALLOW_UNALIGNED_DATA_ACCESS - if (!assumeAligned) - return UnalignedPutWordNonTemplate(order, block, value, xorBlock); - assert(IsAligned<T>(block)); - assert(IsAligned<T>(xorBlock)); -#endif - *reinterpret_cast<T *>(block) = ConditionalByteReverse(order, value) ^ (xorBlock ? *reinterpret_cast<const T *>(xorBlock) : 0); -} - -template <class T, class B, bool A=false> -class GetBlock -{ -public: - GetBlock(const void *block) - : m_block((const byte *)block) {} - - template <class U> - inline GetBlock<T, B, A> & operator()(U &x) - { - CRYPTOPP_COMPILE_ASSERT(sizeof(U) >= sizeof(T)); - x = GetWord<T>(A, B::ToEnum(), m_block); - m_block += sizeof(T); - return *this; - } - -private: - const byte *m_block; -}; - -template <class T, class B, bool A=false> -class PutBlock -{ -public: - PutBlock(const void *xorBlock, void *block) - : m_xorBlock((const byte *)xorBlock), m_block((byte *)block) {} - - template <class U> - inline PutBlock<T, B, A> & operator()(U x) - { - PutWord(A, B::ToEnum(), m_block, (T)x, m_xorBlock); - m_block += sizeof(T); - if (m_xorBlock) - m_xorBlock += sizeof(T); - return *this; - } - -private: - const byte *m_xorBlock; - byte *m_block; -}; - -template <class T, class B, bool GA=false, bool PA=false> -struct BlockGetAndPut -{ - // function needed because of C++ grammatical ambiguity between expression-statements and declarations - static inline GetBlock<T, B, GA> Get(const void *block) {return GetBlock<T, B, GA>(block);} - typedef PutBlock<T, B, PA> Put; -}; - -template <class T> -std::string WordToString(T value, ByteOrder order = BIG_ENDIAN_ORDER) -{ - if (!NativeByteOrderIs(order)) - value = ByteReverse(value); - - return std::string((char *)&value, sizeof(value)); -} - -template <class T> -T StringToWord(const std::string &str, ByteOrder order = BIG_ENDIAN_ORDER) -{ - T value = 0; - memcpy_s(&value, sizeof(value), str.data(), UnsignedMin(str.size(), sizeof(value))); - return NativeByteOrderIs(order) ? value : ByteReverse(value); -} - -// ************** help remove warning on g++ *************** - -template <bool overflow> struct SafeShifter; - -template<> struct SafeShifter<true> -{ - template <class T> - static inline T RightShift(T value, unsigned int bits) - { - return 0; - } - - template <class T> - static inline T LeftShift(T value, unsigned int bits) - { - return 0; - } -}; - -template<> struct SafeShifter<false> -{ - template <class T> - static inline T RightShift(T value, unsigned int bits) - { - return value >> bits; - } - - template <class T> - static inline T LeftShift(T value, unsigned int bits) - { - return value << bits; - } -}; - -template <unsigned int bits, class T> -inline T SafeRightShift(T value) -{ - return SafeShifter<(bits>=(8*sizeof(T)))>::RightShift(value, bits); -} - -template <unsigned int bits, class T> -inline T SafeLeftShift(T value) -{ - return SafeShifter<(bits>=(8*sizeof(T)))>::LeftShift(value, bits); -} - -// ************** use one buffer for multiple data members *************** - -#define CRYPTOPP_BLOCK_1(n, t, s) t* m_##n() {return (t *)(m_aggregate+0);} size_t SS1() {return sizeof(t)*(s);} size_t m_##n##Size() {return (s);} -#define CRYPTOPP_BLOCK_2(n, t, s) t* m_##n() {return (t *)(m_aggregate+SS1());} size_t SS2() {return SS1()+sizeof(t)*(s);} size_t m_##n##Size() {return (s);} -#define CRYPTOPP_BLOCK_3(n, t, s) t* m_##n() {return (t *)(m_aggregate+SS2());} size_t SS3() {return SS2()+sizeof(t)*(s);} size_t m_##n##Size() {return (s);} -#define CRYPTOPP_BLOCK_4(n, t, s) t* m_##n() {return (t *)(m_aggregate+SS3());} size_t SS4() {return SS3()+sizeof(t)*(s);} size_t m_##n##Size() {return (s);} -#define CRYPTOPP_BLOCK_5(n, t, s) t* m_##n() {return (t *)(m_aggregate+SS4());} size_t SS5() {return SS4()+sizeof(t)*(s);} size_t m_##n##Size() {return (s);} -#define CRYPTOPP_BLOCK_6(n, t, s) t* m_##n() {return (t *)(m_aggregate+SS5());} size_t SS6() {return SS5()+sizeof(t)*(s);} size_t m_##n##Size() {return (s);} -#define CRYPTOPP_BLOCK_7(n, t, s) t* m_##n() {return (t *)(m_aggregate+SS6());} size_t SS7() {return SS6()+sizeof(t)*(s);} size_t m_##n##Size() {return (s);} -#define CRYPTOPP_BLOCK_8(n, t, s) t* m_##n() {return (t *)(m_aggregate+SS7());} size_t SS8() {return SS7()+sizeof(t)*(s);} size_t m_##n##Size() {return (s);} -#define CRYPTOPP_BLOCKS_END(i) size_t SST() {return SS##i();} void AllocateBlocks() {m_aggregate.New(SST());} AlignedSecByteBlock m_aggregate; - -NAMESPACE_END - -#endif diff --git a/src/cryptopp/obj/.gitignore b/src/cryptopp/obj/.gitignore deleted file mode 100644 index d6b7ef32c8..0000000000 --- a/src/cryptopp/obj/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -* -!.gitignore diff --git a/src/cryptopp/pch.h b/src/cryptopp/pch.h deleted file mode 100644 index 418c39076d..0000000000 --- a/src/cryptopp/pch.h +++ /dev/null @@ -1,21 +0,0 @@ -#ifndef CRYPTOPP_PCH_H -#define CRYPTOPP_PCH_H - -#ifdef CRYPTOPP_GENERATE_X64_MASM - - #include "cpu.h" - -#else - - #include "config.h" - - #ifdef USE_PRECOMPILED_HEADERS - #include "simple.h" - #include "secblock.h" - #include "misc.h" - #include "smartptr.h" - #endif - -#endif - -#endif diff --git a/src/cryptopp/secblock.h b/src/cryptopp/secblock.h deleted file mode 100644 index 2025757dbb..0000000000 --- a/src/cryptopp/secblock.h +++ /dev/null @@ -1,501 +0,0 @@ -// secblock.h - written and placed in the public domain by Wei Dai - -#ifndef CRYPTOPP_SECBLOCK_H -#define CRYPTOPP_SECBLOCK_H - -#include "config.h" -#include "misc.h" -#include <assert.h> - -#if defined(CRYPTOPP_MEMALIGN_AVAILABLE) || defined(CRYPTOPP_MM_MALLOC_AVAILABLE) || defined(QNX) - #include <malloc.h> -#else - #include <stdlib.h> -#endif - -NAMESPACE_BEGIN(CryptoPP) - -// ************** secure memory allocation *************** - -template<class T> -class AllocatorBase -{ -public: - typedef T value_type; - typedef size_t size_type; -#ifdef CRYPTOPP_MSVCRT6 - typedef ptrdiff_t difference_type; -#else - typedef std::ptrdiff_t difference_type; -#endif - typedef T * pointer; - typedef const T * const_pointer; - typedef T & reference; - typedef const T & const_reference; - - pointer address(reference r) const {return (&r);} - const_pointer address(const_reference r) const {return (&r); } - void construct(pointer p, const T& val) {new (p) T(val);} - void destroy(pointer p) {p->~T();} - size_type max_size() const {return ~size_type(0)/sizeof(T);} // switch to std::numeric_limits<T>::max later - -protected: - static void CheckSize(size_t n) - { - if (n > ~size_t(0) / sizeof(T)) - throw InvalidArgument("AllocatorBase: requested size would cause integer overflow"); - } -}; - -#define CRYPTOPP_INHERIT_ALLOCATOR_TYPES \ -typedef typename AllocatorBase<T>::value_type value_type;\ -typedef typename AllocatorBase<T>::size_type size_type;\ -typedef typename AllocatorBase<T>::difference_type difference_type;\ -typedef typename AllocatorBase<T>::pointer pointer;\ -typedef typename AllocatorBase<T>::const_pointer const_pointer;\ -typedef typename AllocatorBase<T>::reference reference;\ -typedef typename AllocatorBase<T>::const_reference const_reference; - -#if defined(_MSC_VER) && (_MSC_VER < 1300) -// this pragma causes an internal compiler error if placed immediately before std::swap(a, b) -#pragma warning(push) -#pragma warning(disable: 4700) // VC60 workaround: don't know how to get rid of this warning -#endif - -template <class T, class A> -typename A::pointer StandardReallocate(A& a, T *p, typename A::size_type oldSize, typename A::size_type newSize, bool preserve) -{ - if (oldSize == newSize) - return p; - - if (preserve) - { - typename A::pointer newPointer = a.allocate(newSize, NULL); - memcpy_s(newPointer, sizeof(T)*newSize, p, sizeof(T)*STDMIN(oldSize, newSize)); - a.deallocate(p, oldSize); - return newPointer; - } - else - { - a.deallocate(p, oldSize); - return a.allocate(newSize, NULL); - } -} - -#if defined(_MSC_VER) && (_MSC_VER < 1300) -#pragma warning(pop) -#endif - -template <class T, bool T_Align16 = false> -class AllocatorWithCleanup : public AllocatorBase<T> -{ -public: - CRYPTOPP_INHERIT_ALLOCATOR_TYPES - - pointer allocate(size_type n, const void * = NULL) - { - CheckSize(n); - if (n == 0) - return NULL; - - if (CRYPTOPP_BOOL_ALIGN16_ENABLED && T_Align16 && n*sizeof(T) >= 16) - { - byte *p; - #ifdef CRYPTOPP_MM_MALLOC_AVAILABLE - while (!(p = (byte *)_mm_malloc(sizeof(T)*n, 16))) - #elif defined(CRYPTOPP_MEMALIGN_AVAILABLE) - while (!(p = (byte *)memalign(16, sizeof(T)*n))) - #elif defined(CRYPTOPP_MALLOC_ALIGNMENT_IS_16) - while (!(p = (byte *)malloc(sizeof(T)*n))) - #else - while (!(p = (byte *)malloc(sizeof(T)*n + 16))) - #endif - CallNewHandler(); - - #ifdef CRYPTOPP_NO_ALIGNED_ALLOC - size_t adjustment = 16-((size_t)p%16); - p += adjustment; - p[-1] = (byte)adjustment; - #endif - - assert(IsAlignedOn(p, 16)); - return (pointer)p; - } - - pointer p; - while (!(p = (pointer)malloc(sizeof(T)*n))) - CallNewHandler(); - return p; - } - - void deallocate(void *p, size_type n) - { - memset_z(p, 0, n*sizeof(T)); - - if (CRYPTOPP_BOOL_ALIGN16_ENABLED && T_Align16 && n*sizeof(T) >= 16) - { - #ifdef CRYPTOPP_MM_MALLOC_AVAILABLE - _mm_free(p); - #elif defined(CRYPTOPP_NO_ALIGNED_ALLOC) - p = (byte *)p - ((byte *)p)[-1]; - free(p); - #else - free(p); - #endif - return; - } - - free(p); - } - - pointer reallocate(T *p, size_type oldSize, size_type newSize, bool preserve) - { - return StandardReallocate(*this, p, oldSize, newSize, preserve); - } - - // VS.NET STL enforces the policy of "All STL-compliant allocators have to provide a - // template class member called rebind". - template <class U> struct rebind { typedef AllocatorWithCleanup<U, T_Align16> other; }; -#if _MSC_VER >= 1500 - AllocatorWithCleanup() {} - template <class U, bool A> AllocatorWithCleanup(const AllocatorWithCleanup<U, A> &) {} -#endif -}; - -CRYPTOPP_DLL_TEMPLATE_CLASS AllocatorWithCleanup<byte>; -CRYPTOPP_DLL_TEMPLATE_CLASS AllocatorWithCleanup<word16>; -CRYPTOPP_DLL_TEMPLATE_CLASS AllocatorWithCleanup<word32>; -CRYPTOPP_DLL_TEMPLATE_CLASS AllocatorWithCleanup<word64>; -#if CRYPTOPP_BOOL_X86 -CRYPTOPP_DLL_TEMPLATE_CLASS AllocatorWithCleanup<word, true>; // for Integer -#endif - -template <class T> -class NullAllocator : public AllocatorBase<T> -{ -public: - CRYPTOPP_INHERIT_ALLOCATOR_TYPES - - pointer allocate(size_type n, const void * = NULL) - { - assert(false); - return NULL; - } - - void deallocate(void *p, size_type n) - { - //// Bitcoin: don't know why this trips, probably a false alarm, depends on the compiler used. - //assert(false); - } - - size_type max_size() const {return 0;} -}; - -// This allocator can't be used with standard collections because -// they require that all objects of the same allocator type are equivalent. -// So this is for use with SecBlock only. -template <class T, size_t S, class A = NullAllocator<T>, bool T_Align16 = false> -class FixedSizeAllocatorWithCleanup : public AllocatorBase<T> -{ -public: - CRYPTOPP_INHERIT_ALLOCATOR_TYPES - - FixedSizeAllocatorWithCleanup() : m_allocated(false) {} - - pointer allocate(size_type n) - { - assert(IsAlignedOn(m_array, 8)); - - if (n <= S && !m_allocated) - { - m_allocated = true; - return GetAlignedArray(); - } - else - return m_fallbackAllocator.allocate(n); - } - - pointer allocate(size_type n, const void *hint) - { - if (n <= S && !m_allocated) - { - m_allocated = true; - return GetAlignedArray(); - } - else - return m_fallbackAllocator.allocate(n, hint); - } - - void deallocate(void *p, size_type n) - { - if (p == GetAlignedArray()) - { - assert(n <= S); - assert(m_allocated); - m_allocated = false; - memset(p, 0, n*sizeof(T)); - } - else - m_fallbackAllocator.deallocate(p, n); - } - - pointer reallocate(pointer p, size_type oldSize, size_type newSize, bool preserve) - { - if (p == GetAlignedArray() && newSize <= S) - { - assert(oldSize <= S); - if (oldSize > newSize) - memset(p + newSize, 0, (oldSize-newSize)*sizeof(T)); - return p; - } - - pointer newPointer = allocate(newSize, NULL); - if (preserve) - memcpy(newPointer, p, sizeof(T)*STDMIN(oldSize, newSize)); - deallocate(p, oldSize); - return newPointer; - } - - size_type max_size() const {return STDMAX(m_fallbackAllocator.max_size(), S);} - -private: -#ifdef __BORLANDC__ - T* GetAlignedArray() {return m_array;} - T m_array[S]; -#else - T* GetAlignedArray() {return (CRYPTOPP_BOOL_ALIGN16_ENABLED && T_Align16) ? (T*)(((byte *)m_array) + (0-(size_t)m_array)%16) : m_array;} - CRYPTOPP_ALIGN_DATA(8) T m_array[(CRYPTOPP_BOOL_ALIGN16_ENABLED && T_Align16) ? S+8/sizeof(T) : S]; -#endif - A m_fallbackAllocator; - bool m_allocated; -}; - -//! a block of memory allocated using A -template <class T, class A = AllocatorWithCleanup<T> > -class SecBlock -{ -public: - typedef typename A::value_type value_type; - typedef typename A::pointer iterator; - typedef typename A::const_pointer const_iterator; - typedef typename A::size_type size_type; - - explicit SecBlock(size_type size=0) - : m_size(size) {m_ptr = m_alloc.allocate(size, NULL);} - SecBlock(const SecBlock<T, A> &t) - : m_size(t.m_size) {m_ptr = m_alloc.allocate(m_size, NULL); memcpy_s(m_ptr, m_size*sizeof(T), t.m_ptr, m_size*sizeof(T));} - SecBlock(const T *t, size_type len) - : m_size(len) - { - m_ptr = m_alloc.allocate(len, NULL); - if (t == NULL) - memset_z(m_ptr, 0, len*sizeof(T)); - else - memcpy(m_ptr, t, len*sizeof(T)); - } - - ~SecBlock() - {m_alloc.deallocate(m_ptr, m_size);} - -#ifdef __BORLANDC__ - operator T *() const - {return (T*)m_ptr;} -#else - operator const void *() const - {return m_ptr;} - operator void *() - {return m_ptr;} - - operator const T *() const - {return m_ptr;} - operator T *() - {return m_ptr;} -#endif - -// T *operator +(size_type offset) -// {return m_ptr+offset;} - -// const T *operator +(size_type offset) const -// {return m_ptr+offset;} - -// T& operator[](size_type index) -// {assert(index >= 0 && index < m_size); return m_ptr[index];} - -// const T& operator[](size_type index) const -// {assert(index >= 0 && index < m_size); return m_ptr[index];} - - iterator begin() - {return m_ptr;} - const_iterator begin() const - {return m_ptr;} - iterator end() - {return m_ptr+m_size;} - const_iterator end() const - {return m_ptr+m_size;} - - typename A::pointer data() {return m_ptr;} - typename A::const_pointer data() const {return m_ptr;} - - size_type size() const {return m_size;} - bool empty() const {return m_size == 0;} - - byte * BytePtr() {return (byte *)m_ptr;} - const byte * BytePtr() const {return (const byte *)m_ptr;} - size_type SizeInBytes() const {return m_size*sizeof(T);} - - //! set contents and size - void Assign(const T *t, size_type len) - { - New(len); - memcpy_s(m_ptr, m_size*sizeof(T), t, len*sizeof(T)); - } - - //! copy contents and size from another SecBlock - void Assign(const SecBlock<T, A> &t) - { - New(t.m_size); - memcpy_s(m_ptr, m_size*sizeof(T), t.m_ptr, m_size*sizeof(T)); - } - - SecBlock<T, A>& operator=(const SecBlock<T, A> &t) - { - Assign(t); - return *this; - } - - // append to this object - SecBlock<T, A>& operator+=(const SecBlock<T, A> &t) - { - size_type oldSize = m_size; - Grow(m_size+t.m_size); - memcpy_s(m_ptr+oldSize, m_size*sizeof(T), t.m_ptr, t.m_size*sizeof(T)); - return *this; - } - - // append operator - SecBlock<T, A> operator+(const SecBlock<T, A> &t) - { - SecBlock<T, A> result(m_size+t.m_size); - memcpy_s(result.m_ptr, result.m_size*sizeof(T), m_ptr, m_size*sizeof(T)); - memcpy_s(result.m_ptr+m_size, t.m_size*sizeof(T), t.m_ptr, t.m_size*sizeof(T)); - return result; - } - - bool operator==(const SecBlock<T, A> &t) const - { - return m_size == t.m_size && VerifyBufsEqual(m_ptr, t.m_ptr, m_size*sizeof(T)); - } - - bool operator!=(const SecBlock<T, A> &t) const - { - return !operator==(t); - } - - //! change size, without preserving contents - void New(size_type newSize) - { - m_ptr = m_alloc.reallocate(m_ptr, m_size, newSize, false); - m_size = newSize; - } - - //! change size and set contents to 0 - void CleanNew(size_type newSize) - { - New(newSize); - memset_z(m_ptr, 0, m_size*sizeof(T)); - } - - //! change size only if newSize > current size. contents are preserved - void Grow(size_type newSize) - { - if (newSize > m_size) - { - m_ptr = m_alloc.reallocate(m_ptr, m_size, newSize, true); - m_size = newSize; - } - } - - //! change size only if newSize > current size. contents are preserved and additional area is set to 0 - void CleanGrow(size_type newSize) - { - if (newSize > m_size) - { - m_ptr = m_alloc.reallocate(m_ptr, m_size, newSize, true); - memset(m_ptr+m_size, 0, (newSize-m_size)*sizeof(T)); - m_size = newSize; - } - } - - //! change size and preserve contents - void resize(size_type newSize) - { - m_ptr = m_alloc.reallocate(m_ptr, m_size, newSize, true); - m_size = newSize; - } - - //! swap contents and size with another SecBlock - void swap(SecBlock<T, A> &b) - { - std::swap(m_alloc, b.m_alloc); - std::swap(m_size, b.m_size); - std::swap(m_ptr, b.m_ptr); - } - -//private: - A m_alloc; - size_type m_size; - T *m_ptr; -}; - -typedef SecBlock<byte> SecByteBlock; -typedef SecBlock<byte, AllocatorWithCleanup<byte, true> > AlignedSecByteBlock; -typedef SecBlock<word> SecWordBlock; - -//! a SecBlock with fixed size, allocated statically -template <class T, unsigned int S, class A = FixedSizeAllocatorWithCleanup<T, S> > -class FixedSizeSecBlock : public SecBlock<T, A> -{ -public: - explicit FixedSizeSecBlock() : SecBlock<T, A>(S) {} -}; - -template <class T, unsigned int S, bool T_Align16 = true> -class FixedSizeAlignedSecBlock : public FixedSizeSecBlock<T, S, FixedSizeAllocatorWithCleanup<T, S, NullAllocator<T>, T_Align16> > -{ -}; - -//! a SecBlock that preallocates size S statically, and uses the heap when this size is exceeded -template <class T, unsigned int S, class A = FixedSizeAllocatorWithCleanup<T, S, AllocatorWithCleanup<T> > > -class SecBlockWithHint : public SecBlock<T, A> -{ -public: - explicit SecBlockWithHint(size_t size) : SecBlock<T, A>(size) {} -}; - -template<class T, bool A, class U, bool B> -inline bool operator==(const CryptoPP::AllocatorWithCleanup<T, A>&, const CryptoPP::AllocatorWithCleanup<U, B>&) {return (true);} -template<class T, bool A, class U, bool B> -inline bool operator!=(const CryptoPP::AllocatorWithCleanup<T, A>&, const CryptoPP::AllocatorWithCleanup<U, B>&) {return (false);} - -NAMESPACE_END - -NAMESPACE_BEGIN(std) -template <class T, class A> -inline void swap(CryptoPP::SecBlock<T, A> &a, CryptoPP::SecBlock<T, A> &b) -{ - a.swap(b); -} - -#if defined(_STLP_DONT_SUPPORT_REBIND_MEMBER_TEMPLATE) || (defined(_STLPORT_VERSION) && !defined(_STLP_MEMBER_TEMPLATE_CLASSES)) -// working for STLport 5.1.3 and MSVC 6 SP5 -template <class _Tp1, class _Tp2> -inline CryptoPP::AllocatorWithCleanup<_Tp2>& -__stl_alloc_rebind(CryptoPP::AllocatorWithCleanup<_Tp1>& __a, const _Tp2*) -{ - return (CryptoPP::AllocatorWithCleanup<_Tp2>&)(__a); -} -#endif - -NAMESPACE_END - -#endif diff --git a/src/cryptopp/sha.cpp b/src/cryptopp/sha.cpp deleted file mode 100644 index fd0b0a2596..0000000000 --- a/src/cryptopp/sha.cpp +++ /dev/null @@ -1,899 +0,0 @@ -// sha.cpp - modified by Wei Dai from Steve Reid's public domain sha1.c - -// Steve Reid implemented SHA-1. Wei Dai implemented SHA-2. -// Both are in the public domain. - -// use "cl /EP /P /DCRYPTOPP_GENERATE_X64_MASM sha.cpp" to generate MASM code - -#include "pch.h" - -#ifndef CRYPTOPP_IMPORTS -#ifndef CRYPTOPP_GENERATE_X64_MASM - -#include "sha.h" -#include "misc.h" -#include "cpu.h" - -NAMESPACE_BEGIN(CryptoPP) - -// start of Steve Reid's code - -#define blk0(i) (W[i] = data[i]) -#define blk1(i) (W[i&15] = rotlFixed(W[(i+13)&15]^W[(i+8)&15]^W[(i+2)&15]^W[i&15],1)) - -void SHA1::InitState(HashWordType *state) -{ - state[0] = 0x67452301L; - state[1] = 0xEFCDAB89L; - state[2] = 0x98BADCFEL; - state[3] = 0x10325476L; - state[4] = 0xC3D2E1F0L; -} - -#define f1(x,y,z) (z^(x&(y^z))) -#define f2(x,y,z) (x^y^z) -#define f3(x,y,z) ((x&y)|(z&(x|y))) -#define f4(x,y,z) (x^y^z) - -/* (R0+R1), R2, R3, R4 are the different operations used in SHA1 */ -#define R0(v,w,x,y,z,i) z+=f1(w,x,y)+blk0(i)+0x5A827999+rotlFixed(v,5);w=rotlFixed(w,30); -#define R1(v,w,x,y,z,i) z+=f1(w,x,y)+blk1(i)+0x5A827999+rotlFixed(v,5);w=rotlFixed(w,30); -#define R2(v,w,x,y,z,i) z+=f2(w,x,y)+blk1(i)+0x6ED9EBA1+rotlFixed(v,5);w=rotlFixed(w,30); -#define R3(v,w,x,y,z,i) z+=f3(w,x,y)+blk1(i)+0x8F1BBCDC+rotlFixed(v,5);w=rotlFixed(w,30); -#define R4(v,w,x,y,z,i) z+=f4(w,x,y)+blk1(i)+0xCA62C1D6+rotlFixed(v,5);w=rotlFixed(w,30); - -void SHA1::Transform(word32 *state, const word32 *data) -{ - word32 W[16]; - /* Copy context->state[] to working vars */ - word32 a = state[0]; - word32 b = state[1]; - word32 c = state[2]; - word32 d = state[3]; - word32 e = state[4]; - /* 4 rounds of 20 operations each. Loop unrolled. */ - R0(a,b,c,d,e, 0); R0(e,a,b,c,d, 1); R0(d,e,a,b,c, 2); R0(c,d,e,a,b, 3); - R0(b,c,d,e,a, 4); R0(a,b,c,d,e, 5); R0(e,a,b,c,d, 6); R0(d,e,a,b,c, 7); - R0(c,d,e,a,b, 8); R0(b,c,d,e,a, 9); R0(a,b,c,d,e,10); R0(e,a,b,c,d,11); - R0(d,e,a,b,c,12); R0(c,d,e,a,b,13); R0(b,c,d,e,a,14); R0(a,b,c,d,e,15); - R1(e,a,b,c,d,16); R1(d,e,a,b,c,17); R1(c,d,e,a,b,18); R1(b,c,d,e,a,19); - R2(a,b,c,d,e,20); R2(e,a,b,c,d,21); R2(d,e,a,b,c,22); R2(c,d,e,a,b,23); - R2(b,c,d,e,a,24); R2(a,b,c,d,e,25); R2(e,a,b,c,d,26); R2(d,e,a,b,c,27); - R2(c,d,e,a,b,28); R2(b,c,d,e,a,29); R2(a,b,c,d,e,30); R2(e,a,b,c,d,31); - R2(d,e,a,b,c,32); R2(c,d,e,a,b,33); R2(b,c,d,e,a,34); R2(a,b,c,d,e,35); - R2(e,a,b,c,d,36); R2(d,e,a,b,c,37); R2(c,d,e,a,b,38); R2(b,c,d,e,a,39); - R3(a,b,c,d,e,40); R3(e,a,b,c,d,41); R3(d,e,a,b,c,42); R3(c,d,e,a,b,43); - R3(b,c,d,e,a,44); R3(a,b,c,d,e,45); R3(e,a,b,c,d,46); R3(d,e,a,b,c,47); - R3(c,d,e,a,b,48); R3(b,c,d,e,a,49); R3(a,b,c,d,e,50); R3(e,a,b,c,d,51); - R3(d,e,a,b,c,52); R3(c,d,e,a,b,53); R3(b,c,d,e,a,54); R3(a,b,c,d,e,55); - R3(e,a,b,c,d,56); R3(d,e,a,b,c,57); R3(c,d,e,a,b,58); R3(b,c,d,e,a,59); - R4(a,b,c,d,e,60); R4(e,a,b,c,d,61); R4(d,e,a,b,c,62); R4(c,d,e,a,b,63); - R4(b,c,d,e,a,64); R4(a,b,c,d,e,65); R4(e,a,b,c,d,66); R4(d,e,a,b,c,67); - R4(c,d,e,a,b,68); R4(b,c,d,e,a,69); R4(a,b,c,d,e,70); R4(e,a,b,c,d,71); - R4(d,e,a,b,c,72); R4(c,d,e,a,b,73); R4(b,c,d,e,a,74); R4(a,b,c,d,e,75); - R4(e,a,b,c,d,76); R4(d,e,a,b,c,77); R4(c,d,e,a,b,78); R4(b,c,d,e,a,79); - /* Add the working vars back into context.state[] */ - state[0] += a; - state[1] += b; - state[2] += c; - state[3] += d; - state[4] += e; -} - -// end of Steve Reid's code - -// ************************************************************* - -void SHA224::InitState(HashWordType *state) -{ - static const word32 s[8] = {0xc1059ed8, 0x367cd507, 0x3070dd17, 0xf70e5939, 0xffc00b31, 0x68581511, 0x64f98fa7, 0xbefa4fa4}; - memcpy(state, s, sizeof(s)); -} - -void SHA256::InitState(HashWordType *state) -{ - static const word32 s[8] = {0x6a09e667, 0xbb67ae85, 0x3c6ef372, 0xa54ff53a, 0x510e527f, 0x9b05688c, 0x1f83d9ab, 0x5be0cd19}; - memcpy(state, s, sizeof(s)); -} - -#if CRYPTOPP_BOOL_SSE2_ASM_AVAILABLE -CRYPTOPP_ALIGN_DATA(16) extern const word32 SHA256_K[64] CRYPTOPP_SECTION_ALIGN16 = { -#else -extern const word32 SHA256_K[64] = { -#endif - 0x428a2f98, 0x71374491, 0xb5c0fbcf, 0xe9b5dba5, - 0x3956c25b, 0x59f111f1, 0x923f82a4, 0xab1c5ed5, - 0xd807aa98, 0x12835b01, 0x243185be, 0x550c7dc3, - 0x72be5d74, 0x80deb1fe, 0x9bdc06a7, 0xc19bf174, - 0xe49b69c1, 0xefbe4786, 0x0fc19dc6, 0x240ca1cc, - 0x2de92c6f, 0x4a7484aa, 0x5cb0a9dc, 0x76f988da, - 0x983e5152, 0xa831c66d, 0xb00327c8, 0xbf597fc7, - 0xc6e00bf3, 0xd5a79147, 0x06ca6351, 0x14292967, - 0x27b70a85, 0x2e1b2138, 0x4d2c6dfc, 0x53380d13, - 0x650a7354, 0x766a0abb, 0x81c2c92e, 0x92722c85, - 0xa2bfe8a1, 0xa81a664b, 0xc24b8b70, 0xc76c51a3, - 0xd192e819, 0xd6990624, 0xf40e3585, 0x106aa070, - 0x19a4c116, 0x1e376c08, 0x2748774c, 0x34b0bcb5, - 0x391c0cb3, 0x4ed8aa4a, 0x5b9cca4f, 0x682e6ff3, - 0x748f82ee, 0x78a5636f, 0x84c87814, 0x8cc70208, - 0x90befffa, 0xa4506ceb, 0xbef9a3f7, 0xc67178f2 -}; - -#endif // #ifndef CRYPTOPP_GENERATE_X64_MASM - -#if defined(CRYPTOPP_X86_ASM_AVAILABLE) || defined(CRYPTOPP_GENERATE_X64_MASM) - -#pragma warning(disable: 4731) // frame pointer register 'ebp' modified by inline assembly code - -static void CRYPTOPP_FASTCALL X86_SHA256_HashBlocks(word32 *state, const word32 *data, size_t len -#if defined(_MSC_VER) && (_MSC_VER == 1200) - , ... // VC60 workaround: prevent VC 6 from inlining this function -#endif - ) -{ -#if defined(_MSC_VER) && (_MSC_VER == 1200) - AS2(mov ecx, [state]) - AS2(mov edx, [data]) -#endif - - #define LOCALS_SIZE 8*4 + 16*4 + 4*WORD_SZ - #define H(i) [BASE+ASM_MOD(1024+7-(i),8)*4] - #define G(i) H(i+1) - #define F(i) H(i+2) - #define E(i) H(i+3) - #define D(i) H(i+4) - #define C(i) H(i+5) - #define B(i) H(i+6) - #define A(i) H(i+7) - #define Wt(i) BASE+8*4+ASM_MOD(1024+15-(i),16)*4 - #define Wt_2(i) Wt((i)-2) - #define Wt_15(i) Wt((i)-15) - #define Wt_7(i) Wt((i)-7) - #define K_END [BASE+8*4+16*4+0*WORD_SZ] - #define STATE_SAVE [BASE+8*4+16*4+1*WORD_SZ] - #define DATA_SAVE [BASE+8*4+16*4+2*WORD_SZ] - #define DATA_END [BASE+8*4+16*4+3*WORD_SZ] - #define Kt(i) WORD_REG(si)+(i)*4 -#if CRYPTOPP_BOOL_X86 - #define BASE esp+4 -#elif defined(__GNUC__) - #define BASE r8 -#else - #define BASE rsp -#endif - -#define RA0(i, edx, edi) \ - AS2( add edx, [Kt(i)] )\ - AS2( add edx, [Wt(i)] )\ - AS2( add edx, H(i) )\ - -#define RA1(i, edx, edi) - -#define RB0(i, edx, edi) - -#define RB1(i, edx, edi) \ - AS2( mov AS_REG_7d, [Wt_2(i)] )\ - AS2( mov edi, [Wt_15(i)])\ - AS2( mov ebx, AS_REG_7d )\ - AS2( shr AS_REG_7d, 10 )\ - AS2( ror ebx, 17 )\ - AS2( xor AS_REG_7d, ebx )\ - AS2( ror ebx, 2 )\ - AS2( xor ebx, AS_REG_7d )/* s1(W_t-2) */\ - AS2( add ebx, [Wt_7(i)])\ - AS2( mov AS_REG_7d, edi )\ - AS2( shr AS_REG_7d, 3 )\ - AS2( ror edi, 7 )\ - AS2( add ebx, [Wt(i)])/* s1(W_t-2) + W_t-7 + W_t-16 */\ - AS2( xor AS_REG_7d, edi )\ - AS2( add edx, [Kt(i)])\ - AS2( ror edi, 11 )\ - AS2( add edx, H(i) )\ - AS2( xor AS_REG_7d, edi )/* s0(W_t-15) */\ - AS2( add AS_REG_7d, ebx )/* W_t = s1(W_t-2) + W_t-7 + s0(W_t-15) W_t-16*/\ - AS2( mov [Wt(i)], AS_REG_7d)\ - AS2( add edx, AS_REG_7d )\ - -#define ROUND(i, r, eax, ecx, edi, edx)\ - /* in: edi = E */\ - /* unused: eax, ecx, temp: ebx, AS_REG_7d, out: edx = T1 */\ - AS2( mov edx, F(i) )\ - AS2( xor edx, G(i) )\ - AS2( and edx, edi )\ - AS2( xor edx, G(i) )/* Ch(E,F,G) = (G^(E&(F^G))) */\ - AS2( mov AS_REG_7d, edi )\ - AS2( ror edi, 6 )\ - AS2( ror AS_REG_7d, 25 )\ - RA##r(i, edx, edi )/* H + Wt + Kt + Ch(E,F,G) */\ - AS2( xor AS_REG_7d, edi )\ - AS2( ror edi, 5 )\ - AS2( xor AS_REG_7d, edi )/* S1(E) */\ - AS2( add edx, AS_REG_7d )/* T1 = S1(E) + Ch(E,F,G) + H + Wt + Kt */\ - RB##r(i, edx, edi )/* H + Wt + Kt + Ch(E,F,G) */\ - /* in: ecx = A, eax = B^C, edx = T1 */\ - /* unused: edx, temp: ebx, AS_REG_7d, out: eax = A, ecx = B^C, edx = E */\ - AS2( mov ebx, ecx )\ - AS2( xor ecx, B(i) )/* A^B */\ - AS2( and eax, ecx )\ - AS2( xor eax, B(i) )/* Maj(A,B,C) = B^((A^B)&(B^C) */\ - AS2( mov AS_REG_7d, ebx )\ - AS2( ror ebx, 2 )\ - AS2( add eax, edx )/* T1 + Maj(A,B,C) */\ - AS2( add edx, D(i) )\ - AS2( mov D(i), edx )\ - AS2( ror AS_REG_7d, 22 )\ - AS2( xor AS_REG_7d, ebx )\ - AS2( ror ebx, 11 )\ - AS2( xor AS_REG_7d, ebx )\ - AS2( add eax, AS_REG_7d )/* T1 + S0(A) + Maj(A,B,C) */\ - AS2( mov H(i), eax )\ - -#define SWAP_COPY(i) \ - AS2( mov WORD_REG(bx), [WORD_REG(dx)+i*WORD_SZ])\ - AS1( bswap WORD_REG(bx))\ - AS2( mov [Wt(i*(1+CRYPTOPP_BOOL_X64)+CRYPTOPP_BOOL_X64)], WORD_REG(bx)) - -#if defined(__GNUC__) - #if CRYPTOPP_BOOL_X64 - FixedSizeAlignedSecBlock<byte, LOCALS_SIZE> workspace; - #endif - __asm__ __volatile__ - ( - #if CRYPTOPP_BOOL_X64 - "lea %4, %%r8;" - #endif - ".intel_syntax noprefix;" -#elif defined(CRYPTOPP_GENERATE_X64_MASM) - ALIGN 8 - X86_SHA256_HashBlocks PROC FRAME - rex_push_reg rsi - push_reg rdi - push_reg rbx - push_reg rbp - alloc_stack(LOCALS_SIZE+8) - .endprolog - mov rdi, r8 - lea rsi, [?SHA256_K@CryptoPP@@3QBIB + 48*4] -#endif - -#if CRYPTOPP_BOOL_X86 - #ifndef __GNUC__ - AS2( mov edi, [len]) - AS2( lea WORD_REG(si), [SHA256_K+48*4]) - #endif - #if !defined(_MSC_VER) || (_MSC_VER < 1400) - AS_PUSH_IF86(bx) - #endif - - AS_PUSH_IF86(bp) - AS2( mov ebx, esp) - AS2( and esp, -16) - AS2( sub WORD_REG(sp), LOCALS_SIZE) - AS_PUSH_IF86(bx) -#endif - AS2( mov STATE_SAVE, WORD_REG(cx)) - AS2( mov DATA_SAVE, WORD_REG(dx)) - AS2( add WORD_REG(di), WORD_REG(dx)) - AS2( mov DATA_END, WORD_REG(di)) - AS2( mov K_END, WORD_REG(si)) - -#if CRYPTOPP_BOOL_SSE2_ASM_AVAILABLE -#if CRYPTOPP_BOOL_X86 - AS2( test edi, 1) - ASJ( jnz, 2, f) -#endif - AS2( movdqa xmm0, XMMWORD_PTR [WORD_REG(cx)+0*16]) - AS2( movdqa xmm1, XMMWORD_PTR [WORD_REG(cx)+1*16]) -#endif - -#if CRYPTOPP_BOOL_X86 -#if CRYPTOPP_BOOL_SSE2_ASM_AVAILABLE - ASJ( jmp, 0, f) -#endif - ASL(2) // non-SSE2 - AS2( mov esi, ecx) - AS2( lea edi, A(0)) - AS2( mov ecx, 8) - AS1( rep movsd) - AS2( mov esi, K_END) - ASJ( jmp, 3, f) -#endif - -#if CRYPTOPP_BOOL_SSE2_ASM_AVAILABLE - ASL(0) - AS2( movdqa E(0), xmm1) - AS2( movdqa A(0), xmm0) -#endif -#if CRYPTOPP_BOOL_X86 - ASL(3) -#endif - AS2( sub WORD_REG(si), 48*4) - SWAP_COPY(0) SWAP_COPY(1) SWAP_COPY(2) SWAP_COPY(3) - SWAP_COPY(4) SWAP_COPY(5) SWAP_COPY(6) SWAP_COPY(7) -#if CRYPTOPP_BOOL_X86 - SWAP_COPY(8) SWAP_COPY(9) SWAP_COPY(10) SWAP_COPY(11) - SWAP_COPY(12) SWAP_COPY(13) SWAP_COPY(14) SWAP_COPY(15) -#endif - AS2( mov edi, E(0)) // E - AS2( mov eax, B(0)) // B - AS2( xor eax, C(0)) // B^C - AS2( mov ecx, A(0)) // A - - ROUND(0, 0, eax, ecx, edi, edx) - ROUND(1, 0, ecx, eax, edx, edi) - ROUND(2, 0, eax, ecx, edi, edx) - ROUND(3, 0, ecx, eax, edx, edi) - ROUND(4, 0, eax, ecx, edi, edx) - ROUND(5, 0, ecx, eax, edx, edi) - ROUND(6, 0, eax, ecx, edi, edx) - ROUND(7, 0, ecx, eax, edx, edi) - ROUND(8, 0, eax, ecx, edi, edx) - ROUND(9, 0, ecx, eax, edx, edi) - ROUND(10, 0, eax, ecx, edi, edx) - ROUND(11, 0, ecx, eax, edx, edi) - ROUND(12, 0, eax, ecx, edi, edx) - ROUND(13, 0, ecx, eax, edx, edi) - ROUND(14, 0, eax, ecx, edi, edx) - ROUND(15, 0, ecx, eax, edx, edi) - - ASL(1) - AS2(add WORD_REG(si), 4*16) - ROUND(0, 1, eax, ecx, edi, edx) - ROUND(1, 1, ecx, eax, edx, edi) - ROUND(2, 1, eax, ecx, edi, edx) - ROUND(3, 1, ecx, eax, edx, edi) - ROUND(4, 1, eax, ecx, edi, edx) - ROUND(5, 1, ecx, eax, edx, edi) - ROUND(6, 1, eax, ecx, edi, edx) - ROUND(7, 1, ecx, eax, edx, edi) - ROUND(8, 1, eax, ecx, edi, edx) - ROUND(9, 1, ecx, eax, edx, edi) - ROUND(10, 1, eax, ecx, edi, edx) - ROUND(11, 1, ecx, eax, edx, edi) - ROUND(12, 1, eax, ecx, edi, edx) - ROUND(13, 1, ecx, eax, edx, edi) - ROUND(14, 1, eax, ecx, edi, edx) - ROUND(15, 1, ecx, eax, edx, edi) - AS2( cmp WORD_REG(si), K_END) - ASJ( jne, 1, b) - - AS2( mov WORD_REG(dx), DATA_SAVE) - AS2( add WORD_REG(dx), 64) - AS2( mov AS_REG_7, STATE_SAVE) - AS2( mov DATA_SAVE, WORD_REG(dx)) - -#if CRYPTOPP_BOOL_SSE2_ASM_AVAILABLE -#if CRYPTOPP_BOOL_X86 - AS2( test DWORD PTR DATA_END, 1) - ASJ( jnz, 4, f) -#endif - AS2( movdqa xmm1, XMMWORD_PTR [AS_REG_7+1*16]) - AS2( movdqa xmm0, XMMWORD_PTR [AS_REG_7+0*16]) - AS2( paddd xmm1, E(0)) - AS2( paddd xmm0, A(0)) - AS2( movdqa [AS_REG_7+1*16], xmm1) - AS2( movdqa [AS_REG_7+0*16], xmm0) - AS2( cmp WORD_REG(dx), DATA_END) - ASJ( jl, 0, b) -#endif - -#if CRYPTOPP_BOOL_X86 -#if CRYPTOPP_BOOL_SSE2_ASM_AVAILABLE - ASJ( jmp, 5, f) - ASL(4) // non-SSE2 -#endif - AS2( add [AS_REG_7+0*4], ecx) // A - AS2( add [AS_REG_7+4*4], edi) // E - AS2( mov eax, B(0)) - AS2( mov ebx, C(0)) - AS2( mov ecx, D(0)) - AS2( add [AS_REG_7+1*4], eax) - AS2( add [AS_REG_7+2*4], ebx) - AS2( add [AS_REG_7+3*4], ecx) - AS2( mov eax, F(0)) - AS2( mov ebx, G(0)) - AS2( mov ecx, H(0)) - AS2( add [AS_REG_7+5*4], eax) - AS2( add [AS_REG_7+6*4], ebx) - AS2( add [AS_REG_7+7*4], ecx) - AS2( mov ecx, AS_REG_7d) - AS2( cmp WORD_REG(dx), DATA_END) - ASJ( jl, 2, b) -#if CRYPTOPP_BOOL_SSE2_ASM_AVAILABLE - ASL(5) -#endif -#endif - - AS_POP_IF86(sp) - AS_POP_IF86(bp) - #if !defined(_MSC_VER) || (_MSC_VER < 1400) - AS_POP_IF86(bx) - #endif - -#ifdef CRYPTOPP_GENERATE_X64_MASM - add rsp, LOCALS_SIZE+8 - pop rbp - pop rbx - pop rdi - pop rsi - ret - X86_SHA256_HashBlocks ENDP -#endif - -#ifdef __GNUC__ - ".att_syntax prefix;" - : - : "c" (state), "d" (data), "S" (SHA256_K+48), "D" (len) - #if CRYPTOPP_BOOL_X64 - , "m" (workspace[0]) - #endif - : "memory", "cc", "%eax" - #if CRYPTOPP_BOOL_X64 - , "%rbx", "%r8" - #endif - ); -#endif -} - -#endif // #if defined(CRYPTOPP_X86_ASM_AVAILABLE) || defined(CRYPTOPP_GENERATE_X64_MASM) - -#ifndef CRYPTOPP_GENERATE_X64_MASM - -#ifdef CRYPTOPP_X64_MASM_AVAILABLE -extern "C" { -void CRYPTOPP_FASTCALL X86_SHA256_HashBlocks(word32 *state, const word32 *data, size_t len); -} -#endif - -#if defined(CRYPTOPP_X86_ASM_AVAILABLE) || defined(CRYPTOPP_X64_MASM_AVAILABLE) - -size_t SHA256::HashMultipleBlocks(const word32 *input, size_t length) -{ - X86_SHA256_HashBlocks(m_state, input, (length&(size_t(0)-BLOCKSIZE)) - !HasSSE2()); - return length % BLOCKSIZE; -} - -size_t SHA224::HashMultipleBlocks(const word32 *input, size_t length) -{ - X86_SHA256_HashBlocks(m_state, input, (length&(size_t(0)-BLOCKSIZE)) - !HasSSE2()); - return length % BLOCKSIZE; -} - -#endif - -#define blk2(i) (W[i&15]+=s1(W[(i-2)&15])+W[(i-7)&15]+s0(W[(i-15)&15])) - -#define Ch(x,y,z) (z^(x&(y^z))) -#define Maj(x,y,z) (y^((x^y)&(y^z))) - -#define a(i) T[(0-i)&7] -#define b(i) T[(1-i)&7] -#define c(i) T[(2-i)&7] -#define d(i) T[(3-i)&7] -#define e(i) T[(4-i)&7] -#define f(i) T[(5-i)&7] -#define g(i) T[(6-i)&7] -#define h(i) T[(7-i)&7] - -#define R(i) h(i)+=S1(e(i))+Ch(e(i),f(i),g(i))+SHA256_K[i+j]+(j?blk2(i):blk0(i));\ - d(i)+=h(i);h(i)+=S0(a(i))+Maj(a(i),b(i),c(i)) - -// for SHA256 -#define S0(x) (rotrFixed(x,2)^rotrFixed(x,13)^rotrFixed(x,22)) -#define S1(x) (rotrFixed(x,6)^rotrFixed(x,11)^rotrFixed(x,25)) -#define s0(x) (rotrFixed(x,7)^rotrFixed(x,18)^(x>>3)) -#define s1(x) (rotrFixed(x,17)^rotrFixed(x,19)^(x>>10)) - -void SHA256::Transform(word32 *state, const word32 *data) -{ - word32 W[16]; -#if defined(CRYPTOPP_X86_ASM_AVAILABLE) || defined(CRYPTOPP_X64_MASM_AVAILABLE) - // this byte reverse is a waste of time, but this function is only called by MDC - ByteReverse(W, data, BLOCKSIZE); - X86_SHA256_HashBlocks(state, W, BLOCKSIZE - !HasSSE2()); -#else - word32 T[8]; - /* Copy context->state[] to working vars */ - memcpy(T, state, sizeof(T)); - /* 64 operations, partially loop unrolled */ - for (unsigned int j=0; j<64; j+=16) - { - R( 0); R( 1); R( 2); R( 3); - R( 4); R( 5); R( 6); R( 7); - R( 8); R( 9); R(10); R(11); - R(12); R(13); R(14); R(15); - } - /* Add the working vars back into context.state[] */ - state[0] += a(0); - state[1] += b(0); - state[2] += c(0); - state[3] += d(0); - state[4] += e(0); - state[5] += f(0); - state[6] += g(0); - state[7] += h(0); -#endif -} - -/* -// smaller but slower -void SHA256::Transform(word32 *state, const word32 *data) -{ - word32 T[20]; - word32 W[32]; - unsigned int i = 0, j = 0; - word32 *t = T+8; - - memcpy(t, state, 8*4); - word32 e = t[4], a = t[0]; - - do - { - word32 w = data[j]; - W[j] = w; - w += SHA256_K[j]; - w += t[7]; - w += S1(e); - w += Ch(e, t[5], t[6]); - e = t[3] + w; - t[3] = t[3+8] = e; - w += S0(t[0]); - a = w + Maj(a, t[1], t[2]); - t[-1] = t[7] = a; - --t; - ++j; - if (j%8 == 0) - t += 8; - } while (j<16); - - do - { - i = j&0xf; - word32 w = s1(W[i+16-2]) + s0(W[i+16-15]) + W[i] + W[i+16-7]; - W[i+16] = W[i] = w; - w += SHA256_K[j]; - w += t[7]; - w += S1(e); - w += Ch(e, t[5], t[6]); - e = t[3] + w; - t[3] = t[3+8] = e; - w += S0(t[0]); - a = w + Maj(a, t[1], t[2]); - t[-1] = t[7] = a; - - w = s1(W[(i+1)+16-2]) + s0(W[(i+1)+16-15]) + W[(i+1)] + W[(i+1)+16-7]; - W[(i+1)+16] = W[(i+1)] = w; - w += SHA256_K[j+1]; - w += (t-1)[7]; - w += S1(e); - w += Ch(e, (t-1)[5], (t-1)[6]); - e = (t-1)[3] + w; - (t-1)[3] = (t-1)[3+8] = e; - w += S0((t-1)[0]); - a = w + Maj(a, (t-1)[1], (t-1)[2]); - (t-1)[-1] = (t-1)[7] = a; - - t-=2; - j+=2; - if (j%8 == 0) - t += 8; - } while (j<64); - - state[0] += a; - state[1] += t[1]; - state[2] += t[2]; - state[3] += t[3]; - state[4] += e; - state[5] += t[5]; - state[6] += t[6]; - state[7] += t[7]; -} -*/ - -#undef S0 -#undef S1 -#undef s0 -#undef s1 -#undef R - -// ************************************************************* - -void SHA384::InitState(HashWordType *state) -{ - static const word64 s[8] = { - W64LIT(0xcbbb9d5dc1059ed8), W64LIT(0x629a292a367cd507), - W64LIT(0x9159015a3070dd17), W64LIT(0x152fecd8f70e5939), - W64LIT(0x67332667ffc00b31), W64LIT(0x8eb44a8768581511), - W64LIT(0xdb0c2e0d64f98fa7), W64LIT(0x47b5481dbefa4fa4)}; - memcpy(state, s, sizeof(s)); -} - -void SHA512::InitState(HashWordType *state) -{ - static const word64 s[8] = { - W64LIT(0x6a09e667f3bcc908), W64LIT(0xbb67ae8584caa73b), - W64LIT(0x3c6ef372fe94f82b), W64LIT(0xa54ff53a5f1d36f1), - W64LIT(0x510e527fade682d1), W64LIT(0x9b05688c2b3e6c1f), - W64LIT(0x1f83d9abfb41bd6b), W64LIT(0x5be0cd19137e2179)}; - memcpy(state, s, sizeof(s)); -} - -#if CRYPTOPP_BOOL_SSE2_ASM_AVAILABLE && CRYPTOPP_BOOL_X86 -CRYPTOPP_ALIGN_DATA(16) static const word64 SHA512_K[80] CRYPTOPP_SECTION_ALIGN16 = { -#else -static const word64 SHA512_K[80] = { -#endif - W64LIT(0x428a2f98d728ae22), W64LIT(0x7137449123ef65cd), - W64LIT(0xb5c0fbcfec4d3b2f), W64LIT(0xe9b5dba58189dbbc), - W64LIT(0x3956c25bf348b538), W64LIT(0x59f111f1b605d019), - W64LIT(0x923f82a4af194f9b), W64LIT(0xab1c5ed5da6d8118), - W64LIT(0xd807aa98a3030242), W64LIT(0x12835b0145706fbe), - W64LIT(0x243185be4ee4b28c), W64LIT(0x550c7dc3d5ffb4e2), - W64LIT(0x72be5d74f27b896f), W64LIT(0x80deb1fe3b1696b1), - W64LIT(0x9bdc06a725c71235), W64LIT(0xc19bf174cf692694), - W64LIT(0xe49b69c19ef14ad2), W64LIT(0xefbe4786384f25e3), - W64LIT(0x0fc19dc68b8cd5b5), W64LIT(0x240ca1cc77ac9c65), - W64LIT(0x2de92c6f592b0275), W64LIT(0x4a7484aa6ea6e483), - W64LIT(0x5cb0a9dcbd41fbd4), W64LIT(0x76f988da831153b5), - W64LIT(0x983e5152ee66dfab), W64LIT(0xa831c66d2db43210), - W64LIT(0xb00327c898fb213f), W64LIT(0xbf597fc7beef0ee4), - W64LIT(0xc6e00bf33da88fc2), W64LIT(0xd5a79147930aa725), - W64LIT(0x06ca6351e003826f), W64LIT(0x142929670a0e6e70), - W64LIT(0x27b70a8546d22ffc), W64LIT(0x2e1b21385c26c926), - W64LIT(0x4d2c6dfc5ac42aed), W64LIT(0x53380d139d95b3df), - W64LIT(0x650a73548baf63de), W64LIT(0x766a0abb3c77b2a8), - W64LIT(0x81c2c92e47edaee6), W64LIT(0x92722c851482353b), - W64LIT(0xa2bfe8a14cf10364), W64LIT(0xa81a664bbc423001), - W64LIT(0xc24b8b70d0f89791), W64LIT(0xc76c51a30654be30), - W64LIT(0xd192e819d6ef5218), W64LIT(0xd69906245565a910), - W64LIT(0xf40e35855771202a), W64LIT(0x106aa07032bbd1b8), - W64LIT(0x19a4c116b8d2d0c8), W64LIT(0x1e376c085141ab53), - W64LIT(0x2748774cdf8eeb99), W64LIT(0x34b0bcb5e19b48a8), - W64LIT(0x391c0cb3c5c95a63), W64LIT(0x4ed8aa4ae3418acb), - W64LIT(0x5b9cca4f7763e373), W64LIT(0x682e6ff3d6b2b8a3), - W64LIT(0x748f82ee5defb2fc), W64LIT(0x78a5636f43172f60), - W64LIT(0x84c87814a1f0ab72), W64LIT(0x8cc702081a6439ec), - W64LIT(0x90befffa23631e28), W64LIT(0xa4506cebde82bde9), - W64LIT(0xbef9a3f7b2c67915), W64LIT(0xc67178f2e372532b), - W64LIT(0xca273eceea26619c), W64LIT(0xd186b8c721c0c207), - W64LIT(0xeada7dd6cde0eb1e), W64LIT(0xf57d4f7fee6ed178), - W64LIT(0x06f067aa72176fba), W64LIT(0x0a637dc5a2c898a6), - W64LIT(0x113f9804bef90dae), W64LIT(0x1b710b35131c471b), - W64LIT(0x28db77f523047d84), W64LIT(0x32caab7b40c72493), - W64LIT(0x3c9ebe0a15c9bebc), W64LIT(0x431d67c49c100d4c), - W64LIT(0x4cc5d4becb3e42b6), W64LIT(0x597f299cfc657e2a), - W64LIT(0x5fcb6fab3ad6faec), W64LIT(0x6c44198c4a475817) -}; - -#if CRYPTOPP_BOOL_SSE2_ASM_AVAILABLE && CRYPTOPP_BOOL_X86 -// put assembly version in separate function, otherwise MSVC 2005 SP1 doesn't generate correct code for the non-assembly version -CRYPTOPP_NAKED static void CRYPTOPP_FASTCALL SHA512_SSE2_Transform(word64 *state, const word64 *data) -{ -#ifdef __GNUC__ - __asm__ __volatile__ - ( - ".intel_syntax noprefix;" - AS1( push ebx) - AS2( mov ebx, eax) -#else - AS1( push ebx) - AS1( push esi) - AS1( push edi) - AS2( lea ebx, SHA512_K) -#endif - - AS2( mov eax, esp) - AS2( and esp, 0xfffffff0) - AS2( sub esp, 27*16) // 17*16 for expanded data, 20*8 for state - AS1( push eax) - AS2( xor eax, eax) - AS2( lea edi, [esp+4+8*8]) // start at middle of state buffer. will decrement pointer each round to avoid copying - AS2( lea esi, [esp+4+20*8+8]) // 16-byte alignment, then add 8 - - AS2( movdqa xmm0, [ecx+0*16]) - AS2( movdq2q mm4, xmm0) - AS2( movdqa [edi+0*16], xmm0) - AS2( movdqa xmm0, [ecx+1*16]) - AS2( movdqa [edi+1*16], xmm0) - AS2( movdqa xmm0, [ecx+2*16]) - AS2( movdq2q mm5, xmm0) - AS2( movdqa [edi+2*16], xmm0) - AS2( movdqa xmm0, [ecx+3*16]) - AS2( movdqa [edi+3*16], xmm0) - ASJ( jmp, 0, f) - -#define SSE2_S0_S1(r, a, b, c) \ - AS2( movq mm6, r)\ - AS2( psrlq r, a)\ - AS2( movq mm7, r)\ - AS2( psllq mm6, 64-c)\ - AS2( pxor mm7, mm6)\ - AS2( psrlq r, b-a)\ - AS2( pxor mm7, r)\ - AS2( psllq mm6, c-b)\ - AS2( pxor mm7, mm6)\ - AS2( psrlq r, c-b)\ - AS2( pxor r, mm7)\ - AS2( psllq mm6, b-a)\ - AS2( pxor r, mm6) - -#define SSE2_s0(r, a, b, c) \ - AS2( movdqa xmm6, r)\ - AS2( psrlq r, a)\ - AS2( movdqa xmm7, r)\ - AS2( psllq xmm6, 64-c)\ - AS2( pxor xmm7, xmm6)\ - AS2( psrlq r, b-a)\ - AS2( pxor xmm7, r)\ - AS2( psrlq r, c-b)\ - AS2( pxor r, xmm7)\ - AS2( psllq xmm6, c-a)\ - AS2( pxor r, xmm6) - -#define SSE2_s1(r, a, b, c) \ - AS2( movdqa xmm6, r)\ - AS2( psrlq r, a)\ - AS2( movdqa xmm7, r)\ - AS2( psllq xmm6, 64-c)\ - AS2( pxor xmm7, xmm6)\ - AS2( psrlq r, b-a)\ - AS2( pxor xmm7, r)\ - AS2( psllq xmm6, c-b)\ - AS2( pxor xmm7, xmm6)\ - AS2( psrlq r, c-b)\ - AS2( pxor r, xmm7) - - ASL(SHA512_Round) - // k + w is in mm0, a is in mm4, e is in mm5 - AS2( paddq mm0, [edi+7*8]) // h - AS2( movq mm2, [edi+5*8]) // f - AS2( movq mm3, [edi+6*8]) // g - AS2( pxor mm2, mm3) - AS2( pand mm2, mm5) - SSE2_S0_S1(mm5,14,18,41) - AS2( pxor mm2, mm3) - AS2( paddq mm0, mm2) // h += Ch(e,f,g) - AS2( paddq mm5, mm0) // h += S1(e) - AS2( movq mm2, [edi+1*8]) // b - AS2( movq mm1, mm2) - AS2( por mm2, mm4) - AS2( pand mm2, [edi+2*8]) // c - AS2( pand mm1, mm4) - AS2( por mm1, mm2) - AS2( paddq mm1, mm5) // temp = h + Maj(a,b,c) - AS2( paddq mm5, [edi+3*8]) // e = d + h - AS2( movq [edi+3*8], mm5) - AS2( movq [edi+11*8], mm5) - SSE2_S0_S1(mm4,28,34,39) // S0(a) - AS2( paddq mm4, mm1) // a = temp + S0(a) - AS2( movq [edi-8], mm4) - AS2( movq [edi+7*8], mm4) - AS1( ret) - - // first 16 rounds - ASL(0) - AS2( movq mm0, [edx+eax*8]) - AS2( movq [esi+eax*8], mm0) - AS2( movq [esi+eax*8+16*8], mm0) - AS2( paddq mm0, [ebx+eax*8]) - ASC( call, SHA512_Round) - AS1( inc eax) - AS2( sub edi, 8) - AS2( test eax, 7) - ASJ( jnz, 0, b) - AS2( add edi, 8*8) - AS2( cmp eax, 16) - ASJ( jne, 0, b) - - // rest of the rounds - AS2( movdqu xmm0, [esi+(16-2)*8]) - ASL(1) - // data expansion, W[i-2] already in xmm0 - AS2( movdqu xmm3, [esi]) - AS2( paddq xmm3, [esi+(16-7)*8]) - AS2( movdqa xmm2, [esi+(16-15)*8]) - SSE2_s1(xmm0, 6, 19, 61) - AS2( paddq xmm0, xmm3) - SSE2_s0(xmm2, 1, 7, 8) - AS2( paddq xmm0, xmm2) - AS2( movdq2q mm0, xmm0) - AS2( movhlps xmm1, xmm0) - AS2( paddq mm0, [ebx+eax*8]) - AS2( movlps [esi], xmm0) - AS2( movlps [esi+8], xmm1) - AS2( movlps [esi+8*16], xmm0) - AS2( movlps [esi+8*17], xmm1) - // 2 rounds - ASC( call, SHA512_Round) - AS2( sub edi, 8) - AS2( movdq2q mm0, xmm1) - AS2( paddq mm0, [ebx+eax*8+8]) - ASC( call, SHA512_Round) - // update indices and loop - AS2( add esi, 16) - AS2( add eax, 2) - AS2( sub edi, 8) - AS2( test eax, 7) - ASJ( jnz, 1, b) - // do housekeeping every 8 rounds - AS2( mov esi, 0xf) - AS2( and esi, eax) - AS2( lea esi, [esp+4+20*8+8+esi*8]) - AS2( add edi, 8*8) - AS2( cmp eax, 80) - ASJ( jne, 1, b) - -#define SSE2_CombineState(i) \ - AS2( movdqa xmm0, [edi+i*16])\ - AS2( paddq xmm0, [ecx+i*16])\ - AS2( movdqa [ecx+i*16], xmm0) - - SSE2_CombineState(0) - SSE2_CombineState(1) - SSE2_CombineState(2) - SSE2_CombineState(3) - - AS1( pop esp) - AS1( emms) - -#if defined(__GNUC__) - AS1( pop ebx) - ".att_syntax prefix;" - : - : "a" (SHA512_K), "c" (state), "d" (data) - : "%esi", "%edi", "memory", "cc" - ); -#else - AS1( pop edi) - AS1( pop esi) - AS1( pop ebx) - AS1( ret) -#endif -} -#endif // #if CRYPTOPP_BOOL_SSE2_ASM_AVAILABLE - -void SHA512::Transform(word64 *state, const word64 *data) -{ -#if CRYPTOPP_BOOL_SSE2_ASM_AVAILABLE && CRYPTOPP_BOOL_X86 - if (HasSSE2()) - { - SHA512_SSE2_Transform(state, data); - return; - } -#endif - -#define S0(x) (rotrFixed(x,28)^rotrFixed(x,34)^rotrFixed(x,39)) -#define S1(x) (rotrFixed(x,14)^rotrFixed(x,18)^rotrFixed(x,41)) -#define s0(x) (rotrFixed(x,1)^rotrFixed(x,8)^(x>>7)) -#define s1(x) (rotrFixed(x,19)^rotrFixed(x,61)^(x>>6)) - -#define R(i) h(i)+=S1(e(i))+Ch(e(i),f(i),g(i))+SHA512_K[i+j]+(j?blk2(i):blk0(i));\ - d(i)+=h(i);h(i)+=S0(a(i))+Maj(a(i),b(i),c(i)) - - word64 W[16]; - word64 T[8]; - /* Copy context->state[] to working vars */ - memcpy(T, state, sizeof(T)); - /* 80 operations, partially loop unrolled */ - for (unsigned int j=0; j<80; j+=16) - { - R( 0); R( 1); R( 2); R( 3); - R( 4); R( 5); R( 6); R( 7); - R( 8); R( 9); R(10); R(11); - R(12); R(13); R(14); R(15); - } - /* Add the working vars back into context.state[] */ - state[0] += a(0); - state[1] += b(0); - state[2] += c(0); - state[3] += d(0); - state[4] += e(0); - state[5] += f(0); - state[6] += g(0); - state[7] += h(0); -} - -NAMESPACE_END - -#endif // #ifndef CRYPTOPP_GENERATE_X64_MASM -#endif // #ifndef CRYPTOPP_IMPORTS diff --git a/src/cryptopp/sha.h b/src/cryptopp/sha.h deleted file mode 100644 index 679081e8fa..0000000000 --- a/src/cryptopp/sha.h +++ /dev/null @@ -1,63 +0,0 @@ -#ifndef CRYPTOPP_SHA_H -#define CRYPTOPP_SHA_H - -#include "iterhash.h" - -NAMESPACE_BEGIN(CryptoPP) - -/// <a href="http://www.weidai.com/scan-mirror/md.html#SHA-1">SHA-1</a> -class CRYPTOPP_DLL SHA1 : public IteratedHashWithStaticTransform<word32, BigEndian, 64, 20, SHA1> -{ -public: - static void CRYPTOPP_API InitState(HashWordType *state); - static void CRYPTOPP_API Transform(word32 *digest, const word32 *data); - static const char * CRYPTOPP_API StaticAlgorithmName() {return "SHA-1";} -}; - -typedef SHA1 SHA; // for backwards compatibility - -//! implements the SHA-256 standard -class CRYPTOPP_DLL SHA256 : public IteratedHashWithStaticTransform<word32, BigEndian, 64, 32, SHA256, 32, true> -{ -public: -#if defined(CRYPTOPP_X86_ASM_AVAILABLE) || defined(CRYPTOPP_X64_MASM_AVAILABLE) - size_t HashMultipleBlocks(const word32 *input, size_t length); -#endif - static void CRYPTOPP_API InitState(HashWordType *state); - static void CRYPTOPP_API Transform(word32 *digest, const word32 *data); - static const char * CRYPTOPP_API StaticAlgorithmName() {return "SHA-256";} -}; - -//! implements the SHA-224 standard -class CRYPTOPP_DLL SHA224 : public IteratedHashWithStaticTransform<word32, BigEndian, 64, 32, SHA224, 28, true> -{ -public: -#if defined(CRYPTOPP_X86_ASM_AVAILABLE) || defined(CRYPTOPP_X64_MASM_AVAILABLE) - size_t HashMultipleBlocks(const word32 *input, size_t length); -#endif - static void CRYPTOPP_API InitState(HashWordType *state); - static void CRYPTOPP_API Transform(word32 *digest, const word32 *data) {SHA256::Transform(digest, data);} - static const char * CRYPTOPP_API StaticAlgorithmName() {return "SHA-224";} -}; - -//! implements the SHA-512 standard -class CRYPTOPP_DLL SHA512 : public IteratedHashWithStaticTransform<word64, BigEndian, 128, 64, SHA512, 64, CRYPTOPP_BOOL_X86> -{ -public: - static void CRYPTOPP_API InitState(HashWordType *state); - static void CRYPTOPP_API Transform(word64 *digest, const word64 *data); - static const char * CRYPTOPP_API StaticAlgorithmName() {return "SHA-512";} -}; - -//! implements the SHA-384 standard -class CRYPTOPP_DLL SHA384 : public IteratedHashWithStaticTransform<word64, BigEndian, 128, 64, SHA384, 48, CRYPTOPP_BOOL_X86> -{ -public: - static void CRYPTOPP_API InitState(HashWordType *state); - static void CRYPTOPP_API Transform(word64 *digest, const word64 *data) {SHA512::Transform(digest, data);} - static const char * CRYPTOPP_API StaticAlgorithmName() {return "SHA-384";} -}; - -NAMESPACE_END - -#endif diff --git a/src/cryptopp/simple.h b/src/cryptopp/simple.h deleted file mode 100644 index 8b13789179..0000000000 --- a/src/cryptopp/simple.h +++ /dev/null @@ -1 +0,0 @@ - diff --git a/src/cryptopp/smartptr.h b/src/cryptopp/smartptr.h deleted file mode 100644 index 6b4040e999..0000000000 --- a/src/cryptopp/smartptr.h +++ /dev/null @@ -1,223 +0,0 @@ -#ifndef CRYPTOPP_SMARTPTR_H -#define CRYPTOPP_SMARTPTR_H - -#include "config.h" -#include <algorithm> - -NAMESPACE_BEGIN(CryptoPP) - -template <class T> class simple_ptr -{ -public: - simple_ptr() : m_p(NULL) {} - ~simple_ptr() {delete m_p;} - T *m_p; -}; - -template <class T> class member_ptr -{ -public: - explicit member_ptr(T *p = NULL) : m_p(p) {} - - ~member_ptr(); - - const T& operator*() const { return *m_p; } - T& operator*() { return *m_p; } - - const T* operator->() const { return m_p; } - T* operator->() { return m_p; } - - const T* get() const { return m_p; } - T* get() { return m_p; } - - T* release() - { - T *old_p = m_p; - m_p = 0; - return old_p; - } - - void reset(T *p = 0); - -protected: - member_ptr(const member_ptr<T>& rhs); // copy not allowed - void operator=(const member_ptr<T>& rhs); // assignment not allowed - - T *m_p; -}; - -template <class T> member_ptr<T>::~member_ptr() {delete m_p;} -template <class T> void member_ptr<T>::reset(T *p) {delete m_p; m_p = p;} - -// ******************************************************** - -template<class T> class value_ptr : public member_ptr<T> -{ -public: - value_ptr(const T &obj) : member_ptr<T>(new T(obj)) {} - value_ptr(T *p = NULL) : member_ptr<T>(p) {} - value_ptr(const value_ptr<T>& rhs) - : member_ptr<T>(rhs.m_p ? new T(*rhs.m_p) : NULL) {} - - value_ptr<T>& operator=(const value_ptr<T>& rhs); - bool operator==(const value_ptr<T>& rhs) - { - return (!this->m_p && !rhs.m_p) || (this->m_p && rhs.m_p && *this->m_p == *rhs.m_p); - } -}; - -template <class T> value_ptr<T>& value_ptr<T>::operator=(const value_ptr<T>& rhs) -{ - T *old_p = this->m_p; - this->m_p = rhs.m_p ? new T(*rhs.m_p) : NULL; - delete old_p; - return *this; -} - -// ******************************************************** - -template<class T> class clonable_ptr : public member_ptr<T> -{ -public: - clonable_ptr(const T &obj) : member_ptr<T>(obj.Clone()) {} - clonable_ptr(T *p = NULL) : member_ptr<T>(p) {} - clonable_ptr(const clonable_ptr<T>& rhs) - : member_ptr<T>(rhs.m_p ? rhs.m_p->Clone() : NULL) {} - - clonable_ptr<T>& operator=(const clonable_ptr<T>& rhs); -}; - -template <class T> clonable_ptr<T>& clonable_ptr<T>::operator=(const clonable_ptr<T>& rhs) -{ - T *old_p = this->m_p; - this->m_p = rhs.m_p ? rhs.m_p->Clone() : NULL; - delete old_p; - return *this; -} - -// ******************************************************** - -template<class T> class counted_ptr -{ -public: - explicit counted_ptr(T *p = 0); - counted_ptr(const T &r) : m_p(0) {attach(r);} - counted_ptr(const counted_ptr<T>& rhs); - - ~counted_ptr(); - - const T& operator*() const { return *m_p; } - T& operator*() { return *m_p; } - - const T* operator->() const { return m_p; } - T* operator->() { return get(); } - - const T* get() const { return m_p; } - T* get(); - - void attach(const T &p); - - counted_ptr<T> & operator=(const counted_ptr<T>& rhs); - -private: - T *m_p; -}; - -template <class T> counted_ptr<T>::counted_ptr(T *p) - : m_p(p) -{ - if (m_p) - m_p->m_referenceCount = 1; -} - -template <class T> counted_ptr<T>::counted_ptr(const counted_ptr<T>& rhs) - : m_p(rhs.m_p) -{ - if (m_p) - m_p->m_referenceCount++; -} - -template <class T> counted_ptr<T>::~counted_ptr() -{ - if (m_p && --m_p->m_referenceCount == 0) - delete m_p; -} - -template <class T> void counted_ptr<T>::attach(const T &r) -{ - if (m_p && --m_p->m_referenceCount == 0) - delete m_p; - if (r.m_referenceCount == 0) - { - m_p = r.clone(); - m_p->m_referenceCount = 1; - } - else - { - m_p = const_cast<T *>(&r); - m_p->m_referenceCount++; - } -} - -template <class T> T* counted_ptr<T>::get() -{ - if (m_p && m_p->m_referenceCount > 1) - { - T *temp = m_p->clone(); - m_p->m_referenceCount--; - m_p = temp; - m_p->m_referenceCount = 1; - } - return m_p; -} - -template <class T> counted_ptr<T> & counted_ptr<T>::operator=(const counted_ptr<T>& rhs) -{ - if (m_p != rhs.m_p) - { - if (m_p && --m_p->m_referenceCount == 0) - delete m_p; - m_p = rhs.m_p; - if (m_p) - m_p->m_referenceCount++; - } - return *this; -} - -// ******************************************************** - -template <class T> class vector_member_ptrs -{ -public: - vector_member_ptrs(size_t size=0) - : m_size(size), m_ptr(new member_ptr<T>[size]) {} - ~vector_member_ptrs() - {delete [] this->m_ptr;} - - member_ptr<T>& operator[](size_t index) - {assert(index<this->m_size); return this->m_ptr[index];} - const member_ptr<T>& operator[](size_t index) const - {assert(index<this->m_size); return this->m_ptr[index];} - - size_t size() const {return this->m_size;} - void resize(size_t newSize) - { - member_ptr<T> *newPtr = new member_ptr<T>[newSize]; - for (size_t i=0; i<this->m_size && i<newSize; i++) - newPtr[i].reset(this->m_ptr[i].release()); - delete [] this->m_ptr; - this->m_size = newSize; - this->m_ptr = newPtr; - } - -private: - vector_member_ptrs(const vector_member_ptrs<T> &c); // copy not allowed - void operator=(const vector_member_ptrs<T> &x); // assignment not allowed - - size_t m_size; - member_ptr<T> *m_ptr; -}; - -NAMESPACE_END - -#endif diff --git a/src/cryptopp/stdcpp.h b/src/cryptopp/stdcpp.h deleted file mode 100644 index 9a468ab61e..0000000000 --- a/src/cryptopp/stdcpp.h +++ /dev/null @@ -1,27 +0,0 @@ -#ifndef CRYPTOPP_STDCPP_H -#define CRYPTOPP_STDCPP_H - -#include <stddef.h> -#include <assert.h> -#include <limits.h> -#include <memory> -#include <string> -#include <exception> -#include <typeinfo> - - -#ifdef _MSC_VER -#include <string.h> // CodeWarrior doesn't have memory.h -#include <algorithm> -#include <map> -#include <vector> - -// re-disable this -#pragma warning(disable: 4231) -#endif - -#if defined(_MSC_VER) && defined(_CRTAPI1) -#define CRYPTOPP_MSVCRT6 -#endif - -#endif diff --git a/src/db.cpp b/src/db.cpp index f2363647aa..7de1f8df9a 100644 --- a/src/db.cpp +++ b/src/db.cpp @@ -520,24 +520,6 @@ bool CAddrDB::LoadAddresses() { CRITICAL_BLOCK(cs_mapAddresses) { - // Load user provided addresses - CAutoFile filein = fopen((GetDataDir() + "/addr.txt").c_str(), "rt"); - if (filein) - { - try - { - char psz[1000]; - while (fgets(psz, sizeof(psz), filein)) - { - CAddress addr(psz, false, NODE_NETWORK); - addr.nTime = 0; // so it won't relay unless successfully connected - if (addr.IsValid()) - AddAddress(addr); - } - } - catch (...) { } - } - // Get cursor Dbc* pcursor = GetCursor(); if (!pcursor) @@ -676,7 +658,7 @@ int CWalletDB::LoadWallet(CWallet* pwallet) vector<uint256> vWalletUpgrade; // Modify defaults -#ifndef __WXMSW__ +#ifndef WIN32 // Tray icon sometimes disappears on 9.10 karmic koala 64-bit, leaving no way to access the program fMinimizeToTray = false; fMinimizeOnClose = false; diff --git a/src/headers.h b/src/headers.h index 17e9b3bc52..1e174da0de 100644 --- a/src/headers.h +++ b/src/headers.h @@ -22,7 +22,7 @@ #if (defined(__unix__) || defined(unix)) && !defined(USG) #include <sys/param.h> // to get BSD define #endif -#ifdef __WXMAC_OSX__ +#ifdef MAC_OSX #ifndef BSD #define BSD 1 #endif @@ -51,7 +51,7 @@ #include <boost/foreach.hpp> -#ifdef __WXMSW__ +#ifdef WIN32 #include <windows.h> #include <winsock2.h> #include <mswsock.h> diff --git a/src/init.cpp b/src/init.cpp index f09e1d019e..28be7ef7c0 100644 --- a/src/init.cpp +++ b/src/init.cpp @@ -24,7 +24,7 @@ CWallet* pwalletMain; void ExitTimeout(void* parg) { -#ifdef __WXMSW__ +#ifdef WIN32 Sleep(5000); ExitProcess(0); #endif @@ -121,10 +121,10 @@ bool AppInit2(int argc, char* argv[]) // Disable confusing "helpful" text message on abort, ctrl-c _set_abort_behavior(0, _WRITE_ABORT_MSG | _CALL_REPORTFAULT); #endif -#ifndef __WXMSW__ +#ifndef WIN32 umask(077); #endif -#ifndef __WXMSW__ +#ifndef WIN32 // Clean shutdown on SIGTERM struct sigaction sa; sa.sa_handler = HandleSIGTERM; @@ -192,7 +192,7 @@ bool AppInit2(int argc, char* argv[]) #ifdef GUI " -server \t\t " + _("Accept command line and JSON-RPC commands\n") + #endif -#ifndef __WXMSW__ +#ifndef WIN32 " -daemon \t\t " + _("Run in the background as a daemon and accept commands\n") + #endif " -testnet \t\t " + _("Use the test network\n") + @@ -225,7 +225,7 @@ bool AppInit2(int argc, char* argv[]) fDebug = GetBoolArg("-debug"); fAllowDNS = GetBoolArg("-dns"); -#ifndef __WXMSW__ +#ifndef WIN32 fDaemon = GetBoolArg("-daemon"); #else fDaemon = false; @@ -260,7 +260,7 @@ bool AppInit2(int argc, char* argv[]) } #endif -#ifndef __WXMSW__ +#ifndef WIN32 if (fDaemon) { // Daemonize diff --git a/src/main.cpp b/src/main.cpp index 472c80a33a..45de76a351 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -6,7 +6,6 @@ #include "db.h" #include "net.h" #include "init.h" -#include "cryptopp/sha.h" #include <boost/filesystem.hpp> #include <boost/filesystem/fstream.hpp> @@ -1338,7 +1337,7 @@ bool CBlock::AcceptBlock() return true; } -bool static ProcessBlock(CNode* pfrom, CBlock* pblock) +bool ProcessBlock(CNode* pfrom, CBlock* pblock) { // Check for duplicate uint256 hash = pblock->GetHash(); @@ -2614,15 +2613,25 @@ int static FormatHashBlocks(void* pbuffer, unsigned int len) return blocks; } -using CryptoPP::ByteReverse; - static const unsigned int pSHA256InitState[8] = {0x6a09e667, 0xbb67ae85, 0x3c6ef372, 0xa54ff53a, 0x510e527f, 0x9b05688c, 0x1f83d9ab, 0x5be0cd19}; -inline void SHA256Transform(void* pstate, void* pinput, const void* pinit) +void SHA256Transform(void* pstate, void* pinput, const void* pinit) { - memcpy(pstate, pinit, 32); - CryptoPP::SHA256::Transform((CryptoPP::word32*)pstate, (CryptoPP::word32*)pinput); + SHA256_CTX ctx; + unsigned char data[64]; + + SHA256_Init(&ctx); + + for (int i = 0; i < 16; i++) + ((uint32_t*)data)[i] = ByteReverse(((uint32_t*)pinput)[i]); + + for (int i = 0; i < 8; i++) + ctx.h[i] = ((uint32_t*)pinit)[i]; + + SHA256_Update(&ctx, data, sizeof(data)); + for (int i = 0; i < 8; i++) + ((uint32_t*)pstate)[i] = ctx.h[i]; } // @@ -2923,7 +2932,6 @@ bool CheckWork(CBlock* pblock, CWallet& wallet, CReserveKey& reservekey) return error("BitcoinMiner : ProcessBlock, block not accepted"); } - Sleep(2000); return true; } diff --git a/src/main.h b/src/main.h index 1106bb9785..60ca318381 100644 --- a/src/main.h +++ b/src/main.h @@ -85,6 +85,7 @@ class CTxIndex; void RegisterWallet(CWallet* pwalletIn); void UnregisterWallet(CWallet* pwalletIn); +bool ProcessBlock(CNode* pfrom, CBlock* pblock); bool CheckDiskSpace(uint64 nAdditionalBytes=0); FILE* OpenBlockFile(unsigned int nFile, unsigned int nBlockPos, const char* pszMode="rb"); FILE* AppendBlockFile(unsigned int& nFileRet); @@ -926,7 +927,7 @@ public: fflush(fileout); if (!IsInitialBlockDownload() || (nBestHeight+1) % 500 == 0) { -#ifdef __WXMSW__ +#ifdef WIN32 _commit(_fileno(fileout)); #else fsync(fileno(fileout)); diff --git a/src/makefile.linux-mingw b/src/makefile.linux-mingw index 8b3df66d98..eb22190e57 100644 --- a/src/makefile.linux-mingw +++ b/src/makefile.linux-mingw @@ -51,6 +51,7 @@ HEADERS = \ util.h \ wallet.h + ifdef USE_UPNP LIBPATHS += -L"$(DEPSDIR)/miniupnpc" LIBS += -l miniupnpc -l iphlpapi @@ -71,20 +72,14 @@ OBJS= \ obj/bitcoinrpc.o \ obj/script.o \ obj/util.o \ - obj/wallet.o \ - cryptopp/obj/sha.o \ - cryptopp/obj/cpu.o - + obj/wallet.o all: bitcoind.exe -cryptopp/obj/%.o: cryptopp/%.cpp - i586-mingw32msvc-g++ -c $(CFLAGS) -O3 -DCRYPTOPP_DISABLE_ASM -o $@ $< - obj/nogui/%.o: %.cpp $(HEADERS) i586-mingw32msvc-g++ -c $(CFLAGS) -o $@ $< -bitcoind.exe: $(OBJS:obj/%=obj/nogui/%) obj/ui_res.o +bitcoind.exe: $(OBJS:obj/%=obj/nogui/%) i586-mingw32msvc-g++ $(CFLAGS) -o $@ $(LIBPATHS) $^ $(LIBS) @@ -99,7 +94,6 @@ clean: -rm -f obj/*.o -rm -f obj/nogui/*.o -rm -f obj/test/*.o - -rm -f cryptopp/obj/*.o -rm -f test/*.o -rm -f headers.h.gch -rm -f bitcoind.exe diff --git a/src/makefile.mingw b/src/makefile.mingw index d1c6ba8bef..95d09f8770 100644 --- a/src/makefile.mingw +++ b/src/makefile.mingw @@ -69,20 +69,15 @@ OBJS= \ obj/bitcoinrpc.o \ obj/script.o \ obj/util.o \ - obj/wallet.o \ - cryptopp/obj/sha.o \ - cryptopp/obj/cpu.o + obj/wallet.o all: bitcoind.exe -cryptopp/obj/%.o: cryptopp/%.cpp - g++ -c $(CFLAGS) -O3 -DCRYPTOPP_DISABLE_ASM -o $@ $< - obj/nogui/%.o: %.cpp $(HEADERS) g++ -c $(CFLAGS) -o $@ $< -bitcoind.exe: $(OBJS:obj/%=obj/nogui/%) obj/ui_res.o +bitcoind.exe: $(OBJS:obj/%=obj/nogui/%) g++ $(CFLAGS) -o $@ $(LIBPATHS) $^ $(LIBS) obj/test/test_bitcoin.o: $(wildcard test/*.cpp) $(HEADERS) @@ -96,6 +91,5 @@ clean: -del /Q obj\* -del /Q obj\nogui\* -del /Q obj\test\* - -del /Q cryptopp\obj\* -del /Q test\*.o -del /Q headers.h.gch diff --git a/src/makefile.osx b/src/makefile.osx index 1d1d6b7b7b..6269d93bda 100644 --- a/src/makefile.osx +++ b/src/makefile.osx @@ -1,35 +1,38 @@ -# Copyright (c) 2010 Laszlo Hanyecz +# -*- mode: Makefile; -*- +# Copyright (c) 2011 Bitcoin Developers # Distributed under the MIT/X11 software license, see the accompanying # file license.txt or http://www.opensource.org/licenses/mit-license.php. # Mac OS X makefile for bitcoin -# Laszlo Hanyecz (solar@heliacal.net) +# Originally by Laszlo Hanyecz (solar@heliacal.net) CXX=llvm-g++ -DEPSDIR=/Users/macosuser/bitcoin/deps +DEPSDIR=/opt/local INCLUDEPATHS= \ - -I"$(DEPSDIR)/include" + -I"$(DEPSDIR)/include" \ + -I"$(DEPSDIR)/include/db48" LIBPATHS= \ - -L"$(DEPSDIR)/lib" + -L"$(DEPSDIR)/lib" \ + -L"$(DEPSDIR)/lib/db48" -USE_UPNP:=0 +USE_UPNP:=1 LIBS= -dead_strip \ - $(DEPSDIR)/lib/libdb_cxx-4.8.a \ - $(DEPSDIR)/lib/libboost_system.a \ - $(DEPSDIR)/lib/libboost_filesystem.a \ - $(DEPSDIR)/lib/libboost_program_options.a \ - $(DEPSDIR)/lib/libboost_thread.a \ - $(DEPSDIR)/lib/libssl.a \ - $(DEPSDIR)/lib/libcrypto.a + -ldb_cxx-4.8 \ + -lboost_system-mt \ + -lboost_filesystem-mt \ + -lboost_program_options-mt \ + -lboost_thread-mt \ + -lssl \ + -lcrypto -DEFS=-D__WXMAC_OSX__ -DNOPCH -DMSG_NOSIGNAL=0 -DUSE_SSL +DEFS=-DMAC_OSX -DMSG_NOSIGNAL=0 -DUSE_SSL DEBUGFLAGS=-g # ppc doesn't work because we don't support big-endian -CFLAGS=-mmacosx-version-min=10.5 -arch i386 -arch x86_64 -O3 -Wno-invalid-offsetof -Wformat $(DEBUGFLAGS) $(DEFS) $(INCLUDEPATHS) +CFLAGS=-mmacosx-version-min=10.5 -arch i386 -O3 -Wno-invalid-offsetof -Wformat $(DEBUGFLAGS) $(DEFS) $(INCLUDEPATHS) HEADERS = \ base58.h \ bignum.h \ @@ -64,36 +67,45 @@ OBJS= \ obj/bitcoinrpc.o \ obj/script.o \ obj/util.o \ - obj/wallet.o \ - cryptopp/obj/sha.o \ - cryptopp/obj/cpu.o + obj/wallet.o ifdef USE_UPNP - LIBS += $(DEPSDIR)/lib/libminiupnpc.a + LIBS += -lminiupnpc DEFS += -DUSE_UPNP=$(USE_UPNP) endif - + all: bitcoind -cryptopp/obj/%.o: cryptopp/%.cpp - $(CXX) -c $(CFLAGS) -O3 -DCRYPTOPP_DISABLE_ASM -o $@ $< +# auto-generated dependencies: +-include obj/nogui/*.P +-include obj/test/*.P -obj/nogui/%.o: %.cpp $(HEADERS) - $(CXX) -c $(CFLAGS) -o $@ $< +obj/nogui/%.o: %.cpp + $(CXX) -c $(CFLAGS) -MMD -o $@ $< + @cp $(@:%.o=%.d) $(@:%.o=%.P); \ + sed -e 's/#.*//' -e 's/^[^:]*: *//' -e 's/ *\\$$//' \ + -e '/^$$/ d' -e 's/$$/ :/' < $(@:%.o=%.d) >> $(@:%.o=%.P); \ + rm -f $(@:%.o=%.d) bitcoind: $(OBJS:obj/%=obj/nogui/%) $(CXX) $(CFLAGS) -o $@ $(LIBPATHS) $^ $(LIBS) -obj/test/test_bitcoin.o: $(wildcard test/*.cpp) $(HEADERS) - $(CXX) -c $(CFLAGS) -o $@ test/test_bitcoin.cpp +obj/test/%.o: test/%.cpp + $(CXX) -c $(CFLAGS) -MMD -o $@ $< + @cp $(@:%.o=%.d) $(@:%.o=%.P); \ + sed -e 's/#.*//' -e 's/^[^:]*: *//' -e 's/ *\\$$//' \ + -e '/^$$/ d' -e 's/$$/ :/' < $(@:%.o=%.d) >> $(@:%.o=%.P); \ + rm -f $(@:%.o=%.d) test_bitcoin: obj/test/test_bitcoin.o $(filter-out obj/nogui/init.o,$(OBJS:obj/%=obj/nogui/%)) - $(CXX) $(CFLAGS) -o $@ $(LIBPATHS) $^ $(LIBS) -lboost_unit_test_framework + $(CXX) $(CFLAGS) -o $@ $(LIBPATHS) $^ $(LIBS) $(DEPSDIR)/lib/libboost_unit_test_framework-mt.a clean: -rm -f bitcoind test_bitcoin -rm -f obj/*.o -rm -f obj/nogui/*.o -rm -f obj/test/*.o - -rm -f cryptopp/obj/*.o + -rm -f obj/*.P + -rm -f obj/nogui/*.P + -rm -f obj/test/*.P diff --git a/src/makefile.unix b/src/makefile.unix index 689c54d9d2..1ef7caaad7 100644 --- a/src/makefile.unix +++ b/src/makefile.unix @@ -96,25 +96,31 @@ OBJS= \ obj/bitcoinrpc.o \ obj/script.o \ obj/util.o \ - obj/wallet.o \ - cryptopp/obj/sha.o \ - cryptopp/obj/cpu.o + obj/wallet.o all: bitcoind +# auto-generated dependencies: +-include obj/nogui/*.P +-include obj/test/*.P -cryptopp/obj/%.o: cryptopp/%.cpp - $(CXX) -c $(CFLAGS) -O3 -o $@ $< - -obj/nogui/%.o: %.cpp $(HEADERS) - $(CXX) -c $(CXXFLAGS) -o $@ $< +obj/nogui/%.o: %.cpp + $(CXX) -c $(CXXFLAGS) -MMD -o $@ $< + @cp $(@:%.o=%.d) $(@:%.o=%.P); \ + sed -e 's/#.*//' -e 's/^[^:]*: *//' -e 's/ *\\$$//' \ + -e '/^$$/ d' -e 's/$$/ :/' < $(@:%.o=%.d) >> $(@:%.o=%.P); \ + rm -f $(@:%.o=%.d) bitcoind: $(OBJS:obj/%=obj/nogui/%) $(CXX) $(CXXFLAGS) -o $@ $^ $(LIBS) -obj/test/test_bitcoin.o: $(wildcard test/*.cpp) $(HEADERS) - $(CXX) -c $(CFLAGS) -o $@ test/test_bitcoin.cpp +obj/test/%.o: test/%.cpp + $(CXX) -c $(CXXFLAGS) -MMD -o $@ $< + @cp $(@:%.o=%.d) $(@:%.o=%.P); \ + sed -e 's/#.*//' -e 's/^[^:]*: *//' -e 's/ *\\$$//' \ + -e '/^$$/ d' -e 's/$$/ :/' < $(@:%.o=%.d) >> $(@:%.o=%.P); \ + rm -f $(@:%.o=%.d) test_bitcoin: obj/test/test_bitcoin.o $(filter-out obj/nogui/init.o,$(OBJS:obj/%=obj/nogui/%)) $(CXX) $(CXXFLAGS) -o $@ $(LIBPATHS) $^ -Wl,-Bstatic -lboost_unit_test_framework $(LIBS) @@ -124,5 +130,6 @@ clean: -rm -f obj/*.o -rm -f obj/nogui/*.o -rm -f obj/test/*.o - -rm -f cryptopp/obj/*.o - -rm -f headers.h.gch + -rm -f obj/*.P + -rm -f obj/nogui/*.P + -rm -f obj/test/*.P diff --git a/src/makefile.vc b/src/makefile.vc index accc762b56..c7e8578a95 100644 --- a/src/makefile.vc +++ b/src/makefile.vc @@ -76,13 +76,7 @@ OBJS= \ obj\protocol.o \ obj\script.o \ obj\util.o \ - obj\wallet.o \ - cryptopp\obj\sha.o \ - cryptopp\obj\cpu.o - -CRYPTOPP_OBJS= \ - cryptopp\obj\sha.obj \ - cryptopp\obj\cpu.obj + obj\wallet.o RC=../share @@ -119,12 +113,6 @@ obj\ui.obj: $(HEADERS) obj\uibase.obj: $(HEADERS) -cryptopp\obj\sha.obj: cryptopp\sha.cpp - cl $(CFLAGS) /O2 /DCRYPTOPP_DISABLE_ASM /Fo$@ %s - -cryptopp\obj\cpu.obj: cryptopp\cpu.cpp - cl $(CFLAGS) /O2 /DCRYPTOPP_DISABLE_ASM /Fo$@ %s - .cpp{obj\nogui}.obj: cl $(CFLAGS) /Fo$@ %s @@ -148,13 +136,12 @@ obj\nogui\rpc.obj: $(HEADERS) obj\nogui\init.obj: $(HEADERS) -bitcoind.exe: $(OBJS:obj\=obj\nogui\) $(CRYPTOPP_OBJS) obj\ui.res +bitcoind.exe: $(OBJS:obj\=obj\nogui\) obj\ui.res link /nologo /OUT:$@ $(LIBPATHS) $** $(LIBS) clean: -del /Q obj\* -del /Q obj\nogui\* - -del /Q cryptopp\obj\* -del /Q *.ilk -del /Q *.pdb -del /Q bitcoind.exe diff --git a/src/net.cpp b/src/net.cpp index 1792bf78a0..ead7362616 100644 --- a/src/net.cpp +++ b/src/net.cpp @@ -10,7 +10,7 @@ #include "init.h" #include "strlcpy.h" -#ifdef __WXMSW__ +#ifdef WIN32 #include <string.h> #endif @@ -102,7 +102,7 @@ bool ConnectSocket(const CAddress& addrConnect, SOCKET& hSocketRet, int nTimeout bool fProxy = (fUseProxy && addrConnect.IsRoutable()); struct sockaddr_in sockaddr = (fProxy ? addrProxy.GetSockAddr() : addrConnect.GetSockAddr()); -#ifdef __WXMSW__ +#ifdef WIN32 u_long fNonblock = 1; if (ioctlsocket(hSocket, FIONBIO, &fNonblock) == SOCKET_ERROR) #else @@ -141,7 +141,7 @@ bool ConnectSocket(const CAddress& addrConnect, SOCKET& hSocketRet, int nTimeout return false; } socklen_t nRetSize = sizeof(nRet); -#ifdef __WXMSW__ +#ifdef WIN32 if (getsockopt(hSocket, SOL_SOCKET, SO_ERROR, (char*)(&nRet), &nRetSize) == SOCKET_ERROR) #else if (getsockopt(hSocket, SOL_SOCKET, SO_ERROR, &nRet, &nRetSize) == SOCKET_ERROR) @@ -158,7 +158,7 @@ bool ConnectSocket(const CAddress& addrConnect, SOCKET& hSocketRet, int nTimeout return false; } } -#ifdef __WXMSW__ +#ifdef WIN32 else if (WSAGetLastError() != WSAEISCONN) #else else @@ -175,7 +175,7 @@ bool ConnectSocket(const CAddress& addrConnect, SOCKET& hSocketRet, int nTimeout CNode::ConnectNode immediately turns the socket back to non-blocking but we'll turn it back to blocking just in case */ -#ifdef __WXMSW__ +#ifdef WIN32 fNonblock = 0; if (ioctlsocket(hSocket, FIONBIO, &fNonblock) == SOCKET_ERROR) #else @@ -674,7 +674,7 @@ CNode* ConnectNode(CAddress addrConnect, int64 nTimeout) printf("connected %s\n", addrConnect.ToString().c_str()); // Set to nonblocking -#ifdef __WXMSW__ +#ifdef WIN32 u_long nOne = 1; if (ioctlsocket(hSocket, FIONBIO, &nOne) == SOCKET_ERROR) printf("ConnectSocket() : ioctlsocket nonblocking setting failed, error %d\n", WSAGetLastError()); @@ -1438,6 +1438,8 @@ void ThreadOpenConnections2(void* parg) BOOST_FOREACH(CNode* pnode, vNodes) setConnected.insert(pnode->addr.ip & 0x0000ffff); + int64 nANow = GetAdjustedTime(); + CRITICAL_BLOCK(cs_mapAddresses) { BOOST_FOREACH(const PAIRTYPE(vector<unsigned char>, CAddress)& item, mapAddresses) @@ -1445,8 +1447,8 @@ void ThreadOpenConnections2(void* parg) const CAddress& addr = item.second; if (!addr.IsIPv4() || !addr.IsValid() || setConnected.count(addr.ip & 0x0000ffff)) continue; - int64 nSinceLastSeen = GetAdjustedTime() - addr.nTime; - int64 nSinceLastTry = GetAdjustedTime() - addr.nLastTry; + int64 nSinceLastSeen = nANow - addr.nTime; + int64 nSinceLastTry = nANow - addr.nLastTry; // Randomize the order in a deterministic way, putting the standard port first int64 nRandomizer = (uint64)(nStart * 4951 + addr.nLastTry * 9567851 + addr.ip * 7789) % (2 * 60 * 60); @@ -1610,7 +1612,7 @@ bool BindListenPort(string& strError) int nOne = 1; addrLocalHost.port = htons(GetListenPort()); -#ifdef __WXMSW__ +#ifdef WIN32 // Initialize Windows Sockets WSADATA wsadata; int ret = WSAStartup(MAKEWORD(2,2), &wsadata); @@ -1636,13 +1638,13 @@ bool BindListenPort(string& strError) setsockopt(hListenSocket, SOL_SOCKET, SO_NOSIGPIPE, (void*)&nOne, sizeof(int)); #endif -#ifndef __WXMSW__ +#ifndef WIN32 // Allow binding if the port is still in TIME_WAIT state after // the program was closed and restarted. Not an issue on windows. setsockopt(hListenSocket, SOL_SOCKET, SO_REUSEADDR, (void*)&nOne, sizeof(int)); #endif -#ifdef __WXMSW__ +#ifdef WIN32 // Set to nonblocking, incoming connections will also inherit this if (ioctlsocket(hListenSocket, FIONBIO, (u_long*)&nOne) == SOCKET_ERROR) #else @@ -1689,7 +1691,7 @@ void StartNode(void* parg) if (pnodeLocalHost == NULL) pnodeLocalHost = new CNode(INVALID_SOCKET, CAddress("127.0.0.1", 0, false, nLocalServices)); -#ifdef __WXMSW__ +#ifdef WIN32 // Get local host ip char pszHostName[1000] = ""; if (gethostname(pszHostName, sizeof(pszHostName)) != SOCKET_ERROR) @@ -1765,7 +1767,8 @@ void StartNode(void* parg) printf("Error: CreateThread(ThreadIRCSeed) failed\n"); // Send and receive from sockets, accept connections - CreateThread(ThreadSocketHandler, NULL); + if (!CreateThread(ThreadSocketHandler, NULL)) + printf("Error: CreateThread(ThreadSocketHandler) failed\n"); // Initiate outbound connections if (!CreateThread(ThreadOpenConnections, NULL)) @@ -1824,7 +1827,7 @@ public: if (closesocket(hListenSocket) == SOCKET_ERROR) printf("closesocket(hListenSocket) failed with error %d\n", WSAGetLastError()); -#ifdef __WXMSW__ +#ifdef WIN32 // Shutdown Windows Sockets WSACleanup(); #endif @@ -10,7 +10,7 @@ #include <boost/foreach.hpp> #include <openssl/rand.h> -#ifndef __WXMSW__ +#ifndef WIN32 #include <arpa/inet.h> #endif diff --git a/src/protocol.cpp b/src/protocol.cpp index 48784b9cfb..f46570e21c 100644 --- a/src/protocol.cpp +++ b/src/protocol.cpp @@ -6,7 +6,7 @@ #include "protocol.h" #include "util.h" -#ifndef __WXMSW__ +#ifndef WIN32 # include <arpa/inet.h> #endif diff --git a/src/qt/locale/bitcoin_de.ts b/src/qt/locale/bitcoin_de.ts index 1978f06d41..ba2e25d62f 100644 --- a/src/qt/locale/bitcoin_de.ts +++ b/src/qt/locale/bitcoin_de.ts @@ -79,165 +79,464 @@ Dieses Produkt enthält Software, welche vom OpenSSL Projekt zur Verwendung im O <source>&Delete</source> <translation>&Löschen</translation> </message> + <message> + <location filename="../addressbookpage.cpp" line="197"/> + <source>Export Address Book Data</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../addressbookpage.cpp" line="199"/> + <source>Comma separated file (*.csv)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../addressbookpage.cpp" line="212"/> + <source>Error exporting</source> + <translation type="unfinished">Fehler beim exportieren</translation> + </message> + <message> + <location filename="../addressbookpage.cpp" line="212"/> + <source>Could not write to file %1.</source> + <translation type="unfinished">Konnte Datei %1 nicht zum beschreiben öffnen</translation> + </message> </context> <context> <name>AddressTableModel</name> <message> - <location filename="../addresstablemodel.cpp" line="78"/> + <location filename="../addresstablemodel.cpp" line="77"/> <source>Label</source> <translation>Bezeichnung</translation> </message> <message> - <location filename="../addresstablemodel.cpp" line="78"/> + <location filename="../addresstablemodel.cpp" line="77"/> <source>Address</source> <translation>Adresse</translation> </message> <message> - <location filename="../addresstablemodel.cpp" line="114"/> + <location filename="../addresstablemodel.cpp" line="113"/> <source>(no label)</source> <translation>(keine Bezeichnung)</translation> </message> </context> <context> + <name>AskPassphraseDialog</name> + <message> + <location filename="../forms/askpassphrasedialog.ui" line="26"/> + <source>Dialog</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../forms/askpassphrasedialog.ui" line="32"/> + <source>TextLabel</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../forms/askpassphrasedialog.ui" line="47"/> + <source>Enter passphrase</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../forms/askpassphrasedialog.ui" line="61"/> + <source>New passphrase</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../forms/askpassphrasedialog.ui" line="75"/> + <source>Repeat new passphrase</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../askpassphrasedialog.cpp" line="26"/> + <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 type="unfinished"></translation> + </message> + <message> + <location filename="../askpassphrasedialog.cpp" line="27"/> + <source>Encrypt wallet</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../askpassphrasedialog.cpp" line="30"/> + <source>This operation needs your wallet passphrase to unlock the wallet.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../askpassphrasedialog.cpp" line="35"/> + <source>Unlock wallet</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../askpassphrasedialog.cpp" line="38"/> + <source>This operation needs your wallet passphrase to decrypt the wallet.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../askpassphrasedialog.cpp" line="43"/> + <source>Decrypt wallet</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../askpassphrasedialog.cpp" line="46"/> + <source>Change passphrase</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../askpassphrasedialog.cpp" line="47"/> + <source>Enter the old and new passphrase to the wallet.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../askpassphrasedialog.cpp" line="91"/> + <source>Confirm wallet encryption</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../askpassphrasedialog.cpp" line="92"/> + <source>WARNING: If you encrypt your wallet and lose your passphrase, you will <b>LOSE ALL OF YOUR BITCOINS</b>! +Are you sure you wish to encrypt your wallet?</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../askpassphrasedialog.cpp" line="101"/> + <location filename="../askpassphrasedialog.cpp" line="149"/> + <source>Wallet encrypted</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../askpassphrasedialog.cpp" line="102"/> + <source>Remember that encrypting your wallet cannot fully protect your bitcoins from being stolen by malware infecting your computer.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../askpassphrasedialog.cpp" line="106"/> + <location filename="../askpassphrasedialog.cpp" line="113"/> + <location filename="../askpassphrasedialog.cpp" line="155"/> + <location filename="../askpassphrasedialog.cpp" line="161"/> + <source>Wallet encryption failed</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../askpassphrasedialog.cpp" line="107"/> + <source>Wallet encryption failed due to an internal error. Your wallet was not encrypted.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../askpassphrasedialog.cpp" line="114"/> + <location filename="../askpassphrasedialog.cpp" line="162"/> + <source>The supplied passphrases do not match.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../askpassphrasedialog.cpp" line="125"/> + <source>Wallet unlock failed</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../askpassphrasedialog.cpp" line="126"/> + <location filename="../askpassphrasedialog.cpp" line="137"/> + <location filename="../askpassphrasedialog.cpp" line="156"/> + <source>The passphrase entered for the wallet decryption was incorrect.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../askpassphrasedialog.cpp" line="136"/> + <source>Wallet decryption failed</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../askpassphrasedialog.cpp" line="150"/> + <source>Wallet passphrase was succesfully changed.</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> <name>BitcoinGUI</name> <message> - <location filename="../bitcoingui.cpp" line="50"/> + <location filename="../bitcoingui.cpp" line="59"/> <source>Bitcoin Wallet</source> <translation>Bitcoin Wallet</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="112"/> <source>Number of connections to other clients</source> - <translation>Anzahl der Verbindungen zu anderen Clients</translation> + <translation type="obsolete">Anzahl der Verbindungen zu anderen Clients</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="117"/> <source>Number of blocks in the block chain</source> - <translation>Anzahl der Blöcke in der Block-Chain</translation> + <translation type="obsolete">Anzahl der Blöcke in der Block-Chain</translation> + </message> + <message> + <location filename="../bitcoingui.cpp" line="67"/> + <source>&File</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../bitcoingui.cpp" line="73"/> + <source>&Settings</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../bitcoingui.cpp" line="79"/> + <source>&Help</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../bitcoingui.cpp" line="83"/> + <source>Tabs toolbar</source> + <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoingui.cpp" line="120"/> + <location filename="../bitcoingui.cpp" line="91"/> + <source>Actions toolbar</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../bitcoingui.cpp" line="142"/> <source>Synchronizing with network...</source> <translation>Mit Netzwerk synchronisieren...</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="123"/> + <location filename="../bitcoingui.cpp" line="145"/> <source>Block chain synchronization in progress</source> <translation>Synchronisierung der Block-Chain...</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="140"/> + <location filename="../bitcoingui.cpp" line="169"/> <source>&Overview</source> <translation>Übersicht</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="144"/> + <location filename="../bitcoingui.cpp" line="170"/> + <source>Show general overview of wallet</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../bitcoingui.cpp" line="174"/> <source>&Transactions</source> <translation>Transaktionen</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="148"/> + <location filename="../bitcoingui.cpp" line="175"/> + <source>Browse transaction history</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../bitcoingui.cpp" line="179"/> <source>&Address Book</source> <translation>Adressbuch</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="149"/> + <location filename="../bitcoingui.cpp" line="180"/> <source>Edit the list of stored addresses and labels</source> <translation>Adressen bearbeiten</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="153"/> + <location filename="../bitcoingui.cpp" line="184"/> <source>&Receive coins</source> <translation>Bitcoins empfangen</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="154"/> + <location filename="../bitcoingui.cpp" line="185"/> <source>Show the list of addresses for receiving payments</source> <translation>Empfangsadressen anzeigen</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="158"/> + <location filename="../bitcoingui.cpp" line="189"/> <source>&Send coins</source> <translation>Bitcoins senden</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="159"/> + <location filename="../bitcoingui.cpp" line="190"/> <source>Send coins to a bitcoin address</source> <translation>Bitcoins an eine Bitcoin-Adresse senden</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="169"/> + <location filename="../bitcoingui.cpp" line="200"/> <source>&Exit</source> <translation>Beenden</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="170"/> + <location filename="../bitcoingui.cpp" line="201"/> <source>Quit application</source> <translation>Anwendung beenden</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="171"/> + <location filename="../bitcoingui.cpp" line="202"/> <source>&About</source> <translation>Über</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="172"/> + <location filename="../bitcoingui.cpp" line="203"/> <source>Show information about Bitcoin</source> <translation>Informationen über Bitcoin</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="173"/> + <location filename="../bitcoingui.cpp" line="204"/> <source>&Options...</source> <translation>Einstellungen</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="174"/> + <location filename="../bitcoingui.cpp" line="205"/> <source>Modify configuration options for bitcoin</source> <translation>Einstellungen ändern</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="175"/> + <location filename="../bitcoingui.cpp" line="206"/> <source>Open &Bitcoin</source> <translation>Bitcoin öffnen</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="176"/> + <location filename="../bitcoingui.cpp" line="207"/> <source>Show the Bitcoin window</source> <translation>Bitcoin-Fenster anzeigen</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="177"/> + <location filename="../bitcoingui.cpp" line="208"/> <source>&Export...</source> <translation>Exportieren...</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="178"/> + <location filename="../bitcoingui.cpp" line="209"/> + <source>Export the current view to a file</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../bitcoingui.cpp" line="210"/> + <source>&Encrypt Wallet</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../bitcoingui.cpp" line="211"/> + <source>Encrypt or decrypt wallet</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../bitcoingui.cpp" line="213"/> + <source>&Change Passphrase</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../bitcoingui.cpp" line="214"/> + <source>Change the passphrase used for wallet encryption</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../bitcoingui.cpp" line="230"/> + <source>[testnet]</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../bitcoingui.cpp" line="293"/> + <source>bitcoin-qt</source> + <translation type="unfinished"></translation> + </message> + <message numerus="yes"> + <location filename="../bitcoingui.cpp" line="332"/> + <source>%n active connection(s) to Bitcoin network</source> + <translation type="unfinished"> + <numerusform></numerusform> + <numerusform></numerusform> + </translation> + </message> + <message> + <location filename="../bitcoingui.cpp" line="347"/> + <source>Downloaded %1 of %2 blocks of transaction history.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../bitcoingui.cpp" line="353"/> + <source>Downloaded %1 blocks of transaction history.</source> + <translation type="unfinished"></translation> + </message> + <message numerus="yes"> + <location filename="../bitcoingui.cpp" line="364"/> + <source>%n second(s) ago</source> + <translation type="unfinished"> + <numerusform></numerusform> + <numerusform></numerusform> + </translation> + </message> + <message numerus="yes"> + <location filename="../bitcoingui.cpp" line="368"/> + <source>%n minute(s) ago</source> + <translation type="unfinished"> + <numerusform></numerusform> + <numerusform></numerusform> + </translation> + </message> + <message numerus="yes"> + <location filename="../bitcoingui.cpp" line="372"/> + <source>%n hour(s) ago</source> + <translation type="unfinished"> + <numerusform></numerusform> + <numerusform></numerusform> + </translation> + </message> + <message numerus="yes"> + <location filename="../bitcoingui.cpp" line="376"/> + <source>%n day(s) ago</source> + <translation type="unfinished"> + <numerusform></numerusform> + <numerusform></numerusform> + </translation> + </message> + <message> + <location filename="../bitcoingui.cpp" line="382"/> + <source>Up to date</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../bitcoingui.cpp" line="387"/> + <source>Catching up...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../bitcoingui.cpp" line="393"/> + <source>Last received block was generated %1.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../bitcoingui.cpp" line="472"/> + <source>Date: %1 +Amount: %2 +Type: %3 +Address: %4 +</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../bitcoingui.cpp" line="566"/> + <source>Wallet is <b>encrypted</b> and currently <b>unlocked</b></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../bitcoingui.cpp" line="574"/> + <source>Wallet is <b>encrypted</b> and currently <b>locked</b></source> + <translation type="unfinished"></translation> + </message> + <message> <source>Export data in current view to a file</source> - <translation>Angezeigte Daten als Datei exportieren</translation> + <translation type="obsolete">Angezeigte Daten als Datei exportieren</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="193"/> <source>Bitcoin Wallet [testnet]</source> - <translation>Bitcoin Wallet [testnet]</translation> + <translation type="obsolete">Bitcoin Wallet [testnet]</translation> </message> <message numerus="yes"> - <location filename="../bitcoingui.cpp" line="298"/> <source>%n connection(s)</source> - <translation> + <translation type="obsolete"> <numerusform>%n Verbindung(en)</numerusform> <numerusform></numerusform> </translation> </message> <message numerus="yes"> - <location filename="../bitcoingui.cpp" line="317"/> <source>%n block(s)</source> - <translation> + <translation type="obsolete"> <numerusform>%n Blöcke</numerusform> <numerusform></numerusform> </translation> </message> <message> - <location filename="../bitcoingui.cpp" line="375"/> + <location filename="../bitcoingui.cpp" line="440"/> <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 Größe dieser Transaktion übersteigt das Limit. Sie können die Coins jedoch senden, wenn sie einen zusätzlichen Betrag von 1% zahlen, @@ -245,34 +544,53 @@ welcher an die Teilnehmer des Bitcoin-Netzwerkes ausgeschüttet wird und dieses Möchten Sie die zusätzliche Gebühr zahlen?</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="379"/> + <location filename="../bitcoingui.cpp" line="445"/> <source>Sending...</source> <translation>Senden...</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="407"/> + <location filename="../bitcoingui.cpp" line="470"/> + <source>Sent transaction</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../bitcoingui.cpp" line="471"/> <source>Incoming transaction</source> <translation>Eingehende Transaktion</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="408"/> <source>Date: </source> - <translation>Datum:</translation> + <translation type="obsolete">Datum:</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="409"/> <source>Amount: </source> - <translation>Betrag:</translation> + <translation type="obsolete">Betrag:</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="410"/> <source>Type: </source> - <translation>Beschreibung:</translation> + <translation type="obsolete">Beschreibung:</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="411"/> <source>Address: </source> - <translation>Adresse:</translation> + <translation type="obsolete">Adresse:</translation> + </message> +</context> +<context> + <name>DisplayOptionsPage</name> + <message> + <location filename="../optionsdialog.cpp" line="258"/> + <source>&Unit to show amounts in: </source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../optionsdialog.cpp" line="262"/> + <source>Choose the default subdivision unit to show in the interface, and when sending coins</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../optionsdialog.cpp" line="269"/> + <source>Display addresses in transaction list</source> + <translation type="unfinished"></translation> </message> </context> <context> @@ -323,12 +641,22 @@ Möchten Sie die zusätzliche Gebühr zahlen?</translation> <translation>Zahlungsadresse bearbeiten</translation> </message> <message> - <location filename="../editaddressdialog.cpp" line="89"/> + <location filename="../editaddressdialog.cpp" line="92"/> <source>The entered address "%1" is not a valid bitcoin address.</source> <translation>Die eingegebene Adresse ("%1") ist keine gültige Bitcoin-Adresse.</translation> </message> <message> <location filename="../editaddressdialog.cpp" line="97"/> + <source>Could not unlock wallet.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../editaddressdialog.cpp" line="102"/> + <source>New key generation failed.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../editaddressdialog.cpp" line="87"/> <source>The entered address "%1" is already in the address book.</source> <translation>Die eingegebene Adresse ("%1") befindet sich bereits in Ihrem Adressbuch.</translation> </message> @@ -336,87 +664,87 @@ Möchten Sie die zusätzliche Gebühr zahlen?</translation> <context> <name>MainOptionsPage</name> <message> - <location filename="../optionsdialog.cpp" line="142"/> + <location filename="../optionsdialog.cpp" line="166"/> <source>&Start Bitcoin on window system startup</source> <translation>Bitcoin beim Start des Systems ausführen</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="143"/> + <location filename="../optionsdialog.cpp" line="167"/> <source>Automatically start Bitcoin after the computer is turned on</source> <translation>Bitcoin automatisch beim Systemstart ausführen</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="146"/> + <location filename="../optionsdialog.cpp" line="170"/> <source>&Minimize to the tray instead of the taskbar</source> <translation>In den Infobereich statt der Taskleiste minimieren</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="147"/> + <location filename="../optionsdialog.cpp" line="171"/> <source>Show only a tray icon after minimizing the window</source> <translation>Minimiert nur im Infobereich anzeigen.</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="150"/> + <location filename="../optionsdialog.cpp" line="174"/> <source>Map port using &UPnP</source> <translation>Portweiterleitung via UPnP</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="151"/> + <location filename="../optionsdialog.cpp" line="175"/> <source>Automatically open the Bitcoin client port on the router. This only works when your router supports UPnP and it is enabled.</source> <translation>Öffnet den Bitcoin Client-Port automatisch auf dem Router. Dies funktioniert nur, wenn Ihr Router UPnP unterstützt und dies aktiviert ist.</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="154"/> + <location filename="../optionsdialog.cpp" line="178"/> <source>M&inimize on close</source> <translation>Beim Schließen minimieren</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="155"/> + <location filename="../optionsdialog.cpp" line="179"/> <source>Minimize instead of exit the application when the window is closed. When this option is enabled, the application will be closed only after selecting Quit in the menu.</source> <translation>Minimiert die Anwendung, wenn das Fenster geschlossen wird. Wenn dies aktiviert ist, müssen Sie das Programm über "Beenden" im Menü schließen.</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="158"/> + <location filename="../optionsdialog.cpp" line="182"/> <source>&Connect through SOCKS4 proxy:</source> <translation>Über SOCKS4-Proxy verbinden:</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="159"/> + <location filename="../optionsdialog.cpp" line="183"/> <source>Connect to the Bitcon network through a SOCKS4 proxy (e.g. when connecting through Tor)</source> <translation>Über SOCKS4-Proxy zum Bitcoin-Netzwerk verbinden (bspw. für eine Verbindung über Tor)</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="164"/> + <location filename="../optionsdialog.cpp" line="188"/> <source>Proxy &IP: </source> <translation>Proxy-IP:</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="170"/> + <location filename="../optionsdialog.cpp" line="194"/> <source>IP address of the proxy (e.g. 127.0.0.1)</source> <translation>IP-Adresse des Proxys (z.B. 127.0.0.1)</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="173"/> + <location filename="../optionsdialog.cpp" line="197"/> <source>&Port: </source> <translation>Port:</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="179"/> + <location filename="../optionsdialog.cpp" line="203"/> <source>Port of the proxy (e.g. 1234)</source> <translation>Port des Proxy-Servers (z.B. 1234)</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="185"/> + <location filename="../optionsdialog.cpp" line="209"/> <source>Optional transaction fee per KB that helps make sure your transactions are processed quickly. Most transactions are 1KB. Fee 0.01 recommended.</source> <translation>Zusätzliche Transaktionsgebühr per KB, welche sicherstellt dass Ihre Transaktionen schnell bearbeitet werden. Die meisten Transaktionen sind 1KB groß. Eine Gebühr von 0.01 wird empfohlen.</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="191"/> + <location filename="../optionsdialog.cpp" line="215"/> <source>Pay transaction &fee</source> <translation>Transaktionsgebühr bezahlen</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="194"/> + <location filename="../optionsdialog.cpp" line="218"/> <source>Optional transaction fee per KB that helps make sure your transactions are processed quickly. Most transactions are 1KB. Fee 0.01 recommended.</source> <translation>Zusätzliche Transaktionsgebühr per KB, welche sicherstellt dass Ihre Transaktionen schnell bearbeitet werden. Die meisten Transaktionen sind 1KB groß. Eine Gebühr von 0.01 wird empfohlen.</translation> </message> @@ -424,12 +752,17 @@ Möchten Sie die zusätzliche Gebühr zahlen?</translation> <context> <name>OptionsDialog</name> <message> - <location filename="../optionsdialog.cpp" line="54"/> + <location filename="../optionsdialog.cpp" line="75"/> <source>Main</source> <translation>Haupt</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="74"/> + <location filename="../optionsdialog.cpp" line="80"/> + <source>Display</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../optionsdialog.cpp" line="100"/> <source>Options</source> <translation>Einstellungen</translation> </message> @@ -442,144 +775,421 @@ Möchten Sie die zusätzliche Gebühr zahlen?</translation> <translation></translation> </message> <message> - <location filename="../forms/overviewpage.ui" line="38"/> + <location filename="../forms/overviewpage.ui" line="40"/> <source>Balance:</source> <translation>Kontostand:</translation> </message> <message> - <location filename="../forms/overviewpage.ui" line="45"/> + <location filename="../forms/overviewpage.ui" line="47"/> <source>123.456 BTC</source> <translation></translation> </message> <message> - <location filename="../forms/overviewpage.ui" line="52"/> + <location filename="../forms/overviewpage.ui" line="54"/> <source>Number of transactions:</source> <translation>Anzahl der Transaktionen:</translation> </message> <message> - <location filename="../forms/overviewpage.ui" line="59"/> + <location filename="../forms/overviewpage.ui" line="61"/> <source>0</source> <translation></translation> </message> <message> - <location filename="../overviewpage.cpp" line="14"/> + <location filename="../forms/overviewpage.ui" line="68"/> + <source>Unconfirmed:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../forms/overviewpage.ui" line="75"/> + <source>0 BTC</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../forms/overviewpage.ui" line="82"/> + <source><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> +<html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'Ubuntu'; font-size:11pt; font-weight:400; font-style:normal;"> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-weight:600;">Wallet</span></p></body></html></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../forms/overviewpage.ui" line="122"/> + <source><b>Recent transactions</b></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../overviewpage.cpp" line="103"/> <source>Your current balance</source> <translation>Kontostand</translation> </message> + <message> + <location filename="../overviewpage.cpp" line="108"/> + <source>Total of transactions that have yet to be confirmed, and do not yet count toward the current balance</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../overviewpage.cpp" line="111"/> + <source>Total number of transactions in wallet</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>SendCoinsDialog</name> <message> <location filename="../forms/sendcoinsdialog.ui" line="14"/> - <location filename="../sendcoinsdialog.cpp" line="56"/> - <location filename="../sendcoinsdialog.cpp" line="78"/> - <location filename="../sendcoinsdialog.cpp" line="84"/> - <location filename="../sendcoinsdialog.cpp" line="90"/> - <location filename="../sendcoinsdialog.cpp" line="96"/> + <location filename="../sendcoinsdialog.cpp" line="103"/> + <location filename="../sendcoinsdialog.cpp" line="108"/> + <location filename="../sendcoinsdialog.cpp" line="113"/> + <location filename="../sendcoinsdialog.cpp" line="118"/> + <location filename="../sendcoinsdialog.cpp" line="124"/> + <location filename="../sendcoinsdialog.cpp" line="129"/> + <location filename="../sendcoinsdialog.cpp" line="134"/> <source>Send Coins</source> <translation>Bitcoins überweisen</translation> </message> <message> - <location filename="../forms/sendcoinsdialog.ui" line="27"/> <source>The address to send the payment to (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source> - <translation>Empfangsadresse für die Überweisung (z.B. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation> + <translation type="obsolete">Empfangsadresse für die Überweisung (z.B. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation> </message> <message> - <location filename="../forms/sendcoinsdialog.ui" line="37"/> <source>Look up adress in address book</source> - <translation>Adressbuch</translation> + <translation type="obsolete">Adressbuch</translation> </message> <message> - <location filename="../forms/sendcoinsdialog.ui" line="47"/> <source>Alt+A</source> - <translation>Alt+A</translation> + <translation type="obsolete">Alt+A</translation> </message> <message> - <location filename="../forms/sendcoinsdialog.ui" line="60"/> <source>Paste address from system clipboard</source> - <translation>Adresse aus der Zwischenanlage einfügen</translation> + <translation type="obsolete">Adresse aus der Zwischenanlage einfügen</translation> </message> <message> - <location filename="../forms/sendcoinsdialog.ui" line="70"/> <source>Alt+P</source> - <translation>Alt+P</translation> + <translation type="obsolete">Alt+P</translation> </message> <message> - <location filename="../forms/sendcoinsdialog.ui" line="82"/> <source>A&mount:</source> - <translation>Betrag:</translation> + <translation type="obsolete">Betrag:</translation> </message> <message> - <location filename="../forms/sendcoinsdialog.ui" line="95"/> <source>Pay &To:</source> - <translation>Empfänger:</translation> + <translation type="obsolete">Empfänger:</translation> </message> <message> - <location filename="../forms/sendcoinsdialog.ui" line="113"/> <source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source> - <translation>Bitcoin-Adresse eingeben (z.B. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation> + <translation type="obsolete">Bitcoin-Adresse eingeben (z.B. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation> </message> <message> - <location filename="../forms/sendcoinsdialog.ui" line="131"/> - <location filename="../sendcoinsdialog.cpp" line="23"/> <source>Enter a label for this address to add it to your address book</source> - <translation>Beschreibung der Adresse im Adressbuch</translation> + <translation type="obsolete">Beschreibung der Adresse im Adressbuch</translation> </message> <message> - <location filename="../forms/sendcoinsdialog.ui" line="140"/> <source>&Label:</source> - <translation>Beschreibung:</translation> + <translation type="obsolete">Beschreibung:</translation> + </message> + <message> + <location filename="../forms/sendcoinsdialog.ui" line="67"/> + <source>Send to multiple recipients at once</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../forms/sendcoinsdialog.ui" line="70"/> + <source>&Add recipient...</source> + <translation type="unfinished"></translation> </message> <message> - <location filename="../forms/sendcoinsdialog.ui" line="183"/> + <location filename="../forms/sendcoinsdialog.ui" line="87"/> + <source>Clear all</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../forms/sendcoinsdialog.ui" line="106"/> + <source>Balance:</source> + <translation type="unfinished">Kontostand:</translation> + </message> + <message> + <location filename="../forms/sendcoinsdialog.ui" line="113"/> + <source>123.456 BTC</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../forms/sendcoinsdialog.ui" line="144"/> <source>Confirm the send action</source> <translation>Überweisung bestätigen</translation> </message> <message> - <location filename="../forms/sendcoinsdialog.ui" line="186"/> + <location filename="../forms/sendcoinsdialog.ui" line="147"/> <source>&Send</source> <translation>Überweisen</translation> </message> <message> - <location filename="../forms/sendcoinsdialog.ui" line="206"/> <source>Abort the send action</source> - <translation>Überweisung abbrechen</translation> + <translation type="obsolete">Überweisung abbrechen</translation> </message> <message> - <location filename="../sendcoinsdialog.cpp" line="57"/> <source>Must fill in an amount to pay.</source> - <translation>Bitte geben Sie einen Betrag ein.</translation> + <translation type="obsolete">Bitte geben Sie einen Betrag ein.</translation> </message> <message> - <location filename="../sendcoinsdialog.cpp" line="65"/> + <location filename="../sendcoinsdialog.cpp" line="82"/> <source>Confirm send coins</source> <translation>Überweisung bestätigen</translation> </message> <message> - <location filename="../sendcoinsdialog.cpp" line="66"/> <source>Are you sure you want to send %1 BTC to %2 (%3)?</source> - <translation>Möchten Sie %1 BTC an %2 (%3) überweisen?</translation> + <translation type="obsolete">Möchten Sie %1 BTC an %2 (%3) überweisen?</translation> </message> <message> <location filename="../sendcoinsdialog.cpp" line="79"/> + <source><b>%1</b> to %2 (%3)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../sendcoinsdialog.cpp" line="83"/> + <source>Are you sure you want to send %1?</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../sendcoinsdialog.cpp" line="83"/> + <source> and </source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../sendcoinsdialog.cpp" line="104"/> <source>The recepient address is not valid, please recheck.</source> <translation>Die Empfangsadresse ist ungültig.</translation> </message> <message> - <location filename="../sendcoinsdialog.cpp" line="85"/> + <location filename="../sendcoinsdialog.cpp" line="109"/> <source>The amount to pay must be larger than 0.</source> <translation>Der Betrag muss mehr als 0 betragen.</translation> </message> <message> - <location filename="../sendcoinsdialog.cpp" line="91"/> + <location filename="../sendcoinsdialog.cpp" line="114"/> <source>Amount exceeds your balance</source> <translation>Der Betrag übersteigt ihren Kontostand</translation> </message> <message> - <location filename="../sendcoinsdialog.cpp" line="97"/> + <location filename="../sendcoinsdialog.cpp" line="119"/> <source>Total exceeds your balance when the %1 transaction fee is included</source> <translation>Betrag übersteigt ihren Kontostand aufgrund der Transaktionsgebühren in Höhe von %1</translation> </message> + <message> + <location filename="../sendcoinsdialog.cpp" line="125"/> + <source>Duplicate address found, can only send to each address once in one send operation</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../sendcoinsdialog.cpp" line="130"/> + <source>Error: Transaction creation failed </source> + <translation type="unfinished">Fehler: Die Transaktion konnte nicht erstellt werden.</translation> + </message> + <message> + <location filename="../sendcoinsdialog.cpp" line="135"/> + <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">Fehler: Die Transaktion wurde zurückgewiesen. Dies kann passieren wenn einige Ihrer BitCoins bereits ausgegeben wurde (zB aus einer Sicherungskopie Ihrer wallet.dat)</translation> + </message> +</context> +<context> + <name>SendCoinsEntry</name> + <message> + <location filename="../forms/sendcoinsentry.ui" line="14"/> + <source>Form</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../forms/sendcoinsentry.ui" line="29"/> + <source>A&mount:</source> + <translation type="unfinished">Betrag:</translation> + </message> + <message> + <location filename="../forms/sendcoinsentry.ui" line="42"/> + <source>Pay &To:</source> + <translation type="unfinished">Empfänger:</translation> + </message> + <message> + <location filename="../forms/sendcoinsentry.ui" line="66"/> + <location filename="../sendcoinsentry.cpp" line="22"/> + <source>Enter a label for this address to add it to your address book</source> + <translation type="unfinished">Beschreibung der Adresse im Adressbuch</translation> + </message> + <message> + <location filename="../forms/sendcoinsentry.ui" line="75"/> + <source>&Label:</source> + <translation type="unfinished">Beschreibung:</translation> + </message> + <message> + <location filename="../forms/sendcoinsentry.ui" line="93"/> + <source>The address to send the payment to (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source> + <translation type="unfinished">Empfangsadresse für die Überweisung (z.B. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation> + </message> + <message> + <location filename="../forms/sendcoinsentry.ui" line="103"/> + <source>Choose adress from address book</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../forms/sendcoinsentry.ui" line="113"/> + <source>Alt+A</source> + <translation type="unfinished">Alt+A</translation> + </message> + <message> + <location filename="../forms/sendcoinsentry.ui" line="126"/> + <source>Paste address from clipboard</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../forms/sendcoinsentry.ui" line="136"/> + <source>Alt+P</source> + <translation type="unfinished">Alt+P</translation> + </message> + <message> + <location filename="../forms/sendcoinsentry.ui" line="146"/> + <source>Remove this recipient</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../sendcoinsentry.cpp" line="21"/> + <source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source> + <translation type="unfinished">Bitcoin-Adresse eingeben (z.B. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation> + </message> +</context> +<context> + <name>TransactionDesc</name> + <message> + <location filename="../transactiondesc.cpp" line="34"/> + <source>Open for %1 blocks</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../transactiondesc.cpp" line="36"/> + <source>Open until %1</source> + <translation type="unfinished">Offen bis %1</translation> + </message> + <message> + <location filename="../transactiondesc.cpp" line="42"/> + <source>%1/offline?</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../transactiondesc.cpp" line="44"/> + <source>%1/unconfirmed</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../transactiondesc.cpp" line="46"/> + <source>%1 confirmations</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../transactiondesc.cpp" line="63"/> + <source><b>Status:</b> </source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../transactiondesc.cpp" line="68"/> + <source>, has not been successfully broadcast yet</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../transactiondesc.cpp" line="70"/> + <source>, broadcast through %1 node</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../transactiondesc.cpp" line="72"/> + <source>, broadcast through %1 nodes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../transactiondesc.cpp" line="76"/> + <source><b>Date:</b> </source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../transactiondesc.cpp" line="83"/> + <source><b>Source:</b> Generated<br></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../transactiondesc.cpp" line="89"/> + <location filename="../transactiondesc.cpp" line="106"/> + <source><b>From:</b> </source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../transactiondesc.cpp" line="106"/> + <source>unknown</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../transactiondesc.cpp" line="107"/> + <location filename="../transactiondesc.cpp" line="130"/> + <location filename="../transactiondesc.cpp" line="189"/> + <source><b>To:</b> </source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../transactiondesc.cpp" line="110"/> + <source> (yours, label: </source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../transactiondesc.cpp" line="112"/> + <source> (yours)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../transactiondesc.cpp" line="147"/> + <location filename="../transactiondesc.cpp" line="161"/> + <location filename="../transactiondesc.cpp" line="206"/> + <location filename="../transactiondesc.cpp" line="223"/> + <source><b>Credit:</b> </source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../transactiondesc.cpp" line="149"/> + <source>(%1 matures in %2 more blocks)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../transactiondesc.cpp" line="153"/> + <source>(not accepted)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../transactiondesc.cpp" line="197"/> + <location filename="../transactiondesc.cpp" line="205"/> + <location filename="../transactiondesc.cpp" line="220"/> + <source><b>Debit:</b> </source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../transactiondesc.cpp" line="211"/> + <source><b>Transaction fee:</b> </source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../transactiondesc.cpp" line="227"/> + <source><b>Net amount:</b> </source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../transactiondesc.cpp" line="233"/> + <source>Message:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../transactiondesc.cpp" line="235"/> + <source>Comment:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../transactiondesc.cpp" line="238"/> + <source>Generated coins must wait 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, it will change to "not accepted" and not be spendable. This may occasionally happen if another node generates a block within a few seconds of yours.</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>TransactionDescDialog</name> @@ -597,32 +1207,31 @@ Möchten Sie die zusätzliche Gebühr zahlen?</translation> <context> <name>TransactionTableModel</name> <message> - <location filename="../transactiontablemodel.cpp" line="211"/> <source>Status</source> - <translation>Status</translation> + <translation type="obsolete">Status</translation> </message> <message> - <location filename="../transactiontablemodel.cpp" line="211"/> + <location filename="../transactiontablemodel.cpp" line="213"/> <source>Date</source> <translation>Datum</translation> </message> <message> - <location filename="../transactiontablemodel.cpp" line="211"/> + <location filename="../transactiontablemodel.cpp" line="213"/> <source>Type</source> <translation>Beschreibung</translation> </message> <message> - <location filename="../transactiontablemodel.cpp" line="211"/> + <location filename="../transactiontablemodel.cpp" line="213"/> <source>Address</source> <translation>Adresse</translation> </message> <message> - <location filename="../transactiontablemodel.cpp" line="211"/> + <location filename="../transactiontablemodel.cpp" line="213"/> <source>Amount</source> <translation>Betrag</translation> </message> <message numerus="yes"> - <location filename="../transactiontablemodel.cpp" line="272"/> + <location filename="../transactiontablemodel.cpp" line="274"/> <source>Open for %n block(s)</source> <translation> <numerusform>Offen für %n Blöcke</numerusform> @@ -630,27 +1239,31 @@ Möchten Sie die zusätzliche Gebühr zahlen?</translation> </translation> </message> <message> - <location filename="../transactiontablemodel.cpp" line="275"/> + <location filename="../transactiontablemodel.cpp" line="277"/> <source>Open until %1</source> <translation>Offen bis %1</translation> </message> <message> - <location filename="../transactiontablemodel.cpp" line="278"/> + <location filename="../transactiontablemodel.cpp" line="280"/> <source>Offline (%1 confirmations)</source> <translation>Nicht verbunden (%1 Bestätigungen)</translation> </message> <message> - <location filename="../transactiontablemodel.cpp" line="281"/> <source>Unconfirmed (%1/%2 confirmations)</source> - <translation>Unbestätigt (%1/%2 Bestätigungen)</translation> + <translation type="obsolete">Unbestätigt (%1/%2 Bestätigungen)</translation> + </message> + <message> + <location filename="../transactiontablemodel.cpp" line="283"/> + <source>Unconfirmed (%1 of %2 confirmations)</source> + <translation type="unfinished"></translation> </message> <message> - <location filename="../transactiontablemodel.cpp" line="284"/> + <location filename="../transactiontablemodel.cpp" line="286"/> <source>Confirmed (%1 confirmations)</source> <translation>Bestätigt (%1 Bestätigungen)</translation> </message> <message numerus="yes"> - <location filename="../transactiontablemodel.cpp" line="293"/> + <location filename="../transactiontablemodel.cpp" line="295"/> <source>Mined balance will be available in %n more blocks</source> <translation> <numerusform>Der Betrag wird in %n Blöcken verfügbar sein</numerusform> @@ -658,67 +1271,72 @@ Möchten Sie die zusätzliche Gebühr zahlen?</translation> </translation> </message> <message> - <location filename="../transactiontablemodel.cpp" line="299"/> + <location filename="../transactiontablemodel.cpp" line="301"/> <source>This block was not received by any other nodes and will probably not be accepted!</source> <translation>Dieser Block wurde vom Netzwerk nicht angenommen und wird wahrscheinlich nicht bestätigt werden!</translation> </message> <message> - <location filename="../transactiontablemodel.cpp" line="302"/> + <location filename="../transactiontablemodel.cpp" line="304"/> <source>Generated but not accepted</source> <translation>Generiert, jedoch nicht angenommen</translation> </message> <message> - <location filename="../transactiontablemodel.cpp" line="348"/> + <location filename="../transactiontablemodel.cpp" line="347"/> <source>Received with</source> <translation>Empfangen durch</translation> </message> <message> - <location filename="../transactiontablemodel.cpp" line="351"/> + <location filename="../transactiontablemodel.cpp" line="349"/> <source>Received from IP</source> <translation>Empfangen durch IP</translation> </message> <message> - <location filename="../transactiontablemodel.cpp" line="354"/> + <location filename="../transactiontablemodel.cpp" line="351"/> <source>Sent to</source> <translation>An</translation> </message> <message> - <location filename="../transactiontablemodel.cpp" line="357"/> + <location filename="../transactiontablemodel.cpp" line="353"/> <source>Sent to IP</source> <translation>An IP</translation> </message> <message> - <location filename="../transactiontablemodel.cpp" line="360"/> + <location filename="../transactiontablemodel.cpp" line="355"/> <source>Payment to yourself</source> <translation>Überweisung an Sie selbst</translation> </message> <message> - <location filename="../transactiontablemodel.cpp" line="363"/> + <location filename="../transactiontablemodel.cpp" line="357"/> <source>Mined</source> <translation>Erarbeitet</translation> </message> <message> - <location filename="../transactiontablemodel.cpp" line="578"/> + <location filename="../transactiontablemodel.cpp" line="395"/> + <source>(n/a)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../transactiontablemodel.cpp" line="594"/> <source>Transaction status. Hover over this field to show number of confirmations.</source> <translation>Transaktionsstatus. Fahren Sie mit der Maus über dieses Feld um die Anzahl der Bestätigungen zu sehen.</translation> </message> <message> - <location filename="../transactiontablemodel.cpp" line="580"/> + <location filename="../transactiontablemodel.cpp" line="596"/> <source>Date and time that the transaction was received.</source> <translation>Datum und Uhrzeit als die Transaktion empfangen wurde.</translation> </message> <message> - <location filename="../transactiontablemodel.cpp" line="582"/> + <location filename="../transactiontablemodel.cpp" line="598"/> <source>Type of transaction.</source> <translation>Art der Transaktion.</translation> </message> <message> - <location filename="../transactiontablemodel.cpp" line="584"/> + <location filename="../transactiontablemodel.cpp" line="600"/> <source>Destination address of transaction.</source> <translation>Empfangsadresse der Transaktion</translation> </message> <message> - <location filename="../transactiontablemodel.cpp" line="586"/> + <location filename="../transactiontablemodel.cpp" line="602"/> <source>Amount removed from or added to balance.</source> <translation>Betrag vom Kontostand entfernt oder hinzugefügt.</translation> </message> @@ -726,91 +1344,166 @@ Möchten Sie die zusätzliche Gebühr zahlen?</translation> <context> <name>TransactionView</name> <message> - <location filename="../transactionview.cpp" line="39"/> - <location filename="../transactionview.cpp" line="52"/> + <location filename="../transactionview.cpp" line="48"/> + <location filename="../transactionview.cpp" line="61"/> <source>All</source> <translation>Alle</translation> </message> <message> - <location filename="../transactionview.cpp" line="40"/> + <location filename="../transactionview.cpp" line="49"/> <source>Today</source> <translation>Heute</translation> </message> <message> - <location filename="../transactionview.cpp" line="41"/> + <location filename="../transactionview.cpp" line="50"/> <source>This week</source> <translation>Diese Woche</translation> </message> <message> - <location filename="../transactionview.cpp" line="42"/> + <location filename="../transactionview.cpp" line="51"/> <source>This month</source> <translation>Diesen Monat</translation> </message> <message> - <location filename="../transactionview.cpp" line="43"/> + <location filename="../transactionview.cpp" line="52"/> <source>Last month</source> <translation>Letzten Monat</translation> </message> <message> - <location filename="../transactionview.cpp" line="44"/> + <location filename="../transactionview.cpp" line="53"/> <source>This year</source> <translation>Dieses Jahr</translation> </message> <message> - <location filename="../transactionview.cpp" line="45"/> + <location filename="../transactionview.cpp" line="54"/> <source>Range...</source> <translation>Bereich...</translation> </message> <message> - <location filename="../transactionview.cpp" line="53"/> + <location filename="../transactionview.cpp" line="62"/> <source>Received with</source> <translation>Empfangen durch</translation> </message> <message> - <location filename="../transactionview.cpp" line="55"/> + <location filename="../transactionview.cpp" line="64"/> <source>Sent to</source> <translation>An</translation> </message> <message> - <location filename="../transactionview.cpp" line="57"/> + <location filename="../transactionview.cpp" line="66"/> <source>To yourself</source> <translation>Zu Ihnen selbst</translation> </message> <message> - <location filename="../transactionview.cpp" line="58"/> + <location filename="../transactionview.cpp" line="67"/> <source>Mined</source> <translation>Erarbeitet</translation> </message> <message> - <location filename="../transactionview.cpp" line="59"/> + <location filename="../transactionview.cpp" line="68"/> <source>Other</source> <translation>Andere</translation> </message> <message> - <location filename="../transactionview.cpp" line="208"/> + <location filename="../transactionview.cpp" line="74"/> + <source>Enter address or label to search</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../transactionview.cpp" line="80"/> + <source>Min amount</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../transactionview.cpp" line="108"/> + <source>Copy address</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../transactionview.cpp" line="109"/> + <source>Copy label</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../transactionview.cpp" line="110"/> + <source>Edit label</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../transactionview.cpp" line="111"/> + <source>Show details...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../transactionview.cpp" line="244"/> <source>Export Transaction Data</source> <translation>Transaktionen exportieren</translation> </message> <message> - <location filename="../transactionview.cpp" line="210"/> + <location filename="../transactionview.cpp" line="246"/> <source>Comma separated file (*.csv)</source> <translation></translation> </message> <message> - <location filename="../transactionview.cpp" line="230"/> + <location filename="../transactionview.cpp" line="254"/> + <source>Confirmed</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../transactionview.cpp" line="255"/> + <source>Date</source> + <translation type="unfinished">Datum</translation> + </message> + <message> + <location filename="../transactionview.cpp" line="256"/> + <source>Type</source> + <translation type="unfinished">Beschreibung</translation> + </message> + <message> + <location filename="../transactionview.cpp" line="257"/> + <source>Label</source> + <translation type="unfinished">Bezeichnung</translation> + </message> + <message> + <location filename="../transactionview.cpp" line="258"/> + <source>Address</source> + <translation type="unfinished">Adresse</translation> + </message> + <message> + <location filename="../transactionview.cpp" line="259"/> + <source>Amount</source> + <translation type="unfinished">Betrag</translation> + </message> + <message> + <location filename="../transactionview.cpp" line="260"/> + <source>ID</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../transactionview.cpp" line="264"/> <source>Error exporting</source> <translation>Fehler beim exportieren</translation> </message> <message> - <location filename="../transactionview.cpp" line="230"/> + <location filename="../transactionview.cpp" line="264"/> <source>Could not write to file %1.</source> <translation>Konnte Datei %1 nicht zum beschreiben öffnen</translation> </message> + <message> + <location filename="../transactionview.cpp" line="352"/> + <source>Range:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../transactionview.cpp" line="360"/> + <source>to</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>WalletModel</name> <message> - <location filename="../walletmodel.cpp" line="95"/> + <location filename="../walletmodel.cpp" line="144"/> <source>Sending...</source> <translation>Senden...</translation> </message> @@ -1045,111 +1738,711 @@ SSL options: (see the Bitcoin Wiki for SSL setup instructions) </message> <message> <location filename="../bitcoinstrings.cpp" line="47"/> + <source>Loading addresses...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="48"/> <source>Error loading addr.dat </source> <translation>Fehler beim laden der addr.dat</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="48"/> + <location filename="../bitcoinstrings.cpp" line="49"/> + <source>Loading block index...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="50"/> <source>Error loading blkindex.dat </source> <translation>Fehler beim laden der blkindex.dat</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="49"/> + <location filename="../bitcoinstrings.cpp" line="51"/> + <source>Loading wallet...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="52"/> + <source>Error loading wallet.dat: Wallet corrupted +</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="53"/> + <source>Error loading wallet.dat: Wallet requires newer version of Bitcoin +</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="55"/> <source>Error loading wallet.dat </source> <translation>Fehler beim laden von wallet.dat</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="50"/> + <location filename="../bitcoinstrings.cpp" line="56"/> + <source>Rescanning...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="57"/> + <source>Done loading</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="58"/> <source>Invalid -proxy address</source> <translation>Fehlerhafte Proxy Adresse</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="51"/> + <location filename="../bitcoinstrings.cpp" line="59"/> <source>Invalid amount for -paytxfee=<amount></source> <translation>Ungültige Angabe für -paytxfee=<Betrag></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="52"/> + <location filename="../bitcoinstrings.cpp" line="60"/> <source>Warning: -paytxfee is set very high. This is the transaction fee you will pay if you send a transaction.</source> <translation>Warnung: -paytxfee ist auf einen sehr hohen Wert gesetzt. Dies ist die Gebühr die beim senden einer Transaktion fällig wird.</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="55"/> + <location filename="../bitcoinstrings.cpp" line="63"/> + <source>Error: CreateThread(StartNode) failed</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="64"/> <source>Warning: Disk space is low </source> <translation>Warnung: Festplattenplatz wird knapp.</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="56"/> + <location filename="../bitcoinstrings.cpp" line="68"/> + <source>This transaction is over the size limit. You can still send it for a fee of %s, 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> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="72"/> + <source>Enter the current passphrase to the wallet.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="73"/> + <source>Passphrase</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="74"/> + <source>Please supply the current wallet decryption passphrase.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="75"/> + <source>The passphrase entered for the wallet decryption was incorrect.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="76"/> + <source>Status</source> + <translation type="unfinished">Status</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="77"/> + <source>Date</source> + <translation type="unfinished">Datum</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="78"/> + <source>Description</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="79"/> + <source>Debit</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="80"/> + <source>Credit</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="81"/> + <source>Open for %d blocks</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="82"/> + <source>Open until %s</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="83"/> + <source>%d/offline?</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="84"/> + <source>%d/unconfirmed</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="85"/> + <source>%d confirmations</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="86"/> + <source>Generated</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="87"/> + <source>Generated (%s matures in %d more blocks)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="88"/> + <source>Generated - Warning: This block was not received by any other nodes and will probably not be accepted!</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="91"/> + <source>Generated (not accepted)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="92"/> + <source>From: </source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="93"/> + <source>Received with: </source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="94"/> + <source>Payment to yourself</source> + <translation type="unfinished">Überweisung an Sie selbst</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="95"/> + <source>To: </source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="96"/> + <source> Generating</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="97"/> + <source>(not connected)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="98"/> + <source> %d connections %d blocks %d transactions</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="99"/> + <source>Wallet already encrypted.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="100"/> + <source>Enter the new passphrase to the wallet. +Please use a passphrase of 10 or more random characters, or eight or more words.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="104"/> + <source>Error: The supplied passphrase was too short.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="105"/> + <source>WARNING: If you encrypt your wallet and lose your passphrase, you will LOSE ALL OF YOUR BITCOINS! +Are you sure you wish to encrypt your wallet?</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="109"/> + <source>Please re-enter your new wallet passphrase.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="110"/> + <source>Error: the supplied passphrases didn't match.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="111"/> + <source>Wallet encryption failed.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="112"/> + <source>Wallet Encrypted. +Remember that encrypting your wallet cannot fully protect your bitcoins from being stolen by malware infecting your computer.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="116"/> + <source>Wallet is unencrypted, please encrypt it first.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="117"/> + <source>Enter the new passphrase for the wallet.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="118"/> + <source>Re-enter the new passphrase for the wallet.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="119"/> + <source>Wallet Passphrase Changed.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="120"/> + <source>New Receiving Address</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="121"/> + <source>You should use a new address for each payment you receive. + +Label</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="125"/> + <source><b>Status:</b> </source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="126"/> + <source>, has not been successfully broadcast yet</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="127"/> + <source>, broadcast through %d node</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="128"/> + <source>, broadcast through %d nodes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="129"/> + <source><b>Date:</b> </source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="130"/> + <source><b>Source:</b> Generated<br></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="131"/> + <source><b>From:</b> </source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="132"/> + <source>unknown</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="133"/> + <source><b>To:</b> </source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="134"/> + <source> (yours, label: </source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="135"/> + <source> (yours)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="136"/> + <source><b>Credit:</b> </source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="137"/> + <source>(%s matures in %d more blocks)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="138"/> + <source>(not accepted)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="139"/> + <source><b>Debit:</b> </source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="140"/> + <source><b>Transaction fee:</b> </source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="141"/> + <source><b>Net amount:</b> </source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="142"/> + <source>Message:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="143"/> + <source>Comment:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="144"/> + <source>Generated coins must wait 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, it will change to "not accepted" and not be spendable. This may occasionally happen if another node generates a block within a few seconds of yours.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="150"/> + <source>Cannot write autostart/bitcoin.desktop file</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="151"/> + <source>Main</source> + <translation type="unfinished">Haupt</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="152"/> + <source>&Start Bitcoin on window system startup</source> + <translation type="unfinished">Bitcoin beim Start des Systems ausführen</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="153"/> + <source>&Minimize on close</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="154"/> + <source>version %s</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="155"/> + <source>Error in amount </source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="156"/> + <source>Send Coins</source> + <translation type="unfinished">Bitcoins überweisen</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="157"/> + <source>Amount exceeds your balance </source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="158"/> + <source>Total exceeds your balance when the </source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="159"/> + <source> transaction fee is included </source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="160"/> + <source>Payment sent </source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="162"/> + <source>Invalid address </source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="163"/> + <source>Sending %s to %s</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="164"/> + <source>CANCELLED</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="165"/> + <source>Cancelled</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="166"/> + <source>Transfer cancelled </source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="167"/> + <source>Error: </source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="169"/> + <source>Connecting...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="170"/> + <source>Unable to connect</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="171"/> + <source>Requesting public key...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="172"/> + <source>Received public key...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="173"/> + <source>Recipient is not accepting transactions sent by IP address</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="174"/> + <source>Transfer was not accepted</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="175"/> + <source>Invalid response received</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="176"/> + <source>Creating transaction...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="177"/> + <source>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> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="180"/> + <source>Transaction creation failed</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="181"/> + <source>Transaction aborted</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="182"/> + <source>Lost connection, transaction cancelled</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="183"/> + <source>Sending payment...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="184"/> + <source>The transaction was rejected. This might happen if some of the coins in your wallet were already spent, such as if you used a copy of wallet.dat and coins were spent in the copy but not marked as spent here.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="188"/> + <source>Waiting for confirmation...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="189"/> + <source>The payment was sent, but the recipient was unable to verify it. +The transaction is recorded and will credit to the recipient, +but the comment information will be blank.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="193"/> + <source>Payment was sent, but an invalid response was received</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="194"/> + <source>Payment completed</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="195"/> + <source>Name</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="196"/> + <source>Address</source> + <translation type="unfinished">Adresse</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="197"/> + <source>Label</source> + <translation type="unfinished">Bezeichnung</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="198"/> + <source>Bitcoin Address</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="199"/> + <source>This is one of your own addresses for receiving payments and cannot be entered in the address book. </source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="202"/> + <source>Edit Address</source> + <translation type="unfinished">Adresse bearbeiten</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="203"/> + <source>Edit Address Label</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="204"/> + <source>Add Address</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="205"/> + <source>Bitcoin</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="206"/> + <source>Bitcoin - Generating</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="207"/> + <source>Bitcoin - (not connected)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="208"/> + <source>&Open Bitcoin</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="209"/> + <source>&Send Bitcoins</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="210"/> + <source>O&ptions...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="211"/> + <source>E&xit</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="212"/> + <source>Program has crashed and will terminate. </source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="216"/> + <source>beta</source> + <translation type="unfinished"></translation> + </message> + <message> <source>Error: This transaction requires a transaction fee of at least %s because of its amount, complexity, or use of recently received funds </source> - <translation>Fehler: Diese Transaktion erfordert eine Gebühr von mindestens %s. Die Gebühr wird fällig aufgrund der Größe, der Komplexität oder der Verwendung erst kürzlich erhaltener BitCoins</translation> + <translation type="obsolete">Fehler: Diese Transaktion erfordert eine Gebühr von mindestens %s. Die Gebühr wird fällig aufgrund der Größe, der Komplexität oder der Verwendung erst kürzlich erhaltener BitCoins</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="59"/> <source>Error: Transaction creation failed </source> - <translation>Fehler: Die Transaktion konnte nicht erstellt werden.</translation> + <translation type="obsolete">Fehler: Die Transaktion konnte nicht erstellt werden.</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="60"/> + <location filename="../bitcoinstrings.cpp" line="161"/> <source>Sending...</source> <translation>Senden...</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="61"/> <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 zurückgewiesen. Dies kann passieren wenn einige Ihrer BitCoins bereits ausgegeben wurde (zB aus einer Sicherungskopie Ihrer wallet.dat)</translation> + <translation type="obsolete">Fehler: Die Transaktion wurde zurückgewiesen. Dies kann passieren wenn einige Ihrer BitCoins bereits ausgegeben wurde (zB aus einer Sicherungskopie Ihrer wallet.dat)</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="65"/> <source>Invalid amount</source> - <translation>Fehlerhafter Betrag</translation> + <translation type="obsolete">Fehlerhafter Betrag</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="66"/> + <location filename="../bitcoinstrings.cpp" line="168"/> <source>Insufficient funds</source> <translation>Unzureichender Kontostand</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="67"/> <source>Invalid bitcoin address</source> - <translation>Fehlerhafte Bitcoin Adresse</translation> + <translation type="obsolete">Fehlerhafte Bitcoin Adresse</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="68"/> + <location filename="../bitcoinstrings.cpp" line="65"/> <source>Unable to bind to port %d on this computer. Bitcoin is probably already running.</source> <translation>Fehler beim registrieren des Ports %d auf diesem Computer. Evtl. läuft BitCoin bereits</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="71"/> <source>To use the %s option</source> - <translation>Um die Option %s zuu verwenden</translation> + <translation type="obsolete">Um die Option %s zuu verwenden</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="72"/> <source>Warning: %s, 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>Warnung: Sie müssen rpcpassword=password in der Konfigurationsdatei angeben.</translation> + <translation type="obsolete">Warnung: Sie müssen rpcpassword=password in der Konfigurationsdatei angeben.</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="77"/> <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>Sie müssen rpcpassword=password in der Konfigurationsdatei angeben.</translation> + <translation type="obsolete">Sie müssen rpcpassword=password in der Konfigurationsdatei angeben.</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="82"/> + <location filename="../bitcoinstrings.cpp" line="213"/> <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>Bitte prüfen Sie Ihre Datums- und Uhrzeiteinstellungen, ansonsten kann es sein das BitCoin nicht ordnungsgemäss funktioniert.</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="85"/> <source>-beta</source> - <translation>-beta</translation> + <translation type="obsolete">-beta</translation> </message> </context> </TS> diff --git a/src/qt/locale/bitcoin_nl.ts b/src/qt/locale/bitcoin_nl.ts index afe0dc89e2..9940e90e18 100644 --- a/src/qt/locale/bitcoin_nl.ts +++ b/src/qt/locale/bitcoin_nl.ts @@ -136,21 +136,41 @@ door Thomas Bernard. <source>&Delete</source> <translation type="unfinished">&Verwijderen</translation> </message> + <message> + <location filename="../addressbookpage.cpp" line="197"/> + <source>Export Address Book Data</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../addressbookpage.cpp" line="199"/> + <source>Comma separated file (*.csv)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../addressbookpage.cpp" line="212"/> + <source>Error exporting</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../addressbookpage.cpp" line="212"/> + <source>Could not write to file %1.</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>AddressTableModel</name> <message> - <location filename="../addresstablemodel.cpp" line="78"/> + <location filename="../addresstablemodel.cpp" line="77"/> <source>Label</source> <translation>Label</translation> </message> <message> - <location filename="../addresstablemodel.cpp" line="78"/> + <location filename="../addresstablemodel.cpp" line="77"/> <source>Address</source> <translation>Adres</translation> </message> <message> - <location filename="../addresstablemodel.cpp" line="114"/> + <location filename="../addresstablemodel.cpp" line="113"/> <source>(no label)</source> <translation type="unfinished"></translation> </message> @@ -160,6 +180,137 @@ door Thomas Bernard. </message> </context> <context> + <name>AskPassphraseDialog</name> + <message> + <location filename="../forms/askpassphrasedialog.ui" line="26"/> + <source>Dialog</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../forms/askpassphrasedialog.ui" line="32"/> + <source>TextLabel</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../forms/askpassphrasedialog.ui" line="47"/> + <source>Enter passphrase</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../forms/askpassphrasedialog.ui" line="61"/> + <source>New passphrase</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../forms/askpassphrasedialog.ui" line="75"/> + <source>Repeat new passphrase</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../askpassphrasedialog.cpp" line="26"/> + <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 type="unfinished"></translation> + </message> + <message> + <location filename="../askpassphrasedialog.cpp" line="27"/> + <source>Encrypt wallet</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../askpassphrasedialog.cpp" line="30"/> + <source>This operation needs your wallet passphrase to unlock the wallet.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../askpassphrasedialog.cpp" line="35"/> + <source>Unlock wallet</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../askpassphrasedialog.cpp" line="38"/> + <source>This operation needs your wallet passphrase to decrypt the wallet.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../askpassphrasedialog.cpp" line="43"/> + <source>Decrypt wallet</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../askpassphrasedialog.cpp" line="46"/> + <source>Change passphrase</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../askpassphrasedialog.cpp" line="47"/> + <source>Enter the old and new passphrase to the wallet.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../askpassphrasedialog.cpp" line="91"/> + <source>Confirm wallet encryption</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../askpassphrasedialog.cpp" line="92"/> + <source>WARNING: If you encrypt your wallet and lose your passphrase, you will <b>LOSE ALL OF YOUR BITCOINS</b>! +Are you sure you wish to encrypt your wallet?</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../askpassphrasedialog.cpp" line="101"/> + <location filename="../askpassphrasedialog.cpp" line="149"/> + <source>Wallet encrypted</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../askpassphrasedialog.cpp" line="102"/> + <source>Remember that encrypting your wallet cannot fully protect your bitcoins from being stolen by malware infecting your computer.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../askpassphrasedialog.cpp" line="106"/> + <location filename="../askpassphrasedialog.cpp" line="113"/> + <location filename="../askpassphrasedialog.cpp" line="155"/> + <location filename="../askpassphrasedialog.cpp" line="161"/> + <source>Wallet encryption failed</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../askpassphrasedialog.cpp" line="107"/> + <source>Wallet encryption failed due to an internal error. Your wallet was not encrypted.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../askpassphrasedialog.cpp" line="114"/> + <location filename="../askpassphrasedialog.cpp" line="162"/> + <source>The supplied passphrases do not match.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../askpassphrasedialog.cpp" line="125"/> + <source>Wallet unlock failed</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../askpassphrasedialog.cpp" line="126"/> + <location filename="../askpassphrasedialog.cpp" line="137"/> + <location filename="../askpassphrasedialog.cpp" line="156"/> + <source>The passphrase entered for the wallet decryption was incorrect.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../askpassphrasedialog.cpp" line="136"/> + <source>Wallet decryption failed</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../askpassphrasedialog.cpp" line="150"/> + <source>Wallet passphrase was succesfully changed.</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> <name>BitcoinGUI</name> <message> <source>Bitcoin</source> @@ -198,127 +349,249 @@ door Thomas Bernard. <translation type="obsolete">Uw huidige saldo</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="112"/> <source>Number of connections to other clients</source> - <translation>Aantal verbindingen met andere clients</translation> + <translation type="obsolete">Aantal verbindingen met andere clients</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="117"/> <source>Number of blocks in the block chain</source> - <translation>Aantal blokken in de block-chain</translation> + <translation type="obsolete">Aantal blokken in de block-chain</translation> </message> <message> <source>Number of transactions in your wallet</source> <translation type="obsolete">Aantal transacties in je portefeuille</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="120"/> + <location filename="../bitcoingui.cpp" line="142"/> <source>Synchronizing with network...</source> <translation>Synchroniseren met netwerk...</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="123"/> + <location filename="../bitcoingui.cpp" line="145"/> <source>Block chain synchronization in progress</source> <translation>Bezig met blokken-database-synchronisatie</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="169"/> + <location filename="../bitcoingui.cpp" line="200"/> <source>&Exit</source> <translation>A&fsluiten</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="170"/> + <location filename="../bitcoingui.cpp" line="201"/> <source>Quit application</source> <translation>De applicatie afsluiten</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="158"/> + <location filename="../bitcoingui.cpp" line="189"/> <source>&Send coins</source> <translation>&Verstuur coins</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="159"/> + <location filename="../bitcoingui.cpp" line="190"/> <source>Send coins to a bitcoin address</source> <translation>Coins versturen naar een bitcoin-adres</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="148"/> + <location filename="../bitcoingui.cpp" line="179"/> <source>&Address Book</source> <translation>&Adresboek</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="50"/> + <location filename="../bitcoingui.cpp" line="59"/> <source>Bitcoin Wallet</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoingui.cpp" line="140"/> + <location filename="../bitcoingui.cpp" line="67"/> + <source>&File</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../bitcoingui.cpp" line="73"/> + <source>&Settings</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../bitcoingui.cpp" line="79"/> + <source>&Help</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../bitcoingui.cpp" line="83"/> + <source>Tabs toolbar</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../bitcoingui.cpp" line="91"/> + <source>Actions toolbar</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../bitcoingui.cpp" line="169"/> <source>&Overview</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoingui.cpp" line="144"/> + <location filename="../bitcoingui.cpp" line="170"/> + <source>Show general overview of wallet</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../bitcoingui.cpp" line="174"/> <source>&Transactions</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoingui.cpp" line="149"/> + <location filename="../bitcoingui.cpp" line="175"/> + <source>Browse transaction history</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../bitcoingui.cpp" line="180"/> <source>Edit the list of stored addresses and labels</source> <translation>Bewerk de lijst van adressen en labels</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="153"/> + <location filename="../bitcoingui.cpp" line="184"/> <source>&Receive coins</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoingui.cpp" line="154"/> + <location filename="../bitcoingui.cpp" line="185"/> <source>Show the list of addresses for receiving payments</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoingui.cpp" line="171"/> + <location filename="../bitcoingui.cpp" line="202"/> <source>&About</source> <translation>&Over Bitcoin</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="172"/> + <location filename="../bitcoingui.cpp" line="203"/> <source>Show information about Bitcoin</source> <translation>Laat informatie zien over Bitcoin</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="177"/> + <location filename="../bitcoingui.cpp" line="208"/> <source>&Export...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoingui.cpp" line="178"/> - <source>Export data in current view to a file</source> + <location filename="../bitcoingui.cpp" line="209"/> + <source>Export the current view to a file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoingui.cpp" line="193"/> - <source>[testnet]</source> + <location filename="../bitcoingui.cpp" line="210"/> + <source>&Encrypt Wallet</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../bitcoingui.cpp" line="211"/> + <source>Encrypt or decrypt wallet</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../bitcoingui.cpp" line="213"/> + <source>&Change Passphrase</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../bitcoingui.cpp" line="214"/> + <source>Change the passphrase used for wallet encryption</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../bitcoingui.cpp" line="293"/> + <source>bitcoin-qt</source> + <translation type="unfinished"></translation> + </message> + <message numerus="yes"> + <location filename="../bitcoingui.cpp" line="332"/> + <source>%n active connection(s) to Bitcoin network</source> + <translation type="unfinished"> + <numerusform></numerusform> + <numerusform></numerusform> + </translation> + </message> + <message> + <location filename="../bitcoingui.cpp" line="347"/> + <source>Downloaded %1 of %2 blocks of transaction history.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../bitcoingui.cpp" line="353"/> + <source>Downloaded %1 blocks of transaction history.</source> + <translation type="unfinished"></translation> + </message> + <message numerus="yes"> + <location filename="../bitcoingui.cpp" line="364"/> + <source>%n second(s) ago</source> + <translation type="unfinished"> + <numerusform></numerusform> + <numerusform></numerusform> + </translation> + </message> + <message numerus="yes"> + <location filename="../bitcoingui.cpp" line="368"/> + <source>%n minute(s) ago</source> + <translation type="unfinished"> + <numerusform></numerusform> + <numerusform></numerusform> + </translation> + </message> + <message numerus="yes"> + <location filename="../bitcoingui.cpp" line="372"/> + <source>%n hour(s) ago</source> + <translation type="unfinished"> + <numerusform></numerusform> + <numerusform></numerusform> + </translation> + </message> + <message numerus="yes"> + <location filename="../bitcoingui.cpp" line="376"/> + <source>%n day(s) ago</source> + <translation type="unfinished"> + <numerusform></numerusform> + <numerusform></numerusform> + </translation> + </message> + <message> + <location filename="../bitcoingui.cpp" line="382"/> + <source>Up to date</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoingui.cpp" line="408"/> - <source>Date: </source> + <location filename="../bitcoingui.cpp" line="387"/> + <source>Catching up...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoingui.cpp" line="409"/> - <source>Amount: </source> + <location filename="../bitcoingui.cpp" line="393"/> + <source>Last received block was generated %1.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoingui.cpp" line="410"/> - <source>Type: </source> + <location filename="../bitcoingui.cpp" line="472"/> + <source>Date: %1 +Amount: %2 +Type: %3 +Address: %4 +</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoingui.cpp" line="411"/> - <source>Address: </source> + <location filename="../bitcoingui.cpp" line="566"/> + <source>Wallet is <b>encrypted</b> and currently <b>unlocked</b></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../bitcoingui.cpp" line="574"/> + <source>Wallet is <b>encrypted</b> and currently <b>locked</b></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../bitcoingui.cpp" line="230"/> + <source>[testnet]</source> <translation type="unfinished"></translation> </message> <message> @@ -330,22 +603,22 @@ door Thomas Bernard. <translation type="obsolete">Laat de lijst zien van ontvangst-adressen en bewerk de labels</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="173"/> + <location filename="../bitcoingui.cpp" line="204"/> <source>&Options...</source> <translation>&Opties...</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="174"/> + <location filename="../bitcoingui.cpp" line="205"/> <source>Modify configuration options for bitcoin</source> <translation>Verander instellingen van Bitcoin</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="175"/> + <location filename="../bitcoingui.cpp" line="206"/> <source>Open &Bitcoin</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoingui.cpp" line="176"/> + <location filename="../bitcoingui.cpp" line="207"/> <source>Show the Bitcoin window</source> <translation>Laat het Bitcoin-venster zien</translation> </message> @@ -366,17 +639,15 @@ door Thomas Bernard. <translation type="obsolete">Ontvangen</translation> </message> <message numerus="yes"> - <location filename="../bitcoingui.cpp" line="298"/> <source>%n connection(s)</source> - <translation> + <translation type="obsolete"> <numerusform>%n verbinding</numerusform> <numerusform>%n verbindingen</numerusform> </translation> </message> <message numerus="yes"> - <location filename="../bitcoingui.cpp" line="317"/> <source>%n block(s)</source> - <translation> + <translation type="obsolete"> <numerusform>%n blok</numerusform> <numerusform>%n blokken</numerusform> </translation> @@ -389,17 +660,22 @@ door Thomas Bernard. </translation> </message> <message> - <location filename="../bitcoingui.cpp" line="375"/> + <location filename="../bitcoingui.cpp" line="440"/> <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 limiet. Om de transactie alsnog te verwerken kun je een fooi betalen van %1. Deze zal betaald worden aan de node die uw transactie verwerkt. Wil je doorgaan en deze fooi betalen?</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="379"/> + <location filename="../bitcoingui.cpp" line="445"/> <source>Sending...</source> <translation>Versturen...</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="407"/> + <location filename="../bitcoingui.cpp" line="470"/> + <source>Sent transaction</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../bitcoingui.cpp" line="471"/> <source>Incoming transaction</source> <translation>Binnenkomende transactie</translation> </message> @@ -412,6 +688,24 @@ door Thomas Bernard. </message> </context> <context> + <name>DisplayOptionsPage</name> + <message> + <location filename="../optionsdialog.cpp" line="258"/> + <source>&Unit to show amounts in: </source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../optionsdialog.cpp" line="262"/> + <source>Choose the default subdivision unit to show in the interface, and when sending coins</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../optionsdialog.cpp" line="269"/> + <source>Display addresses in transaction list</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> <name>EditAddressDialog</name> <message> <location filename="../forms/editaddressdialog.ui" line="14"/> @@ -463,12 +757,22 @@ door Thomas Bernard. <translation>Bewerk ontvangst-adres</translation> </message> <message> - <location filename="../editaddressdialog.cpp" line="89"/> + <location filename="../editaddressdialog.cpp" line="92"/> <source>The entered address "%1" is not a valid bitcoin address.</source> <translation type="unfinished"></translation> </message> <message> <location filename="../editaddressdialog.cpp" line="97"/> + <source>Could not unlock wallet.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../editaddressdialog.cpp" line="102"/> + <source>New key generation failed.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../editaddressdialog.cpp" line="87"/> <source>The entered address "%1" is already in the address book.</source> <translation type="unfinished"></translation> </message> @@ -480,87 +784,87 @@ door Thomas Bernard. <context> <name>MainOptionsPage</name> <message> - <location filename="../optionsdialog.cpp" line="142"/> + <location filename="../optionsdialog.cpp" line="166"/> <source>&Start Bitcoin on window system startup</source> <translation>&Start Bitcoin wanneer het systeem opstart</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="143"/> + <location filename="../optionsdialog.cpp" line="167"/> <source>Automatically start Bitcoin after the computer is turned on</source> <translation>Start Bitcoin automatisch wanneer het systeem start</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="146"/> + <location filename="../optionsdialog.cpp" line="170"/> <source>&Minimize to the tray instead of the taskbar</source> <translation>&Minimaliseer tot systeemvak in plaats van de taakbalk</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="147"/> + <location filename="../optionsdialog.cpp" line="171"/> <source>Show only a tray icon after minimizing the window</source> <translation>Laat alleen een systeemvak-icoon zien wanneer het venster geminimaliseerd is</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="150"/> + <location filename="../optionsdialog.cpp" line="174"/> <source>Map port using &UPnP</source> <translation>Portmapping via &UPnP</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="151"/> + <location filename="../optionsdialog.cpp" line="175"/> <source>Automatically open the Bitcoin client port on the router. This only works when your router supports UPnP and it is enabled.</source> <translation>Open de Bitcoin-poort automatisch op de router. Dit werkt alleen als de router UPnP ondersteunt.</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="154"/> + <location filename="../optionsdialog.cpp" line="178"/> <source>M&inimize on close</source> <translation>&Minimaliseer bij sluiten van het venster</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="155"/> + <location filename="../optionsdialog.cpp" line="179"/> <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>Minimiliseer het venster in de plaats van de applicatie af te sluiten als het venster gesloten wordt. Wanneer deze optie aan staan, kan de applicatie alleen worden afgesloten door Afsluiten te kiezen in het menu.</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="158"/> + <location filename="../optionsdialog.cpp" line="182"/> <source>&Connect through SOCKS4 proxy:</source> <translation>&Verbind via socks4 proxy: </translation> </message> <message> - <location filename="../optionsdialog.cpp" line="159"/> + <location filename="../optionsdialog.cpp" line="183"/> <source>Connect to the Bitcon network through a SOCKS4 proxy (e.g. when connecting through Tor)</source> <translation>Verbind met het Bitcoin-netwerk door een SOCKS4 proxy (bijvoorbeeld Tor)</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="164"/> + <location filename="../optionsdialog.cpp" line="188"/> <source>Proxy &IP: </source> <translation>Proxy &IP:</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="170"/> + <location filename="../optionsdialog.cpp" line="194"/> <source>IP address of the proxy (e.g. 127.0.0.1)</source> <translation>IP adres van de proxy (bijv. 127.0.0.1)</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="173"/> + <location filename="../optionsdialog.cpp" line="197"/> <source>&Port: </source> <translation>&Poort:</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="179"/> + <location filename="../optionsdialog.cpp" line="203"/> <source>Port of the proxy (e.g. 1234)</source> <translation>Poort waarop de proxy luistert (bijv. 1234)</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="185"/> + <location filename="../optionsdialog.cpp" line="209"/> <source>Optional transaction fee per KB that helps make sure your transactions are processed quickly. Most transactions are 1KB. Fee 0.01 recommended.</source> <translation>Optionele transactiefooi per KB die helpt ervoor zorgen dat uw transacties snel verwerkt worden. De meeste transacties zijn 1KB. Fooi 0.01 is aangeraden.</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="191"/> + <location filename="../optionsdialog.cpp" line="215"/> <source>Pay transaction &fee</source> <translation>Transactie&fooi</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="194"/> + <location filename="../optionsdialog.cpp" line="218"/> <source>Optional transaction fee per KB that helps make sure your transactions are processed quickly. Most transactions are 1KB. Fee 0.01 recommended.</source> <translation>Optionele transactiefooi per KB die helpt ervoor zorgen dat uw transacties snel verwerkt worden. De meeste transacties zijn 1KB. Fooi 0.01 is aangeraden.</translation> </message> @@ -568,12 +872,17 @@ door Thomas Bernard. <context> <name>OptionsDialog</name> <message> - <location filename="../optionsdialog.cpp" line="54"/> + <location filename="../optionsdialog.cpp" line="75"/> <source>Main</source> <translation>Algemeen</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="74"/> + <location filename="../optionsdialog.cpp" line="80"/> + <source>Display</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../optionsdialog.cpp" line="100"/> <source>Options</source> <translation>Opties</translation> </message> @@ -586,40 +895,76 @@ door Thomas Bernard. <translation type="unfinished"></translation> </message> <message> - <location filename="../forms/overviewpage.ui" line="38"/> + <location filename="../forms/overviewpage.ui" line="40"/> <source>Balance:</source> <translation type="unfinished">Saldo:</translation> </message> <message> - <location filename="../forms/overviewpage.ui" line="45"/> + <location filename="../forms/overviewpage.ui" line="47"/> <source>123.456 BTC</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../forms/overviewpage.ui" line="52"/> + <location filename="../forms/overviewpage.ui" line="54"/> <source>Number of transactions:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../forms/overviewpage.ui" line="59"/> + <location filename="../forms/overviewpage.ui" line="61"/> <source>0</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../overviewpage.cpp" line="14"/> + <location filename="../forms/overviewpage.ui" line="68"/> + <source>Unconfirmed:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../forms/overviewpage.ui" line="75"/> + <source>0 BTC</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../forms/overviewpage.ui" line="82"/> + <source><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> +<html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'Ubuntu'; font-size:11pt; font-weight:400; font-style:normal;"> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-weight:600;">Wallet</span></p></body></html></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../forms/overviewpage.ui" line="122"/> + <source><b>Recent transactions</b></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../overviewpage.cpp" line="103"/> <source>Your current balance</source> <translation type="unfinished">Uw huidige saldo</translation> </message> + <message> + <location filename="../overviewpage.cpp" line="108"/> + <source>Total of transactions that have yet to be confirmed, and do not yet count toward the current balance</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../overviewpage.cpp" line="111"/> + <source>Total number of transactions in wallet</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>SendCoinsDialog</name> <message> <location filename="../forms/sendcoinsdialog.ui" line="14"/> - <location filename="../sendcoinsdialog.cpp" line="56"/> - <location filename="../sendcoinsdialog.cpp" line="78"/> - <location filename="../sendcoinsdialog.cpp" line="84"/> - <location filename="../sendcoinsdialog.cpp" line="90"/> - <location filename="../sendcoinsdialog.cpp" line="96"/> + <location filename="../sendcoinsdialog.cpp" line="103"/> + <location filename="../sendcoinsdialog.cpp" line="108"/> + <location filename="../sendcoinsdialog.cpp" line="113"/> + <location filename="../sendcoinsdialog.cpp" line="118"/> + <location filename="../sendcoinsdialog.cpp" line="124"/> + <location filename="../sendcoinsdialog.cpp" line="129"/> + <location filename="../sendcoinsdialog.cpp" line="134"/> <source>Send Coins</source> <translation>Verstuur coins</translation> </message> @@ -628,63 +973,44 @@ door Thomas Bernard. <translation type="obsolete">&Hoeveelheid:</translation> </message> <message> - <location filename="../forms/sendcoinsdialog.ui" line="95"/> <source>Pay &To:</source> - <translation>Betaal &aan:</translation> + <translation type="obsolete">Betaal &aan:</translation> </message> <message> - <location filename="../forms/sendcoinsdialog.ui" line="27"/> <source>The address to send the payment to (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source> - <translation>Voer een bitcoin-adres (bijvoorbeeld: 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation> + <translation type="obsolete">Voer een bitcoin-adres (bijvoorbeeld: 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation> </message> <message> - <location filename="../forms/sendcoinsdialog.ui" line="47"/> <source>Alt+A</source> - <translation>Alt+A</translation> + <translation type="obsolete">Alt+A</translation> </message> <message> - <location filename="../forms/sendcoinsdialog.ui" line="60"/> <source>Paste address from system clipboard</source> - <translation>Plak adres uit systeemplakbord</translation> - </message> - <message> - <location filename="../forms/sendcoinsdialog.ui" line="131"/> - <location filename="../sendcoinsdialog.cpp" line="23"/> - <source>Enter a label for this address to add it to your address book</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../forms/sendcoinsdialog.ui" line="140"/> - <source>&Label:</source> - <translation type="unfinished"></translation> + <translation type="obsolete">Plak adres uit systeemplakbord</translation> </message> <message> <source>&Paste</source> <translation type="obsolete">&Plakken</translation> </message> <message> - <location filename="../forms/sendcoinsdialog.ui" line="37"/> <source>Look up adress in address book</source> - <translation>Opzoeken in adresboek</translation> + <translation type="obsolete">Opzoeken in adresboek</translation> </message> <message> <source>Address &Book...</source> <translation type="obsolete">Adres&boek....</translation> </message> <message> - <location filename="../forms/sendcoinsdialog.ui" line="70"/> <source>Alt+P</source> - <translation>Alt+P</translation> + <translation type="obsolete">Alt+P</translation> </message> <message> - <location filename="../forms/sendcoinsdialog.ui" line="82"/> <source>A&mount:</source> - <translation>&Hoeveelheid:</translation> + <translation type="obsolete">&Hoeveelheid:</translation> </message> <message> - <location filename="../forms/sendcoinsdialog.ui" line="113"/> <source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source> - <translation>Voer een bitcoin-adres in (bijvoorbeeld: 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation> + <translation type="obsolete">Voer een bitcoin-adres in (bijvoorbeeld: 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation> </message> <message> <source>Add specified destination address to address book</source> @@ -699,59 +1025,303 @@ door Thomas Bernard. <translation type="obsolete">Label om toe te kennen aan adres in adresboek</translation> </message> <message> - <location filename="../forms/sendcoinsdialog.ui" line="183"/> + <location filename="../forms/sendcoinsdialog.ui" line="67"/> + <source>Send to multiple recipients at once</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../forms/sendcoinsdialog.ui" line="70"/> + <source>&Add recipient...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../forms/sendcoinsdialog.ui" line="87"/> + <source>Clear all</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../forms/sendcoinsdialog.ui" line="106"/> + <source>Balance:</source> + <translation type="unfinished">Saldo:</translation> + </message> + <message> + <location filename="../forms/sendcoinsdialog.ui" line="113"/> + <source>123.456 BTC</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../forms/sendcoinsdialog.ui" line="144"/> <source>Confirm the send action</source> <translation>Bevestig de zend-transactie</translation> </message> <message> - <location filename="../forms/sendcoinsdialog.ui" line="186"/> + <location filename="../forms/sendcoinsdialog.ui" line="147"/> <source>&Send</source> <translation>&Versturen</translation> </message> <message> - <location filename="../forms/sendcoinsdialog.ui" line="206"/> <source>Abort the send action</source> - <translation>De transactie annuleren</translation> + <translation type="obsolete">De transactie annuleren</translation> </message> <message> <source>The amount to pay must be a valid number.</source> <translation type="obsolete">Het ingevoerde bedrag is geen geldig getal.</translation> </message> <message> - <location filename="../sendcoinsdialog.cpp" line="57"/> - <source>Must fill in an amount to pay.</source> + <location filename="../sendcoinsdialog.cpp" line="82"/> + <source>Confirm send coins</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../sendcoinsdialog.cpp" line="65"/> - <source>Confirm send coins</source> + <location filename="../sendcoinsdialog.cpp" line="79"/> + <source><b>%1</b> to %2 (%3)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../sendcoinsdialog.cpp" line="66"/> - <source>Are you sure you want to send %1 BTC to %2 (%3)?</source> + <location filename="../sendcoinsdialog.cpp" line="83"/> + <source>Are you sure you want to send %1?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../sendcoinsdialog.cpp" line="79"/> + <location filename="../sendcoinsdialog.cpp" line="83"/> + <source> and </source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../sendcoinsdialog.cpp" line="104"/> <source>The recepient address is not valid, please recheck.</source> <translation>Het verzendadres is niet geld.</translation> </message> <message> - <location filename="../sendcoinsdialog.cpp" line="85"/> + <location filename="../sendcoinsdialog.cpp" line="109"/> <source>The amount to pay must be larger than 0.</source> <translation>Het ingevoerde gedrag moet groter zijn dan 0.</translation> </message> <message> - <location filename="../sendcoinsdialog.cpp" line="91"/> + <location filename="../sendcoinsdialog.cpp" line="114"/> <source>Amount exceeds your balance</source> <translation>Hoeveelheid overschrijdt uw huidige balans</translation> </message> <message> - <location filename="../sendcoinsdialog.cpp" line="97"/> + <location filename="../sendcoinsdialog.cpp" line="119"/> <source>Total exceeds your balance when the %1 transaction fee is included</source> <translation>Totaal overschrijdt uw huidige balans wanneer de %1 transactiefooi is meegerekend</translation> </message> + <message> + <location filename="../sendcoinsdialog.cpp" line="125"/> + <source>Duplicate address found, can only send to each address once in one send operation</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../sendcoinsdialog.cpp" line="130"/> + <source>Error: Transaction creation failed </source> + <translation type="unfinished">Fout: Aanmaken van transactie mislukt </translation> + </message> + <message> + <location filename="../sendcoinsdialog.cpp" line="135"/> + <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">Fout: De transactie is afgekeurd. Dit kan gebeuren als bepaalde coins in je Portefeuille al zijn uitgegeven. Dit kan veroorzaakt worden doordat je een kopie van wallet.dat gebruikt hebt en enkel daar je uitgave geregistreerd is.</translation> + </message> +</context> +<context> + <name>SendCoinsEntry</name> + <message> + <location filename="../forms/sendcoinsentry.ui" line="14"/> + <source>Form</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../forms/sendcoinsentry.ui" line="29"/> + <source>A&mount:</source> + <translation type="unfinished">&Hoeveelheid:</translation> + </message> + <message> + <location filename="../forms/sendcoinsentry.ui" line="42"/> + <source>Pay &To:</source> + <translation type="unfinished">Betaal &aan:</translation> + </message> + <message> + <location filename="../forms/sendcoinsentry.ui" line="66"/> + <location filename="../sendcoinsentry.cpp" line="22"/> + <source>Enter a label for this address to add it to your address book</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../forms/sendcoinsentry.ui" line="75"/> + <source>&Label:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../forms/sendcoinsentry.ui" line="93"/> + <source>The address to send the payment to (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source> + <translation type="unfinished">Voer een bitcoin-adres (bijvoorbeeld: 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation> + </message> + <message> + <location filename="../forms/sendcoinsentry.ui" line="103"/> + <source>Choose adress from address book</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../forms/sendcoinsentry.ui" line="113"/> + <source>Alt+A</source> + <translation type="unfinished">Alt+A</translation> + </message> + <message> + <location filename="../forms/sendcoinsentry.ui" line="126"/> + <source>Paste address from clipboard</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../forms/sendcoinsentry.ui" line="136"/> + <source>Alt+P</source> + <translation type="unfinished">Alt+P</translation> + </message> + <message> + <location filename="../forms/sendcoinsentry.ui" line="146"/> + <source>Remove this recipient</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../sendcoinsentry.cpp" line="21"/> + <source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source> + <translation type="unfinished">Voer een bitcoin-adres in (bijvoorbeeld: 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation> + </message> +</context> +<context> + <name>TransactionDesc</name> + <message> + <location filename="../transactiondesc.cpp" line="34"/> + <source>Open for %1 blocks</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../transactiondesc.cpp" line="36"/> + <source>Open until %1</source> + <translation type="unfinished">Open tot %1</translation> + </message> + <message> + <location filename="../transactiondesc.cpp" line="42"/> + <source>%1/offline?</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../transactiondesc.cpp" line="44"/> + <source>%1/unconfirmed</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../transactiondesc.cpp" line="46"/> + <source>%1 confirmations</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../transactiondesc.cpp" line="63"/> + <source><b>Status:</b> </source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../transactiondesc.cpp" line="68"/> + <source>, has not been successfully broadcast yet</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../transactiondesc.cpp" line="70"/> + <source>, broadcast through %1 node</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../transactiondesc.cpp" line="72"/> + <source>, broadcast through %1 nodes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../transactiondesc.cpp" line="76"/> + <source><b>Date:</b> </source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../transactiondesc.cpp" line="83"/> + <source><b>Source:</b> Generated<br></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../transactiondesc.cpp" line="89"/> + <location filename="../transactiondesc.cpp" line="106"/> + <source><b>From:</b> </source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../transactiondesc.cpp" line="106"/> + <source>unknown</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../transactiondesc.cpp" line="107"/> + <location filename="../transactiondesc.cpp" line="130"/> + <location filename="../transactiondesc.cpp" line="189"/> + <source><b>To:</b> </source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../transactiondesc.cpp" line="110"/> + <source> (yours, label: </source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../transactiondesc.cpp" line="112"/> + <source> (yours)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../transactiondesc.cpp" line="147"/> + <location filename="../transactiondesc.cpp" line="161"/> + <location filename="../transactiondesc.cpp" line="206"/> + <location filename="../transactiondesc.cpp" line="223"/> + <source><b>Credit:</b> </source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../transactiondesc.cpp" line="149"/> + <source>(%1 matures in %2 more blocks)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../transactiondesc.cpp" line="153"/> + <source>(not accepted)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../transactiondesc.cpp" line="197"/> + <location filename="../transactiondesc.cpp" line="205"/> + <location filename="../transactiondesc.cpp" line="220"/> + <source><b>Debit:</b> </source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../transactiondesc.cpp" line="211"/> + <source><b>Transaction fee:</b> </source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../transactiondesc.cpp" line="227"/> + <source><b>Net amount:</b> </source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../transactiondesc.cpp" line="233"/> + <source>Message:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../transactiondesc.cpp" line="235"/> + <source>Comment:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../transactiondesc.cpp" line="238"/> + <source>Generated coins must wait 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, it will change to "not accepted" and not be spendable. This may occasionally happen if another node generates a block within a few seconds of yours.</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>TransactionDescDialog</name> @@ -769,47 +1339,46 @@ door Thomas Bernard. <context> <name>TransactionTableModel</name> <message> - <location filename="../transactiontablemodel.cpp" line="211"/> <source>Status</source> - <translation>Status</translation> + <translation type="obsolete">Status</translation> </message> <message> - <location filename="../transactiontablemodel.cpp" line="211"/> + <location filename="../transactiontablemodel.cpp" line="213"/> <source>Date</source> <translation>Datum</translation> </message> <message> - <location filename="../transactiontablemodel.cpp" line="211"/> + <location filename="../transactiontablemodel.cpp" line="213"/> <source>Type</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../transactiontablemodel.cpp" line="211"/> + <location filename="../transactiontablemodel.cpp" line="213"/> <source>Address</source> <translation type="unfinished">Adres</translation> </message> <message> - <location filename="../transactiontablemodel.cpp" line="211"/> + <location filename="../transactiontablemodel.cpp" line="213"/> <source>Amount</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../transactiontablemodel.cpp" line="278"/> + <location filename="../transactiontablemodel.cpp" line="280"/> <source>Offline (%1 confirmations)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../transactiontablemodel.cpp" line="281"/> - <source>Unconfirmed (%1/%2 confirmations)</source> + <location filename="../transactiontablemodel.cpp" line="283"/> + <source>Unconfirmed (%1 of %2 confirmations)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../transactiontablemodel.cpp" line="284"/> + <location filename="../transactiontablemodel.cpp" line="286"/> <source>Confirmed (%1 confirmations)</source> <translation type="unfinished"></translation> </message> <message numerus="yes"> - <location filename="../transactiontablemodel.cpp" line="293"/> + <location filename="../transactiontablemodel.cpp" line="295"/> <source>Mined balance will be available in %n more blocks</source> <translation type="unfinished"> <numerusform></numerusform> @@ -817,52 +1386,57 @@ door Thomas Bernard. </translation> </message> <message> - <location filename="../transactiontablemodel.cpp" line="299"/> + <location filename="../transactiontablemodel.cpp" line="301"/> <source>This block was not received by any other nodes and will probably not be accepted!</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../transactiontablemodel.cpp" line="302"/> + <location filename="../transactiontablemodel.cpp" line="304"/> <source>Generated but not accepted</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../transactiontablemodel.cpp" line="348"/> + <location filename="../transactiontablemodel.cpp" line="347"/> <source>Received with</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../transactiontablemodel.cpp" line="351"/> + <location filename="../transactiontablemodel.cpp" line="349"/> <source>Received from IP</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../transactiontablemodel.cpp" line="354"/> + <location filename="../transactiontablemodel.cpp" line="351"/> <source>Sent to</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../transactiontablemodel.cpp" line="357"/> + <location filename="../transactiontablemodel.cpp" line="353"/> <source>Sent to IP</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../transactiontablemodel.cpp" line="363"/> + <location filename="../transactiontablemodel.cpp" line="357"/> <source>Mined</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../transactiontablemodel.cpp" line="582"/> + <location filename="../transactiontablemodel.cpp" line="395"/> + <source>(n/a)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../transactiontablemodel.cpp" line="598"/> <source>Type of transaction.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../transactiontablemodel.cpp" line="584"/> + <location filename="../transactiontablemodel.cpp" line="600"/> <source>Destination address of transaction.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../transactiontablemodel.cpp" line="586"/> + <location filename="../transactiontablemodel.cpp" line="602"/> <source>Amount removed from or added to balance.</source> <translation type="unfinished"></translation> </message> @@ -879,7 +1453,7 @@ door Thomas Bernard. <translation type="obsolete">Credit</translation> </message> <message numerus="yes"> - <location filename="../transactiontablemodel.cpp" line="272"/> + <location filename="../transactiontablemodel.cpp" line="274"/> <source>Open for %n block(s)</source> <translation> <numerusform>Open gedurende %n blok</numerusform> @@ -887,7 +1461,7 @@ door Thomas Bernard. </translation> </message> <message> - <location filename="../transactiontablemodel.cpp" line="275"/> + <location filename="../transactiontablemodel.cpp" line="277"/> <source>Open until %1</source> <translation>Open tot %1</translation> </message> @@ -920,7 +1494,7 @@ door Thomas Bernard. <translation type="obsolete">Verzonden aan IP:</translation> </message> <message> - <location filename="../transactiontablemodel.cpp" line="360"/> + <location filename="../transactiontablemodel.cpp" line="355"/> <source>Payment to yourself</source> <translation>Betaling aan uzelf</translation> </message> @@ -944,12 +1518,12 @@ door Thomas Bernard. <translation type="obsolete">Gegenereerd (niet geaccepteerd)</translation> </message> <message> - <location filename="../transactiontablemodel.cpp" line="578"/> + <location filename="../transactiontablemodel.cpp" line="594"/> <source>Transaction status. Hover over this field to show number of confirmations.</source> <translation>Transactiestatus. Hou de muiscursor boven dit veld om het aantal bevestigingen te laten zien.</translation> </message> <message> - <location filename="../transactiontablemodel.cpp" line="580"/> + <location filename="../transactiontablemodel.cpp" line="596"/> <source>Date and time that the transaction was received.</source> <translation>Datum en tijd waarop deze transactie is ontvangen.</translation> </message> @@ -969,91 +1543,166 @@ door Thomas Bernard. <context> <name>TransactionView</name> <message> - <location filename="../transactionview.cpp" line="39"/> - <location filename="../transactionview.cpp" line="52"/> + <location filename="../transactionview.cpp" line="48"/> + <location filename="../transactionview.cpp" line="61"/> <source>All</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../transactionview.cpp" line="40"/> + <location filename="../transactionview.cpp" line="49"/> <source>Today</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../transactionview.cpp" line="41"/> + <location filename="../transactionview.cpp" line="50"/> <source>This week</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../transactionview.cpp" line="42"/> + <location filename="../transactionview.cpp" line="51"/> <source>This month</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../transactionview.cpp" line="43"/> + <location filename="../transactionview.cpp" line="52"/> <source>Last month</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../transactionview.cpp" line="44"/> + <location filename="../transactionview.cpp" line="53"/> <source>This year</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../transactionview.cpp" line="45"/> + <location filename="../transactionview.cpp" line="54"/> <source>Range...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../transactionview.cpp" line="53"/> + <location filename="../transactionview.cpp" line="62"/> <source>Received with</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../transactionview.cpp" line="55"/> + <location filename="../transactionview.cpp" line="64"/> <source>Sent to</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../transactionview.cpp" line="57"/> + <location filename="../transactionview.cpp" line="66"/> <source>To yourself</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../transactionview.cpp" line="58"/> + <location filename="../transactionview.cpp" line="67"/> <source>Mined</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../transactionview.cpp" line="59"/> + <location filename="../transactionview.cpp" line="68"/> <source>Other</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../transactionview.cpp" line="209"/> + <location filename="../transactionview.cpp" line="74"/> + <source>Enter address or label to search</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../transactionview.cpp" line="80"/> + <source>Min amount</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../transactionview.cpp" line="108"/> + <source>Copy address</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../transactionview.cpp" line="109"/> + <source>Copy label</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../transactionview.cpp" line="110"/> + <source>Edit label</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../transactionview.cpp" line="111"/> + <source>Show details...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../transactionview.cpp" line="244"/> <source>Export Transaction Data</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../transactionview.cpp" line="211"/> + <location filename="../transactionview.cpp" line="246"/> <source>Comma separated file (*.csv)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../transactionview.cpp" line="231"/> + <location filename="../transactionview.cpp" line="254"/> + <source>Confirmed</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../transactionview.cpp" line="255"/> + <source>Date</source> + <translation type="unfinished">Datum</translation> + </message> + <message> + <location filename="../transactionview.cpp" line="256"/> + <source>Type</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../transactionview.cpp" line="257"/> + <source>Label</source> + <translation type="unfinished">Label</translation> + </message> + <message> + <location filename="../transactionview.cpp" line="258"/> + <source>Address</source> + <translation type="unfinished">Adres</translation> + </message> + <message> + <location filename="../transactionview.cpp" line="259"/> + <source>Amount</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../transactionview.cpp" line="260"/> + <source>ID</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../transactionview.cpp" line="264"/> <source>Error exporting</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../transactionview.cpp" line="231"/> + <location filename="../transactionview.cpp" line="264"/> <source>Could not write to file %1.</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../transactionview.cpp" line="352"/> + <source>Range:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../transactionview.cpp" line="360"/> + <source>to</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>WalletModel</name> <message> - <location filename="../walletmodel.cpp" line="95"/> + <location filename="../walletmodel.cpp" line="144"/> <source>Sending...</source> <translation type="unfinished">Versturen...</translation> </message> @@ -1323,119 +1972,719 @@ SSL opties: (zie de Bitcoin wiki voor SSL instructies) </message> <message> <location filename="../bitcoinstrings.cpp" line="47"/> + <source>Loading addresses...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="48"/> <source>Error loading addr.dat </source> <translation>Fout bij laden van bestand addr.dat </translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="48"/> + <location filename="../bitcoinstrings.cpp" line="49"/> + <source>Loading block index...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="50"/> <source>Error loading blkindex.dat </source> <translation>Fout bij laden van bestand addr.dat </translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="49"/> + <location filename="../bitcoinstrings.cpp" line="51"/> + <source>Loading wallet...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="52"/> + <source>Error loading wallet.dat: Wallet corrupted +</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="53"/> + <source>Error loading wallet.dat: Wallet requires newer version of Bitcoin +</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="55"/> <source>Error loading wallet.dat </source> <translation>Fout bij laden van bestand wallet.dat </translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="50"/> + <location filename="../bitcoinstrings.cpp" line="56"/> + <source>Rescanning...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="57"/> + <source>Done loading</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="58"/> <source>Invalid -proxy address</source> <translation>Foutief -proxy adres</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="51"/> + <location filename="../bitcoinstrings.cpp" line="59"/> <source>Invalid amount for -paytxfee=<amount></source> <translation>Ongeldig bedrag voor -paytxfee=<bedrag></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="52"/> + <location filename="../bitcoinstrings.cpp" line="60"/> <source>Warning: -paytxfee is set very high. This is the transaction fee you will pay if you send a transaction.</source> <translation>Waarschuwing: -paytxfee is zeer hoog ingesteld. Dit is de fooi die betaald wordt bij het zenden van een transactie.</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="55"/> + <location filename="../bitcoinstrings.cpp" line="63"/> + <source>Error: CreateThread(StartNode) failed</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="64"/> <source>Warning: Disk space is low </source> <translation>Waarschuwing: Weinig schijfruimte over </translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="56"/> + <location filename="../bitcoinstrings.cpp" line="68"/> + <source>This transaction is over the size limit. You can still send it for a fee of %s, 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> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="72"/> + <source>Enter the current passphrase to the wallet.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="73"/> + <source>Passphrase</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="74"/> + <source>Please supply the current wallet decryption passphrase.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="75"/> + <source>The passphrase entered for the wallet decryption was incorrect.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="76"/> + <source>Status</source> + <translation type="unfinished">Status</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="77"/> + <source>Date</source> + <translation type="unfinished">Datum</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="78"/> + <source>Description</source> + <translation type="unfinished">Beschrijving</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="79"/> + <source>Debit</source> + <translation type="unfinished">Debet</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="80"/> + <source>Credit</source> + <translation type="unfinished">Credit</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="81"/> + <source>Open for %d blocks</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="82"/> + <source>Open until %s</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="83"/> + <source>%d/offline?</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="84"/> + <source>%d/unconfirmed</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="85"/> + <source>%d confirmations</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="86"/> + <source>Generated</source> + <translation type="unfinished">Gegenereerd</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="87"/> + <source>Generated (%s matures in %d more blocks)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="88"/> + <source>Generated - Warning: This block was not received by any other nodes and will probably not be accepted!</source> + <translation type="unfinished">Gegenereerd - Waarschuwing: Dit blok is niet ontvangen door andere nodes en zal waarschijnlijk niet geaccepteerd worden!</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="91"/> + <source>Generated (not accepted)</source> + <translation type="unfinished">Gegenereerd (niet geaccepteerd)</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="92"/> + <source>From: </source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="93"/> + <source>Received with: </source> + <translation type="unfinished">Ontvangen met:</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="94"/> + <source>Payment to yourself</source> + <translation type="unfinished">Betaling aan uzelf</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="95"/> + <source>To: </source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="96"/> + <source> Generating</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="97"/> + <source>(not connected)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="98"/> + <source> %d connections %d blocks %d transactions</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="99"/> + <source>Wallet already encrypted.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="100"/> + <source>Enter the new passphrase to the wallet. +Please use a passphrase of 10 or more random characters, or eight or more words.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="104"/> + <source>Error: The supplied passphrase was too short.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="105"/> + <source>WARNING: If you encrypt your wallet and lose your passphrase, you will LOSE ALL OF YOUR BITCOINS! +Are you sure you wish to encrypt your wallet?</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="109"/> + <source>Please re-enter your new wallet passphrase.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="110"/> + <source>Error: the supplied passphrases didn't match.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="111"/> + <source>Wallet encryption failed.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="112"/> + <source>Wallet Encrypted. +Remember that encrypting your wallet cannot fully protect your bitcoins from being stolen by malware infecting your computer.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="116"/> + <source>Wallet is unencrypted, please encrypt it first.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="117"/> + <source>Enter the new passphrase for the wallet.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="118"/> + <source>Re-enter the new passphrase for the wallet.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="119"/> + <source>Wallet Passphrase Changed.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="120"/> + <source>New Receiving Address</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="121"/> + <source>You should use a new address for each payment you receive. + +Label</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="125"/> + <source><b>Status:</b> </source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="126"/> + <source>, has not been successfully broadcast yet</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="127"/> + <source>, broadcast through %d node</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="128"/> + <source>, broadcast through %d nodes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="129"/> + <source><b>Date:</b> </source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="130"/> + <source><b>Source:</b> Generated<br></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="131"/> + <source><b>From:</b> </source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="132"/> + <source>unknown</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="133"/> + <source><b>To:</b> </source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="134"/> + <source> (yours, label: </source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="135"/> + <source> (yours)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="136"/> + <source><b>Credit:</b> </source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="137"/> + <source>(%s matures in %d more blocks)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="138"/> + <source>(not accepted)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="139"/> + <source><b>Debit:</b> </source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="140"/> + <source><b>Transaction fee:</b> </source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="141"/> + <source><b>Net amount:</b> </source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="142"/> + <source>Message:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="143"/> + <source>Comment:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="144"/> + <source>Generated coins must wait 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, it will change to "not accepted" and not be spendable. This may occasionally happen if another node generates a block within a few seconds of yours.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="150"/> + <source>Cannot write autostart/bitcoin.desktop file</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="151"/> + <source>Main</source> + <translation type="unfinished">Algemeen</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="152"/> + <source>&Start Bitcoin on window system startup</source> + <translation type="unfinished">&Start Bitcoin wanneer het systeem opstart</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="153"/> + <source>&Minimize on close</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="154"/> + <source>version %s</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="155"/> + <source>Error in amount </source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="156"/> + <source>Send Coins</source> + <translation type="unfinished">Verstuur coins</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="157"/> + <source>Amount exceeds your balance </source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="158"/> + <source>Total exceeds your balance when the </source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="159"/> + <source> transaction fee is included </source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="160"/> + <source>Payment sent </source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="162"/> + <source>Invalid address </source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="163"/> + <source>Sending %s to %s</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="164"/> + <source>CANCELLED</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="165"/> + <source>Cancelled</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="166"/> + <source>Transfer cancelled </source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="167"/> + <source>Error: </source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="169"/> + <source>Connecting...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="170"/> + <source>Unable to connect</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="171"/> + <source>Requesting public key...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="172"/> + <source>Received public key...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="173"/> + <source>Recipient is not accepting transactions sent by IP address</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="174"/> + <source>Transfer was not accepted</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="175"/> + <source>Invalid response received</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="176"/> + <source>Creating transaction...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="177"/> + <source>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> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="180"/> + <source>Transaction creation failed</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="181"/> + <source>Transaction aborted</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="182"/> + <source>Lost connection, transaction cancelled</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="183"/> + <source>Sending payment...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="184"/> + <source>The transaction was rejected. This might happen if some of the coins in your wallet were already spent, such as if you used a copy of wallet.dat and coins were spent in the copy but not marked as spent here.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="188"/> + <source>Waiting for confirmation...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="189"/> + <source>The payment was sent, but the recipient was unable to verify it. +The transaction is recorded and will credit to the recipient, +but the comment information will be blank.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="193"/> + <source>Payment was sent, but an invalid response was received</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="194"/> + <source>Payment completed</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="195"/> + <source>Name</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="196"/> + <source>Address</source> + <translation type="unfinished">Adres</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="197"/> + <source>Label</source> + <translation type="unfinished">Label</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="198"/> + <source>Bitcoin Address</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="199"/> + <source>This is one of your own addresses for receiving payments and cannot be entered in the address book. </source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="202"/> + <source>Edit Address</source> + <translation type="unfinished">Bewerk Adres</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="203"/> + <source>Edit Address Label</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="204"/> + <source>Add Address</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="205"/> + <source>Bitcoin</source> + <translation type="unfinished">Bitcoin</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="206"/> + <source>Bitcoin - Generating</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="207"/> + <source>Bitcoin - (not connected)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="208"/> + <source>&Open Bitcoin</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="209"/> + <source>&Send Bitcoins</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="210"/> + <source>O&ptions...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="211"/> + <source>E&xit</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="212"/> + <source>Program has crashed and will terminate. </source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="216"/> + <source>beta</source> + <translation type="unfinished"></translation> + </message> + <message> <source>Error: This transaction requires a transaction fee of at least %s because of its amount, complexity, or use of recently received funds </source> - <translation>Fout: Deze transactie vergt een fooi van ten minste %s omwille van zijn bedrag, complexiteit, of gebruik van recent ontvangen coins </translation> + <translation type="obsolete">Fout: Deze transactie vergt een fooi van ten minste %s omwille van zijn bedrag, complexiteit, of gebruik van recent ontvangen coins </translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="59"/> <source>Error: Transaction creation failed </source> - <translation>Fout: Aanmaken van transactie mislukt </translation> + <translation type="obsolete">Fout: Aanmaken van transactie mislukt </translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="60"/> + <location filename="../bitcoinstrings.cpp" line="161"/> <source>Sending...</source> <translation>Versturen...</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="61"/> <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 is afgekeurd. Dit kan gebeuren als bepaalde coins in je Portefeuille al zijn uitgegeven. Dit kan veroorzaakt worden doordat je een kopie van wallet.dat gebruikt hebt en enkel daar je uitgave geregistreerd is.</translation> + <translation type="obsolete">Fout: De transactie is afgekeurd. Dit kan gebeuren als bepaalde coins in je Portefeuille al zijn uitgegeven. Dit kan veroorzaakt worden doordat je een kopie van wallet.dat gebruikt hebt en enkel daar je uitgave geregistreerd is.</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="65"/> <source>Invalid amount</source> - <translation>Foutieve hoeveelheid</translation> + <translation type="obsolete">Foutieve hoeveelheid</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="66"/> + <location filename="../bitcoinstrings.cpp" line="168"/> <source>Insufficient funds</source> <translation>Onvoldoende saldo</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="67"/> <source>Invalid bitcoin address</source> - <translation>Foutief bitcoin-adres</translation> + <translation type="obsolete">Foutief bitcoin-adres</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="68"/> + <location filename="../bitcoinstrings.cpp" line="65"/> <source>Unable to bind to port %d on this computer. Bitcoin is probably already running.</source> <translation>Kan niet binden met poort %d op deze computer. Bitcoin draait vermoedelijk reeds.</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="71"/> <source>To use the %s option</source> - <translation>Om de %s optie te gebruiken</translation> + <translation type="obsolete">Om de %s optie te gebruiken</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="72"/> <source>Warning: %s, 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>Waarschuwing: %s, rpcpassword=<password> moet ingesteld zijn + <translation type="obsolete">Waarschuwing: %s, rpcpassword=<password> moet ingesteld zijn in het configuratie bestand: %s Als het bestand nog niet bestaat, maak het dan aan met enkel-leesbaar-door-eigenaar rechten. </translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="77"/> <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>rpcpassword=<password> moet ingesteld in het configuratie bestand: + <translation type="obsolete">rpcpassword=<password> moet ingesteld in het configuratie bestand: %s Als het bestand nog niet bestaat, maak het dan aan met enkel-leesbaar-door-eigenaar rechten.</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="82"/> + <location filename="../bitcoinstrings.cpp" line="213"/> <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>Waarschuwing: Controleer of uw computers datum en tijd correct ingesteld zijn. Als uw klok fout staat zal Bitcoin niet correct werken.</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="85"/> <source>-beta</source> - <translation>-beta</translation> + <translation type="obsolete">-beta</translation> </message> </context> </TS> diff --git a/src/qt/locale/bitcoin_ru.ts b/src/qt/locale/bitcoin_ru.ts index 6085602f9c..ea32d95607 100644 --- a/src/qt/locale/bitcoin_ru.ts +++ b/src/qt/locale/bitcoin_ru.ts @@ -1,6 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <!DOCTYPE TS> <TS version="2.0" language="ru_RU"> +<defaultcodec>UTF-8</defaultcodec> <context> <name>AboutDialog</name> <message> @@ -13,7 +14,7 @@ <source><b>Bitcoin</b> version</source> <translation>Версия Bitcoin'а</translation> </message> - <message utf8="true"> + <message> <location filename="../forms/aboutdialog.ui" line="85"/> <source>Copyright © 2009-2011 Bitcoin Developers @@ -102,170 +103,326 @@ This product includes software developed by the OpenSSL Project for use in the O <context> <name>AddressTableModel</name> <message> - <location filename="../addresstablemodel.cpp" line="78"/> + <location filename="../addresstablemodel.cpp" line="77"/> <source>Label</source> <translation>Метка</translation> </message> <message> - <location filename="../addresstablemodel.cpp" line="78"/> + <location filename="../addresstablemodel.cpp" line="77"/> <source>Address</source> <translation>Адрес</translation> </message> <message> - <location filename="../addresstablemodel.cpp" line="114"/> + <location filename="../addresstablemodel.cpp" line="113"/> <source>(no label)</source> <translation>[нет метки]</translation> </message> </context> <context> + <name>AskPassphraseDialog</name> + <message> + <location filename="../forms/askpassphrasedialog.ui" line="26"/> + <source>Dialog</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../forms/askpassphrasedialog.ui" line="32"/> + <source>TextLabel</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../forms/askpassphrasedialog.ui" line="47"/> + <source>Enter passphrase</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../forms/askpassphrasedialog.ui" line="61"/> + <source>New passphrase</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../forms/askpassphrasedialog.ui" line="75"/> + <source>Repeat new passphrase</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../askpassphrasedialog.cpp" line="26"/> + <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 type="unfinished"></translation> + </message> + <message> + <location filename="../askpassphrasedialog.cpp" line="27"/> + <source>Encrypt wallet</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../askpassphrasedialog.cpp" line="30"/> + <source>This operation needs your wallet passphrase to unlock the wallet.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../askpassphrasedialog.cpp" line="35"/> + <source>Unlock wallet</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../askpassphrasedialog.cpp" line="38"/> + <source>This operation needs your wallet passphrase to decrypt the wallet.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../askpassphrasedialog.cpp" line="43"/> + <source>Decrypt wallet</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../askpassphrasedialog.cpp" line="46"/> + <source>Change passphrase</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../askpassphrasedialog.cpp" line="47"/> + <source>Enter the old and new passphrase to the wallet.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../askpassphrasedialog.cpp" line="91"/> + <source>Confirm wallet encryption</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../askpassphrasedialog.cpp" line="92"/> + <source>WARNING: If you encrypt your wallet and lose your passphrase, you will <b>LOSE ALL OF YOUR BITCOINS</b>! +Are you sure you wish to encrypt your wallet?</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../askpassphrasedialog.cpp" line="101"/> + <location filename="../askpassphrasedialog.cpp" line="149"/> + <source>Wallet encrypted</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../askpassphrasedialog.cpp" line="102"/> + <source>Remember that encrypting your wallet cannot fully protect your bitcoins from being stolen by malware infecting your computer.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../askpassphrasedialog.cpp" line="106"/> + <location filename="../askpassphrasedialog.cpp" line="113"/> + <location filename="../askpassphrasedialog.cpp" line="155"/> + <location filename="../askpassphrasedialog.cpp" line="161"/> + <source>Wallet encryption failed</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../askpassphrasedialog.cpp" line="107"/> + <source>Wallet encryption failed due to an internal error. Your wallet was not encrypted.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../askpassphrasedialog.cpp" line="114"/> + <location filename="../askpassphrasedialog.cpp" line="162"/> + <source>The supplied passphrases do not match.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../askpassphrasedialog.cpp" line="125"/> + <source>Wallet unlock failed</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../askpassphrasedialog.cpp" line="126"/> + <location filename="../askpassphrasedialog.cpp" line="137"/> + <location filename="../askpassphrasedialog.cpp" line="156"/> + <source>The passphrase entered for the wallet decryption was incorrect.</source> + <translation type="unfinished">Указанный пароль не подходит.</translation> + </message> + <message> + <location filename="../askpassphrasedialog.cpp" line="136"/> + <source>Wallet decryption failed</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../askpassphrasedialog.cpp" line="150"/> + <source>Wallet passphrase was succesfully changed.</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> <name>BitcoinGUI</name> <message> - <location filename="../bitcoingui.cpp" line="53"/> + <location filename="../bitcoingui.cpp" line="59"/> <source>Bitcoin Wallet</source> <translation>Bitcoin-бумажник</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="61"/> + <location filename="../bitcoingui.cpp" line="67"/> <source>&File</source> <translation>&Файл</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="67"/> + <location filename="../bitcoingui.cpp" line="73"/> <source>&Settings</source> <translation>&Настройки</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="70"/> + <location filename="../bitcoingui.cpp" line="79"/> <source>&Help</source> <translation>&Помощь</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="74"/> + <location filename="../bitcoingui.cpp" line="83"/> <source>Tabs toolbar</source> <translation>Панель вкладок</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="82"/> + <location filename="../bitcoingui.cpp" line="91"/> <source>Actions toolbar</source> <translation>Панель действий</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="130"/> + <location filename="../bitcoingui.cpp" line="142"/> <source>Synchronizing with network...</source> <translation>Синхронизация с сетью...</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="133"/> + <location filename="../bitcoingui.cpp" line="145"/> <source>Block chain synchronization in progress</source> <translation>Идёт синхронизация цепочки блоков</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="157"/> + <location filename="../bitcoingui.cpp" line="169"/> <source>&Overview</source> <translation>О&бзор</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="158"/> + <location filename="../bitcoingui.cpp" line="170"/> <source>Show general overview of wallet</source> <translation>Показать общий обзор действий с бумажником</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="162"/> + <location filename="../bitcoingui.cpp" line="174"/> <source>&Transactions</source> <translation>&Транзакции</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="163"/> + <location filename="../bitcoingui.cpp" line="175"/> <source>Browse transaction history</source> <translation>Показать историю транзакций</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="167"/> + <location filename="../bitcoingui.cpp" line="179"/> <source>&Address Book</source> <translation>&Адресная книга</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="168"/> + <location filename="../bitcoingui.cpp" line="180"/> <source>Edit the list of stored addresses and labels</source> <translation>Изменить список сохранённых адресов и меток к ним</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="172"/> + <location filename="../bitcoingui.cpp" line="184"/> <source>&Receive coins</source> <translation>&Получение</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="173"/> + <location filename="../bitcoingui.cpp" line="185"/> <source>Show the list of addresses for receiving payments</source> <translation>Показать список адресов для получения платежей</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="177"/> + <location filename="../bitcoingui.cpp" line="189"/> <source>&Send coins</source> <translation>Отп&равка</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="178"/> + <location filename="../bitcoingui.cpp" line="190"/> <source>Send coins to a bitcoin address</source> <translation>Отправить монеты на указанный адрес</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="188"/> + <location filename="../bitcoingui.cpp" line="200"/> <source>&Exit</source> <translation>Вы&ход</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="189"/> + <location filename="../bitcoingui.cpp" line="201"/> <source>Quit application</source> <translation>Закрыть приложение</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="190"/> + <location filename="../bitcoingui.cpp" line="202"/> <source>&About</source> <translation>&Информация</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="191"/> + <location filename="../bitcoingui.cpp" line="203"/> <source>Show information about Bitcoin</source> <translation>Показать информацию о Bitcoin'е</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="192"/> + <location filename="../bitcoingui.cpp" line="204"/> <source>&Options...</source> <translation>Оп&ции...</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="193"/> + <location filename="../bitcoingui.cpp" line="205"/> <source>Modify configuration options for bitcoin</source> <translation>Изменить настройки</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="194"/> + <location filename="../bitcoingui.cpp" line="206"/> <source>Open &Bitcoin</source> <translation>&Показать бумажник</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="195"/> + <location filename="../bitcoingui.cpp" line="207"/> <source>Show the Bitcoin window</source> <translation>Показать окно бумажника</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="196"/> + <location filename="../bitcoingui.cpp" line="208"/> <source>&Export...</source> <translation>&Экспорт...</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="197"/> + <location filename="../bitcoingui.cpp" line="209"/> <source>Export the current view to a file</source> <translation>Экспортировать в файл</translation> </message> <message> + <location filename="../bitcoingui.cpp" line="210"/> + <source>&Encrypt Wallet</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../bitcoingui.cpp" line="211"/> + <source>Encrypt or decrypt wallet</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../bitcoingui.cpp" line="213"/> + <source>&Change Passphrase</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../bitcoingui.cpp" line="214"/> + <source>Change the passphrase used for wallet encryption</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../bitcoingui.cpp" line="230"/> <source>[testnet]</source> <translation>[тестовая сеть]</translation> </message> + <message> + <location filename="../bitcoingui.cpp" line="293"/> + <source>bitcoin-qt</source> + <translation type="unfinished"></translation> + </message> <message numerus="yes"> - <location filename="../bitcoingui.cpp" line="304"/> + <location filename="../bitcoingui.cpp" line="332"/> <source>%n active connection(s) to Bitcoin network</source> <translation> <numerusform>%n активное соединение с сетью</numerusform> @@ -274,17 +431,17 @@ This product includes software developed by the OpenSSL Project for use in the O </translation> </message> <message> - <location filename="../bitcoingui.cpp" line="318"/> + <location filename="../bitcoingui.cpp" line="347"/> <source>Downloaded %1 of %2 blocks of transaction history.</source> <translation>Загружено %1 из %2 блоков истории транзакций.</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="324"/> + <location filename="../bitcoingui.cpp" line="353"/> <source>Downloaded %1 blocks of transaction history.</source> <translation>Загружено %1 блоков истории транзакций.</translation> </message> <message numerus="yes"> - <location filename="../bitcoingui.cpp" line="335"/> + <location filename="../bitcoingui.cpp" line="364"/> <source>%n second(s) ago</source> <translation> <numerusform>%n секунду назад</numerusform> @@ -293,7 +450,7 @@ This product includes software developed by the OpenSSL Project for use in the O </translation> </message> <message numerus="yes"> - <location filename="../bitcoingui.cpp" line="339"/> + <location filename="../bitcoingui.cpp" line="368"/> <source>%n minute(s) ago</source> <translation> <numerusform>%n минуту назад</numerusform> @@ -302,7 +459,7 @@ This product includes software developed by the OpenSSL Project for use in the O </translation> </message> <message numerus="yes"> - <location filename="../bitcoingui.cpp" line="343"/> + <location filename="../bitcoingui.cpp" line="372"/> <source>%n hour(s) ago</source> <translation> <numerusform>%n час назад</numerusform> @@ -311,7 +468,7 @@ This product includes software developed by the OpenSSL Project for use in the O </translation> </message> <message numerus="yes"> - <location filename="../bitcoingui.cpp" line="347"/> + <location filename="../bitcoingui.cpp" line="376"/> <source>%n day(s) ago</source> <translation> <numerusform>%n день назад</numerusform> @@ -320,75 +477,90 @@ This product includes software developed by the OpenSSL Project for use in the O </translation> </message> <message> - <location filename="../bitcoingui.cpp" line="353"/> + <location filename="../bitcoingui.cpp" line="382"/> <source>Up to date</source> <translation>Синхронизированно</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="358"/> + <location filename="../bitcoingui.cpp" line="387"/> <source>Catching up...</source> <translation>Синхронизируется...</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="364"/> + <location filename="../bitcoingui.cpp" line="393"/> <source>Last received block was generated %1.</source> <translation>Последний полученный блок был сгенерирован %1.</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="421"/> + <location filename="../bitcoingui.cpp" line="440"/> <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 filename="../bitcoingui.cpp" line="426"/> + <location filename="../bitcoingui.cpp" line="445"/> <source>Sending...</source> <translation>Отправка...</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="449"/> + <location filename="../bitcoingui.cpp" line="470"/> <source>Sent transaction</source> <translation>Исходящая транзакция</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="450"/> + <location filename="../bitcoingui.cpp" line="471"/> <source>Incoming transaction</source> <translation>Входящая транзакция</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="451"/> + <location filename="../bitcoingui.cpp" line="472"/> + <source>Date: %1 +Amount: %2 +Type: %3 +Address: %4 +</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../bitcoingui.cpp" line="566"/> + <source>Wallet is <b>encrypted</b> and currently <b>unlocked</b></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../bitcoingui.cpp" line="574"/> + <source>Wallet is <b>encrypted</b> and currently <b>locked</b></source> + <translation type="unfinished"></translation> + </message> + <message> <source>Date: </source> - <translation>Дата: </translation> + <translation type="obsolete">Дата: </translation> </message> <message> - <location filename="../bitcoingui.cpp" line="452"/> <source>Amount: </source> - <translation>Количество: </translation> + <translation type="obsolete">Количество: </translation> </message> <message> - <location filename="../bitcoingui.cpp" line="453"/> <source>Type: </source> - <translation>Тип: </translation> + <translation type="obsolete">Тип: </translation> </message> <message> - <location filename="../bitcoingui.cpp" line="454"/> <source>Address: </source> - <translation>Адрес: </translation> + <translation type="obsolete">Адрес: </translation> </message> </context> <context> <name>DisplayOptionsPage</name> <message> - <location filename="../optionsdialog.cpp" line="254"/> + <location filename="../optionsdialog.cpp" line="258"/> <source>&Unit to show amounts in: </source> <translation>&Измерять монеты в: </translation> </message> <message> - <location filename="../optionsdialog.cpp" line="258"/> + <location filename="../optionsdialog.cpp" line="262"/> <source>Choose the default subdivision unit to show in the interface, and when sending coins</source> <translation>Единица измерения количества монет при отображении и при отправке</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="265"/> + <location filename="../optionsdialog.cpp" line="269"/> <source>Display addresses in transaction list</source> <translation>Показывать адреса в списке транзакций</translation> </message> @@ -450,91 +622,101 @@ This product includes software developed by the OpenSSL Project for use in the O <source>The entered address "%1" is not a valid bitcoin address.</source> <translation>Введённый адрес «%1» не является правильным Bitcoin-адресом.</translation> </message> + <message> + <location filename="../editaddressdialog.cpp" line="97"/> + <source>Could not unlock wallet.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../editaddressdialog.cpp" line="102"/> + <source>New key generation failed.</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>MainOptionsPage</name> <message> - <location filename="../optionsdialog.cpp" line="162"/> + <location filename="../optionsdialog.cpp" line="166"/> <source>&Start Bitcoin on window system startup</source> <translation>&Запускать бумажник при входе в систему</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="163"/> + <location filename="../optionsdialog.cpp" line="167"/> <source>Automatically start Bitcoin after the computer is turned on</source> <translation>Автоматически запускать бумажник, когда включается компьютер</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="166"/> + <location filename="../optionsdialog.cpp" line="170"/> <source>&Minimize to the tray instead of the taskbar</source> <translation>&Cворачивать в системный лоток вместо панели задач</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="167"/> + <location filename="../optionsdialog.cpp" line="171"/> <source>Show only a tray icon after minimizing the window</source> <translation>Показывать только иконку в системном лотке при сворачивании окна</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="170"/> + <location filename="../optionsdialog.cpp" line="174"/> <source>Map port using &UPnP</source> <translation>Пробросить порт через &UPnP</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="171"/> + <location filename="../optionsdialog.cpp" line="175"/> <source>Automatically open the Bitcoin client port on the router. This only works when your router supports UPnP and it is enabled.</source> <translation>Автоматически открыть порт для Bitcoin-клиента на роутере. Работает ТОЛЬКО если Ваш роутер поддерживает UPnP и данная функция включена.</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="174"/> + <location filename="../optionsdialog.cpp" line="178"/> <source>M&inimize on close</source> <translation>С&ворачивать вместо закрытия</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="175"/> + <location filename="../optionsdialog.cpp" line="179"/> <source>Minimize instead of exit the application when the window is closed. When this option is enabled, the application will be closed only after selecting Quit in the menu.</source> <translation>Сворачивать вместо закрытия. Если данная опция будет выбрана — приложение закроется только после выбора соответствующего пункта в меню.</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="178"/> + <location filename="../optionsdialog.cpp" line="182"/> <source>&Connect through SOCKS4 proxy:</source> <translation>&Подключаться через SOCKS4 прокси:</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="179"/> + <location filename="../optionsdialog.cpp" line="183"/> <source>Connect to the Bitcon network through a SOCKS4 proxy (e.g. when connecting through Tor)</source> <translation>Подключаться к сети Bitcoin через SOCKS4 прокси (например, при использовании Tor)</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="184"/> + <location filename="../optionsdialog.cpp" line="188"/> <source>Proxy &IP: </source> <translation>&IP Прокси: </translation> </message> <message> - <location filename="../optionsdialog.cpp" line="190"/> + <location filename="../optionsdialog.cpp" line="194"/> <source>IP address of the proxy (e.g. 127.0.0.1)</source> <translation>IP-адрес прокси (например 127.0.0.1)</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="193"/> + <location filename="../optionsdialog.cpp" line="197"/> <source>&Port: </source> <translation>По&рт: </translation> </message> <message> - <location filename="../optionsdialog.cpp" line="199"/> + <location filename="../optionsdialog.cpp" line="203"/> <source>Port of the proxy (e.g. 1234)</source> <translation>Порт прокси-сервера (например 1234)</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="205"/> + <location filename="../optionsdialog.cpp" line="209"/> <source>Optional transaction fee per KB that helps make sure your transactions are processed quickly. Most transactions are 1KB. Fee 0.01 recommended.</source> <translation>Опциональная комиссия за кадый KB транзакции, которое позволяет быть уверенным, что Ваша транзакция будет обработана быстро. Большинство транщакций занимают 1 KB. Рекомендованная комиссия: 0.01 BTC.</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="211"/> + <location filename="../optionsdialog.cpp" line="215"/> <source>Pay transaction &fee</source> <translation>Добавлять ко&миссию</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="214"/> + <location filename="../optionsdialog.cpp" line="218"/> <source>Optional transaction fee per KB that helps make sure your transactions are processed quickly. Most transactions are 1KB. Fee 0.01 recommended.</source> <translation>Опциональная комиссия за кадый KB транзакции, которая позволяет быть уверенным, что Ваша транзакция будет обработана быстро. Большинство транзакций занимают 1 KB. Рекомендованная комиссия: 0.01 BTC.</translation> </message> @@ -542,17 +724,17 @@ This product includes software developed by the OpenSSL Project for use in the O <context> <name>OptionsDialog</name> <message> - <location filename="../optionsdialog.cpp" line="71"/> + <location filename="../optionsdialog.cpp" line="75"/> <source>Main</source> <translation>Основное</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="76"/> + <location filename="../optionsdialog.cpp" line="80"/> <source>Display</source> <translation>Отображение</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="96"/> + <location filename="../optionsdialog.cpp" line="100"/> <source>Options</source> <translation>Опции</translation> </message> @@ -613,17 +795,17 @@ p, li { white-space: pre-wrap; } <translation><b>Последние транзакции</b></translation> </message> <message> - <location filename="../overviewpage.cpp" line="102"/> + <location filename="../overviewpage.cpp" line="103"/> <source>Your current balance</source> <translation>Ваш текущий баланс</translation> </message> <message> - <location filename="../overviewpage.cpp" line="107"/> + <location filename="../overviewpage.cpp" line="108"/> <source>Total of transactions that have yet to be confirmed, and do not yet count toward the current balance</source> <translation>Общая сумма всех транзакций, которые до сих пор не подтверждены, и до сих пор не учитываются в текущем балансе</translation> </message> <message> - <location filename="../overviewpage.cpp" line="110"/> + <location filename="../overviewpage.cpp" line="111"/> <source>Total number of transactions in wallet</source> <translation>Общая количество транзакций в Вашем бумажнике</translation> </message> @@ -632,13 +814,13 @@ p, li { white-space: pre-wrap; } <name>SendCoinsDialog</name> <message> <location filename="../forms/sendcoinsdialog.ui" line="14"/> - <location filename="../sendcoinsdialog.cpp" line="91"/> - <location filename="../sendcoinsdialog.cpp" line="96"/> - <location filename="../sendcoinsdialog.cpp" line="101"/> - <location filename="../sendcoinsdialog.cpp" line="106"/> - <location filename="../sendcoinsdialog.cpp" line="112"/> - <location filename="../sendcoinsdialog.cpp" line="117"/> - <location filename="../sendcoinsdialog.cpp" line="123"/> + <location filename="../sendcoinsdialog.cpp" line="103"/> + <location filename="../sendcoinsdialog.cpp" line="108"/> + <location filename="../sendcoinsdialog.cpp" line="113"/> + <location filename="../sendcoinsdialog.cpp" line="118"/> + <location filename="../sendcoinsdialog.cpp" line="124"/> + <location filename="../sendcoinsdialog.cpp" line="129"/> + <location filename="../sendcoinsdialog.cpp" line="134"/> <source>Send Coins</source> <translation>Отправка</translation> </message> @@ -653,67 +835,82 @@ p, li { white-space: pre-wrap; } <translation>&Добавить получателя...</translation> </message> <message> - <location filename="../forms/sendcoinsdialog.ui" line="100"/> + <location filename="../forms/sendcoinsdialog.ui" line="87"/> + <source>Clear all</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../forms/sendcoinsdialog.ui" line="106"/> + <source>Balance:</source> + <translation type="unfinished">Баланс:</translation> + </message> + <message> + <location filename="../forms/sendcoinsdialog.ui" line="113"/> + <source>123.456 BTC</source> + <translation type="unfinished">123.456 BTC</translation> + </message> + <message> + <location filename="../forms/sendcoinsdialog.ui" line="144"/> <source>Confirm the send action</source> <translation>Подтвердить отправку</translation> </message> <message> - <location filename="../forms/sendcoinsdialog.ui" line="103"/> + <location filename="../forms/sendcoinsdialog.ui" line="147"/> <source>&Send</source> <translation>&Отправить</translation> </message> <message> - <location filename="../sendcoinsdialog.cpp" line="74"/> + <location filename="../sendcoinsdialog.cpp" line="79"/> <source><b>%1</b> to %2 (%3)</source> <translation><b>%1</b> адресату %2 (%3)</translation> </message> <message> - <location filename="../sendcoinsdialog.cpp" line="77"/> + <location filename="../sendcoinsdialog.cpp" line="82"/> <source>Confirm send coins</source> <translation>Подтвердите отправку монет</translation> </message> <message> - <location filename="../sendcoinsdialog.cpp" line="78"/> + <location filename="../sendcoinsdialog.cpp" line="83"/> <source>Are you sure you want to send %1?</source> <translation>Вы уверены, что хотите отправить %1?</translation> </message> <message> - <location filename="../sendcoinsdialog.cpp" line="78"/> + <location filename="../sendcoinsdialog.cpp" line="83"/> <source> and </source> <translation> и </translation> </message> <message> - <location filename="../sendcoinsdialog.cpp" line="92"/> + <location filename="../sendcoinsdialog.cpp" line="104"/> <source>The recepient address is not valid, please recheck.</source> <translation>Адрес получателя неверный, пожалуйста, перепроверьте.</translation> </message> <message> - <location filename="../sendcoinsdialog.cpp" line="97"/> + <location filename="../sendcoinsdialog.cpp" line="109"/> <source>The amount to pay must be larger than 0.</source> <translation>Количество монет для отправки должно быть больше 0.</translation> </message> <message> - <location filename="../sendcoinsdialog.cpp" line="102"/> + <location filename="../sendcoinsdialog.cpp" line="114"/> <source>Amount exceeds your balance</source> <translation>Количество отправляемых монет превышает Ваш баланс</translation> </message> <message> - <location filename="../sendcoinsdialog.cpp" line="107"/> + <location filename="../sendcoinsdialog.cpp" line="119"/> <source>Total exceeds your balance when the %1 transaction fee is included</source> <translation>Сумма превысит Ваш баланс, если комиссия в %1 будет добавлена к транзакции</translation> </message> <message> - <location filename="../sendcoinsdialog.cpp" line="113"/> + <location filename="../sendcoinsdialog.cpp" line="125"/> <source>Duplicate address found, can only send to each address once in one send operation</source> <translation>Обнаружен дублирующийся адрес. Отправка на один и тот же адрес возможна только один раз за одну операцию отправки</translation> </message> <message> - <location filename="../sendcoinsdialog.cpp" line="118"/> + <location filename="../sendcoinsdialog.cpp" line="130"/> <source>Error: Transaction creation failed </source> <translation>Ошибка: Создание транзакции не удалось </translation> </message> <message> - <location filename="../sendcoinsdialog.cpp" line="124"/> + <location filename="../sendcoinsdialog.cpp" line="135"/> <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> @@ -1224,7 +1421,7 @@ p, li { white-space: pre-wrap; } <context> <name>WalletModel</name> <message> - <location filename="../walletmodel.cpp" line="139"/> + <location filename="../walletmodel.cpp" line="144"/> <source>Sending...</source> <translation>Отправка....</translation> </message> diff --git a/src/serialize.h b/src/serialize.h index 6b35773ac3..396594cf73 100644 --- a/src/serialize.h +++ b/src/serialize.h @@ -30,7 +30,7 @@ typedef unsigned long long uint64; #define for if (false) ; else for #endif -#ifdef __WXMSW__ +#ifdef WIN32 #include <windows.h> // This is used to attempt to keep keying material out of swap // Note that VirtualLock does not provide this as a guarantee on Windows, diff --git a/src/test/base58_tests.cpp b/src/test/base58_tests.cpp new file mode 100644 index 0000000000..c7fa74e96d --- /dev/null +++ b/src/test/base58_tests.cpp @@ -0,0 +1,87 @@ +#include <boost/test/unit_test.hpp> + +#include "../util.h" + +BOOST_AUTO_TEST_SUITE(base58_tests) + +// TODO: +// EncodeBase58Check +// DecodeBase58Check +// CBase58Data +// bool SetString(const char* psz) + // bool SetString(const std::string& str) + // std::string ToString() const + // int CompareTo(const CBase58Data& b58) const + // bool operator==(const CBase58Data& b58) const + // bool operator<=(const CBase58Data& b58) const + // bool operator>=(const CBase58Data& b58) const + // bool operator< (const CBase58Data& b58) const + // bool operator> (const CBase58Data& b58) const + +// CBitcoinAddress + // bool SetHash160(const uint160& hash160) + // bool SetPubKey(const std::vector<unsigned char>& vchPubKey) + // bool IsValid() const + // CBitcoinAddress() + // CBitcoinAddress(uint160 hash160In) + // CBitcoinAddress(const std::vector<unsigned char>& vchPubKey) + // CBitcoinAddress(const std::string& strAddress) + // CBitcoinAddress(const char* pszAddress) + // uint160 GetHash160() const + +#define U(x) (reinterpret_cast<const unsigned char*>(x)) +static struct { + const unsigned char *data; + int size; +} vstrIn[] = { +{U(""), 0}, +{U("\x61"), 1}, +{U("\x62\x62\x62"), 3}, +{U("\x63\x63\x63"), 3}, +{U("\x73\x69\x6d\x70\x6c\x79\x20\x61\x20\x6c\x6f\x6e\x67\x20\x73\x74\x72\x69\x6e\x67"), 20}, +{U("\x00\xeb\x15\x23\x1d\xfc\xeb\x60\x92\x58\x86\xb6\x7d\x06\x52\x99\x92\x59\x15\xae\xb1\x72\xc0\x66\x47"), 25}, +{U("\x51\x6b\x6f\xcd\x0f"), 5}, +{U("\xbf\x4f\x89\x00\x1e\x67\x02\x74\xdd"), 9}, +{U("\x57\x2e\x47\x94"), 4}, +{U("\xec\xac\x89\xca\xd9\x39\x23\xc0\x23\x21"), 10}, +{U("\x10\xc8\x51\x1e"), 4}, +{U("\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00"), 10}, +}; + +const char *vstrOut[] = { +"", +"2g", +"a3gV", +"aPEr", +"2cFupjhnEsSn59qHXstmK2ffpLv2", +"1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L", +"ABnLTmg", +"3SEo3LWLoPntC", +"3EFU7m", +"EJDM8drfXA6uyA", +"Rt5zm", +"1111111111" +}; + +BOOST_AUTO_TEST_CASE(base58_EncodeBase58) +{ + for (int i=0; i<sizeof(vstrIn)/sizeof(vstrIn[0]); i++) + { + BOOST_CHECK_EQUAL(EncodeBase58(vstrIn[i].data, vstrIn[i].data + vstrIn[i].size), vstrOut[i]); + } +} + +BOOST_AUTO_TEST_CASE(base58_DecodeBase58) +{ + std::vector<unsigned char> result; + for (int i=0; i<sizeof(vstrIn)/sizeof(vstrIn[0]); i++) + { + std::vector<unsigned char> expected(vstrIn[i].data, vstrIn[i].data + vstrIn[i].size); + BOOST_CHECK(DecodeBase58(vstrOut[i], result)); + BOOST_CHECK_EQUAL_COLLECTIONS(result.begin(), result.end(), expected.begin(), expected.end()); + } + BOOST_CHECK(!DecodeBase58("invalid", result)); +} + +BOOST_AUTO_TEST_SUITE_END() + diff --git a/src/test/miner_tests.cpp b/src/test/miner_tests.cpp new file mode 100644 index 0000000000..8fc534762a --- /dev/null +++ b/src/test/miner_tests.cpp @@ -0,0 +1,35 @@ +#include <boost/test/unit_test.hpp> + +#include "../uint256.h" + +extern void SHA256Transform(void* pstate, void* pinput, const void* pinit); + +BOOST_AUTO_TEST_SUITE(miner_tests) + +BOOST_AUTO_TEST_CASE(sha256transform_equality) +{ + unsigned int pSHA256InitState[8] = {0x6a09e667, 0xbb67ae85, 0x3c6ef372, 0xa54ff53a, 0x510e527f, 0x9b05688c, 0x1f83d9ab, 0x5be0cd19}; + + + unsigned char pstate[32]; + unsigned char pinput[64]; + + int i; + + for (i = 0; i < 32; i++) { + pinput[i] = i; + pinput[i+32] = 0; + } + + uint256 hash; + + SHA256Transform(&hash, pinput, pSHA256InitState); + + BOOST_TEST_MESSAGE(hash.GetHex()); + + uint256 hash_reference("0x2df5e1c65ef9f8cde240d23cae2ec036d31a15ec64bc68f64be242b1da6631f3"); + + BOOST_CHECK(hash == hash_reference); +} + +BOOST_AUTO_TEST_SUITE_END() diff --git a/src/test/test_bitcoin.cpp b/src/test/test_bitcoin.cpp index a42ad7524f..8863aad478 100644 --- a/src/test/test_bitcoin.cpp +++ b/src/test/test_bitcoin.cpp @@ -10,10 +10,13 @@ #include "transaction_tests.cpp" #include "DoS_tests.cpp" #include "base64_tests.cpp" +#include "util_tests.cpp" +#include "base58_tests.cpp" +#include "miner_tests.cpp" CWallet* pwalletMain; void Shutdown(void* parg) { - exit(0); + exit(0); } diff --git a/src/test/util_tests.cpp b/src/test/util_tests.cpp index 337d901277..8afc85c507 100644 --- a/src/test/util_tests.cpp +++ b/src/test/util_tests.cpp @@ -12,25 +12,203 @@ BOOST_AUTO_TEST_CASE(util_MedianFilter) { CMedianFilter<int> filter(5, 15); - BOOST_CHECK(filter.median() == 15); + BOOST_CHECK_EQUAL(filter.median(), 15); filter.input(20); // [15 20] - BOOST_CHECK(filter.median() == 17); + BOOST_CHECK_EQUAL(filter.median(), 17); filter.input(30); // [15 20 30] - BOOST_CHECK(filter.median() == 20); + BOOST_CHECK_EQUAL(filter.median(), 20); filter.input(3); // [3 15 20 30] - BOOST_CHECK(filter.median() == 17); + BOOST_CHECK_EQUAL(filter.median(), 17); filter.input(7); // [3 7 15 20 30] - BOOST_CHECK(filter.median() == 15); + BOOST_CHECK_EQUAL(filter.median(), 15); filter.input(18); // [3 7 18 20 30] - BOOST_CHECK(filter.median() == 18); + BOOST_CHECK_EQUAL(filter.median(), 18); filter.input(0); // [0 3 7 18 30] - BOOST_CHECK(filter.median() == 7); + BOOST_CHECK_EQUAL(filter.median(), 7); +} + +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, + 0x5f +}; +BOOST_AUTO_TEST_CASE(util_ParseHex) +{ + std::vector<unsigned char> result; + std::vector<unsigned char> expected(ParseHex_expected, ParseHex_expected + sizeof(ParseHex_expected)); + // Basic test vector + result = ParseHex("04678afdb0fe5548271967f1a67130b7105cd6a828e03909a67962e0ea1f61deb649f6bc3f4cef38c4f35504e51ec112de5c384df7ba0b8d578a4c702b6bf11d5f"); + BOOST_CHECK_EQUAL_COLLECTIONS(result.begin(), result.end(), expected.begin(), expected.end()); + + // Spaces between bytes must be supported + result = ParseHex("12 34 56 78"); + BOOST_CHECK(result.size() == 4 && result[0] == 0x12 && result[1] == 0x34 && result[2] == 0x56 && result[3] == 0x78); + + // Stop parsing at invalid value + result = ParseHex("1234 invalid 1234"); + BOOST_CHECK(result.size() == 2 && result[0] == 0x12 && result[1] == 0x34); +} + +BOOST_AUTO_TEST_CASE(util_HexStr) +{ + BOOST_CHECK_EQUAL( + HexStr(ParseHex_expected, ParseHex_expected + sizeof(ParseHex_expected)), + "04678afdb0fe5548271967f1a67130b7105cd6a828e03909a67962e0ea1f61deb649f6bc3f4cef38c4f35504e51ec112de5c384df7ba0b8d578a4c702b6bf11d5f"); + + BOOST_CHECK_EQUAL( + HexStr(ParseHex_expected, ParseHex_expected + 5, true), + "04 67 8a fd b0"); +} + +BOOST_AUTO_TEST_CASE(util_DateTimeStrFormat) +{ + BOOST_CHECK_EQUAL(DateTimeStrFormat("%x %H:%M:%S", 0), "01/01/70 00:00:00"); + BOOST_CHECK_EQUAL(DateTimeStrFormat("%x %H:%M:%S", 0x7FFFFFFF), "01/19/38 03:14:07"); + // Formats used within bitcoin + BOOST_CHECK_EQUAL(DateTimeStrFormat("%x %H:%M:%S", 1317425777), "09/30/11 23:36:17"); + BOOST_CHECK_EQUAL(DateTimeStrFormat("%x %H:%M", 1317425777), "09/30/11 23:36"); +} + +BOOST_AUTO_TEST_CASE(util_ParseParameters) +{ + const char *argv_test[] = {"-ignored", "-a", "-b", "-ccc=argument", "-ccc=multiple", "f", "-d=e"}; + + ParseParameters(0, (char**)argv_test); + BOOST_CHECK(mapArgs.empty() && mapMultiArgs.empty()); + + ParseParameters(1, (char**)argv_test); + BOOST_CHECK(mapArgs.empty() && mapMultiArgs.empty()); + + ParseParameters(5, (char**)argv_test); + // 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") + && !mapArgs.count("f") && !mapArgs.count("-d")); + BOOST_CHECK(mapMultiArgs.count("-a") && mapMultiArgs.count("-b") && mapMultiArgs.count("-ccc") + && !mapMultiArgs.count("f") && !mapMultiArgs.count("-d")); + + BOOST_CHECK(mapArgs["-a"] == "" && mapArgs["-ccc"] == "multiple"); + BOOST_CHECK(mapMultiArgs["-ccc"].size() == 2); +} + +BOOST_AUTO_TEST_CASE(util_GetArg) +{ + mapArgs.clear(); + mapArgs["strtest1"] = "string..."; + // strtest2 undefined on purpose + mapArgs["inttest1"] = "12345"; + mapArgs["inttest2"] = "81985529216486895"; + // inttest3 undefined on purpose + mapArgs["booltest1"] = ""; + // booltest2 undefined on purpose + mapArgs["booltest3"] = "0"; + mapArgs["booltest4"] = "1"; + + BOOST_CHECK_EQUAL(GetArg("strtest1", "default"), "string..."); + BOOST_CHECK_EQUAL(GetArg("strtest2", "default"), "default"); + 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_AUTO_TEST_CASE(util_WildcardMatch) +{ + BOOST_CHECK(WildcardMatch("127.0.0.1", "*")); + BOOST_CHECK(WildcardMatch("127.0.0.1", "127.*")); + BOOST_CHECK(WildcardMatch("abcdef", "a?cde?")); + BOOST_CHECK(!WildcardMatch("abcdef", "a?cde??")); + BOOST_CHECK(WildcardMatch("abcdef", "a*f")); + BOOST_CHECK(!WildcardMatch("abcdef", "a*x")); + BOOST_CHECK(WildcardMatch("", "*")); +} + +BOOST_AUTO_TEST_CASE(util_FormatMoney) +{ + BOOST_CHECK_EQUAL(FormatMoney(0, false), "0.00"); + BOOST_CHECK_EQUAL(FormatMoney((COIN/10000)*123456789, false), "12345.6789"); + BOOST_CHECK_EQUAL(FormatMoney(COIN, true), "+1.00"); + BOOST_CHECK_EQUAL(FormatMoney(-COIN, false), "-1.00"); + BOOST_CHECK_EQUAL(FormatMoney(-COIN, true), "-1.00"); + + BOOST_CHECK_EQUAL(FormatMoney(COIN*100000000, false), "100000000.00"); + BOOST_CHECK_EQUAL(FormatMoney(COIN*10000000, false), "10000000.00"); + BOOST_CHECK_EQUAL(FormatMoney(COIN*1000000, false), "1000000.00"); + BOOST_CHECK_EQUAL(FormatMoney(COIN*100000, false), "100000.00"); + BOOST_CHECK_EQUAL(FormatMoney(COIN*10000, false), "10000.00"); + BOOST_CHECK_EQUAL(FormatMoney(COIN*1000, false), "1000.00"); + BOOST_CHECK_EQUAL(FormatMoney(COIN*100, false), "100.00"); + BOOST_CHECK_EQUAL(FormatMoney(COIN*10, false), "10.00"); + BOOST_CHECK_EQUAL(FormatMoney(COIN, false), "1.00"); + BOOST_CHECK_EQUAL(FormatMoney(COIN/10, false), "0.10"); + BOOST_CHECK_EQUAL(FormatMoney(COIN/100, false), "0.01"); + BOOST_CHECK_EQUAL(FormatMoney(COIN/1000, false), "0.001"); + BOOST_CHECK_EQUAL(FormatMoney(COIN/10000, false), "0.0001"); + BOOST_CHECK_EQUAL(FormatMoney(COIN/100000, false), "0.00001"); + BOOST_CHECK_EQUAL(FormatMoney(COIN/1000000, false), "0.000001"); + BOOST_CHECK_EQUAL(FormatMoney(COIN/10000000, false), "0.0000001"); + BOOST_CHECK_EQUAL(FormatMoney(COIN/100000000, false), "0.00000001"); +} + +BOOST_AUTO_TEST_CASE(util_ParseMoney) +{ + int64 ret = 0; + BOOST_CHECK(ParseMoney("0.0", ret)); + BOOST_CHECK_EQUAL(ret, 0); + + BOOST_CHECK(ParseMoney("12345.6789", ret)); + BOOST_CHECK_EQUAL(ret, (COIN/10000)*123456789); + + BOOST_CHECK(ParseMoney("100000000.00", ret)); + BOOST_CHECK_EQUAL(ret, COIN*100000000); + BOOST_CHECK(ParseMoney("10000000.00", ret)); + BOOST_CHECK_EQUAL(ret, COIN*10000000); + BOOST_CHECK(ParseMoney("1000000.00", ret)); + BOOST_CHECK_EQUAL(ret, COIN*1000000); + BOOST_CHECK(ParseMoney("100000.00", ret)); + BOOST_CHECK_EQUAL(ret, COIN*100000); + BOOST_CHECK(ParseMoney("10000.00", ret)); + BOOST_CHECK_EQUAL(ret, COIN*10000); + BOOST_CHECK(ParseMoney("1000.00", ret)); + BOOST_CHECK_EQUAL(ret, COIN*1000); + BOOST_CHECK(ParseMoney("100.00", ret)); + BOOST_CHECK_EQUAL(ret, COIN*100); + BOOST_CHECK(ParseMoney("10.00", ret)); + BOOST_CHECK_EQUAL(ret, COIN*10); + BOOST_CHECK(ParseMoney("1.00", ret)); + BOOST_CHECK_EQUAL(ret, COIN); + BOOST_CHECK(ParseMoney("0.1", ret)); + BOOST_CHECK_EQUAL(ret, COIN/10); + BOOST_CHECK(ParseMoney("0.01", ret)); + BOOST_CHECK_EQUAL(ret, COIN/100); + BOOST_CHECK(ParseMoney("0.001", ret)); + BOOST_CHECK_EQUAL(ret, COIN/1000); + BOOST_CHECK(ParseMoney("0.0001", ret)); + BOOST_CHECK_EQUAL(ret, COIN/10000); + BOOST_CHECK(ParseMoney("0.00001", ret)); + BOOST_CHECK_EQUAL(ret, COIN/100000); + BOOST_CHECK(ParseMoney("0.000001", ret)); + BOOST_CHECK_EQUAL(ret, COIN/1000000); + BOOST_CHECK(ParseMoney("0.0000001", ret)); + BOOST_CHECK_EQUAL(ret, COIN/10000000); + BOOST_CHECK(ParseMoney("0.00000001", ret)); + BOOST_CHECK_EQUAL(ret, COIN/100000000); + + // Attempted 63 bit overflow should fail + BOOST_CHECK(!ParseMoney("92233720368.54775808", ret)); } BOOST_AUTO_TEST_SUITE_END() diff --git a/src/util.cpp b/src/util.cpp index fb648a9721..236c7f7c44 100644 --- a/src/util.cpp +++ b/src/util.cpp @@ -64,7 +64,7 @@ public: ppmutexOpenSSL[i] = new boost::interprocess::interprocess_mutex(); CRYPTO_set_locking_callback(locking_callback); -#ifdef __WXMSW__ +#ifdef WIN32 // Seed random number generator with screen scrape and other hardware sources RAND_screen(); #endif @@ -108,7 +108,7 @@ void RandAddSeedPerfmon() return; nLastPerfmon = GetTime(); -#ifdef __WXMSW__ +#ifdef WIN32 // Don't need this on Linux, OpenSSL automatically uses /dev/urandom // Seed with the entire set of perfmon data unsigned char pdata[250000]; @@ -198,7 +198,7 @@ inline int OutputDebugStringF(const char* pszFormat, ...) } } -#ifdef __WXMSW__ +#ifdef WIN32 if (fPrintToDebugger) { static CCriticalSection cs_OutputDebugStringF; @@ -387,7 +387,7 @@ bool ParseMoney(const char* pszIn, int64& nRet) for (; *p; p++) if (!isspace(*p)) return false; - if (strWhole.size() > 14) + if (strWhole.size() > 10) // guard against 63 bit overflow return false; if (nUnits < 0 || nUnits > COIN) return false; @@ -457,7 +457,7 @@ void ParseParameters(int argc, char* argv[]) pszValue = strchr(psz, '='); *pszValue++ = '\0'; } - #ifdef __WXMSW__ + #ifdef WIN32 _strlwr(psz); if (psz[0] == '/') psz[0] = '-'; @@ -648,7 +648,7 @@ bool WildcardMatch(const string& str, const string& mask) void FormatException(char* pszMessage, std::exception* pex, const char* pszThread) { -#ifdef __WXMSW__ +#ifdef WIN32 char pszModule[MAX_PATH]; pszModule[0] = '\0'; GetModuleFileNameA(NULL, pszModule, sizeof(pszModule)); @@ -707,7 +707,7 @@ void PrintExceptionContinue(std::exception* pex, const char* pszThread) -#ifdef __WXMSW__ +#ifdef WIN32 typedef WINSHELLAPI BOOL (WINAPI *PSHGETSPECIALFOLDERPATHA)(HWND hwndOwner, LPSTR lpszPath, int nFolder, BOOL fCreate); string MyGetSpecialFolderPath(int nFolder, bool fCreate) @@ -748,7 +748,7 @@ string GetDefaultDataDir() // Windows: C:\Documents and Settings\username\Application Data\Bitcoin // Mac: ~/Library/Application Support/Bitcoin // Unix: ~/.bitcoin -#ifdef __WXMSW__ +#ifdef WIN32 // Windows return MyGetSpecialFolderPath(CSIDL_APPDATA, true) + "\\Bitcoin"; #else @@ -758,7 +758,7 @@ string GetDefaultDataDir() string strHome = pszHome; if (strHome[strHome.size()-1] != '/') strHome += '/'; -#ifdef __WXMAC_OSX__ +#ifdef MAC_OSX // Mac strHome += "Library/Application Support/"; filesystem::create_directory(strHome.c_str()); diff --git a/src/util.h b/src/util.h index f0b2f4a71c..178923727a 100644 --- a/src/util.h +++ b/src/util.h @@ -7,7 +7,7 @@ #include "uint256.h" -#ifndef __WXMSW__ +#ifndef WIN32 #include <sys/types.h> #include <sys/time.h> #include <sys/resource.h> @@ -81,7 +81,7 @@ T* alignup(T* p) return u.ptr; } -#ifdef __WXMSW__ +#ifdef WIN32 #define MSG_NOSIGNAL 0 #define MSG_DONTWAIT 0 #ifndef UINT64_MAX @@ -123,7 +123,7 @@ inline int myclosesocket(SOCKET& hSocket) { if (hSocket == INVALID_SOCKET) return WSAENOTSOCK; -#ifdef __WXMSW__ +#ifdef WIN32 int ret = closesocket(hSocket); #else int ret = close(hSocket); @@ -192,7 +192,7 @@ std::string GetConfigFile(); std::string GetPidFile(); void CreatePidFile(std::string pidFile, pid_t pid); void ReadConfigFile(std::map<std::string, std::string>& mapSettingsRet, std::map<std::string, std::vector<std::string> >& mapMultiSettingsRet); -#ifdef __WXMSW__ +#ifdef WIN32 std::string MyGetSpecialFolderPath(int nFolder, bool fCreate); #endif std::string GetDefaultDataDir(); @@ -390,7 +390,7 @@ inline void PrintHex(const std::vector<unsigned char>& vch, const char* pszForma inline int64 GetPerformanceCounter() { int64 nCounter = 0; -#ifdef __WXMSW__ +#ifdef WIN32 QueryPerformanceCounter((LARGE_INTEGER*)&nCounter); #else timeval t; @@ -424,7 +424,7 @@ void skipspaces(T& it) inline bool IsSwitchChar(char c) { -#ifdef __WXMSW__ +#ifdef WIN32 return c == '-' || c == '/'; #else return c == '-'; @@ -467,7 +467,7 @@ inline bool GetBoolArg(const std::string& strArg) inline void heapchk() { -#ifdef __WXMSW__ +#ifdef WIN32 /// for debugging //if (_heapchk() != _HEAPOK) // DebugBreak(); @@ -626,7 +626,7 @@ public: // Note: It turns out we might have been able to use boost::thread // by using TerminateThread(boost::thread.native_handle(), 0); -#ifdef __WXMSW__ +#ifdef WIN32 typedef HANDLE pthread_t; inline pthread_t CreateThread(void(*pfn)(void*), void* parg, bool fWantHandle=false) @@ -708,10 +708,10 @@ inline void ExitThread(size_t nExitCode) inline bool AffinityBugWorkaround(void(*pfn)(void*)) { -#ifdef __WXMSW__ +#ifdef WIN32 // Sometimes after a few hours affinity gets stuck on one processor - DWORD dwProcessAffinityMask = -1; - DWORD dwSystemAffinityMask = -1; + DWORD_PTR dwProcessAffinityMask = -1; + DWORD_PTR dwSystemAffinityMask = -1; GetProcessAffinityMask(GetCurrentProcess(), &dwProcessAffinityMask, &dwSystemAffinityMask); DWORD dwPrev1 = SetThreadAffinityMask(GetCurrentThread(), dwProcessAffinityMask); DWORD dwPrev2 = SetThreadAffinityMask(GetCurrentThread(), dwProcessAffinityMask); @@ -726,4 +726,10 @@ inline bool AffinityBugWorkaround(void(*pfn)(void*)) return false; } +inline uint32_t ByteReverse(uint32_t value) +{ + value = ((value & 0xFF00FF00) >> 8) | ((value & 0x00FF00FF) << 8); + return (value<<16) | (value>>16); +} + #endif diff --git a/src/wallet.cpp b/src/wallet.cpp index d78e470396..30a561dcb4 100644 --- a/src/wallet.cpp +++ b/src/wallet.cpp @@ -5,7 +5,6 @@ #include "headers.h" #include "db.h" -#include "cryptopp/sha.h" #include "crypter.h" using namespace std; |