Mention Qt4 runtime dependencies

Add English translation to fix plural(s).

.gitignore

@@ -3,3 +3,19 @@ src/bitcoin
 src/bitcoind
 .*.swp
 *.*~*
+*.bak
+*.rej
+*.orig
+*.o
+*.patch
+.bitcoin
+#compilation and Qt preprocessor part
+*.qm
+Makefile
+bitcoin-qt
+#resources cpp
+qrc_*.cpp
+#qt creator
+*.pro.user
+#mac specific
+.DS_Store

INSTALL

@@ -0,0 +1,9 @@
+Building Bitcoin
+
+See doc/readme-qt.rst for instructions on building Bitcoin QT,
+the intended-for-end-users, nice-graphical-interface, reference
+implementation of Bitcoin.
+
+See doc/build-*.txt for instructions on building bitcoind,
+the intended-for-services, no-graphical-interface, reference
+implementation of Bitcoin.

README.md

@@ -1,16 +1,42 @@
+
 Bitcoin integration/staging tree
 
 Development process
 ===================
 
-Developers work in their own trees, then submit pull requests when they think their feature or bug fix is ready.
+Developers work in their own trees, then submit pull requests when
+they think their feature or bug fix is ready.
 
-If it is a simple/trivial/non-controversial change, then one of the bitcoin development team members simply pulls it.
+If it is a simple/trivial/non-controversial change, then one of the
+bitcoin development team members simply pulls it.
 
-If it is a more complicated or potentially controversial change, then the patch submitter will be asked to start a discussion (if they haven't already) on the development forums:  http://www.bitcoin.org/smf/index.php?board=6.0
-The patch will be accepted if there is broad consensus that it is a good thing.  Developers should expect to rework and resubmit patches if they don't match the project's coding conventions (see coding.txt) or are controversial.
+If it is a more complicated or potentially controversial
+change, then the patch submitter will be asked to start a
+discussion (if they haven't already) on the mailing list:
+http://sourceforge.net/mailarchive/forum.php?forum_name=bitcoin-development
 
-The master branch is regularly built and tested (by who? need people willing to be quality assurance testers), and periodically pushed to the subversion repo to become the official, stable, released bitcoin.
+The patch will be accepted if there is broad consensus that it is a
+good thing.  Developers should expect to rework and resubmit patches
+if they don't match the project's coding conventions (see coding.txt)
+or are controversial.
 
+The master branch is regularly built and tested, but is not guaranteed
+to be completely stable. Tags are regularly created to indicate new
+official, stable release versions of Bitcoin. If you would like to
+help test the Bitcoin core, please contact QA@BitcoinTesting.org.
 
-Feature branches are created when there are major new features being worked on by several people.
+Feature branches are created when there are major new features being
+worked on by several people.
+
+From time to time a pull request will become outdated. If this occurs, and
+the pull is no longer automatically mergeable; a comment on the pull will
+be used to issue a warning of closure. The pull will be closed 15 days
+after the warning if action is not taken by the author. Pull requests closed
+in this manner will have their corresponding issue labeled 'stagnant'.
+
+Issues with no commits will be given a similar warning, and closed after
+15 days from their last activity. Issues closed in this manner will be 
+labeled 'stale'. 
+
+Requests to reopen closed pull requests and/or issues can be submitted to 
+QA@BitcoinTesting.org. 

bitcoin-qt.pro

@@ -0,0 +1,276 @@
+TEMPLATE = app
+TARGET =
+VERSION = 0.5.0
+INCLUDEPATH += src src/json src/qt
+DEFINES += QT_GUI BOOST_THREAD_USE_LIB
+CONFIG += no_include_pwd
+
+# for boost 1.37, add -mt to the boost libraries 
+# use: qmake BOOST_LIB_SUFFIX=-mt
+# for boost thread win32 with _win32 sufix
+# use: BOOST_THREAD_LIB_SUFFIX=_win32-...
+# or when linking against a specific BerkelyDB version: BDB_LIB_SUFFIX=-4.8
+
+# Dependency library locations can be customized with BOOST_INCLUDE_PATH, 
+#    BOOST_LIB_PATH, BDB_INCLUDE_PATH, BDB_LIB_PATH
+#    OPENSSL_INCLUDE_PATH and OPENSSL_LIB_PATH respectively
+
+OBJECTS_DIR = build
+MOC_DIR = build
+UI_DIR = build
+
+# use: qmake "RELEASE=1"
+contains(RELEASE, 1) {
+    # Mac: compile for maximum compatibility (10.5, 32-bit)
+    macx:QMAKE_CXXFLAGS += -mmacosx-version-min=10.5 -arch i386 -isysroot /Developer/SDKs/MacOSX10.5.sdk
+
+    !windows:!macx {
+        # Linux: static link
+        LIBS += -Wl,-Bstatic
+    }
+}
+
+# use: qmake "USE_UPNP=1" ( enabled by default; default)
+#  or: qmake "USE_UPNP=0" (disabled by default)
+#  or: qmake "USE_UPNP=-" (not supported)
+# miniupnpc (http://miniupnp.free.fr/files/) must be installed for support
+contains(USE_UPNP, -) {
+    message(Building without UPNP support)
+} else {
+    message(Building with UPNP support)
+    count(USE_UPNP, 0) {
+        USE_UPNP=1
+    }
+    DEFINES += USE_UPNP=$$USE_UPNP STATICLIB
+    INCLUDEPATH += $$MINIUPNPC_INCLUDE_PATH
+    LIBS += $$join(MINIUPNPC_LIB_PATH,,-L,) -lminiupnpc
+    win32:LIBS += -liphlpapi
+}
+
+# use: qmake "USE_DBUS=1"
+contains(USE_DBUS, 1) {
+    message(Building with DBUS (Freedesktop notifications) support)
+    DEFINES += USE_DBUS
+    QT += dbus
+}
+
+# use: qmake "USE_SSL=1"
+contains(USE_SSL, 1) {
+    message(Building with SSL support for RPC)
+    DEFINES += USE_SSL
+}
+
+contains(BITCOIN_NEED_QT_PLUGINS, 1) {
+    DEFINES += BITCOIN_NEED_QT_PLUGINS
+    QTPLUGIN += qcncodecs qjpcodecs qtwcodecs qkrcodecs
+}
+
+!windows {
+    # for extra security against potential buffer overflows
+    QMAKE_CXXFLAGS += -fstack-protector
+    QMAKE_LFLAGS += -fstack-protector
+    # do not enable this on windows, as it will result in a non-working executable!
+}
+
+# disable quite some warnings because bitcoin core "sins" a lot
+QMAKE_CXXFLAGS_WARN_ON = -fdiagnostics-show-option -Wall -Wno-strict-aliasing -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 json/include
+HEADERS += src/qt/bitcoingui.h \
+    src/qt/transactiontablemodel.h \
+    src/qt/addresstablemodel.h \
+    src/qt/optionsdialog.h \
+    src/qt/sendcoinsdialog.h \
+    src/qt/addressbookpage.h \
+    src/qt/aboutdialog.h \
+    src/qt/editaddressdialog.h \
+    src/qt/bitcoinaddressvalidator.h \
+    src/base58.h \
+    src/bignum.h \
+    src/util.h \
+    src/uint256.h \
+    src/serialize.h \
+    src/strlcpy.h \
+    src/main.h \
+    src/net.h \
+    src/key.h \
+    src/db.h \
+    src/script.h \
+    src/noui.h \
+    src/init.h \
+    src/headers.h \
+    src/irc.h \
+    src/json/json_spirit_writer_template.h \
+    src/json/json_spirit_writer.h \
+    src/json/json_spirit_value.h \
+    src/json/json_spirit_utils.h \
+    src/json/json_spirit_stream_reader.h \
+    src/json/json_spirit_reader_template.h \
+    src/json/json_spirit_reader.h \
+    src/json/json_spirit_error_position.h \
+    src/json/json_spirit.h \
+    src/qt/clientmodel.h \
+    src/qt/guiutil.h \
+    src/qt/transactionrecord.h \
+    src/qt/guiconstants.h \
+    src/qt/optionsmodel.h \
+    src/qt/monitoreddatamapper.h \
+    src/qtui.h \
+    src/qt/transactiondesc.h \
+    src/qt/transactiondescdialog.h \
+    src/qt/bitcoinamountfield.h \
+    src/wallet.h \
+    src/keystore.h \
+    src/qt/transactionfilterproxy.h \
+    src/qt/transactionview.h \
+    src/qt/walletmodel.h \
+    src/bitcoinrpc.h \
+    src/qt/overviewpage.h \
+    src/qt/csvmodelwriter.h \
+    src/crypter.h \
+    src/qt/sendcoinsentry.h \
+    src/qt/qvalidatedlineedit.h \
+    src/qt/bitcoinunits.h \
+    src/qt/qvaluecombobox.h \
+    src/qt/askpassphrasedialog.h \
+    src/protocol.h \
+    src/qt/notificator.h
+
+SOURCES += src/qt/bitcoin.cpp src/qt/bitcoingui.cpp \
+    src/qt/transactiontablemodel.cpp \
+    src/qt/addresstablemodel.cpp \
+    src/qt/optionsdialog.cpp \
+    src/qt/sendcoinsdialog.cpp \
+    src/qt/addressbookpage.cpp \
+    src/qt/aboutdialog.cpp \
+    src/qt/editaddressdialog.cpp \
+    src/qt/bitcoinaddressvalidator.cpp \
+    src/util.cpp \
+    src/script.cpp \
+    src/main.cpp \
+    src/init.cpp \
+    src/net.cpp \
+    src/irc.cpp \
+    src/db.cpp \
+    src/json/json_spirit_writer.cpp \
+    src/json/json_spirit_value.cpp \
+    src/json/json_spirit_reader.cpp \
+    src/qt/clientmodel.cpp \
+    src/qt/guiutil.cpp \
+    src/qt/transactionrecord.cpp \
+    src/qt/optionsmodel.cpp \
+    src/qt/monitoreddatamapper.cpp \
+    src/qt/transactiondesc.cpp \
+    src/qt/transactiondescdialog.cpp \
+    src/qt/bitcoinstrings.cpp \
+    src/qt/bitcoinamountfield.cpp \
+    src/wallet.cpp \
+    src/keystore.cpp \
+    src/qt/transactionfilterproxy.cpp \
+    src/qt/transactionview.cpp \
+    src/qt/walletmodel.cpp \
+    src/bitcoinrpc.cpp \
+    src/qt/overviewpage.cpp \
+    src/qt/csvmodelwriter.cpp \
+    src/crypter.cpp \
+    src/qt/sendcoinsentry.cpp \
+    src/qt/qvalidatedlineedit.cpp \
+    src/qt/bitcoinunits.cpp \
+    src/qt/qvaluecombobox.cpp \
+    src/qt/askpassphrasedialog.cpp \
+    src/protocol.cpp \
+    src/qt/notificator.cpp
+
+RESOURCES += \
+    src/qt/bitcoin.qrc
+
+FORMS += \
+    src/qt/forms/sendcoinsdialog.ui \
+    src/qt/forms/addressbookpage.ui \
+    src/qt/forms/aboutdialog.ui \
+    src/qt/forms/editaddressdialog.ui \
+    src/qt/forms/transactiondescdialog.ui \
+    src/qt/forms/overviewpage.ui \
+    src/qt/forms/sendcoinsentry.ui \
+    src/qt/forms/askpassphrasedialog.ui
+
+CODECFORTR = UTF-8
+
+# for lrelease/lupdate
+# also add new translations to src/qt/bitcoin.qrc under translations/
+TRANSLATIONS = $$files(src/qt/locale/bitcoin_*.ts)
+
+isEmpty(QMAKE_LRELEASE) {
+    win32:QMAKE_LRELEASE = $$[QT_INSTALL_BINS]\lrelease.exe
+    else:QMAKE_LRELEASE = $$[QT_INSTALL_BINS]/lrelease
+}
+isEmpty(TS_DIR):TS_DIR = src/qt/locale
+# automatically build translations, so they can be included in resource file
+TSQM.name = lrelease ${QMAKE_FILE_IN}
+TSQM.input = TRANSLATIONS
+TSQM.output = $$TS_DIR/${QMAKE_FILE_BASE}.qm
+TSQM.commands = $$QMAKE_LRELEASE ${QMAKE_FILE_IN}
+TSQM.CONFIG = no_link
+QMAKE_EXTRA_COMPILERS += TSQM
+PRE_TARGETDEPS += compiler_TSQM_make_all
+
+# "Other files" to show in Qt Creator
+OTHER_FILES += \
+    doc/*.rst doc/*.txt doc/README README.md
+
+# platform specific defaults, if not overridden on command line
+isEmpty(BOOST_LIB_SUFFIX) {
+    macx:BOOST_LIB_SUFFIX = -mt
+    windows:BOOST_LIB_SUFFIX = -mgw44-mt-1_43
+}
+
+isEmpty(BOOST_THREAD_LIB_SUFFIX) {
+    BOOST_THREAD_LIB_SUFFIX = $$BOOST_LIB_SUFFIX
+}
+
+isEmpty(BDB_LIB_PATH) {
+    macx:BDB_LIB_PATH = /opt/local/lib/db48
+}
+
+isEmpty(BDB_LIB_SUFFIX) {
+    macx:BDB_LIB_SUFFIX = -4.8
+}
+
+isEmpty(BDB_INCLUDE_PATH) {
+    macx:BDB_INCLUDE_PATH = /opt/local/include/db48
+}
+
+isEmpty(BOOST_LIB_PATH) {
+    macx:BOOST_LIB_PATH = /opt/local/lib
+}
+
+isEmpty(BOOST_INCLUDE_PATH) {
+    macx:BOOST_INCLUDE_PATH = /opt/local/include
+}
+
+windows:LIBS += -lws2_32 -lgdi32
+windows:DEFINES += WIN32
+windows:RC_FILE = src/qt/res/bitcoin-qt.rc
+
+macx:HEADERS += src/qt/macdockiconhandler.h
+macx:OBJECTIVE_SOURCES += src/qt/macdockiconhandler.mm
+macx:LIBS += -framework Foundation -framework ApplicationServices -framework AppKit
+macx:DEFINES += MAC_OSX MSG_NOSIGNAL=0 BOOST_FILESYSTEM_VERSION=3
+macx:ICON = src/qt/res/icons/bitcoin.icns
+macx:TARGET = "Bitcoin-Qt"
+
+# Set libraries and includes at end, to use platform-defined defaults if not overridden
+INCLUDEPATH += $$BOOST_INCLUDE_PATH $$BDB_INCLUDE_PATH $$OPENSSL_INCLUDE_PATH
+LIBS += $$join(BOOST_LIB_PATH,,-L,) $$join(BDB_LIB_PATH,,-L,) $$join(OPENSSL_LIB_PATH,,-L,)
+LIBS += -lssl -lcrypto -ldb_cxx$$BDB_LIB_SUFFIX
+LIBS += -lboost_system$$BOOST_LIB_SUFFIX -lboost_filesystem$$BOOST_LIB_SUFFIX -lboost_program_options$$BOOST_LIB_SUFFIX -lboost_thread$$BOOST_THREAD_LIB_SUFFIX
+
+contains(RELEASE, 1) {
+    !windows:!macx {
+        # Linux: turn dynamic linking back on for c/c++ runtime libraries
+        LIBS += -Wl,-Bdynamic
+    }
+}
+
+system($$QMAKE_LRELEASE -silent $$_PRO_FILE_)

contrib/Bitcoin.app/Contents/Info.plist

@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>CFBundleDisplayName</key>
-	<string>Bitcoin</string>
-	<key>CFBundleDevelopmentRegion</key>
-	<string>English</string>
-	<key>CFBundleExecutable</key>
-	<string>bitcoin</string>
-	<key>CFBundleIdentifier</key>
-	<string>org.bitcoin.bitcoin</string>
-	<key>CFBundleInfoDictionaryVersion</key>
-	<string>6.0</string>
-	<key>CFBundleName</key>
-	<string>Bitcoin</string>
-	<key>CFBundlePackageType</key>
-	<string>APPL</string>
-	<key>CFBundleShortVersionString</key>
-	<string>0.4.00</string>
-	<key>CFBundleSignature</key>
-	<string>????</string>
-	<key>CFBundleVersion</key>
-	<string>400</string>
-	<key>LSMinimumSystemVersion</key>
-	<string>10.5</string>
-	<key>CFBundleIconFile</key>
-	<string>BitcoinAppIcon.icns</string>
-	<key>LSMultipleInstancesProhibited</key>
-	<true/>
-</dict>
-</plist>

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"

contrib/gitian-descriptors/README

@@ -0,0 +1,31 @@
+Gavin's notes on getting gitian builds up and running:
+
+You need the right hardware: you need a 64-bit-capable CPU with hardware virtualization support (Intel VT-x or AMD-V). Not all modern CPUs support hardware virtualization.
+
+You probably need to enable hardware virtualization in your machine's BIOS.
+
+You need to be running a recent version of 64-bit-Ubuntu, and you need to install several prerequisites:
+  sudo apt-get install apache2 git apt-cacher-ng python-vm-builder qemu-kvm
+
+Sanity checks:
+  sudo service apt-cacher-ng status   # Should return apt-cacher-ng is running
+  ls -l /dev/kvm   # Should show a /dev/kvm device
+
+Once you've got the right hardware and software:
+
+    git clone git://github.com/bitcoin/bitcoin.git
+    git clone git://github.com/devrandom/gitian-builder.git
+    mkdir gitian-builder/inputs
+    wget 'http://miniupnp.tuxfamily.org/files/download.php?file=miniupnpc-1.6.tar.gz' -O gitian-builder/inputs/miniupnpc-1.6.tar.gz
+
+    cd gitian-builder
+    bin/make-base-vm --arch i386
+    bin/make-base-vm --arch amd64
+    cd ..
+
+    # To build
+    cd bitcoin
+    git pull
+    cd ../gitian-builder
+    git pull
+    ./bin/gbuild --commit bitcoin=HEAD ../bitcoin/contrib/gitian.yml

contrib/gitian-descriptors/gitian-win32.yml

@@ -10,31 +10,24 @@ packages:
 - "unzip"
 - "nsis"
 - "faketime"
+- "wine"
 reference_datetime: "2011-01-30 00:00:00"
 remotes:
 - "url": "https://github.com/bitcoin/bitcoin.git"
   "dir": "bitcoin"
 files:
-- "wxwidgets-win32-2.9.2-gitian.zip"
+- "qt-win32-4.7.4-gitian.zip"
 - "boost-win32-1.47.0-gitian.zip"
-- "openssl-1.0.0d.tar.gz"
+- "openssl-1.0.0e.tar.gz"
 - "db-4.8.30.NC.tar.gz"
 - "miniupnpc-1.6.tar.gz"
 script: |
   #
-  mkdir wxWidgets-2.9.2
-  cd wxWidgets-2.9.2
-  mkdir lib
-  unzip ../wxwidgets-win32-2.9.2-gitian.zip
-  cd bin/$GBUILD_BITS
-  for lib in wx_mswu; do
-    i586-mingw32msvc-ar rc ../../lib/lib${lib}-2.9-i586-mingw32msvc.a $lib/*.o
-    i586-mingw32msvc-ranlib ../../lib/lib${lib}-2.9-i586-mingw32msvc.a
-  done
-  cp -a wx ../../lib
-  cd ../..
-  mv include/wx-2.9/wx include
-  cd ..
+  mkdir $HOME/qt
+  cd $HOME/qt
+  unzip ../build/qt-win32-4.7.4-gitian.zip
+  cd $HOME/build/
+  export PATH=$PATH:$HOME/qt/bin/
   #
   mkdir boost_1_47_0
   cd boost_1_47_0
@@ -49,8 +42,8 @@ script: |
   mv include/boost .
   cd ..
   #
-  tar xzf openssl-1.0.0d.tar.gz
-  cd openssl-1.0.0d
+  tar xzf openssl-1.0.0e.tar.gz
+  cd openssl-1.0.0e
   ./Configure --cross-compile-prefix=i586-mingw32msvc- mingw
   make
   cd ..
@@ -73,19 +66,23 @@ script: |
   mkdir -p $OUTDIR/src
   cp -a . $OUTDIR/src
   rm -rf $OUTDIR/src/.git
-  cp -a $OUTDIR/src/locale $OUTDIR
   cp $OUTDIR/src/doc/README_windows.txt $OUTDIR/readme.txt
   cp $OUTDIR/src/COPYING $OUTDIR/license.txt
+  export LD_PRELOAD=/usr/lib/faketime/libfaketime.so.1
+  export FAKETIME=$REFERENCE_DATETIME
+  export TZ=UTC
+  $HOME/qt/src/bin/qmake -spec unsupported/win32-g++-cross MINIUPNPC_LIB_PATH=$HOME/build/miniupnpc MINIUPNPC_INCLUDE_PATH=$HOME/build/ BDB_LIB_PATH=$HOME/build/db-4.8.30.NC/build_unix BDB_INCLUDE_PATH=$HOME/build/db-4.8.30.NC/build_unix BOOST_LIB_PATH=$HOME/build/boost_1_47_0/stage/lib BOOST_INCLUDE_PATH=$HOME/build/boost_1_47_0 BOOST_LIB_SUFFIX=-mt-s BOOST_THREAD_LIB_SUFFIX=_win32-mt-s OPENSSL_LIB_PATH=$HOME/build/openssl-1.0.0e OPENSSL_INCLUDE_PATH=$HOME/build/openssl-1.0.0e/include INCLUDEPATH=$HOME/build DEFINES=BOOST_THREAD_USE_LIB BITCOIN_NEED_QT_PLUGINS=1 QMAKE_LRELEASE=lrelease QMAKE_CXXFLAGS=-frandom-seed=bitcoin QMAKE_LFLAGS=-frandom-seed=bitcoin
+  make $MAKEOPTS
+  cp release/bitcoin-qt.exe $OUTDIR/
+  #
   cd src
   sed 's/$(DEBUGFLAGS)/-frandom-seed=bitcoin/' -i makefile.linux-mingw
   export LD_PRELOAD=/usr/lib/faketime/libfaketime.so.1
   export FAKETIME=$REFERENCE_DATETIME
   export TZ=UTC
-  make -f makefile.linux-mingw $MAKEOPTS DEPSDIR=$HOME/build bitcoin.exe USE_UPNP=1
   make -f makefile.linux-mingw $MAKEOPTS DEPSDIR=$HOME/build bitcoind.exe USE_UPNP=0
-  i586-mingw32msvc-strip bitcoin.exe
   i586-mingw32msvc-strip bitcoind.exe
   makensis ../share/setup.nsi
-  cp bitcoin.exe ../share/bitcoin-*-win32-setup.exe $OUTDIR/
+  cp ../share/bitcoin-*-win32-setup.exe $OUTDIR/
   mkdir $OUTDIR/daemon
   cp bitcoind.exe $OUTDIR/daemon

contrib/gitian-descriptors/gitian.yml

@@ -0,0 +1,48 @@
+---
+name: "bitcoin"
+suites:
+- "lucid"
+architectures:
+- "i386"
+- "amd64"
+packages: 
+- "libdb4.8++-dev"
+- "qt4-qmake"
+- "libqt4-dev"
+- "libboost-system-dev"
+- "libboost-filesystem-dev"
+- "libboost-program-options-dev"
+- "libboost-thread-dev"
+- "libssl-dev"
+- "git-core"
+- "unzip"
+reference_datetime: "2011-01-30 00:00:00"
+remotes:
+- "url": "https://github.com/bitcoin/bitcoin.git"
+  "dir": "bitcoin"
+files:
+- "miniupnpc-1.6.tar.gz"
+script: |
+  INSTDIR="$HOME/install"
+  export LIBRARY_PATH="$INSTDIR/lib"
+  #
+  tar xzf miniupnpc-1.6.tar.gz
+  cd miniupnpc-1.6
+  INSTALLPREFIX=$INSTDIR make $MAKEOPTS install
+  cd ..
+  #
+  cd bitcoin
+  mkdir -p $OUTDIR/src
+  cp -a . $OUTDIR/src
+  rm -rf $OUTDIR/src/.git
+  cp $OUTDIR/src/doc/README $OUTDIR
+  cp $OUTDIR/src/COPYING $OUTDIR
+  cd src
+  sed 's/$(DEBUGFLAGS)//' -i makefile.unix
+  make -f makefile.unix STATIC=1 DEFS="-I$INSTDIR/include -L$INSTDIR/lib" $MAKEOPTS bitcoind USE_UPNP=0
+  mkdir -p $OUTDIR/bin/$GBUILD_BITS
+  install -s bitcoind $OUTDIR/bin/$GBUILD_BITS
+  cd ..
+  qmake INCLUDEPATH="$INSTDIR/include" LIBS="-L$INSTDIR/lib" RELEASE=1
+  make $MAKEOPTS
+  install bitcoin-qt $OUTDIR/bin/$GBUILD_BITS

contrib/gitian-descriptors/qt-win32.yml

@@ -0,0 +1,54 @@
+---
+name: "qt"
+suites:
+- "lucid"
+architectures:
+- "i386"
+packages: 
+- "mingw32"
+- "zip"
+- "faketime"
+reference_datetime: "2011-01-30 00:00:00"
+remotes: []
+files:
+- "qt-everywhere-opensource-src-4.7.4.tar.gz"
+script: |
+  INSTDIR="$HOME/qt/"
+  mkdir $INSTDIR
+  SRCDIR="$INSTDIR/src/"
+  mkdir $SRCDIR
+  #
+  tar xzf qt-everywhere-opensource-src-4.7.4.tar.gz
+  cd qt-everywhere-opensource-src-4.7.4
+  sed 's/$TODAY/2011-01-30/' -i configure
+  sed 's/i686-pc-mingw32-/i586-mingw32msvc-/' -i mkspecs/unsupported/win32-g++-cross/qmake.conf
+  sed --posix 's|QMAKE_CFLAGS\t\t= -pipe|QMAKE_CFLAGS\t\t= -pipe -isystem /usr/i586-mingw32msvc/include/ -frandom-seed=qtbuild|' -i mkspecs/unsupported/win32-g++-cross/qmake.conf
+  sed 's/QMAKE_CXXFLAGS_EXCEPTIONS_ON = -fexceptions -mthreads/QMAKE_CXXFLAGS_EXCEPTIONS_ON = -fexceptions/' -i mkspecs/unsupported/win32-g++-cross/qmake.conf
+  sed 's/QMAKE_LFLAGS_EXCEPTIONS_ON = -mthreads/QMAKE_LFLAGS_EXCEPTIONS_ON = -lmingwthrd/' -i mkspecs/unsupported/win32-g++-cross/qmake.conf
+  sed --posix 's/QMAKE_MOC\t\t= i586-mingw32msvc-moc/QMAKE_MOC\t\t= moc/' -i mkspecs/unsupported/win32-g++-cross/qmake.conf
+  sed --posix 's/QMAKE_RCC\t\t= i586-mingw32msvc-rcc/QMAKE_RCC\t\t= rcc/' -i mkspecs/unsupported/win32-g++-cross/qmake.conf
+  sed --posix 's/QMAKE_UIC\t\t= i586-mingw32msvc-uic/QMAKE_UIC\t\t= uic/' -i mkspecs/unsupported/win32-g++-cross/qmake.conf
+  # ar adds timestamps to every object file included in the static library
+  # providing -D as ar argument is supposed to solve it, but doesn't work as qmake strips off the arguments and adds -M to pass a script...
+  # which somehow cannot be combined with other flags.
+  # use faketime only for ar, as it confuses make/qmake into hanging sometimes
+  sed --posix "s|QMAKE_LIB\t\t= i586-mingw32msvc-ar -ru|QMAKE_LIB\t\t= $HOME/ar -Dr|" -i mkspecs/unsupported/win32-g++-cross/qmake.conf
+  echo '#!/bin/bash' > $HOME/ar
+  echo 'export LD_PRELOAD=/usr/lib/faketime/libfaketime.so.1' >> $HOME/ar
+  echo 'i586-mingw32msvc-ar "$@"' >> $HOME/ar
+  chmod +x $HOME/ar
+  #export LD_PRELOAD=/usr/lib/faketime/libfaketime.so.1
+  export FAKETIME=$REFERENCE_DATETIME
+  export TZ=UTC
+  ./configure -prefix $INSTDIR -confirm-license -release -opensource -static -no-qt3support -xplatform unsupported/win32-g++-cross -no-multimedia -no-audio-backend -no-phonon -no-phonon-backend -no-declarative -no-script -no-scripttools -no-javascript-jit  -no-webkit -no-svg -no-xmlpatterns -no-sql-sqlite -no-nis -no-cups -no-iconv -no-dbus -no-gif -no-libtiff -opengl no -nomake examples -nomake demos -nomake docs
+  find . -name *.prl | xargs -l sed 's|/\.||' -i
+  find . -name *.prl | xargs -l sed 's|/$||' -i
+  make $MAKEOPTS install
+  cp -a bin $SRCDIR/
+  cd $INSTDIR
+  find . -name *.prl | xargs -l sed 's|/$||' -i
+  #sed 's|QMAKE_PRL_LIBS.*|QMAKE_PRL_LIBS = -lQtDeclarative -lQtScript -lQtSvg -lQtSql -lQtXmlPatterns -lQtGui -lgdi32 -lcomdlg32 -loleaut32 -limm32 -lwinmm -lwinspool -lmsimg32 -lQtNetwork -lQtCore -lole32 -luuid -lws2_32 -ladvapi32 -lshell32 -luser32 -lkernel32|' -i imports/Qt/labs/particles/qmlparticlesplugin.prl
+
+  # as zip stores file timestamps, use faketime to intercept stat calls to set dates for all files to reference date
+  export LD_PRELOAD=/usr/lib/faketime/libfaketime.so.1
+  zip -r $OUTDIR/qt-win32-4.7.4-gitian.zip *

contrib/gitian-downloader/linux-download-config

@@ -0,0 +1,30 @@
+--- 
+name: bitcoin
+urls:
+- http://bitcoin.org/bitcoin-latest-linux-gitian.zip
+rss:
+- url: http://sourceforge.net/api/file/index/project-id/244765/mtime/desc/limit/100/rss
+  xpath: //item/link/text()
+  pattern: bitcoin-\d+.\d+.\d+-linux-gitian.zip
+signers:
+  0A82509767C7D4A5D14DA2301AE1D35043E08E54:
+    weight: 40
+    name: BlueMatt
+    key: bluematt
+  BF6273FAEF7CC0BA1F562E50989F6B3048A116B5:
+    weight: 40
+    name: Devrandom
+    key: devrandom
+  D762373D24904A3E42F33B08B9A408E71DAAC974:
+    weight: 40
+    name: Sipa
+    key: sipa
+  77E72E69DA7EE0A148C06B21B34821D4944DE5F7:
+    weight: 40
+    name: tcatm
+    key: tcatm
+  01CDF4627A3B88AAE4A571C87588242FBE38D3A8:
+    weight: 40
+    name: "Gavin Andresen"
+    key: gavinandresen
+minimum_weight: 120

contrib/gitian-downloader/win32-download-config

@@ -0,0 +1,30 @@
+--- 
+name: bitcoin
+urls:
+- http://bitcoin.org/bitcoin-latest-win32-gitian.zip
+rss:
+- url: http://sourceforge.net/api/file/index/project-id/244765/mtime/desc/limit/100/rss
+  xpath: //item/link/text()
+  pattern: bitcoin-\d+.\d+.\d+-win32-gitian.zip
+signers:
+  0A82509767C7D4A5D14DA2301AE1D35043E08E54:
+    weight: 40
+    name: BlueMatt
+    key: bluematt
+  BF6273FAEF7CC0BA1F562E50989F6B3048A116B5:
+    weight: 40
+    name: Devrandom
+    key: devrandom
+  D762373D24904A3E42F33B08B9A408E71DAAC974:
+    weight: 40
+    name: Sipa
+    key: sipa
+  77E72E69DA7EE0A148C06B21B34821D4944DE5F7:
+    weight: 40
+    name: tcatm
+    key: tcatm
+  01CDF4627A3B88AAE4A571C87588242FBE38D3A8:
+    weight: 40
+    name: "Gavin Andresen"
+    key: gavinandresen
+minimum_weight: 120

contrib/gitian.yml

@@ -1,57 +0,0 @@
----
-name: "bitcoin"
-suites:
-- "lucid"
-architectures:
-- "i386"
-- "amd64"
-packages: 
-- "libdb4.8++-dev"
-- "libxxf86vm-dev"
-- "libgtk2.0-dev"
-- "libboost-all-dev"
-- "libssl-dev"
-- "git-core"
-- "unzip"
-reference_datetime: "2011-01-30 00:00:00"
-remotes:
-- "url": "https://github.com/bitcoin/bitcoin.git"
-  "dir": "bitcoin"
-files:
-- "wxWidgets-2.9.2-gitian.zip"
-- "miniupnpc-1.6.tar.gz"
-script: |
-  INSTDIR="$HOME/install"
-  export LIBRARY_PATH="$INSTDIR/lib"
-  #
-  tar xzf miniupnpc-1.6.tar.gz
-  cd miniupnpc-1.6
-  INSTALLPREFIX=$INSTDIR make $MAKEOPTS install
-  cd ..
-  #
-  mkdir -p $INSTDIR/bin $INSTDIR/lib/wx $INSTDIR/include
-  mkdir wxWidgets-2.9.2
-  cd wxWidgets-2.9.2
-  unzip ../wxWidgets-2.9.2-gitian.zip
-  cp -a bin/$GBUILD_BITS/wx/config/gtk2-unicode-static-2.9 $INSTDIR/bin/wx-config
-  for lib in wx_gtk2u wxregexu wxtiff; do
-    ar rc $INSTDIR/lib/lib${lib}-2.9.a bin/$GBUILD_BITS/$lib/*.o
-    ranlib $INSTDIR/lib/lib${lib}-2.9.a
-  done
-  cp -a include/wx-2.9/* $INSTDIR/include
-  cp -a bin/$GBUILD_BITS/wx/include $INSTDIR/lib/wx
-  cd ..
-  #
-  cd bitcoin
-  mkdir -p $OUTDIR/src
-  cp -a . $OUTDIR/src
-  rm -rf $OUTDIR/src/.git
-  mv $OUTDIR/src/locale $OUTDIR
-  cp $OUTDIR/src/doc/README $OUTDIR
-  cp $OUTDIR/src/COPYING $OUTDIR
-  cd src
-  sed 's/$(DEBUGFLAGS)//' -i makefile.unix
-  PATH=$INSTDIR/bin:$PATH make -f makefile.unix CXX="g++ -I$INSTDIR/include -L$INSTDIR/lib" $MAKEOPTS bitcoin USE_UPNP=1
-  PATH=$INSTDIR/bin:$PATH make -f makefile.unix CXX="g++ -I$INSTDIR/include -L$INSTDIR/lib" $MAKEOPTS bitcoind USE_UPNP=0
-  mkdir -p $OUTDIR/bin/$GBUILD_BITS
-  install -s bitcoin bitcoind $OUTDIR/bin/$GBUILD_BITS

contrib/macdeploy/LICENSE

@@ -0,0 +1,674 @@
+                    GNU GENERAL PUBLIC LICENSE
+                       Version 3, 29 June 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+                            Preamble
+
+  The GNU General Public License is a free, copyleft license for
+software and other kinds of works.
+
+  The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works.  By contrast,
+the GNU General Public License is intended to guarantee your freedom to
+share and change all versions of a program--to make sure it remains free
+software for all its users.  We, the Free Software Foundation, use the
+GNU General Public License for most of our software; it applies also to
+any other work released this way by its authors.  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+them if you wish), that you receive source code or can get it if you
+want it, that you can change the software or use pieces of it in new
+free programs, and that you know you can do these things.
+
+  To protect your rights, we need to prevent others from denying you
+these rights or asking you to surrender the rights.  Therefore, you have
+certain responsibilities if you distribute copies of the software, or if
+you modify it: responsibilities to respect the freedom of others.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must pass on to the recipients the same
+freedoms that you received.  You must make sure that they, too, receive
+or can get the source code.  And you must show them these terms so they
+know their rights.
+
+  Developers that use the GNU GPL protect your rights with two steps:
+(1) assert copyright on the software, and (2) offer you this License
+giving you legal permission to copy, distribute and/or modify it.
+
+  For the developers' and authors' protection, the GPL clearly explains
+that there is no warranty for this free software.  For both users' and
+authors' sake, the GPL requires that modified versions be marked as
+changed, so that their problems will not be attributed erroneously to
+authors of previous versions.
+
+  Some devices are designed to deny users access to install or run
+modified versions of the software inside them, although the manufacturer
+can do so.  This is fundamentally incompatible with the aim of
+protecting users' freedom to change the software.  The systematic
+pattern of such abuse occurs in the area of products for individuals to
+use, which is precisely where it is most unacceptable.  Therefore, we
+have designed this version of the GPL to prohibit the practice for those
+products.  If such problems arise substantially in other domains, we
+stand ready to extend this provision to those domains in future versions
+of the GPL, as needed to protect the freedom of users.
+
+  Finally, every program is threatened constantly by software patents.
+States should not allow patents to restrict development and use of
+software on general-purpose computers, but in those that do, we wish to
+avoid the special danger that patents applied to a free program could
+make it effectively proprietary.  To prevent this, the GPL assures that
+patents cannot be used to render the program non-free.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+                       TERMS AND CONDITIONS
+
+  0. Definitions.
+
+  "This License" refers to version 3 of the GNU General Public License.
+
+  "Copyright" also means copyright-like laws that apply to other kinds of
+works, such as semiconductor masks.
+
+  "The Program" refers to any copyrightable work licensed under this
+License.  Each licensee is addressed as "you".  "Licensees" and
+"recipients" may be individuals or organizations.
+
+  To "modify" a work means to copy from or adapt all or part of the work
+in a fashion requiring copyright permission, other than the making of an
+exact copy.  The resulting work is called a "modified version" of the
+earlier work or a work "based on" the earlier work.
+
+  A "covered work" means either the unmodified Program or a work based
+on the Program.
+
+  To "propagate" a work means to do anything with it that, without
+permission, would make you directly or secondarily liable for
+infringement under applicable copyright law, except executing it on a
+computer or modifying a private copy.  Propagation includes copying,
+distribution (with or without modification), making available to the
+public, and in some countries other activities as well.
+
+  To "convey" a work means any kind of propagation that enables other
+parties to make or receive copies.  Mere interaction with a user through
+a computer network, with no transfer of a copy, is not conveying.
+
+  An interactive user interface displays "Appropriate Legal Notices"
+to the extent that it includes a convenient and prominently visible
+feature that (1) displays an appropriate copyright notice, and (2)
+tells the user that there is no warranty for the work (except to the
+extent that warranties are provided), that licensees may convey the
+work under this License, and how to view a copy of this License.  If
+the interface presents a list of user commands or options, such as a
+menu, a prominent item in the list meets this criterion.
+
+  1. Source Code.
+
+  The "source code" for a work means the preferred form of the work
+for making modifications to it.  "Object code" means any non-source
+form of a work.
+
+  A "Standard Interface" means an interface that either is an official
+standard defined by a recognized standards body, or, in the case of
+interfaces specified for a particular programming language, one that
+is widely used among developers working in that language.
+
+  The "System Libraries" of an executable work include anything, other
+than the work as a whole, that (a) is included in the normal form of
+packaging a Major Component, but which is not part of that Major
+Component, and (b) serves only to enable use of the work with that
+Major Component, or to implement a Standard Interface for which an
+implementation is available to the public in source code form.  A
+"Major Component", in this context, means a major essential component
+(kernel, window system, and so on) of the specific operating system
+(if any) on which the executable work runs, or a compiler used to
+produce the work, or an object code interpreter used to run it.
+
+  The "Corresponding Source" for a work in object code form means all
+the source code needed to generate, install, and (for an executable
+work) run the object code and to modify the work, including scripts to
+control those activities.  However, it does not include the work's
+System Libraries, or general-purpose tools or generally available free
+programs which are used unmodified in performing those activities but
+which are not part of the work.  For example, Corresponding Source
+includes interface definition files associated with source files for
+the work, and the source code for shared libraries and dynamically
+linked subprograms that the work is specifically designed to require,
+such as by intimate data communication or control flow between those
+subprograms and other parts of the work.
+
+  The Corresponding Source need not include anything that users
+can regenerate automatically from other parts of the Corresponding
+Source.
+
+  The Corresponding Source for a work in source code form is that
+same work.
+
+  2. Basic Permissions.
+
+  All rights granted under this License are granted for the term of
+copyright on the Program, and are irrevocable provided the stated
+conditions are met.  This License explicitly affirms your unlimited
+permission to run the unmodified Program.  The output from running a
+covered work is covered by this License only if the output, given its
+content, constitutes a covered work.  This License acknowledges your
+rights of fair use or other equivalent, as provided by copyright law.
+
+  You may make, run and propagate covered works that you do not
+convey, without conditions so long as your license otherwise remains
+in force.  You may convey covered works to others for the sole purpose
+of having them make modifications exclusively for you, or provide you
+with facilities for running those works, provided that you comply with
+the terms of this License in conveying all material for which you do
+not control copyright.  Those thus making or running the covered works
+for you must do so exclusively on your behalf, under your direction
+and control, on terms that prohibit them from making any copies of
+your copyrighted material outside their relationship with you.
+
+  Conveying under any other circumstances is permitted solely under
+the conditions stated below.  Sublicensing is not allowed; section 10
+makes it unnecessary.
+
+  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
+
+  No covered work shall be deemed part of an effective technological
+measure under any applicable law fulfilling obligations under article
+11 of the WIPO copyright treaty adopted on 20 December 1996, or
+similar laws prohibiting or restricting circumvention of such
+measures.
+
+  When you convey a covered work, you waive any legal power to forbid
+circumvention of technological measures to the extent such circumvention
+is effected by exercising rights under this License with respect to
+the covered work, and you disclaim any intention to limit operation or
+modification of the work as a means of enforcing, against the work's
+users, your or third parties' legal rights to forbid circumvention of
+technological measures.
+
+  4. Conveying Verbatim Copies.
+
+  You may convey verbatim copies of the Program's source code as you
+receive it, in any medium, provided that you conspicuously and
+appropriately publish on each copy an appropriate copyright notice;
+keep intact all notices stating that this License and any
+non-permissive terms added in accord with section 7 apply to the code;
+keep intact all notices of the absence of any warranty; and give all
+recipients a copy of this License along with the Program.
+
+  You may charge any price or no price for each copy that you convey,
+and you may offer support or warranty protection for a fee.
+
+  5. Conveying Modified Source Versions.
+
+  You may convey a work based on the Program, or the modifications to
+produce it from the Program, in the form of source code under the
+terms of section 4, provided that you also meet all of these conditions:
+
+    a) The work must carry prominent notices stating that you modified
+    it, and giving a relevant date.
+
+    b) The work must carry prominent notices stating that it is
+    released under this License and any conditions added under section
+    7.  This requirement modifies the requirement in section 4 to
+    "keep intact all notices".
+
+    c) You must license the entire work, as a whole, under this
+    License to anyone who comes into possession of a copy.  This
+    License will therefore apply, along with any applicable section 7
+    additional terms, to the whole of the work, and all its parts,
+    regardless of how they are packaged.  This License gives no
+    permission to license the work in any other way, but it does not
+    invalidate such permission if you have separately received it.
+
+    d) If the work has interactive user interfaces, each must display
+    Appropriate Legal Notices; however, if the Program has interactive
+    interfaces that do not display Appropriate Legal Notices, your
+    work need not make them do so.
+
+  A compilation of a covered work with other separate and independent
+works, which are not by their nature extensions of the covered work,
+and which are not combined with it such as to form a larger program,
+in or on a volume of a storage or distribution medium, is called an
+"aggregate" if the compilation and its resulting copyright are not
+used to limit the access or legal rights of the compilation's users
+beyond what the individual works permit.  Inclusion of a covered work
+in an aggregate does not cause this License to apply to the other
+parts of the aggregate.
+
+  6. Conveying Non-Source Forms.
+
+  You may convey a covered work in object code form under the terms
+of sections 4 and 5, provided that you also convey the
+machine-readable Corresponding Source under the terms of this License,
+in one of these ways:
+
+    a) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by the
+    Corresponding Source fixed on a durable physical medium
+    customarily used for software interchange.
+
+    b) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by a
+    written offer, valid for at least three years and valid for as
+    long as you offer spare parts or customer support for that product
+    model, to give anyone who possesses the object code either (1) a
+    copy of the Corresponding Source for all the software in the
+    product that is covered by this License, on a durable physical
+    medium customarily used for software interchange, for a price no
+    more than your reasonable cost of physically performing this
+    conveying of source, or (2) access to copy the
+    Corresponding Source from a network server at no charge.
+
+    c) Convey individual copies of the object code with a copy of the
+    written offer to provide the Corresponding Source.  This
+    alternative is allowed only occasionally and noncommercially, and
+    only if you received the object code with such an offer, in accord
+    with subsection 6b.
+
+    d) Convey the object code by offering access from a designated
+    place (gratis or for a charge), and offer equivalent access to the
+    Corresponding Source in the same way through the same place at no
+    further charge.  You need not require recipients to copy the
+    Corresponding Source along with the object code.  If the place to
+    copy the object code is a network server, the Corresponding Source
+    may be on a different server (operated by you or a third party)
+    that supports equivalent copying facilities, provided you maintain
+    clear directions next to the object code saying where to find the
+    Corresponding Source.  Regardless of what server hosts the
+    Corresponding Source, you remain obligated to ensure that it is
+    available for as long as needed to satisfy these requirements.
+
+    e) Convey the object code using peer-to-peer transmission, provided
+    you inform other peers where the object code and Corresponding
+    Source of the work are being offered to the general public at no
+    charge under subsection 6d.
+
+  A separable portion of the object code, whose source code is excluded
+from the Corresponding Source as a System Library, need not be
+included in conveying the object code work.
+
+  A "User Product" is either (1) a "consumer product", which means any
+tangible personal property which is normally used for personal, family,
+or household purposes, or (2) anything designed or sold for incorporation
+into a dwelling.  In determining whether a product is a consumer product,
+doubtful cases shall be resolved in favor of coverage.  For a particular
+product received by a particular user, "normally used" refers to a
+typical or common use of that class of product, regardless of the status
+of the particular user or of the way in which the particular user
+actually uses, or expects or is expected to use, the product.  A product
+is a consumer product regardless of whether the product has substantial
+commercial, industrial or non-consumer uses, unless such uses represent
+the only significant mode of use of the product.
+
+  "Installation Information" for a User Product means any methods,
+procedures, authorization keys, or other information required to install
+and execute modified versions of a covered work in that User Product from
+a modified version of its Corresponding Source.  The information must
+suffice to ensure that the continued functioning of the modified object
+code is in no case prevented or interfered with solely because
+modification has been made.
+
+  If you convey an object code work under this section in, or with, or
+specifically for use in, a User Product, and the conveying occurs as
+part of a transaction in which the right of possession and use of the
+User Product is transferred to the recipient in perpetuity or for a
+fixed term (regardless of how the transaction is characterized), the
+Corresponding Source conveyed under this section must be accompanied
+by the Installation Information.  But this requirement does not apply
+if neither you nor any third party retains the ability to install
+modified object code on the User Product (for example, the work has
+been installed in ROM).
+
+  The requirement to provide Installation Information does not include a
+requirement to continue to provide support service, warranty, or updates
+for a work that has been modified or installed by the recipient, or for
+the User Product in which it has been modified or installed.  Access to a
+network may be denied when the modification itself materially and
+adversely affects the operation of the network or violates the rules and
+protocols for communication across the network.
+
+  Corresponding Source conveyed, and Installation Information provided,
+in accord with this section must be in a format that is publicly
+documented (and with an implementation available to the public in
+source code form), and must require no special password or key for
+unpacking, reading or copying.
+
+  7. Additional Terms.
+
+  "Additional permissions" are terms that supplement the terms of this
+License by making exceptions from one or more of its conditions.
+Additional permissions that are applicable to the entire Program shall
+be treated as though they were included in this License, to the extent
+that they are valid under applicable law.  If additional permissions
+apply only to part of the Program, that part may be used separately
+under those permissions, but the entire Program remains governed by
+this License without regard to the additional permissions.
+
+  When you convey a copy of a covered work, you may at your option
+remove any additional permissions from that copy, or from any part of
+it.  (Additional permissions may be written to require their own
+removal in certain cases when you modify the work.)  You may place
+additional permissions on material, added by you to a covered work,
+for which you have or can give appropriate copyright permission.
+
+  Notwithstanding any other provision of this License, for material you
+add to a covered work, you may (if authorized by the copyright holders of
+that material) supplement the terms of this License with terms:
+
+    a) Disclaiming warranty or limiting liability differently from the
+    terms of sections 15 and 16 of this License; or
+
+    b) Requiring preservation of specified reasonable legal notices or
+    author attributions in that material or in the Appropriate Legal
+    Notices displayed by works containing it; or
+
+    c) Prohibiting misrepresentation of the origin of that material, or
+    requiring that modified versions of such material be marked in
+    reasonable ways as different from the original version; or
+
+    d) Limiting the use for publicity purposes of names of licensors or
+    authors of the material; or
+
+    e) Declining to grant rights under trademark law for use of some
+    trade names, trademarks, or service marks; or
+
+    f) Requiring indemnification of licensors and authors of that
+    material by anyone who conveys the material (or modified versions of
+    it) with contractual assumptions of liability to the recipient, for
+    any liability that these contractual assumptions directly impose on
+    those licensors and authors.
+
+  All other non-permissive additional terms are considered "further
+restrictions" within the meaning of section 10.  If the Program as you
+received it, or any part of it, contains a notice stating that it is
+governed by this License along with a term that is a further
+restriction, you may remove that term.  If a license document contains
+a further restriction but permits relicensing or conveying under this
+License, you may add to a covered work material governed by the terms
+of that license document, provided that the further restriction does
+not survive such relicensing or conveying.
+
+  If you add terms to a covered work in accord with this section, you
+must place, in the relevant source files, a statement of the
+additional terms that apply to those files, or a notice indicating
+where to find the applicable terms.
+
+  Additional terms, permissive or non-permissive, may be stated in the
+form of a separately written license, or stated as exceptions;
+the above requirements apply either way.
+
+  8. Termination.
+
+  You may not propagate or modify a covered work except as expressly
+provided under this License.  Any attempt otherwise to propagate or
+modify it is void, and will automatically terminate your rights under
+this License (including any patent licenses granted under the third
+paragraph of section 11).
+
+  However, if you cease all violation of this License, then your
+license from a particular copyright holder is reinstated (a)
+provisionally, unless and until the copyright holder explicitly and
+finally terminates your license, and (b) permanently, if the copyright
+holder fails to notify you of the violation by some reasonable means
+prior to 60 days after the cessation.
+
+  Moreover, your license from a particular copyright holder is
+reinstated permanently if the copyright holder notifies you of the
+violation by some reasonable means, this is the first time you have
+received notice of violation of this License (for any work) from that
+copyright holder, and you cure the violation prior to 30 days after
+your receipt of the notice.
+
+  Termination of your rights under this section does not terminate the
+licenses of parties who have received copies or rights from you under
+this License.  If your rights have been terminated and not permanently
+reinstated, you do not qualify to receive new licenses for the same
+material under section 10.
+
+  9. Acceptance Not Required for Having Copies.
+
+  You are not required to accept this License in order to receive or
+run a copy of the Program.  Ancillary propagation of a covered work
+occurring solely as a consequence of using peer-to-peer transmission
+to receive a copy likewise does not require acceptance.  However,
+nothing other than this License grants you permission to propagate or
+modify any covered work.  These actions infringe copyright if you do
+not accept this License.  Therefore, by modifying or propagating a
+covered work, you indicate your acceptance of this License to do so.
+
+  10. Automatic Licensing of Downstream Recipients.
+
+  Each time you convey a covered work, the recipient automatically
+receives a license from the original licensors, to run, modify and
+propagate that work, subject to this License.  You are not responsible
+for enforcing compliance by third parties with this License.
+
+  An "entity transaction" is a transaction transferring control of an
+organization, or substantially all assets of one, or subdividing an
+organization, or merging organizations.  If propagation of a covered
+work results from an entity transaction, each party to that
+transaction who receives a copy of the work also receives whatever
+licenses to the work the party's predecessor in interest had or could
+give under the previous paragraph, plus a right to possession of the
+Corresponding Source of the work from the predecessor in interest, if
+the predecessor has it or can get it with reasonable efforts.
+
+  You may not impose any further restrictions on the exercise of the
+rights granted or affirmed under this License.  For example, you may
+not impose a license fee, royalty, or other charge for exercise of
+rights granted under this License, and you may not initiate litigation
+(including a cross-claim or counterclaim in a lawsuit) alleging that
+any patent claim is infringed by making, using, selling, offering for
+sale, or importing the Program or any portion of it.
+
+  11. Patents.
+
+  A "contributor" is a copyright holder who authorizes use under this
+License of the Program or a work on which the Program is based.  The
+work thus licensed is called the contributor's "contributor version".
+
+  A contributor's "essential patent claims" are all patent claims
+owned or controlled by the contributor, whether already acquired or
+hereafter acquired, that would be infringed by some manner, permitted
+by this License, of making, using, or selling its contributor version,
+but do not include claims that would be infringed only as a
+consequence of further modification of the contributor version.  For
+purposes of this definition, "control" includes the right to grant
+patent sublicenses in a manner consistent with the requirements of
+this License.
+
+  Each contributor grants you a non-exclusive, worldwide, royalty-free
+patent license under the contributor's essential patent claims, to
+make, use, sell, offer for sale, import and otherwise run, modify and
+propagate the contents of its contributor version.
+
+  In the following three paragraphs, a "patent license" is any express
+agreement or commitment, however denominated, not to enforce a patent
+(such as an express permission to practice a patent or covenant not to
+sue for patent infringement).  To "grant" such a patent license to a
+party means to make such an agreement or commitment not to enforce a
+patent against the party.
+
+  If you convey a covered work, knowingly relying on a patent license,
+and the Corresponding Source of the work is not available for anyone
+to copy, free of charge and under the terms of this License, through a
+publicly available network server or other readily accessible means,
+then you must either (1) cause the Corresponding Source to be so
+available, or (2) arrange to deprive yourself of the benefit of the
+patent license for this particular work, or (3) arrange, in a manner
+consistent with the requirements of this License, to extend the patent
+license to downstream recipients.  "Knowingly relying" means you have
+actual knowledge that, but for the patent license, your conveying the
+covered work in a country, or your recipient's use of the covered work
+in a country, would infringe one or more identifiable patents in that
+country that you have reason to believe are valid.
+
+  If, pursuant to or in connection with a single transaction or
+arrangement, you convey, or propagate by procuring conveyance of, a
+covered work, and grant a patent license to some of the parties
+receiving the covered work authorizing them to use, propagate, modify
+or convey a specific copy of the covered work, then the patent license
+you grant is automatically extended to all recipients of the covered
+work and works based on it.
+
+  A patent license is "discriminatory" if it does not include within
+the scope of its coverage, prohibits the exercise of, or is
+conditioned on the non-exercise of one or more of the rights that are
+specifically granted under this License.  You may not convey a covered
+work if you are a party to an arrangement with a third party that is
+in the business of distributing software, under which you make payment
+to the third party based on the extent of your activity of conveying
+the work, and under which the third party grants, to any of the
+parties who would receive the covered work from you, a discriminatory
+patent license (a) in connection with copies of the covered work
+conveyed by you (or copies made from those copies), or (b) primarily
+for and in connection with specific products or compilations that
+contain the covered work, unless you entered into that arrangement,
+or that patent license was granted, prior to 28 March 2007.
+
+  Nothing in this License shall be construed as excluding or limiting
+any implied license or other defenses to infringement that may
+otherwise be available to you under applicable patent law.
+
+  12. No Surrender of Others' Freedom.
+
+  If conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot convey a
+covered work so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you may
+not convey it at all.  For example, if you agree to terms that obligate you
+to collect a royalty for further conveying from those to whom you convey
+the Program, the only way you could satisfy both those terms and this
+License would be to refrain entirely from conveying the Program.
+
+  13. Use with the GNU Affero General Public License.
+
+  Notwithstanding any other provision of this License, you have
+permission to link or combine any covered work with a work licensed
+under version 3 of the GNU Affero General Public License into a single
+combined work, and to convey the resulting work.  The terms of this
+License will continue to apply to the part which is the covered work,
+but the special requirements of the GNU Affero General Public License,
+section 13, concerning interaction through a network will apply to the
+combination as such.
+
+  14. Revised Versions of this License.
+
+  The Free Software Foundation may publish revised and/or new versions of
+the GNU General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+  Each version is given a distinguishing version number.  If the
+Program specifies that a certain numbered version of the GNU General
+Public License "or any later version" applies to it, you have the
+option of following the terms and conditions either of that numbered
+version or of any later version published by the Free Software
+Foundation.  If the Program does not specify a version number of the
+GNU General Public License, you may choose any version ever published
+by the Free Software Foundation.
+
+  If the Program specifies that a proxy can decide which future
+versions of the GNU General Public License can be used, that proxy's
+public statement of acceptance of a version permanently authorizes you
+to choose that version for the Program.
+
+  Later license versions may give you additional or different
+permissions.  However, no additional obligations are imposed on any
+author or copyright holder as a result of your choosing to follow a
+later version.
+
+  15. Disclaimer of Warranty.
+
+  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
+APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
+HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
+OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
+IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
+ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+  16. Limitation of Liability.
+
+  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
+THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
+GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
+USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
+DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
+PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
+EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGES.
+
+  17. Interpretation of Sections 15 and 16.
+
+  If the disclaimer of warranty and limitation of liability provided
+above cannot be given local legal effect according to their terms,
+reviewing courts shall apply local law that most closely approximates
+an absolute waiver of all civil liability in connection with the
+Program, unless a warranty or assumption of liability accompanies a
+copy of the Program in return for a fee.
+
+                     END OF TERMS AND CONDITIONS
+
+            How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+state the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+Also add information on how to contact you by electronic and paper mail.
+
+  If the program does terminal interaction, make it output a short
+notice like this when it starts in an interactive mode:
+
+    <program>  Copyright (C) <year>  <name of author>
+    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    This is free software, and you are welcome to redistribute it
+    under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, your program's commands
+might be different; for a GUI interface, you would use an "about box".
+
+  You should also get your employer (if you work as a programmer) or school,
+if any, to sign a "copyright disclaimer" for the program, if necessary.
+For more information on this, and how to apply and follow the GNU GPL, see
+<http://www.gnu.org/licenses/>.
+
+  The GNU General Public License does not permit incorporating your program
+into proprietary programs.  If your program is a subroutine library, you
+may consider it more useful to permit linking proprietary applications with
+the library.  If this is what you want to do, use the GNU Lesser General
+Public License instead of this License.  But first, please read
+<http://www.gnu.org/philosophy/why-not-lgpl.html>.

contrib/macdeploy/fancy.plist

@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>window_bounds</key>
+	<array>
+		<integer>300</integer>
+		<integer>300</integer>
+		<integer>800</integer>
+		<integer>620</integer>
+	</array>
+	<key>background_picture</key>
+	<string>background.png</string>
+	<key>icon_size</key>
+	<integer>96</integer>
+	<key>applications_symlink</key>
+	<true/>
+	<key>items_position</key>
+	<dict>
+		<key>Applications</key>
+		<array>
+			<integer>370</integer>
+			<integer>156</integer>
+		</array>
+		<key>Bitcoin-Qt.app</key>
+		<array>
+			<integer>128</integer>
+			<integer>156</integer>
+		</array>
+	</dict>
+</dict>
+</plist>

contrib/macdeploy/macdeployqtplus

@@ -0,0 +1,341 @@
+#!/usr/bin/env python
+
+#
+# Copyright (C) 2011  Patrick "p2k" Schneider <me@p2k-network.org>
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+
+import subprocess, sys, re, os, shutil, os.path
+from time import sleep
+from argparse import ArgumentParser
+
+qt_conf="""[Paths]
+translations=Resources
+plugins=PlugIns
+"""
+
+ap = ArgumentParser(description="""Front-end to macdeployqt with some additional functions.
+
+Outputs a ready-to-deploy app in a folder "dist" and optionally wraps it in a .dmg file.
+Note, that the "dist" folder will be deleted before deploying on each run.
+
+Optionally, Qt translation files (.qm) and additional resources can be added to the bundle.""")
+
+ap.add_argument("app_bundle", nargs=1, metavar="app-bundle", help="application bundle to be deployed")
+ap.add_argument("-verbose", type=int, nargs=1, default=[1], metavar="<0-3>", help="0 = no output, 1 = error/warning (default), 2 = normal, 3 = debug")
+ap.add_argument("-no-plugins", dest="plugins", action="store_false", default=True, help="skip plugin deployment")
+ap.add_argument("-no-strip", dest="strip", action="store_false", default=True, help="don't run 'strip' on the binaries")
+ap.add_argument("-dmg", nargs="?", const="", metavar="basename", help="create a .dmg disk image; if basename is not specified, a camel-cased version of the app name is used")
+ap.add_argument("-fancy", nargs=1, metavar="plist", default=[], help="make a fancy looking disk image using the given plist file with instructions; requires -dmg to work")
+ap.add_argument("-add-qt-tr", nargs=1, metavar="languages", default=[], help="add Qt translation files to the bundle's ressources; the language list must be separated with commas, not with whitespace")
+ap.add_argument("-add-resources", nargs="+", metavar="path", default=[], help="list of additional files or folders to be copied into the bundle's resources; must be the last argument")
+
+config = ap.parse_args()
+
+verbose = config.verbose[0]
+
+# ------------------------------------------------
+
+app_bundle = config.app_bundle[0]
+
+if not os.path.exists(app_bundle):
+    if verbose >= 1:
+        sys.stderr.write("Error: Could not find app bundle \"%s\"\n" % (app_bundle))
+    sys.exit(1)
+
+app_bundle_name = os.path.splitext(os.path.basename(app_bundle))[0]
+
+# ------------------------------------------------
+
+for p in config.add_resources:
+    if verbose >= 3:
+        print "Checking for \"%s\"..." % p
+    if not os.path.exists(p):
+        if verbose >= 1:
+            sys.stderr.write("Error: Could not find additional resource file \"%s\"\n" % (p))
+        sys.exit(1)
+
+# ------------------------------------------------
+
+if len(config.add_qt_tr) == 0:
+    add_qt_tr = []
+else:
+    qt_tr_dir = os.path.join(os.getenv("QTDIR", ""), "translations")
+    add_qt_tr = ["qt_%s.qm" % lng for lng in config.add_qt_tr[0].split(",")]
+    for lng_file in add_qt_tr:
+        p = os.path.join(qt_tr_dir, lng_file)
+        if verbose >= 3:
+            print "Checking for \"%s\"..." % p
+        if not os.path.exists(p):
+            if verbose >= 1:
+                sys.stderr.write("Error: Could not find Qt translation file \"%s\"\n" % (lng_file))
+                sys.exit(1)
+
+# ------------------------------------------------
+
+if len(config.fancy) == 1:
+    if verbose >= 3:
+        print "Fancy: Importing plistlib..."
+    try:
+        import plistlib
+    except ImportError:
+        if verbose >= 1:
+            sys.stderr.write("Error: Could not import plistlib which is required for fancy disk images.\n")
+        sys.exit(1)
+    
+    if verbose >= 3:
+        print "Fancy: Importing appscript..."
+    try:
+        import appscript
+    except ImportError:
+        if verbose >= 1:
+            sys.stderr.write("Error: Could not import appscript which is required for fancy disk images.\n")
+            sys.stderr.write("Please install it e.g. with \"sudo easy_install appscript\".\n")
+        sys.exit(1)
+    
+    p = config.fancy[0]
+    if verbose >= 3:
+        print "Fancy: Loading \"%s\"..." % p
+    if not os.path.exists(p):
+        if verbose >= 1:
+            sys.stderr.write("Error: Could not find fancy disk image plist at \"%s\"\n" % (p))
+        sys.exit(1)
+    
+    try:
+        fancy = plistlib.readPlist(p)
+    except:
+        if verbose >= 1:
+            sys.stderr.write("Error: Could not parse fancy disk image plist at \"%s\"\n" % (p))
+        sys.exit(1)
+    
+    try:
+        assert not fancy.has_key("window_bounds") or (isinstance(fancy["window_bounds"], list) and len(fancy["window_bounds"]) == 4)
+        assert not fancy.has_key("background_picture") or isinstance(fancy["background_picture"], str)
+        assert not fancy.has_key("icon_size") or isinstance(fancy["icon_size"], int)
+        assert not fancy.has_key("applications_symlink") or isinstance(fancy["applications_symlink"], bool)
+        if fancy.has_key("items_position"):
+            assert isinstance(fancy["items_position"], dict)
+            for key, value in fancy["items_position"].iteritems():
+                assert isinstance(value, list) and len(value) == 2 and isinstance(value[0], int) and isinstance(value[1], int)
+    except:
+        if verbose >= 1:
+            sys.stderr.write("Error: Bad format of fancy disk image plist at \"%s\"\n" % (p))
+        sys.exit(1)
+    
+    if fancy.has_key("background_picture"):
+        bp = fancy["background_picture"]
+        if verbose >= 3:
+            print "Fancy: Resolving background picture \"%s\"..." % bp
+        if not os.path.exists(bp):
+            bp = os.path.join(os.path.dirname(p), bp)
+            if not os.path.exists(bp):
+                if verbose >= 1:
+                    sys.stderr.write("Error: Could not find background picture at \"%s\" or \"%s\"\n" % (fancy["background_picture"], bp))
+                sys.exit(1)
+            else:
+                fancy["background_picture"] = bp
+else:
+    fancy = None
+
+# ------------------------------------------------
+
+if os.path.exists("dist"):
+    if verbose >= 2:
+        print "+ Removing old dist folder +"
+    
+    shutil.rmtree("dist")
+
+# ------------------------------------------------
+
+target = os.path.join("dist", app_bundle)
+target_res = os.path.join(target, "Contents", "Resources")
+
+if verbose >= 2:
+    print "+ Copying source bundle +"
+if verbose >= 3:
+    print app_bundle, "->", target
+
+os.mkdir("dist")
+shutil.copytree(app_bundle, target)
+
+# ------------------------------------------------
+
+macdeployqt_args = ["macdeployqt", target, "-verbose=%d" % verbose]
+if not config.plugins:
+    macdeployqt_args.append("-no-plugins")
+if not config.strip:
+    macdeployqt_args.append("-no-strip")
+
+if verbose >= 2:
+    print "+ Running macdeployqt +"
+
+ret = subprocess.call(macdeployqt_args)
+if ret != 0:
+    sys.exit(ret)
+
+# ------------------------------------------------
+
+if verbose >= 2:
+    print "+ Installing qt.conf +"
+
+f = open(os.path.join(target_res, "qt.conf"), "wb")
+f.write(qt_conf)
+f.close()
+
+# ------------------------------------------------
+
+if len(add_qt_tr) > 0 and verbose >= 2:
+    print "+ Adding Qt translations +"
+
+for lng_file in add_qt_tr:
+    if verbose >= 3:
+        print os.path.join(qt_tr_dir, lng_file), "->", os.path.join(target_res, lng_file)
+    shutil.copy2(os.path.join(qt_tr_dir, lng_file), os.path.join(target_res, lng_file))
+
+# ------------------------------------------------
+
+if len(config.add_resources) > 0 and verbose >= 2:
+    print "+ Adding additional resources +"
+
+for p in config.add_resources:
+    t = os.path.join(target_res, os.path.basename(p))
+    if verbose >= 3:
+        print p, "->", t
+    if os.path.isdir(p):
+        shutil.copytree(p, t)
+    else:
+        shutil.copy2(p, t)
+
+# ------------------------------------------------
+
+if config.dmg is not None:
+    def runHDIUtil(verb, image_basename, **kwargs):
+        hdiutil_args = ["hdiutil", verb, image_basename + ".dmg"]
+        if kwargs.has_key("capture_stdout"):
+            del kwargs["capture_stdout"]
+            run = subprocess.check_output
+        else:
+            if verbose < 2:
+                hdiutil_args.append("-quiet")
+            elif verbose >= 3:
+                hdiutil_args.append("-verbose")
+            run = subprocess.check_call
+        
+        for key, value in kwargs.iteritems():
+            hdiutil_args.append("-" + key)
+            if not value is True:
+                hdiutil_args.append(str(value))
+        
+        return run(hdiutil_args)
+    
+    if verbose >= 2:
+        if fancy is None:
+            print "+ Creating .dmg disk image +"
+        else:
+            print "+ Preparing .dmg disk image +"
+    
+    if config.dmg != "":
+        dmg_name = config.dmg
+    else:
+        spl = app_bundle_name.split(" ")
+        dmg_name = spl[0] + "".join(p.capitalize() for p in spl[1:])
+    
+    if fancy is None:
+        try:
+            runHDIUtil("create", dmg_name, srcfolder="dist", format="UDBZ", volname=app_bundle_name, ov=True)
+        except subprocess.CalledProcessError as e:
+            sys.exit(e.returncode)
+    else:
+        if verbose >= 3:
+            print "Determining size of \"dist\"..."
+        size = 0
+        for path, dirs, files in os.walk("dist"):
+            for file in files:
+                size += os.path.getsize(os.path.join(path, file))
+        size += int(size * 0.1)
+        
+        if verbose >= 3:
+            print "Creating temp image for modification..."
+        try:
+            runHDIUtil("create", dmg_name + ".temp", srcfolder="dist", format="UDRW", size=size, volname=app_bundle_name, ov=True)
+        except subprocess.CalledProcessError as e:
+            sys.exit(e.returncode)
+        
+        if verbose >= 3:
+            print "Attaching temp image..."
+        try:
+            output = runHDIUtil("attach", dmg_name + ".temp", readwrite=True, noverify=True, noautoopen=True, capture_stdout=True)
+        except subprocess.CalledProcessError as e:
+            sys.exit(e.returncode)
+        
+        m = re.search("/Volumes/(.+$)", output)
+        disk_root = m.group(0)
+        disk_name = m.group(1)
+        
+        if verbose >= 2:
+            print "+ Applying fancy settings +"
+        
+        if fancy.has_key("background_picture"):
+            bg_path = os.path.join(disk_root, os.path.basename(fancy["background_picture"]))
+            if verbose >= 3:
+                print fancy["background_picture"], "->", bg_path
+            shutil.copy2(fancy["background_picture"], bg_path)
+        else:
+            bg_path = None
+        
+        if fancy.get("applications_symlink", False):
+            os.symlink("/Applications", os.path.join(disk_root, "Applications"))
+        
+        finder = appscript.app("Finder")
+        disk = finder.disks[disk_name]
+        disk.open()
+        window = disk.container_window
+        window.current_view.set(appscript.k.icon_view)
+        window.toolbar_visible.set(False)
+        window.statusbar_visible.set(False)
+        if fancy.has_key("window_bounds"):
+            window.bounds.set(fancy["window_bounds"])
+        view_options = window.icon_view_options
+        view_options.arrangement.set(appscript.k.not_arranged)
+        if fancy.has_key("icon_size"):
+            view_options.icon_size.set(fancy["icon_size"])
+        if bg_path is not None:
+            view_options.background_picture.set(disk.files[os.path.basename(bg_path)])
+        if fancy.has_key("items_position"):
+            for name, position in fancy["items_position"].iteritems():
+                window.items[name].position.set(position)
+        disk.close()
+        if bg_path is not None:
+            subprocess.call(["SetFile", "-a", "V", bg_path])
+        disk.update(registering_applications=False)
+        sleep(2)
+        disk.eject()
+        
+        if verbose >= 2:
+            print "+ Finalizing .dmg disk image +"
+        
+        try:
+            runHDIUtil("convert", dmg_name + ".temp", format="UDBZ", o=dmg_name + ".dmg", ov=True)
+        except subprocess.CalledProcessError as e:
+            sys.exit(e.returncode)
+        
+        os.unlink(dmg_name + ".temp.dmg")
+
+# ------------------------------------------------
+
+if verbose >= 2:
+    print "+ Done +"
+
+sys.exit(0)

contrib/macdeploy/notes.txt

@@ -0,0 +1,26 @@
+
+macdeployqtplus works best on OS X Lion, for Snow Leopard you'd need to install
+Python 2.7 and make it your default Python installation.
+
+You will need the appscript package for the fancy disk image creation to work.
+Install it by invoking "sudo easy_install appscript".
+
+Ths script should be invoked in the target directory like this:
+$source_dir/contrib/macdeploy/macdeployqtplus Bitcoin-Qt.app -add-qt-tr de,es,ru -dmg -fancy $source_dir/contrib/macdeploy/fancy.plist
+
+During the process, the disk image window will pop up briefly where the fancy
+settings are applied. This is normal, please do not interfere.
+
+You can also set up Qt Creator for invoking the script. For this, go to the
+"Projects" tab on the left side, switch to "Run Settings" above and add a
+deploy configuration. Next add a deploy step choosing "Custom Process Step".
+Fill in the following.
+
+Enable custom process step: [x]
+Command: %{sourceDir}/contrib/macdeploy/macdeployqtplus
+Working directory: %{buildDir}
+Command arguments: Bitcoin-Qt.app -add-qt-tr de,ru -dmg -fancy %{sourceDir}/contrib/macdeploy/fancy.plist 
+
+After that you can start the deployment process through the menu with
+Build -> Deploy Project "bitcoin-qt"
+

contrib/miniupnpc/Portfile

@@ -0,0 +1,43 @@
+# -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:filetype=tcl:et:sw=4:ts=4:sts=4
+# $Id$
+
+PortSystem          1.0
+
+name                miniupnpc
+epoch               2
+version             1.6
+revision            2
+categories          net
+platforms           darwin
+license             BSD
+maintainers         singingwolfboy openmaintainer
+description         Lightweight client for UPnP protocol
+long_description    \
+    ${description}
+    
+homepage            http://miniupnp.free.fr/
+master_sites        http://miniupnp.free.fr/files/download.php?file=${distname}${extract.suffix}&dummy=
+checksums           md5     88055f2d4a061cfd4cfe25a9eae22f67 \
+                    sha1    ef8f2edb17f2e7c5b8dc67ee80a65c199d823e0a \
+                    rmd160  d86b75b331a3fb5525c71708548f311977c0598f
+
+use_configure       no
+
+variant universal {}
+if {[variant_isset universal]} {
+    set archflags ${configure.universal_cflags}
+} else {
+    set archflags ${configure.cc_archflags}
+}
+
+build.args-append   CC="${configure.cc} ${archflags}"
+
+post-patch {
+    reinplace "s|-Wl,-install_name,|-Wl,-install_name,${prefix}/lib/|" ${worksrcpath}/Makefile
+}
+
+destroot.destdir    PREFIX=${prefix} INSTALLPREFIX=${destroot}${prefix}
+
+livecheck.type      regex
+livecheck.url       http://miniupnp.free.fr/files/
+livecheck.regex     ${name}-(\\d+(\\.\\d{1,4})+)${extract.suffix}

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)

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)

contrib/wxwidgets-win32.yml

@@ -1,40 +0,0 @@
----
-name: "wxwidgets"
-suites:
-- "lucid"
-architectures:
-- "i386"
-packages: 
-- "mingw32"
-- "faketime"
-- "zip"
-reference_datetime: "2011-01-30 00:00:00"
-remotes: []
-files:
-- "wxWidgets-2.9.2.tar.bz2"
-script: |
-  INSTDIR="$HOME/install"
-  TMPDIR="$HOME/tmpdir"
-  export LIBRARY_PATH="$INSTDIR/lib"
-  #
-  tar xjf wxWidgets-2.9.2.tar.bz2
-  cd wxWidgets-2.9.2
-  CXXFLAGS=-frandom-seed=wx1 ./configure --host=i586-mingw32msvc --build=i686-linux --prefix=$INSTDIR --disable-shared --enable-monolithic --without-libpng --disable-svg
-  perl -i -p -e "s/__TIME__/\"$REFERENCE_TIME\"/;s/__DATE__/\"$REFERENCE_DATE\"/" include/wx/chartype.h
-  make $MAKEOPTS install
-  mkdir $TMPDIR
-  cd $TMPDIR
-  cp -af $INSTDIR/include .
-  mkdir -p $TMPDIR/bin/$GBUILD_BITS
-  cd $TMPDIR/bin/$GBUILD_BITS
-  cp -af $INSTDIR/lib/wx .
-  for lib in wx_mswu; do
-      mkdir $lib
-      (cd $lib ; ar xf $INSTDIR/lib/lib${lib}-2.9-i586-mingw32msvc.a)
-  done
-  chmod -R +w $TMPDIR
-  cd $TMPDIR
-  export LD_PRELOAD=/usr/lib/faketime/libfaketime.so.1
-  export FAKETIME=$REFERENCE_DATETIME
-  zip -r wxwidgets-win32-2.9.2-gitian.zip *
-  cp wxwidgets-win32-2.9.2-gitian.zip $OUTDIR

contrib/wxwidgets.yml

@@ -1,42 +0,0 @@
----
-name: "wxwidgets"
-suites:
-- "lucid"
-architectures:
-- "i386"
-- "amd64"
-packages: 
-- "libxxf86vm-dev"
-- "libgtk2.0-dev"
-- "faketime"
-- "zip"
-reference_datetime: "2011-01-30 00:00:00"
-remotes: []
-files:
-- "wxWidgets-2.9.2.tar.bz2"
-script: |
-  INSTDIR="$HOME/install"
-  TMPDIR="$HOME/tmpdir"
-  export LIBRARY_PATH="$INSTDIR/lib"
-  #
-  tar xjf wxWidgets-2.9.2.tar.bz2
-  cd wxWidgets-2.9.2
-  ./configure --prefix=$INSTDIR --enable-monolithic --disable-shared
-  perl -i -p -e "s/__TIME__/\"$REFERENCE_TIME\"/;s/__DATE__/\"$REFERENCE_DATE\"/" include/wx/chartype.h
-  make $MAKEOPTS install
-  mkdir $TMPDIR
-  cd $TMPDIR
-  cp -af $INSTDIR/include .
-  mkdir -p $TMPDIR/bin/$GBUILD_BITS
-  cd $TMPDIR/bin/$GBUILD_BITS
-  cp -af $INSTDIR/lib/wx .
-  for lib in wxtiff wxregexu wx_gtk2u; do
-      mkdir $lib
-      (cd $lib ; ar xf $INSTDIR/lib/lib${lib}-2.9.a)
-  done
-  chmod -R +w $TMPDIR
-  cd $TMPDIR
-  export LD_PRELOAD=/usr/lib/faketime/libfaketime.so.1
-  export FAKETIME=$REFERENCE_DATETIME
-  zip -r wxWidgets-2.9.2-gitian.zip *
-  cp wxWidgets-2.9.2-gitian.zip $OUTDIR

doc/README

@@ -1,4 +1,4 @@
-Bitcoin 0.4.0rc1 BETA
+Bitcoin 0.5.0 BETA
 
 Copyright (c) 2009-2011 Bitcoin Developers
 Distributed under the MIT/X11 software license, see the accompanying
@@ -18,100 +18,16 @@ with each other, with the help of a P2P network to check for double-spending.
 
 Setup
 -----
+You need the Qt4 run-time libraries to run bitcoin-qt. On Debian or Ubuntu:
+  sudo apt-get install libqtgui4
+
 Unpack the files into a directory and run:
- bin/32/bitcoin (GUI, 32-bit)
+ bin/32/bitcoin-qt (GUI, 32-bit)
  bin/32/bitcoind (headless, 32-bit)
- bin/64/bitcoin (GUI, 64-bit)
+ bin/64/bitcoin-qt (GUI, 64-bit)
  bin/64/bitcoind (headless, 64-bit)
 
 
-Wallet Encryption
------------------
-Bitcoin supports native wallet encryption so that people who steal your
-wallet file don't automatically get access to all of your Bitcoins.
-In order to enable this feature, chose "Encrypt Wallet" from the
-Options menu.  You will be prompted to enter a passphrase, which
-will be used as the key to encrypt your wallet and will be needed
-every time you wish to send Bitcoins.  If you lose this passphrase,
-you will lose access to spend all of the bitcoins in your wallet,
-no one, not even the Bitcoin developers can recover your Bitcoins.
-This means you are responsible for your own security, store your
-passphrase in a secure location and do not forget it.
-
-Remember that the encryption built into bitcoin only encrypts the
-actual keys which are required to send your bitcoins, not the full
-wallet.  This means that someone who steals your wallet file will
-be able to see all the addresses which belong to you, as well as the
-relevant transactions, you are only protected from someone spending
-your coins.
-
-It is recommended that you backup your wallet file before you
-encrypt your wallet.  To do this, close the Bitcoin client and
-copy the wallet.dat file from ~/.bitcoin/ on Linux, /Users/(user
-name)/Application Support/Bitcoin/ on Mac OSX, and %APPDATA%/Bitcoin/
-on Windows (that is /Users/(user name)/AppData/Roaming/Bitcoin on
-Windows Vista and 7 and /Documents and Settings/(user name)/Application
-Data/Bitcoin on Windows XP).  Once you have copied that file to a
-safe location, reopen the Bitcoin client and Encrypt your wallet.
-If everything goes fine, delete the backup and enjoy your encrypted
-wallet.  Note that once you encrypt your wallet, you will never be
-able to go back to a version of the Bitcoin client older than 0.4.
-
-Keep in mind that you are always responsible for your own security.
-All it takes is a slightly more advanced wallet-stealing trojan which
-installs a keylogger to steal your wallet passphrase as you enter it
-in addition to your wallet file and you have lost all your Bitcoins.
-Wallet encryption cannot keep you safe if you do not practice
-good security, such as running up-to-date antivirus software, only
-entering your wallet passphrase in the Bitcoin client and using the
-same passphrase only as your wallet passphrase.
-
-
-Technical details of wallet encryption
---------------------------------------
-Wallet encryption uses AES-256-CBC to encrypt only the private keys
-that are held in a wallet.  The keys are encrypted with a master key
-which is entirely random.  This master key is then encrypted with
-AES-256-CBC with a key derived from the passphrase using SHA512 and
-OpenSSL's EVP_BytesToKey and a dynamic number of rounds determined by
-the speed of the machine which does the initial encryption (and is
-updated based on the speed of a computer which does a subsequent
-passphrase change).  Although the underlying code supports multiple
-encrypted copies of the same master key (and thus multiple passphrases)
-the client does not yet have a method to add additional passphrases.
-
-At runtime, the client loads the wallet as it normally would, however
-the keystore stores the keys in encrypted form.  When the passphrase
-is required (to top up keypool or send coins) it will either be queried
-by a GUI prompt, or must first be entered with the walletpassphrase
-RPC command.  This will change the wallet to "unlocked" state where the
-unencrypted master key is stored in memory (in the case of GUI, only for
-long enough to complete the requested operation, in RPC, for as long as
-is specified by the second parameter to walletpassphrase).  The wallet is
-then locked (or can be manually locked using the walletlock RPC command)
-and the unencrypted master key is removed from memory.
-
-Implementation details of wallet encryption
--------------------------------------------
-When the wallet is locked, calls to sendtoaddress, sendfrom, sendmany,
-and keypoolrefill will return Error -13: "Error: Please enter the wallet 
-passphrase with walletpassphrase first."
-
-When the wallet is unlocked, calls to walletpassphrase will fail.
-
-When a wallet is encrypted, the passphrase is required to top up the
-keypool, thus, if the passphrase is rarely entered, it is possible that
-keypool might run out.  In this case, the default key will be used as the
-target for payouts for mining, and calls to getnewaddress and getaccount
-address will return an error.  In order to prevent such cases, the keypool
-is automatically refilled when walletpassphrase is called with a correct
-passphrase and when topupkeypool is called (while the wallet is unlocked).
-Note that the keypool continues to be topped up on various occasions when
-a new key from pool is used and the wallet is unlocked (or unencrypted).
-
-
-
 See the documentation at the bitcoin wiki:
   https://en.bitcoin.it/wiki/Main_Page
-
-... for help and more information.
+for help and more information.

doc/README_windows.txt

@@ -1,4 +1,4 @@
-Bitcoin 0.4.00rc1 BETA
+Bitcoin 0.5.0 BETA
 
 Copyright (c) 2009-2011 Bitcoin Developers
 Distributed under the MIT/X11 software license, see the accompanying
@@ -18,7 +18,7 @@ with each other, with the help of a P2P network to check for double-spending.
 
 Setup
 -----
-Unpack the files into a directory and run bitcoin.exe.
+Unpack the files into a directory and run bitcoin-qt.exe.
 
 If you have Microsoft Security Essentials, you need to add bitcoin.exe to its
 "Excluded processes" list.  Microsoft Security Essentials->Settings tab,
@@ -27,8 +27,9 @@ select Excluded processes, press Add, select bitcoin.exe, OK, Save changes.
 The software automatically finds other nodes to connect to.  You can
 enable Universal Plug and Play using a menu entry or set your firewall
 to forward port 8333 (TCP) to your computer so you can receive
-incoming connections.  Bitcoin work without incoming connections,
+incoming connections.  Bitcoin works without incoming connections,
 but allowing incoming connections helps the Bitcoin network.
 
-See the bitcoin wiki at:  https://en.bitcoin.it/wiki/Main_Page
+See the bitcoin wiki at:
+  https://en.bitcoin.it/wiki/Main_Page
 for more help and information.

doc/assets-attribution.txt

@@ -0,0 +1,73 @@
+Icon: src/qt/res/icons/clock*.png, src/qt/res/icons/tx*.png,
+      src/qt/res/src/*.svg
+Designer: Wladimir van der Laan
+License: Creative Commons Attribution
+
+Icon: src/qt/res/icons/send.png
+Icon Pack: Vista Style Arrow
+Designer: Icons Land
+License: Freeware Non-commercial
+Site: http://findicons.com/icon/231371/right3green
+
+Icon: src/qt/res/icons/address-book.png
+Icon Pack: Farm-Fresh Web
+Designer: FatCow Web Hosting
+License: Creative Commons Attribution (by)
+Site: http://findicons.com/icon/163938/book_open
+
+Icon: src/qt/res/icons/connect*.png, src/qt/res/icons/synced.png, src/qt/res/icons/lock_*.png
+Icon Pack: Human-O2
+Designer: schollidesign
+License: GNU/GPL
+Site: http://findicons.com/icon/93743/blocks_gnome_netstatus_0
+
+Icon: src/qt/res/icons/transaction*.png
+Designer: md2k7
+Site: https://forum.bitcoin.org/index.php?topic=15276.0
+License: You are free to do with these icons as you wish, including selling,
+ copying, modifying etc.
+
+Icon: src/qt/res/icons/configure.png, src/qt/res/icons/quit.png,
+      src/qt/res/icons/editcopy.png, src/qt/res/icons/editpaste.png,
+      src/qt/res/icons/add.png, src/qt/res/icons/edit.png,
+      src/qt/res/icons/remove.png (edited)
+Designer: http://www.everaldo.com
+Icon Pack: Crystal SVG
+License: LGPL
+
+Icon: src/qt/res/icons/receive.png, src/qt/res/icons/history.png,
+      src/qt/res/icons/export.png
+Designer: Oxygen team
+Icon Pack: Oxygen
+License: Creative Common Attribution-ShareAlike 3.0 License or LGPL
+Site: http://www.oxygen-icons.org/
+
+Icon: src/qt/res/icons/bitcoin.png, src/qt/res/icons/toolbar.png
+Designer: Bitboy (optimized for 16x16 by Wladimir van der Laan)
+License: Public Domain
+Site: http://forum.bitcoin.org/?topic=1756.0
+
+Icon: src/qt/res/icons/overview.png
+Icon Pack: Primo
+Designer: Jack Cai
+License: Creative Commons Attribution No Derivatives (by-nd)
+Site: http://findicons.com/icon/175944/home?id=176221#
+
+Icon:  scripts/img/reload.xcf (modified),src/qt/res/movies/update_spinner.mng
+Icon Pack: Kids
+Designer: Everaldo (Everaldo Coelho)
+License: GNU/GPL 
+Site: http://findicons.com/icon/17102/reload?id=17102
+
+Image: src/qt/res/images/splash2.jpg (Wallet image)
+Designer: Crobbo (forum)
+Site: https://bitcointalk.org/index.php?topic=32273.0
+License: Public domain
+
+Icon: src/qt/res/icons/key.png
+Designer: VisualPharm (Ivan Boyko)
+Icon Pack: Must Have
+Site: http://findicons.com/icon/51009/key?id=51009
+License: Creative Commons Attribution (by)
+
+

doc/build-msw.txt

@@ -7,19 +7,16 @@ cryptographic software written by Eric Young (eay@cryptsoft.com) and UPnP
 software written by Thomas Bernard.
 
 
+See readme-qt.rst for instructions on building Bitcoin QT, the
+graphical user interface.
+
 WINDOWS BUILD NOTES
 ===================
 
 Compilers Supported
 -------------------
-MinGW GCC  http://tdm-gcc.tdragon.net/
-   TDM-GCC with gcc 4.5.1 was used to build this release.
-MSYS 1.0.11 was also used (sh needed to compile some dependencies)
-
-
-Candidate releases were built with MSVC 10.0 (2010), but
-compiling with Visual C++ caused rendering artifacts when
-bitcoin was run.
+TODO: What works?
+Note: releases are cross-compiled using mingw running on Linux.
 
 
 Dependencies
@@ -27,46 +24,31 @@ Dependencies
 Libraries you need to download separately and build:
 
                 default path               download
-wxWidgets       \wxwidgets-2.9.2-mgw       http://www.wxwidgets.org/downloads/
 OpenSSL         \openssl-1.0.0d-mgw        http://www.openssl.org/source/
 Berkeley DB     \db-4.8.30.NC-mgw          http://www.oracle.com/technology/software/products/berkeley-db/index.html
 Boost           \boost-1.47.0-mgw          http://www.boost.org/users/download/
 miniupnpc       \miniupnpc-1.6-mgw         http://miniupnp.tuxfamily.org/files/
 
 Their licenses:
-wxWidgets      LGPL 2.1 with very liberal exceptions
 OpenSSL        Old BSD license with the problematic advertising requirement
 Berkeley DB    New BSD license with additional requirement that linked software must be free open source
 Boost          MIT-like license
 miniupnpc      New (3-clause) BSD license
 
 Versions used in this release:
-wxWidgets    2.9.2
-OpenSSL      1.0.0d
+OpenSSL      1.0.0e
 Berkeley DB  4.8.30.NC
 Boost        1.47.0
 miniupnpc    1.6
 
 
-Notes
------
-The UI layout is edited with wxFormBuilder.  The project file is
-uiproject.fbp.  It generates uibase.cpp and uibase.h, which define base
-classes that do the rote work of constructing all the UI elements.
-
-wxWidgets
----------
-DOS shell:
-cd \wxWidgets-2.9.2-mgw\build\msw
-mingw32-make -f makefile.gcc
-
 OpenSSL
 -------
 MSYS shell:
 un-tar sources with MSYS 'tar xfz' to avoid issue with symlinks (OpenSSL ticket 2377)
 change 'MAKE' env. variable from 'C:\MinGW32\bin\mingw32-make.exe' to '/c/MinGW32/bin/mingw32-make.exe'
 
-cd /c/openssl-1.0.0d-mgw
+cd /c/openssl-1.0.0e-mgw
 ./config
 make
 
@@ -98,6 +80,5 @@ Bitcoin
 -------
 DOS prompt:
 cd \bitcoin\src
-mingw32-make bitcoin.exe bitcoind.exe -f makefile.mingw
-strip bitcoin.exe
+mingw32-make -f makefile.mingw
 strip bitcoind.exe

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
@@ -8,11 +7,14 @@ software written by Eric Young (eay@cryptsoft.com) and UPnP software written by
 Thomas Bernard.
 
 
-Mac OS X build instructions
+Mac OS X bitcoind build instructions
 Laszlo Hanyecz <solar@heliacal.net>
 Douglas Huff <dhuff@jrbobdobbs.org>
 
 
+See readme-qt.rst for instructions on building Bitcoin QT, the
+graphical user interface.
+
 Tested on 10.5 and 10.6 intel.  PPC is not supported because it's big-endian.
 
 All of the commands should be executed in Terminal.app.. it's in
@@ -23,256 +25,32 @@ 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
-~/bitcoin/Bitcoin.app   # the application bundle where you can run the app
+2.  Download and install MacPorts from http://www.macports.org/
 
-Just execute: mkdir ~/bitcoin
-This will create the top dir for you..
+2a. (for 10.7 Lion)
+    Edit /opt/local/etc/macports/macports.conf and uncomment "build_arch i386"
 
-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.
+3.  Install dependencies from MacPorts
 
-2.  Check out the bitcoin code from github:
+sudo port install boost db48 openssl
 
-cd ~/bitcoin
-git clone https://github.com/bitcoin/bitcoin.git
-ln -s bitcoin/src src
+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).
 
-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.
+4.  Now you should be able to build bitcoind:
 
-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
-
-
-wxWidgets
----------
-
-(The wxWidgets-devel MacPorts package will work but will throw annoying assertion dialogs.)
-
-This is the big one..
-
-Check it out from svn
-
-cd ~/bitcoin/deps
-svn checkout http://svn.wxwidgets.org/svn/wx/wxWidgets/trunk wxWidgets-trunk
-
-This will make a wxWidgets-trunk directory in deps.
-
-Use this script snippet, change your prefix to whatever your dir is:
-
-PREFIX=~/bitcoin/deps
-SRCDIR="$PREFIX/wxWidgets-trunk"
-BUILDDIR="$SRCDIR/macbuild"
-
-cd "$PREFIX" &&
-#svn checkout http://svn.wxwidgets.org/svn/wx/wxWidgets/trunk wxWidgets-trunk &&
-cd "$SRCDIR" &&
-
-[ -f include/wx/hashmap.h.orig ] || cp include/wx/hashmap.h include/wx/hashmap.h.orig &&
-sed 's/if wxUSE_STL/if 0 \&\& wxUSE_STL/g' < include/wx/hashmap.h.orig > include/wx/hashmap.h &&
-
-[ -f include/wx/hashset.h.orig ] || cp include/wx/hashset.h include/wx/hashset.h.orig &&
-sed 's/if wxUSE_STL/if 0 \&\& wxUSE_STL/g' < include/wx/hashset.h.orig > include/wx/hashset.h &&
-
-
-
-rm -vrf "$BUILDDIR" &&
-mkdir "$BUILDDIR" &&
-cd "$BUILDDIR" &&
-
-../configure --prefix="$PREFIX" \
---with-osx_cocoa \
---disable-shared \
---disable-debug_flag \
---with-macosx-version-min=10.5 \
---enable-stl \
---enable-utf8 \
---enable-universal_binary \
---with-libjpeg=builtin \
---with-libpng=builtin \
---with-regex=builtin \
---with-libtiff=builtin \
---with-zlib=builtin \
---with-expat=builtin \
---with-macosx-sdk=/Developer/SDKs/MacOSX10.5.sdk &&
-
-
-find . -name Makefile | 
-while read i; do 
-  echo $i; 
-  sed 's/-arch i386/-arch i386 -arch x86_64/g' < "$i" > "$i".new && 
-  mv "$i" "$i".old && 
-  mv "$i".new "$i"; 
-done
-
-
-
-make && 
-make install
-
-
-
-Now you should be able to build bitcoin
-
-cd ~/bitcoin/src
-make -f makefile.osx bitcoin
-
-Before you can run it, you need to create an application bundle for Mac OS.
-
-A bundle is provided in contrib/Bitcoin.app.
-
-Copy the bitcoin binary in to it like this:
-  cp -pR ~/bitcoin/bitcoin/contrib/Bitcoin.app ~/bitcoin/
-  cp ~/bitcoin/src/bitcoin ~/bitcoin/Bitcoin.app/Contents/MacOS/
-
-To run it you can just click the Bitcoin.app in Finder, or just do:
-open ~/bitcoin/Bitcoin.app
-
-If you want to run it with arguments you can just run it without backgrounding
-by specifying the full name in terminal:
-
-~/bitcoin/Bitcoin.app/Contents/MacOS/bitcoin -addnode=192.75.207.66
-
-You can also run it with arguments in the background with output going to the
-normal places for apps (Console) like this:
-
-open ~/bitcoin/Bitcoin.app --args -connect=192.75.207.66
-
-It is advisable to relocate Bitcoin.app to /Applications or $HOME/Applications.
+cd bitcoin/src
+make -f makefile.osx
 
+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

doc/build-unix.txt

@@ -1,4 +1,5 @@
 Copyright (c) 2009-2010 Satoshi Nakamoto
+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
@@ -14,77 +15,75 @@ To Build
 --------
 
 cd src/
+make -f makefile.unix            # Headless bitcoin
 
-make -f makefile.unix            # Bitcoin with wxWidgets GUI
-  or
-make -f makefile.unix bitcoind   # Headless bitcoin
-
+See readme-qt.rst for instructions on building Bitcoin QT,
+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 libgtk2.0-dev
 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 wxWidgets 2.9.0 or greater, which uses UTF-8.  Don't try 2.8, it
-won't work.
 
-You need to download wxWidgets from http://www.wxwidgets.org/downloads/
-and build it yourself.  See the build instructions and configure parameters
-below.
+Dependency Build Instructions: Gentoo
+-------------------------------------
 
-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.
+Note: If you just want to install bitcoind on Gentoo, you can add the Bitcoin
+      overlay and use your package manager:
+          layman -a bitcoin && emerge bitcoind
 
-Licenses of statically linked libraries:
-wxWidgets      LGPL 2.1 with very liberal exceptions
-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
+emerge -av1 --noreplace boost glib openssl sys-libs/db:4.8
 
-Versions used in this release:
-GCC          4.3.3
-OpenSSL      0.9.8g
-wxWidgets    2.9.2
-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
+ make -f makefile.unix USE_UPNP= BDB_INCLUDE_PATH='/usr/include/db4.8'
+ strip bitcoind
 
 
 Notes
 -----
-The UI layout is edited with wxFormBuilder.  The project file is
-uiproject.fbp.  It generates uibase.cpp and uibase.h, which define base
-classes that do the rote work of constructing all the UI elements.
-
-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%.
 
 
-wxWidgets
----------
-cd /usr/local
-tar -xzvf wxWidgets-2.9.2.tar.gz
-cd wxWidgets-2.9.2
-mkdir buildgtk
-cd buildgtk
-../configure --with-gtk --enable-debug --disable-shared --enable-monolithic --without-libpng --disable-svg
-make
-sudo su
-make install
-ldconfig
-
-
 miniupnpc
 ---------
 tar -xzvf miniupnpc-1.6.tar.gz
@@ -107,3 +106,45 @@ If you need to build Boost yourself:
 sudo su
 ./bootstrap.sh
 ./bjam install
+
+
+Security
+--------
+To help make your bitcoin installation more secure by making certain attacks impossible to
+exploit even if a vulnerability is found, you can take the following measures:
+
+* Position Independent Executable
+    Build position independent code to take advantage of Address Space Layout Randomization
+    offered by some kernels. An attacker who is able to cause execution of code at an arbitrary
+    memory location is thwarted if he doesn't know where anything useful is located.
+    The stack and heap are randomly located by default but this allows the code section to be
+    randomly located as well.
+
+    On an Amd64 processor where a library was not compiled with -fPIC, this will cause an error
+    such as: "relocation R_X86_64_32 against `......' can not be used when making a shared object;"
+
+    To build with PIE, use:
+    make -f makefile.unix ... -e PIE=1
+
+    To test that you have built PIE executable, install scanelf, part of paxutils, and use:
+    scanelf -e ./bitcoin
+
+    The output should contain:
+     TYPE
+    ET_DYN
+
+* Non-executable Stack
+    If the stack is executable then trivial stack based buffer overflow exploits are possible if
+    vulnerable buffers are found. By default, bitcoin should be built with a non-executable stack
+    but if one of the libraries it uses asks for an executable stack or someone makes a mistake
+    and uses a compiler extension which requires an executable stack, it will silently build an
+    executable without the non-executable stack protection.
+
+    To verify that the stack is non-executable after compiling use:
+    scanelf -e ./bitcoin
+
+    the output should contain:
+    STK/REL/PTL
+    RW- R-- RW-
+
+    The STK RW- means that the stack is readable and writeable but not executable.

doc/readme-qt.rst

@@ -0,0 +1,178 @@
+Bitcoin-qt: Qt4 GUI for Bitcoin
+===============================
+
+Features
+========
+
+- All functionality of the Wx GUI, including wallet encryption
+
+- Compatibility with Linux (both GNOME and KDE), MacOSX and Windows
+
+- Notification on incoming / outgoing transactions (compatible with FreeDesktop and other desktop notification schemes)
+
+- General interface improvements: Splash screen, tabbed interface
+
+- Overview page with current balance, unconfirmed balance, and such
+
+- Better transaction list with status icons, real-time filtering and a context menu
+
+- Asks for confirmation before sending coins, for your own safety
+
+- CSV export of transactions and address book (for Excel bookkeeping)
+
+- Shows alternative icon when connected to testnet, so you never accidentally send real coins during testing
+
+- Shows a progress bar on initial block download, so that you don't have to wonder how many blocks it needs to download to be up to date
+
+- Sendmany support, send to multiple recipients at the same time
+
+- Multiple unit support, can show subdivided bitcoins (uBTC, mBTC) for users that like large numbers
+
+- Support for English, German, Russian and Dutch languages
+
+- Address books and transaction table can be sorted by any column
+
+- Accepts "bitcoin:" URLs from browsers and other sources through drag and drop
+
+Build instructions
+===================
+
+Debian
+-------
+
+First, make sure that the required packages for Qt4 development of your
+distribution are installed, for Debian and Ubuntu these are:
+
+::
+
+    apt-get install qt4-qmake libqt4-dev build-essential libboost-dev libboost-system-dev \
+        libboost-filesystem-dev libboost-program-options-dev libboost-thread-dev \
+        libssl-dev libdb4.8++-dev
+
+then execute the following:
+
+::
+
+    qmake
+    make
+
+Alternatively, install Qt Creator and open the `bitcoin-qt.pro` file.
+
+An executable named `bitcoin-qt` will be built.
+
+
+Windows
+--------
+
+Windows build instructions:
+
+- Download the `QT Windows SDK`_ and install it. You don't need the Symbian stuff, just the desktop Qt.
+
+- Download and extract the `dependencies archive`_  [#]_, or compile openssl, boost and dbcxx yourself.
+
+- Copy the contents of the folder "deps" to "X:\\QtSDK\\mingw", replace X:\\ with the location where you installed the Qt SDK. Make sure that the contents of "deps\\include" end up in the current "include" directory.
+
+- Open the .pro file in QT creator and build as normal (ctrl-B)
+
+.. _`QT Windows SDK`: http://qt.nokia.com/downloads/sdk-windows-cpp
+.. _`dependencies archive`: https://download.visucore.com/bitcoin/qtgui_deps_1.zip
+.. [#] PGP signature: https://download.visucore.com/bitcoin/qtgui_deps_1.zip.sig (signed with RSA key ID `610945D0`_)
+.. _`610945D0`: http://pgp.mit.edu:11371/pks/lookup?op=get&search=0x610945D0
+
+
+Mac OS X
+--------
+
+- Download and install the `Qt Mac OS X SDK`_. It is recommended to also install Apple's Xcode with UNIX tools.
+
+- Download and install `MacPorts`_.
+
+- Execute the following commands in a terminal to get the dependencies:
+
+::
+
+	sudo port selfupdate
+	sudo port install boost db48
+
+- Open the .pro file in Qt Creator and build as normal (cmd-B)
+
+.. _`Qt Mac OS X SDK`: http://qt.nokia.com/downloads/sdk-mac-os-cpp
+.. _`MacPorts`: http://www.macports.org/install.php
+
+
+Build configuration options
+============================
+
+UPNnP port forwarding
+---------------------
+
+To use UPnP for port forwarding behind a NAT router (recommended, as more connections overall allow for a faster and more stable bitcoin experience), pass the following argument to qmake:
+
+::
+
+    qmake "USE_UPNP=1"
+
+(in **Qt Creator**, you can find the setting for additional qmake arguments under "Projects" -> "Build Settings" -> "Build Steps", then click "Details" next to **qmake**)
+
+This requires miniupnpc for UPnP port mapping.  It can be downloaded from
+http://miniupnp.tuxfamily.org/files/.  UPnP support is not compiled in by default.
+
+Set USE_UPNP to a different value to control this:
+
++------------+--------------------------------------------------------------------------+
+| USE_UPNP=- | no UPnP support, miniupnpc not required;                                 |
++------------+--------------------------------------------------------------------------+
+| USE_UPNP=0 | (the default) built with UPnP, support turned off by default at runtime; |
++------------+--------------------------------------------------------------------------+
+| USE_UPNP=1 | build with UPnP support turned on by default at runtime.                 |
++------------+--------------------------------------------------------------------------+
+
+Mac OS X users: miniupnpc is currently outdated on MacPorts. An updated Portfile is provided in contrib/miniupnpc within this project.
+You can execute the following commands in a terminal to install it:
+
+::
+
+	cd <location of bitcoin-qt>/contrib/miniupnpc
+	sudo port install
+
+Notification support for recent (k)ubuntu versions
+---------------------------------------------------
+
+To see desktop notifications on (k)ubuntu versions starting from 10.04, enable usage of the
+FreeDesktop notification interface through DBUS using the following qmake option:
+
+::
+
+    qmake "USE_DBUS=1"
+
+Berkely DB version warning
+==========================
+
+A warning for people using the *static binary* version of Bitcoin on a Linux/UNIX-ish system (tl;dr: **Berkely DB databases are not forward compatible**).
+
+The static binary version of Bitcoin is linked against libdb4.8 (see also `this Debian issue`_).
+
+Now the nasty thing is that databases from 5.X are not compatible with 4.X.
+
+If the globally installed development package of Berkely DB installed on your system is 5.X, any source you
+build yourself will be linked against that. The first time you run with a 5.X version the database will be upgraded,
+and 4.X cannot open the new format. This means that you cannot go back to the old statically linked version without
+significant hassle!
+
+.. _`this Debian issue`: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=621425
+
+Ubuntu 11.10 warning
+====================
+
+Ubuntu 11.10 has a package called 'qt-at-spi' installed by default.  At the time of writing, having that package
+installed causes bitcoin-qt to crash intermittently.  The issue has been reported as `launchpad bug 857790`_, but
+isn't yet fixed.
+
+Until the bug is fixed, you can remove the qt-at-spi package to work around the problem, though this will presumably
+disable screen reader functionality for Qt apps:
+
+::
+
+    sudo apt-get remove qt-at-spi
+
+.. _`launchpad bug 857790`: https://bugs.launchpad.net/ubuntu/+source/qt-at-spi/+bug/857790

doc/release-process.txt

@@ -5,35 +5,88 @@
 * update (commit) version in OSX app bundle
  contrib/Bitcoin.app/Contents/Info.plist
 
-  * CFBundleShortVersionString should have value like 0.3.23
-  * CFBundleVersion should have value like 323
+  * CFBundleShortVersionString should have value like 0.5.0
+  * CFBundleVersion should have value like 500
 
 * tag version in git
 
-  $ git tag -a v0.3.23
+   git tag -a v0.5.0
 
 * write release notes.  git shortlog helps a lot:
 
-  $ git shortlog --no-merges v0.3.22..
+   git shortlog --no-merges v0.4.0..
 
 * create source-only archive
 
-  $ git archive --format=tar --prefix=bitcoin-0.3.23/ HEAD | \
-  	gzip -9c > ~/tmp/bitcoin-0.3.23-src.tar.gz 
+   git archive --format=tar --prefix=bitcoin-0.5.0/ HEAD | \
+  	gzip -9c > ~/tmp/bitcoin-0.5.0-src.tar.gz 
 
 * perform gitian builds
 
-  * From the bitcoin source dir
-  $ cd ../gitian-builder
-  $ ./bin/gbuild --commit bitcoin=v0.3.23 ../bitcoin/contrib/gitian.yml
-  $ ./bin/gbuild --commit bitcoin=v0.3.23 ../bitcoin/contrib/gitian-win32.yml
- 
-  Build output expected:
-  1. linux 32-bit and 64-bit binaries + source
-  2. windows 32-bit binary + source
-  3. windows installer
+  * From a directory containing the bitcoin source, gitian-builder and gitian.sigs
+   export SIGNER=(your gitian key, ie bluematt, sipa, etc)
+   export VERSION=0.5.0
+   cd ./gitian-builder
 
-* upload source and builds to SF
+  * Fetch and build inputs:
+   mkdir -p inputs; cd inputs/
+   wget 'http://miniupnp.free.fr/files/download.php?file=miniupnpc-1.6.tar.gz' -O miniupnpc-1.6.tar.gz
+   wget 'http://www.openssl.org/source/openssl-1.0.0e.tar.gz'
+   wget 'http://download.oracle.com/berkeley-db/db-4.8.30.NC.tar.gz'
+   wget 'http://downloads.sourceforge.net/project/boost/boost/1.47.0/boost_1_47_0.tar.bz2'
+   wget 'http://download.qt.nokia.com/qt/source/qt-everywhere-opensource-src-4.7.4.tar.gz'
+   cd ..
+   ./bin/gbuild ../bitcoin/contrib/gitian-descriptors/boost-win32.yml
+   cp build/out/boost-win32-1.47.0-gitian.zip inputs/
+   ./bin/gbuild ../bitcoin/contrib/gitian-descriptors/qt-win32.yml
+   cp build/out/qt-win32-4.7.4-gitian.zip inputs/
+
+  * Build bitcoind and bitcoin-qt on Linux32, Linux64, and Win32:
+   ./bin/gbuild --commit bitcoin=v$VERSION ../bitcoin/contrib/gitian-descriptors/gitian.yml
+   ./bin/gsign --signer $SIGNER --release $VERSION --destination ../gitian.sigs/ ../bitcoin/contrib/gitian-descriptors/gitian.yml
+   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 $SIGNER --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 ../../
+
+  Build output expected:
+  1. linux 32-bit and 64-bit binaries + source (bitcoin-$VERSION-linux-gitian.zip)
+  2. windows 32-bit binary, installer + source (bitcoin-$VERSION-win32-gitian.zip)
+  3. Gitian signatures (in gitian.sigs/$VERSION[-win32]/(your gitian key)/
+
+* repackage gitian builds for release as stand-alone zip/tar/installer exe
+
+  * Linux .tar.gz:
+   mkdir bitcoin-$VERSION-linux
+   cd bitcoin-$VERSION-linux
+   unzip bitcoin-$VERSION-linux-gitian.zip
+   cd ..; tar czvf bitcoin-$VERSION-linux.tar.gz bitcoin-$VERSION-linux
+
+  * Windows .zip and setup.exe:
+   mkdir bitcoin-$VERSION-win32
+   cd bitcoin-$VERSION-win32
+   unzip bitcoin-$VERSION-win32-gitian.zip
+   mv bitcoin-$VERSION-win32-setup.exe ..
+   cd ..; zip bitcoin-$VERSION-win32.zip bitcoin-$VERSION-win32
+
+
+* perform Mac build
+  See this blog post for how Gavin set up his build environment and
+  patched macdeployqt to build the OSX release:
+    http://gavintech.blogspot.com/2011/11/deploying-bitcoin-qt-on-osx.html
+  qmake USE_SSL=1 USE_UPNP=1 bitcoin-qt.pro
+  make
+  export QTDIR=/opt/local/share/qt4  # needed to find translations/qt_*.qm files
+  contrib/macdeploy/macdeployqtplus Bitcoin-Qt.app -add-qt-tr de,es,ru -dmg -fancy contrib/macdeploy/fancy.plist  
+
+ Build output expected:
+  Bitcoin-Qt.dmg
+
+* upload source and builds to SourceForge
 
 * create SHA1SUMS for builds, and PGP-sign it
 
@@ -45,4 +98,34 @@
 
 * update wiki download links
 
+* release gitian-signed gitian archives
+
+  * Collect enough gitian signatures to meet minimum_weight (see contrib/gitian-downloader/*-download-config)
+
+  * From a directory containing bitcoin source, gitian.sigs and gitian zips
+   export VERSION=0.5.0
+   mkdir bitcoin-$VERSION-linux-gitian; cd bitcoin-$VERSION-linux-gitian
+   unzip ../bitcoin-$VERSION-linux-gitian.zip
+   mkdir gitian
+   cp ../bitcoin/contrib/gitian-downloader/*.pgp ./gitian/
+   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 ../
+   cd ..
+   mkdir bitcoin-$VERSION-linux-gitian; cd bitcoin-$VERSION-linux-gitian
+   unzip ../bitcoin-$VERSION-linux-gitian.zip
+   mkdir gitian
+   cp ../bitcoin/contrib/gitian-downloader/*.pgp ./gitian/
+   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 ../
+
+  * Upload gitian zips to SourceForge
+
 

locale/es/LC_MESSAGES/bitcoin.po

@@ -1,967 +0,0 @@
-msgid ""
-msgstr ""
-"Project-Id-Version: \n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-24 20:21-0500\n"
-"PO-Revision-Date: 2011-05-24 20:23-0500\n"	
-"Last-Translator: Ariel Patiño <ariel@ficticio.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-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 "No es posible escuchar en el puerto %d en este computador. Probablemente el cliente Bitcoin ya se está ejecutando."
-
-#: ../../../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 "Esta transacción supera el límite. Puede seguir enviandola con una comisión de %s, que va a los nodos que procesan su transacción y ayuda a mantener la red. ¿Quiere pagar la comisión?"
-
-#: ../../../src/ui.cpp:303
-msgid "Status"
-msgstr "Estado"
-
-#: ../../../src/ui.cpp:304
-msgid "Date"
-msgstr "Fecha"
-
-#: ../../../src/ui.cpp:305
-msgid "Description"
-msgstr "Descripción"
-
-#: ../../../src/ui.cpp:306
-msgid "Debit"
-msgstr "Débito"
-
-#: ../../../src/ui.cpp:307
-msgid "Credit"
-msgstr "Crédito"
-
-#: ../../../src/ui.cpp:513
-#, c-format
-msgid "Open for %d blocks"
-msgstr "Abrir para %d bloques"
-
-#: ../../../src/ui.cpp:515
-#, c-format
-msgid "Open until %s"
-msgstr "Abrir hasta %s"
-
-#: ../../../src/ui.cpp:521
-#, c-format
-msgid "%d/offline?"
-msgstr "%d/desconectado?"
-
-#: ../../../src/ui.cpp:523
-#, c-format
-msgid "%d/unconfirmed"
-msgstr "%d/no confirmado"
-
-#: ../../../src/ui.cpp:525
-#, c-format
-msgid "%d confirmations"
-msgstr "%d confirmaciones"
-
-#: ../../../src/ui.cpp:610
-msgid "Generated"
-msgstr "Generado"
-
-#: ../../../src/ui.cpp:618
-#, c-format
-msgid "Generated (%s matures in %d more blocks)"
-msgstr "Generado (%s madura en %d bloques)"
-
-#: ../../../src/ui.cpp:622
-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:626
-msgid "Generated (not accepted)"
-msgstr "Generado (no aceptado)"
-
-#: ../../../src/ui.cpp:636
-msgid "From: "
-msgstr "De: "
-
-#: ../../../src/ui.cpp:660
-msgid "Received with: "
-msgstr "Recibido con: "
-
-#: ../../../src/ui.cpp:706
-msgid "Payment to yourself"
-msgstr "Pago para usted mismo"
-
-#: ../../../src/ui.cpp:740
-msgid "To: "
-msgstr "Para: "
-
-#: ../../../src/ui.cpp:1055
-msgid "    Generating"
-msgstr "    Generando"
-
-#: ../../../src/ui.cpp:1057
-msgid "(not connected)"
-msgstr "(no conectado)"
-
-#: ../../../src/ui.cpp:1060
-#, c-format
-msgid "     %d connections     %d blocks     %d transactions"
-msgstr "     %d conexiones     %d bloques     %d transacciones"
-
-#: ../../../src/ui.cpp:1165
-#: ../../../src/ui.cpp:2529
-msgid "New Receiving Address"
-msgstr "Nueva dirección de recepción"
-
-#: ../../../src/ui.cpp:1166
-#: ../../../src/ui.cpp:2530
-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:1235
-msgid "<b>Status:</b> "
-msgstr "<b>Estado:</b> "
-
-#: ../../../src/ui.cpp:1240
-msgid ", has not been successfully broadcast yet"
-msgstr ", no ha sido emitido satisfactoriamente todavía"
-
-#: ../../../src/ui.cpp:1242
-#, c-format
-msgid ", broadcast through %d node"
-msgstr ", emitido mediante %d nodo"
-
-#: ../../../src/ui.cpp:1244
-#, c-format
-msgid ", broadcast through %d nodes"
-msgstr ", emitido mediante %d nodos"
-
-#: ../../../src/ui.cpp:1248
-msgid "<b>Date:</b> "
-msgstr "<b>Fecha:</b> "
-
-#: ../../../src/ui.cpp:1256
-msgid "<b>Source:</b> Generated<br>"
-msgstr "<b>Fuente:</b> Generado<br>"
-
-#: ../../../src/ui.cpp:1262
-#: ../../../src/ui.cpp:1280
-msgid "<b>From:</b> "
-msgstr "<b>De:</b> "
-
-#: ../../../src/ui.cpp:1280
-msgid "unknown"
-msgstr "desconocido"
-
-#: ../../../src/ui.cpp:1281
-#: ../../../src/ui.cpp:1305
-#: ../../../src/ui.cpp:1364
-msgid "<b>To:</b> "
-msgstr "<b>Para:</b> "
-
-#: ../../../src/ui.cpp:1284
-msgid " (yours, label: "
-msgstr "(suya, etiqueta: "
-
-#: ../../../src/ui.cpp:1286
-msgid " (yours)"
-msgstr "(suya)"
-
-#: ../../../src/ui.cpp:1323
-#: ../../../src/ui.cpp:1335
-#: ../../../src/ui.cpp:1381
-#: ../../../src/ui.cpp:1398
-msgid "<b>Credit:</b> "
-msgstr "<b>Crédito:</b> "
-
-#: ../../../src/ui.cpp:1325
-#, c-format
-msgid "(%s matures in %d more blocks)"
-msgstr "(%s madura en %d bloques)"
-
-#: ../../../src/ui.cpp:1327
-msgid "(not accepted)"
-msgstr "(no aceptada)"
-
-#: ../../../src/ui.cpp:1372
-#: ../../../src/ui.cpp:1380
-#: ../../../src/ui.cpp:1395
-msgid "<b>Debit:</b> "
-msgstr "<b>Débito:</b> "
-
-#: ../../../src/ui.cpp:1386
-msgid "<b>Transaction fee:</b> "
-msgstr "<b>Comisión transacción:</b> "
-
-#: ../../../src/ui.cpp:1402
-msgid "<b>Net amount:</b> "
-msgstr "<b>Cantidad de la red:</b> "
-
-#: ../../../src/ui.cpp:1409
-msgid "Message:"
-msgstr "Mensaje:"
-
-#: ../../../src/ui.cpp:1411
-msgid "Comment:"
-msgstr "Comentario:"
-
-#: ../../../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 "Las monedas generadas deben esperar 120 bloques antes de ser gastadas. Cuando usted generó este bloque, fue emitido a la red para ser agregado a 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 apenas a unos segundos del suyo."
-
-#: ../../../src/ui.cpp:1594
-msgid "Cannot write autostart/bitcoin.desktop file"
-msgstr "No se puede escribir el fichero autostart/bitcoin.desktop"
-
-#: ../../../src/ui.cpp:1630
-msgid "Main"
-msgstr "Principal"
-
-#: ../../../src/ui.cpp:1638
-msgid "&Start Bitcoin on window system startup"
-msgstr "&Arrancar Bitcoin al iniciar el sistema"
-
-#: ../../../src/ui.cpp:1645
-msgid "&Minimize on close"
-msgstr "&Minimizar al cerrar"
-
-#: ../../../src/ui.cpp:1787
-#, c-format
-msgid "version %s"
-msgstr "versión %s"
-
-#: ../../../src/ui.cpp:1899
-msgid "Error in amount  "
-msgstr "Error en la cantidad  "
-
-#: ../../../src/ui.cpp:1899
-#: ../../../src/ui.cpp:1904
-#: ../../../src/ui.cpp:1909
-#: ../../../src/ui.cpp:1944
-#: ../../../src/uibase.cpp:55
-msgid "Send Coins"
-msgstr "Enviar monedas"
-
-#: ../../../src/ui.cpp:1904
-msgid "Amount exceeds your balance  "
-msgstr "La cantidad excede su balance  "
-
-#: ../../../src/ui.cpp:1909
-msgid "Total exceeds your balance when the "
-msgstr "El total excede su balance cuando el "
-
-#: ../../../src/ui.cpp:1909
-msgid " transaction fee is included  "
-msgstr " la comisión de la transaccion está incluida  "
-
-#: ../../../src/ui.cpp:1927
-msgid "Payment sent  "
-msgstr "Pago enviado  "
-
-#: ../../../src/ui.cpp:1927
-#: ../../../src/ui.cpp:1932
-#: ../../../src/ui.cpp:2076
-#: ../../../src/ui.cpp:2229
-#: ../../../src/main.cpp:3997
-msgid "Sending..."
-msgstr "Enviando..."
-
-#: ../../../src/ui.cpp:1944
-msgid "Invalid address  "
-msgstr "Dirección inválida  "
-
-#: ../../../src/ui.cpp:1997
-#, c-format
-msgid "Sending %s to %s"
-msgstr "Enviando %s a %s"
-
-#: ../../../src/ui.cpp:2070
-#: ../../../src/ui.cpp:2103
-msgid "CANCELLED"
-msgstr "CANCELADO"
-
-#: ../../../src/ui.cpp:2074
-msgid "Cancelled"
-msgstr "Cancelado"
-
-#: ../../../src/ui.cpp:2076
-msgid "Transfer cancelled  "
-msgstr "Transferencia cancelada  "
-
-#: ../../../src/ui.cpp:2129
-msgid "Error: "
-msgstr "Error: "
-
-#: ../../../src/ui.cpp:2143
-#: ../../../src/ui.cpp:2214
-#: ../../../src/main.cpp:4016
-msgid "Insufficient funds"
-msgstr "Fondos insuficientes"
-
-#: ../../../src/ui.cpp:2148
-msgid "Connecting..."
-msgstr "Conectando..."
-
-#: ../../../src/ui.cpp:2153
-msgid "Unable to connect"
-msgstr "No es posible conectar"
-
-#: ../../../src/ui.cpp:2158
-msgid "Requesting public key..."
-msgstr "Pidiendo clave pública..."
-
-#: ../../../src/ui.cpp:2170
-msgid "Received public key..."
-msgstr "Clave pública recibida..."
-
-#: ../../../src/ui.cpp:2184
-msgid "Recipient is not accepting transactions sent by IP address"
-msgstr "El destinatario no está aceptando transacciones enviadas por direcciones IP"
-
-#: ../../../src/ui.cpp:2186
-msgid "Transfer was not accepted"
-msgstr "La transferencia no fue aceptada"
-
-#: ../../../src/ui.cpp:2195
-msgid "Invalid response received"
-msgstr "Respuesta inválida recibida"
-
-#: ../../../src/ui.cpp:2210
-msgid "Creating transaction..."
-msgstr "Creando transacción..."
-
-#: ../../../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 "Esta transacción requiere de una comisión de al menos %s por su cantidad, complejidad o uso de fondos recibidos recientemente"
-
-#: ../../../src/ui.cpp:2224
-msgid "Transaction creation failed"
-msgstr "Fallo al crear la transacción."
-
-#: ../../../src/ui.cpp:2231
-msgid "Transaction aborted"
-msgstr "Transacción abortada"
-
-#: ../../../src/ui.cpp:2239
-msgid "Lost connection, transaction cancelled"
-msgstr "Conexión perdida, transacción cancelada"
-
-#: ../../../src/ui.cpp:2255
-msgid "Sending payment..."
-msgstr "Enviando pago..."
-
-#: ../../../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 "La transacción fue rechazada. Esto puede haber ocurrido si alguna de las monedas fue gastada, o si ha usado una copia de wallet.dat y las monedas fueron gastadas en la copia pero no fueron marcadas como gastadas aqui."
-
-#: ../../../src/ui.cpp:2270
-msgid "Waiting for confirmation..."
-msgstr "Esperando confirmación..."
-
-#: ../../../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 ""
-"El pago fue enviado, pero el receptor no pudo verificarlo.\n"
-"La transacción se grabó y dará el crédito al receptor,\n"
-"pero la información en los comentarios quedará en blanco."
-
-#: ../../../src/ui.cpp:2297
-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:2303
-msgid "Payment completed"
-msgstr "Pago completado"
-
-#: ../../../src/ui.cpp:2334
-#: ../../../src/ui.cpp:2480
-#: ../../../src/ui.cpp:2517
-msgid "Name"
-msgstr "Nombre"
-
-#: ../../../src/ui.cpp:2335
-#: ../../../src/ui.cpp:2480
-#: ../../../src/ui.cpp:2517
-msgid "Address"
-msgstr "Dirección"
-
-#: ../../../src/ui.cpp:2337
-#: ../../../src/ui.cpp:2492
-msgid "Label"
-msgstr "Etiqueta"
-
-#: ../../../src/ui.cpp:2338
-#: ../../../src/uibase.cpp:837
-msgid "Bitcoin Address"
-msgstr "Dirección Bitcoin"
-
-#: ../../../src/ui.cpp:2462
-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:2480
-#: ../../../src/ui.cpp:2486
-msgid "Edit Address"
-msgstr "Editar dirección"
-
-#: ../../../src/ui.cpp:2492
-msgid "Edit Address Label"
-msgstr "Editar etiqueta dirección"
-
-#: ../../../src/ui.cpp:2517
-#: ../../../src/ui.cpp:2523
-msgid "Add Address"
-msgstr "Agregar dirección"
-
-#: ../../../src/ui.cpp:2600
-msgid "Bitcoin"
-msgstr "Bitcoin"
-
-#: ../../../src/ui.cpp:2602
-msgid "Bitcoin - Generating"
-msgstr "Bitcoin - Generando"
-
-#: ../../../src/ui.cpp:2604
-msgid "Bitcoin - (not connected)"
-msgstr "Bitcoin - (no conectado)"
-
-#: ../../../src/ui.cpp:2683
-msgid "&Open Bitcoin"
-msgstr "&Abrir Bitcoin"
-
-#: ../../../src/ui.cpp:2684
-msgid "&Send Bitcoins"
-msgstr "&Enviar Bitcoin"
-
-#: ../../../src/ui.cpp:2685
-msgid "O&ptions..."
-msgstr "O&pciones"
-
-#: ../../../src/ui.cpp:2688
-#: ../../../src/uibase.cpp:25
-msgid "E&xit"
-msgstr "S&alir"
-
-#: ../../../src/ui.cpp:2904
-msgid "Program has crashed and will terminate.  "
-msgstr "El programa ha detectado un error y va a cerrarse.  "
-
-#: ../../../src/main.cpp:1866
-msgid "Warning: Disk space is low  "
-msgstr "Cuidado: Poco espacio en disco  "
-
-#: ../../../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 "Error: Esta transacción requiere de una comisión de al menos %s por su cantidad, complejidad o uso de fondos recibidos recientemente "
-
-#: ../../../src/main.cpp:3992
-msgid "Error: Transaction creation failed  "
-msgstr "Error: La creación de la transacción falló  "
-
-#: ../../../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 "Error: La transacción fue rechazada. Esto puede haber ocurrido si alguna de las monedas ya fue gastada, o si ha usado un copia de wallet.dat y las monedas fueron gastadas en la copia pero no han sido marcadas como gastadas aqui."
-
-#: ../../../src/main.cpp:4014
-msgid "Invalid amount"
-msgstr "Cantidad erronea"
-
-#: ../../../src/main.cpp:4021
-msgid "Invalid bitcoin address"
-msgstr "Dirección Bitcoin inválida"
-
-#: ../../../src/rpc.cpp:1802
-#: ../../../src/rpc.cpp:1804
-#, c-format
-msgid "To use the %s option"
-msgstr "Para usar la opción %s"
-
-#: ../../../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 ""
-"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: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 ""
-"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/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 "Precaución: Por favor revisa que la fecha y hora de tu computador son correctas. Si tu reloj está mal, Bitcoin no funcionará correctamente."
-
-#: ../../../src/util.cpp:899
-msgid "beta"
-msgstr "beta"
-
-#: ../../../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:36
-msgid "&Options..."
-msgstr "&Opciones..."
-
-#: ../../../src/uibase.cpp:39
-msgid "&Settings"
-msgstr "&Configuración"
-
-#: ../../../src/uibase.cpp:43
-msgid "&About..."
-msgstr "&Acerca de..."
-
-#: ../../../src/uibase.cpp:46
-msgid "&Help"
-msgstr "&Ayuda"
-
-#: ../../../src/uibase.cpp:56
-msgid "Address Book"
-msgstr "Libreta de direcciones"
-
-#: ../../../src/uibase.cpp:69
-msgid "Your Bitcoin Address:"
-msgstr "Su dirección Bitcoin:"
-
-#: ../../../src/uibase.cpp:76
-msgid " &New... "
-msgstr " &Nuevo... "
-
-#: ../../../src/uibase.cpp:79
-#: ../../../src/uibase.cpp:780
-#: ../../../src/uibase.cpp:883
-msgid " &Copy to Clipboard "
-msgstr " &Copiar al portapapeles "
-
-#: ../../../src/uibase.cpp:93
-msgid "Balance:"
-msgstr "Balance:"
-
-#: ../../../src/uibase.cpp:109
-msgid " All"
-msgstr " Todo"
-
-#: ../../../src/uibase.cpp:109
-msgid " Sent"
-msgstr " Enviado"
-
-#: ../../../src/uibase.cpp:109
-msgid " Received"
-msgstr " Recibido"
-
-#: ../../../src/uibase.cpp:109
-msgid " In Progress"
-msgstr " En progreso"
-
-#: ../../../src/uibase.cpp:130
-msgid "All Transactions"
-msgstr "Todas las transacciones"
-
-#: ../../../src/uibase.cpp:141
-msgid "Sent/Received"
-msgstr "Enviado/Recibido"
-
-#: ../../../src/uibase.cpp:152
-msgid "Sent"
-msgstr "Enviado"
-
-#: ../../../src/uibase.cpp:163
-msgid "Received"
-msgstr "Recibido"
-
-#: ../../../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 "&Arrancar Bitcoin al iniciar el sistema"
-
-#: ../../../src/uibase.cpp:348
-msgid "&Minimize to the tray instead of the taskbar"
-msgstr "&Minimizar a la bandeja en vez de a la barra de tareas"
-
-#: ../../../src/uibase.cpp:351
-msgid "Map port using &UPnP"
-msgstr "Mapear el puerto usando &UPnP"
-
-#: ../../../src/uibase.cpp:354
-msgid "M&inimize to the tray on close"
-msgstr "M&inimizar a la bandeja al cerrar"
-
-#: ../../../src/uibase.cpp:360
-msgid "&Connect through socks4 proxy: "
-msgstr "&Conectar usando un proxy socks4: "
-
-#: ../../../src/uibase.cpp:371
-msgid "Proxy &IP:"
-msgstr "Proxy &IP:"
-
-#: ../../../src/uibase.cpp:379
-msgid " &Port:"
-msgstr " &Puerto:"
-
-#: ../../../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 "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:399
-msgid "Pay transaction fee:"
-msgstr "Comisión de la transacción:"
-
-#: ../../../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 "Cancelar"
-
-#: ../../../src/uibase.cpp:449
-msgid "&Apply"
-msgstr "&Aplicar"
-
-#: ../../../src/uibase.cpp:508
-msgid "Bitcoin "
-msgstr "Bitcoin "
-
-#: ../../../src/uibase.cpp:514
-msgid "version"
-msgstr "versión"
-
-#: ../../../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"
-"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:581
-msgid "Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)"
-msgstr "Ponga una dirección Bitcoin (ejemplo: 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)"
-
-#: ../../../src/uibase.cpp:595
-msgid "Pay &To:"
-msgstr "Pagar &A:"
-
-#: ../../../src/uibase.cpp:610
-msgid "&Paste"
-msgstr "&Pegar"
-
-#: ../../../src/uibase.cpp:613
-msgid " Address &Book..."
-msgstr " Libreta &Direcciones..."
-
-#: ../../../src/uibase.cpp:620
-msgid "&Amount:"
-msgstr "&Cantidad:"
-
-#: ../../../src/uibase.cpp:630
-msgid "T&ransfer:"
-msgstr "T&ransferir:"
-
-#: ../../../src/uibase.cpp:636
-msgid " Standard"
-msgstr " Estándar"
-
-#: ../../../src/uibase.cpp:663
-msgid "&Send"
-msgstr "&Enviar"
-
-#: ../../../src/uibase.cpp:711
-msgid ""
-"\n"
-"\n"
-"Connecting..."
-msgstr ""
-"\n"
-"\n"
-"Conenctando..."
-
-#: ../../../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 "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:774
-#: ../../../src/uibase.cpp:886
-msgid "&Edit..."
-msgstr "&Editar..."
-
-#: ../../../src/uibase.cpp:777
-#: ../../../src/uibase.cpp:889
-msgid " &New Address... "
-msgstr " &Nueva dirección... "
-
-#: ../../../src/uibase.cpp:849
-msgid "Sending"
-msgstr "Enviando"
-
-#: ../../../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 "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:870
-msgid "Receiving"
-msgstr "Recibiendo"
-
-#: ../../../src/uibase.cpp:880
-msgid "&Delete"
-msgstr "&Borrar"
-
-#: ../../../src/init.cpp:142
-msgid "Bitcoin version"
-msgstr "versión Bitcoin"
-
-#: ../../../src/init.cpp:143
-msgid "Usage:"
-msgstr "Uso:"
-
-#: ../../../src/init.cpp:145
-msgid "Send command to -server or bitcoind\n"
-msgstr "Enviar comando a bitcoin corriendo con -server o a bitcoind\n"
-
-#: ../../../src/init.cpp:146
-msgid "List commands\n"
-msgstr "Lista de comandos\n"
-
-#: ../../../src/init.cpp:147
-msgid "Get help for a command\n"
-msgstr "Recibir ayuda para un comando\n"
-
-#: ../../../src/init.cpp:148
-msgid "Options:\n"
-msgstr "Opciones:\n"
-
-#: ../../../src/init.cpp:149
-msgid "Specify configuration file (default: bitcoin.conf)\n"
-msgstr "Especificar archivo de configuración (predeterminado: bitcoin.conf)\n"
-
-#: ../../../src/init.cpp:150
-msgid "Specify pid file (default: bitcoind.pid)\n"
-msgstr "Especificar archivo pid (predeterminado: bitcoin.pid)\n"
-
-#: ../../../src/init.cpp:151
-msgid "Generate coins\n"
-msgstr "Generar monedas\n"
-
-#: ../../../src/init.cpp:152
-msgid "Don't generate coins\n"
-msgstr "No generar monedas\n"
-
-#: ../../../src/init.cpp:153
-msgid "Start minimized\n"
-msgstr "Arrancar minimizado\n"
-
-#: ../../../src/init.cpp:154
-msgid "Specify data directory\n"
-msgstr "Especificar directorio para los datos\n"
-
-#: ../../../src/init.cpp:155
-msgid "Connect through socks4 proxy\n"
-msgstr "Conectar mediante proxy socks4\n"
-
-#: ../../../src/init.cpp:156
-msgid "Allow DNS lookups for addnode and connect\n"
-msgstr "Permitir búsqueda DNS para addnode y connect\n"
-
-#: ../../../src/init.cpp:157
-msgid "Add a node to connect to\n"
-msgstr "Agregar un nodo para conectarse\n"
-
-#: ../../../src/init.cpp:158
-msgid "Connect only to the specified node\n"
-msgstr "Conectar solo al nodo especificado\n"
-
-#: ../../../src/init.cpp:159
-msgid "Don't accept connections from outside\n"
-msgstr "No aceptar conexiones desde el exterior\n"
-
-#: ../../../src/init.cpp:162
-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:164
-msgid "Attempt to use UPnP to map the listening port\n"
-msgstr "Intentar usar UPnP para mapear el puerto de escucha.\n"
-
-#: ../../../src/init.cpp:167
-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:169
-msgid "Accept command line and JSON-RPC commands\n"
-msgstr "Aceptar comandos por línea de comandos y JSON-RPC\n"
-
-#: ../../../src/init.cpp:172
-msgid "Run in the background as a daemon and accept commands\n"
-msgstr "Correr en el fondo como demonio y aceptar comandos\n"
-
-#: ../../../src/init.cpp:174
-msgid "Use the test network\n"
-msgstr "Usar la red de pruebas\n"
-
-#: ../../../src/init.cpp:175
-msgid "Username for JSON-RPC connections\n"
-msgstr "Usuario para las conexiones JSON-RPC\n"
-
-#: ../../../src/init.cpp:176
-msgid "Password for JSON-RPC connections\n"
-msgstr "Contraseña para las conexiones JSON-RPC\n"
-
-#: ../../../src/init.cpp:177
-msgid "Listen for JSON-RPC connections on <port> (default: 8332)\n"
-msgstr "Escuchar conexiones JSON-RPC en el puerto <puerto> (predeterminado: 8332)\n"
-
-#: ../../../src/init.cpp:178
-msgid "Allow JSON-RPC connections from specified IP address\n"
-msgstr "Permitir conexiones JSON-RPC desde la dirección IP especificada\n"
-
-#: ../../../src/init.cpp:179
-msgid "Send commands to node running on <ip> (default: 127.0.0.1)\n"
-msgstr "Enviar comando al nodo ejecutándose en <ip> (predeterminado: 127.0.0.1)\n"
-
-#: ../../../src/init.cpp:180
-msgid "Set key pool size to <n> (default: 100)\n"
-msgstr "Ajustar el tamaño de la llave (key) de la piscina (pool) a <n> (predeterminado: 100)\n"
-
-#: ../../../src/init.cpp:181
-msgid "Rescan the block chain for missing wallet transactions\n"
-msgstr "Re-escanear la cadena de bloques para transacciones perdidas de la billetera\n"
-
-#: ../../../src/init.cpp:185
-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:186
-msgid "Use OpenSSL (https) for JSON-RPC connections\n"
-msgstr "Usar OpenSSL (https) para las conexiones JSON-RPC\n"
-
-#: ../../../src/init.cpp:187
-msgid "Server certificate file (default: server.cert)\n"
-msgstr "Archivo de certificado del servidor (Predeterminado: server.cert)\n"
-
-#: ../../../src/init.cpp:188
-msgid "Server private key (default: server.pem)\n"
-msgstr "Clave privada del servidor (Predeterminado: server.pem)\n"
-
-#: ../../../src/init.cpp:189
-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:193
-msgid "This help message\n"
-msgstr "Este mensaje de ayuda\n"
-
-#: ../../../src/init.cpp:330
-#, c-format
-msgid "Cannot obtain a lock on data directory %s.  Bitcoin is probably already running."
-msgstr "No se puede obtener el bloqueo en el directorio de datos %s. Probablemente el cliente de Bitcoin ya se está ejecutando."
-
-#: ../../../src/init.cpp:356
-msgid "Error loading addr.dat      \n"
-msgstr "Error cargando addr.dat      \n"
-
-#: ../../../src/init.cpp:362
-msgid "Error loading blkindex.dat      \n"
-msgstr "Error cargando blkindex.dat      \n"
-
-#: ../../../src/init.cpp:369
-msgid "Error loading wallet.dat      \n"
-msgstr "Error cargando wallet.dat      \n"
-
-#: ../../../src/init.cpp:449
-msgid "Invalid -proxy address"
-msgstr "Dirección proxy - inválida"
-
-#: ../../../src/init.cpp:472
-msgid "Invalid amount for -paytxfee=<amount>"
-msgstr "Cantidad inválida para -paytxfee=<cantidad>"
-
-#: ../../../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 "Precaución: -paytxfee está configurado muy alto. Esta es la comisión que pagarás si envias una transacción."
-
-#: ../../../src/uibase.h:147
-msgid "Transaction Details"
-msgstr "Detalles de la transacción"
-
-#: ../../../src/uibase.h:199
-msgid "Options"
-msgstr "Opciones"
-
-#: ../../../src/uibase.h:228
-msgid "About Bitcoin"
-msgstr "Acerca de Bitcoin"
-
-#: ../../../src/uibase.h:337
-msgid "Your Bitcoin Addresses"
-msgstr "Sus direcciones Bitcoin"

locale/fr/LC_MESSAGES/bitcoin.po

@@ -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]"

locale/it/LC_MESSAGES/bitcoin.po

@@ -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"

locale/lt/LC_MESSAGES/bitcoin.po

@@ -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"

locale/nl/LC_MESSAGES/bitcoin.po

@@ -1,973 +0,0 @@
-msgid ""
-msgstr ""
-"Project-Id-Version: \n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-15 18:23+0100\n"
-"PO-Revision-Date: 2011-05-15 18:23+0100\n"
-"Last-Translator: Pieter Wuille <sipa@ulyssis.org>\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 "Kan niet binden met poort %d op deze computer. Bitcoin draait vermoedelijk reeds."
-
-#: ../../../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 "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:301
-msgid "Status"
-msgstr "Status"
-
-#: ../../../src/ui.cpp:302
-msgid "Date"
-msgstr "Datum"
-
-#: ../../../src/ui.cpp:303
-msgid "Description"
-msgstr "Beschrijving"
-
-#: ../../../src/ui.cpp:304
-msgid "Debit"
-msgstr "Debet"
-
-#: ../../../src/ui.cpp:305
-msgid "Credit"
-msgstr "Credit"
-
-#: ../../../src/ui.cpp:511
-#, c-format
-msgid "Open for %d blocks"
-msgstr "Open gedurende %d blokken"
-
-#: ../../../src/ui.cpp:513
-#, c-format
-msgid "Open until %s"
-msgstr "Open tot %s"
-
-#: ../../../src/ui.cpp:519
-#, c-format
-msgid "%d/offline?"
-msgstr "%d/offline?"
-
-#: ../../../src/ui.cpp:521
-#, c-format
-msgid "%d/unconfirmed"
-msgstr "%d/niet bevestigd"
-
-#: ../../../src/ui.cpp:523
-#, c-format
-msgid "%d confirmations"
-msgstr "%d bevestigingen"
-
-#: ../../../src/ui.cpp:608
-msgid "Generated"
-msgstr "Gegenereerd"
-
-#: ../../../src/ui.cpp:616
-#, c-format
-msgid "Generated (%s matures in %d more blocks)"
-msgstr "Gegenereerd (%s wordt volwassen over %d blokken)"
-
-#: ../../../src/ui.cpp:620
-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:624
-msgid "Generated (not accepted)"
-msgstr "Gegenereerd (niet geaccepteerd)"
-
-#: ../../../src/ui.cpp:634
-msgid "From: "
-msgstr "Van: "
-
-#: ../../../src/ui.cpp:658
-msgid "Received with: "
-msgstr "Ontvangen op: "
-
-#: ../../../src/ui.cpp:704
-msgid "Payment to yourself"
-msgstr "Betaling aan uzelf"
-
-#: ../../../src/ui.cpp:738
-msgid "To: "
-msgstr "Naar: "
-
-#: ../../../src/ui.cpp:1053
-msgid "    Generating"
-msgstr "    Genereren..."
-
-#: ../../../src/ui.cpp:1055
-msgid "(not connected)"
-msgstr "(niet verbonden)"
-
-#: ../../../src/ui.cpp:1058
-#, c-format
-msgid "     %d connections     %d blocks     %d transactions"
-msgstr "     %d verbindingen     %d blokken     %d transacties"
-
-#: ../../../src/ui.cpp:1163
-#: ../../../src/ui.cpp:2527
-msgid "New Receiving Address"
-msgstr "Nieuw Ontvangstadres"
-
-#: ../../../src/ui.cpp:1164
-#: ../../../src/ui.cpp:2528
-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:1233
-msgid "<b>Status:</b> "
-msgstr "<b>Status:</b> "
-
-#: ../../../src/ui.cpp:1238
-msgid ", has not been successfully broadcast yet"
-msgstr ", is nog niet succesvol verstuurd naar het netwerk"
-
-#: ../../../src/ui.cpp:1240
-#, c-format
-msgid ", broadcast through %d node"
-msgstr ", verstuurd via %d node"
-
-#: ../../../src/ui.cpp:1242
-#, c-format
-msgid ", broadcast through %d nodes"
-msgstr ", verstuurd via %d nodes"
-
-#: ../../../src/ui.cpp:1246
-msgid "<b>Date:</b> "
-msgstr "<b>Datum:</b> "
-
-#: ../../../src/ui.cpp:1254
-msgid "<b>Source:</b> Generated<br>"
-msgstr "<b>Bron:</b> Gegenereerd<br>"
-
-#: ../../../src/ui.cpp:1260
-#: ../../../src/ui.cpp:1278
-msgid "<b>From:</b> "
-msgstr "<b>Van:</b> "
-
-#: ../../../src/ui.cpp:1278
-msgid "unknown"
-msgstr "onbekend"
-
-#: ../../../src/ui.cpp:1279
-#: ../../../src/ui.cpp:1303
-#: ../../../src/ui.cpp:1362
-msgid "<b>To:</b> "
-msgstr "<b>Naar:</b> "
-
-#: ../../../src/ui.cpp:1282
-msgid " (yours, label: "
-msgstr " (van jou, label: "
-
-#: ../../../src/ui.cpp:1284
-msgid " (yours)"
-msgstr " (van jou)"
-
-#: ../../../src/ui.cpp:1321
-#: ../../../src/ui.cpp:1333
-#: ../../../src/ui.cpp:1379
-#: ../../../src/ui.cpp:1396
-msgid "<b>Credit:</b> "
-msgstr "<b>Credit:</b>"
-
-#: ../../../src/ui.cpp:1323
-#, c-format
-msgid "(%s matures in %d more blocks)"
-msgstr "(%s wordt volwassen over %d blokken)"
-
-#: ../../../src/ui.cpp:1325
-msgid "(not accepted)"
-msgstr "(niet geaccepteerd)"
-
-#: ../../../src/ui.cpp:1370
-#: ../../../src/ui.cpp:1378
-#: ../../../src/ui.cpp:1393
-msgid "<b>Debit:</b> "
-msgstr "<b>Debet:</b>"
-
-#: ../../../src/ui.cpp:1384
-msgid "<b>Transaction fee:</b> "
-msgstr "<b>Transactiefooi:</b> "
-
-#: ../../../src/ui.cpp:1400
-msgid "<b>Net amount:</b> "
-msgstr "<b>Nettobedrag:</b> "
-
-#: ../../../src/ui.cpp:1407
-msgid "Message:"
-msgstr "Mededeling:"
-
-#: ../../../src/ui.cpp:1409
-msgid "Comment:"
-msgstr "Commentaar:"
-
-#: ../../../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 "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:1592
-msgid "Cannot write autostart/bitcoin.desktop file"
-msgstr "Kan niet schrijven naar het bestand autostart/bitcoin.desktop"
-
-#: ../../../src/ui.cpp:1628
-msgid "Main"
-msgstr "Algemeen"
-
-#: ../../../src/ui.cpp:1636
-msgid "&Start Bitcoin on window system startup"
-msgstr "&Start Bitcoin wanneer het systeem opstart"
-
-#: ../../../src/ui.cpp:1643
-msgid "&Minimize on close"
-msgstr "&Minimaliseer bij sluiten van het venster"
-
-#: ../../../src/ui.cpp:1785
-#, c-format
-msgid "version %s"
-msgstr "versie %s"
-
-#: ../../../src/ui.cpp:1897
-msgid "Error in amount  "
-msgstr "Fout in hoeveelheid  "
-
-#: ../../../src/ui.cpp:1897
-#: ../../../src/ui.cpp:1902
-#: ../../../src/ui.cpp:1907
-#: ../../../src/ui.cpp:1942
-#: ../../../src/uibase.cpp:55
-msgid "Send Coins"
-msgstr "Verstuur coins"
-
-#: ../../../src/ui.cpp:1902
-msgid "Amount exceeds your balance  "
-msgstr "Hoeveelheid overschrijdt uw huidige balans  "
-
-#: ../../../src/ui.cpp:1907
-msgid "Total exceeds your balance when the "
-msgstr "Totaal overschrijdt uw huidige balans wanneer de "
-
-#: ../../../src/ui.cpp:1907
-msgid " transaction fee is included  "
-msgstr " transactiefooi is meegerekend  "
-
-#: ../../../src/ui.cpp:1925
-msgid "Payment sent  "
-msgstr "Betaling verzonden  "
-
-#: ../../../src/ui.cpp:1925
-#: ../../../src/ui.cpp:1930
-#: ../../../src/ui.cpp:2074
-#: ../../../src/ui.cpp:2227
-#: ../../../src/main.cpp:3999
-msgid "Sending..."
-msgstr "Versturen..."
-
-#: ../../../src/ui.cpp:1942
-msgid "Invalid address  "
-msgstr "Foutief adres  "
-
-#: ../../../src/ui.cpp:1995
-#, c-format
-msgid "Sending %s to %s"
-msgstr "%s versturen naar %s"
-
-#: ../../../src/ui.cpp:2068
-#: ../../../src/ui.cpp:2101
-msgid "CANCELLED"
-msgstr "GEANNULEERD"
-
-#: ../../../src/ui.cpp:2072
-msgid "Cancelled"
-msgstr "Geannuleerd"
-
-#: ../../../src/ui.cpp:2074
-msgid "Transfer cancelled  "
-msgstr "Transactie geannuleerd  "
-
-#: ../../../src/ui.cpp:2127
-msgid "Error: "
-msgstr "Fout: "
-
-#: ../../../src/ui.cpp:2141
-#: ../../../src/ui.cpp:2212
-#: ../../../src/main.cpp:4018
-msgid "Insufficient funds"
-msgstr "Onvoldoende saldo"
-
-#: ../../../src/ui.cpp:2146
-msgid "Connecting..."
-msgstr "Verbinden..."
-
-#: ../../../src/ui.cpp:2151
-msgid "Unable to connect"
-msgstr "Kan niet verbinden"
-
-#: ../../../src/ui.cpp:2156
-msgid "Requesting public key..."
-msgstr "Aanvragen van publieke sleutel..."
-
-#: ../../../src/ui.cpp:2168
-msgid "Received public key..."
-msgstr "Publieke sleutel ontvangen..."
-
-#: ../../../src/ui.cpp:2182
-msgid "Recipient is not accepting transactions sent by IP address"
-msgstr "Ontvanger aanvaardt geen transacties via IP adres"
-
-#: ../../../src/ui.cpp:2184
-msgid "Transfer was not accepted"
-msgstr "Transactie niet geaccepteerd"
-
-#: ../../../src/ui.cpp:2193
-msgid "Invalid response received"
-msgstr "Foutief antwoord ontvangen"
-
-#: ../../../src/ui.cpp:2208
-msgid "Creating transaction..."
-msgstr "Transactie aanmaken..."
-
-#: ../../../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 "Deze transactie vergt een fooi van ten minste %s omwille van zijn bedrag, complexiteit, of gebruik van recent ontvangen fonden"
-
-#: ../../../src/ui.cpp:2222
-msgid "Transaction creation failed"
-msgstr "Aanmaken van transactie mislukt"
-
-#: ../../../src/ui.cpp:2229
-msgid "Transaction aborted"
-msgstr "Transactie geannuleerd"
-
-#: ../../../src/ui.cpp:2237
-msgid "Lost connection, transaction cancelled"
-msgstr "Verbinding verloren, transactie geannuleerd"
-
-#: ../../../src/ui.cpp:2253
-msgid "Sending payment..."
-msgstr "Betaling versturen..."
-
-#: ../../../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 "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:2268
-msgid "Waiting for confirmation..."
-msgstr "Wachten op bevestiging..."
-
-#: ../../../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 ""
-"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:2295
-msgid "Payment was sent, but an invalid response was received"
-msgstr "Betaling is verstuurd, maar een foutief antword is ontvangen."
-
-#: ../../../src/ui.cpp:2301
-msgid "Payment completed"
-msgstr "Betaling voltooid"
-
-#: ../../../src/ui.cpp:2332
-#: ../../../src/ui.cpp:2478
-#: ../../../src/ui.cpp:2515
-msgid "Name"
-msgstr "Naam"
-
-#: ../../../src/ui.cpp:2333
-#: ../../../src/ui.cpp:2478
-#: ../../../src/ui.cpp:2515
-msgid "Address"
-msgstr "Adres"
-
-#: ../../../src/ui.cpp:2335
-#: ../../../src/ui.cpp:2490
-msgid "Label"
-msgstr "Label"
-
-#: ../../../src/ui.cpp:2336
-#: ../../../src/uibase.cpp:837
-msgid "Bitcoin Address"
-msgstr "Bitcoin-adres"
-
-#: ../../../src/ui.cpp:2460
-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:2478
-#: ../../../src/ui.cpp:2484
-msgid "Edit Address"
-msgstr "Bewerk adres"
-
-#: ../../../src/ui.cpp:2490
-msgid "Edit Address Label"
-msgstr "Bewerk adreslabel"
-
-#: ../../../src/ui.cpp:2515
-#: ../../../src/ui.cpp:2521
-msgid "Add Address"
-msgstr "Adres toevoegen"
-
-#: ../../../src/ui.cpp:2598
-msgid "Bitcoin"
-msgstr "Bitcoin"
-
-#: ../../../src/ui.cpp:2600
-msgid "Bitcoin - Generating"
-msgstr "Bitcoin - Genereren..."
-
-#: ../../../src/ui.cpp:2602
-msgid "Bitcoin - (not connected)"
-msgstr "Bitcoin - (niet verbonden)"
-
-#: ../../../src/ui.cpp:2681
-msgid "&Open Bitcoin"
-msgstr "&Open Bitcoin"
-
-#: ../../../src/ui.cpp:2682
-msgid "&Send Bitcoins"
-msgstr "&Verstuur Bitcoins"
-
-#: ../../../src/ui.cpp:2683
-msgid "O&ptions..."
-msgstr "O&pties"
-
-#: ../../../src/ui.cpp:2686
-#: ../../../src/uibase.cpp:25
-msgid "E&xit"
-msgstr "A&fsluiten"
-
-#: ../../../src/ui.cpp:2902
-msgid "Program has crashed and will terminate.  "
-msgstr "Het programma is gecrasht en wordt afgesloten.  "
-
-#: ../../../src/main.cpp:1868
-msgid "Warning: Disk space is low  "
-msgstr "Waarschuwing: Weinig schijfruimte over  "
-
-#: ../../../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 "Fout: Deze transactie vergt een fooi van ten minste %s omwille van zijn bedrag, complexiteit, of gebruik van recent ontvangen fonden  "
-
-#: ../../../src/main.cpp:3994
-msgid "Error: Transaction creation failed  "
-msgstr "Fout: Aanmaken van transactie mislukt  "
-
-#: ../../../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 "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/main.cpp:4016
-msgid "Invalid amount"
-msgstr "Foutieve hoeveelheid"
-
-#: ../../../src/main.cpp:4023
-msgid "Invalid bitcoin address"
-msgstr "Foutief bitcoin-adres"
-
-#: ../../../src/rpc.cpp:1800
-#: ../../../src/rpc.cpp:1802
-#, c-format
-msgid "To use the %s option"
-msgstr "Om de %s optie te gebruiken"
-
-#: ../../../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 ""
-"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: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=<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/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 "Waarschuwing: Controleer of uw computers datum en tijd correct ingesteld zijn. Als uw klok fout staat zal Bitcoin niet correct werken."
-
-#: ../../../src/util.cpp:898
-msgid "beta"
-msgstr "beta"
-
-#: ../../../src/uibase.cpp:28
-msgid "&File"
-msgstr "&Bestand"
-
-#: ../../../src/uibase.cpp:32
-msgid "&Your Receiving Addresses..."
-msgstr "&Uw ontvangstadressen..."
-
-#: ../../../src/uibase.cpp:36
-msgid "&Options..."
-msgstr "&Opties..."
-
-#: ../../../src/uibase.cpp:39
-msgid "&Settings"
-msgstr "&Eigenschappen"
-
-#: ../../../src/uibase.cpp:43
-msgid "&About..."
-msgstr "&Over..."
-
-#: ../../../src/uibase.cpp:46
-msgid "&Help"
-msgstr "&Help"
-
-#: ../../../src/uibase.cpp:56
-msgid "Address Book"
-msgstr "Adresboek"
-
-#: ../../../src/uibase.cpp:69
-msgid "Your Bitcoin Address:"
-msgstr "Uw bitcoin-adres:"
-
-#: ../../../src/uibase.cpp:76
-msgid " &New... "
-msgstr " &Nieuw... "
-
-#: ../../../src/uibase.cpp:79
-#: ../../../src/uibase.cpp:780
-#: ../../../src/uibase.cpp:883
-msgid " &Copy to Clipboard "
-msgstr " &Kopieer naar plakbord "
-
-#: ../../../src/uibase.cpp:93
-msgid "Balance:"
-msgstr "Balans:"
-
-#: ../../../src/uibase.cpp:109
-msgid " All"
-msgstr " Alles"
-
-#: ../../../src/uibase.cpp:109
-msgid " Sent"
-msgstr " Verstuurd"
-
-#: ../../../src/uibase.cpp:109
-msgid " Received"
-msgstr " Ontvangen"
-
-#: ../../../src/uibase.cpp:109
-msgid " In Progress"
-msgstr " Wordt verwerkt"
-
-#: ../../../src/uibase.cpp:130
-msgid "All Transactions"
-msgstr "Alle transacties"
-
-#: ../../../src/uibase.cpp:141
-msgid "Sent/Received"
-msgstr "Verstuurd/Ontvangen"
-
-#: ../../../src/uibase.cpp:152
-msgid "Sent"
-msgstr "Verstuurd"
-
-#: ../../../src/uibase.cpp:163
-msgid "Received"
-msgstr "Ontvangen"
-
-#: ../../../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 "&Start Bitcoin wanneer het systeem opstart"
-
-#: ../../../src/uibase.cpp:348
-msgid "&Minimize to the tray instead of the taskbar"
-msgstr "&Minimaliseer tot systeemvak in plaats van de taakbalk"
-
-#: ../../../src/uibase.cpp:351
-msgid "Map port using &UPnP"
-msgstr "Portmapping via &UPnP"
-
-#: ../../../src/uibase.cpp:354
-msgid "M&inimize to the tray on close"
-msgstr "M&inimaliseer tot taakbalk bij sluiten"
-
-#: ../../../src/uibase.cpp:360
-msgid "&Connect through socks4 proxy: "
-msgstr "&Verbind via socks4 proxy: "
-
-#: ../../../src/uibase.cpp:371
-msgid "Proxy &IP:"
-msgstr "Proxy &IP:"
-
-#: ../../../src/uibase.cpp:379
-msgid " &Port:"
-msgstr " &Poort:"
-
-#: ../../../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 "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:399
-msgid "Pay transaction fee:"
-msgstr "Transactiefooi:"
-
-#: ../../../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 "Annuleren"
-
-#: ../../../src/uibase.cpp:449
-msgid "&Apply"
-msgstr "&Toepassen"
-
-#: ../../../src/uibase.cpp:508
-msgid "Bitcoin "
-msgstr "Bitcoin "
-
-#: ../../../src/uibase.cpp:514
-msgid "version"
-msgstr "versie"
-
-#: ../../../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-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:581
-msgid "Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)"
-msgstr "Voer een bitcoin-adres (bijvoorbeeld: 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)"
-
-#: ../../../src/uibase.cpp:595
-msgid "Pay &To:"
-msgstr "Betaal &aan:"
-
-#: ../../../src/uibase.cpp:610
-msgid "&Paste"
-msgstr "&Plakken"
-
-#: ../../../src/uibase.cpp:613
-msgid " Address &Book..."
-msgstr " Adres&boek..."
-
-#: ../../../src/uibase.cpp:620
-msgid "&Amount:"
-msgstr "&Hoeveelheid:"
-
-#: ../../../src/uibase.cpp:630
-msgid "T&ransfer:"
-msgstr "O&verdracht:"
-
-#: ../../../src/uibase.cpp:636
-msgid " Standard"
-msgstr " Standaard"
-
-#: ../../../src/uibase.cpp:663
-msgid "&Send"
-msgstr "&Versturen"
-
-#: ../../../src/uibase.cpp:711
-msgid ""
-"\n"
-"\n"
-"Connecting..."
-msgstr ""
-"\n"
-"\n"
-"Verbinden..."
-
-#: ../../../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 "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:774
-#: ../../../src/uibase.cpp:886
-msgid "&Edit..."
-msgstr "&Bewerken..."
-
-#: ../../../src/uibase.cpp:777
-#: ../../../src/uibase.cpp:889
-msgid " &New Address... "
-msgstr " &Nieuw adres... "
-
-#: ../../../src/uibase.cpp:849
-msgid "Sending"
-msgstr "Versturen..."
-
-#: ../../../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 "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:870
-msgid "Receiving"
-msgstr "Ontvangen..."
-
-#: ../../../src/uibase.cpp:880
-msgid "&Delete"
-msgstr "&Verwijderen"
-
-#: ../../../src/init.cpp:147
-msgid "Bitcoin version"
-msgstr "Bitcoin "
-
-#: ../../../src/init.cpp:148
-msgid "Usage:"
-msgstr "Mededeling:"
-
-#: ../../../src/init.cpp:150
-msgid "Send command to -server or bitcoind\n"
-msgstr "Zend commando naar -server of bitcoind\n"
-
-#: ../../../src/init.cpp:151
-msgid "List commands\n"
-msgstr "List van commando's\n"
-
-#: ../../../src/init.cpp:152
-msgid "Get help for a command\n"
-msgstr "Toon hulp voor een commando\n"
-
-#: ../../../src/init.cpp:153
-msgid "Options:\n"
-msgstr "Opties:\n"
-
-#: ../../../src/init.cpp:154
-msgid "Specify configuration file (default: bitcoin.conf)\n"
-msgstr "Specifieer configuratiebestand (standaard: bitcoin.conf)\n"
-
-#: ../../../src/init.cpp:155
-msgid "Specify pid file (default: bitcoind.pid)\n"
-msgstr "Specifieer pid-bestand (standaard: bitcoind.pid)\n"
-
-#: ../../../src/init.cpp:156
-msgid "Generate coins\n"
-msgstr "Genereer coins\n"
-
-#: ../../../src/init.cpp:157
-msgid "Don't generate coins\n"
-msgstr "Genereer geen coins\n"
-
-#: ../../../src/init.cpp:158
-msgid "Start minimized\n"
-msgstr "Geminimaliseerd starten\n"
-
-#: ../../../src/init.cpp:159
-msgid "Specify data directory\n"
-msgstr "Stel datamap in\n"
-
-#: ../../../src/init.cpp:161
-msgid "Specify connection timeout (in milliseconds)\n"
-msgstr "Gelieve de time-out tijd te specifieren (in milliseconden)\n"
-
-#: ../../../src/init.cpp:160
-msgid "Connect through socks4 proxy\n"
-msgstr "Verbind via socks4 proxy\n"
-
-#: ../../../src/init.cpp:161
-msgid "Allow DNS lookups for addnode and connect\n"
-msgstr "Sta DNS-opzoeking toe voor addnode en connect\n"
-
-#: ../../../src/init.cpp:162
-msgid "Add a node to connect to\n"
-msgstr "Voeg een node toe om mee te verbinden\n"
-
-#: ../../../src/init.cpp:163
-msgid "Connect only to the specified node\n"
-msgstr "Verbind alleen met deze node\n"
-
-#: ../../../src/init.cpp:164
-msgid "Don't accept connections from outside\n"
-msgstr "Sta geen verbindingen van buitenaf toe\n"
-
-#: ../../../src/init.cpp:167
-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:169
-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:172
-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:174
-msgid "Accept command line and JSON-RPC commands\n"
-msgstr "Aanvaard commandolijn en JSON-RPC commando's\n"
-
-#: ../../../src/init.cpp:177
-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:179
-msgid "Use the test network\n"
-msgstr "Gebruik het test-netwerk\n"
-
-#: ../../../src/init.cpp:180
-msgid "Username for JSON-RPC connections\n"
-msgstr "Gebruikersnaam voor JSON-RPC verbindingen\n"
-
-#: ../../../src/init.cpp:181
-msgid "Password for JSON-RPC connections\n"
-msgstr "Wachtwoord voor JSON-RPC verbindingen\n"
-
-#: ../../../src/init.cpp:182
-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:183
-msgid "Allow JSON-RPC connections from specified IP address\n"
-msgstr "Enkel JSON-RPC verbindingen van opgegeven IP adres toestaan\n"
-
-#: ../../../src/init.cpp:184
-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:185
-msgid "Set key pool size to <n> (default: 100)\n"
-msgstr "Stel sleutelpoelgrootte in op <n> (standaard: 100)\n"
-
-#: ../../../src/init.cpp:186
-msgid "Rescan the block chain for missing wallet transactions\n"
-msgstr "Doorzoek de blokken database voor ontbrekende portefeuille-transacties\n"
-
-#: ../../../src/init.cpp:190
-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:191
-msgid "Use OpenSSL (https) for JSON-RPC connections\n"
-msgstr "Gebruik OpenSSL (https) voor JSON-RPC verbindingen\n"
-
-#: ../../../src/init.cpp:192
-msgid "Server certificate file (default: server.cert)\n"
-msgstr "Certificaat-bestand voor server (standaard: server.cert)\n"
-
-#: ../../../src/init.cpp:193
-msgid "Server private key (default: server.pem)\n"
-msgstr "Geheime sleutel voor server (standaard: server.pem)\n"
-
-#: ../../../src/init.cpp:194
-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:198
-msgid "This help message\n"
-msgstr "Dit helpbericht\n"
-
-#: ../../../src/init.cpp:335
-#, 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:361
-msgid "Error loading addr.dat      \n"
-msgstr "Fout bij laden van bestand addr.dat      \n"
-
-#: ../../../src/init.cpp:367
-msgid "Error loading blkindex.dat      \n"
-msgstr "Fout bij laden van bestand blkindex.dat      \n"
-
-#: ../../../src/init.cpp:374
-msgid "Error loading wallet.dat      \n"
-msgstr "Fout bij laden van bestand wallet.dat      \n"
-
-#: ../../../src/init.cpp:454
-msgid "Invalid -proxy address"
-msgstr "Foutief -proxy adres"
-
-#: ../../../src/init.cpp:477
-msgid "Invalid amount for -paytxfee=<amount>"
-msgstr "Ongeldig bedrag voor -paytxfee=<bedrag>"
-
-#: ../../../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 "Waarschuwing: -paytxfee is zeer hoog ingesteld.  Dit is de fooi die betaald wordt bij het zenden van een transactie."
-
-#: ../../../src/uibase.h:147
-msgid "Transaction Details"
-msgstr "Transactiedetails"
-
-#: ../../../src/uibase.h:199
-msgid "Options"
-msgstr "Opties"
-
-#: ../../../src/uibase.h:228
-msgid "About Bitcoin"
-msgstr "Over Bitcoin"
-
-#: ../../../src/uibase.h:337
-msgid "Your Bitcoin Addresses"
-msgstr "Uw bitcoin-adressen"

locale/pl/LC_MESSAGES/bitcoin.po

@@ -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"
-

locale/pt/LC_MESSAGES/bitcoin.po

@@ -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"

locale/readme.txt

@@ -1,5 +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

locale/sv/LC_MESSAGES/bitcoin.po

@@ -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"
-

locale/zh_cn/LC_MESSAGES/bitcoin.po

@@ -1,967 +0,0 @@
-msgid ""
-msgstr ""
-"Project-Id-Version: \n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-21 14:19+0800\n"
-"PO-Revision-Date: 2011-05-28 17: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:142
-msgid "Bitcoin version"
-msgstr "Bitcoin 版本"
-
-#: ../../../src/init.cpp:143
-msgid "Usage:"
-msgstr "用法:"
-
-#: ../../../src/init.cpp:145
-msgid "Send command to -server or bitcoind\n"
-msgstr "发送命令给 -server 或 bitcoin\n"
-
-#: ../../../src/init.cpp:146
-msgid "List commands\n"
-msgstr "列出命令\n"
-
-#: ../../../src/init.cpp:147
-msgid "Get help for a command\n"
-msgstr "获取命令的帮助\n"
-
-#: ../../../src/init.cpp:148
-msgid "Options:\n"
-msgstr "选项:\n"
-
-#: ../../../src/init.cpp:149
-msgid "Specify configuration file (default: bitcoin.conf)\n"
-msgstr "指定配置文件 (默认: bitcoin.conf)\n"
-
-#: ../../../src/init.cpp:150
-msgid "Specify pid file (default: bitcoind.pid)\n"
-msgstr "指定 pid 文件 (默认: bitcoin.pid)\n"
-
-#: ../../../src/init.cpp:151
-msgid "Generate coins\n"
-msgstr "生成货币\n"
-
-#: ../../../src/init.cpp:152
-msgid "Don't generate coins\n"
-msgstr "不要生成货币\n"
-
-#: ../../../src/init.cpp:153
-msgid "Start minimized\n"
-msgstr "启动时最小化\n"
-
-#: ../../../src/init.cpp:154
-msgid "Specify data directory\n"
-msgstr "指定数据目录\n"
-
-#: ../../../src/init.cpp:155
-msgid "Connect through socks4 proxy\n"
-msgstr "通过 socks4 代理连接\n"
-
-#: ../../../src/init.cpp:156
-msgid "Allow DNS lookups for addnode and connect\n"
-msgstr "允许 DNS 查找新增结点和连接\n"
-
-#: ../../../src/init.cpp:157
-msgid "Add a node to connect to\n"
-msgstr "添加一个连接结点\n"
-
-#: ../../../src/init.cpp:158
-msgid "Connect only to the specified node\n"
-msgstr "只连接特定结点\n"
-
-#: ../../../src/init.cpp:159
-msgid "Don't accept connections from outside\n"
-msgstr "不要接受外部传来的连接\n"
-
-#: ../../../src/init.cpp:162
-msgid "Don't attempt to use UPnP to map the listening port\n"
-msgstr "不要尝试使用 UPnP 映射监听端口\n"
-
-#: ../../../src/init.cpp:164
-msgid "Attempt to use UPnP to map the listening port\n"
-msgstr "尝试使用 UPnP 映射监听端口\n"
-
-#: ../../../src/init.cpp:167
-msgid "Fee per KB to add to transactions you send\n"
-msgstr "您为每 KB 支付所增加的交易佣金\n"
-
-#: ../../../src/init.cpp:169
-msgid "Accept command line and JSON-RPC commands\n"
-msgstr "允许命令行和 JSON-RPC 控制\n"
-
-#: ../../../src/init.cpp:172
-msgid "Run in the background as a daemon and accept commands\n"
-msgstr "在后台运行并接收命令\n"
-
-#: ../../../src/init.cpp:174
-msgid "Use the test network\n"
-msgstr "使用测试网络\n"
-
-#: ../../../src/init.cpp:175
-msgid "Username for JSON-RPC connections\n"
-msgstr "JSON-RPC 连接的用户名\n"
-
-#: ../../../src/init.cpp:176
-msgid "Password for JSON-RPC connections\n"
-msgstr "JSON-RPC 连接的密码\n"
-
-#: ../../../src/init.cpp:177
-msgid "Listen for JSON-RPC connections on <port> (default: 8332)\n"
-msgstr "在端口 <port> 监听 JSON-RPC 连接 (默认: 8332)\n"
-
-#: ../../../src/init.cpp:178
-msgid "Allow JSON-RPC connections from specified IP address\n"
-msgstr "允许来自特定 IP 地址的 JSON-RPC 连接\n"
-
-#: ../../../src/init.cpp:179
-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:180
-msgid "Set key pool size to <n> (default: 100)\n"
-msgstr "设置密钥池大小为 <n> (默认: 100)\n"
-
-#: ../../../src/init.cpp:181
-msgid "Rescan the block chain for missing wallet transactions\n"
-msgstr "重新扫描货币包链来检测丢失的货币交易\n"
-
-#: ../../../src/init.cpp:185
-msgid ""
-"\n"
-"SSL options: (see the Bitcoin Wiki for SSL setup instructions)\n"
-msgstr ""
-"\n"
-"SSL 选项: (SSL 设置步骤请参见 Bitcoin Wiki)\n"
-
-#: ../../../src/init.cpp:186
-msgid "Use OpenSSL (https) for JSON-RPC connections\n"
-msgstr "使用 OpenSSL (https) 进行 JSON-RPC 连接\n"
-
-#: ../../../src/init.cpp:187
-msgid "Server certificate file (default: server.cert)\n"
-msgstr "服务器证书 (默认: server.cert)\n"
-
-#: ../../../src/init.cpp:188
-msgid "Server private key (default: server.pem)\n"
-msgstr "服务器私有密钥 (默认: server.pem)\n"
-
-#: ../../../src/init.cpp:189
-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:193
-msgid "This help message\n"
-msgstr "本帮助信息\n"
-
-#: ../../../src/init.cpp:330
-#, c-format
-msgid "Cannot obtain a lock on data directory %s.  Bitcoin is probably already running."
-msgstr "无法获取数据目录 %s 的锁。 Bitcoin 可能已经启动。"
-
-#: ../../../src/init.cpp:356
-msgid "Error loading addr.dat      \n"
-msgstr "加载 addr.dat 出错      \n"
-
-#: ../../../src/init.cpp:362
-msgid "Error loading blkindex.dat      \n"
-msgstr "加载 blkindex.dat 出错      \n"
-
-#: ../../../src/init.cpp:369
-msgid "Error loading wallet.dat      \n"
-msgstr "加载 wallet.dat 出错      \n"
-
-#: ../../../src/init.cpp:449
-msgid "Invalid -proxy address"
-msgstr "无效 -proxy 地址"
-
-#: ../../../src/init.cpp:472
-msgid "Invalid amount for -paytxfee=<amount>"
-msgstr "无效的金额 -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 "警告: -paytxfee 设置得过高。 这个参数是您发送一笔交易要支付的佣金。"
-
-#: ../../../src/main.cpp:1866
-msgid "Warning: Disk space is low  "
-msgstr "警告: 磁盘空间不足"
-
-#: ../../../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 "错误: 这个交易因为近期收到支付的数量，难度或者使用而需要支付至少 %s 交易佣金 "
-
-#: ../../../src/main.cpp:3992
-msgid "Error: Transaction creation failed  "
-msgstr "错误: 交易创建失败"
-
-#: ../../../src/main.cpp:3997
-#: ../../../src/ui.cpp:1927
-#: ../../../src/ui.cpp:1932
-#: ../../../src/ui.cpp:2076
-#: ../../../src/ui.cpp:2229
-msgid "Sending..."
-msgstr "正在发送..."
-
-#: ../../../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 "错误: 交易被拒绝。 这可能是因为您账户里的一些货币应经被使用，比如您使用了一个复制的 wallet.dat 文件，一些货币在另一个复件里支付了但是没有在这里更新。"
-
-#: ../../../src/main.cpp:4014
-msgid "Invalid amount"
-msgstr "无效金额"
-
-#: ../../../src/main.cpp:4016
-#: ../../../src/ui.cpp:2143
-#: ../../../src/ui.cpp:2214
-msgid "Insufficient funds"
-msgstr "余额不足"
-
-#: ../../../src/main.cpp:4021
-msgid "Invalid bitcoin address"
-msgstr "无效 bitcoin 地址"
-
-#: ../../../src/net.cpp:1503
-#, c-format
-msgid "Unable to bind to port %d on this computer.  Bitcoin is probably already running."
-msgstr "无法在这台电脑上绑定 %d 端口。 Bitcoin 可能已经在运行。"
-
-#: ../../../src/rpc.cpp:1802
-#: ../../../src/rpc.cpp:1804
-#, c-format
-msgid "To use the %s option"
-msgstr "使用 %s 选项"
-
-#: ../../../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 ""
-"警告: %s，您必须在配置文件中设置 rpcpassword=<password>\n"
-"配置文件为: %s\n"
-"如果文件不存在，请创建文件并只给创建者提供只读访问权限。\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 ""
-"您必须在配置文件中设置 rpcpassword=<password> :\n"
-"%s\n"
-"如果文件不存在，请创建文件并只给创建者提供只读访问权限。"
-
-#: ../../../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 "这笔交易超过了大小限制。 您依然可以通过支付 %s 的佣金来进行，佣金用来支付为您的交易计算的结点来帮助支撑网络。 您是否要支付佣金?"
-
-#: ../../../src/ui.cpp:303
-msgid "Status"
-msgstr "状态"
-
-#: ../../../src/ui.cpp:304
-msgid "Date"
-msgstr "日期"
-
-#: ../../../src/ui.cpp:305
-msgid "Description"
-msgstr "描述"
-
-#: ../../../src/ui.cpp:306
-msgid "Debit"
-msgstr "付款人"
-
-#: ../../../src/ui.cpp:307
-msgid "Credit"
-msgstr "信用"
-
-#: ../../../src/ui.cpp:513
-#, c-format
-msgid "Open for %d blocks"
-msgstr "%d 个货币包开放"
-
-#: ../../../src/ui.cpp:515
-#, c-format
-msgid "Open until %s"
-msgstr "开放直到 %s"
-
-#: ../../../src/ui.cpp:521
-#, c-format
-msgid "%d/offline?"
-msgstr "%d/离线?"
-
-#: ../../../src/ui.cpp:523
-#, c-format
-msgid "%d/unconfirmed"
-msgstr "%d/未确认"
-
-#: ../../../src/ui.cpp:525
-#, c-format
-msgid "%d confirmations"
-msgstr "%d 确认"
-
-#: ../../../src/ui.cpp:610
-msgid "Generated"
-msgstr "已生成"
-
-#: ../../../src/ui.cpp:618
-#, c-format
-msgid "Generated (%s matures in %d more blocks)"
-msgstr "已生成 (%s 成熟 %d 新增货币包)"
-
-#: ../../../src/ui.cpp:622
-msgid "Generated - Warning: This block was not received by any other nodes and will probably not be accepted!"
-msgstr "已生成 - 警告: 这个货币包没有被任何其他结点收到，因此很可能不会被接受!"
-
-#: ../../../src/ui.cpp:626
-msgid "Generated (not accepted)"
-msgstr "已生成 (未被接受)"
-
-#: ../../../src/ui.cpp:636
-msgid "From: "
-msgstr "来自: "
-
-#: ../../../src/ui.cpp:660
-msgid "Received with: "
-msgstr "伴随接收: "
-
-#: ../../../src/ui.cpp:706
-msgid "Payment to yourself"
-msgstr "支付给您自己"
-
-#: ../../../src/ui.cpp:740
-msgid "To: "
-msgstr "到: "
-
-#: ../../../src/ui.cpp:1055
-msgid "    Generating"
-msgstr "    生成中"
-
-#: ../../../src/ui.cpp:1057
-msgid "(not connected)"
-msgstr "(未连接)"
-
-#: ../../../src/ui.cpp:1060
-#, c-format
-msgid "     %d connections     %d blocks     %d transactions"
-msgstr "     %d 个连接     %d 个货币包     %d 个交易 "
-
-#: ../../../src/ui.cpp:1165
-#: ../../../src/ui.cpp:2529
-msgid "New Receiving Address"
-msgstr "新建接收地址"
-
-#: ../../../src/ui.cpp:1166
-#: ../../../src/ui.cpp:2530
-msgid ""
-"You should use a new address for each payment you receive.\n"
-"\n"
-"Label"
-msgstr ""
-"您应该为您收到的每次付款使用不同的地址。\n"
-"\n"
-"标签"
-
-#: ../../../src/ui.cpp:1235
-msgid "<b>Status:</b> "
-msgstr "<b>状态:</b> "
-
-#: ../../../src/ui.cpp:1240
-msgid ", has not been successfully broadcast yet"
-msgstr "，尚未被成功广播"
-
-#: ../../../src/ui.cpp:1242
-#, c-format
-msgid ", broadcast through %d node"
-msgstr "，通过 %d 个结点广播"
-
-#: ../../../src/ui.cpp:1244
-#, c-format
-msgid ", broadcast through %d nodes"
-msgstr "，通过 %d 个结点广播"
-
-#: ../../../src/ui.cpp:1248
-msgid "<b>Date:</b> "
-msgstr "<b>日期:</b>"
-
-#: ../../../src/ui.cpp:1256
-msgid "<b>Source:</b> Generated<br>"
-msgstr "<b>来源:</b> 生成<br>"
-
-#: ../../../src/ui.cpp:1262
-#: ../../../src/ui.cpp:1280
-msgid "<b>From:</b> "
-msgstr "<b>从:</b> "
-
-#: ../../../src/ui.cpp:1280
-msgid "unknown"
-msgstr "未知"
-
-#: ../../../src/ui.cpp:1281
-#: ../../../src/ui.cpp:1305
-#: ../../../src/ui.cpp:1364
-msgid "<b>To:</b> "
-msgstr "<b>到:</b> "
-
-#: ../../../src/ui.cpp:1284
-msgid " (yours, label: "
-msgstr " (您的标签: "
-
-#: ../../../src/ui.cpp:1286
-msgid " (yours)"
-msgstr " (您的)"
-
-#: ../../../src/ui.cpp:1323
-#: ../../../src/ui.cpp:1335
-#: ../../../src/ui.cpp:1381
-#: ../../../src/ui.cpp:1398
-msgid "<b>Credit:</b> "
-msgstr "<b>信用:</b> "
-
-#: ../../../src/ui.cpp:1325
-#, c-format
-msgid "(%s matures in %d more blocks)"
-msgstr "(%s 收获在 %d 更多的货币包)"
-
-#: ../../../src/ui.cpp:1327
-msgid "(not accepted)"
-msgstr "(未被接受)"
-
-#: ../../../src/ui.cpp:1372
-#: ../../../src/ui.cpp:1380
-#: ../../../src/ui.cpp:1395
-msgid "<b>Debit:</b> "
-msgstr "<b>付款人:</b> "
-
-#: ../../../src/ui.cpp:1386
-msgid "<b>Transaction fee:</b> "
-msgstr "<b>交易佣金:</b> "
-
-#: ../../../src/ui.cpp:1402
-msgid "<b>Net amount:</b> "
-msgstr "<b>网络金额:</b> "
-
-#: ../../../src/ui.cpp:1409
-msgid "Message:"
-msgstr "消息:"
-
-#: ../../../src/ui.cpp:1411
-msgid "Comment:"
-msgstr "评论"
-
-#: ../../../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 "生成的货币必须等待 120 个货币包之后才能够使用。 当您生成了一个货币包后，它被广播给网络来加入货币包链中。 如果它无法加入货币包链中，他将会标记为\"不被接受\"且不能被支付。 这种情况可能因为在您生成这个货币包之后的几秒钟内有别人也生成了货币包而发生。"
-
-#: ../../../src/ui.cpp:1594
-msgid "Cannot write autostart/bitcoin.desktop file"
-msgstr "无法写入 autostart/bitcoin.desktop 文件"
-
-#: ../../../src/ui.cpp:1630
-msgid "Main"
-msgstr "主要"
-
-#: ../../../src/ui.cpp:1638
-msgid "&Start Bitcoin on window system startup"
-msgstr "开机自动启动 Bitcoin(&S)"
-
-#: ../../../src/ui.cpp:1645
-msgid "&Minimize on close"
-msgstr "关闭时最小化(&M)"
-
-#: ../../../src/ui.cpp:1787
-#, c-format
-msgid "version %s"
-msgstr "版本 %s"
-
-#: ../../../src/ui.cpp:1899
-msgid "Error in amount  "
-msgstr "金额有误  "
-
-#: ../../../src/ui.cpp:1899
-#: ../../../src/ui.cpp:1904
-#: ../../../src/ui.cpp:1909
-#: ../../../src/ui.cpp:1944
-#: ../../../src/uibase.cpp:55
-msgid "Send Coins"
-msgstr "发送货币"
-
-#: ../../../src/ui.cpp:1904
-msgid "Amount exceeds your balance  "
-msgstr "金额超出您的账户余额"
-
-#: ../../../src/ui.cpp:1909
-msgid "Total exceeds your balance when the "
-msgstr "总费用超出您的账户余额当 "
-
-#: ../../../src/ui.cpp:1909
-msgid " transaction fee is included  "
-msgstr " 交易佣金已包括"
-
-#: ../../../src/ui.cpp:1927
-msgid "Payment sent  "
-msgstr "付款已发送"
-
-#: ../../../src/ui.cpp:1944
-msgid "Invalid address  "
-msgstr "无效地址  "
-
-#: ../../../src/ui.cpp:1997
-#, c-format
-msgid "Sending %s to %s"
-msgstr "发送 %s 给 %s"
-
-#: ../../../src/ui.cpp:2070
-#: ../../../src/ui.cpp:2103
-msgid "CANCELLED"
-msgstr "已取消"
-
-#: ../../../src/ui.cpp:2074
-msgid "Cancelled"
-msgstr "已取消"
-
-#: ../../../src/ui.cpp:2076
-msgid "Transfer cancelled  "
-msgstr "传输已取消  "
-
-#: ../../../src/ui.cpp:2129
-msgid "Error: "
-msgstr "错误: "
-
-#: ../../../src/ui.cpp:2148
-msgid "Connecting..."
-msgstr "正在连接..."
-
-#: ../../../src/ui.cpp:2153
-msgid "Unable to connect"
-msgstr "无法连接"
-
-#: ../../../src/ui.cpp:2158
-msgid "Requesting public key..."
-msgstr "正在请求公共密钥..."
-
-#: ../../../src/ui.cpp:2170
-msgid "Received public key..."
-msgstr "收到公共密钥..."
-
-#: ../../../src/ui.cpp:2184
-msgid "Recipient is not accepting transactions sent by IP address"
-msgstr "收款人不接受来自 IP 地址的交易"
-
-#: ../../../src/ui.cpp:2186
-msgid "Transfer was not accepted"
-msgstr "传输没有被接受"
-
-#: ../../../src/ui.cpp:2195
-msgid "Invalid response received"
-msgstr "接收到无效回复"
-
-#: ../../../src/ui.cpp:2210
-msgid "Creating transaction..."
-msgstr "正在创建交易..."
-
-#: ../../../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 "这笔交易因为它最近收到的付款的数量，交易难度或者使用情况，需要至少 %s 交易佣金"
-
-#: ../../../src/ui.cpp:2224
-msgid "Transaction creation failed"
-msgstr "交易创建失败"
-
-#: ../../../src/ui.cpp:2231
-msgid "Transaction aborted"
-msgstr "交易中止"
-
-#: ../../../src/ui.cpp:2239
-msgid "Lost connection, transaction cancelled"
-msgstr "失去连接，交易已取消"
-
-#: ../../../src/ui.cpp:2255
-msgid "Sending payment..."
-msgstr "正在发送付款..."
-
-#: ../../../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 "交易被拒绝。 这可能是因为您账户中的一部分货币已经被使用，比如您使用了一个复制的 wallet.dat 文件，而且货币在另一个副本里使用但没有在这里标记。"
-
-#: ../../../src/ui.cpp:2270
-msgid "Waiting for confirmation..."
-msgstr "正在等待确认..."
-
-#: ../../../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 ""
-"付款已发送，但是收款人无法进行确认。\n"
-"交易已经被记录，并且支付给收款人，\n"
-"但是评论信息可能是空的。"
-
-#: ../../../src/ui.cpp:2297
-msgid "Payment was sent, but an invalid response was received"
-msgstr "支付已发送，但是收到无效回复"
-
-#: ../../../src/ui.cpp:2303
-msgid "Payment completed"
-msgstr "付款完成"
-
-#: ../../../src/ui.cpp:2334
-#: ../../../src/ui.cpp:2480
-#: ../../../src/ui.cpp:2517
-msgid "Name"
-msgstr "姓名"
-
-#: ../../../src/ui.cpp:2335
-#: ../../../src/ui.cpp:2480
-#: ../../../src/ui.cpp:2517
-msgid "Address"
-msgstr "地址"
-
-#: ../../../src/ui.cpp:2337
-#: ../../../src/ui.cpp:2492
-msgid "Label"
-msgstr "标签"
-
-#: ../../../src/ui.cpp:2338
-#: ../../../src/uibase.cpp:837
-msgid "Bitcoin Address"
-msgstr "Bitcoin 地址"
-
-#: ../../../src/ui.cpp:2462
-msgid "This is one of your own addresses for receiving payments and cannot be entered in the address book.  "
-msgstr "这是您拥有的接收付款的地址之一，它不能够进入这个地址簿。 "
-
-#: ../../../src/ui.cpp:2480
-#: ../../../src/ui.cpp:2486
-msgid "Edit Address"
-msgstr "编辑地址"
-
-#: ../../../src/ui.cpp:2492
-msgid "Edit Address Label"
-msgstr "编辑地址标签"
-
-#: ../../../src/ui.cpp:2517
-#: ../../../src/ui.cpp:2523
-msgid "Add Address"
-msgstr "添加地址"
-
-#: ../../../src/ui.cpp:2600
-msgid "Bitcoin"
-msgstr "Bitcoin"
-
-#: ../../../src/ui.cpp:2602
-msgid "Bitcoin - Generating"
-msgstr "Bitcoin - 生成中"
-
-#: ../../../src/ui.cpp:2604
-msgid "Bitcoin - (not connected)"
-msgstr "Bitcoin - (未连接)"
-
-#: ../../../src/ui.cpp:2683
-msgid "&Open Bitcoin"
-msgstr "打开 Bitcoin(&O)"
-
-#: ../../../src/ui.cpp:2684
-msgid "&Send Bitcoins"
-msgstr "发送 Bitcoins(&S)"
-
-#: ../../../src/ui.cpp:2685
-msgid "O&ptions..."
-msgstr "选项(&P)..."
-
-#: ../../../src/ui.cpp:2688
-#: ../../../src/uibase.cpp:25
-msgid "E&xit"
-msgstr "退出(&X)"
-
-#: ../../../src/ui.cpp:2904
-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:36
-msgid "&Options..."
-msgstr "选项(&O)..."
-
-#: ../../../src/uibase.cpp:39
-msgid "&Settings"
-msgstr "设置(&S)"
-
-#: ../../../src/uibase.cpp:43
-msgid "&About..."
-msgstr "关于(&A)..."
-
-#: ../../../src/uibase.cpp:46
-msgid "&Help"
-msgstr "帮助(&H)"
-
-#: ../../../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 " 新建(&N)... "
-
-#: ../../../src/uibase.cpp:79
-#: ../../../src/uibase.cpp:780
-#: ../../../src/uibase.cpp:883
-msgid " &Copy to Clipboard "
-msgstr " 复制到剪贴板(&C)"
-
-#: ../../../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 "开机自动启动(&S)"
-
-#: ../../../src/uibase.cpp:348
-msgid "&Minimize to the tray instead of the taskbar"
-msgstr "最小化到系统托盘(&M)"
-
-#: ../../../src/uibase.cpp:351
-msgid "Map port using &UPnP"
-msgstr "使用 &UPnP 映射端口"
-
-#: ../../../src/uibase.cpp:354
-msgid "M&inimize to the tray on close"
-msgstr "关闭时最小化到托盘(&I)"
-
-#: ../../../src/uibase.cpp:360
-msgid "&Connect through socks4 proxy: "
-msgstr "通过 socks4 代理连接(&C): "
-
-#: ../../../src/uibase.cpp:371
-msgid "Proxy &IP:"
-msgstr "代理服务器(&I):"
-
-#: ../../../src/uibase.cpp:379
-msgid " &Port:"
-msgstr " 端口(&P):"
-
-#: ../../../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 "可以选择按照KB支付交易佣金来确保您的交易得到迅速处理。 大多数交易需要 1KB。 建议支付 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 "应用(&A)"
-
-#: ../../../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 开发人员\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:581
-msgid "Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)"
-msgstr "输入 Bitcoin 地址 (比如 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)"
-
-#: ../../../src/uibase.cpp:595
-msgid "Pay &To:"
-msgstr "付款给(&T):"
-
-#: ../../../src/uibase.cpp:610
-msgid "&Paste"
-msgstr "粘贴(&P)"
-
-#: ../../../src/uibase.cpp:613
-msgid " Address &Book..."
-msgstr " 地址簿(&B)..."
-
-#: ../../../src/uibase.cpp:620
-msgid "&Amount:"
-msgstr "数量(&A):"
-
-#: ../../../src/uibase.cpp:630
-msgid "T&ransfer:"
-msgstr "传输(&R):"
-
-#: ../../../src/uibase.cpp:636
-msgid " Standard"
-msgstr "标准"
-
-#: ../../../src/uibase.cpp:663
-msgid "&Send"
-msgstr "发送(&S)"
-
-#: ../../../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 "这些是您用来接收付款的 Bitcoin 地址。 您可能需要给每一个付款人一个不同的地址从而可以最终每一笔交易是谁支付的。 下面高亮的地址是您的主窗口正在使用的地址。"
-
-#: ../../../src/uibase.cpp:774
-#: ../../../src/uibase.cpp:886
-msgid "&Edit..."
-msgstr "编辑(&E)..."
-
-#: ../../../src/uibase.cpp:777
-#: ../../../src/uibase.cpp:889
-msgid " &New Address... "
-msgstr " 新建地址(&N)..."
-
-#: ../../../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 "这些是您用来接收付款的 Bitcoin 地址。 您可以给每一个付款人一个不同的地址从而可以最终每一笔交易是谁支付的。 下面高亮的地址是您的主窗口正在使用的地址。"
-
-#: ../../../src/uibase.cpp:870
-msgid "Receiving"
-msgstr "我的接收地址"
-
-#: ../../../src/uibase.cpp:880
-msgid "&Delete"
-msgstr "删除(&D)"
-
-#: ../../../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 "警告: 请检查您的电脑日期和时间是否正确。 如果您的时钟不正确 Bitcoin 将无法正常工作。"
-
-#: ../../../src/util.cpp:899
-msgid "beta"
-msgstr "测试版"
-
-#: ../../../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 地址"

scripts/qt/extract_strings_qt.py

@@ -0,0 +1,63 @@
+#!/usr/bin/python
+'''
+Extract _("...") strings for translation and convert to Qt4 stringdefs so that
+they can be picked up by Qt linguist.
+'''
+from subprocess import Popen, PIPE
+
+OUT_CPP="src/qt/bitcoinstrings.cpp"
+EMPTY=['""']
+
+def parse_po(text):
+    """
+    Parse 'po' format produced by xgettext.
+    Return a list of (msgid,msgstr) tuples.
+    """
+    messages = []
+    msgid = []
+    msgstr = []
+    in_msgid = False
+    in_msgstr = False
+
+    for line in text.split('\n'):
+        line = line.rstrip('\r')
+        if line.startswith('msgid '):
+            if in_msgstr:
+                messages.append((msgid, msgstr))
+                in_msgstr = False
+            # message start
+            in_msgid = True
+            
+            msgid = [line[6:]]
+        elif line.startswith('msgstr '):
+            in_msgid = False
+            in_msgstr = True
+            msgstr = [line[7:]]
+        elif line.startswith('"'):
+            if in_msgid:
+                msgid.append(line)
+            if in_msgstr:
+                msgstr.append(line)
+
+    if in_msgstr:
+        messages.append((msgid, msgstr))
+
+    return messages
+
+files = ['src/base58.h', 'src/bignum.h', 'src/db.cpp', 'src/db.h', 'src/headers.h', 'src/init.cpp', 'src/init.h', 'src/irc.cpp', 'src/irc.h', 'src/key.h', 'src/main.cpp', 'src/main.h', 'src/net.cpp', 'src/net.h', 'src/noui.h', 'src/script.cpp', 'src/script.h', 'src/serialize.h', 'src/strlcpy.h', 'src/uint256.h', 'src/util.cpp', 'src/util.h']
+
+# xgettext -n --keyword=_ $FILES
+child = Popen(['xgettext','--output=-','-n','--keyword=_'] + files, stdout=PIPE)
+(out, err) = child.communicate()
+
+messages = parse_po(out) 
+
+f = open(OUT_CPP, 'w')
+f.write('#include <QtGlobal>\n')
+f.write('// Automatically generated by extract_strings.py\n')
+f.write('static const char *bitcoin_strings[] = {')
+for (msgid, msgstr) in messages:
+    if msgid != EMPTY:
+        f.write('QT_TRANSLATE_NOOP("bitcoin-core", %s),\n' % ('\n'.join(msgid)))
+f.write('};')
+f.close()

scripts/qt/make_spinner.py

@@ -0,0 +1,43 @@
+#!/usr/bin/env python
+# W.J. van der Laan, 2011
+# Make spinning .mng animation from a .png
+# Requires imagemagick 6.7+
+from __future__ import division
+from os import path
+from PIL import Image
+from subprocess import Popen
+
+SRC='img/reload_scaled.png'
+DST='../../src/qt/res/movies/update_spinner.mng'
+TMPDIR='/tmp'
+TMPNAME='tmp-%03i.png'
+NUMFRAMES=35
+FRAMERATE=10.0
+CONVERT='convert'
+CLOCKWISE=True
+DSIZE=(16,16)
+
+im_src = Image.open(SRC)
+
+if CLOCKWISE:
+    im_src = im_src.transpose(Image.FLIP_LEFT_RIGHT)
+
+def frame_to_filename(frame):
+    return path.join(TMPDIR, TMPNAME % frame)
+
+frame_files = []
+for frame in xrange(NUMFRAMES):
+    rotation = (frame + 0.5) / NUMFRAMES * 360.0
+    if CLOCKWISE:
+        rotation = -rotation
+    im_new = im_src.rotate(rotation, Image.BICUBIC)
+    im_new.thumbnail(DSIZE, Image.ANTIALIAS)
+    outfile = frame_to_filename(frame)
+    im_new.save(outfile, 'png')
+    frame_files.append(outfile)
+
+p = Popen([CONVERT, "-delay", str(FRAMERATE), "-dispose", "2"] + frame_files + [DST])
+p.communicate()
+
+
+

scripts/qt/make_windows_icon.py

@@ -0,0 +1,9 @@
+#!/bin/bash
+# create multiresolution windows icon
+ICON_SRC=../../src/qt/res/icons/bitcoin.png
+ICON_DST=../../src/qt/res/icons/bitcoin.ico
+convert ${ICON_SRC} -resize 16x16 bitcoin-16.png
+convert ${ICON_SRC} -resize 32x32 bitcoin-32.png
+convert ${ICON_SRC} -resize 48x48 bitcoin-48.png
+convert bitcoin-16.png bitcoin-32.png bitcoin-48.png ${ICON_DST}
+

share/setup.nsi

@@ -5,7 +5,7 @@ SetCompressor /SOLID lzma
 
 # General Symbol Definitions
 !define REGKEY "SOFTWARE\$(^Name)"
-!define VERSION 0.4.00
+!define VERSION 0.5.0
 !define COMPANY "Bitcoin project"
 !define URL http://www.bitcoin.org/
 
@@ -20,7 +20,7 @@ SetCompressor /SOLID lzma
 !define MUI_STARTMENUPAGE_REGISTRY_KEY ${REGKEY}
 !define MUI_STARTMENUPAGE_REGISTRY_VALUENAME StartMenuGroup
 !define MUI_STARTMENUPAGE_DEFAULTFOLDER Bitcoin
-!define MUI_FINISHPAGE_RUN $INSTDIR\bitcoin.exe
+!define MUI_FINISHPAGE_RUN $INSTDIR\bitcoin-qt.exe
 !define MUI_UNICON "${NSISDIR}\Contrib\Graphics\Icons\modern-uninstall.ico"
 !define MUI_UNWELCOMEFINISHPAGE_BITMAP "../share/pixmaps/nsis-wizard.bmp"
 !define MUI_UNFINISHPAGE_NOAUTOCLOSE
@@ -45,13 +45,13 @@ Var StartMenuGroup
 !insertmacro MUI_LANGUAGE English
 
 # Installer attributes
-OutFile bitcoin-0.4.00-win32-setup.exe
+OutFile bitcoin-0.5.0-win32-setup.exe
 InstallDir $PROGRAMFILES\Bitcoin
 CRCCheck on
 XPStyle on
 BrandingText " "
 ShowInstDetails show
-VIProductVersion 0.4.00.0
+VIProductVersion 0.5.0.0
 VIAddVersionKey ProductName Bitcoin
 VIAddVersionKey ProductVersion "${VERSION}"
 VIAddVersionKey CompanyName "${COMPANY}"
@@ -66,13 +66,11 @@ ShowUninstDetails show
 Section -Main SEC0000
     SetOutPath $INSTDIR
     SetOverwrite on
-    File ../src/bitcoin.exe
+    File ../release/bitcoin-qt.exe
     File /oname=license.txt ../COPYING
     File /oname=readme.txt ../doc/README_windows.txt
     SetOutPath $INSTDIR\daemon
     File ../src/bitcoind.exe
-    SetOutPath $INSTDIR\locale
-    File /r ../locale/*.*
     SetOutPath $INSTDIR\src
     File /r /x *.exe /x *.o ../src\*.*
     SetOutPath $INSTDIR
@@ -85,7 +83,7 @@ Section -post SEC0001
     WriteUninstaller $INSTDIR\uninstall.exe
     !insertmacro MUI_STARTMENU_WRITE_BEGIN Application
     CreateDirectory $SMPROGRAMS\$StartMenuGroup
-    CreateShortcut "$SMPROGRAMS\$StartMenuGroup\Bitcoin.lnk" $INSTDIR\bitcoin.exe
+    CreateShortcut "$SMPROGRAMS\$StartMenuGroup\Bitcoin.lnk" $INSTDIR\bitcoin-qt.exe
     CreateShortcut "$SMPROGRAMS\$StartMenuGroup\Uninstall Bitcoin.lnk" $INSTDIR\uninstall.exe
     !insertmacro MUI_STARTMENU_WRITE_END
     WriteRegStr HKCU "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\$(^Name)" DisplayName "$(^Name)"
@@ -113,11 +111,10 @@ done${UNSECTION_ID}:
 
 # Uninstaller sections
 Section /o -un.Main UNSEC0000
-    Delete /REBOOTOK $INSTDIR\bitcoin.exe
+    Delete /REBOOTOK $INSTDIR\bitcoin-qt.exe
     Delete /REBOOTOK $INSTDIR\license.txt
     Delete /REBOOTOK $INSTDIR\readme.txt
     RMDir /r /REBOOTOK $INSTDIR\daemon
-    RMDir /r /REBOOTOK $INSTDIR\locale
     RMDir /r /REBOOTOK $INSTDIR\src
     DeleteRegValue HKCU "${REGKEY}\Components" Main
 SectionEnd

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"
@@ -50,13 +49,13 @@ Object JSONRPCError(int code, const string& message)
 }
 
 
-void PrintConsole(const char* format, ...)
+void PrintConsole(const std::string &format, ...)
 {
     char buffer[50000];
     int limit = sizeof(buffer);
     va_list arg_ptr;
     va_start(arg_ptr, format);
-    int ret = _vsnprintf(buffer, limit, format, arg_ptr);
+    int ret = _vsnprintf(buffer, limit, format.c_str(), arg_ptr);
     va_end(arg_ptr);
     if (ret < 0 || ret >= limit)
     {
@@ -64,11 +63,7 @@ void PrintConsole(const char* format, ...)
         buffer[limit-1] = 0;
     }
     printf("%s", buffer);
-#if defined(__WXMSW__) && defined(GUI)
-    MyMessageBox(buffer, "Bitcoin", wxOK | wxICON_EXCLAMATION);
-#else
     fprintf(stdout, "%s", buffer);
-#endif
 }
 
 
@@ -530,6 +525,72 @@ Value sendtoaddress(const Array& params, bool fHelp)
     return wtx.GetHash().GetHex();
 }
 
+static const string strMessageMagic = "Bitcoin Signed Message:\n";
+
+Value signmessage(const Array& params, bool fHelp)
+{
+    if (fHelp || params.size() != 2)
+        throw runtime_error(
+            "signmessage <bitcoinaddress> <message>\n"
+            "Sign a message with the private key of an address");
+
+    if (pwalletMain->IsLocked())
+        throw JSONRPCError(-13, "Error: Please enter the wallet passphrase with walletpassphrase first.");
+
+    string strAddress = params[0].get_str();
+    string strMessage = params[1].get_str();
+
+    CBitcoinAddress addr(strAddress);
+    if (!addr.IsValid())
+        throw JSONRPCError(-3, "Invalid address");
+
+    CKey key;
+    if (!pwalletMain->GetKey(addr, key))
+        throw JSONRPCError(-4, "Private key not available");
+
+    CDataStream ss(SER_GETHASH);
+    ss << strMessageMagic;
+    ss << strMessage;
+
+    vector<unsigned char> vchSig;
+    if (!key.SignCompact(Hash(ss.begin(), ss.end()), vchSig))
+        throw JSONRPCError(-5, "Sign failed");
+
+    return EncodeBase64(&vchSig[0], vchSig.size());
+}
+
+Value verifymessage(const Array& params, bool fHelp)
+{
+    if (fHelp || params.size() != 3)
+        throw runtime_error(
+            "verifymessage <bitcoinaddress> <signature> <message>\n"
+            "Verify a signed message");
+
+    string strAddress  = params[0].get_str();
+    string strSign     = params[1].get_str();
+    string strMessage  = params[2].get_str();
+
+    CBitcoinAddress addr(strAddress);
+    if (!addr.IsValid())
+        throw JSONRPCError(-3, "Invalid address");
+
+    bool fInvalid = false;
+    vector<unsigned char> vchSig = DecodeBase64(strSign.c_str(), &fInvalid);
+
+    if (fInvalid)
+        throw JSONRPCError(-5, "Malformed base64 encoding");
+
+    CDataStream ss(SER_GETHASH);
+    ss << strMessageMagic;
+    ss << strMessage;
+
+    CKey key;
+    if (!key.SetCompactSignature(Hash(ss.begin(), ss.end()), vchSig))
+        return false;
+
+    return (key.GetAddress() == addr);
+}
+
 
 Value getreceivedbyaddress(const Array& params, bool fHelp)
 {
@@ -941,7 +1002,6 @@ Value ListReceived(const Array& params, bool fByAccounts)
             Object obj;
             obj.push_back(Pair("address",       address.ToString()));
             obj.push_back(Pair("account",       strAccount));
-            obj.push_back(Pair("label",         strAccount)); // deprecated
             obj.push_back(Pair("amount",        ValueFromAmount(nAmount)));
             obj.push_back(Pair("confirmations", (nConf == INT_MAX ? 0 : nConf)));
             ret.push_back(obj);
@@ -956,7 +1016,6 @@ Value ListReceived(const Array& params, bool fByAccounts)
             int nConf = (*it).second.nConf;
             Object obj;
             obj.push_back(Pair("account",       (*it).first));
-            obj.push_back(Pair("label",         (*it).first)); // deprecated
             obj.push_back(Pair("amount",        ValueFromAmount(nAmount)));
             obj.push_back(Pair("confirmations", (nConf == INT_MAX ? 0 : nConf)));
             ret.push_back(obj);
@@ -1198,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)
@@ -1486,9 +1609,9 @@ Value getwork(const Array& params, bool fHelp)
         throw runtime_error(
             "getwork [data]\n"
             "If [data] is not specified, returns formatted hash data to work on:\n"
-            "  \"midstate\" : precomputed hash state after hashing the first half of the data\n"
+            "  \"midstate\" : precomputed hash state after hashing the first half of the data (DEPRECATED)\n" // deprecated
             "  \"data\" : block data\n"
-            "  \"hash1\" : formatted hash buffer for second hash\n"
+            "  \"hash1\" : formatted hash buffer for second hash (DEPRECATED)\n" // deprecated
             "  \"target\" : little endian hash target\n"
             "If [data] is specified, tries to solve the block and returns true if it was successful.");
 
@@ -1498,7 +1621,8 @@ Value getwork(const Array& params, bool fHelp)
     if (IsInitialBlockDownload())
         throw JSONRPCError(-10, "Bitcoin is downloading blocks...");
 
-    static map<uint256, pair<CBlock*, unsigned int> > mapNewBlock;
+    typedef map<uint256, pair<CBlock*, CScript> > mapNewBlock_t;
+    static mapNewBlock_t mapNewBlock;
     static vector<CBlock*> vNewBlock;
     static CReserveKey reservekey(pwalletMain);
 
@@ -1537,11 +1661,10 @@ Value getwork(const Array& params, bool fHelp)
 
         // Update nExtraNonce
         static unsigned int nExtraNonce = 0;
-        static int64 nPrevTime = 0;
-        IncrementExtraNonce(pblock, pindexPrev, nExtraNonce, nPrevTime);
+        IncrementExtraNonce(pblock, pindexPrev, nExtraNonce);
 
         // Save
-        mapNewBlock[pblock->hashMerkleRoot] = make_pair(pblock, nExtraNonce);
+        mapNewBlock[pblock->hashMerkleRoot] = make_pair(pblock, pblock->vtx[0].vin[0].scriptSig);
 
         // Prebuild hash buffers
         char pmidstate[32];
@@ -1552,9 +1675,9 @@ Value getwork(const Array& params, bool fHelp)
         uint256 hashTarget = CBigNum().SetCompact(pblock->nBits).getuint256();
 
         Object result;
-        result.push_back(Pair("midstate", HexStr(BEGIN(pmidstate), END(pmidstate))));
+        result.push_back(Pair("midstate", HexStr(BEGIN(pmidstate), END(pmidstate)))); // deprecated
         result.push_back(Pair("data",     HexStr(BEGIN(pdata), END(pdata))));
-        result.push_back(Pair("hash1",    HexStr(BEGIN(phash1), END(phash1))));
+        result.push_back(Pair("hash1",    HexStr(BEGIN(phash1), END(phash1)))); // deprecated
         result.push_back(Pair("target",   HexStr(BEGIN(hashTarget), END(hashTarget))));
         return result;
     }
@@ -1568,17 +1691,16 @@ 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))
             return false;
         CBlock* pblock = mapNewBlock[pdata->hashMerkleRoot].first;
-        unsigned int nExtraNonce = mapNewBlock[pdata->hashMerkleRoot].second;
 
         pblock->nTime = pdata->nTime;
         pblock->nNonce = pdata->nNonce;
-        pblock->vtx[0].vin[0].scriptSig = CScript() << pblock->nBits << CBigNum(nExtraNonce);
+        pblock->vtx[0].vin[0].scriptSig = mapNewBlock[pdata->hashMerkleRoot].second;
         pblock->hashMerkleRoot = pblock->BuildMerkleTree();
 
         return CheckWork(pblock, *pwalletMain, reservekey);
@@ -1586,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);
+    }
+}
+
+
 
 
 
@@ -1614,20 +1823,13 @@ pair<string, rpcfn_type> pCallTable[] =
     make_pair("getnewaddress",          &getnewaddress),
     make_pair("getaccountaddress",      &getaccountaddress),
     make_pair("setaccount",             &setaccount),
-    make_pair("setlabel",               &setaccount), // deprecated
     make_pair("getaccount",             &getaccount),
-    make_pair("getlabel",               &getaccount), // deprecated
     make_pair("getaddressesbyaccount",  &getaddressesbyaccount),
-    make_pair("getaddressesbylabel",    &getaddressesbyaccount), // deprecated
     make_pair("sendtoaddress",          &sendtoaddress),
-    make_pair("getamountreceived",      &getreceivedbyaddress), // deprecated, renamed to getreceivedbyaddress
-    make_pair("getallreceived",         &listreceivedbyaddress), // deprecated, renamed to listreceivedbyaddress
     make_pair("getreceivedbyaddress",   &getreceivedbyaddress),
     make_pair("getreceivedbyaccount",   &getreceivedbyaccount),
-    make_pair("getreceivedbylabel",     &getreceivedbyaccount), // deprecated
     make_pair("listreceivedbyaddress",  &listreceivedbyaddress),
     make_pair("listreceivedbyaccount",  &listreceivedbyaccount),
-    make_pair("listreceivedbylabel",    &listreceivedbyaccount), // deprecated
     make_pair("backupwallet",           &backupwallet),
     make_pair("keypoolrefill",          &keypoolrefill),
     make_pair("walletpassphrase",       &walletpassphrase),
@@ -1641,9 +1843,13 @@ pair<string, rpcfn_type> pCallTable[] =
     make_pair("sendmany",               &sendmany),
     make_pair("gettransaction",         &gettransaction),
     make_pair("listtransactions",       &listtransactions),
+    make_pair("signmessage",           &signmessage),
+    make_pair("verifymessage",         &verifymessage),
     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]));
 
@@ -1661,17 +1867,15 @@ string pAllowInSafeMode[] =
     "getinfo",
     "getnewaddress",
     "getaccountaddress",
-    "setlabel", // deprecated
     "getaccount",
-    "getlabel", // deprecated
     "getaddressesbyaccount",
-    "getaddressesbylabel", // deprecated
     "backupwallet",
     "keypoolrefill",
     "walletpassphrase",
     "walletlock",
     "validateaddress",
     "getwork",
+    "getmemorypool",
 };
 set<string> setAllowInSafeMode(pAllowInSafeMode, pAllowInSafeMode + sizeof(pAllowInSafeMode)/sizeof(pAllowInSafeMode[0]));
 
@@ -1693,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";
@@ -1733,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"
@@ -1749,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(),
@@ -1816,43 +2022,6 @@ int ReadHTTP(std::basic_istream<char>& stream, map<string, string>& mapHeadersRe
     return nStatus;
 }
 
-string EncodeBase64(string s)
-{
-    BIO *b64, *bmem;
-    BUF_MEM *bptr;
-
-    b64 = BIO_new(BIO_f_base64());
-    BIO_set_flags(b64, BIO_FLAGS_BASE64_NO_NL);
-    bmem = BIO_new(BIO_s_mem());
-    b64 = BIO_push(b64, bmem);
-    BIO_write(b64, s.c_str(), s.size());
-    BIO_flush(b64);
-    BIO_get_mem_ptr(b64, &bptr);
-
-    string result(bptr->data, bptr->length);
-    BIO_free_all(b64);
-
-    return result;
-}
-
-string DecodeBase64(string s)
-{
-    BIO *b64, *bmem;
-
-    char* buffer = static_cast<char*>(calloc(s.size(), sizeof(char)));
-
-    b64 = BIO_new(BIO_f_base64());
-    BIO_set_flags(b64, BIO_FLAGS_BASE64_NO_NL);
-    bmem = BIO_new_mem_buf(const_cast<char*>(s.c_str()), s.size());
-    bmem = BIO_push(b64, bmem);
-    BIO_read(bmem, buffer, s.size());
-    BIO_free_all(bmem);
-
-    string result(buffer);
-    free(buffer);
-    return result;
-}
-
 bool HTTPAuthorized(map<string, string>& mapHeaders)
 {
     string strAuth = mapHeaders["authorization"];
@@ -2124,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
@@ -2290,18 +2459,12 @@ int CommandLineRPC(int argc, char *argv[])
         if (strMethod == "setgenerate"            && n > 1) ConvertTo<boost::int64_t>(params[1]);
         if (strMethod == "sendtoaddress"          && n > 1) ConvertTo<double>(params[1]);
         if (strMethod == "settxfee"               && n > 0) ConvertTo<double>(params[0]);
-        if (strMethod == "getamountreceived"      && n > 1) ConvertTo<boost::int64_t>(params[1]); // deprecated
         if (strMethod == "getreceivedbyaddress"   && n > 1) ConvertTo<boost::int64_t>(params[1]);
         if (strMethod == "getreceivedbyaccount"   && n > 1) ConvertTo<boost::int64_t>(params[1]);
-        if (strMethod == "getreceivedbylabel"     && n > 1) ConvertTo<boost::int64_t>(params[1]); // deprecated
-        if (strMethod == "getallreceived"         && n > 0) ConvertTo<boost::int64_t>(params[0]); // deprecated
-        if (strMethod == "getallreceived"         && n > 1) ConvertTo<bool>(params[1]); // deprecated
         if (strMethod == "listreceivedbyaddress"  && n > 0) ConvertTo<boost::int64_t>(params[0]);
         if (strMethod == "listreceivedbyaddress"  && n > 1) ConvertTo<bool>(params[1]);
         if (strMethod == "listreceivedbyaccount"  && n > 0) ConvertTo<boost::int64_t>(params[0]);
         if (strMethod == "listreceivedbyaccount"  && n > 1) ConvertTo<bool>(params[1]);
-        if (strMethod == "listreceivedbylabel"    && n > 0) ConvertTo<boost::int64_t>(params[0]); // deprecated
-        if (strMethod == "listreceivedbylabel"    && n > 1) ConvertTo<bool>(params[1]); // deprecated
         if (strMethod == "getbalance"             && n > 1) ConvertTo<boost::int64_t>(params[1]);
         if (strMethod == "move"                   && n > 2) ConvertTo<double>(params[2]);
         if (strMethod == "move"                   && n > 3) ConvertTo<boost::int64_t>(params[3]);
@@ -2311,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();
@@ -2358,13 +2522,7 @@ int CommandLineRPC(int argc, char *argv[])
 
     if (strPrint != "")
     {
-#if defined(__WXMSW__) && defined(GUI)
-        // Windows GUI apps can't print to command line,
-        // so settle for a message box yuck
-        MyMessageBox(strPrint, "Bitcoin", wxOK);
-#else
         fprintf((nRet == 0 ? stdout : stderr), "%s\n", strPrint.c_str());
-#endif
     }
     return nRet;
 }

src/crypter.cpp

@@ -7,7 +7,7 @@
 #include <vector>
 #include <string>
 #include "headers.h"
-#ifdef __WXMSW__
+#ifdef WIN32
 #include <windows.h>
 #endif
 

src/cryptopp/License.txt

@@ -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.

src/cryptopp/Readme.txt

@@ -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

src/cryptopp/config.h

@@ -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

src/cryptopp/cpu.cpp

@@ -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

src/cryptopp/cpu.h

@@ -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

src/cryptopp/iterhash.h

@@ -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

src/cryptopp/obj/.gitignore

@@ -1,2 +0,0 @@
-*
-!.gitignore

src/cryptopp/pch.h

@@ -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

src/cryptopp/secblock.h

@@ -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

src/cryptopp/sha.cpp

@@ -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

src/cryptopp/sha.h

@@ -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

src/cryptopp/simple.h

@@ -1 +0,0 @@
-

src/cryptopp/smartptr.h

@@ -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

src/cryptopp/stdcpp.h

@@ -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

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;
@@ -822,7 +804,7 @@ int CWalletDB::LoadWallet(CWallet* pwallet)
                 ssKey >> strKey;
 
                 // Options
-#ifndef GUI
+#ifndef QT_GUI
                 if (strKey == "fGenerateBitcoins")  ssValue >> fGenerateBitcoins;
 #endif
                 if (strKey == "nTransactionFee")    ssValue >> nTransactionFee;

src/headers.h

@@ -18,23 +18,21 @@
 #endif
 #define _WIN32_IE 0x0400
 #define WIN32_LEAN_AND_MEAN 1
+
+// Include boost/foreach here as it defines __STDC_LIMIT_MACROS on some systems.
+#include <boost/foreach.hpp>
+#ifndef __STDC_LIMIT_MACROS
 #define __STDC_LIMIT_MACROS // to enable UINT64_MAX from stdint.h
+#endif
+
 #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
 #endif
-#ifdef GUI
-#include <wx/wx.h>
-#include <wx/stdpaths.h>
-#include <wx/snglinst.h>
-#include <wx/utils.h>
-#include <wx/clipbrd.h>
-#include <wx/taskbar.h>
-#endif
 #include <openssl/buffer.h>
 #include <openssl/ecdsa.h>
 #include <openssl/evp.h>
@@ -57,9 +55,7 @@
 #include <deque>
 #include <map>
 
-#include <boost/foreach.hpp>
-
-#ifdef __WXMSW__
+#ifdef WIN32
 #include <windows.h>
 #include <winsock2.h>
 #include <mswsock.h>
@@ -95,24 +91,8 @@
 #include "bignum.h"
 #include "base58.h"
 #include "main.h"
-#ifdef GUI
-#include "uibase.h"
-#include "ui.h"
+#ifdef QT_GUI
+#include "qtui.h"
 #else
 #include "noui.h"
 #endif
-
-#ifdef GUI
-#include "xpm/addressbook16.xpm"
-#include "xpm/addressbook20.xpm"
-#include "xpm/bitcoin16.xpm"
-#include "xpm/bitcoin20.xpm"
-#include "xpm/bitcoin32.xpm"
-#include "xpm/bitcoin48.xpm"
-#include "xpm/bitcoin80.xpm"
-#include "xpm/check.xpm"
-#include "xpm/send16.xpm"
-#include "xpm/send16noshadow.xpm"
-#include "xpm/send20.xpm"
-#include "xpm/about.xpm"
-#endif

src/init.cpp

@@ -4,7 +4,7 @@
 // file license.txt or http://www.opensource.org/licenses/mit-license.php.
 #include "headers.h"
 #include "db.h"
-#include "rpc.h"
+#include "bitcoinrpc.h"
 #include "net.h"
 #include "init.h"
 #include "strlcpy.h"
@@ -12,6 +12,16 @@
 #include <boost/filesystem/fstream.hpp>
 #include <boost/interprocess/sync/file_lock.hpp>
 
+#if defined(BITCOIN_NEED_QT_PLUGINS) && !defined(_BITCOIN_QT_PLUGINS_INCLUDED)
+#define _BITCOIN_QT_PLUGINS_INCLUDED
+#define __INSURE__
+#include <QtPlugin>
+Q_IMPORT_PLUGIN(qcncodecs)
+Q_IMPORT_PLUGIN(qjpcodecs)
+Q_IMPORT_PLUGIN(qtwcodecs)
+Q_IMPORT_PLUGIN(qkrcodecs)
+#endif
+
 using namespace std;
 using namespace boost;
 
@@ -24,7 +34,7 @@ CWallet* pwalletMain;
 
 void ExitTimeout(void* parg)
 {
-#ifdef __WXMSW__
+#ifdef WIN32
     Sleep(5000);
     ExitProcess(0);
 #endif
@@ -80,7 +90,7 @@ void HandleSIGTERM(int)
 //
 // Start
 //
-#ifndef GUI
+#if !defined(QT_GUI)
 int main(int argc, char* argv[])
 {
     bool fRet = false;
@@ -121,10 +131,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;
@@ -179,6 +189,8 @@ bool AppInit2(int argc, char* argv[])
             "  -addnode=<ip>    \t  "   + _("Add a node to connect to\n") +
             "  -connect=<ip>    \t\t  " + _("Connect only to the specified node\n") +
             "  -nolisten        \t  "   + _("Don't accept connections from outside\n") +
+            "  -banscore=<n>    \t  "   + _("Threshold for disconnecting misbehaving peers (default: 100)\n") +
+            "  -bantime=<n>     \t  "   + _("Number of seconds to keep misbehaving peers from reconnecting (default: 86400)\n") +
 #ifdef USE_UPNP
 #if USE_UPNP
             "  -noupnp          \t  "   + _("Don't attempt to use UPnP to map the listening port\n") +
@@ -190,7 +202,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") +
@@ -214,21 +226,16 @@ bool AppInit2(int argc, char* argv[])
         strUsage += string() +
             "  -?               \t\t  " + _("This help message\n");
 
-#if defined(__WXMSW__) && defined(GUI)
-        // Tabs make the columns line up in the message box
-        wxMessageBox(strUsage, "Bitcoin", wxOK);
-#else
         // Remove tabs
         strUsage.erase(std::remove(strUsage.begin(), strUsage.end(), '\t'), strUsage.end());
         fprintf(stderr, "%s", strUsage.c_str());
-#endif
         return false;
     }
 
     fDebug = GetBoolArg("-debug");
     fAllowDNS = GetBoolArg("-dns");
 
-#ifndef __WXMSW__
+#ifndef WIN32
     fDaemon = GetBoolArg("-daemon");
 #else
     fDaemon = false;
@@ -240,10 +247,9 @@ bool AppInit2(int argc, char* argv[])
         fServer = GetBoolArg("-server");
 
     /* force fServer when running without GUI */
-#ifndef GUI
+#if !defined(QT_GUI)
     fServer = true;
 #endif
-
     fPrintToConsole = GetBoolArg("-printtoconsole");
     fPrintToDebugger = GetBoolArg("-printtodebugger");
 
@@ -252,6 +258,7 @@ bool AppInit2(int argc, char* argv[])
     fNoListen = GetBoolArg("-nolisten") || fTOR;
     fLogTimestamps = GetBoolArg("-logtimestamps");
 
+#ifndef QT_GUI
     for (int i = 1; i < argc; i++)
         if (!IsSwitchChar(argv[i][0]))
             fCommandLine = true;
@@ -261,8 +268,9 @@ bool AppInit2(int argc, char* argv[])
         int ret = CommandLineRPC(argc, argv);
         exit(ret);
     }
+#endif
 
-#ifndef __WXMSW__
+#ifndef WIN32
     if (fDaemon)
     {
         // Daemonize
@@ -288,11 +296,6 @@ bool AppInit2(int argc, char* argv[])
         ShrinkDebugFile();
     printf("\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n");
     printf("Bitcoin version %s\n", FormatFullVersion().c_str());
-#ifdef GUI
-    printf("OS version %s\n", ((string)wxGetOsDescription()).c_str());
-    printf("System default language is %d %s\n", g_locale.GetSystemLanguage(), ((string)g_locale.GetSysName()).c_str());
-    printf("Language file %s (%s)\n", (string("locale/") + (string)g_locale.GetCanonicalName() + "/LC_MESSAGES/bitcoin.mo").c_str(), ((string)g_locale.GetLocale()).c_str());
-#endif
     printf("Default data directory %s\n", GetDefaultDataDir().c_str());
 
     if (GetBoolArg("-loadblockindextest"))
@@ -303,46 +306,6 @@ bool AppInit2(int argc, char* argv[])
         return false;
     }
 
-    //
-    // Limit to single instance per user
-    // Required to protect the database files if we're going to keep deleting log.*
-    //
-#if defined(__WXMSW__) && defined(GUI)
-    // wxSingleInstanceChecker doesn't work on Linux
-    wxString strMutexName = wxString("bitcoin_running.") + getenv("HOMEPATH");
-    for (int i = 0; i < strMutexName.size(); i++)
-        if (!isalnum(strMutexName[i]))
-            strMutexName[i] = '.';
-    wxSingleInstanceChecker* psingleinstancechecker = new wxSingleInstanceChecker(strMutexName);
-    if (psingleinstancechecker->IsAnotherRunning())
-    {
-        printf("Existing instance found\n");
-        unsigned int nStart = GetTime();
-        loop
-        {
-            // Show the previous instance and exit
-            HWND hwndPrev = FindWindowA("wxWindowClassNR", "Bitcoin");
-            if (hwndPrev)
-            {
-                if (IsIconic(hwndPrev))
-                    ShowWindow(hwndPrev, SW_RESTORE);
-                SetForegroundWindow(hwndPrev);
-                return false;
-            }
-
-            if (GetTime() > nStart + 60)
-                return false;
-
-            // Resume this instance if the other exits
-            delete psingleinstancechecker;
-            Sleep(1000);
-            psingleinstancechecker = new wxSingleInstanceChecker(strMutexName);
-            if (!psingleinstancechecker->IsAnotherRunning())
-                break;
-        }
-    }
-#endif
-
     // Make sure only a single bitcoin process is using the data directory.
     string strLockFile = GetDataDir() + "/.lock";
     FILE* file = fopen(strLockFile.c_str(), "a"); // empty lock file; created if it doesn't exist.
@@ -373,18 +336,21 @@ bool AppInit2(int argc, char* argv[])
     strErrors = "";
     int64 nStart;
 
+    InitMessage(_("Loading addresses..."));
     printf("Loading addresses...\n");
     nStart = GetTimeMillis();
     if (!LoadAddresses())
         strErrors += _("Error loading addr.dat      \n");
     printf(" addresses   %15"PRI64d"ms\n", GetTimeMillis() - nStart);
 
+    InitMessage(_("Loading block index..."));
     printf("Loading block index...\n");
     nStart = GetTimeMillis();
     if (!LoadBlockIndex())
         strErrors += _("Error loading blkindex.dat      \n");
     printf(" block index %15"PRI64d"ms\n", GetTimeMillis() - nStart);
 
+    InitMessage(_("Loading wallet..."));
     printf("Loading wallet...\n");
     nStart = GetTimeMillis();
     bool fFirstRun;
@@ -415,12 +381,14 @@ bool AppInit2(int argc, char* argv[])
     }
     if (pindexBest != pindexRescan)
     {
+        InitMessage(_("Rescanning..."));
         printf("Rescanning last %i blocks (from block %i)...\n", pindexBest->nHeight - pindexRescan->nHeight, pindexRescan->nHeight);
         nStart = GetTimeMillis();
         pwalletMain->ScanForWalletTransactions(pindexRescan, true);
         printf(" rescan      %15"PRI64d"ms\n", GetTimeMillis() - nStart);
     }
 
+    InitMessage(_("Done loading"));
     printf("Done loading\n");
 
         //// debug print
@@ -530,30 +498,20 @@ bool AppInit2(int argc, char* argv[])
     }
 
     //
-    // Create the main window and start the node
+    // Start the node
     //
-#ifdef GUI
-    if (!fDaemon)
-        CreateMainWindow();
-#endif
-
     if (!CheckDiskSpace())
         return false;
 
     RandAddSeedPerfmon();
 
     if (!CreateThread(StartNode, NULL))
-        wxMessageBox("Error: CreateThread(StartNode) failed", "Bitcoin");
+        wxMessageBox(_("Error: CreateThread(StartNode) failed"), "Bitcoin");
 
     if (fServer)
         CreateThread(ThreadRPCServer, NULL);
 
-#if defined(__WXMSW__) && defined(GUI)
-    if (fFirstRun)
-        SetStartOnSystemStartup(true);
-#endif
-
-#ifndef GUI
+#if !defined(QT_GUI)
     while (1)
         Sleep(5000);
 #endif

src/key.h

@@ -75,6 +75,76 @@ err:
     return(ok);
 }
 
+int static inline ECDSA_SIG_recover_key_GFp(EC_KEY *eckey, ECDSA_SIG *ecsig, const unsigned char *msg, int msglen, int recid, int check)
+{
+    if (!eckey) return 0;
+
+    int ret = 0;
+    BN_CTX *ctx = NULL;
+
+    BIGNUM *x = NULL;
+    BIGNUM *e = NULL;
+    BIGNUM *order = NULL;
+    BIGNUM *sor = NULL;
+    BIGNUM *eor = NULL;
+    BIGNUM *field = NULL;
+    EC_POINT *R = NULL;
+    EC_POINT *O = NULL;
+    EC_POINT *Q = NULL;
+    BIGNUM *rr = NULL;
+    BIGNUM *zero = NULL;
+    int n = 0;
+    int i = recid / 2;
+
+    const EC_GROUP *group = EC_KEY_get0_group(eckey);
+    if ((ctx = BN_CTX_new()) == NULL) { ret = -1; goto err; }
+    BN_CTX_start(ctx);
+    order = BN_CTX_get(ctx);
+    if (!EC_GROUP_get_order(group, order, ctx)) { ret = -2; goto err; }
+    x = BN_CTX_get(ctx);
+    if (!BN_copy(x, order)) { ret=-1; goto err; }
+    if (!BN_mul_word(x, i)) { ret=-1; goto err; }
+    if (!BN_add(x, x, ecsig->r)) { ret=-1; goto err; }
+    field = BN_CTX_get(ctx);
+    if (!EC_GROUP_get_curve_GFp(group, field, NULL, NULL, ctx)) { ret=-2; goto err; }
+    if (BN_cmp(x, field) >= 0) { ret=0; goto err; }
+    if ((R = EC_POINT_new(group)) == NULL) { ret = -2; goto err; }
+    if (!EC_POINT_set_compressed_coordinates_GFp(group, R, x, recid % 2, ctx)) { ret=0; goto err; }
+    if (check)
+    {
+        if ((O = EC_POINT_new(group)) == NULL) { ret = -2; goto err; }
+        if (!EC_POINT_mul(group, O, NULL, R, order, ctx)) { ret=-2; goto err; }
+        if (!EC_POINT_is_at_infinity(group, O)) { ret = 0; goto err; }
+    }
+    if ((Q = EC_POINT_new(group)) == NULL) { ret = -2; goto err; }
+    n = EC_GROUP_get_degree(group);
+    e = BN_CTX_get(ctx);
+    if (!BN_bin2bn(msg, msglen, e)) { ret=-1; goto err; }
+    if (8*msglen > n) BN_rshift(e, e, 8-(n & 7));
+    zero = BN_CTX_get(ctx);
+    if (!BN_zero(zero)) { ret=-1; goto err; }
+    if (!BN_mod_sub(e, zero, e, order, ctx)) { ret=-1; goto err; }
+    rr = BN_CTX_get(ctx);
+    if (!BN_mod_inverse(rr, ecsig->r, order, ctx)) { ret=-1; goto err; }
+    sor = BN_CTX_get(ctx);
+    if (!BN_mod_mul(sor, ecsig->s, rr, order, ctx)) { ret=-1; goto err; }
+    eor = BN_CTX_get(ctx);
+    if (!BN_mod_mul(eor, e, rr, order, ctx)) { ret=-1; goto err; }
+    if (!EC_POINT_mul(group, Q, eor, R, sor, ctx)) { ret=-2; goto err; }
+    if (!EC_KEY_set_public_key(eckey, Q)) { ret=-2; goto err; }
+
+    ret = 1;
+
+err:
+    if (ctx) {
+        BN_CTX_end(ctx);
+        BN_CTX_free(ctx);
+    }
+    if (R != NULL) EC_POINT_free(R);
+    if (O != NULL) EC_POINT_free(O);
+    if (Q != NULL) EC_POINT_free(Q);
+    return ret;
+}
 
 class key_error : public std::runtime_error
 {
@@ -221,6 +291,66 @@ public:
         return true;
     }
 
+    // create a compact signature (65 bytes), which allows reconstructing the used public key
+    bool SignCompact(uint256 hash, std::vector<unsigned char>& vchSig)
+    {
+        bool fOk = false;
+        ECDSA_SIG *sig = ECDSA_do_sign((unsigned char*)&hash, sizeof(hash), pkey);
+        if (sig==NULL)
+            return false;
+        vchSig.clear();
+        vchSig.resize(65,0);
+        int nBitsR = BN_num_bits(sig->r);
+        int nBitsS = BN_num_bits(sig->s);
+        if (nBitsR <= 256 && nBitsS <= 256)
+        {
+            int nRecId = -1;
+            for (int i=0; i<4; i++)
+            {
+                CKey keyRec;
+                keyRec.fSet = true;
+                if (ECDSA_SIG_recover_key_GFp(keyRec.pkey, sig, (unsigned char*)&hash, sizeof(hash), i, 1) == 1)
+                    if (keyRec.GetPubKey() == this->GetPubKey())
+                    {
+                        nRecId = i;
+                        break;
+                    }
+            }
+
+            if (nRecId == -1)
+                throw key_error("CKEy::SignCompact() : unable to construct recoverable key");
+
+            vchSig[0] = nRecId+27;
+            BN_bn2bin(sig->r,&vchSig[33-(nBitsR+7)/8]);
+            BN_bn2bin(sig->s,&vchSig[65-(nBitsS+7)/8]);
+            fOk = true;
+        }
+        ECDSA_SIG_free(sig);
+        return fOk;
+    }
+
+    // reconstruct public key from a compact signature
+    bool SetCompactSignature(uint256 hash, const std::vector<unsigned char>& vchSig)
+    {
+        if (vchSig.size() != 65)
+            return false;
+        if (vchSig[0]<27 || vchSig[0]>=31)
+            return false;
+        ECDSA_SIG *sig = ECDSA_SIG_new();
+        BN_bin2bn(&vchSig[1],32,sig->r);
+        BN_bin2bn(&vchSig[33],32,sig->s);
+
+        EC_KEY_free(pkey);
+        pkey = EC_KEY_new_by_curve_name(NID_secp256k1);
+        if (ECDSA_SIG_recover_key_GFp(pkey, sig, (unsigned char*)&hash, sizeof(hash), vchSig[0] - 27, 0) == 1)
+        {
+            fSet = true;
+            ECDSA_SIG_free(sig);
+            return true;
+        }
+        return false;
+    }
+
     bool Verify(uint256 hash, const std::vector<unsigned char>& vchSig)
     {
         // -1 = error, 0 = bad sig, 1 = good
@@ -229,6 +359,16 @@ public:
         return true;
     }
 
+    bool VerifyCompact(uint256 hash, const std::vector<unsigned char>& vchSig)
+    {
+        CKey key;
+        if (!key.SetCompactSignature(hash, vchSig))
+            return false;
+        if (GetPubKey() != key.GetPubKey())
+            return false;
+        return true;
+    }
+
     CBitcoinAddress GetAddress() const
     {
         return CBitcoinAddress(GetPubKey());

src/keystore.h

@@ -114,6 +114,7 @@ public:
                 return CBasicKeyStore::HaveKey(address);
             return mapCryptedKeys.count(address) > 0;
         }
+        return false;
     }
     bool GetKey(const CBitcoinAddress &address, CKey& keyOut) const;
     bool GetPubKey(const CBitcoinAddress &address, std::vector<unsigned char>& vchPubKeyOut) const;

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>
 
@@ -40,6 +39,8 @@ uint256 hashBestChain = 0;
 CBlockIndex* pindexBest = NULL;
 int64 nTimeBestReceived = 0;
 
+CMedianFilter<int> cPeerBlockCounts(5, 0); // Amount of blocks that other nodes claim to have
+
 map<uint256, CBlock*> mapOrphanBlocks;
 multimap<uint256, CBlock*> mapOrphanBlocksByPrev;
 
@@ -64,11 +65,6 @@ int fUseUPnP = false;
 #endif
 
 
-
-
-
-
-
 //////////////////////////////////////////////////////////////////////////////
 //
 // dispatching functions
@@ -296,24 +292,24 @@ bool CTransaction::CheckTransaction() const
 {
     // Basic checks that don't depend on any context
     if (vin.empty())
-        return error("CTransaction::CheckTransaction() : vin empty");
+        return DoS(10, error("CTransaction::CheckTransaction() : vin empty"));
     if (vout.empty())
-        return error("CTransaction::CheckTransaction() : vout empty");
+        return DoS(10, error("CTransaction::CheckTransaction() : vout empty"));
     // Size limits
     if (::GetSerializeSize(*this, SER_NETWORK) > MAX_BLOCK_SIZE)
-        return error("CTransaction::CheckTransaction() : size limits failed");
+        return DoS(100, error("CTransaction::CheckTransaction() : size limits failed"));
 
     // Check for negative or overflow output values
     int64 nValueOut = 0;
     BOOST_FOREACH(const CTxOut& txout, vout)
     {
         if (txout.nValue < 0)
-            return error("CTransaction::CheckTransaction() : txout.nValue negative");
+            return DoS(100, error("CTransaction::CheckTransaction() : txout.nValue negative"));
         if (txout.nValue > MAX_MONEY)
-            return error("CTransaction::CheckTransaction() : txout.nValue too high");
+            return DoS(100, error("CTransaction::CheckTransaction() : txout.nValue too high"));
         nValueOut += txout.nValue;
         if (!MoneyRange(nValueOut))
-            return error("CTransaction::CheckTransaction() : txout total out of range");
+            return DoS(100, error("CTransaction::CheckTransaction() : txout total out of range"));
     }
 
     // Check for duplicate inputs
@@ -328,13 +324,13 @@ bool CTransaction::CheckTransaction() const
     if (IsCoinBase())
     {
         if (vin[0].scriptSig.size() < 2 || vin[0].scriptSig.size() > 100)
-            return error("CTransaction::CheckTransaction() : coinbase script size");
+            return DoS(100, error("CTransaction::CheckTransaction() : coinbase script size"));
     }
     else
     {
         BOOST_FOREACH(const CTxIn& txin, vin)
             if (txin.prevout.IsNull())
-                return error("CTransaction::CheckTransaction() : prevout is null");
+                return DoS(10, error("CTransaction::CheckTransaction() : prevout is null"));
     }
 
     return true;
@@ -350,7 +346,7 @@ bool CTransaction::AcceptToMemoryPool(CTxDB& txdb, bool fCheckInputs, bool* pfMi
 
     // Coinbase is only valid in a block, not as a loose transaction
     if (IsCoinBase())
-        return error("AcceptToMemoryPool() : coinbase as individual tx");
+        return DoS(100, error("AcceptToMemoryPool() : coinbase as individual tx"));
 
     // To help v0.1.5 clients who would see it as a negative number
     if ((int64)nLockTime > INT_MAX)
@@ -363,7 +359,7 @@ bool CTransaction::AcceptToMemoryPool(CTxDB& txdb, bool fCheckInputs, bool* pfMi
     // 34 bytes because a TxOut is:
     //   20-byte address + 8 byte bitcoin amount + 5 bytes of ops + 1 byte script length
     if (GetSigOpCount() > nSize / 34 || nSize < 100)
-        return error("AcceptToMemoryPool() : nonstandard transaction");
+        return error("AcceptToMemoryPool() : transaction with out-of-bounds SigOpCount");
 
     // Rather not work on nonstandard transactions (unless -testnet)
     if (!fTestNet && !IsStandard())
@@ -726,6 +722,12 @@ int GetTotalBlocksEstimate()
     }
 }
 
+// Return maximum amount of blocks that other nodes claim to have
+int GetNumBlocksOfPeers()
+{
+    return std::max(cPeerBlockCounts.median(), GetTotalBlocksEstimate());
+}
+
 bool IsInitialBlockDownload()
 {
     if (pindexBest == NULL || nBestHeight < (GetTotalBlocksEstimate()-nInitialBlockThreshold))
@@ -803,6 +805,9 @@ bool CTransaction::ConnectInputs(CTxDB& txdb, map<uint256, CTxIndex>& mapTestPoo
                                  CBlockIndex* pindexBlock, int64& nFees, bool fBlock, bool fMiner, int64 nMinFee)
 {
     // Take over previous transactions' spent pointers
+    // fBlock is true when this is called from AcceptBlock when a new best-block is added to the blockchain
+    // fMiner is true when called from the internal bitcoin miner
+    // ... both are false when called from CTransaction::AcceptToMemoryPool
     if (!IsCoinBase())
     {
         int64 nValueIn = 0;
@@ -813,7 +818,7 @@ bool CTransaction::ConnectInputs(CTxDB& txdb, map<uint256, CTxIndex>& mapTestPoo
             // Read txindex
             CTxIndex txindex;
             bool fFound = true;
-            if (fMiner && mapTestPool.count(prevout.hash))
+            if ((fBlock || fMiner) && mapTestPool.count(prevout.hash))
             {
                 // Get txindex from current proposed changes
                 txindex = mapTestPool[prevout.hash];
@@ -848,7 +853,7 @@ bool CTransaction::ConnectInputs(CTxDB& txdb, map<uint256, CTxIndex>& mapTestPoo
             }
 
             if (prevout.n >= txPrev.vout.size() || prevout.n >= txindex.vSpent.size())
-                return error("ConnectInputs() : %s prevout.n out of range %d %d %d prev tx %s\n%s", GetHash().ToString().substr(0,10).c_str(), prevout.n, txPrev.vout.size(), txindex.vSpent.size(), prevout.hash.ToString().substr(0,10).c_str(), txPrev.ToString().c_str());
+                return DoS(100, error("ConnectInputs() : %s prevout.n out of range %d %d %d prev tx %s\n%s", GetHash().ToString().substr(0,10).c_str(), prevout.n, txPrev.vout.size(), txindex.vSpent.size(), prevout.hash.ToString().substr(0,10).c_str(), txPrev.ToString().c_str()));
 
             // If prev is coinbase, check that it's matured
             if (txPrev.IsCoinBase())
@@ -856,53 +861,53 @@ bool CTransaction::ConnectInputs(CTxDB& txdb, map<uint256, CTxIndex>& mapTestPoo
                     if (pindex->nBlockPos == txindex.pos.nBlockPos && pindex->nFile == txindex.pos.nFile)
                         return error("ConnectInputs() : tried to spend coinbase at depth %d", pindexBlock->nHeight - pindex->nHeight);
 
-            // Verify signature
-            if (!VerifySignature(txPrev, *this, i))
-                return error("ConnectInputs() : %s VerifySignature failed", GetHash().ToString().substr(0,10).c_str());
+            // Skip ECDSA signature verification when connecting blocks (fBlock=true) during initial download
+            // (before the last blockchain checkpoint). This is safe because block merkle hashes are
+            // still computed and checked, and any change will be caught at the next checkpoint.
+            if (!(fBlock && IsInitialBlockDownload()))
+                // Verify signature
+                if (!VerifySignature(txPrev, *this, i))
+                    return DoS(100,error("ConnectInputs() : %s VerifySignature failed", GetHash().ToString().substr(0,10).c_str()));
 
-            // Check for conflicts
+            // Check for conflicts (double-spend)
+            // This doesn't trigger the DoS code on purpose; if it did, it would make it easier
+            // for an attacker to attempt to split the network.
             if (!txindex.vSpent[prevout.n].IsNull())
                 return fMiner ? false : error("ConnectInputs() : %s prev tx already used at %s", GetHash().ToString().substr(0,10).c_str(), txindex.vSpent[prevout.n].ToString().c_str());
 
             // Check for negative or overflow input values
             nValueIn += txPrev.vout[prevout.n].nValue;
             if (!MoneyRange(txPrev.vout[prevout.n].nValue) || !MoneyRange(nValueIn))
-                return error("ConnectInputs() : txin values out of range");
+                return DoS(100, error("ConnectInputs() : txin values out of range"));
 
             // Mark outpoints as spent
             txindex.vSpent[prevout.n] = posThisTx;
 
             // Write back
-            if (fBlock)
-            {
-                if (!txdb.UpdateTxIndex(prevout.hash, txindex))
-                    return error("ConnectInputs() : UpdateTxIndex failed");
-            }
-            else if (fMiner)
+            if (fBlock || fMiner)
             {
                 mapTestPool[prevout.hash] = txindex;
             }
         }
 
         if (nValueIn < GetValueOut())
-            return error("ConnectInputs() : %s value in < value out", GetHash().ToString().substr(0,10).c_str());
+            return DoS(100, error("ConnectInputs() : %s value in < value out", GetHash().ToString().substr(0,10).c_str()));
 
         // Tally transaction fees
         int64 nTxFee = nValueIn - GetValueOut();
         if (nTxFee < 0)
-            return error("ConnectInputs() : %s nTxFee < 0", GetHash().ToString().substr(0,10).c_str());
+            return DoS(100, error("ConnectInputs() : %s nTxFee < 0", GetHash().ToString().substr(0,10).c_str()));
         if (nTxFee < nMinFee)
             return false;
         nFees += nTxFee;
         if (!MoneyRange(nFees))
-            return error("ConnectInputs() : nFees out of range");
+            return DoS(100, error("ConnectInputs() : nFees out of range"));
     }
 
     if (fBlock)
     {
-        // Add transaction to disk index
-        if (!txdb.AddTxIndex(*this, posThisTx, pindexBlock->nHeight))
-            return error("ConnectInputs() : AddTxPos failed");
+        // Add transaction to changes
+        mapTestPool[GetHash()] = CTxIndex(posThisTx, vout.size());
     }
     else if (fMiner)
     {
@@ -991,16 +996,22 @@ bool CBlock::ConnectBlock(CTxDB& txdb, CBlockIndex* pindex)
     //// issue here: it doesn't know the version
     unsigned int nTxPos = pindex->nBlockPos + ::GetSerializeSize(CBlock(), SER_DISK) - 1 + GetSizeOfCompactSize(vtx.size());
 
-    map<uint256, CTxIndex> mapUnused;
+    map<uint256, CTxIndex> mapQueuedChanges;
     int64 nFees = 0;
     BOOST_FOREACH(CTransaction& tx, vtx)
     {
         CDiskTxPos posThisTx(pindex->nFile, pindex->nBlockPos, nTxPos);
         nTxPos += ::GetSerializeSize(tx, SER_DISK);
 
-        if (!tx.ConnectInputs(txdb, mapUnused, posThisTx, pindex, nFees, true, false))
+        if (!tx.ConnectInputs(txdb, mapQueuedChanges, posThisTx, pindex, nFees, true, false))
             return false;
     }
+    // Write queued txindex changes
+    for (map<uint256, CTxIndex>::iterator mi = mapQueuedChanges.begin(); mi != mapQueuedChanges.end(); ++mi)
+    {
+        if (!txdb.UpdateTxIndex((*mi).first, (*mi).second))
+            return error("ConnectBlock() : UpdateTxIndex failed");
+    }
 
     if (vtx[0].GetValueOut() > GetBlockValue(pindex->nHeight, nFees))
         return false;
@@ -1233,11 +1244,11 @@ bool CBlock::CheckBlock() const
 
     // Size limits
     if (vtx.empty() || vtx.size() > MAX_BLOCK_SIZE || ::GetSerializeSize(*this, SER_NETWORK) > MAX_BLOCK_SIZE)
-        return error("CheckBlock() : size limits failed");
+        return DoS(100, error("CheckBlock() : size limits failed"));
 
     // Check proof of work matches claimed amount
     if (!CheckProofOfWork(GetHash(), nBits))
-        return error("CheckBlock() : proof of work failed");
+        return DoS(50, error("CheckBlock() : proof of work failed"));
 
     // Check timestamp
     if (GetBlockTime() > GetAdjustedTime() + 2 * 60 * 60)
@@ -1245,23 +1256,23 @@ bool CBlock::CheckBlock() const
 
     // First transaction must be coinbase, the rest must not be
     if (vtx.empty() || !vtx[0].IsCoinBase())
-        return error("CheckBlock() : first tx is not coinbase");
+        return DoS(100, error("CheckBlock() : first tx is not coinbase"));
     for (int i = 1; i < vtx.size(); i++)
         if (vtx[i].IsCoinBase())
-            return error("CheckBlock() : more than one coinbase");
+            return DoS(100, error("CheckBlock() : more than one coinbase"));
 
     // Check transactions
     BOOST_FOREACH(const CTransaction& tx, vtx)
         if (!tx.CheckTransaction())
-            return error("CheckBlock() : CheckTransaction failed");
+            return DoS(tx.nDoS, error("CheckBlock() : CheckTransaction failed"));
 
     // Check that it's not full of nonstandard transactions
     if (GetSigOpCount() > MAX_BLOCK_SIGOPS)
-        return error("CheckBlock() : too many nonstandard transactions");
+        return DoS(100, error("CheckBlock() : out-of-bounds SigOpCount"));
 
     // Check merkleroot
     if (hashMerkleRoot != BuildMerkleTree())
-        return error("CheckBlock() : hashMerkleRoot mismatch");
+        return DoS(100, error("CheckBlock() : hashMerkleRoot mismatch"));
 
     return true;
 }
@@ -1276,13 +1287,13 @@ bool CBlock::AcceptBlock()
     // Get prev block index
     map<uint256, CBlockIndex*>::iterator mi = mapBlockIndex.find(hashPrevBlock);
     if (mi == mapBlockIndex.end())
-        return error("AcceptBlock() : prev block not found");
+        return DoS(10, error("AcceptBlock() : prev block not found"));
     CBlockIndex* pindexPrev = (*mi).second;
     int nHeight = pindexPrev->nHeight+1;
 
     // Check proof of work
     if (nBits != GetNextWorkRequired(pindexPrev))
-        return error("AcceptBlock() : incorrect proof of work");
+        return DoS(100, error("AcceptBlock() : incorrect proof of work"));
 
     // Check timestamp against prev
     if (GetBlockTime() <= pindexPrev->GetMedianTimePast())
@@ -1291,7 +1302,7 @@ bool CBlock::AcceptBlock()
     // Check that all transactions are finalized
     BOOST_FOREACH(const CTransaction& tx, vtx)
         if (!tx.IsFinal(nHeight, GetBlockTime()))
-            return error("AcceptBlock() : contains a non-final transaction");
+            return DoS(10, error("AcceptBlock() : contains a non-final transaction"));
 
     // Check that the block chain matches the known block chain up to a checkpoint
     if (!fTestNet)
@@ -1304,7 +1315,7 @@ bool CBlock::AcceptBlock()
             (nHeight == 118000 && hash != uint256("0x000000000000774a7f8a7a12dc906ddb9e17e75d684f15e00f8767f9e8f36553")) ||
             (nHeight == 134444 && hash != uint256("0x00000000000005b12ffd4cd315cd34ffd4a594f430ac814c91184a0d42d2b0fe")) ||
             (nHeight == 140700 && hash != uint256("0x000000000000033b512028abb90e1626d8b346fd0ed598ac0a3c371138dce2bd")))
-            return error("AcceptBlock() : rejected by checkpoint lockin at %d", nHeight);
+            return DoS(100, error("AcceptBlock() : rejected by checkpoint lockin at %d", nHeight));
 
     // Write block to history file
     if (!CheckDiskSpace(::GetSerializeSize(*this, SER_DISK)))
@@ -1326,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();
@@ -1744,9 +1755,10 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv)
 {
     static map<unsigned int, vector<unsigned char> > mapReuseKey;
     RandAddSeedPerfmon();
-    if (fDebug)
+    if (fDebug) {
         printf("%s ", DateTimeStrFormat("%x %H:%M:%S", GetTime()).c_str());
-    printf("received: %s (%d bytes)\n", strCommand.c_str(), vRecv.size());
+        printf("received: %s (%d bytes)\n", strCommand.c_str(), vRecv.size());
+    }
     if (mapArgs.count("-dropmessagestest") && GetRand(atoi(mapArgs["-dropmessagestest"])) == 0)
     {
         printf("dropmessagestest DROPPING RECV MESSAGE\n");
@@ -1761,7 +1773,10 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv)
     {
         // Each connection can only send one version message
         if (pfrom->nVersion != 0)
+        {
+            pfrom->Misbehaving(1);
             return false;
+        }
 
         int64 nTime;
         CAddress addrMe;
@@ -1839,12 +1854,15 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv)
         pfrom->fSuccessfullyConnected = true;
 
         printf("version message: version %d, blocks=%d\n", pfrom->nVersion, pfrom->nStartingHeight);
+
+        cPeerBlockCounts.input(pfrom->nStartingHeight);
     }
 
 
     else if (pfrom->nVersion == 0)
     {
         // Must have a version message before anything else
+        pfrom->Misbehaving(1);
         return false;
     }
 
@@ -1866,7 +1884,10 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv)
         if (pfrom->nVersion < 31402 && mapAddresses.size() > 1000)
             return true;
         if (vAddr.size() > 1000)
+        {
+            pfrom->Misbehaving(20);
             return error("message addr size() = %d", vAddr.size());
+        }
 
         // Store the new addresses
         CAddrDB addrDB;
@@ -1924,7 +1945,10 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv)
         vector<CInv> vInv;
         vRecv >> vInv;
         if (vInv.size() > 50000)
+        {
+            pfrom->Misbehaving(20);
             return error("message inv size() = %d", vInv.size());
+        }
 
         CTxDB txdb("r");
         BOOST_FOREACH(const CInv& inv, vInv)
@@ -1934,7 +1958,8 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv)
             pfrom->AddInventoryKnown(inv);
 
             bool fAlreadyHave = AlreadyHave(txdb, inv);
-            printf("  got inventory: %s  %s\n", inv.ToString().c_str(), fAlreadyHave ? "have" : "new");
+            if (fDebug)
+                printf("  got inventory: %s  %s\n", inv.ToString().c_str(), fAlreadyHave ? "have" : "new");
 
             if (!fAlreadyHave)
                 pfrom->AskFor(inv);
@@ -1952,7 +1977,10 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv)
         vector<CInv> vInv;
         vRecv >> vInv;
         if (vInv.size() > 50000)
+        {
+            pfrom->Misbehaving(20);
             return error("message getdata size() = %d", vInv.size());
+        }
 
         BOOST_FOREACH(const CInv& inv, vInv)
         {
@@ -2124,6 +2152,7 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv)
             printf("storing orphan tx %s\n", inv.hash.ToString().substr(0,10).c_str());
             AddOrphanTx(vMsg);
         }
+        if (tx.nDoS) pfrom->Misbehaving(tx.nDoS);
     }
 
 
@@ -2140,6 +2169,7 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv)
 
         if (ProcessBlock(pfrom, &block))
             mapAlreadyAskedFor.erase(inv);
+        if (block.nDoS) pfrom->Misbehaving(block.nDoS);
     }
 
 
@@ -2583,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];
 }
 
 //
@@ -2798,16 +2838,17 @@ CBlock* CreateNewBlock(CReserveKey& reservekey)
 }
 
 
-void IncrementExtraNonce(CBlock* pblock, CBlockIndex* pindexPrev, unsigned int& nExtraNonce, int64& nPrevTime)
+void IncrementExtraNonce(CBlock* pblock, CBlockIndex* pindexPrev, unsigned int& nExtraNonce)
 {
     // Update nExtraNonce
-    int64 nNow = max(pindexPrev->GetMedianTimePast()+1, GetAdjustedTime());
-    if (++nExtraNonce >= 0x7f && nNow > nPrevTime+1)
+    static uint256 hashPrevBlock;
+    if (hashPrevBlock != pblock->hashPrevBlock)
     {
-        nExtraNonce = 1;
-        nPrevTime = nNow;
+        nExtraNonce = 0;
+        hashPrevBlock = pblock->hashPrevBlock;
     }
-    pblock->vtx[0].vin[0].scriptSig = CScript() << pblock->nBits << CBigNum(nExtraNonce);
+    ++nExtraNonce;
+    pblock->vtx[0].vin[0].scriptSig = CScript() << pblock->nTime << CBigNum(nExtraNonce);
     pblock->hashMerkleRoot = pblock->BuildMerkleTree();
 }
 
@@ -2891,7 +2932,6 @@ bool CheckWork(CBlock* pblock, CWallet& wallet, CReserveKey& reservekey)
             return error("BitcoinMiner : ProcessBlock, block not accepted");
     }
 
-    Sleep(2000);
     return true;
 }
 
@@ -2905,7 +2945,6 @@ void static BitcoinMiner(CWallet *pwallet)
     // Each thread has its own key and counter
     CReserveKey reservekey(pwallet);
     unsigned int nExtraNonce = 0;
-    int64 nPrevTime = 0;
 
     while (fGenerateBitcoins)
     {
@@ -2932,7 +2971,7 @@ void static BitcoinMiner(CWallet *pwallet)
         auto_ptr<CBlock> pblock(CreateNewBlock(reservekey));
         if (!pblock.get())
             return;
-        IncrementExtraNonce(pblock.get(), pindexPrev, nExtraNonce, nPrevTime);
+        IncrementExtraNonce(pblock.get(), pindexPrev, nExtraNonce);
 
         printf("Running BitcoinMiner with %d transactions in block\n", pblock->vtx.size());
 

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);
@@ -94,11 +95,12 @@ bool ProcessMessages(CNode* pfrom);
 bool SendMessages(CNode* pto, bool fSendTrickle);
 void GenerateBitcoins(bool fGenerate, CWallet* pwallet);
 CBlock* CreateNewBlock(CReserveKey& reservekey);
-void IncrementExtraNonce(CBlock* pblock, CBlockIndex* pindexPrev, unsigned int& nExtraNonce, int64& nPrevTime);
+void IncrementExtraNonce(CBlock* pblock, CBlockIndex* pindexPrev, unsigned int& nExtraNonce);
 void FormatHashBuffers(CBlock* pblock, char* pmidstate, char* pdata, char* phash1);
 bool CheckWork(CBlock* pblock, CWallet& wallet, CReserveKey& reservekey);
 bool CheckProofOfWork(uint256 hash, unsigned int nBits);
 int GetTotalBlocksEstimate();
+int GetNumBlocksOfPeers();
 bool IsInitialBlockDownload();
 std::string GetWarnings(std::string strFor);
 
@@ -399,6 +401,9 @@ public:
     std::vector<CTxOut> vout;
     unsigned int nLockTime;
 
+    // Denial-of-service detection:
+    mutable int nDoS;
+    bool DoS(int nDoSIn, bool fIn) const { nDoS += nDoSIn; return fIn; }
 
     CTransaction()
     {
@@ -420,6 +425,7 @@ public:
         vin.clear();
         vout.clear();
         nLockTime = 0;
+        nDoS = 0;  // Denial-of-service prevention
     }
 
     bool IsNull() const
@@ -786,6 +792,9 @@ public:
     // memory only
     mutable std::vector<uint256> vMerkleTree;
 
+    // Denial-of-service detection:
+    mutable int nDoS;
+    bool DoS(int nDoSIn, bool fIn) const { nDoS += nDoSIn; return fIn; }
 
     CBlock()
     {
@@ -819,6 +828,7 @@ public:
         nNonce = 0;
         vtx.clear();
         vMerkleTree.clear();
+        nDoS = 0;
     }
 
     bool IsNull() const
@@ -917,7 +927,7 @@ public:
         fflush(fileout);
         if (!IsInitialBlockDownload() || (nBestHeight+1) % 500 == 0)
         {
-#ifdef __WXMSW__
+#ifdef WIN32
             _commit(_fileno(fileout));
 #else
             fsync(fileno(fileout));

src/makefile.linux-mingw

@@ -9,19 +9,13 @@ USE_UPNP:=0
 INCLUDEPATHS= \
  -I"$(DEPSDIR)/boost_1_47_0" \
  -I"$(DEPSDIR)/db-4.8.30.NC/build_unix" \
- -I"$(DEPSDIR)/openssl-1.0.0d/include" \
- -I"$(DEPSDIR)/wxWidgets-2.9.2/lib/gcc_lib/mswud" \
- -I"$(DEPSDIR)/wxWidgets-2.9.2/include" \
- -I"$(DEPSDIR)/wxWidgets-2.9.2/lib/wx/include/i586-mingw32msvc-msw-unicode-static-2.9/" \
+ -I"$(DEPSDIR)/openssl-1.0.0e/include" \
  -I"$(DEPSDIR)"
 
 LIBPATHS= \
  -L"$(DEPSDIR)/boost_1_47_0/stage/lib" \
  -L"$(DEPSDIR)/db-4.8.30.NC/build_unix" \
- -L"$(DEPSDIR)/openssl-1.0.0d" \
- -L"$(DEPSDIR)/wxWidgets-2.9.2/lib"
-
-WXLIBS= -l wx_mswu-2.9-i586-mingw32msvc
+ -L"$(DEPSDIR)/openssl-1.0.0e"
 
 LIBS= \
  -l boost_system-mt-s \
@@ -32,8 +26,8 @@ LIBS= \
  -l ssl \
  -l crypto
 
-DEFS=-D_MT -DWIN32 -D__WXMSW__ -D_WINDOWS -DNOPCH -DUSE_SSL -DBOOST_THREAD_USE_LIB
-DEBUGFLAGS=-g -D__WXDEBUG__
+DEFS=-D_MT -DWIN32 -D_WINDOWS -DNOPCH -DUSE_SSL -DBOOST_THREAD_USE_LIB
+DEBUGFLAGS=-g
 CFLAGS=-O2 -w -Wno-invalid-offsetof -Wformat $(DEBUGFLAGS) $(DEFS) $(INCLUDEPATHS)
 HEADERS = \
     base58.h \
@@ -49,16 +43,15 @@ HEADERS = \
     net.h \
     noui.h \
     protocol.h \
-    rpc.h \
+    bitcoinrpc.h \
     script.h \
     serialize.h \
     strlcpy.h \
-    ui.h \
-    uibase.h \
     uint256.h \
     util.h \
     wallet.h
 
+
 ifdef USE_UPNP
 	LIBPATHS += -L"$(DEPSDIR)/miniupnpc"
 	LIBS += -l miniupnpc -l iphlpapi
@@ -76,34 +69,17 @@ OBJS= \
     obj/main.o \
     obj/net.o \
     obj/protocol.o \
-    obj/rpc.o \
+    obj/bitcoinrpc.o \
     obj/script.o \
     obj/util.o \
-    obj/wallet.o \
-    cryptopp/obj/sha.o \
-    cryptopp/obj/cpu.o
-
-
-all: bitcoin.exe
-
-
-obj/%.o: %.cpp $(HEADERS)
-	i586-mingw32msvc-g++ -c $(CFLAGS) -DGUI -o $@ $<
-
-cryptopp/obj/%.o: cryptopp/%.cpp
-	i586-mingw32msvc-g++ -c $(CFLAGS) -O3 -DCRYPTOPP_DISABLE_ASM -o $@ $<
-
-obj/ui_res.o: ../share/ui.rc  ../share/pixmaps/bitcoin.ico ../share/pixmaps/check.ico ../share/pixmaps/send16.bmp ../share/pixmaps/send16mask.bmp ../share/pixmaps/send16masknoshadow.bmp ../share/pixmaps/send20.bmp ../share/pixmaps/send20mask.bmp ../share/pixmaps/addressbook16.bmp ../share/pixmaps/addressbook16mask.bmp ../share/pixmaps/addressbook20.bmp ../share/pixmaps/addressbook20mask.bmp
-	i586-mingw32msvc-windres $(DEFS) $(INCLUDEPATHS) -o $@ -i $<
-
-bitcoin.exe: $(OBJS) obj/ui.o obj/uibase.o obj/ui_res.o
-	i586-mingw32msvc-g++ $(CFLAGS) -mwindows -Wl,--subsystem,windows -o $@ $(LIBPATHS) $^ $(WXLIBS) $(LIBS)
+    obj/wallet.o
 
+all: bitcoind.exe
 
 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)
 
 
@@ -118,9 +94,7 @@ 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 bitcoin.exe
 	-rm -f bitcoind.exe
 	-rm -f test_bitcoin.exe