aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.gitignore4
-rw-r--r--README.md6
-rw-r--r--bitcoin-qt.pro42
-rwxr-xr-xcontrib/debian/bin/bitcoind14
-rw-r--r--contrib/debian/bitcoind.install3
-rw-r--r--contrib/debian/changelog36
-rw-r--r--contrib/debian/control4
-rw-r--r--contrib/debian/examples/bitcoin.conf4
-rw-r--r--contrib/debian/manpages/bitcoin.conf.53
-rw-r--r--contrib/homebrew/makefile.osx.patch47
-rw-r--r--doc/assets-attribution.txt13
-rw-r--r--doc/bitcoin_logo_doxygen.pngbin5735 -> 4757 bytes
-rw-r--r--doc/build-osx.md173
-rw-r--r--doc/build-osx.txt54
-rw-r--r--doc/coding.txt3
-rw-r--r--doc/multiwallet-qt.txt53
-rw-r--r--doc/release-process.txt17
-rw-r--r--share/qt/Info.plist31
-rw-r--r--src/alert.cpp33
-rw-r--r--src/alert.h2
-rw-r--r--src/bitcoinrpc.cpp287
-rw-r--r--src/bitcoinrpc.h5
-rw-r--r--src/bloom.cpp4
-rw-r--r--src/checkpoints.cpp76
-rw-r--r--src/checkpoints.h4
-rw-r--r--src/checkqueue.h18
-rw-r--r--src/db.cpp17
-rw-r--r--src/db.h2
-rw-r--r--src/init.cpp292
-rw-r--r--src/init.h5
-rw-r--r--src/irc.cpp403
-rw-r--r--src/irc.h12
-rw-r--r--src/limitedmap.h100
-rw-r--r--src/main.cpp563
-rw-r--r--src/main.h48
-rw-r--r--src/makefile.linux-mingw1
-rw-r--r--src/makefile.mingw1
-rw-r--r--src/makefile.osx1
-rw-r--r--src/makefile.unix1
-rw-r--r--src/net.cpp639
-rw-r--r--src/net.h194
-rw-r--r--src/protocol.h3
-rw-r--r--src/qt/addressbookpage.cpp68
-rw-r--r--src/qt/addressbookpage.h9
-rw-r--r--src/qt/addresstablemodel.cpp2
-rw-r--r--src/qt/addresstablemodel.h1
-rw-r--r--src/qt/askpassphrasedialog.cpp2
-rw-r--r--src/qt/askpassphrasedialog.h1
-rw-r--r--src/qt/bitcoin.cpp64
-rw-r--r--src/qt/bitcoin.qrc12
-rw-r--r--src/qt/bitcoinaddressvalidator.h7
-rw-r--r--src/qt/bitcoinamountfield.cpp15
-rw-r--r--src/qt/bitcoinamountfield.h3
-rw-r--r--src/qt/bitcoingui.cpp444
-rw-r--r--src/qt/bitcoingui.h68
-rw-r--r--src/qt/bitcoinstrings.cpp26
-rw-r--r--src/qt/bitcoinunits.h3
-rw-r--r--src/qt/clientmodel.cpp11
-rw-r--r--src/qt/clientmodel.h3
-rw-r--r--src/qt/csvmodelwriter.h6
-rw-r--r--src/qt/editaddressdialog.cpp1
-rw-r--r--src/qt/editaddressdialog.h8
-rw-r--r--src/qt/forms/addressbookpage.ui9
-rw-r--r--src/qt/forms/overviewpage.ui18
-rw-r--r--src/qt/guiconstants.h2
-rw-r--r--src/qt/guiutil.cpp17
-rw-r--r--src/qt/guiutil.h3
-rw-r--r--src/qt/locale/bitcoin_bg.ts683
-rw-r--r--src/qt/locale/bitcoin_bs.ts2976
-rw-r--r--src/qt/locale/bitcoin_ca.ts2976
-rw-r--r--src/qt/locale/bitcoin_ca_ES.ts1607
-rw-r--r--src/qt/locale/bitcoin_cs.ts761
-rw-r--r--src/qt/locale/bitcoin_cy.ts2976
-rw-r--r--src/qt/locale/bitcoin_da.ts731
-rw-r--r--src/qt/locale/bitcoin_de.ts703
-rw-r--r--src/qt/locale/bitcoin_el_GR.ts715
-rw-r--r--src/qt/locale/bitcoin_en.ts571
-rw-r--r--src/qt/locale/bitcoin_eo.ts2976
-rw-r--r--src/qt/locale/bitcoin_es.ts702
-rw-r--r--src/qt/locale/bitcoin_es_CL.ts683
-rw-r--r--src/qt/locale/bitcoin_et.ts683
-rw-r--r--src/qt/locale/bitcoin_eu_ES.ts975
-rw-r--r--src/qt/locale/bitcoin_fa.ts684
-rw-r--r--src/qt/locale/bitcoin_fa_IR.ts690
-rw-r--r--src/qt/locale/bitcoin_fi.ts711
-rw-r--r--src/qt/locale/bitcoin_fr.ts712
-rw-r--r--src/qt/locale/bitcoin_fr_CA.ts683
-rw-r--r--src/qt/locale/bitcoin_gu_IN.ts683
-rw-r--r--src/qt/locale/bitcoin_he.ts740
-rw-r--r--src/qt/locale/bitcoin_hi_IN.ts689
-rw-r--r--src/qt/locale/bitcoin_hr.ts701
-rw-r--r--src/qt/locale/bitcoin_hu.ts781
-rw-r--r--src/qt/locale/bitcoin_it.ts825
-rw-r--r--src/qt/locale/bitcoin_ja.ts847
-rw-r--r--src/qt/locale/bitcoin_la.ts2996
-rw-r--r--src/qt/locale/bitcoin_lt.ts683
-rw-r--r--src/qt/locale/bitcoin_lv_LV.ts2982
-rw-r--r--src/qt/locale/bitcoin_nb.ts683
-rw-r--r--src/qt/locale/bitcoin_nl.ts818
-rw-r--r--src/qt/locale/bitcoin_pl.ts719
-rw-r--r--src/qt/locale/bitcoin_pt_BR.ts683
-rw-r--r--src/qt/locale/bitcoin_pt_PT.ts722
-rw-r--r--src/qt/locale/bitcoin_ro_RO.ts1026
-rw-r--r--src/qt/locale/bitcoin_ru.ts718
-rw-r--r--src/qt/locale/bitcoin_sk.ts683
-rw-r--r--src/qt/locale/bitcoin_sr.ts889
-rw-r--r--src/qt/locale/bitcoin_sv.ts696
-rw-r--r--src/qt/locale/bitcoin_th_TH.ts683
-rw-r--r--src/qt/locale/bitcoin_tr.ts712
-rw-r--r--src/qt/locale/bitcoin_uk.ts1114
-rw-r--r--src/qt/locale/bitcoin_zh_CN.ts746
-rw-r--r--src/qt/locale/bitcoin_zh_TW.ts717
-rw-r--r--src/qt/macdockiconhandler.h5
-rw-r--r--src/qt/macdockiconhandler.mm1
-rw-r--r--src/qt/monitoreddatamapper.cpp1
-rw-r--r--src/qt/monitoreddatamapper.h5
-rw-r--r--src/qt/notificator.cpp2
-rw-r--r--src/qt/notificator.h8
-rw-r--r--src/qt/optionsdialog.cpp2
-rw-r--r--src/qt/optionsmodel.cpp10
-rw-r--r--src/qt/overviewpage.cpp8
-rw-r--r--src/qt/overviewpage.h9
-rw-r--r--src/qt/paymentserver.cpp160
-rw-r--r--src/qt/paymentserver.h67
-rw-r--r--src/qt/qtipcserver.cpp165
-rw-r--r--src/qt/qtipcserver.h16
-rw-r--r--src/qt/qvalidatedlineedit.h1
-rw-r--r--src/qt/qvaluecombobox.h4
-rw-r--r--src/qt/res/bitcoin-qt.rc2
-rw-r--r--src/qt/res/icons/bitcoin.icnsbin99044 -> 919273 bytes
-rwxr-xr-x[-rw-r--r--]src/qt/res/icons/bitcoin.icobin15086 -> 62107 bytes
-rw-r--r--src/qt/res/icons/bitcoin.pngbin34168 -> 36486 bytes
-rw-r--r--src/qt/res/icons/bitcoin_testnet.pngbin28756 -> 26315 bytes
-rw-r--r--src/qt/res/src/bitcoin.svg173
-rw-r--r--src/qt/rpcconsole.cpp18
-rw-r--r--src/qt/sendcoinsdialog.cpp24
-rw-r--r--src/qt/sendcoinsdialog.h1
-rw-r--r--src/qt/sendcoinsentry.cpp7
-rw-r--r--src/qt/sendcoinsentry.h1
-rw-r--r--src/qt/signverifymessagedialog.cpp4
-rw-r--r--src/qt/signverifymessagedialog.h3
-rw-r--r--src/qt/test/uritests.cpp9
-rw-r--r--src/qt/transactiondesc.cpp3
-rw-r--r--src/qt/transactiondesc.h3
-rw-r--r--src/qt/transactiondescdialog.h1
-rw-r--r--src/qt/transactionfilterproxy.cpp1
-rw-r--r--src/qt/transactionfilterproxy.h7
-rw-r--r--src/qt/transactionrecord.h4
-rw-r--r--src/qt/transactiontablemodel.cpp3
-rw-r--r--src/qt/transactiontablemodel.h2
-rw-r--r--src/qt/transactionview.cpp26
-rw-r--r--src/qt/transactionview.h2
-rw-r--r--src/qt/walletframe.cpp129
-rw-r--r--src/qt/walletframe.h73
-rw-r--r--src/qt/walletmodel.cpp2
-rw-r--r--src/qt/walletmodel.h2
-rw-r--r--src/qt/walletstack.cpp155
-rw-r--r--src/qt/walletstack.h102
-rw-r--r--src/qt/walletview.cpp277
-rw-r--r--src/qt/walletview.h104
-rw-r--r--src/rpcnet.cpp1
-rw-r--r--src/rpcrawtransaction.cpp7
-rw-r--r--src/rpcwallet.cpp7
-rw-r--r--src/serialize.h8
-rw-r--r--src/test/alert_tests.cpp185
-rw-r--r--src/test/bignum_tests.cpp24
-rw-r--r--src/test/checkblock_tests.cpp66
-rw-r--r--src/test/data/alertTestsbin0 -> 1283 bytes
-rw-r--r--src/test/data/script_invalid.json71
-rw-r--r--src/test/data/script_valid.json66
-rw-r--r--src/test/multisig_tests.cpp4
-rw-r--r--src/test/script_P2SH_tests.cpp4
-rw-r--r--src/test/serialize_tests.cpp4
-rw-r--r--src/test/sigopcount_tests.cpp22
-rw-r--r--src/test/test_bitcoin.cpp6
-rw-r--r--src/test/util_tests.cpp120
-rw-r--r--src/test/wallet_tests.cpp30
-rw-r--r--src/txdb.cpp12
-rw-r--r--src/txdb.h6
-rw-r--r--src/ui_interface.h3
-rw-r--r--src/util.cpp93
-rw-r--r--src/util.h102
-rw-r--r--src/wallet.cpp24
-rw-r--r--src/wallet.h3
-rw-r--r--src/walletdb.cpp28
185 files changed, 41009 insertions, 13244 deletions
diff --git a/.gitignore b/.gitignore
index b11949171e..a34921b3ac 100644
--- a/.gitignore
+++ b/.gitignore
@@ -16,6 +16,10 @@ src/test_bitcoin
Makefile
bitcoin-qt
+# Unit-tests
+Makefile.test
+bitcoin-qt_test
+
# Resources cpp
qrc_*.cpp
diff --git a/README.md b/README.md
index 58dc2969a6..a50736d4ed 100644
--- a/README.md
+++ b/README.md
@@ -3,7 +3,7 @@ Bitcoin integration/staging tree
http://www.bitcoin.org
-Copyright (c) 2009-2012 Bitcoin Developers
+Copyright (c) 2009-2013 Bitcoin Developers
What is Bitcoin?
----------------
@@ -60,13 +60,13 @@ submit new unit tests for old code.
Unit tests for the core code are in `src/test/`. To compile and run them:
- cd src; make -f makefile.linux test
+ cd src; make -f makefile.unix test
Unit tests for the GUI code are in `src/qt/test/`. To compile and run them:
qmake BITCOIN_QT_TEST=1 -o Makefile.test bitcoin-qt.pro
make -f Makefile.test
- ./Bitcoin-Qt
+ ./bitcoin-qt_test
Every pull request is built for both Windows and Linux on a dedicated server,
and unit and sanity tests are automatically run. The binaries produced may be
diff --git a/bitcoin-qt.pro b/bitcoin-qt.pro
index 1c6bc0a654..ae912e59e4 100644
--- a/bitcoin-qt.pro
+++ b/bitcoin-qt.pro
@@ -1,7 +1,9 @@
TEMPLATE = app
TARGET = bitcoin-qt
+macx:TARGET = "Bitcoin-Qt"
VERSION = 0.8.0
INCLUDEPATH += src src/json src/qt
+QT += network
DEFINES += QT_GUI BOOST_THREAD_USE_LIB BOOST_SPIRIT_THREADSAFE
CONFIG += no_include_pwd
CONFIG += thread
@@ -28,10 +30,8 @@ contains(RELEASE, 1) {
macx:QMAKE_OBJECTIVE_CFLAGS += -mmacosx-version-min=10.5 -arch i386 -isysroot /Developer/SDKs/MacOSX10.5.sdk
!win32:!macx {
- # Linux: static link
+ # Linux: static link and extra security (see: https://wiki.debian.org/Hardening)
LIBS += -Wl,-Bstatic -Wl,-z,relro -Wl,-z,now
- # for extra security (see: https://wiki.debian.org/Hardening)
- QMAKE_CXXFLAGS *= -D_FORTIFY_SOURCE=2
}
}
@@ -42,6 +42,8 @@ contains(RELEASE, 1) {
# Exclude on Windows cross compile with MinGW 4.2.x, as it will result in a non-working executable!
# This can be enabled for Windows, when we switch to MinGW >= 4.4.x.
}
+# for extra security (see: https://wiki.debian.org/Hardening): this flag is GCC compiler-specific
+QMAKE_CXXFLAGS *= -D_FORTIFY_SOURCE=2
# for extra security on Windows: enable ASLR and DEP via GCC linker flags
win32:QMAKE_LFLAGS *= -Wl,--dynamicbase -Wl,--nxcompat
# on Windows: enable GCC large address aware linker flag
@@ -99,14 +101,15 @@ contains(BITCOIN_NEED_QT_PLUGINS, 1) {
INCLUDEPATH += src/leveldb/include src/leveldb/helpers
LIBS += $$PWD/src/leveldb/libleveldb.a $$PWD/src/leveldb/libmemenv.a
!win32 {
- genleveldb.commands = cd $$PWD/src/leveldb && CC=$$QMAKE_CC CXX=$$QMAKE_CXX $(MAKE) OPT=\"$$QMAKE_CXXFLAGS\" libleveldb.a libmemenv.a
+ # we use QMAKE_CXXFLAGS_RELEASE even without RELEASE=1 because we use RELEASE to indicate linking preferences not -O preferences
+ genleveldb.commands = cd $$PWD/src/leveldb && CC=$$QMAKE_CC CXX=$$QMAKE_CXX $(MAKE) OPT=\"$$QMAKE_CXXFLAGS $$QMAKE_CXXFLAGS_RELEASE\" libleveldb.a libmemenv.a
} else {
# make an educated guess about what the ranlib command is called
isEmpty(QMAKE_RANLIB) {
QMAKE_RANLIB = $$replace(QMAKE_STRIP, strip, ranlib)
}
LIBS += -lshlwapi
- genleveldb.commands = cd $$PWD/src/leveldb && CC=$$QMAKE_CC CXX=$$QMAKE_CXX TARGET_OS=OS_WINDOWS_CROSSCOMPILE $(MAKE) OPT=\"$$QMAKE_CXXFLAGS\" libleveldb.a libmemenv.a && $$QMAKE_RANLIB $$PWD/src/leveldb/libleveldb.a && $$QMAKE_RANLIB $$PWD/src/leveldb/libmemenv.a
+ genleveldb.commands = cd $$PWD/src/leveldb && CC=$$QMAKE_CC CXX=$$QMAKE_CXX TARGET_OS=OS_WINDOWS_CROSSCOMPILE $(MAKE) OPT=\"$$QMAKE_CXXFLAGS $$QMAKE_CXXFLAGS_RELEASE\" libleveldb.a libmemenv.a && $$QMAKE_RANLIB $$PWD/src/leveldb/libleveldb.a && $$QMAKE_RANLIB $$PWD/src/leveldb/libmemenv.a
}
genleveldb.target = $$PWD/src/leveldb/libleveldb.a
genleveldb.depends = FORCE
@@ -157,7 +160,6 @@ HEADERS += src/qt/bitcoingui.h \
src/walletdb.h \
src/script.h \
src/init.h \
- src/irc.h \
src/bloom.h \
src/mruset.h \
src/checkqueue.h \
@@ -184,6 +186,9 @@ HEADERS += src/qt/bitcoingui.h \
src/qt/transactionfilterproxy.h \
src/qt/transactionview.h \
src/qt/walletmodel.h \
+ src/qt/walletview.h \
+ src/qt/walletstack.h \
+ src/qt/walletframe.h \
src/bitcoinrpc.h \
src/qt/overviewpage.h \
src/qt/csvmodelwriter.h \
@@ -195,7 +200,7 @@ HEADERS += src/qt/bitcoingui.h \
src/qt/askpassphrasedialog.h \
src/protocol.h \
src/qt/notificator.h \
- src/qt/qtipcserver.h \
+ src/qt/paymentserver.h \
src/allocators.h \
src/ui_interface.h \
src/qt/rpcconsole.h \
@@ -204,9 +209,11 @@ HEADERS += src/qt/bitcoingui.h \
src/clientversion.h \
src/txdb.h \
src/leveldb.h \
- src/threadsafety.h
+ src/threadsafety.h \
+ src/limitedmap.h
-SOURCES += src/qt/bitcoin.cpp src/qt/bitcoingui.cpp \
+SOURCES += src/qt/bitcoin.cpp \
+ src/qt/bitcoingui.cpp \
src/qt/transactiontablemodel.cpp \
src/qt/addresstablemodel.cpp \
src/qt/optionsdialog.cpp \
@@ -227,7 +234,6 @@ SOURCES += src/qt/bitcoin.cpp src/qt/bitcoingui.cpp \
src/main.cpp \
src/init.cpp \
src/net.cpp \
- src/irc.cpp \
src/bloom.cpp \
src/checkpoints.cpp \
src/addrman.cpp \
@@ -247,6 +253,9 @@ SOURCES += src/qt/bitcoin.cpp src/qt/bitcoingui.cpp \
src/qt/transactionfilterproxy.cpp \
src/qt/transactionview.cpp \
src/qt/walletmodel.cpp \
+ src/qt/walletview.cpp \
+ src/qt/walletstack.cpp \
+ src/qt/walletframe.cpp \
src/bitcoinrpc.cpp \
src/rpcdump.cpp \
src/rpcnet.cpp \
@@ -264,17 +273,15 @@ SOURCES += src/qt/bitcoin.cpp src/qt/bitcoingui.cpp \
src/qt/askpassphrasedialog.cpp \
src/protocol.cpp \
src/qt/notificator.cpp \
- src/qt/qtipcserver.cpp \
+ src/qt/paymentserver.cpp \
src/qt/rpcconsole.cpp \
src/noui.cpp \
src/leveldb.cpp \
src/txdb.cpp
-RESOURCES += \
- src/qt/bitcoin.qrc
+RESOURCES += src/qt/bitcoin.qrc
-FORMS += \
- src/qt/forms/sendcoinsdialog.ui \
+FORMS += src/qt/forms/sendcoinsdialog.ui \
src/qt/forms/addressbookpage.ui \
src/qt/forms/signverifymessagedialog.ui \
src/qt/forms/aboutdialog.ui \
@@ -300,6 +307,7 @@ DEPENDPATH += src/qt/test
QT += testlib
TARGET = bitcoin-qt_test
DEFINES += BITCOIN_QT_TEST
+ macx: CONFIG -= app_bundle
}
CODECFORTR = UTF-8
@@ -381,10 +389,10 @@ macx:OBJECTIVE_SOURCES += src/qt/macdockiconhandler.mm
macx:LIBS += -framework Foundation -framework ApplicationServices -framework AppKit
macx:DEFINES += MAC_OSX MSG_NOSIGNAL=0
macx:ICON = src/qt/res/icons/bitcoin.icns
-macx:TARGET = "Bitcoin-Qt"
macx:QMAKE_CFLAGS_THREAD += -pthread
macx:QMAKE_LFLAGS_THREAD += -pthread
macx:QMAKE_CXXFLAGS_THREAD += -pthread
+macx:QMAKE_INFO_PLIST = share/qt/Info.plist
# Set libraries and includes at end, to use platform-defined defaults if not overridden
INCLUDEPATH += $$BOOST_INCLUDE_PATH $$BDB_INCLUDE_PATH $$OPENSSL_INCLUDE_PATH $$QRENCODE_INCLUDE_PATH
@@ -402,4 +410,4 @@ contains(RELEASE, 1) {
}
}
-system($$QMAKE_LRELEASE -silent $$_PRO_FILE_)
+system($$QMAKE_LRELEASE -silent $$TRANSLATIONS)
diff --git a/contrib/debian/bin/bitcoind b/contrib/debian/bin/bitcoind
deleted file mode 100755
index a2f55a9138..0000000000
--- a/contrib/debian/bin/bitcoind
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/bin/sh
-
-set -e
-
-umask 077
-
-basedir=~/.bitcoin
-cfgfile="$basedir/bitcoin.conf"
-
-[ -e "$basedir" ] || mkdir "$basedir"
-
-[ -e "$cfgfile" ] || perl -le 'print"rpcpassword=",map{(a..z,A..Z,0..9)[rand 62]}0..9' > "$cfgfile"
-
-exec /usr/lib/bitcoin/bitcoind "$@"
diff --git a/contrib/debian/bitcoind.install b/contrib/debian/bitcoind.install
index e978c44b3f..7bf746006c 100644
--- a/contrib/debian/bitcoind.install
+++ b/contrib/debian/bitcoind.install
@@ -1,2 +1 @@
-debian/bin/bitcoind usr/bin
-src/bitcoind usr/lib/bitcoin
+src/bitcoind usr/bin
diff --git a/contrib/debian/changelog b/contrib/debian/changelog
index 52d0e5907b..4388e7175a 100644
--- a/contrib/debian/changelog
+++ b/contrib/debian/changelog
@@ -1,3 +1,39 @@
+bitcoin (0.8.1-natty2) natty; urgency=low
+
+ * Remove dumb broken launcher script
+
+ -- Matt Corallo <matt@bluematt.me> Sun, 24 Mar 2013 20:01:00 -0400
+
+bitcoin (0.8.1-natty1) natty; urgency=low
+
+ * New upstream release.
+
+ -- Matt Corallo <matt@bluematt.me> Tue, 19 Mar 2013 13:03:00 -0400
+
+bitcoin (0.8.0-natty1) natty; urgency=low
+
+ * New upstream release.
+
+ -- Matt Corallo <matt@bluematt.me> Sat, 23 Feb 2013 16:01:00 -0500
+
+bitcoin (0.7.2-natty1) natty; urgency=low
+
+ * New upstream release.
+
+ -- Matt Corallo <matt@bluematt.me> Sat, 15 Dec 2012 10:59:00 -0400
+
+bitcoin (0.7.1-natty1) natty; urgency=low
+
+ * New upstream release.
+
+ -- Matt Corallo <matt@bluematt.me> Wed, 24 Oct 2012 15:06:00 -0400
+
+bitcoin (0.7.0-natty1) natty; urgency=low
+
+ * New upstream release.
+
+ -- Matt Corallo <matt@bluematt.me> Mon, 17 Sep 2012 13:45:00 +0200
+
bitcoin (0.6.3-natty1) natty; urgency=low
* New upstream release.
diff --git a/contrib/debian/control b/contrib/debian/control
index c8266f686b..dd167ef53d 100644
--- a/contrib/debian/control
+++ b/contrib/debian/control
@@ -33,8 +33,6 @@ Description: peer-to-peer network based digital currency - daemon
transact directly with each other, with the help of a P2P network to
check for double-spending.
.
- By default connects to an IRC network to discover other peers.
- .
Full transaction history is stored locally at each client. This
requires 2+ GB of space, slowly growing.
.
@@ -51,8 +49,6 @@ Description: peer-to-peer network based digital currency - Qt GUI
transact directly with each other, with the help of a P2P network to
check for double-spending.
.
- By default connects to an IRC network to discover other peers.
- .
Full transaction history is stored locally at each client. This
requires 2+ GB of space, slowly growing.
.
diff --git a/contrib/debian/examples/bitcoin.conf b/contrib/debian/examples/bitcoin.conf
index e56c43cb50..10ec36ae7e 100644
--- a/contrib/debian/examples/bitcoin.conf
+++ b/contrib/debian/examples/bitcoin.conf
@@ -18,10 +18,6 @@
#connect=69.164.218.197
#connect=10.0.0.1:8333
-# Do not use Internet Relay Chat (irc.lfnet.org #bitcoin channel) to
-# find other peers.
-#noirc=1
-
# Maximum number of inbound+outbound connections.
#maxconnections=
diff --git a/contrib/debian/manpages/bitcoin.conf.5 b/contrib/debian/manpages/bitcoin.conf.5
index 1243253413..426fe06675 100644
--- a/contrib/debian/manpages/bitcoin.conf.5
+++ b/contrib/debian/manpages/bitcoin.conf.5
@@ -24,9 +24,6 @@ Use as many *addnode=* settings as you like to connect to specific peers.
\fBconnect=\fR\fI'10.0.0.1:8333'\fR
Use as many *connect=* settings as you like to connect ONLY to specific peers.
.TP
-\fBnoirc=\fR[\fI'1'\fR|\fI'0'\fR]
-Use or Do not use Internet Relay Chat (irc.lfnet.org #bitcoin channel) to find other peers.
-.TP
\fRmaxconnections=\fR\fI'value'\fR
Maximum number of inbound+outbound connections.
.SH JSON-RPC OPTIONS
diff --git a/contrib/homebrew/makefile.osx.patch b/contrib/homebrew/makefile.osx.patch
new file mode 100644
index 0000000000..340de0efdf
--- /dev/null
+++ b/contrib/homebrew/makefile.osx.patch
@@ -0,0 +1,47 @@
+diff --git a/src/makefile.osx b/src/makefile.osx
+index 8b7c559..8a0560c 100644
+--- a/src/makefile.osx
++++ b/src/makefile.osx
+@@ -7,17 +7,21 @@
+ # Originally by Laszlo Hanyecz (solar@heliacal.net)
+
+ CXX=llvm-g++
+-DEPSDIR=/opt/local
++DEPSDIR=/usr/local
++DB4DIR=/usr/local/opt/berkeley-db4
++OPENSSLDIR=/usr/local/opt/openssl
+
+ INCLUDEPATHS= \
+ -I"$(CURDIR)" \
+- -I"$(CURDIR)"/obj \
++ -I"$(CURDIR)/obj" \
+ -I"$(DEPSDIR)/include" \
+- -I"$(DEPSDIR)/include/db48"
++ -I"$(DB4DIR)/include" \
++ -I"$(OPENSSLDIR)/include"
+
+ LIBPATHS= \
+ -L"$(DEPSDIR)/lib" \
+- -L"$(DEPSDIR)/lib/db48"
++ -L"$(DB4DIR)/lib" \
++ -L"$(OPENSSLDIR)/lib"
+
+ USE_UPNP:=1
+ USE_IPV6:=1
+@@ -31,13 +35,13 @@ ifdef STATIC
+ TESTLIBS += \
+ $(DEPSDIR)/lib/libboost_unit_test_framework-mt.a
+ LIBS += \
+- $(DEPSDIR)/lib/db48/libdb_cxx-4.8.a \
++ $(DB4DIR)/lib/libdb_cxx-4.8.a \
+ $(DEPSDIR)/lib/libboost_system-mt.a \
+ $(DEPSDIR)/lib/libboost_filesystem-mt.a \
+ $(DEPSDIR)/lib/libboost_program_options-mt.a \
+ $(DEPSDIR)/lib/libboost_thread-mt.a \
+- $(DEPSDIR)/lib/libssl.a \
+- $(DEPSDIR)/lib/libcrypto.a \
++ $(OPENSSLDIR)/lib/libssl.a \
++ $(OPENSSLDIR)/lib/libcrypto.a \
+ -lz
+ else
+ TESTLIBS += \
diff --git a/doc/assets-attribution.txt b/doc/assets-attribution.txt
index 0693d535c3..abcb9d8b3a 100644
--- a/doc/assets-attribution.txt
+++ b/doc/assets-attribution.txt
@@ -1,5 +1,8 @@
Icon: src/qt/res/icons/clock*.png, src/qt/res/icons/tx*.png,
- src/qt/res/src/*.svg
+ src/qt/res/src/clock_green.svg, src/qt/res/src/clock1.svg
+ src/qt/res/src/clock2.svg, src/qt/res/src/clock3.svg
+ src/qt/res/src/clock4.svg, src/qt/res/src/clock5.svg
+ src/qt/res/src/inout.svg, src/qt/res/src/questionmark.svg
Designer: Wladimir van der Laan
License: MIT
@@ -35,7 +38,7 @@ Designer: http://www.everaldo.com
Icon Pack: Crystal SVG
License: LGPL
-Icon: src/qt/res/icons/bitcoin.png, src/qt/res/icons/toolbar.png
+Icon: src/qt/res/icons/toolbar.png
Designer: Bitboy (optimized for 16x16 by Wladimir van der Laan)
License: Public Domain
Site: https://bitcointalk.org/?topic=1756.0
@@ -55,3 +58,9 @@ Icon: src/qt/res/icons/debugwindow.png
Designer: Vignoni David
Site: http://www.oxygen-icons.org/
License: Oxygen icon theme is dual licensed. You may copy it under the Creative Common Attribution-ShareAlike 3.0 License or the GNU Library General Public License.
+
+Icon: src/qt/res/icons/bitcoin.icns, src/qt/res/src/bitcoin.svg,
+ src/qt/res/src/bitcoin.ico, src/qt/res/src/bitcoin.png,
+ src/qt/res/src/bitcoin_testnet.png, docs/bitcoin_logo_doxygen.png
+Designer: Jonas Schnelli (based on the original bitcoin logo from Bitboy)
+License: MIT \ No newline at end of file
diff --git a/doc/bitcoin_logo_doxygen.png b/doc/bitcoin_logo_doxygen.png
index 5b41b02e18..2d62a8dc8a 100644
--- a/doc/bitcoin_logo_doxygen.png
+++ b/doc/bitcoin_logo_doxygen.png
Binary files differ
diff --git a/doc/build-osx.md b/doc/build-osx.md
new file mode 100644
index 0000000000..1ed593d5eb
--- /dev/null
+++ b/doc/build-osx.md
@@ -0,0 +1,173 @@
+Mac OS X bitcoind build instructions
+====================================
+
+Authors
+-------
+
+* Laszlo Hanyecz <solar@heliacal.net>
+* Douglas Huff <dhuff@jrbobdobbs.org>
+* Colin Dean <cad@cad.cx>
+* Gavin Andresen <gavinandresen@gmail.com>
+
+License
+-------
+
+Copyright (c) 2009-2012 Bitcoin Developers
+
+Distributed under the MIT/X11 software license, see the accompanying
+file COPYING or http://www.opensource.org/licenses/mit-license.php.
+
+This product includes software developed by the OpenSSL Project for use in
+the OpenSSL Toolkit (http://www.openssl.org/).
+
+This product includes cryptographic software written by
+Eric Young (eay@cryptsoft.com) and UPnP software written by Thomas Bernard.
+
+Notes
+-----
+
+See `doc/readme-qt.rst` for instructions on building Bitcoin-Qt, the
+graphical user interface.
+
+Tested on OS X 10.5 through 10.8 on Intel processors only. PPC is not
+supported because it is big-endian.
+
+All of the commands should be executed in a Terminal application. The
+built-in one is located in `/Applications/Utilities`.
+
+Preparation
+-----------
+
+You need to install XCode with all the options checked so that the compiler
+and everything is available in /usr not just /Developer. XCode should be
+available on your OS X installation media, but if not, you can get the
+current version from https://developer.apple.com/xcode/. If you install
+Xcode 4.3 or later, you'll need to install its command line tools. This can
+be done in `Xcode > Preferences > Downloads > Components` and generally must
+be re-done or updated every time Xcode is updated.
+
+There's an assumption that you already have `git` installed, as well. If
+not, it's the path of least resistance to install Github for Mac
+(OS X 10.7+) or
+[Git for OS X](https://code.google.com/p/git-osx-installer/). It is also
+available via Homebrew or MacPorts.
+
+You will also need to install [Homebrew](http://mxcl.github.com/homebrew/)
+or [MacPorts](http://www.macports.org/) in order to install library
+dependencies. It's largely a religious decision which to choose, but, as of
+December 2012, MacPorts is a little easier because you can just install the
+dependencies immediately - no other work required. If you're unsure, read
+the instructions through first in order to assess what you want to do.
+Homebrew is a little more popular among those newer to OS X.
+
+The installation of the actual dependencies is covered in the Instructions
+sections below.
+
+Instructions: MacPorts
+----------------------
+
+### Install dependencies
+
+Installing the dependencies using MacPorts is very straightforward.
+
+ sudo port install boost db48@+no_java openssl miniupnpc
+
+### Building `bitcoind`
+
+1. Clone the github tree to get the source code and go into the directory.
+
+ git clone git@github.com:bitcoin/bitcoin.git bitcoin
+ cd bitcoin
+
+2. Build bitcoind:
+
+ cd src
+ make -f makefile.osx
+
+3. It is a good idea to build and run the unit tests, too:
+
+ make -f makefile.osx test
+
+Instructions: HomeBrew
+----------------------
+
+#### Install dependencies using Homebrew
+
+ brew install boost miniupnpc openssl berkeley-db4
+
+### Building `bitcoind`
+
+1. Clone the github tree to get the source code and go into the directory.
+
+ git clone git@github.com:bitcoin/bitcoin.git bitcoin
+ cd bitcoin
+
+2. Modify source in order to pick up the `openssl` library.
+
+ Edit `makefile.osx` to account for library location differences. There's a
+ diff in `contrib/homebrew/makefile.osx.patch` that shows what you need to
+ change, or you can just patch by doing
+
+ patch -p1 < contrib/homebrew/makefile.osx.patch
+
+3. Build bitcoind:
+
+ cd src
+ make -f makefile.osx
+
+4. It is a good idea to build and run the unit tests, too:
+
+ make -f makefile.osx test
+
+Creating a release build
+------------------------
+
+A bitcoind binary is not included in the Bitcoin-Qt.app bundle. You can ignore
+this section if you are building `bitcoind` for your own use.
+
+If you are building `bitcoind` for others, your build machine should be set up
+as follows for maximum compatibility:
+
+All dependencies should be compiled with these flags:
+
+ -mmacosx-version-min=10.5 -arch i386 -isysroot /Developer/SDKs/MacOSX10.5.sdk
+
+For MacPorts, that means editing your macports.conf and setting
+`macosx_deployment_target` and `build_arch`:
+
+ macosx_deployment_target=10.5
+ build_arch=i386
+
+... and then uninstalling and re-installing, or simply rebuilding, all ports.
+
+As of December 2012, the `boost` port does not obey `macosx_deployment_target`.
+Download `http://gavinandresen-bitcoin.s3.amazonaws.com/boost_macports_fix.zip`
+for a fix. Some ports also seem to obey either `build_arch` or
+`macosx_deployment_target`, but not both at the same time. For example, building
+on an OS X 10.6 64-bit machine fails. Official release builds of Bitcoin-Qt are
+compiled on an OS X 10.6 32-bit machine to workaround that problem.
+
+Once dependencies are compiled, creating `Bitcoin-Qt.app` is easy:
+
+ make -f Makefile.osx RELEASE=1
+
+Running
+-------
+
+It's now available at `./bitcoind`, provided that you are still in the `src`
+directory. We have to first create the RPC configuration file, though.
+
+Run `./bitcoind` to get the filename where it should be put, or just try these
+commands:
+
+ echo -e "rpcuser=bitcoinrpc\nrpcpassword=$(xxd -l 16 -p /dev/urandom)" > "/Users/${USER}/Library/Application Support/Bitcoin/bitcoin.conf"
+ chmod 600 "/Users/${USER}/Library/Application Support/Bitcoin/bitcoin.conf"
+
+When next you run it, it will start downloading the blockchain, but it won't
+output anything while it's doing this. This process may take several hours.
+
+Other commands:
+
+ ./bitcoind --help # for a list of command-line options.
+ ./bitcoind -daemon # to start the bitcoin daemon.
+ ./bitcoind help # When the daemon is running, to get a list of RPC commands
diff --git a/doc/build-osx.txt b/doc/build-osx.txt
deleted file mode 100644
index fd878043c0..0000000000
--- a/doc/build-osx.txt
+++ /dev/null
@@ -1,54 +0,0 @@
-Copyright (c) 2009-2012 Bitcoin Developers
-Distributed under the MIT/X11 software license, see the accompanying
-file COPYING or http://www.opensource.org/licenses/mit-license.php.
-This product includes software developed by the OpenSSL Project for use in
-the OpenSSL Toolkit (http://www.openssl.org/). This product includes
-cryptographic software written by Eric Young (eay@cryptsoft.com) and UPnP
-software written by Thomas Bernard.
-
-
-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, 10.6 and 10.7 intel. PPC is not supported because it's big-endian.
-
-All of the commands should be executed in Terminal.app.. it's in
-/Applications/Utilities
-
-You need to install XCode with all the options checked so that the compiler and
-everything is available in /usr not just /Developer. XCode should be available on your OS X
-install DVD, but if not, you can get the current version from https://developer.apple.com/xcode/
-
-
-1. Clone the github tree to get the source code:
-
-git clone git@github.com:bitcoin/bitcoin.git bitcoin
-
-2. Download and install MacPorts from http://www.macports.org/
-
-2a. (for 10.7 Lion)
- Edit /opt/local/etc/macports/macports.conf and uncomment "build_arch i386"
-
-3. Install dependencies from MacPorts
-
-sudo port install boost db48 openssl miniupnpc
-
-Optionally install qrencode (and set USE_QRCODE=1):
-sudo port install qrencode
-
-4. Now you should be able to build bitcoind:
-
-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
diff --git a/doc/coding.txt b/doc/coding.txt
index 0813105e73..427e388cfd 100644
--- a/doc/coding.txt
+++ b/doc/coding.txt
@@ -65,9 +65,6 @@ StartNode : Starts other threads.
ThreadGetMyExternalIP : Determines outside-the-firewall IP address,
sends addr message to connected peers when it determines it.
-ThreadIRCSeed : Joins IRC bootstrapping channel, watching for new
-peers and advertising this node's IP address.
-
ThreadSocketHandler : Sends/Receives data from peers on port 8333.
ThreadMessageHandler : Higher-level message handling (sending and
diff --git a/doc/multiwallet-qt.txt b/doc/multiwallet-qt.txt
new file mode 100644
index 0000000000..8394080db0
--- /dev/null
+++ b/doc/multiwallet-qt.txt
@@ -0,0 +1,53 @@
+Multiwallet Qt Development and Integration Strategy
+===================================================
+
+In order to support loading of multiple wallets in bitcoin-qt, a few changes in the UI architecture will be needed.
+Fortunately, only four of the files in the existing project are affected by this change.
+
+Three new classes have been implemented in three new .h/.cpp file pairs, with much of the functionality that was previously
+implemented in the BitcoinGUI class moved over to these new classes.
+
+The two existing files most affected, by far, are bitcoingui.h and bitcoingui.cpp, as the BitcoinGUI class will require
+some major retrofitting.
+
+Only requiring some minor changes is bitcoin.cpp.
+
+Finally, three new headers and source files will have to be added to bitcoin-qt.pro.
+
+Changes to class BitcoinGUI
+---------------------------
+The principal change to the BitcoinGUI class concerns the QStackedWidget instance called centralWidget.
+This widget owns five page views: overviewPage, transactionsPage, addressBookPage, receiveCoinsPage, and sendCoinsPage.
+
+A new class called *WalletView* inheriting from QStackedWidget has been written to handle all renderings and updates of
+these page views. In addition to owning these five page views, a WalletView also has a pointer to a WalletModel instance.
+This allows the construction of multiple WalletView objects, each rendering a distinct wallet.
+
+A second class called *WalletStack*, also inheriting from QStackedWidget, has been written to handle switching focus between
+different loaded wallets. In its current implementation, as a QStackedWidget, only one wallet can be viewed at a time -
+but this can be changed later.
+
+A third class called *WalletFrame* inheriting from QFrame has been written as a container for embedding all wallet-related
+controls into BitcoinGUI. At present it just contains a WalletStack instance and does little more than passing on messages
+from BitcoinGUI to the WalletStack, which in turn passes them to the individual WalletViews. It is a WalletFrame instance
+that takes the place of what used to be centralWidget in BitcoinGUI. The purpose of this class is to allow future
+refinements of the wallet controls with minimal need for further modifications to BitcoinGUI, thus greatly simplifying
+merges while reducing the risk of breaking top-level stuff.
+
+Changes to bitcoin.cpp
+----------------------
+bitcoin.cpp is the entry point into bitcoin-qt, and as such, will require some minor modifications to provide hooks for
+multiple wallet support. Most importantly will be the way it instantiates WalletModels and passes them to the
+singleton BitcoinGUI instance called window. Formerly, BitcoinGUI kept a pointer to a single instance of a WalletModel.
+The initial change required is very simple: rather than calling window.setWalletModel(&walletModel); we perform the
+following two steps:
+
+window.addWallet("~Default", &walletModel);
+window.setCurrentWallet("~Default");
+
+The string parameter is just an arbitrary name given to the default wallet. It's been prepended with a tilde to avoid name
+collisions in the future with additional wallets.
+
+The shutdown call window.setWalletModel(0) has also been removed. In its place is now:
+
+window.removeAllWallets();
diff --git a/doc/release-process.txt b/doc/release-process.txt
index 166f2aaf3c..29271ad224 100644
--- a/doc/release-process.txt
+++ b/doc/release-process.txt
@@ -1,25 +1,26 @@
-* update translations (ping tcatm on IRC for now)
+* update translations (ping wumpus, Diapolo or tcatm on IRC)
+ * see https://github.com/bitcoin/bitcoin/blob/master/doc/translation_process.md#syncing-with-transifex
* update (commit) version in sources
bitcoin-qt.pro
- src/clientversion.h (change CLIENT_VERSION_IS_RELEASE to true)
- share/setup.nsi
- doc/README*
contrib/verifysfbinaries/verify.sh
+ doc/README*
+ share/setup.nsi
+ src/clientversion.h (change CLIENT_VERSION_IS_RELEASE to true)
* tag version in git
- git tag -a v0.5.1
+ git tag -a v0.8.0
-* write release notes. git shortlog helps a lot:
+* write release notes. git shortlog helps a lot, for example:
- git shortlog --no-merges v0.5.0..
+ git shortlog --no-merges v0.7.2..v0.8.0
* perform gitian builds
* From a directory containing the bitcoin source, gitian-builder and gitian.sigs
export SIGNER=(your gitian key, ie bluematt, sipa, etc)
- export VERSION=0.5.1
+ export VERSION=0.8.0
cd ./gitian-builder
* Fetch and build inputs: (first time, or when dependency versions change)
diff --git a/share/qt/Info.plist b/share/qt/Info.plist
new file mode 100644
index 0000000000..58b2152e9f
--- /dev/null
+++ b/share/qt/Info.plist
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist SYSTEM "file://localhost/System/Library/DTDs/PropertyList.dtd">
+<plist version="0.9">
+<dict>
+ <key>CFBundleIconFile</key>
+ <string>bitcoin.icns</string>
+ <key>CFBundlePackageType</key>
+ <string>APPL</string>
+ <key>CFBundleGetInfoString</key>
+ <string>Bitcoin-Qt</string>
+ <key>CFBundleSignature</key>
+ <string>????</string>
+ <key>CFBundleExecutable</key>
+ <string>Bitcoin-Qt</string>
+ <key>CFBundleIdentifier</key>
+ <string>org.bitcoinfoundation.Bitcoin-Qt</string>
+ <key>CFBundleURLTypes</key>
+ <array>
+ <dict>
+ <key>CFBundleTypeRole</key>
+ <string>Editor</string>
+ <key>CFBundleURLName</key>
+ <string>org.bitcoinfoundation.BitcoinPayment</string>
+ <key>CFBundleURLSchemes</key>
+ <array>
+ <string>bitcoin</string>
+ </array>
+ </dict>
+ </array>
+</dict>
+</plist>
diff --git a/src/alert.cpp b/src/alert.cpp
index 48920629e2..4b029840dd 100644
--- a/src/alert.cpp
+++ b/src/alert.cpp
@@ -2,6 +2,9 @@
// Alert system
//
+#include <algorithm>
+#include <boost/algorithm/string/classification.hpp>
+#include <boost/algorithm/string/replace.hpp>
#include <boost/foreach.hpp>
#include <map>
@@ -165,7 +168,7 @@ CAlert CAlert::getAlertByHash(const uint256 &hash)
return retval;
}
-bool CAlert::ProcessAlert()
+bool CAlert::ProcessAlert(bool fThread)
{
if (!CheckSignature())
return false;
@@ -229,9 +232,35 @@ bool CAlert::ProcessAlert()
// Add to mapAlerts
mapAlerts.insert(make_pair(GetHash(), *this));
- // Notify UI if it applies to me
+ // Notify UI and -alertnotify if it applies to me
if(AppliesToMe())
+ {
uiInterface.NotifyAlertChanged(GetHash(), CT_NEW);
+ std::string strCmd = GetArg("-alertnotify", "");
+ if (!strCmd.empty())
+ {
+ // Alert text should be plain ascii coming from a trusted source, but to
+ // be safe we first strip anything not in safeChars, then add single quotes around
+ // the whole string before passing it to the shell:
+ std::string singleQuote("'");
+ // safeChars chosen to allow simple messages/URLs/email addresses, but avoid anything
+ // even possibly remotely dangerous like & or >
+ std::string safeChars("abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ01234567890 .,;_/:?@");
+ std::string safeStatus;
+ for (std::string::size_type i = 0; i < strStatusBar.size(); i++)
+ {
+ if (safeChars.find(strStatusBar[i]) != std::string::npos)
+ safeStatus.push_back(strStatusBar[i]);
+ }
+ safeStatus = singleQuote+safeStatus+singleQuote;
+ boost::replace_all(strCmd, "%s", safeStatus);
+
+ if (fThread)
+ boost::thread t(runCommand, strCmd); // thread runs free
+ else
+ runCommand(strCmd);
+ }
+ }
}
printf("accepted alert %d, AppliesToMe()=%d\n", nID, AppliesToMe());
diff --git a/src/alert.h b/src/alert.h
index 7949c76972..25e140f573 100644
--- a/src/alert.h
+++ b/src/alert.h
@@ -91,7 +91,7 @@ public:
bool AppliesToMe() const;
bool RelayTo(CNode* pnode) const;
bool CheckSignature() const;
- bool ProcessAlert();
+ bool ProcessAlert(bool fThread = true);
/*
* Get copy of (active) alert object by hash. Returns a null alert if it is not found.
diff --git a/src/bitcoinrpc.cpp b/src/bitcoinrpc.cpp
index 7751e4c8b6..9c126fc3da 100644
--- a/src/bitcoinrpc.cpp
+++ b/src/bitcoinrpc.cpp
@@ -30,13 +30,12 @@ using namespace boost;
using namespace boost::asio;
using namespace json_spirit;
-void ThreadRPCServer2(void* parg);
-
static std::string strRPCUserColonPass;
-const Object emptyobj;
-
-void ThreadRPCServer3(void* parg);
+// These are created by StartRPCThreads, destroyed in StopRPCThreads
+static asio::io_service* rpc_io_service = NULL;
+static ssl::context* rpc_ssl_context = NULL;
+static boost::thread_group* rpc_worker_group = NULL;
static inline unsigned short GetDefaultRPCPort()
{
@@ -194,70 +193,70 @@ Value stop(const Array& params, bool fHelp)
static const CRPCCommand vRPCCommands[] =
-{ // name function safemd unlocked
- // ------------------------ ----------------------- ------ --------
- { "help", &help, true, true },
- { "stop", &stop, true, true },
- { "getblockcount", &getblockcount, true, false },
- { "getconnectioncount", &getconnectioncount, true, false },
- { "getpeerinfo", &getpeerinfo, true, false },
- { "addnode", &addnode, true, true },
- { "getaddednodeinfo", &getaddednodeinfo, true, true },
- { "getdifficulty", &getdifficulty, true, false },
- { "getgenerate", &getgenerate, true, false },
- { "setgenerate", &setgenerate, true, false },
- { "gethashespersec", &gethashespersec, true, false },
- { "getinfo", &getinfo, true, false },
- { "getmininginfo", &getmininginfo, true, false },
- { "getnewaddress", &getnewaddress, true, false },
- { "getaccountaddress", &getaccountaddress, true, false },
- { "setaccount", &setaccount, true, false },
- { "getaccount", &getaccount, false, false },
- { "getaddressesbyaccount", &getaddressesbyaccount, true, false },
- { "sendtoaddress", &sendtoaddress, false, false },
- { "getreceivedbyaddress", &getreceivedbyaddress, false, false },
- { "getreceivedbyaccount", &getreceivedbyaccount, false, false },
- { "listreceivedbyaddress", &listreceivedbyaddress, false, false },
- { "listreceivedbyaccount", &listreceivedbyaccount, false, false },
- { "backupwallet", &backupwallet, true, false },
- { "keypoolrefill", &keypoolrefill, true, false },
- { "walletpassphrase", &walletpassphrase, true, false },
- { "walletpassphrasechange", &walletpassphrasechange, false, false },
- { "walletlock", &walletlock, true, false },
- { "encryptwallet", &encryptwallet, false, false },
- { "validateaddress", &validateaddress, true, false },
- { "getbalance", &getbalance, false, false },
- { "move", &movecmd, false, false },
- { "sendfrom", &sendfrom, false, false },
- { "sendmany", &sendmany, false, false },
- { "addmultisigaddress", &addmultisigaddress, false, false },
- { "createmultisig", &createmultisig, true, true },
- { "getrawmempool", &getrawmempool, true, false },
- { "getblock", &getblock, false, false },
- { "getblockhash", &getblockhash, false, false },
- { "gettransaction", &gettransaction, false, false },
- { "listtransactions", &listtransactions, false, false },
- { "listaddressgroupings", &listaddressgroupings, false, false },
- { "signmessage", &signmessage, false, false },
- { "verifymessage", &verifymessage, false, false },
- { "getwork", &getwork, true, false },
- { "listaccounts", &listaccounts, false, false },
- { "settxfee", &settxfee, false, false },
- { "getblocktemplate", &getblocktemplate, true, false },
- { "submitblock", &submitblock, false, false },
- { "listsinceblock", &listsinceblock, false, false },
- { "dumpprivkey", &dumpprivkey, false, false },
- { "importprivkey", &importprivkey, false, false },
- { "listunspent", &listunspent, false, false },
- { "getrawtransaction", &getrawtransaction, false, false },
- { "createrawtransaction", &createrawtransaction, false, false },
- { "decoderawtransaction", &decoderawtransaction, false, false },
- { "signrawtransaction", &signrawtransaction, false, false },
- { "sendrawtransaction", &sendrawtransaction, false, false },
- { "gettxoutsetinfo", &gettxoutsetinfo, true, false },
- { "gettxout", &gettxout, true, false },
- { "lockunspent", &lockunspent, false, false },
- { "listlockunspent", &listlockunspent, false, false },
+{ // name actor (function) okSafeMode threadSafe
+ // ------------------------ ----------------------- ---------- ----------
+ { "help", &help, true, true },
+ { "stop", &stop, true, true },
+ { "getblockcount", &getblockcount, true, false },
+ { "getconnectioncount", &getconnectioncount, true, false },
+ { "getpeerinfo", &getpeerinfo, true, false },
+ { "addnode", &addnode, true, true },
+ { "getaddednodeinfo", &getaddednodeinfo, true, true },
+ { "getdifficulty", &getdifficulty, true, false },
+ { "getgenerate", &getgenerate, true, false },
+ { "setgenerate", &setgenerate, true, false },
+ { "gethashespersec", &gethashespersec, true, false },
+ { "getinfo", &getinfo, true, false },
+ { "getmininginfo", &getmininginfo, true, false },
+ { "getnewaddress", &getnewaddress, true, false },
+ { "getaccountaddress", &getaccountaddress, true, false },
+ { "setaccount", &setaccount, true, false },
+ { "getaccount", &getaccount, false, false },
+ { "getaddressesbyaccount", &getaddressesbyaccount, true, false },
+ { "sendtoaddress", &sendtoaddress, false, false },
+ { "getreceivedbyaddress", &getreceivedbyaddress, false, false },
+ { "getreceivedbyaccount", &getreceivedbyaccount, false, false },
+ { "listreceivedbyaddress", &listreceivedbyaddress, false, false },
+ { "listreceivedbyaccount", &listreceivedbyaccount, false, false },
+ { "backupwallet", &backupwallet, true, false },
+ { "keypoolrefill", &keypoolrefill, true, false },
+ { "walletpassphrase", &walletpassphrase, true, false },
+ { "walletpassphrasechange", &walletpassphrasechange, false, false },
+ { "walletlock", &walletlock, true, false },
+ { "encryptwallet", &encryptwallet, false, false },
+ { "validateaddress", &validateaddress, true, false },
+ { "getbalance", &getbalance, false, false },
+ { "move", &movecmd, false, false },
+ { "sendfrom", &sendfrom, false, false },
+ { "sendmany", &sendmany, false, false },
+ { "addmultisigaddress", &addmultisigaddress, false, false },
+ { "createmultisig", &createmultisig, true, true },
+ { "getrawmempool", &getrawmempool, true, false },
+ { "getblock", &getblock, false, false },
+ { "getblockhash", &getblockhash, false, false },
+ { "gettransaction", &gettransaction, false, false },
+ { "listtransactions", &listtransactions, false, false },
+ { "listaddressgroupings", &listaddressgroupings, false, false },
+ { "signmessage", &signmessage, false, false },
+ { "verifymessage", &verifymessage, false, false },
+ { "getwork", &getwork, true, false },
+ { "listaccounts", &listaccounts, false, false },
+ { "settxfee", &settxfee, false, false },
+ { "getblocktemplate", &getblocktemplate, true, false },
+ { "submitblock", &submitblock, false, false },
+ { "listsinceblock", &listsinceblock, false, false },
+ { "dumpprivkey", &dumpprivkey, true, false },
+ { "importprivkey", &importprivkey, false, false },
+ { "listunspent", &listunspent, false, false },
+ { "getrawtransaction", &getrawtransaction, false, false },
+ { "createrawtransaction", &createrawtransaction, false, false },
+ { "decoderawtransaction", &decoderawtransaction, false, false },
+ { "signrawtransaction", &signrawtransaction, false, false },
+ { "sendrawtransaction", &sendrawtransaction, false, false },
+ { "gettxoutsetinfo", &gettxoutsetinfo, true, false },
+ { "gettxout", &gettxout, true, false },
+ { "lockunspent", &lockunspent, false, false },
+ { "listlockunspent", &listlockunspent, false, false },
};
CRPCTable::CRPCTable()
@@ -650,26 +649,7 @@ private:
iostreams::stream< SSLIOStreamDevice<Protocol> > _stream;
};
-void ThreadRPCServer(void* parg)
-{
- // Make this thread recognisable as the RPC listener
- RenameThread("bitcoin-rpclist");
-
- try
- {
- vnThreadsRunning[THREAD_RPCLISTENER]++;
- ThreadRPCServer2(parg);
- vnThreadsRunning[THREAD_RPCLISTENER]--;
- }
- catch (std::exception& e) {
- vnThreadsRunning[THREAD_RPCLISTENER]--;
- PrintException(&e, "ThreadRPCServer()");
- } catch (...) {
- vnThreadsRunning[THREAD_RPCLISTENER]--;
- PrintException(NULL, "ThreadRPCServer()");
- }
- printf("ThreadRPCServer exited\n");
-}
+void ServiceConnection(AcceptedConnection *conn);
// Forward declaration required for RPCListen
template <typename Protocol, typename SocketAcceptorService>
@@ -711,11 +691,8 @@ static void RPCAcceptHandler(boost::shared_ptr< basic_socket_acceptor<Protocol,
AcceptedConnection* conn,
const boost::system::error_code& error)
{
- vnThreadsRunning[THREAD_RPCLISTENER]++;
-
// Immediately start accepting new connections, except when we're cancelled or our socket is closed.
- if (error != asio::error::operation_aborted
- && acceptor->is_open())
+ if (error != asio::error::operation_aborted && acceptor->is_open())
RPCListen(acceptor, context, fUseSSL);
AcceptedConnectionImpl<ip::tcp>* tcp_conn = dynamic_cast< AcceptedConnectionImpl<ip::tcp>* >(conn);
@@ -729,28 +706,22 @@ static void RPCAcceptHandler(boost::shared_ptr< basic_socket_acceptor<Protocol,
// Restrict callers by IP. It is important to
// do this before starting client thread, to filter out
// certain DoS and misbehaving clients.
- else if (tcp_conn
- && !ClientAllowed(tcp_conn->peer.address()))
+ else if (tcp_conn && !ClientAllowed(tcp_conn->peer.address()))
{
// Only send a 403 if we're not using SSL to prevent a DoS during the SSL handshake.
if (!fUseSSL)
conn->stream() << HTTPReply(HTTP_FORBIDDEN, "", false) << std::flush;
delete conn;
}
-
- // start HTTP client thread
- else if (!NewThread(ThreadRPCServer3, conn)) {
- printf("Failed to create RPC server client thread\n");
+ else {
+ ServiceConnection(conn);
+ conn->close();
delete conn;
}
-
- vnThreadsRunning[THREAD_RPCLISTENER]--;
}
-void ThreadRPCServer2(void* parg)
+void StartRPCThreads()
{
- printf("ThreadRPCServer started\n");
-
strRPCUserColonPass = mapArgs["-rpcuser"] + ":" + mapArgs["-rpcpassword"];
if ((mapArgs["-rpcpassword"] == "") ||
(mapArgs["-rpcuser"] == mapArgs["-rpcpassword"]))
@@ -763,13 +734,16 @@ void ThreadRPCServer2(void* parg)
else if (mapArgs.count("-daemon"))
strWhatAmI = strprintf(_("To use the %s option"), "\"-daemon\"");
uiInterface.ThreadSafeMessageBox(strprintf(
- _("%s, you must set a rpcpassword in the configuration file:\n %s\n"
+ _("%s, you must set a rpcpassword in the configuration file:\n"
+ "%s\n"
"It is recommended you use the following random password:\n"
"rpcuser=bitcoinrpc\n"
"rpcpassword=%s\n"
"(you do not need to remember this password)\n"
"The username and password MUST NOT be the same.\n"
- "If the file does not exist, create it with owner-readable-only file permissions.\n"),
+ "If the file does not exist, create it with owner-readable-only file permissions.\n"
+ "It is also recommended to set alertnotify so you are notified of problems;\n"
+ "for example: alertnotify=echo %%s | mail -s \"Bitcoin Alert\" admin@foo.com\n"),
strWhatAmI.c_str(),
GetConfigFile().string().c_str(),
EncodeBase58(&rand_pwd[0],&rand_pwd[0]+32).c_str()),
@@ -778,27 +752,28 @@ void ThreadRPCServer2(void* parg)
return;
}
- const bool fUseSSL = GetBoolArg("-rpcssl");
+ assert(rpc_io_service == NULL);
+ rpc_io_service = new asio::io_service();
+ rpc_ssl_context = new ssl::context(*rpc_io_service, ssl::context::sslv23);
- asio::io_service io_service;
+ const bool fUseSSL = GetBoolArg("-rpcssl");
- ssl::context context(io_service, ssl::context::sslv23);
if (fUseSSL)
{
- context.set_options(ssl::context::no_sslv2);
+ rpc_ssl_context->set_options(ssl::context::no_sslv2);
filesystem::path pathCertFile(GetArg("-rpcsslcertificatechainfile", "server.cert"));
if (!pathCertFile.is_complete()) pathCertFile = filesystem::path(GetDataDir()) / pathCertFile;
- if (filesystem::exists(pathCertFile)) context.use_certificate_chain_file(pathCertFile.string());
+ if (filesystem::exists(pathCertFile)) rpc_ssl_context->use_certificate_chain_file(pathCertFile.string());
else printf("ThreadRPCServer ERROR: missing server certificate file %s\n", pathCertFile.string().c_str());
filesystem::path pathPKFile(GetArg("-rpcsslprivatekeyfile", "server.pem"));
if (!pathPKFile.is_complete()) pathPKFile = filesystem::path(GetDataDir()) / pathPKFile;
- if (filesystem::exists(pathPKFile)) context.use_private_key_file(pathPKFile.string(), ssl::context::pem);
+ if (filesystem::exists(pathPKFile)) rpc_ssl_context->use_private_key_file(pathPKFile.string(), ssl::context::pem);
else printf("ThreadRPCServer ERROR: missing server private key file %s\n", pathPKFile.string().c_str());
string strCiphers = GetArg("-rpcsslciphers", "TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH");
- SSL_CTX_set_cipher_list(context.impl(), strCiphers.c_str());
+ SSL_CTX_set_cipher_list(rpc_ssl_context->impl(), strCiphers.c_str());
}
// Try a dual IPv6/IPv4 socket, falling back to separate IPv4 and IPv6 sockets
@@ -806,9 +781,7 @@ void ThreadRPCServer2(void* parg)
asio::ip::address bindAddress = loopback ? asio::ip::address_v6::loopback() : asio::ip::address_v6::any();
ip::tcp::endpoint endpoint(bindAddress, GetArg("-rpcport", GetDefaultRPCPort()));
boost::system::error_code v6_only_error;
- boost::shared_ptr<ip::tcp::acceptor> acceptor(new ip::tcp::acceptor(io_service));
-
- boost::signals2::signal<void ()> StopRequests;
+ boost::shared_ptr<ip::tcp::acceptor> acceptor(new ip::tcp::acceptor(*rpc_io_service));
bool fListening = false;
std::string strerr;
@@ -823,11 +796,7 @@ void ThreadRPCServer2(void* parg)
acceptor->bind(endpoint);
acceptor->listen(socket_base::max_connections);
- RPCListen(acceptor, context, fUseSSL);
- // Cancel outstanding listen-requests for this acceptor when shutting down
- StopRequests.connect(signals2::slot<void ()>(
- static_cast<void (ip::tcp::acceptor::*)()>(&ip::tcp::acceptor::close), acceptor.get())
- .track(acceptor));
+ RPCListen(acceptor, *rpc_ssl_context, fUseSSL);
fListening = true;
}
@@ -843,17 +812,13 @@ void ThreadRPCServer2(void* parg)
bindAddress = loopback ? asio::ip::address_v4::loopback() : asio::ip::address_v4::any();
endpoint.address(bindAddress);
- acceptor.reset(new ip::tcp::acceptor(io_service));
+ acceptor.reset(new ip::tcp::acceptor(*rpc_io_service));
acceptor->open(endpoint.protocol());
acceptor->set_option(boost::asio::ip::tcp::acceptor::reuse_address(true));
acceptor->bind(endpoint);
acceptor->listen(socket_base::max_connections);
- RPCListen(acceptor, context, fUseSSL);
- // Cancel outstanding listen-requests for this acceptor when shutting down
- StopRequests.connect(signals2::slot<void ()>(
- static_cast<void (ip::tcp::acceptor::*)()>(&ip::tcp::acceptor::close), acceptor.get())
- .track(acceptor));
+ RPCListen(acceptor, *rpc_ssl_context, fUseSSL);
fListening = true;
}
@@ -869,11 +834,20 @@ void ThreadRPCServer2(void* parg)
return;
}
- vnThreadsRunning[THREAD_RPCLISTENER]--;
- while (!fShutdown)
- io_service.run_one();
- vnThreadsRunning[THREAD_RPCLISTENER]++;
- StopRequests();
+ rpc_worker_group = new boost::thread_group();
+ for (int i = 0; i < GetArg("-rpcthreads", 4); i++)
+ rpc_worker_group->create_thread(boost::bind(&asio::io_service::run, rpc_io_service));
+}
+
+void StopRPCThreads()
+{
+ if (rpc_io_service == NULL) return;
+
+ rpc_io_service->stop();
+ rpc_worker_group->join_all();
+ delete rpc_worker_group; rpc_worker_group = NULL;
+ delete rpc_ssl_context; rpc_ssl_context = NULL;
+ delete rpc_io_service; rpc_io_service = NULL;
}
class JSONRequest
@@ -950,32 +924,11 @@ static string JSONRPCExecBatch(const Array& vReq)
return write_string(Value(ret), false) + "\n";
}
-static CCriticalSection cs_THREAD_RPCHANDLER;
-
-void ThreadRPCServer3(void* parg)
+void ServiceConnection(AcceptedConnection *conn)
{
- // Make this thread recognisable as the RPC handler
- RenameThread("bitcoin-rpchand");
-
- {
- LOCK(cs_THREAD_RPCHANDLER);
- vnThreadsRunning[THREAD_RPCHANDLER]++;
- }
- AcceptedConnection *conn = (AcceptedConnection *) parg;
-
bool fRun = true;
- loop {
- if (fShutdown || !fRun)
- {
- conn->close();
- delete conn;
- {
- LOCK(cs_THREAD_RPCHANDLER);
- --vnThreadsRunning[THREAD_RPCHANDLER];
- }
- return;
- }
-
+ while (fRun)
+ {
int nProto = 0;
map<string, string> mapHeaders;
string strRequest, strMethod, strURI;
@@ -1000,7 +953,7 @@ void ThreadRPCServer3(void* parg)
If this results in a DOS the user really
shouldn't have their RPC port exposed.*/
if (mapArgs["-rpcpassword"].size() < 20)
- Sleep(250);
+ MilliSleep(250);
conn->stream() << HTTPReply(HTTP_UNAUTHORIZED, "", false) << std::flush;
break;
@@ -1046,12 +999,6 @@ void ThreadRPCServer3(void* parg)
break;
}
}
-
- delete conn;
- {
- LOCK(cs_THREAD_RPCHANDLER);
- vnThreadsRunning[THREAD_RPCHANDLER]--;
- }
}
json_spirit::Value CRPCTable::execute(const std::string &strMethod, const json_spirit::Array &params) const
@@ -1072,7 +1019,7 @@ json_spirit::Value CRPCTable::execute(const std::string &strMethod, const json_s
// Execute
Value result;
{
- if (pcmd->unlocked)
+ if (pcmd->threadSafe)
result = pcmd->actor(params, false);
else {
LOCK2(cs_main, pwalletMain->cs_wallet);
@@ -1274,13 +1221,14 @@ int CommandLineRPC(int argc, char *argv[])
strPrint = write_string(result, true);
}
}
- catch (std::exception& e)
- {
+ catch (boost::thread_interrupted) {
+ throw;
+ }
+ catch (std::exception& e) {
strPrint = string("error: ") + e.what();
nRet = 87;
}
- catch (...)
- {
+ catch (...) {
PrintException(NULL, "CommandLineRPC()");
}
@@ -1318,6 +1266,9 @@ int main(int argc, char *argv[])
return CommandLineRPC(argc, argv);
}
}
+ catch (boost::thread_interrupted) {
+ throw;
+ }
catch (std::exception& e) {
PrintException(&e, "main()");
} catch (...) {
diff --git a/src/bitcoinrpc.h b/src/bitcoinrpc.h
index 36bfbe3eef..315fd92383 100644
--- a/src/bitcoinrpc.h
+++ b/src/bitcoinrpc.h
@@ -67,7 +67,8 @@ enum RPCErrorCode
json_spirit::Object JSONRPCError(int code, const std::string& message);
-void ThreadRPCServer(void* parg);
+void StartRPCThreads();
+void StopRPCThreads();
int CommandLineRPC(int argc, char *argv[]);
/** Convert parameter values for RPC call from strings to command-specific JSON objects. */
@@ -95,7 +96,7 @@ public:
std::string name;
rpcfn_type actor;
bool okSafeMode;
- bool unlocked;
+ bool threadSafe;
};
/**
diff --git a/src/bloom.cpp b/src/bloom.cpp
index 36f5e50134..d9ec2efa81 100644
--- a/src/bloom.cpp
+++ b/src/bloom.cpp
@@ -37,6 +37,8 @@ inline unsigned int CBloomFilter::Hash(unsigned int nHashNum, const std::vector<
void CBloomFilter::insert(const vector<unsigned char>& vKey)
{
+ if (vData.size() == 1 && vData[0] == 0xff)
+ return;
for (unsigned int i = 0; i < nHashFuncs; i++)
{
unsigned int nIndex = Hash(i, vKey);
@@ -61,6 +63,8 @@ void CBloomFilter::insert(const uint256& hash)
bool CBloomFilter::contains(const vector<unsigned char>& vKey) const
{
+ if (vData.size() == 1 && vData[0] == 0xff)
+ return true;
for (unsigned int i = 0; i < nHashFuncs; i++)
{
unsigned int nIndex = Hash(i, vKey);
diff --git a/src/checkpoints.cpp b/src/checkpoints.cpp
index e2c420edd7..9e8e0f7024 100644
--- a/src/checkpoints.cpp
+++ b/src/checkpoints.cpp
@@ -14,13 +14,25 @@ namespace Checkpoints
{
typedef std::map<int, uint256> MapCheckpoints;
- //
+ // How many times we expect transactions after the last checkpoint to
+ // be slower. This number is a compromise, as it can't be accurate for
+ // every system. When reindexing from a fast disk with a slow CPU, it
+ // can be up to 20, while when downloading from a slow network with a
+ // fast multicore CPU, it won't be much higher than 1.
+ static const double fSigcheckVerificationFactor = 5.0;
+
+ struct CCheckpointData {
+ const MapCheckpoints *mapCheckpoints;
+ int64 nTimeLastCheckpoint;
+ int64 nTransactionsLastCheckpoint;
+ double fTransactionsPerDay;
+ };
+
// What makes a good checkpoint block?
// + Is surrounded by blocks with reasonable timestamps
// (no blocks before with a timestamp after, none after with
// timestamp before)
// + Contains no strange transactions
- //
static MapCheckpoints mapCheckpoints =
boost::assign::map_list_of
( 11111, uint256("0x0000000069e244f73d78e8fd29ba2fd2ed618bd6fa2ee92559f542fdb26e7c1d"))
@@ -32,31 +44,83 @@ namespace Checkpoints
(193000, uint256("0x000000000000059f452a5f7340de6682a977387c17010ff6e6c3bd83ca8b1317"))
(210000, uint256("0x000000000000048b95347e83192f69cf0366076336c639f9b7228e9ba171342e"))
(216116, uint256("0x00000000000001b4f4b433e81ee46494af945cf96014816a4e2370f11b23df4e"))
+ (225430, uint256("0x00000000000001c108384350f74090433e7fcf79a606b8e797f065b130575932"))
;
+ static const CCheckpointData data = {
+ &mapCheckpoints,
+ 1363044259, // * UNIX timestamp of last checkpoint block
+ 14264869, // * total number of transactions between genesis and last checkpoint
+ // (the tx=... number in the SetBestChain debug.log lines)
+ 60000.0 // * estimated number of transactions per day after checkpoint
+ };
- static MapCheckpoints mapCheckpointsTestnet =
+ static MapCheckpoints mapCheckpointsTestnet =
boost::assign::map_list_of
( 546, uint256("000000002a936ca763904c3c35fce2f3556c559c0214345d31b1bcebf76acb70"))
;
+ static const CCheckpointData dataTestnet = {
+ &mapCheckpointsTestnet,
+ 1338180505,
+ 16341,
+ 300
+ };
+
+ const CCheckpointData &Checkpoints() {
+ if (fTestNet)
+ return dataTestnet;
+ else
+ return data;
+ }
bool CheckBlock(int nHeight, const uint256& hash)
{
if (!GetBoolArg("-checkpoints", true))
return true;
- MapCheckpoints& checkpoints = (fTestNet ? mapCheckpointsTestnet : mapCheckpoints);
+ const MapCheckpoints& checkpoints = *Checkpoints().mapCheckpoints;
MapCheckpoints::const_iterator i = checkpoints.find(nHeight);
if (i == checkpoints.end()) return true;
return hash == i->second;
}
+ // Guess how far we are in the verification process at the given block index
+ double GuessVerificationProgress(CBlockIndex *pindex) {
+ if (pindex==NULL)
+ return 0.0;
+
+ int64 nNow = time(NULL);
+
+ double fWorkBefore = 0.0; // Amount of work done before pindex
+ double fWorkAfter = 0.0; // Amount of work left after pindex (estimated)
+ // Work is defined as: 1.0 per transaction before the last checkoint, and
+ // fSigcheckVerificationFactor per transaction after.
+
+ const CCheckpointData &data = Checkpoints();
+
+ if (pindex->nChainTx <= data.nTransactionsLastCheckpoint) {
+ double nCheapBefore = pindex->nChainTx;
+ double nCheapAfter = data.nTransactionsLastCheckpoint - pindex->nChainTx;
+ double nExpensiveAfter = (nNow - data.nTimeLastCheckpoint)/86400.0*data.fTransactionsPerDay;
+ fWorkBefore = nCheapBefore;
+ fWorkAfter = nCheapAfter + nExpensiveAfter*fSigcheckVerificationFactor;
+ } else {
+ double nCheapBefore = data.nTransactionsLastCheckpoint;
+ double nExpensiveBefore = pindex->nChainTx - data.nTransactionsLastCheckpoint;
+ double nExpensiveAfter = (nNow - pindex->nTime)/86400.0*data.fTransactionsPerDay;
+ fWorkBefore = nCheapBefore + nExpensiveBefore*fSigcheckVerificationFactor;
+ fWorkAfter = nExpensiveAfter*fSigcheckVerificationFactor;
+ }
+
+ return fWorkBefore / (fWorkBefore + fWorkAfter);
+ }
+
int GetTotalBlocksEstimate()
{
if (!GetBoolArg("-checkpoints", true))
return 0;
- MapCheckpoints& checkpoints = (fTestNet ? mapCheckpointsTestnet : mapCheckpoints);
+ const MapCheckpoints& checkpoints = *Checkpoints().mapCheckpoints;
return checkpoints.rbegin()->first;
}
@@ -66,7 +130,7 @@ namespace Checkpoints
if (!GetBoolArg("-checkpoints", true))
return NULL;
- MapCheckpoints& checkpoints = (fTestNet ? mapCheckpointsTestnet : mapCheckpoints);
+ const MapCheckpoints& checkpoints = *Checkpoints().mapCheckpoints;
BOOST_REVERSE_FOREACH(const MapCheckpoints::value_type& i, checkpoints)
{
diff --git a/src/checkpoints.h b/src/checkpoints.h
index 70e936564c..3d56885556 100644
--- a/src/checkpoints.h
+++ b/src/checkpoints.h
@@ -2,7 +2,7 @@
// Distributed under the MIT/X11 software license, see the accompanying
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
#ifndef BITCOIN_CHECKPOINT_H
-#define BITCOIN_CHECKPOINT_H
+#define BITCOIN_CHECKPOINT_H
#include <map>
@@ -22,6 +22,8 @@ namespace Checkpoints
// Returns last CBlockIndex* in mapBlockIndex that is a checkpoint
CBlockIndex* GetLastCheckpoint(const std::map<uint256, CBlockIndex*>& mapBlockIndex);
+
+ double GuessVerificationProgress(CBlockIndex *pindex);
}
#endif
diff --git a/src/checkqueue.h b/src/checkqueue.h
index 12dde36fe7..eba424fbaa 100644
--- a/src/checkqueue.h
+++ b/src/checkqueue.h
@@ -33,9 +33,6 @@ private:
// Master thread blocks on this when out of work
boost::condition_variable condMaster;
- // Quit method blocks on this until all workers are gone
- boost::condition_variable condQuit;
-
// The queue of elements to be processed.
// As the order of booleans doesn't matter, it is used as a LIFO (stack)
std::vector<T> queue;
@@ -85,8 +82,6 @@ private:
while (queue.empty()) {
if ((fMaster || fQuit) && nTodo == 0) {
nTotal--;
- if (nTotal==0)
- condQuit.notify_one();
bool fRet = fAllOk;
// reset the status for new work later
if (fMaster)
@@ -151,20 +146,7 @@ public:
condWorker.notify_all();
}
- // Shut the queue down
- void Quit() {
- boost::unique_lock<boost::mutex> lock(mutex);
- fQuit = true;
- // No need to wake the master, as he will quit automatically when all jobs are
- // done.
- condWorker.notify_all();
-
- while (nTotal > 0)
- condQuit.wait(lock);
- }
-
~CCheckQueue() {
- Quit();
}
friend class CCheckQueueControl<T>;
diff --git a/src/db.cpp b/src/db.cpp
index 94629f3cad..35d6cca890 100644
--- a/src/db.cpp
+++ b/src/db.cpp
@@ -62,8 +62,7 @@ bool CDBEnv::Open(const boost::filesystem::path& path)
if (fDbEnvInit)
return true;
- if (fShutdown)
- return false;
+ boost::this_thread::interruption_point();
strPath = path.string();
filesystem::path pathLogDir = path / "database";
@@ -75,11 +74,10 @@ bool CDBEnv::Open(const boost::filesystem::path& path)
if (GetBoolArg("-privdb", true))
nEnvFlags |= DB_PRIVATE;
- unsigned int nDbCache = GetArg("-dbcache", 25);
dbenv.set_lg_dir(pathLogDir.string().c_str());
- dbenv.set_cachesize(nDbCache / 1024, (nDbCache % 1024)*1048576, 1);
- dbenv.set_lg_bsize(1048576);
- dbenv.set_lg_max(10485760);
+ dbenv.set_cachesize(0, 0x100000, 1); // 1 MiB should be enough for just the wallet
+ dbenv.set_lg_bsize(0x10000);
+ dbenv.set_lg_max(1048576);
dbenv.set_lk_max_locks(40000);
dbenv.set_lk_max_objects(40000);
dbenv.set_errfile(fopen(pathErrorFile.string().c_str(), "a")); /// debug
@@ -109,8 +107,7 @@ void CDBEnv::MakeMock()
if (fDbEnvInit)
throw runtime_error("CDBEnv::MakeMock(): already initialized");
- if (fShutdown)
- throw runtime_error("CDBEnv::MakeMock(): during shutdown");
+ boost::this_thread::interruption_point();
printf("CDBEnv::MakeMock()\n");
@@ -328,7 +325,7 @@ bool CDBEnv::RemoveDb(const string& strFile)
bool CDB::Rewrite(const string& strFile, const char* pszSkip)
{
- while (!fShutdown)
+ while (true)
{
{
LOCK(bitdb.cs_db);
@@ -414,7 +411,7 @@ bool CDB::Rewrite(const string& strFile, const char* pszSkip)
return fSuccess;
}
}
- Sleep(100);
+ MilliSleep(100);
}
return false;
}
diff --git a/src/db.h b/src/db.h
index 9c01060a1c..206da91e9e 100644
--- a/src/db.h
+++ b/src/db.h
@@ -24,7 +24,7 @@ class CWalletTx;
extern unsigned int nWalletDBUpdated;
-void ThreadFlushWalletDB(void* parg);
+void ThreadFlushWalletDB(const std::string& strWalletFile);
bool BackupWallet(const CWallet& wallet, const std::string& strDest);
diff --git a/src/init.cpp b/src/init.cpp
index 99e89d9edc..66272e8421 100644
--- a/src/init.cpp
+++ b/src/init.cpp
@@ -40,85 +40,82 @@ enum BindFlags {
// Shutdown
//
-void ExitTimeout(void* parg)
-{
-#ifdef WIN32
- Sleep(5000);
- ExitProcess(0);
-#endif
-}
+//
+// Thread management and startup/shutdown:
+//
+// The network-processing threads are all part of a thread group
+// created by AppInit() or the Qt main() function.
+//
+// A clean exit happens when StartShutdown() or the SIGTERM
+// signal handler sets fRequestShutdown, which triggers
+// the DetectShutdownThread(), which interrupts the main thread group.
+// DetectShutdownThread() then exits, which causes AppInit() to
+// continue (it .joins the shutdown thread).
+// Shutdown() is then
+// called to clean up database connections, and stop other
+// threads that should only be stopped after the main network-processing
+// threads have exited.
+//
+// Note that if running -daemon the parent process returns from AppInit2
+// before adding any threads to the threadGroup, so .join_all() returns
+// immediately and the parent exits from main().
+//
+// Shutdown for Qt is very similar, only it uses a QTimer to detect
+// fRequestShutdown getting set, and then does the normal Qt
+// shutdown thing.
+//
+
+volatile bool fRequestShutdown = false;
void StartShutdown()
{
-#ifdef QT_GUI
- // ensure we leave the Qt main loop for a clean GUI exit (Shutdown() is called in bitcoin.cpp afterwards)
- uiInterface.QueueShutdown();
-#else
- // Without UI, Shutdown() can simply be started in a new thread
- NewThread(Shutdown, NULL);
-#endif
+ fRequestShutdown = true;
+}
+bool ShutdownRequested()
+{
+ return fRequestShutdown;
}
static CCoinsViewDB *pcoinsdbview;
-void Shutdown(void* parg)
+void Shutdown()
{
static CCriticalSection cs_Shutdown;
- static bool fTaken;
+ TRY_LOCK(cs_Shutdown, lockShutdown);
+ if (!lockShutdown) return;
- // Make this thread recognisable as the shutdown thread
RenameThread("bitcoin-shutoff");
-
- bool fFirstThread = false;
- {
- TRY_LOCK(cs_Shutdown, lockShutdown);
- if (lockShutdown)
- {
- fFirstThread = !fTaken;
- fTaken = true;
- }
- }
- static bool fExit;
- if (fFirstThread)
+ nTransactionsUpdated++;
+ StopRPCThreads();
+ bitdb.Flush(false);
+ StopNode();
{
- fShutdown = true;
- fRequestShutdown = true;
- nTransactionsUpdated++;
- bitdb.Flush(false);
- {
- LOCK(cs_main);
- ThreadScriptCheckQuit();
- }
- StopNode();
- {
- LOCK(cs_main);
- if (pblocktree)
- pblocktree->Flush();
- if (pcoinsTip)
- pcoinsTip->Flush();
- delete pcoinsTip;
- delete pcoinsdbview;
- delete pblocktree;
- }
- bitdb.Flush(true);
- boost::filesystem::remove(GetPidFile());
- UnregisterWallet(pwalletMain);
- delete pwalletMain;
- NewThread(ExitTimeout, NULL);
- Sleep(50);
- printf("Bitcoin exited\n\n");
- fExit = true;
-#ifndef QT_GUI
- // ensure non-UI client gets exited here, but let Bitcoin-Qt reach 'return 0;' in bitcoin.cpp
- exit(0);
-#endif
+ LOCK(cs_main);
+ if (pblocktree)
+ pblocktree->Flush();
+ if (pcoinsTip)
+ pcoinsTip->Flush();
+ delete pcoinsTip; pcoinsTip = NULL;
+ delete pcoinsdbview; pcoinsdbview = NULL;
+ delete pblocktree; pblocktree = NULL;
}
- else
+ bitdb.Flush(true);
+ boost::filesystem::remove(GetPidFile());
+ UnregisterWallet(pwalletMain);
+ delete pwalletMain;
+}
+
+//
+// Signal handlers are very limited in what they are allowed to do, so:
+//
+void DetectShutdownThread(boost::thread_group* threadGroup)
+{
+ // Tell the main threads to shutdown.
+ while (!fRequestShutdown)
{
- while (!fExit)
- Sleep(500);
- Sleep(100);
- ExitThread(0);
+ MilliSleep(200);
+ if (fRequestShutdown)
+ threadGroup->interrupt_all();
}
}
@@ -143,6 +140,9 @@ void HandleSIGHUP(int)
#if !defined(QT_GUI)
bool AppInit(int argc, char* argv[])
{
+ boost::thread_group threadGroup;
+ boost::thread* detectShutdownThread = NULL;
+
bool fRet = false;
try
{
@@ -154,7 +154,7 @@ bool AppInit(int argc, char* argv[])
if (!boost::filesystem::is_directory(GetDataDir(false)))
{
fprintf(stderr, "Error: Specified directory does not exist\n");
- Shutdown(NULL);
+ Shutdown();
}
ReadConfigFile(mapArgs, mapMultiArgs);
@@ -184,16 +184,52 @@ bool AppInit(int argc, char* argv[])
int ret = CommandLineRPC(argc, argv);
exit(ret);
}
+#if !defined(WIN32)
+ fDaemon = GetBoolArg("-daemon");
+ if (fDaemon)
+ {
+ // Daemonize
+ pid_t pid = fork();
+ if (pid < 0)
+ {
+ fprintf(stderr, "Error: fork() returned %d errno %d\n", pid, errno);
+ return false;
+ }
+ if (pid > 0) // Parent process, pid is child process id
+ {
+ CreatePidFile(GetPidFile(), pid);
+ return true;
+ }
+ // Child process falls through to rest of initialization
+
+ pid_t sid = setsid();
+ if (sid < 0)
+ fprintf(stderr, "Error: setsid() returned %d errno %d\n", sid, errno);
+ }
+#endif
- fRet = AppInit2();
+ detectShutdownThread = new boost::thread(boost::bind(&DetectShutdownThread, &threadGroup));
+ fRet = AppInit2(threadGroup);
}
catch (std::exception& e) {
PrintExceptionContinue(&e, "AppInit()");
} catch (...) {
PrintExceptionContinue(NULL, "AppInit()");
}
- if (!fRet)
- Shutdown(NULL);
+ if (!fRet) {
+ if (detectShutdownThread)
+ detectShutdownThread->interrupt();
+ threadGroup.interrupt_all();
+ }
+
+ if (detectShutdownThread)
+ {
+ detectShutdownThread->join();
+ delete detectShutdownThread;
+ detectShutdownThread = NULL;
+ }
+ Shutdown();
+
return fRet;
}
@@ -210,7 +246,7 @@ int main(int argc, char* argv[])
if (fRet && fDaemon)
return 0;
- return 1;
+ return (fRet ? 0 : 1);
}
#endif
@@ -262,7 +298,6 @@ std::string HelpMessage()
" -externalip=<ip> " + _("Specify your own public address") + "\n" +
" -onlynet=<net> " + _("Only connect to nodes in network <net> (IPv4, IPv6 or Tor)") + "\n" +
" -discover " + _("Discover own IP address (default: 1 when listening and no -externalip)") + "\n" +
- " -irc " + _("Find peers using internet relay chat (default: 0)") + "\n" +
" -checkpoints " + _("Only accept block chain matching built-in checkpoints (default: 1)") + "\n" +
" -listen " + _("Accept connections from outside (default: 1 if no -proxy or -connect)") + "\n" +
" -bind=<addr> " + _("Bind to given address and always listen on it. Use [host]:port notation for IPv6") + "\n" +
@@ -299,7 +334,10 @@ std::string HelpMessage()
" -rpcport=<port> " + _("Listen for JSON-RPC connections on <port> (default: 8332 or testnet: 18332)") + "\n" +
" -rpcallowip=<ip> " + _("Allow JSON-RPC connections from specified IP address") + "\n" +
" -rpcconnect=<ip> " + _("Send commands to node running on <ip> (default: 127.0.0.1)") + "\n" +
+ " -rpcthreads=<n> " + _("Use this many threads to service RPC calls (default: 4)") + "\n" +
" -blocknotify=<cmd> " + _("Execute command when the best block changes (%s in cmd is replaced by block hash)") + "\n" +
+ " -walletnotify=<cmd> " + _("Execute command when a wallet transaction changes (%s in cmd is replaced by TxID)") + "\n" +
+ " -alertnotify=<cmd> " + _("Execute command when a relevant alert is received (%s in cmd is replaced by message)") + "\n" +
" -upgradewallet " + _("Upgrade wallet to latest format") + "\n" +
" -keypool=<n> " + _("Set key pool size to <n> (default: 100)") + "\n" +
" -rescan " + _("Rescan the block chain for missing wallet transactions") + "\n" +
@@ -308,7 +346,7 @@ std::string HelpMessage()
" -checklevel=<n> " + _("How thorough the block verification is (0-4, default: 3)") + "\n" +
" -txindex " + _("Maintain a full transaction index (default: 0)") + "\n" +
" -loadblock=<file> " + _("Imports blocks from external blk000??.dat file") + "\n" +
- " -reindex " + _("Rebuild blockchain index from current blk000??.dat files") + "\n" +
+ " -reindex " + _("Rebuild block chain index from current blk000??.dat files") + "\n" +
" -par=N " + _("Set the number of script verification threads (1-16, 0=auto, default: 0)") + "\n" +
"\n" + _("Block creation options:") + "\n" +
@@ -338,22 +376,15 @@ struct CImportingNow
}
};
-struct CImportData {
- std::vector<boost::filesystem::path> vFiles;
-};
-
-void ThreadImport(void *data) {
- CImportData *import = reinterpret_cast<CImportData*>(data);
-
+void ThreadImport(std::vector<boost::filesystem::path> vImportFiles)
+{
RenameThread("bitcoin-loadblk");
- vnThreadsRunning[THREAD_IMPORT]++;
-
// -reindex
if (fReindex) {
CImportingNow imp;
int nFile = 0;
- while (!fRequestShutdown) {
+ while (true) {
CDiskBlockPos pos(nFile, 0);
FILE *file = OpenBlockFile(pos, true);
if (!file)
@@ -362,18 +393,16 @@ void ThreadImport(void *data) {
LoadExternalBlockFile(file, &pos);
nFile++;
}
- if (!fRequestShutdown) {
- pblocktree->WriteReindexing(false);
- fReindex = false;
- printf("Reindexing finished\n");
- // To avoid ending up in a situation without genesis block, re-try initializing (no-op if reindexing worked):
- InitBlockIndex();
- }
+ pblocktree->WriteReindexing(false);
+ fReindex = false;
+ printf("Reindexing finished\n");
+ // To avoid ending up in a situation without genesis block, re-try initializing (no-op if reindexing worked):
+ InitBlockIndex();
}
// hardcoded $DATADIR/bootstrap.dat
filesystem::path pathBootstrap = GetDataDir() / "bootstrap.dat";
- if (filesystem::exists(pathBootstrap) && !fRequestShutdown) {
+ if (filesystem::exists(pathBootstrap)) {
FILE *file = fopen(pathBootstrap.string().c_str(), "rb");
if (file) {
CImportingNow imp;
@@ -385,9 +414,7 @@ void ThreadImport(void *data) {
}
// -loadblock=
- BOOST_FOREACH(boost::filesystem::path &path, import->vFiles) {
- if (fRequestShutdown)
- break;
+ BOOST_FOREACH(boost::filesystem::path &path, vImportFiles) {
FILE *file = fopen(path.string().c_str(), "rb");
if (file) {
CImportingNow imp;
@@ -395,16 +422,12 @@ void ThreadImport(void *data) {
LoadExternalBlockFile(file);
}
}
-
- delete import;
-
- vnThreadsRunning[THREAD_IMPORT]--;
}
/** Initialize bitcoin.
* @pre Parameters should be parsed and config file should be read.
*/
-bool AppInit2()
+bool AppInit2(boost::thread_group& threadGroup)
{
// ********************************************************* Step 1: setup
#ifdef _MSC_VER
@@ -451,9 +474,6 @@ bool AppInit2()
// ********************************************************* Step 2: parameter interactions
fTestNet = GetBoolArg("-testnet");
- if (fTestNet) {
- SoftSetBoolArg("-irc", true);
- }
if (mapArgs.count("-bind")) {
// when specifying an explicit binding address, you want to listen on it
@@ -497,7 +517,7 @@ bool AppInit2()
nScriptCheckThreads = GetArg("-par", 0);
if (nScriptCheckThreads == 0)
nScriptCheckThreads = boost::thread::hardware_concurrency();
- if (nScriptCheckThreads <= 1)
+ if (nScriptCheckThreads <= 1)
nScriptCheckThreads = 0;
else if (nScriptCheckThreads > MAX_SCRIPTCHECK_THREADS)
nScriptCheckThreads = MAX_SCRIPTCHECK_THREADS;
@@ -508,12 +528,6 @@ bool AppInit2()
else
fDebugNet = GetBoolArg("-debugnet");
-#if !defined(WIN32) && !defined(QT_GUI)
- fDaemon = GetBoolArg("-daemon");
-#else
- fDaemon = false;
-#endif
-
if (fDaemon)
fServer = true;
else
@@ -561,28 +575,6 @@ bool AppInit2()
if (!lock.try_lock())
return InitError(strprintf(_("Cannot obtain a lock on data directory %s. Bitcoin is probably already running."), strDataDir.c_str()));
-#if !defined(WIN32) && !defined(QT_GUI)
- if (fDaemon)
- {
- // Daemonize
- pid_t pid = fork();
- if (pid < 0)
- {
- fprintf(stderr, "Error: fork() returned %d errno %d\n", pid, errno);
- return false;
- }
- if (pid > 0)
- {
- CreatePidFile(GetPidFile(), pid);
- return true;
- }
-
- pid_t sid = setsid();
- if (sid < 0)
- fprintf(stderr, "Error: setsid() returned %d errno %d\n", sid, errno);
- }
-#endif
-
if (GetBoolArg("-shrinkdebugfile", !fDebug))
ShrinkDebugFile();
printf("\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n");
@@ -600,20 +592,18 @@ bool AppInit2()
if (nScriptCheckThreads) {
printf("Using %u threads for script verification\n", nScriptCheckThreads);
for (int i=0; i<nScriptCheckThreads-1; i++)
- NewThread(ThreadScriptCheck, NULL);
+ threadGroup.create_thread(&ThreadScriptCheck);
}
int64 nStart;
// ********************************************************* Step 5: verify wallet database integrity
- uiInterface.InitMessage(_("Verifying wallet integrity..."));
+ uiInterface.InitMessage(_("Verifying wallet..."));
if (!bitdb.Open(GetDataDir()))
{
- string msg = strprintf(_("Error initializing database environment %s!"
- " To recover, BACKUP THAT DIRECTORY, then remove"
- " everything from it except for wallet.dat."), strDataDir.c_str());
+ string msg = strprintf(_("Error initializing wallet database environment %s!"), strDataDir.c_str());
return InitError(msg);
}
@@ -642,7 +632,6 @@ bool AppInit2()
// ********************************************************* Step 6: network initialization
int nSocksVersion = GetArg("-socks", 5);
-
if (nSocksVersion != 4 && nSocksVersion != 5)
return InitError(strprintf(_("Unknown -socks proxy version requested: %i"), nSocksVersion));
@@ -703,9 +692,6 @@ bool AppInit2()
fNoListen = !GetBoolArg("-listen", true);
fDiscover = GetBoolArg("-discover", true);
fNameLookup = GetBoolArg("-dns", true);
-#ifdef USE_UPNP
- fUseUPnP = GetBoolArg("-upnp", USE_UPNP);
-#endif
bool fBound = false;
if (!fNoListen) {
@@ -745,6 +731,7 @@ bool AppInit2()
fReindex = GetBoolArg("-reindex");
+ // Todo: Check if needed, because in step 5 we do the same
if (!bitdb.Open(GetDataDir()))
{
string msg = strprintf(_("Error initializing database environment %s!"
@@ -825,7 +812,7 @@ bool AppInit2()
break;
}
- uiInterface.InitMessage(_("Verifying block database integrity..."));
+ uiInterface.InitMessage(_("Verifying blocks..."));
if (!VerifyDB()) {
strLoadError = _("Corrupted block database detected");
break;
@@ -984,18 +971,17 @@ bool AppInit2()
// ********************************************************* Step 9: import blocks
// scan for better chains in the block chain database, that are not yet connected in the active best chain
- uiInterface.InitMessage(_("Importing blocks from block database..."));
CValidationState state;
if (!ConnectBestBlock(state))
strErrors << "Failed to connect best block";
- CImportData *pimport = new CImportData();
+ std::vector<boost::filesystem::path> vImportFiles;
if (mapArgs.count("-loadblock"))
{
BOOST_FOREACH(string strFile, mapMultiArgs["-loadblock"])
- pimport->vFiles.push_back(strFile);
+ vImportFiles.push_back(strFile);
}
- NewThread(ThreadImport, pimport);
+ threadGroup.create_thread(boost::bind(&ThreadImport, vImportFiles));
// ********************************************************* Step 10: load peers
@@ -1026,11 +1012,13 @@ bool AppInit2()
printf("mapWallet.size() = %"PRIszu"\n", pwalletMain->mapWallet.size());
printf("mapAddressBook.size() = %"PRIszu"\n", pwalletMain->mapAddressBook.size());
- if (!NewThread(StartNode, NULL))
- InitError(_("Error: could not start node"));
+ StartNode(threadGroup);
if (fServer)
- NewThread(ThreadRPCServer, NULL);
+ StartRPCThreads();
+
+ // Generate coins in the background
+ GenerateBitcoins(GetBoolArg("-gen", false), pwalletMain);
// ********************************************************* Step 12: finished
@@ -1042,12 +1030,8 @@ bool AppInit2()
// Add wallet transactions that aren't already in a block to mapTransactions
pwalletMain->ReacceptWalletTransactions();
-#if !defined(QT_GUI)
- // Loop until process is exit()ed from shutdown() function,
- // called from ThreadRPCServer thread when a "stop" command is received.
- while (1)
- Sleep(5000);
-#endif
+ // Run a thread to flush wallet periodically
+ threadGroup.create_thread(boost::bind(&ThreadFlushWalletDB, boost::ref(pwalletMain->strWalletFile)));
- return true;
+ return !fRequestShutdown;
}
diff --git a/src/init.h b/src/init.h
index 8308ee648b..5927670c83 100644
--- a/src/init.h
+++ b/src/init.h
@@ -10,8 +10,9 @@
extern CWallet* pwalletMain;
void StartShutdown();
-void Shutdown(void* parg);
-bool AppInit2();
+bool ShutdownRequested();
+void Shutdown();
+bool AppInit2(boost::thread_group& threadGroup);
std::string HelpMessage();
#endif
diff --git a/src/irc.cpp b/src/irc.cpp
deleted file mode 100644
index e8471a6630..0000000000
--- a/src/irc.cpp
+++ /dev/null
@@ -1,403 +0,0 @@
-// Copyright (c) 2009-2010 Satoshi Nakamoto
-// Copyright (c) 2009-2012 The Bitcoin developers
-// Distributed under the MIT/X11 software license, see the accompanying
-// file COPYING or http://www.opensource.org/licenses/mit-license.php.
-
-#include "irc.h"
-#include "net.h"
-#include "base58.h"
-
-#include <boost/algorithm/string/predicate.hpp> // for startswith() and endswith()
-
-using namespace std;
-using namespace boost;
-
-int nGotIRCAddresses = 0;
-
-void ThreadIRCSeed2(void* parg);
-
-
-
-
-#pragma pack(push, 1)
-struct ircaddr
-{
- struct in_addr ip;
- short port;
-};
-#pragma pack(pop)
-
-string EncodeAddress(const CService& addr)
-{
- struct ircaddr tmp;
- if (addr.GetInAddr(&tmp.ip))
- {
- tmp.port = htons(addr.GetPort());
-
- vector<unsigned char> vch(UBEGIN(tmp), UEND(tmp));
- return string("u") + EncodeBase58Check(vch);
- }
- return "";
-}
-
-bool DecodeAddress(string str, CService& addr)
-{
- vector<unsigned char> vch;
- if (!DecodeBase58Check(str.substr(1), vch))
- return false;
-
- struct ircaddr tmp;
- if (vch.size() != sizeof(tmp))
- return false;
- memcpy(&tmp, &vch[0], sizeof(tmp));
-
- addr = CService(tmp.ip, ntohs(tmp.port));
- return true;
-}
-
-
-
-
-
-
-static bool Send(SOCKET hSocket, const char* pszSend)
-{
- if (strstr(pszSend, "PONG") != pszSend)
- printf("IRC SENDING: %s\n", pszSend);
- const char* psz = pszSend;
- const char* pszEnd = psz + strlen(psz);
- while (psz < pszEnd)
- {
- int ret = send(hSocket, psz, pszEnd - psz, MSG_NOSIGNAL);
- if (ret < 0)
- return false;
- psz += ret;
- }
- return true;
-}
-
-bool RecvLineIRC(SOCKET hSocket, string& strLine)
-{
- loop
- {
- bool fRet = RecvLine(hSocket, strLine);
- if (fRet)
- {
- if (fShutdown)
- return false;
- vector<string> vWords;
- ParseString(strLine, ' ', vWords);
- if (vWords.size() >= 1 && vWords[0] == "PING")
- {
- strLine[1] = 'O';
- strLine += '\r';
- Send(hSocket, strLine.c_str());
- continue;
- }
- }
- return fRet;
- }
-}
-
-int RecvUntil(SOCKET hSocket, const char* psz1, const char* psz2=NULL, const char* psz3=NULL, const char* psz4=NULL)
-{
- loop
- {
- string strLine;
- strLine.reserve(10000);
- if (!RecvLineIRC(hSocket, strLine))
- return 0;
- printf("IRC %s\n", strLine.c_str());
- if (psz1 && strLine.find(psz1) != string::npos)
- return 1;
- if (psz2 && strLine.find(psz2) != string::npos)
- return 2;
- if (psz3 && strLine.find(psz3) != string::npos)
- return 3;
- if (psz4 && strLine.find(psz4) != string::npos)
- return 4;
- }
-}
-
-bool Wait(int nSeconds)
-{
- if (fShutdown)
- return false;
- printf("IRC waiting %d seconds to reconnect\n", nSeconds);
- for (int i = 0; i < nSeconds; i++)
- {
- if (fShutdown)
- return false;
- Sleep(1000);
- }
- return true;
-}
-
-bool RecvCodeLine(SOCKET hSocket, const char* psz1, string& strRet)
-{
- strRet.clear();
- loop
- {
- string strLine;
- if (!RecvLineIRC(hSocket, strLine))
- return false;
-
- vector<string> vWords;
- ParseString(strLine, ' ', vWords);
- if (vWords.size() < 2)
- continue;
-
- if (vWords[1] == psz1)
- {
- printf("IRC %s\n", strLine.c_str());
- strRet = strLine;
- return true;
- }
- }
-}
-
-bool GetIPFromIRC(SOCKET hSocket, string strMyName, CNetAddr& ipRet)
-{
- Send(hSocket, strprintf("USERHOST %s\r", strMyName.c_str()).c_str());
-
- string strLine;
- if (!RecvCodeLine(hSocket, "302", strLine))
- return false;
-
- vector<string> vWords;
- ParseString(strLine, ' ', vWords);
- if (vWords.size() < 4)
- return false;
-
- string str = vWords[3];
- if (str.rfind("@") == string::npos)
- return false;
- string strHost = str.substr(str.rfind("@")+1);
-
- // Hybrid IRC used by lfnet always returns IP when you userhost yourself,
- // but in case another IRC is ever used this should work.
- printf("GetIPFromIRC() got userhost %s\n", strHost.c_str());
- CNetAddr addr(strHost, true);
- if (!addr.IsValid())
- return false;
- ipRet = addr;
-
- return true;
-}
-
-
-
-void ThreadIRCSeed(void* parg)
-{
- // Make this thread recognisable as the IRC seeding thread
- RenameThread("bitcoin-ircseed");
-
- printf("ThreadIRCSeed started\n");
-
- try
- {
- ThreadIRCSeed2(parg);
- }
- catch (std::exception& e) {
- PrintExceptionContinue(&e, "ThreadIRCSeed()");
- } catch (...) {
- PrintExceptionContinue(NULL, "ThreadIRCSeed()");
- }
- printf("ThreadIRCSeed exited\n");
-}
-
-void ThreadIRCSeed2(void* parg)
-{
- // Don't connect to IRC if we won't use IPv4 connections.
- if (IsLimited(NET_IPV4))
- return;
-
- // ... or if we won't make outbound connections and won't accept inbound ones.
- if (mapArgs.count("-connect") && fNoListen)
- return;
-
- // ... or if IRC is not enabled.
- if (!GetBoolArg("-irc", false))
- return;
-
- printf("ThreadIRCSeed trying to connect...\n");
-
- int nErrorWait = 10;
- int nRetryWait = 10;
- int nNameRetry = 0;
-
- while (!fShutdown)
- {
- CService addrConnect("92.243.23.21", 6667); // irc.lfnet.org
-
- CService addrIRC("irc.lfnet.org", 6667, true);
- if (addrIRC.IsValid())
- addrConnect = addrIRC;
-
- SOCKET hSocket;
- if (!ConnectSocket(addrConnect, hSocket))
- {
- printf("IRC connect failed\n");
- nErrorWait = nErrorWait * 11 / 10;
- if (Wait(nErrorWait += 60))
- continue;
- else
- return;
- }
-
- if (!RecvUntil(hSocket, "Found your hostname", "using your IP address instead", "Couldn't look up your hostname", "ignoring hostname"))
- {
- closesocket(hSocket);
- hSocket = INVALID_SOCKET;
- nErrorWait = nErrorWait * 11 / 10;
- if (Wait(nErrorWait += 60))
- continue;
- else
- return;
- }
-
- CNetAddr addrIPv4("1.2.3.4"); // arbitrary IPv4 address to make GetLocal prefer IPv4 addresses
- CService addrLocal;
- string strMyName;
- // Don't use our IP as our nick if we're not listening
- // or if it keeps failing because the nick is already in use.
- if (!fNoListen && GetLocal(addrLocal, &addrIPv4) && nNameRetry<3)
- strMyName = EncodeAddress(GetLocalAddress(&addrConnect));
- if (strMyName == "")
- strMyName = strprintf("x%"PRI64u"", GetRand(1000000000));
-
- Send(hSocket, strprintf("NICK %s\r", strMyName.c_str()).c_str());
- Send(hSocket, strprintf("USER %s 8 * : %s\r", strMyName.c_str(), strMyName.c_str()).c_str());
-
- int nRet = RecvUntil(hSocket, " 004 ", " 433 ");
- if (nRet != 1)
- {
- closesocket(hSocket);
- hSocket = INVALID_SOCKET;
- if (nRet == 2)
- {
- printf("IRC name already in use\n");
- nNameRetry++;
- Wait(10);
- continue;
- }
- nErrorWait = nErrorWait * 11 / 10;
- if (Wait(nErrorWait += 60))
- continue;
- else
- return;
- }
- nNameRetry = 0;
- Sleep(500);
-
- // Get our external IP from the IRC server and re-nick before joining the channel
- CNetAddr addrFromIRC;
- if (GetIPFromIRC(hSocket, strMyName, addrFromIRC))
- {
- printf("GetIPFromIRC() returned %s\n", addrFromIRC.ToString().c_str());
- // Don't use our IP as our nick if we're not listening
- if (!fNoListen && addrFromIRC.IsRoutable())
- {
- // IRC lets you to re-nick
- AddLocal(addrFromIRC, LOCAL_IRC);
- strMyName = EncodeAddress(GetLocalAddress(&addrConnect));
- Send(hSocket, strprintf("NICK %s\r", strMyName.c_str()).c_str());
- }
- }
-
- if (fTestNet) {
- Send(hSocket, "JOIN #bitcoinTEST3\r");
- Send(hSocket, "WHO #bitcoinTEST3\r");
- } else {
- // randomly join #bitcoin00-#bitcoin99
- int channel_number = GetRandInt(100);
- Send(hSocket, strprintf("JOIN #bitcoin%02d\r", channel_number).c_str());
- Send(hSocket, strprintf("WHO #bitcoin%02d\r", channel_number).c_str());
- }
-
- int64 nStart = GetTime();
- string strLine;
- strLine.reserve(10000);
- while (!fShutdown && RecvLineIRC(hSocket, strLine))
- {
- if (strLine.empty() || strLine.size() > 900 || strLine[0] != ':')
- continue;
-
- vector<string> vWords;
- ParseString(strLine, ' ', vWords);
- if (vWords.size() < 2)
- continue;
-
- std::string strName;
-
- if (vWords[1] == "352" && vWords.size() >= 8)
- {
- // index 7 is limited to 16 characters
- // could get full length name at index 10, but would be different from join messages
- strName = vWords[7].c_str();
- printf("IRC got who\n");
- }
-
- if (vWords[1] == "JOIN" && vWords[0].size() > 1)
- {
- // :username!username@50000007.F000000B.90000002.IP JOIN :#channelname
- strName = vWords[0].substr(1, vWords[0].find('!', 1) - 1);
- printf("IRC got join\n");
- }
-
- if (boost::algorithm::starts_with(strName, "u"))
- {
- CAddress addr;
- if (DecodeAddress(strName, addr))
- {
- addr.nTime = GetAdjustedTime();
- if (addrman.Add(addr, addrConnect, 51 * 60))
- printf("IRC got new address: %s\n", addr.ToString().c_str());
- nGotIRCAddresses++;
- }
- else
- {
- printf("IRC decode failed\n");
- }
- }
- }
- closesocket(hSocket);
- hSocket = INVALID_SOCKET;
-
- if (GetTime() - nStart > 20 * 60)
- {
- nErrorWait /= 3;
- nRetryWait /= 3;
- }
-
- nRetryWait = nRetryWait * 11 / 10;
- if (!Wait(nRetryWait += 60))
- return;
- }
-}
-
-
-
-
-
-
-
-
-
-
-#ifdef TEST
-int main(int argc, char *argv[])
-{
- WSADATA wsadata;
- if (WSAStartup(MAKEWORD(2,2), &wsadata) != NO_ERROR)
- {
- printf("Error at WSAStartup()\n");
- return false;
- }
-
- ThreadIRCSeed(NULL);
-
- WSACleanup();
- return 0;
-}
-#endif
diff --git a/src/irc.h b/src/irc.h
deleted file mode 100644
index 119aeb3fda..0000000000
--- a/src/irc.h
+++ /dev/null
@@ -1,12 +0,0 @@
-// Copyright (c) 2009-2010 Satoshi Nakamoto
-// Copyright (c) 2009-2012 The Bitcoin developers
-// Distributed under the MIT/X11 software license, see the accompanying
-// file COPYING or http://www.opensource.org/licenses/mit-license.php.
-#ifndef BITCOIN_IRC_H
-#define BITCOIN_IRC_H
-
-void ThreadIRCSeed(void* parg);
-
-extern int nGotIRCAddresses;
-
-#endif
diff --git a/src/limitedmap.h b/src/limitedmap.h
new file mode 100644
index 0000000000..7049d68e5a
--- /dev/null
+++ b/src/limitedmap.h
@@ -0,0 +1,100 @@
+// Copyright (c) 2012 The Bitcoin developers
+// Distributed under the MIT/X11 software license, see the accompanying
+// file COPYING or http://www.opensource.org/licenses/mit-license.php.
+#ifndef BITCOIN_LIMITEDMAP_H
+#define BITCOIN_LIMITEDMAP_H
+
+#include <map>
+#include <deque>
+
+/** STL-like map container that only keeps the N elements with the highest value. */
+template <typename K, typename V> class limitedmap
+{
+public:
+ typedef K key_type;
+ typedef V mapped_type;
+ typedef std::pair<const key_type, mapped_type> value_type;
+ typedef typename std::map<K, V>::const_iterator const_iterator;
+ typedef typename std::map<K, V>::size_type size_type;
+
+protected:
+ std::map<K, V> map;
+ typedef typename std::map<K, V>::iterator iterator;
+ std::multimap<V, iterator> rmap;
+ typedef typename std::multimap<V, iterator>::iterator rmap_iterator;
+ size_type nMaxSize;
+
+public:
+ limitedmap(size_type nMaxSizeIn = 0) { nMaxSize = nMaxSizeIn; }
+ const_iterator begin() const { return map.begin(); }
+ const_iterator end() const { return map.end(); }
+ size_type size() const { return map.size(); }
+ bool empty() const { return map.empty(); }
+ const_iterator find(const key_type& k) const { return map.find(k); }
+ size_type count(const key_type& k) const { return map.count(k); }
+ void insert(const value_type& x)
+ {
+ std::pair<iterator, bool> ret = map.insert(x);
+ if (ret.second)
+ {
+ if (nMaxSize && map.size() == nMaxSize)
+ {
+ map.erase(rmap.begin()->second);
+ rmap.erase(rmap.begin());
+ }
+ rmap.insert(make_pair(x.second, ret.first));
+ }
+ return;
+ }
+ void erase(const key_type& k)
+ {
+ iterator itTarget = map.find(k);
+ if (itTarget == map.end())
+ return;
+ std::pair<rmap_iterator, rmap_iterator> itPair = rmap.equal_range(itTarget->second);
+ for (rmap_iterator it = itPair.first; it != itPair.second; ++it)
+ if (it->second == itTarget)
+ {
+ rmap.erase(it);
+ map.erase(itTarget);
+ return;
+ }
+ // Shouldn't ever get here
+ assert(0); //TODO remove me
+ map.erase(itTarget);
+ }
+ void update(const_iterator itIn, const mapped_type& v)
+ {
+ //TODO: When we switch to C++11, use map.erase(itIn, itIn) to get the non-const iterator
+ iterator itTarget = map.find(itIn->first);
+ if (itTarget == map.end())
+ return;
+ std::pair<rmap_iterator, rmap_iterator> itPair = rmap.equal_range(itTarget->second);
+ for (rmap_iterator it = itPair.first; it != itPair.second; ++it)
+ if (it->second == itTarget)
+ {
+ rmap.erase(it);
+ itTarget->second = v;
+ rmap.insert(make_pair(v, itTarget));
+ return;
+ }
+ // Shouldn't ever get here
+ assert(0); //TODO remove me
+ itTarget->second = v;
+ rmap.insert(make_pair(v, itTarget));
+ }
+ size_type max_size() const { return nMaxSize; }
+ size_type max_size(size_type s)
+ {
+ if (s)
+ while (map.size() > s)
+ {
+ map.erase(rmap.begin()->second);
+ rmap.erase(rmap.begin());
+ }
+ nMaxSize = s;
+ return nMaxSize;
+ }
+};
+
+#endif
diff --git a/src/main.cpp b/src/main.cpp
index 3151a806dc..7f408c4d1b 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -61,8 +61,8 @@ CScript COINBASE_FLAGS;
const string strMessageMagic = "Bitcoin Signed Message:\n";
-double dHashesPerSec;
-int64 nHPSTimerStart;
+double dHashesPerSec = 0.0;
+int64 nHPSTimerStart = 0;
// Settings
int64 nTransactionFee = 0;
@@ -162,9 +162,9 @@ void static ResendWalletTransactions()
// CCoinsView implementations
//
-bool CCoinsView::GetCoins(uint256 txid, CCoins &coins) { return false; }
-bool CCoinsView::SetCoins(uint256 txid, const CCoins &coins) { return false; }
-bool CCoinsView::HaveCoins(uint256 txid) { return false; }
+bool CCoinsView::GetCoins(const uint256 &txid, CCoins &coins) { return false; }
+bool CCoinsView::SetCoins(const uint256 &txid, const CCoins &coins) { return false; }
+bool CCoinsView::HaveCoins(const uint256 &txid) { return false; }
CBlockIndex *CCoinsView::GetBestBlock() { return NULL; }
bool CCoinsView::SetBestBlock(CBlockIndex *pindex) { return false; }
bool CCoinsView::BatchWrite(const std::map<uint256, CCoins> &mapCoins, CBlockIndex *pindex) { return false; }
@@ -172,9 +172,9 @@ bool CCoinsView::GetStats(CCoinsStats &stats) { return false; }
CCoinsViewBacked::CCoinsViewBacked(CCoinsView &viewIn) : base(&viewIn) { }
-bool CCoinsViewBacked::GetCoins(uint256 txid, CCoins &coins) { return base->GetCoins(txid, coins); }
-bool CCoinsViewBacked::SetCoins(uint256 txid, const CCoins &coins) { return base->SetCoins(txid, coins); }
-bool CCoinsViewBacked::HaveCoins(uint256 txid) { return base->HaveCoins(txid); }
+bool CCoinsViewBacked::GetCoins(const uint256 &txid, CCoins &coins) { return base->GetCoins(txid, coins); }
+bool CCoinsViewBacked::SetCoins(const uint256 &txid, const CCoins &coins) { return base->SetCoins(txid, coins); }
+bool CCoinsViewBacked::HaveCoins(const uint256 &txid) { return base->HaveCoins(txid); }
CBlockIndex *CCoinsViewBacked::GetBestBlock() { return base->GetBestBlock(); }
bool CCoinsViewBacked::SetBestBlock(CBlockIndex *pindex) { return base->SetBestBlock(pindex); }
void CCoinsViewBacked::SetBackend(CCoinsView &viewIn) { base = &viewIn; }
@@ -183,7 +183,7 @@ bool CCoinsViewBacked::GetStats(CCoinsStats &stats) { return base->GetStats(stat
CCoinsViewCache::CCoinsViewCache(CCoinsView &baseIn, bool fDummy) : CCoinsViewBacked(baseIn), pindexTip(NULL) { }
-bool CCoinsViewCache::GetCoins(uint256 txid, CCoins &coins) {
+bool CCoinsViewCache::GetCoins(const uint256 &txid, CCoins &coins) {
if (cacheCoins.count(txid)) {
coins = cacheCoins[txid];
return true;
@@ -195,29 +195,30 @@ bool CCoinsViewCache::GetCoins(uint256 txid, CCoins &coins) {
return false;
}
-std::map<uint256,CCoins>::iterator CCoinsViewCache::FetchCoins(uint256 txid) {
- std::map<uint256,CCoins>::iterator it = cacheCoins.find(txid);
- if (it != cacheCoins.end())
+std::map<uint256,CCoins>::iterator CCoinsViewCache::FetchCoins(const uint256 &txid) {
+ std::map<uint256,CCoins>::iterator it = cacheCoins.lower_bound(txid);
+ if (it != cacheCoins.end() && it->first == txid)
return it;
CCoins tmp;
if (!base->GetCoins(txid,tmp))
- return it;
- std::pair<std::map<uint256,CCoins>::iterator,bool> ret = cacheCoins.insert(std::make_pair(txid, tmp));
- return ret.first;
+ return cacheCoins.end();
+ std::map<uint256,CCoins>::iterator ret = cacheCoins.insert(it, std::make_pair(txid, CCoins()));
+ tmp.swap(ret->second);
+ return ret;
}
-CCoins &CCoinsViewCache::GetCoins(uint256 txid) {
+CCoins &CCoinsViewCache::GetCoins(const uint256 &txid) {
std::map<uint256,CCoins>::iterator it = FetchCoins(txid);
assert(it != cacheCoins.end());
return it->second;
}
-bool CCoinsViewCache::SetCoins(uint256 txid, const CCoins &coins) {
+bool CCoinsViewCache::SetCoins(const uint256 &txid, const CCoins &coins) {
cacheCoins[txid] = coins;
return true;
}
-bool CCoinsViewCache::HaveCoins(uint256 txid) {
+bool CCoinsViewCache::HaveCoins(const uint256 &txid) {
return FetchCoins(txid) != cacheCoins.end();
}
@@ -254,7 +255,7 @@ unsigned int CCoinsViewCache::GetCacheSize() {
It does not check for spendings by memory pool transactions. */
CCoinsViewMemPool::CCoinsViewMemPool(CCoinsView &baseIn, CTxMemPool &mempoolIn) : CCoinsViewBacked(baseIn), mempool(mempoolIn) { }
-bool CCoinsViewMemPool::GetCoins(uint256 txid, CCoins &coins) {
+bool CCoinsViewMemPool::GetCoins(const uint256 &txid, CCoins &coins) {
if (base->GetCoins(txid, coins))
return true;
if (mempool.exists(txid)) {
@@ -265,7 +266,7 @@ bool CCoinsViewMemPool::GetCoins(uint256 txid, CCoins &coins) {
return false;
}
-bool CCoinsViewMemPool::HaveCoins(uint256 txid) {
+bool CCoinsViewMemPool::HaveCoins(const uint256 &txid) {
return mempool.exists(txid) || base->HaveCoins(txid);
}
@@ -454,8 +455,7 @@ bool CTransaction::AreInputsStandard(CCoinsViewCache& mapInputs) const
return true;
}
-unsigned int
-CTransaction::GetLegacySigOpCount() const
+unsigned int CTransaction::GetLegacySigOpCount() const
{
unsigned int nSigOps = 0;
BOOST_FOREACH(const CTxIn& txin, vin)
@@ -1176,7 +1176,7 @@ int GetNumBlocksOfPeers()
bool IsInitialBlockDownload()
{
- if (pindexBest == NULL || nBestHeight < Checkpoints::GetTotalBlocksEstimate() || fReindex || fImporting)
+ if (pindexBest == NULL || fImporting || fReindex || nBestHeight < Checkpoints::GetTotalBlocksEstimate())
return true;
static int64 nLastUpdate;
static CBlockIndex* pindexLastBest;
@@ -1256,8 +1256,7 @@ bool ConnectBestBlock(CValidationState &state) {
if (pindexTest->pprev == NULL || pindexTest->pnext != NULL) {
reverse(vAttach.begin(), vAttach.end());
BOOST_FOREACH(CBlockIndex *pindexSwitch, vAttach) {
- if (fRequestShutdown)
- break;
+ boost::this_thread::interruption_point();
try {
if (!SetBestChain(state, pindexSwitch))
return false;
@@ -1533,7 +1532,7 @@ bool CBlock::DisconnectBlock(CValidationState &state, CBlockIndex *pindex, CCoin
}
}
-void static FlushBlockFile()
+void static FlushBlockFile(bool fFinalize = false)
{
LOCK(cs_LastBlockFile);
@@ -1541,12 +1540,16 @@ void static FlushBlockFile()
FILE *fileOld = OpenBlockFile(posOld);
if (fileOld) {
+ if (fFinalize)
+ TruncateFile(fileOld, infoLastBlockFile.nSize);
FileCommit(fileOld);
fclose(fileOld);
}
fileOld = OpenUndoFile(posOld);
if (fileOld) {
+ if (fFinalize)
+ TruncateFile(fileOld, infoLastBlockFile.nUndoSize);
FileCommit(fileOld);
fclose(fileOld);
}
@@ -1556,15 +1559,9 @@ bool FindUndoPos(CValidationState &state, int nFile, CDiskBlockPos &pos, unsigne
static CCheckQueue<CScriptCheck> scriptcheckqueue(128);
-void ThreadScriptCheck(void*) {
- vnThreadsRunning[THREAD_SCRIPTCHECK]++;
+void ThreadScriptCheck() {
RenameThread("bitcoin-scriptch");
scriptcheckqueue.Thread();
- vnThreadsRunning[THREAD_SCRIPTCHECK]--;
-}
-
-void ThreadScriptCheckQuit() {
- scriptcheckqueue.Quit();
}
bool CBlock::ConnectBlock(CValidationState &state, CBlockIndex* pindex, CCoinsViewCache &view, bool fJustCheck)
@@ -1629,7 +1626,6 @@ bool CBlock::ConnectBlock(CValidationState &state, CBlockIndex* pindex, CCoinsVi
vPos.reserve(vtx.size());
for (unsigned int i=0; i<vtx.size(); i++)
{
-
const CTransaction &tx = vtx[i];
nInputs += tx.vin.size();
@@ -1793,7 +1789,7 @@ bool SetBestChain(CValidationState &state, CBlockIndex* pindexNew)
return error("SetBestBlock() : ConnectBlock %s failed", BlockHashStr(pindex->GetBlockHash()).c_str());
}
if (fBenchmark)
- printf("- Connect: %.2fms\n", (GetTimeMicros() - nStart) * 0.001);
+ printf("- Connect: %.2fms\n", (GetTimeMicros() - nStart) * 0.001);
// Queue memory transactions to delete
BOOST_FOREACH(const CTransaction& tx, block.vtx)
@@ -1865,9 +1861,10 @@ bool SetBestChain(CValidationState &state, CBlockIndex* pindexNew)
bnBestChainWork = pindexNew->bnChainWork;
nTimeBestReceived = GetTime();
nTransactionsUpdated++;
- printf("SetBestChain: new best=%s height=%d work=%s tx=%lu date=%s\n",
+ printf("SetBestChain: new best=%s height=%d work=%s tx=%lu date=%s progress=%f\n",
BlockHashStr(hashBestChain).c_str(), nBestHeight, bnBestChainWork.ToString().c_str(), (unsigned long)pindexNew->nChainTx,
- DateTimeStrFormat("%Y-%m-%d %H:%M:%S", pindexBest->GetBlockTime()).c_str());
+ DateTimeStrFormat("%Y-%m-%d %H:%M:%S", pindexBest->GetBlockTime()).c_str(),
+ Checkpoints::GuessVerificationProgress(pindexBest));
// Check the version of the last 100 blocks to see if we need to upgrade:
if (!fIsInitialDownload)
@@ -1965,7 +1962,7 @@ bool FindBlockPos(CValidationState &state, CDiskBlockPos &pos, unsigned int nAdd
} else {
while (infoLastBlockFile.nSize + nAddSize >= MAX_BLOCKFILE_SIZE) {
printf("Leaving block file %i: %s\n", nLastBlockFile, infoLastBlockFile.ToString().c_str());
- FlushBlockFile();
+ FlushBlockFile(true);
nLastBlockFile++;
infoLastBlockFile.SetNull();
pblocktree->ReadBlockFileInfo(nLastBlockFile, infoLastBlockFile); // check whether data for the new file somehow already exist; can fail just fine
@@ -2053,6 +2050,25 @@ bool CBlock::CheckBlock(CValidationState &state, bool fCheckPOW, bool fCheckMerk
if (vtx.empty() || vtx.size() > MAX_BLOCK_SIZE || ::GetSerializeSize(*this, SER_NETWORK, PROTOCOL_VERSION) > MAX_BLOCK_SIZE)
return state.DoS(100, error("CheckBlock() : size limits failed"));
+ // Special short-term limits to avoid 10,000 BDB lock limit:
+ if (GetBlockTime() >= 1363867200 && // start enforcing 21 March 2013, noon GMT
+ GetBlockTime() < 1368576000) // stop enforcing 15 May 2013 00:00:00
+ {
+ // Rule is: #unique txids referenced <= 4,500
+ // ... to prevent 10,000 BDB lock exhaustion on old clients
+ set<uint256> setTxIn;
+ for (size_t i = 0; i < vtx.size(); i++)
+ {
+ setTxIn.insert(vtx[i].GetHash());
+ if (i == 0) continue; // skip coinbase txin
+ BOOST_FOREACH(const CTxIn& txin, vtx[i].vin)
+ setTxIn.insert(txin.prevout.hash);
+ }
+ size_t nTxids = setTxIn.size();
+ if (nTxids > 4500)
+ return error("CheckBlock() : 15 May maxlocks violation");
+ }
+
// Check proof of work matches claimed amount
if (fCheckPOW && !CheckProofOfWork(GetHash(), nBits))
return state.DoS(50, error("CheckBlock() : proof of work failed"));
@@ -2441,10 +2457,9 @@ uint256 CPartialMerkleTree::ExtractMatches(std::vector<uint256> &vMatch) {
bool AbortNode(const std::string &strMessage) {
- fRequestShutdown = true;
strMiscWarning = strMessage;
printf("*** %s\n", strMessage.c_str());
- uiInterface.ThreadSafeMessageBox(strMessage, "", CClientUIInterface::MSG_ERROR | CClientUIInterface::MODAL);
+ uiInterface.ThreadSafeMessageBox(strMessage, "", CClientUIInterface::MSG_ERROR);
StartShutdown();
return false;
}
@@ -2491,7 +2506,7 @@ FILE* OpenBlockFile(const CDiskBlockPos &pos, bool fReadOnly) {
return OpenDiskFile(pos, "blk", fReadOnly);
}
-FILE *OpenUndoFile(const CDiskBlockPos &pos, bool fReadOnly) {
+FILE* OpenUndoFile(const CDiskBlockPos &pos, bool fReadOnly) {
return OpenDiskFile(pos, "rev", fReadOnly);
}
@@ -2520,8 +2535,7 @@ bool static LoadBlockIndexDB()
if (!pblocktree->LoadBlockIndexGuts())
return false;
- if (fRequestShutdown)
- return true;
+ boost::this_thread::interruption_point();
// Calculate bnChainWork
vector<pair<int, CBlockIndex*> > vSortedByHeight;
@@ -2543,9 +2557,9 @@ bool static LoadBlockIndexDB()
// Load block file info
pblocktree->ReadLastBlockFile(nLastBlockFile);
- printf("LoadBlockIndex(): last block file = %i\n", nLastBlockFile);
+ printf("LoadBlockIndexDB(): last block file = %i\n", nLastBlockFile);
if (pblocktree->ReadBlockFileInfo(nLastBlockFile, infoLastBlockFile))
- printf("LoadBlockIndex(): last block file: %s\n", infoLastBlockFile.ToString().c_str());
+ printf("LoadBlockIndexDB(): last block file info: %s\n", infoLastBlockFile.ToString().c_str());
// Load bnBestInvalidWork, OK if it doesn't exist
pblocktree->ReadBestInvalidWork(bnBestInvalidWork);
@@ -2557,7 +2571,7 @@ bool static LoadBlockIndexDB()
// Check whether we have a transaction index
pblocktree->ReadFlag("txindex", fTxIndex);
- printf("LoadBlockIndex(): transaction index %s\n", fTxIndex ? "enabled" : "disabled");
+ printf("LoadBlockIndexDB(): transaction index %s\n", fTxIndex ? "enabled" : "disabled");
// Load hashBestChain pointer to end of best chain
pindexBest = pcoinsTip->GetBestBlock();
@@ -2574,7 +2588,7 @@ bool static LoadBlockIndexDB()
pindexPrev->pnext = pindex;
pindex = pindexPrev;
}
- printf("LoadBlockIndex(): hashBestChain=%s height=%d date=%s\n",
+ printf("LoadBlockIndexDB(): hashBestChain=%s height=%d date=%s\n",
BlockHashStr(hashBestChain).c_str(), nBestHeight,
DateTimeStrFormat("%Y-%m-%d %H:%M:%S", pindexBest->GetBlockTime()).c_str());
@@ -2601,7 +2615,8 @@ bool VerifyDB() {
CValidationState state;
for (CBlockIndex* pindex = pindexBest; pindex && pindex->pprev; pindex = pindex->pprev)
{
- if (fRequestShutdown || pindex->nHeight < nBestHeight-nCheckDepth)
+ boost::this_thread::interruption_point();
+ if (pindex->nHeight < nBestHeight-nCheckDepth)
break;
CBlock block;
// check level 0: read from disk
@@ -2638,13 +2653,14 @@ bool VerifyDB() {
// check level 4: try reconnecting blocks
if (nCheckLevel >= 4) {
CBlockIndex *pindex = pindexState;
- while (pindex != pindexBest && !fRequestShutdown) {
- pindex = pindex->pnext;
- CBlock block;
- if (!block.ReadFromDisk(pindex))
- return error("VerifyDB() : *** block.ReadFromDisk failed at %d, hash=%s", pindex->nHeight, pindex->GetBlockHash().ToString().c_str());
- if (!block.ConnectBlock(state, pindex, coins))
- return error("VerifyDB() : *** found unconnectable block at %d, hash=%s", pindex->nHeight, pindex->GetBlockHash().ToString().c_str());
+ while (pindex != pindexBest) {
+ boost::this_thread::interruption_point();
+ pindex = pindex->pnext;
+ CBlock block;
+ if (!block.ReadFromDisk(pindex))
+ return error("VerifyDB() : *** block.ReadFromDisk failed at %d, hash=%s", pindex->nHeight, pindex->GetBlockHash().ToString().c_str());
+ if (!block.ConnectBlock(state, pindex, coins))
+ return error("VerifyDB() : *** found unconnectable block at %d, hash=%s", pindex->nHeight, pindex->GetBlockHash().ToString().c_str());
}
}
@@ -2743,7 +2759,7 @@ bool InitBlockIndex() {
CDiskBlockPos blockPos;
CValidationState state;
if (!FindBlockPos(state, blockPos, nBlockSize+8, 0, block.nTime))
- return error("AcceptBlock() : FindBlockPos failed");
+ return error("LoadBlockIndex() : FindBlockPos failed");
if (!block.WriteToDisk(blockPos))
return error("LoadBlockIndex() : writing genesis block to disk failed");
if (!block.AddToBlockIndex(state, blockPos))
@@ -2845,7 +2861,9 @@ bool LoadExternalBlockFile(FILE* fileIn, CDiskBlockPos *dbp)
}
}
uint64 nRewind = blkdat.GetPos();
- while (blkdat.good() && !blkdat.eof() && !fRequestShutdown) {
+ while (blkdat.good() && !blkdat.eof()) {
+ boost::this_thread::interruption_point();
+
blkdat.SetPos(nRewind);
nRewind++; // start one byte further next time, in case of failure
blkdat.SetLimit(); // remove former limit
@@ -3007,6 +3025,114 @@ bool static AlreadyHave(const CInv& inv)
unsigned char pchMessageStart[4] = { 0xf9, 0xbe, 0xb4, 0xd9 };
+void static ProcessGetData(CNode* pfrom)
+{
+ std::deque<CInv>::iterator it = pfrom->vRecvGetData.begin();
+
+ vector<CInv> vNotFound;
+
+ while (it != pfrom->vRecvGetData.end()) {
+ // Don't bother if send buffer is too full to respond anyway
+ if (pfrom->nSendSize >= SendBufferSize())
+ break;
+
+ const CInv &inv = *it;
+ {
+ boost::this_thread::interruption_point();
+ it++;
+
+ if (inv.type == MSG_BLOCK || inv.type == MSG_FILTERED_BLOCK)
+ {
+ // Send block from disk
+ map<uint256, CBlockIndex*>::iterator mi = mapBlockIndex.find(inv.hash);
+ if (mi != mapBlockIndex.end())
+ {
+ CBlock block;
+ block.ReadFromDisk((*mi).second);
+ if (inv.type == MSG_BLOCK)
+ pfrom->PushMessage("block", block);
+ else // MSG_FILTERED_BLOCK)
+ {
+ LOCK(pfrom->cs_filter);
+ if (pfrom->pfilter)
+ {
+ CMerkleBlock merkleBlock(block, *pfrom->pfilter);
+ pfrom->PushMessage("merkleblock", merkleBlock);
+ // CMerkleBlock just contains hashes, so also push any transactions in the block the client did not see
+ // This avoids hurting performance by pointlessly requiring a round-trip
+ // Note that there is currently no way for a node to request any single transactions we didnt send here -
+ // they must either disconnect and retry or request the full block.
+ // Thus, the protocol spec specified allows for us to provide duplicate txn here,
+ // however we MUST always provide at least what the remote peer needs
+ typedef std::pair<unsigned int, uint256> PairType;
+ BOOST_FOREACH(PairType& pair, merkleBlock.vMatchedTxn)
+ if (!pfrom->setInventoryKnown.count(CInv(MSG_TX, pair.second)))
+ pfrom->PushMessage("tx", block.vtx[pair.first]);
+ }
+ // else
+ // no response
+ }
+
+ // Trigger them to send a getblocks request for the next batch of inventory
+ if (inv.hash == pfrom->hashContinue)
+ {
+ // Bypass PushInventory, this must send even if redundant,
+ // and we want it right after the last block so they don't
+ // wait for other stuff first.
+ vector<CInv> vInv;
+ vInv.push_back(CInv(MSG_BLOCK, hashBestChain));
+ pfrom->PushMessage("inv", vInv);
+ pfrom->hashContinue = 0;
+ }
+ }
+ }
+ else if (inv.IsKnownType())
+ {
+ // Send stream from relay memory
+ bool pushed = false;
+ {
+ LOCK(cs_mapRelay);
+ map<CInv, CDataStream>::iterator mi = mapRelay.find(inv);
+ if (mi != mapRelay.end()) {
+ pfrom->PushMessage(inv.GetCommand(), (*mi).second);
+ pushed = true;
+ }
+ }
+ if (!pushed && inv.type == MSG_TX) {
+ LOCK(mempool.cs);
+ if (mempool.exists(inv.hash)) {
+ CTransaction tx = mempool.lookup(inv.hash);
+ CDataStream ss(SER_NETWORK, PROTOCOL_VERSION);
+ ss.reserve(1000);
+ ss << tx;
+ pfrom->PushMessage("tx", ss);
+ pushed = true;
+ }
+ }
+ if (!pushed) {
+ vNotFound.push_back(inv);
+ }
+ }
+
+ // Track requests for our stuff.
+ Inventory(inv.hash);
+ }
+ }
+
+ pfrom->vRecvGetData.erase(pfrom->vRecvGetData.begin(), it);
+
+ if (!vNotFound.empty()) {
+ // Let the peer know that we didn't find what it asked for, so it doesn't
+ // have to wait around forever. Currently only SPV clients actually care
+ // about this message: it's needed when they are recursively walking the
+ // dependencies of relevant unconfirmed transactions. SPV clients want to
+ // do that because they want to know about (and store and rebroadcast and
+ // risk analyze) the dependencies of transactions relevant to them, without
+ // having to download the entire memory pool.
+ pfrom->PushMessage("notfound", vNotFound);
+ }
+}
+
bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv)
{
RandAddSeedPerfmon();
@@ -3082,7 +3208,7 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv)
// Change version
pfrom->PushMessage("verack");
- pfrom->vSend.SetVersion(min(pfrom->nVersion, PROTOCOL_VERSION));
+ pfrom->ssSend.SetVersion(min(pfrom->nVersion, PROTOCOL_VERSION));
if (!pfrom->fInbound)
{
@@ -3146,7 +3272,7 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv)
else if (strCommand == "verack")
{
- pfrom->vRecv.SetVersion(min(pfrom->nVersion, PROTOCOL_VERSION));
+ pfrom->SetRecvVersion(min(pfrom->nVersion, PROTOCOL_VERSION));
}
@@ -3170,8 +3296,8 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv)
int64 nSince = nNow - 10 * 60;
BOOST_FOREACH(CAddress& addr, vAddr)
{
- if (fShutdown)
- return true;
+ boost::this_thread::interruption_point();
+
if (addr.nTime <= 100000000 || addr.nTime > nNow + 10 * 60)
addr.nTime = nNow - 5 * 24 * 60 * 60;
pfrom->AddAddressKnown(addr);
@@ -3239,8 +3365,7 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv)
{
const CInv &inv = vInv[nInv];
- if (fShutdown)
- return true;
+ boost::this_thread::interruption_point();
pfrom->AddInventoryKnown(inv);
bool fAlreadyHave = AlreadyHave(inv);
@@ -3280,101 +3405,11 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv)
if (fDebugNet || (vInv.size() != 1))
printf("received getdata (%"PRIszu" invsz)\n", vInv.size());
- vector<CInv> vNotFound;
- BOOST_FOREACH(const CInv& inv, vInv)
- {
- if (fShutdown)
- return true;
- if (fDebugNet || (vInv.size() == 1))
- printf("received getdata for: %s\n", inv.ToString().c_str());
+ if ((fDebugNet && vInv.size() > 0) || (vInv.size() == 1))
+ printf("received getdata for: %s\n", vInv[0].ToString().c_str());
- if (inv.type == MSG_BLOCK || inv.type == MSG_FILTERED_BLOCK)
- {
- // Send block from disk
- map<uint256, CBlockIndex*>::iterator mi = mapBlockIndex.find(inv.hash);
- if (mi != mapBlockIndex.end())
- {
- CBlock block;
- block.ReadFromDisk((*mi).second);
- if (inv.type == MSG_BLOCK)
- pfrom->PushMessage("block", block);
- else // MSG_FILTERED_BLOCK)
- {
- LOCK(pfrom->cs_filter);
- if (pfrom->pfilter)
- {
- CMerkleBlock merkleBlock(block, *pfrom->pfilter);
- pfrom->PushMessage("merkleblock", merkleBlock);
- // CMerkleBlock just contains hashes, so also push any transactions in the block the client did not see
- // This avoids hurting performance by pointlessly requiring a round-trip
- // Note that there is currently no way for a node to request any single transactions we didnt send here -
- // they must either disconnect and retry or request the full block.
- // Thus, the protocol spec specified allows for us to provide duplicate txn here,
- // however we MUST always provide at least what the remote peer needs
- typedef std::pair<unsigned int, uint256> PairType;
- BOOST_FOREACH(PairType& pair, merkleBlock.vMatchedTxn)
- if (!pfrom->setInventoryKnown.count(CInv(MSG_TX, pair.second)))
- pfrom->PushMessage("tx", block.vtx[pair.first]);
- }
- // else
- // no response
- }
-
- // Trigger them to send a getblocks request for the next batch of inventory
- if (inv.hash == pfrom->hashContinue)
- {
- // Bypass PushInventory, this must send even if redundant,
- // and we want it right after the last block so they don't
- // wait for other stuff first.
- vector<CInv> vInv;
- vInv.push_back(CInv(MSG_BLOCK, hashBestChain));
- pfrom->PushMessage("inv", vInv);
- pfrom->hashContinue = 0;
- }
- }
- }
- else if (inv.IsKnownType())
- {
- // Send stream from relay memory
- bool pushed = false;
- {
- LOCK(cs_mapRelay);
- map<CInv, CDataStream>::iterator mi = mapRelay.find(inv);
- if (mi != mapRelay.end()) {
- pfrom->PushMessage(inv.GetCommand(), (*mi).second);
- pushed = true;
- }
- }
- if (!pushed && inv.type == MSG_TX) {
- LOCK(mempool.cs);
- if (mempool.exists(inv.hash)) {
- CTransaction tx = mempool.lookup(inv.hash);
- CDataStream ss(SER_NETWORK, PROTOCOL_VERSION);
- ss.reserve(1000);
- ss << tx;
- pfrom->PushMessage("tx", ss);
- pushed = true;
- }
- }
- if (!pushed) {
- vNotFound.push_back(inv);
- }
- }
-
- // Track requests for our stuff.
- Inventory(inv.hash);
-
- if (!vNotFound.empty()) {
- // Let the peer know that we didn't find what it asked for, so it doesn't
- // have to wait around forever. Currently only SPV clients actually care
- // about this message: it's needed when they are recursively walking the
- // dependencies of relevant unconfirmed transactions. SPV clients want to
- // do that because they want to know about (and store and rebroadcast and
- // risk analyze) the dependencies of transactions relevant to them, without
- // having to download the entire memory pool.
- pfrom->PushMessage("notfound", vNotFound);
- }
- }
+ pfrom->vRecvGetData.insert(pfrom->vRecvGetData.end(), vInv.begin(), vInv.end());
+ ProcessGetData(pfrom);
}
@@ -3683,13 +3718,11 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv)
return true;
}
+// requires LOCK(cs_vRecvMsg)
bool ProcessMessages(CNode* pfrom)
{
- CDataStream& vRecv = pfrom->vRecv;
- if (vRecv.empty())
- return true;
//if (fDebug)
- // printf("ProcessMessages(%u bytes)\n", vRecv.size());
+ // printf("ProcessMessages(%zu messages)\n", pfrom->vRecvMsg.size());
//
// Message format
@@ -3699,33 +3732,41 @@ bool ProcessMessages(CNode* pfrom)
// (4) checksum
// (x) data
//
+ bool fOk = true;
- loop
- {
+ if (!pfrom->vRecvGetData.empty())
+ ProcessGetData(pfrom);
+
+ std::deque<CNetMessage>::iterator it = pfrom->vRecvMsg.begin();
+ while (!pfrom->fDisconnect && it != pfrom->vRecvMsg.end()) {
// Don't bother if send buffer is too full to respond anyway
- if (pfrom->vSend.size() >= SendBufferSize())
+ if (pfrom->nSendSize >= SendBufferSize())
+ break;
+
+ // get next message
+ CNetMessage& msg = *it;
+
+ //if (fDebug)
+ // printf("ProcessMessages(message %u msgsz, %zu bytes, complete:%s)\n",
+ // msg.hdr.nMessageSize, msg.vRecv.size(),
+ // msg.complete() ? "Y" : "N");
+
+ // end, if an incomplete message is found
+ if (!msg.complete())
break;
+ // at this point, any failure means we can delete the current message
+ it++;
+
// Scan for message start
- CDataStream::iterator pstart = search(vRecv.begin(), vRecv.end(), BEGIN(pchMessageStart), END(pchMessageStart));
- int nHeaderSize = vRecv.GetSerializeSize(CMessageHeader());
- if (vRecv.end() - pstart < nHeaderSize)
- {
- if ((int)vRecv.size() > nHeaderSize)
- {
- printf("\n\nPROCESSMESSAGE MESSAGESTART NOT FOUND\n\n");
- vRecv.erase(vRecv.begin(), vRecv.end() - nHeaderSize);
- }
+ if (memcmp(msg.hdr.pchMessageStart, pchMessageStart, sizeof(pchMessageStart)) != 0) {
+ printf("\n\nPROCESSMESSAGE: INVALID MESSAGESTART\n\n");
+ fOk = false;
break;
}
- if (pstart - vRecv.begin() > 0)
- printf("\n\nPROCESSMESSAGE SKIPPED %"PRIpdd" BYTES\n\n", pstart - vRecv.begin());
- vRecv.erase(vRecv.begin(), pstart);
// Read header
- vector<char> vHeaderSave(vRecv.begin(), vRecv.begin() + nHeaderSize);
- CMessageHeader hdr;
- vRecv >> hdr;
+ CMessageHeader& hdr = msg.hdr;
if (!hdr.IsValid())
{
printf("\n\nPROCESSMESSAGE: ERRORS IN HEADER %s\n\n\n", hdr.GetCommand().c_str());
@@ -3735,19 +3776,9 @@ bool ProcessMessages(CNode* pfrom)
// Message size
unsigned int nMessageSize = hdr.nMessageSize;
- if (nMessageSize > MAX_SIZE)
- {
- printf("ProcessMessages(%s, %u bytes) : nMessageSize > MAX_SIZE\n", strCommand.c_str(), nMessageSize);
- continue;
- }
- if (nMessageSize > vRecv.size())
- {
- // Rewind and wait for rest of message
- vRecv.insert(vRecv.begin(), vHeaderSave.begin(), vHeaderSave.end());
- break;
- }
// Checksum
+ CDataStream& vRecv = msg.vRecv;
uint256 hash = Hash(vRecv.begin(), vRecv.begin() + nMessageSize);
unsigned int nChecksum = 0;
memcpy(&nChecksum, &hash, sizeof(nChecksum));
@@ -3758,20 +3789,15 @@ bool ProcessMessages(CNode* pfrom)
continue;
}
- // Copy message to its own buffer
- CDataStream vMsg(vRecv.begin(), vRecv.begin() + nMessageSize, vRecv.nType, vRecv.nVersion);
- vRecv.ignore(nMessageSize);
-
// Process message
bool fRet = false;
try
{
{
LOCK(cs_main);
- fRet = ProcessMessage(pfrom, strCommand, vMsg);
+ fRet = ProcessMessage(pfrom, strCommand, vRecv);
}
- if (fShutdown)
- return true;
+ boost::this_thread::interruption_point();
}
catch (std::ios_base::failure& e)
{
@@ -3790,6 +3816,9 @@ bool ProcessMessages(CNode* pfrom)
PrintExceptionContinue(&e, "ProcessMessages()");
}
}
+ catch (boost::thread_interrupted) {
+ throw;
+ }
catch (std::exception& e) {
PrintExceptionContinue(&e, "ProcessMessages()");
} catch (...) {
@@ -3800,8 +3829,11 @@ bool ProcessMessages(CNode* pfrom)
printf("ProcessMessage(%s, %u bytes) FAILED\n", strCommand.c_str(), nMessageSize);
}
- vRecv.Compact();
- return true;
+ // In case the connection got shut down, its receive buffer was wiped
+ if (!pfrom->fDisconnect)
+ pfrom->vRecvMsg.erase(pfrom->vRecvMsg.begin(), it);
+
+ return fOk;
}
@@ -3815,7 +3847,7 @@ bool SendMessages(CNode* pto, bool fSendTrickle)
// Keep-alive ping. We send a nonce of zero because we don't use it anywhere
// right now.
- if (pto->nLastSend && GetTime() - pto->nLastSend > 30 * 60 && pto->vSend.empty()) {
+ if (pto->nLastSend && GetTime() - pto->nLastSend > 30 * 60 && pto->vSendMsg.empty()) {
uint64 nonce = 0;
if (pto->nVersion > BIP0031_VERSION)
pto->PushMessage("ping", nonce);
@@ -3958,7 +3990,6 @@ bool SendMessages(CNode* pto, bool fSendTrickle)
pto->PushMessage("getdata", vGetData);
vGetData.clear();
}
- mapAlreadyAskedFor[inv] = nNow;
}
pto->mapAskFor.erase(pto->mapAskFor.begin());
}
@@ -4053,6 +4084,8 @@ unsigned int static ScanHash_CryptoPP(char* pmidstate, char* pdata, char* phash1
nHashesDone = 0xffff+1;
return (unsigned int) -1;
}
+ if ((nNonce & 0xfff) == 0)
+ boost::this_thread::interruption_point();
}
}
@@ -4133,6 +4166,10 @@ CBlockTemplate* CreateNewBlock(CReserveKey& reservekey)
// Limit to betweeen 1K and MAX_BLOCK_SIZE-1K for sanity:
nBlockMaxSize = std::max((unsigned int)1000, std::min((unsigned int)(MAX_BLOCK_SIZE-1000), nBlockMaxSize));
+ // Special compatibility rule before 15 May: limit size to 500,000 bytes:
+ if (GetAdjustedTime() < 1368576000)
+ nBlockMaxSize = std::min(nBlockMaxSize, (unsigned int)(MAX_BLOCK_SIZE_GEN));
+
// How much of the block should be dedicated to high-priority transactions,
// included regardless of the fees they pay
unsigned int nBlockPrioritySize = GetArg("-blockprioritysize", 27000);
@@ -4466,37 +4503,19 @@ bool CheckWork(CBlock* pblock, CWallet& wallet, CReserveKey& reservekey)
return true;
}
-void static ThreadBitcoinMiner(void* parg);
-
-static bool fGenerateBitcoins = false;
-static bool fLimitProcessors = false;
-static int nLimitProcessors = -1;
-
void static BitcoinMiner(CWallet *pwallet)
{
printf("BitcoinMiner started\n");
SetThreadPriority(THREAD_PRIORITY_LOWEST);
-
- // Make this thread recognisable as the mining thread
RenameThread("bitcoin-miner");
// Each thread has its own key and counter
CReserveKey reservekey(pwallet);
unsigned int nExtraNonce = 0;
- while (fGenerateBitcoins)
- {
- if (fShutdown)
- return;
- while (vNodes.empty() || IsInitialBlockDownload())
- {
- Sleep(1000);
- if (fShutdown)
- return;
- if (!fGenerateBitcoins)
- return;
- }
-
+ try { loop {
+ while (vNodes.empty())
+ MilliSleep(1000);
//
// Create new block
@@ -4513,7 +4532,6 @@ void static BitcoinMiner(CWallet *pwallet)
printf("Running BitcoinMiner with %"PRIszu" transactions in block (%u bytes)\n", pblock->vtx.size(),
::GetSerializeSize(*pblock, SER_NETWORK, PROTOCOL_VERSION));
-
//
// Pre-build hash buffers
//
@@ -4586,19 +4604,14 @@ void static BitcoinMiner(CWallet *pwallet)
if (GetTime() - nLogTime > 30 * 60)
{
nLogTime = GetTime();
- printf("hashmeter %3d CPUs %6.0f khash/s\n", vnThreadsRunning[THREAD_MINER], dHashesPerSec/1000.0);
+ printf("hashmeter %6.0f khash/s\n", dHashesPerSec/1000.0);
}
}
}
}
// Check for stop or if block needs to be rebuilt
- if (fShutdown)
- return;
- if (!fGenerateBitcoins)
- return;
- if (fLimitProcessors && vnThreadsRunning[THREAD_MINER] > nLimitProcessors)
- return;
+ boost::this_thread::interruption_point();
if (vNodes.empty())
break;
if (nBlockNonce >= 0xffff0000)
@@ -4618,57 +4631,35 @@ void static BitcoinMiner(CWallet *pwallet)
hashTarget = CBigNum().SetCompact(pblock->nBits).getuint256();
}
}
- }
-}
-
-void static ThreadBitcoinMiner(void* parg)
-{
- CWallet* pwallet = (CWallet*)parg;
- try
+ } }
+ catch (boost::thread_interrupted)
{
- vnThreadsRunning[THREAD_MINER]++;
- BitcoinMiner(pwallet);
- vnThreadsRunning[THREAD_MINER]--;
- }
- catch (std::exception& e) {
- vnThreadsRunning[THREAD_MINER]--;
- PrintException(&e, "ThreadBitcoinMiner()");
- } catch (...) {
- vnThreadsRunning[THREAD_MINER]--;
- PrintException(NULL, "ThreadBitcoinMiner()");
- }
- nHPSTimerStart = 0;
- if (vnThreadsRunning[THREAD_MINER] == 0)
- dHashesPerSec = 0;
- printf("ThreadBitcoinMiner exiting, %d threads remaining\n", vnThreadsRunning[THREAD_MINER]);
+ printf("BitcoinMiner terminated\n");
+ throw;
+ }
}
-
void GenerateBitcoins(bool fGenerate, CWallet* pwallet)
{
- fGenerateBitcoins = fGenerate;
- nLimitProcessors = GetArg("-genproclimit", -1);
- if (nLimitProcessors == 0)
- fGenerateBitcoins = false;
- fLimitProcessors = (nLimitProcessors != -1);
+ static boost::thread_group* minerThreads = NULL;
- if (fGenerate)
+ int nThreads = GetArg("-genproclimit", -1);
+ if (nThreads < 0)
+ nThreads = boost::thread::hardware_concurrency();
+
+ if (minerThreads != NULL)
{
- int nProcessors = boost::thread::hardware_concurrency();
- printf("%d processors\n", nProcessors);
- if (nProcessors < 1)
- nProcessors = 1;
- if (fLimitProcessors && nProcessors > nLimitProcessors)
- nProcessors = nLimitProcessors;
- int nAddThreads = nProcessors - vnThreadsRunning[THREAD_MINER];
- printf("Starting %d BitcoinMiner threads\n", nAddThreads);
- for (int i = 0; i < nAddThreads; i++)
- {
- if (!NewThread(ThreadBitcoinMiner, pwallet))
- printf("Error: NewThread(ThreadBitcoinMiner) failed\n");
- Sleep(10);
- }
+ minerThreads->interrupt_all();
+ delete minerThreads;
+ minerThreads = NULL;
}
+
+ if (nThreads == 0 || !fGenerate)
+ return;
+
+ minerThreads = new boost::thread_group();
+ for (int i = 0; i < nThreads; i++)
+ minerThreads->create_thread(boost::bind(&BitcoinMiner, pwallet));
}
// Amount compression:
@@ -4724,3 +4715,29 @@ uint64 CTxOutCompressor::DecompressAmount(uint64 x)
}
return n;
}
+
+
+class CMainCleanup
+{
+public:
+ CMainCleanup() {}
+ ~CMainCleanup() {
+ // block headers
+ std::map<uint256, CBlockIndex*>::iterator it1 = mapBlockIndex.begin();
+ for (; it1 != mapBlockIndex.end(); it1++)
+ delete (*it1).second;
+ mapBlockIndex.clear();
+
+ // orphan blocks
+ std::map<uint256, CBlock*>::iterator it2 = mapOrphanBlocks.begin();
+ for (; it2 != mapOrphanBlocks.end(); it2++)
+ delete (*it2).second;
+ mapOrphanBlocks.clear();
+
+ // orphan transactions
+ std::map<uint256, CDataStream*>::iterator it3 = mapOrphanTransactions.begin();
+ for (; it3 != mapOrphanTransactions.end(); it3++)
+ delete (*it3).second;
+ mapOrphanTransactions.clear();
+ }
+} instance_of_cmaincleanup;
diff --git a/src/main.h b/src/main.h
index 4a217d1746..303588306d 100644
--- a/src/main.h
+++ b/src/main.h
@@ -28,7 +28,7 @@ struct CBlockIndexWorkComparator;
static const unsigned int MAX_BLOCK_SIZE = 1000000;
/** The maximum size for mined blocks */
static const unsigned int MAX_BLOCK_SIZE_GEN = MAX_BLOCK_SIZE/2;
-/** The maximum size for transactions we're willing to relay/mine **/
+/** The maximum size for transactions we're willing to relay/mine */
static const unsigned int MAX_STANDARD_TX_SIZE = MAX_BLOCK_SIZE_GEN/5;
/** The maximum allowed number of signature check operations in a block (network rule) */
static const unsigned int MAX_BLOCK_SIGOPS = MAX_BLOCK_SIZE/50;
@@ -45,7 +45,7 @@ static const unsigned int UNDOFILE_CHUNK_SIZE = 0x100000; // 1 MiB
/** Fake height value used in CCoins to signify they are only in the memory pool (since 0.8) */
static const unsigned int MEMPOOL_HEIGHT = 0x7FFFFFFF;
/** Fees smaller than this (in satoshi) are considered zero fee (for transaction creation) */
-static const int64 MIN_TX_FEE = 50000;
+static const int64 MIN_TX_FEE = 10000;
/** Fees smaller than this (in satoshi) are considered zero fee (for relaying) */
static const int64 MIN_RELAY_TX_FEE = 10000;
/** No amount larger than this (in satoshi) is valid */
@@ -118,7 +118,6 @@ class CValidationState;
struct CBlockTemplate;
-
/** Register a wallet to receive updates from core */
void RegisterWallet(CWallet* pwalletIn);
/** Unregister a wallet from core */
@@ -151,12 +150,8 @@ CBlockIndex* FindBlockByHeight(int nHeight);
bool ProcessMessages(CNode* pfrom);
/** Send queued protocol messages to be sent to a give node */
bool SendMessages(CNode* pto, bool fSendTrickle);
-/** Run the importer thread, which deals with reindexing, loading bootstrap.dat, and whatever is passed to -loadblock */
-void ThreadImport(void *parg);
/** Run an instance of the script checking thread */
-void ThreadScriptCheck(void* parg);
-/** Stop the script checking threads */
-void ThreadScriptCheckQuit();
+void ThreadScriptCheck();
/** Run the miner threads */
void GenerateBitcoins(bool fGenerate, CWallet* pwallet);
/** Generate a new block, without valid proof-of-work */
@@ -909,6 +904,15 @@ public:
void Cleanup() {
while (vout.size() > 0 && vout.back().IsNull())
vout.pop_back();
+ if (vout.empty())
+ std::vector<CTxOut>().swap(vout);
+ }
+
+ void swap(CCoins &to) {
+ std::swap(to.fCoinBase, fCoinBase);
+ to.vout.swap(vout);
+ std::swap(to.nHeight, nHeight);
+ std::swap(to.nVersion, nVersion);
}
// equality test
@@ -1549,7 +1553,7 @@ public:
}
std::string ToString() const {
- return strprintf("CBlockFileInfo(blocks=%u, size=%u, heights=%u..%u, time=%s..%s)", nBlocks, nSize, nHeightFirst, nHeightLast, DateTimeStrFormat("%Y-%m-%d", nTimeFirst).c_str(), DateTimeStrFormat("%Y-%m-%d", nTimeLast).c_str());
+ return strprintf("CBlockFileInfo(blocks=%u, size=%u, heights=%u...%u, time=%s...%s)", nBlocks, nSize, nHeightFirst, nHeightLast, DateTimeStrFormat("%Y-%m-%d", nTimeFirst).c_str(), DateTimeStrFormat("%Y-%m-%d", nTimeLast).c_str());
}
// update statistics (does not update nSize)
@@ -2109,14 +2113,14 @@ class CCoinsView
{
public:
// Retrieve the CCoins (unspent transaction outputs) for a given txid
- virtual bool GetCoins(uint256 txid, CCoins &coins);
+ virtual bool GetCoins(const uint256 &txid, CCoins &coins);
// Modify the CCoins for a given txid
- virtual bool SetCoins(uint256 txid, const CCoins &coins);
+ virtual bool SetCoins(const uint256 &txid, const CCoins &coins);
// Just check whether we have data for a given txid.
// This may (but cannot always) return true for fully spent transactions
- virtual bool HaveCoins(uint256 txid);
+ virtual bool HaveCoins(const uint256 &txid);
// Retrieve the block index whose state this CCoinsView currently represents
virtual CBlockIndex *GetBestBlock();
@@ -2142,9 +2146,9 @@ protected:
public:
CCoinsViewBacked(CCoinsView &viewIn);
- bool GetCoins(uint256 txid, CCoins &coins);
- bool SetCoins(uint256 txid, const CCoins &coins);
- bool HaveCoins(uint256 txid);
+ bool GetCoins(const uint256 &txid, CCoins &coins);
+ bool SetCoins(const uint256 &txid, const CCoins &coins);
+ bool HaveCoins(const uint256 &txid);
CBlockIndex *GetBestBlock();
bool SetBestBlock(CBlockIndex *pindex);
void SetBackend(CCoinsView &viewIn);
@@ -2163,9 +2167,9 @@ public:
CCoinsViewCache(CCoinsView &baseIn, bool fDummy = false);
// Standard CCoinsView methods
- bool GetCoins(uint256 txid, CCoins &coins);
- bool SetCoins(uint256 txid, const CCoins &coins);
- bool HaveCoins(uint256 txid);
+ bool GetCoins(const uint256 &txid, CCoins &coins);
+ bool SetCoins(const uint256 &txid, const CCoins &coins);
+ bool HaveCoins(const uint256 &txid);
CBlockIndex *GetBestBlock();
bool SetBestBlock(CBlockIndex *pindex);
bool BatchWrite(const std::map<uint256, CCoins> &mapCoins, CBlockIndex *pindex);
@@ -2173,7 +2177,7 @@ public:
// Return a modifiable reference to a CCoins. Check HaveCoins first.
// Many methods explicitly require a CCoinsViewCache because of this method, to reduce
// copying.
- CCoins &GetCoins(uint256 txid);
+ CCoins &GetCoins(const uint256 &txid);
// Push the modifications applied to this cache to its base.
// Failure to call this method before destruction will cause the changes to be forgotten.
@@ -2183,7 +2187,7 @@ public:
unsigned int GetCacheSize();
private:
- std::map<uint256,CCoins>::iterator FetchCoins(uint256 txid);
+ std::map<uint256,CCoins>::iterator FetchCoins(const uint256 &txid);
};
/** CCoinsView that brings transactions from a memorypool into view.
@@ -2195,8 +2199,8 @@ protected:
public:
CCoinsViewMemPool(CCoinsView &baseIn, CTxMemPool &mempoolIn);
- bool GetCoins(uint256 txid, CCoins &coins);
- bool HaveCoins(uint256 txid);
+ bool GetCoins(const uint256 &txid, CCoins &coins);
+ bool HaveCoins(const uint256 &txid);
};
/** Global variable that points to the active CCoinsView (protected by cs_main) */
diff --git a/src/makefile.linux-mingw b/src/makefile.linux-mingw
index a8be599099..7719cd2637 100644
--- a/src/makefile.linux-mingw
+++ b/src/makefile.linux-mingw
@@ -71,7 +71,6 @@ OBJS= \
obj/key.o \
obj/db.o \
obj/init.o \
- obj/irc.o \
obj/keystore.o \
obj/main.o \
obj/net.o \
diff --git a/src/makefile.mingw b/src/makefile.mingw
index 2e092ff686..8b5a5dccd9 100644
--- a/src/makefile.mingw
+++ b/src/makefile.mingw
@@ -79,7 +79,6 @@ OBJS= \
obj/key.o \
obj/db.o \
obj/init.o \
- obj/irc.o \
obj/keystore.o \
obj/main.o \
obj/net.o \
diff --git a/src/makefile.osx b/src/makefile.osx
index cdee781257..af12731fa4 100644
--- a/src/makefile.osx
+++ b/src/makefile.osx
@@ -80,7 +80,6 @@ OBJS= \
obj/key.o \
obj/db.o \
obj/init.o \
- obj/irc.o \
obj/keystore.o \
obj/main.o \
obj/net.o \
diff --git a/src/makefile.unix b/src/makefile.unix
index 1dd44b2eeb..081edaf63e 100644
--- a/src/makefile.unix
+++ b/src/makefile.unix
@@ -115,7 +115,6 @@ OBJS= \
obj/key.o \
obj/db.o \
obj/init.o \
- obj/irc.o \
obj/keystore.o \
obj/main.o \
obj/net.o \
diff --git a/src/net.cpp b/src/net.cpp
index 3406a28b0e..910baf6b56 100644
--- a/src/net.cpp
+++ b/src/net.cpp
@@ -3,7 +3,6 @@
// Distributed under the MIT/X11 software license, see the accompanying
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
-#include "irc.h"
#include "db.h"
#include "net.h"
#include "init.h"
@@ -27,14 +26,6 @@ using namespace boost;
static const int MAX_OUTBOUND_CONNECTIONS = 8;
-void ThreadMessageHandler2(void* parg);
-void ThreadSocketHandler2(void* parg);
-void ThreadOpenConnections2(void* parg);
-void ThreadOpenAddedConnections2(void* parg);
-#ifdef USE_UPNP
-void ThreadMapPort2(void* parg);
-#endif
-void ThreadDNSAddressSeed2(void* parg);
bool OpenNetworkConnection(const CAddress& addrConnect, CSemaphoreGrant *grantOutbound = NULL, const char *strDest = NULL, bool fOneShot = false);
@@ -47,7 +38,6 @@ struct LocalServiceInfo {
// Global state variables
//
bool fDiscover = true;
-bool fUseUPnP = false;
uint64 nLocalServices = NODE_NETWORK;
static CCriticalSection cs_mapLocalHost;
static map<CNetAddr, LocalServiceInfo> mapLocalHost;
@@ -55,7 +45,6 @@ static bool vfReachable[NET_MAX] = {};
static bool vfLimited[NET_MAX] = {};
static CNode* pnodeLocalHost = NULL;
uint64 nLocalHostNonce = 0;
-array<int, THREAD_MAX> vnThreadsRunning;
static std::vector<SOCKET> vhListenSocket;
CAddrMan addrman;
@@ -64,7 +53,7 @@ CCriticalSection cs_vNodes;
map<CInv, CDataStream> mapRelay;
deque<pair<int64, CInv> > vRelayExpiration;
CCriticalSection cs_mapRelay;
-map<CInv, int64> mapAlreadyAskedFor;
+limitedmap<CInv, int64> mapAlreadyAskedFor(MAX_INV_SZ);
static deque<string> vOneShots;
CCriticalSection cs_vOneShots;
@@ -157,8 +146,7 @@ bool RecvLine(SOCKET hSocket, string& strLine)
}
else if (nBytes <= 0)
{
- if (fShutdown)
- return false;
+ boost::this_thread::interruption_point();
if (nBytes < 0)
{
int nErr = WSAGetLastError();
@@ -166,7 +154,7 @@ bool RecvLine(SOCKET hSocket, string& strLine)
continue;
if (nErr == WSAEWOULDBLOCK || nErr == WSAEINTR || nErr == WSAEINPROGRESS)
{
- Sleep(10);
+ MilliSleep(10);
continue;
}
}
@@ -347,7 +335,6 @@ bool GetMyExternalIP2(const CService& addrConnect, const char* pszGet, const cha
return error("GetMyExternalIP() : connection closed");
}
-// We now get our external IP from the IRC server first and only use this as a backup
bool GetMyExternalIP(CNetAddr& ipRet)
{
CService addrConnect;
@@ -357,13 +344,13 @@ bool GetMyExternalIP(CNetAddr& ipRet)
for (int nLookup = 0; nLookup <= 1; nLookup++)
for (int nHost = 1; nHost <= 2; nHost++)
{
- // We should be phasing out our use of sites like these. If we need
+ // We should be phasing out our use of sites like these. If we need
// replacements, we should ask for volunteers to put this simple
// php file on their web server that prints the client IP:
// <?php echo $_SERVER["REMOTE_ADDR"]; ?>
if (nHost == 1)
{
- addrConnect = CService("91.198.22.70",80); // checkip.dyndns.org
+ addrConnect = CService("91.198.22.70", 80); // checkip.dyndns.org
if (nLookup == 1)
{
@@ -437,12 +424,10 @@ void AddressCurrentlyConnected(const CService& addr)
CNode* FindNode(const CNetAddr& ip)
{
- {
- LOCK(cs_vNodes);
- BOOST_FOREACH(CNode* pnode, vNodes)
- if ((CNetAddr)pnode->addr == ip)
- return (pnode);
- }
+ LOCK(cs_vNodes);
+ BOOST_FOREACH(CNode* pnode, vNodes)
+ if ((CNetAddr)pnode->addr == ip)
+ return (pnode);
return NULL;
}
@@ -457,16 +442,14 @@ CNode* FindNode(std::string addrName)
CNode* FindNode(const CService& addr)
{
- {
- LOCK(cs_vNodes);
- BOOST_FOREACH(CNode* pnode, vNodes)
- if ((CService)pnode->addr == addr)
- return (pnode);
- }
+ LOCK(cs_vNodes);
+ BOOST_FOREACH(CNode* pnode, vNodes)
+ if ((CService)pnode->addr == addr)
+ return (pnode);
return NULL;
}
-CNode* ConnectNode(CAddress addrConnect, const char *pszDest, int64 nTimeout)
+CNode* ConnectNode(CAddress addrConnect, const char *pszDest)
{
if (pszDest == NULL) {
if (IsLocal(addrConnect))
@@ -476,10 +459,7 @@ CNode* ConnectNode(CAddress addrConnect, const char *pszDest, int64 nTimeout)
CNode* pnode = FindNode((CService)addrConnect);
if (pnode)
{
- if (nTimeout != 0)
- pnode->AddRef(nTimeout);
- else
- pnode->AddRef();
+ pnode->AddRef();
return pnode;
}
}
@@ -511,10 +491,7 @@ CNode* ConnectNode(CAddress addrConnect, const char *pszDest, int64 nTimeout)
// Add node
CNode* pnode = new CNode(hSocket, addrConnect, pszDest ? pszDest : "", false);
- if (nTimeout != 0)
- pnode->AddRef(nTimeout);
- else
- pnode->AddRef();
+ pnode->AddRef();
{
LOCK(cs_vNodes);
@@ -538,7 +515,11 @@ void CNode::CloseSocketDisconnect()
printf("disconnecting node %s\n", addrName.c_str());
closesocket(hSocket);
hSocket = INVALID_SOCKET;
- vRecv.clear();
+
+ // in case this fails, we'll empty the recv buffer when the CNode is deleted
+ TRY_LOCK(cs_vRecvMsg, lockRecv);
+ if (lockRecv)
+ vRecvMsg.clear();
}
}
@@ -624,48 +605,138 @@ void CNode::copyStats(CNodeStats &stats)
X(nVersion);
X(strSubVer);
X(fInbound);
- X(nReleaseTime);
X(nStartingHeight);
X(nMisbehavior);
}
#undef X
+// requires LOCK(cs_vRecvMsg)
+bool CNode::ReceiveMsgBytes(const char *pch, unsigned int nBytes)
+{
+ while (nBytes > 0) {
+ // get current incomplete message, or create a new one
+ if (vRecvMsg.empty() ||
+ vRecvMsg.back().complete())
+ vRecvMsg.push_back(CNetMessage(SER_NETWORK, nRecvVersion));
+ CNetMessage& msg = vRecvMsg.back();
+ // absorb network data
+ int handled;
+ if (!msg.in_data)
+ handled = msg.readHeader(pch, nBytes);
+ else
+ handled = msg.readData(pch, nBytes);
+ if (handled < 0)
+ return false;
+
+ pch += handled;
+ nBytes -= handled;
+ }
+
+ return true;
+}
+int CNetMessage::readHeader(const char *pch, unsigned int nBytes)
+{
+ // copy data to temporary parsing buffer
+ unsigned int nRemaining = 24 - nHdrPos;
+ unsigned int nCopy = std::min(nRemaining, nBytes);
+
+ memcpy(&hdrbuf[nHdrPos], pch, nCopy);
+ nHdrPos += nCopy;
+
+ // if header incomplete, exit
+ if (nHdrPos < 24)
+ return nCopy;
+
+ // deserialize to CMessageHeader
+ try {
+ hdrbuf >> hdr;
+ }
+ catch (std::exception &e) {
+ return -1;
+ }
+ // reject messages larger than MAX_SIZE
+ if (hdr.nMessageSize > MAX_SIZE)
+ return -1;
+ // switch state to reading message data
+ in_data = true;
+ vRecv.resize(hdr.nMessageSize);
+ return nCopy;
+}
-void ThreadSocketHandler(void* parg)
+int CNetMessage::readData(const char *pch, unsigned int nBytes)
{
- // Make this thread recognisable as the networking thread
- RenameThread("bitcoin-net");
+ unsigned int nRemaining = hdr.nMessageSize - nDataPos;
+ unsigned int nCopy = std::min(nRemaining, nBytes);
- try
- {
- vnThreadsRunning[THREAD_SOCKETHANDLER]++;
- ThreadSocketHandler2(parg);
- vnThreadsRunning[THREAD_SOCKETHANDLER]--;
+ memcpy(&vRecv[nDataPos], pch, nCopy);
+ nDataPos += nCopy;
+
+ return nCopy;
+}
+
+
+
+
+
+
+
+
+
+// requires LOCK(cs_vSend)
+void SocketSendData(CNode *pnode)
+{
+ std::deque<CSerializeData>::iterator it = pnode->vSendMsg.begin();
+
+ while (it != pnode->vSendMsg.end()) {
+ const CSerializeData &data = *it;
+ assert(data.size() > pnode->nSendOffset);
+ int nBytes = send(pnode->hSocket, &data[pnode->nSendOffset], data.size() - pnode->nSendOffset, MSG_NOSIGNAL | MSG_DONTWAIT);
+ if (nBytes > 0) {
+ pnode->nLastSend = GetTime();
+ pnode->nSendOffset += nBytes;
+ if (pnode->nSendOffset == data.size()) {
+ pnode->nSendOffset = 0;
+ pnode->nSendSize -= data.size();
+ it++;
+ } else {
+ // could not send full message; stop sending more
+ break;
+ }
+ } else {
+ if (nBytes < 0) {
+ // error
+ int nErr = WSAGetLastError();
+ if (nErr != WSAEWOULDBLOCK && nErr != WSAEMSGSIZE && nErr != WSAEINTR && nErr != WSAEINPROGRESS)
+ {
+ printf("socket send error %d\n", nErr);
+ pnode->CloseSocketDisconnect();
+ }
+ }
+ // couldn't send anything at all
+ break;
+ }
}
- catch (std::exception& e) {
- vnThreadsRunning[THREAD_SOCKETHANDLER]--;
- PrintException(&e, "ThreadSocketHandler()");
- } catch (...) {
- vnThreadsRunning[THREAD_SOCKETHANDLER]--;
- throw; // support pthread_cancel()
+
+ if (it == pnode->vSendMsg.end()) {
+ assert(pnode->nSendOffset == 0);
+ assert(pnode->nSendSize == 0);
}
- printf("ThreadSocketHandler exited\n");
+ pnode->vSendMsg.erase(pnode->vSendMsg.begin(), it);
}
-void ThreadSocketHandler2(void* parg)
+static list<CNode*> vNodesDisconnected;
+
+void ThreadSocketHandler()
{
- printf("ThreadSocketHandler started\n");
- list<CNode*> vNodesDisconnected;
unsigned int nPrevNodeCount = 0;
-
loop
{
//
@@ -678,7 +749,7 @@ void ThreadSocketHandler2(void* parg)
BOOST_FOREACH(CNode* pnode, vNodesCopy)
{
if (pnode->fDisconnect ||
- (pnode->GetRefCount() <= 0 && pnode->vRecv.empty() && pnode->vSend.empty()))
+ (pnode->GetRefCount() <= 0 && pnode->vRecvMsg.empty() && pnode->nSendSize == 0 && pnode->ssSend.empty()))
{
// remove from vNodes
vNodes.erase(remove(vNodes.begin(), vNodes.end(), pnode), vNodes.end());
@@ -691,7 +762,6 @@ void ThreadSocketHandler2(void* parg)
pnode->Cleanup();
// hold in disconnected pool until all refs are released
- pnode->nReleaseTime = max(pnode->nReleaseTime, GetTime() + 15 * 60);
if (pnode->fNetworkNode || pnode->fInbound)
pnode->Release();
vNodesDisconnected.push_back(pnode);
@@ -710,7 +780,7 @@ void ThreadSocketHandler2(void* parg)
TRY_LOCK(pnode->cs_vSend, lockSend);
if (lockSend)
{
- TRY_LOCK(pnode->cs_vRecv, lockRecv);
+ TRY_LOCK(pnode->cs_vRecvMsg, lockRecv);
if (lockRecv)
{
TRY_LOCK(pnode->cs_inventory, lockInv);
@@ -761,24 +831,26 @@ void ThreadSocketHandler2(void* parg)
{
if (pnode->hSocket == INVALID_SOCKET)
continue;
- FD_SET(pnode->hSocket, &fdsetRecv);
- FD_SET(pnode->hSocket, &fdsetError);
- hSocketMax = max(hSocketMax, pnode->hSocket);
- have_fds = true;
{
TRY_LOCK(pnode->cs_vSend, lockSend);
- if (lockSend && !pnode->vSend.empty())
- FD_SET(pnode->hSocket, &fdsetSend);
+ if (lockSend) {
+ // do not read, if draining write queue
+ if (!pnode->vSendMsg.empty())
+ FD_SET(pnode->hSocket, &fdsetSend);
+ else
+ FD_SET(pnode->hSocket, &fdsetRecv);
+ FD_SET(pnode->hSocket, &fdsetError);
+ hSocketMax = max(hSocketMax, pnode->hSocket);
+ have_fds = true;
+ }
}
}
}
- vnThreadsRunning[THREAD_SOCKETHANDLER]--;
int nSelect = select(have_fds ? hSocketMax + 1 : 0,
&fdsetRecv, &fdsetSend, &fdsetError, &timeout);
- vnThreadsRunning[THREAD_SOCKETHANDLER]++;
- if (fShutdown)
- return;
+ boost::this_thread::interruption_point();
+
if (nSelect == SOCKET_ERROR)
{
if (have_fds)
@@ -790,7 +862,7 @@ void ThreadSocketHandler2(void* parg)
}
FD_ZERO(&fdsetSend);
FD_ZERO(&fdsetError);
- Sleep(timeout.tv_usec/1000);
+ MilliSleep(timeout.tv_usec/1000);
}
@@ -865,8 +937,7 @@ void ThreadSocketHandler2(void* parg)
}
BOOST_FOREACH(CNode* pnode, vNodesCopy)
{
- if (fShutdown)
- return;
+ boost::this_thread::interruption_point();
//
// Receive
@@ -875,15 +946,12 @@ void ThreadSocketHandler2(void* parg)
continue;
if (FD_ISSET(pnode->hSocket, &fdsetRecv) || FD_ISSET(pnode->hSocket, &fdsetError))
{
- TRY_LOCK(pnode->cs_vRecv, lockRecv);
+ TRY_LOCK(pnode->cs_vRecvMsg, lockRecv);
if (lockRecv)
{
- CDataStream& vRecv = pnode->vRecv;
- unsigned int nPos = vRecv.size();
-
- if (nPos > ReceiveBufferSize()) {
+ if (pnode->GetTotalRecvSize() > ReceiveFloodSize()) {
if (!pnode->fDisconnect)
- printf("socket recv flood control disconnect (%"PRIszu" bytes)\n", vRecv.size());
+ printf("socket recv flood control disconnect (%u bytes)\n", pnode->GetTotalRecvSize());
pnode->CloseSocketDisconnect();
}
else {
@@ -892,8 +960,8 @@ void ThreadSocketHandler2(void* parg)
int nBytes = recv(pnode->hSocket, pchBuf, sizeof(pchBuf), MSG_DONTWAIT);
if (nBytes > 0)
{
- vRecv.resize(nPos + nBytes);
- memcpy(&vRecv[nPos], pchBuf, nBytes);
+ if (!pnode->ReceiveMsgBytes(pchBuf, nBytes))
+ pnode->CloseSocketDisconnect();
pnode->nLastRecv = GetTime();
}
else if (nBytes == 0)
@@ -927,34 +995,13 @@ void ThreadSocketHandler2(void* parg)
{
TRY_LOCK(pnode->cs_vSend, lockSend);
if (lockSend)
- {
- CDataStream& vSend = pnode->vSend;
- if (!vSend.empty())
- {
- int nBytes = send(pnode->hSocket, &vSend[0], vSend.size(), MSG_NOSIGNAL | MSG_DONTWAIT);
- if (nBytes > 0)
- {
- vSend.erase(vSend.begin(), vSend.begin() + nBytes);
- pnode->nLastSend = GetTime();
- }
- else if (nBytes < 0)
- {
- // error
- int nErr = WSAGetLastError();
- if (nErr != WSAEWOULDBLOCK && nErr != WSAEMSGSIZE && nErr != WSAEINTR && nErr != WSAEINPROGRESS)
- {
- printf("socket send error %d\n", nErr);
- pnode->CloseSocketDisconnect();
- }
- }
- }
- }
+ SocketSendData(pnode);
}
//
// Inactivity checking
//
- if (pnode->vSend.empty())
+ if (pnode->vSendMsg.empty())
pnode->nLastSendEmpty = GetTime();
if (GetTime() - pnode->nTimeConnected > 60)
{
@@ -981,7 +1028,7 @@ void ThreadSocketHandler2(void* parg)
pnode->Release();
}
- Sleep(10);
+ MilliSleep(10);
}
}
@@ -994,31 +1041,8 @@ void ThreadSocketHandler2(void* parg)
#ifdef USE_UPNP
-void ThreadMapPort(void* parg)
-{
- // Make this thread recognisable as the UPnP thread
- RenameThread("bitcoin-UPnP");
-
- try
- {
- vnThreadsRunning[THREAD_UPNP]++;
- ThreadMapPort2(parg);
- vnThreadsRunning[THREAD_UPNP]--;
- }
- catch (std::exception& e) {
- vnThreadsRunning[THREAD_UPNP]--;
- PrintException(&e, "ThreadMapPort()");
- } catch (...) {
- vnThreadsRunning[THREAD_UPNP]--;
- PrintException(NULL, "ThreadMapPort()");
- }
- printf("ThreadMapPort exited\n");
-}
-
-void ThreadMapPort2(void* parg)
+void ThreadMapPort()
{
- printf("ThreadMapPort started\n");
-
std::string port = strprintf("%u", GetListenPort());
const char * multicastif = 0;
const char * minissdpdpath = 0;
@@ -1059,33 +1083,9 @@ void ThreadMapPort2(void* parg)
}
string strDesc = "Bitcoin " + FormatFullVersion();
-#ifndef UPNPDISCOVER_SUCCESS
- /* miniupnpc 1.5 */
- r = UPNP_AddPortMapping(urls.controlURL, data.first.servicetype,
- port.c_str(), port.c_str(), lanaddr, strDesc.c_str(), "TCP", 0);
-#else
- /* miniupnpc 1.6 */
- r = UPNP_AddPortMapping(urls.controlURL, data.first.servicetype,
- port.c_str(), port.c_str(), lanaddr, strDesc.c_str(), "TCP", 0, "0");
-#endif
- if(r!=UPNPCOMMAND_SUCCESS)
- printf("AddPortMapping(%s, %s, %s) failed with code %d (%s)\n",
- port.c_str(), port.c_str(), lanaddr, r, strupnperror(r));
- else
- printf("UPnP Port Mapping successful.\n");
- int i = 1;
- loop {
- if (fShutdown || !fUseUPnP)
- {
- r = UPNP_DeletePortMapping(urls.controlURL, data.first.servicetype, port.c_str(), "TCP", 0);
- printf("UPNP_DeletePortMapping() returned : %d\n", r);
- freeUPNPDevlist(devlist); devlist = 0;
- FreeUPNPUrls(&urls);
- return;
- }
- if (i % 600 == 0) // Refresh every 20 minutes
- {
+ try {
+ loop {
#ifndef UPNPDISCOVER_SUCCESS
/* miniupnpc 1.5 */
r = UPNP_AddPortMapping(urls.controlURL, data.first.servicetype,
@@ -1101,33 +1101,49 @@ void ThreadMapPort2(void* parg)
port.c_str(), port.c_str(), lanaddr, r, strupnperror(r));
else
printf("UPnP Port Mapping successful.\n");;
+
+ MilliSleep(20*60*1000); // Refresh every 20 minutes
}
- Sleep(2000);
- i++;
+ }
+ catch (boost::thread_interrupted)
+ {
+ r = UPNP_DeletePortMapping(urls.controlURL, data.first.servicetype, port.c_str(), "TCP", 0);
+ printf("UPNP_DeletePortMapping() returned : %d\n", r);
+ freeUPNPDevlist(devlist); devlist = 0;
+ FreeUPNPUrls(&urls);
+ throw;
}
} else {
printf("No valid UPnP IGDs found\n");
freeUPNPDevlist(devlist); devlist = 0;
if (r != 0)
FreeUPNPUrls(&urls);
- loop {
- if (fShutdown || !fUseUPnP)
- return;
- Sleep(2000);
- }
}
}
-void MapPort()
+void MapPort(bool fUseUPnP)
{
- if (fUseUPnP && vnThreadsRunning[THREAD_UPNP] < 1)
+ static boost::thread* upnp_thread = NULL;
+
+ if (fUseUPnP)
{
- if (!NewThread(ThreadMapPort, NULL))
- printf("Error: ThreadMapPort(ThreadMapPort) failed\n");
+ if (upnp_thread) {
+ upnp_thread->interrupt();
+ upnp_thread->join();
+ delete upnp_thread;
+ }
+ upnp_thread = new boost::thread(boost::bind(&TraceThread<boost::function<void()> >, "upnp", &ThreadMapPort));
+ }
+ else if (upnp_thread) {
+ upnp_thread->interrupt();
+ upnp_thread->join();
+ delete upnp_thread;
+ upnp_thread = NULL;
}
}
+
#else
-void MapPort()
+void MapPort(bool)
{
// Intentionally left blank.
}
@@ -1155,35 +1171,14 @@ static const char *strMainNetDNSSeed[][2] = {
static const char *strTestNetDNSSeed[][2] = {
{"bitcoin.petertodd.org", "testnet-seed.bitcoin.petertodd.org"},
+ {"bluematt.me", "testnet-seed.bluematt.me"},
{NULL, NULL}
};
-void ThreadDNSAddressSeed(void* parg)
-{
- // Make this thread recognisable as the DNS seeding thread
- RenameThread("bitcoin-dnsseed");
-
- try
- {
- vnThreadsRunning[THREAD_DNSSEED]++;
- ThreadDNSAddressSeed2(parg);
- vnThreadsRunning[THREAD_DNSSEED]--;
- }
- catch (std::exception& e) {
- vnThreadsRunning[THREAD_DNSSEED]--;
- PrintException(&e, "ThreadDNSAddressSeed()");
- } catch (...) {
- vnThreadsRunning[THREAD_DNSSEED]--;
- throw; // support pthread_cancel()
- }
- printf("ThreadDNSAddressSeed exited\n");
-}
-
-void ThreadDNSAddressSeed2(void* parg)
+void ThreadDNSAddressSeed()
{
static const char *(*strDNSSeed)[2] = fTestNet ? strTestNetDNSSeed : strMainNetDNSSeed;
- printf("ThreadDNSAddressSeed started\n");
int found = 0;
printf("Loading addresses from DNS seeds (could take a while)\n");
@@ -1313,57 +1308,6 @@ void DumpAddresses()
addrman.size(), GetTimeMillis() - nStart);
}
-void ThreadDumpAddress2(void* parg)
-{
- printf("ThreadDumpAddress started\n");
-
- vnThreadsRunning[THREAD_DUMPADDRESS]++;
- while (!fShutdown)
- {
- DumpAddresses();
- vnThreadsRunning[THREAD_DUMPADDRESS]--;
- Sleep(100000);
- vnThreadsRunning[THREAD_DUMPADDRESS]++;
- }
- vnThreadsRunning[THREAD_DUMPADDRESS]--;
-}
-
-void ThreadDumpAddress(void* parg)
-{
- // Make this thread recognisable as the address dumping thread
- RenameThread("bitcoin-adrdump");
-
- try
- {
- ThreadDumpAddress2(parg);
- }
- catch (std::exception& e) {
- PrintException(&e, "ThreadDumpAddress()");
- }
- printf("ThreadDumpAddress exited\n");
-}
-
-void ThreadOpenConnections(void* parg)
-{
- // Make this thread recognisable as the connection opening thread
- RenameThread("bitcoin-opencon");
-
- try
- {
- vnThreadsRunning[THREAD_OPENCONNECTIONS]++;
- ThreadOpenConnections2(parg);
- vnThreadsRunning[THREAD_OPENCONNECTIONS]--;
- }
- catch (std::exception& e) {
- vnThreadsRunning[THREAD_OPENCONNECTIONS]--;
- PrintException(&e, "ThreadOpenConnections()");
- } catch (...) {
- vnThreadsRunning[THREAD_OPENCONNECTIONS]--;
- PrintException(NULL, "ThreadOpenConnections()");
- }
- printf("ThreadOpenConnections exited\n");
-}
-
void static ProcessOneShot()
{
string strDest;
@@ -1382,10 +1326,8 @@ void static ProcessOneShot()
}
}
-void ThreadOpenConnections2(void* parg)
+void ThreadOpenConnections()
{
- printf("ThreadOpenConnections started\n");
-
// Connect to specific addresses
if (mapArgs.count("-connect") && mapMultiArgs["-connect"].size() > 0)
{
@@ -1398,12 +1340,10 @@ void ThreadOpenConnections2(void* parg)
OpenNetworkConnection(addr, NULL, strAddr.c_str());
for (int i = 0; i < 10 && i < nLoop; i++)
{
- Sleep(500);
- if (fShutdown)
- return;
+ MilliSleep(500);
}
}
- Sleep(500);
+ MilliSleep(500);
}
}
@@ -1413,18 +1353,10 @@ void ThreadOpenConnections2(void* parg)
{
ProcessOneShot();
- vnThreadsRunning[THREAD_OPENCONNECTIONS]--;
- Sleep(500);
- vnThreadsRunning[THREAD_OPENCONNECTIONS]++;
- if (fShutdown)
- return;
-
+ MilliSleep(500);
- vnThreadsRunning[THREAD_OPENCONNECTIONS]--;
CSemaphoreGrant grant(*semOutbound);
- vnThreadsRunning[THREAD_OPENCONNECTIONS]++;
- if (fShutdown)
- return;
+ boost::this_thread::interruption_point();
// Add seed nodes if IRC isn't working
if (addrman.size()==0 && (GetTime() - nStart > 60) && !fTestNet)
@@ -1504,38 +1436,15 @@ void ThreadOpenConnections2(void* parg)
}
}
-void ThreadOpenAddedConnections(void* parg)
-{
- // Make this thread recognisable as the connection opening thread
- RenameThread("bitcoin-opencon");
-
- try
- {
- vnThreadsRunning[THREAD_ADDEDCONNECTIONS]++;
- ThreadOpenAddedConnections2(parg);
- vnThreadsRunning[THREAD_ADDEDCONNECTIONS]--;
- }
- catch (std::exception& e) {
- vnThreadsRunning[THREAD_ADDEDCONNECTIONS]--;
- PrintException(&e, "ThreadOpenAddedConnections()");
- } catch (...) {
- vnThreadsRunning[THREAD_ADDEDCONNECTIONS]--;
- PrintException(NULL, "ThreadOpenAddedConnections()");
- }
- printf("ThreadOpenAddedConnections exited\n");
-}
-
-void ThreadOpenAddedConnections2(void* parg)
+void ThreadOpenAddedConnections()
{
- printf("ThreadOpenAddedConnections started\n");
-
{
LOCK(cs_vAddedNodes);
vAddedNodes = mapMultiArgs["-addnode"];
}
if (HaveNameProxy()) {
- while(!fShutdown) {
+ while(true) {
list<string> lAddresses(0);
{
LOCK(cs_vAddedNodes);
@@ -1546,15 +1455,10 @@ void ThreadOpenAddedConnections2(void* parg)
CAddress addr;
CSemaphoreGrant grant(*semOutbound);
OpenNetworkConnection(addr, &grant, strAddNode.c_str());
- Sleep(500);
- if (fShutdown)
- return;
+ MilliSleep(500);
}
- vnThreadsRunning[THREAD_ADDEDCONNECTIONS]--;
- Sleep(120000); // Retry every 2 minutes
- vnThreadsRunning[THREAD_ADDEDCONNECTIONS]++;
+ MilliSleep(120000); // Retry every 2 minutes
}
- return;
}
for (unsigned int i = 0; true; i++)
@@ -1598,17 +1502,9 @@ void ThreadOpenAddedConnections2(void* parg)
{
CSemaphoreGrant grant(*semOutbound);
OpenNetworkConnection(CAddress(vserv[i % vserv.size()]), &grant);
- Sleep(500);
- if (fShutdown)
- return;
+ MilliSleep(500);
}
- if (fShutdown)
- return;
- vnThreadsRunning[THREAD_ADDEDCONNECTIONS]--;
- Sleep(120000); // Retry every 2 minutes
- vnThreadsRunning[THREAD_ADDEDCONNECTIONS]++;
- if (fShutdown)
- return;
+ MilliSleep(120000); // Retry every 2 minutes
}
}
@@ -1618,8 +1514,7 @@ bool OpenNetworkConnection(const CAddress& addrConnect, CSemaphoreGrant *grantOu
//
// Initiate outbound network connection
//
- if (fShutdown)
- return false;
+ boost::this_thread::interruption_point();
if (!strDest)
if (IsLocal(addrConnect) ||
FindNode((CNetAddr)addrConnect) || CNode::IsBanned(addrConnect) ||
@@ -1628,11 +1523,9 @@ bool OpenNetworkConnection(const CAddress& addrConnect, CSemaphoreGrant *grantOu
if (strDest && FindNode(strDest))
return false;
- vnThreadsRunning[THREAD_OPENCONNECTIONS]--;
CNode* pnode = ConnectNode(addrConnect, strDest);
- vnThreadsRunning[THREAD_OPENCONNECTIONS]++;
- if (fShutdown)
- return false;
+ boost::this_thread::interruption_point();
+
if (!pnode)
return false;
if (grantOutbound)
@@ -1650,33 +1543,10 @@ bool OpenNetworkConnection(const CAddress& addrConnect, CSemaphoreGrant *grantOu
-
-void ThreadMessageHandler(void* parg)
-{
- // Make this thread recognisable as the message handling thread
- RenameThread("bitcoin-msghand");
-
- try
- {
- vnThreadsRunning[THREAD_MESSAGEHANDLER]++;
- ThreadMessageHandler2(parg);
- vnThreadsRunning[THREAD_MESSAGEHANDLER]--;
- }
- catch (std::exception& e) {
- vnThreadsRunning[THREAD_MESSAGEHANDLER]--;
- PrintException(&e, "ThreadMessageHandler()");
- } catch (...) {
- vnThreadsRunning[THREAD_MESSAGEHANDLER]--;
- PrintException(NULL, "ThreadMessageHandler()");
- }
- printf("ThreadMessageHandler exited\n");
-}
-
-void ThreadMessageHandler2(void* parg)
+void ThreadMessageHandler()
{
- printf("ThreadMessageHandler started\n");
SetThreadPriority(THREAD_PRIORITY_BELOW_NORMAL);
- while (!fShutdown)
+ while (true)
{
vector<CNode*> vNodesCopy;
{
@@ -1692,14 +1562,17 @@ void ThreadMessageHandler2(void* parg)
pnodeTrickle = vNodesCopy[GetRand(vNodesCopy.size())];
BOOST_FOREACH(CNode* pnode, vNodesCopy)
{
+ if (pnode->fDisconnect)
+ continue;
+
// Receive messages
{
- TRY_LOCK(pnode->cs_vRecv, lockRecv);
+ TRY_LOCK(pnode->cs_vRecvMsg, lockRecv);
if (lockRecv)
- ProcessMessages(pnode);
+ if (!ProcessMessages(pnode))
+ pnode->CloseSocketDisconnect();
}
- if (fShutdown)
- return;
+ boost::this_thread::interruption_point();
// Send messages
{
@@ -1707,8 +1580,7 @@ void ThreadMessageHandler2(void* parg)
if (lockSend)
SendMessages(pnode, pnode == pnodeTrickle);
}
- if (fShutdown)
- return;
+ boost::this_thread::interruption_point();
}
{
@@ -1717,16 +1589,7 @@ void ThreadMessageHandler2(void* parg)
pnode->Release();
}
- // Wait and allow messages to bunch up.
- // Reduce vnThreadsRunning so StopNode has permission to exit while
- // we're sleeping, but we must always check fShutdown after doing this.
- vnThreadsRunning[THREAD_MESSAGEHANDLER]--;
- Sleep(100);
- if (fRequestShutdown)
- StartShutdown();
- vnThreadsRunning[THREAD_MESSAGEHANDLER]++;
- if (fShutdown)
- return;
+ MilliSleep(100);
}
}
@@ -1898,7 +1761,7 @@ void static Discover()
NewThread(ThreadGetMyExternalIP, NULL);
}
-void StartNode(void* parg)
+void StartNode(boost::thread_group& threadGroup)
{
// Make this thread recognisable as the startup thread
RenameThread("bitcoin-start");
@@ -1921,77 +1784,41 @@ void StartNode(void* parg)
if (!GetBoolArg("-dnsseed", true))
printf("DNS seeding disabled\n");
else
- if (!NewThread(ThreadDNSAddressSeed, NULL))
- printf("Error: NewThread(ThreadDNSAddressSeed) failed\n");
+ threadGroup.create_thread(boost::bind(&TraceThread<boost::function<void()> >, "dnsseed", &ThreadDNSAddressSeed));
+#ifdef USE_UPNP
// Map ports with UPnP
- if (fUseUPnP)
- MapPort();
-
- // Get addresses from IRC and advertise ours
- if (!NewThread(ThreadIRCSeed, NULL))
- printf("Error: NewThread(ThreadIRCSeed) failed\n");
+ MapPort(GetBoolArg("-upnp", USE_UPNP));
+#endif
// Send and receive from sockets, accept connections
- if (!NewThread(ThreadSocketHandler, NULL))
- printf("Error: NewThread(ThreadSocketHandler) failed\n");
+ threadGroup.create_thread(boost::bind(&TraceThread<void (*)()>, "net", &ThreadSocketHandler));
// Initiate outbound connections from -addnode
- if (!NewThread(ThreadOpenAddedConnections, NULL))
- printf("Error: NewThread(ThreadOpenAddedConnections) failed\n");
+ threadGroup.create_thread(boost::bind(&TraceThread<void (*)()>, "addcon", &ThreadOpenAddedConnections));
// Initiate outbound connections
- if (!NewThread(ThreadOpenConnections, NULL))
- printf("Error: NewThread(ThreadOpenConnections) failed\n");
+ threadGroup.create_thread(boost::bind(&TraceThread<void (*)()>, "opencon", &ThreadOpenConnections));
// Process messages
- if (!NewThread(ThreadMessageHandler, NULL))
- printf("Error: NewThread(ThreadMessageHandler) failed\n");
+ threadGroup.create_thread(boost::bind(&TraceThread<void (*)()>, "msghand", &ThreadMessageHandler));
// Dump network addresses
- if (!NewThread(ThreadDumpAddress, NULL))
- printf("Error; NewThread(ThreadDumpAddress) failed\n");
-
- // Generate coins in the background
- GenerateBitcoins(GetBoolArg("-gen", false), pwalletMain);
+ threadGroup.create_thread(boost::bind(&LoopForever<void (*)()>, "dumpaddr", &DumpAddresses, 10000));
}
bool StopNode()
{
printf("StopNode()\n");
- fShutdown = true;
+ GenerateBitcoins(false, NULL);
+ MapPort(false);
nTransactionsUpdated++;
- int64 nStart = GetTime();
if (semOutbound)
for (int i=0; i<MAX_OUTBOUND_CONNECTIONS; i++)
semOutbound->post();
- do
- {
- int nThreadsRunning = 0;
- for (int n = 0; n < THREAD_MAX; n++)
- nThreadsRunning += vnThreadsRunning[n];
- if (nThreadsRunning == 0)
- break;
- if (GetTime() - nStart > 20)
- break;
- Sleep(20);
- } while(true);
- if (vnThreadsRunning[THREAD_SOCKETHANDLER] > 0) printf("ThreadSocketHandler still running\n");
- if (vnThreadsRunning[THREAD_OPENCONNECTIONS] > 0) printf("ThreadOpenConnections still running\n");
- if (vnThreadsRunning[THREAD_MESSAGEHANDLER] > 0) printf("ThreadMessageHandler still running\n");
- if (vnThreadsRunning[THREAD_MINER] > 0) printf("ThreadBitcoinMiner still running\n");
- if (vnThreadsRunning[THREAD_RPCLISTENER] > 0) printf("ThreadRPCListener still running\n");
- if (vnThreadsRunning[THREAD_RPCHANDLER] > 0) printf("ThreadsRPCServer still running\n");
-#ifdef USE_UPNP
- if (vnThreadsRunning[THREAD_UPNP] > 0) printf("ThreadMapPort still running\n");
-#endif
- if (vnThreadsRunning[THREAD_DNSSEED] > 0) printf("ThreadDNSAddressSeed still running\n");
- if (vnThreadsRunning[THREAD_ADDEDCONNECTIONS] > 0) printf("ThreadOpenAddedConnections still running\n");
- if (vnThreadsRunning[THREAD_DUMPADDRESS] > 0) printf("ThreadDumpAddresses still running\n");
- while (vnThreadsRunning[THREAD_MESSAGEHANDLER] > 0 || vnThreadsRunning[THREAD_RPCHANDLER] > 0)
- Sleep(20);
- Sleep(50);
+ MilliSleep(50);
DumpAddresses();
+
return true;
}
@@ -2012,6 +1839,18 @@ public:
if (closesocket(hListenSocket) == SOCKET_ERROR)
printf("closesocket(hListenSocket) failed with error %d\n", WSAGetLastError());
+ // clean up some globals (to help leak detection)
+ BOOST_FOREACH(CNode *pnode, vNodes)
+ delete pnode;
+ BOOST_FOREACH(CNode *pnode, vNodesDisconnected)
+ delete pnode;
+ vNodes.clear();
+ vNodesDisconnected.clear();
+ delete semOutbound;
+ semOutbound = NULL;
+ delete pnodeLocalHost;
+ pnodeLocalHost = NULL;
+
#ifdef WIN32
// Shutdown Windows Sockets
WSACleanup();
diff --git a/src/net.h b/src/net.h
index 14e12aa102..80773e3f19 100644
--- a/src/net.h
+++ b/src/net.h
@@ -15,6 +15,7 @@
#endif
#include "mruset.h"
+#include "limitedmap.h"
#include "netbase.h"
#include "protocol.h"
#include "addrman.h"
@@ -27,7 +28,7 @@ extern int nBestHeight;
-inline unsigned int ReceiveBufferSize() { return 1000*GetArg("-maxreceivebuffer", 5*1000); }
+inline unsigned int ReceiveFloodSize() { return 1000*GetArg("-maxreceivebuffer", 5*1000); }
inline unsigned int SendBufferSize() { return 1000*GetArg("-maxsendbuffer", 1*1000); }
void AddOneShot(std::string strDest);
@@ -36,12 +37,13 @@ bool GetMyExternalIP(CNetAddr& ipRet);
void AddressCurrentlyConnected(const CService& addr);
CNode* FindNode(const CNetAddr& ip);
CNode* FindNode(const CService& ip);
-CNode* ConnectNode(CAddress addrConnect, const char *strDest = NULL, int64 nTimeout=0);
-void MapPort();
+CNode* ConnectNode(CAddress addrConnect, const char *strDest = NULL);
+void MapPort(bool fUseUPnP);
unsigned short GetListenPort();
bool BindListenPort(const CService &bindAddr, std::string& strError=REF(std::string()));
-void StartNode(void* parg);
+void StartNode(boost::thread_group& threadGroup);
bool StopNode();
+void SocketSendData(CNode *pnode);
enum
{
@@ -49,7 +51,6 @@ enum
LOCAL_IF, // address a local interface listens on
LOCAL_BIND, // address explicit bound to
LOCAL_UPNP, // address reported by UPnP
- LOCAL_IRC, // address reported by IRC (deprecated)
LOCAL_HTTP, // address reported by whatismyip.com and similar
LOCAL_MANUAL, // address explicitly specified (-externalip=)
@@ -69,30 +70,9 @@ void SetReachable(enum Network net, bool fFlag = true);
CAddress GetLocalAddress(const CNetAddr *paddrPeer = NULL);
-/** Thread types */
-enum threadId
-{
- THREAD_SOCKETHANDLER,
- THREAD_OPENCONNECTIONS,
- THREAD_MESSAGEHANDLER,
- THREAD_MINER,
- THREAD_RPCLISTENER,
- THREAD_UPNP,
- THREAD_DNSSEED,
- THREAD_ADDEDCONNECTIONS,
- THREAD_DUMPADDRESS,
- THREAD_RPCHANDLER,
- THREAD_IMPORT,
- THREAD_SCRIPTCHECK,
-
- THREAD_MAX
-};
-
extern bool fDiscover;
-extern bool fUseUPnP;
extern uint64 nLocalServices;
extern uint64 nLocalHostNonce;
-extern boost::array<int, THREAD_MAX> vnThreadsRunning;
extern CAddrMan addrman;
extern std::vector<CNode*> vNodes;
@@ -100,7 +80,7 @@ extern CCriticalSection cs_vNodes;
extern std::map<CInv, CDataStream> mapRelay;
extern std::deque<std::pair<int64, CInv> > vRelayExpiration;
extern CCriticalSection cs_mapRelay;
-extern std::map<CInv, int64> mapAlreadyAskedFor;
+extern limitedmap<CInv, int64> mapAlreadyAskedFor;
extern std::vector<std::string> vAddedNodes;
extern CCriticalSection cs_vAddedNodes;
@@ -119,7 +99,6 @@ public:
int nVersion;
std::string strSubVer;
bool fInbound;
- int64 nReleaseTime;
int nStartingHeight;
int nMisbehavior;
};
@@ -127,6 +106,44 @@ public:
+class CNetMessage {
+public:
+ bool in_data; // parsing header (false) or data (true)
+
+ CDataStream hdrbuf; // partially received header
+ CMessageHeader hdr; // complete header
+ unsigned int nHdrPos;
+
+ CDataStream vRecv; // received message data
+ unsigned int nDataPos;
+
+ CNetMessage(int nTypeIn, int nVersionIn) : hdrbuf(nTypeIn, nVersionIn), vRecv(nTypeIn, nVersionIn) {
+ hdrbuf.resize(24);
+ in_data = false;
+ nHdrPos = 0;
+ nDataPos = 0;
+ }
+
+ bool complete() const
+ {
+ if (!in_data)
+ return false;
+ return (hdr.nMessageSize == nDataPos);
+ }
+
+ void SetVersion(int nVersionIn)
+ {
+ hdrbuf.SetVersion(nVersionIn);
+ vRecv.SetVersion(nVersionIn);
+ }
+
+ int readHeader(const char *pch, unsigned int nBytes);
+ int readData(const char *pch, unsigned int nBytes);
+};
+
+
+
+
/** Information about a peer */
class CNode
@@ -135,16 +152,21 @@ public:
// socket
uint64 nServices;
SOCKET hSocket;
- CDataStream vSend;
- CDataStream vRecv;
+ CDataStream ssSend;
+ size_t nSendSize; // total size of all vSendMsg entries
+ size_t nSendOffset; // offset inside the first vSendMsg already sent
+ std::deque<CSerializeData> vSendMsg;
CCriticalSection cs_vSend;
- CCriticalSection cs_vRecv;
+
+ std::deque<CInv> vRecvGetData;
+ std::deque<CNetMessage> vRecvMsg;
+ CCriticalSection cs_vRecvMsg;
+ int nRecvVersion;
+
int64 nLastSend;
int64 nLastRecv;
int64 nLastSendEmpty;
int64 nTimeConnected;
- int nHeaderStart;
- unsigned int nMessageStart;
CAddress addr;
std::string addrName;
CService addrLocal;
@@ -164,8 +186,8 @@ public:
CSemaphoreGrant grantOutbound;
CCriticalSection cs_filter;
CBloomFilter* pfilter;
-protected:
int nRefCount;
+protected:
// Denial-of-service detection/prevention
// Key is IP address, value is banned-until-time
@@ -174,7 +196,6 @@ protected:
int nMisbehavior;
public:
- int64 nReleaseTime;
uint256 hashContinue;
CBlockIndex* pindexLastGetBlocksBegin;
uint256 hashLastGetBlocksEnd;
@@ -192,16 +213,15 @@ public:
CCriticalSection cs_inventory;
std::multimap<int64, CInv> mapAskFor;
- CNode(SOCKET hSocketIn, CAddress addrIn, std::string addrNameIn = "", bool fInboundIn=false) : vSend(SER_NETWORK, MIN_PROTO_VERSION), vRecv(SER_NETWORK, MIN_PROTO_VERSION)
+ CNode(SOCKET hSocketIn, CAddress addrIn, std::string addrNameIn = "", bool fInboundIn=false) : ssSend(SER_NETWORK, MIN_PROTO_VERSION)
{
nServices = 0;
hSocket = hSocketIn;
+ nRecvVersion = MIN_PROTO_VERSION;
nLastSend = 0;
nLastRecv = 0;
nLastSendEmpty = GetTime();
nTimeConnected = GetTime();
- nHeaderStart = -1;
- nMessageStart = -1;
addr = addrIn;
addrName = addrNameIn == "" ? addr.ToStringIPPort() : addrNameIn;
nVersion = 0;
@@ -213,7 +233,8 @@ public:
fSuccessfullyConnected = false;
fDisconnect = false;
nRefCount = 0;
- nReleaseTime = 0;
+ nSendSize = 0;
+ nSendOffset = 0;
hashContinue = 0;
pindexLastGetBlocksBegin = 0;
hashLastGetBlocksEnd = 0;
@@ -248,15 +269,33 @@ public:
int GetRefCount()
{
- return std::max(nRefCount, 0) + (GetTime() < nReleaseTime ? 1 : 0);
+ assert(nRefCount >= 0);
+ return nRefCount;
}
- CNode* AddRef(int64 nTimeout=0)
+ // requires LOCK(cs_vRecvMsg)
+ unsigned int GetTotalRecvSize()
{
- if (nTimeout != 0)
- nReleaseTime = std::max(nReleaseTime, GetTime() + nTimeout);
- else
- nRefCount++;
+ unsigned int total = 0;
+ BOOST_FOREACH(const CNetMessage &msg, vRecvMsg)
+ total += msg.vRecv.size() + 24;
+ return total;
+ }
+
+ // requires LOCK(cs_vRecvMsg)
+ bool ReceiveMsgBytes(const char *pch, unsigned int nBytes);
+
+ // requires LOCK(cs_vRecvMsg)
+ void SetRecvVersion(int nVersionIn)
+ {
+ nRecvVersion = nVersionIn;
+ BOOST_FOREACH(CNetMessage &msg, vRecvMsg)
+ msg.SetVersion(nVersionIn);
+ }
+
+ CNode* AddRef()
+ {
+ nRefCount++;
return this;
}
@@ -303,7 +342,12 @@ public:
{
// We're using mapAskFor as a priority queue,
// the key is the earliest time the request can be sent
- int64& nRequestTime = mapAlreadyAskedFor[inv];
+ int64 nRequestTime;
+ limitedmap<CInv, int64>::const_iterator it = mapAlreadyAskedFor.find(inv);
+ if (it != mapAlreadyAskedFor.end())
+ nRequestTime = it->second;
+ else
+ nRequestTime = 0;
if (fDebugNet)
printf("askfor %s %"PRI64d" (%s)\n", inv.ToString().c_str(), nRequestTime, DateTimeStrFormat("%H:%M:%S", nRequestTime/1000000).c_str());
@@ -316,6 +360,10 @@ public:
// Each retry is 2 minutes after the last
nRequestTime = std::max(nRequestTime + 2 * 60 * 1000000, nNow);
+ if (it != mapAlreadyAskedFor.end())
+ mapAlreadyAskedFor.update(it, nRequestTime);
+ else
+ mapAlreadyAskedFor.insert(std::make_pair(inv, nRequestTime));
mapAskFor.insert(std::make_pair(nRequestTime, inv));
}
@@ -325,11 +373,8 @@ public:
void BeginMessage(const char* pszCommand) EXCLUSIVE_LOCK_FUNCTION(cs_vSend)
{
ENTER_CRITICAL_SECTION(cs_vSend);
- if (nHeaderStart != -1)
- AbortMessage();
- nHeaderStart = vSend.size();
- vSend << CMessageHeader(pszCommand, 0);
- nMessageStart = vSend.size();
+ assert(ssSend.size() == 0);
+ ssSend << CMessageHeader(pszCommand, 0);
if (fDebug)
printf("sending: %s ", pszCommand);
}
@@ -337,11 +382,8 @@ public:
// TODO: Document the precondition of this function. Is cs_vSend locked?
void AbortMessage() UNLOCK_FUNCTION(cs_vSend)
{
- if (nHeaderStart < 0)
- return;
- vSend.resize(nHeaderStart);
- nHeaderStart = -1;
- nMessageStart = -1;
+ ssSend.clear();
+
LEAVE_CRITICAL_SECTION(cs_vSend);
if (fDebug)
@@ -358,26 +400,32 @@ public:
return;
}
- if (nHeaderStart < 0)
+ if (ssSend.size() == 0)
return;
// Set the size
- unsigned int nSize = vSend.size() - nMessageStart;
- memcpy((char*)&vSend[nHeaderStart] + CMessageHeader::MESSAGE_SIZE_OFFSET, &nSize, sizeof(nSize));
+ unsigned int nSize = ssSend.size() - CMessageHeader::HEADER_SIZE;
+ memcpy((char*)&ssSend[CMessageHeader::MESSAGE_SIZE_OFFSET], &nSize, sizeof(nSize));
// Set the checksum
- uint256 hash = Hash(vSend.begin() + nMessageStart, vSend.end());
+ uint256 hash = Hash(ssSend.begin() + CMessageHeader::HEADER_SIZE, ssSend.end());
unsigned int nChecksum = 0;
memcpy(&nChecksum, &hash, sizeof(nChecksum));
- assert(nMessageStart - nHeaderStart >= CMessageHeader::CHECKSUM_OFFSET + sizeof(nChecksum));
- memcpy((char*)&vSend[nHeaderStart] + CMessageHeader::CHECKSUM_OFFSET, &nChecksum, sizeof(nChecksum));
+ assert(ssSend.size () >= CMessageHeader::CHECKSUM_OFFSET + sizeof(nChecksum));
+ memcpy((char*)&ssSend[CMessageHeader::CHECKSUM_OFFSET], &nChecksum, sizeof(nChecksum));
if (fDebug) {
printf("(%d bytes)\n", nSize);
}
- nHeaderStart = -1;
- nMessageStart = -1;
+ std::deque<CSerializeData>::iterator it = vSendMsg.insert(vSendMsg.end(), CSerializeData());
+ ssSend.GetAndClear(*it);
+ nSendSize += (*it).size();
+
+ // If write queue empty, attempt "optimistic write"
+ if (it == vSendMsg.begin())
+ SocketSendData(this);
+
LEAVE_CRITICAL_SECTION(cs_vSend);
}
@@ -404,7 +452,7 @@ public:
try
{
BeginMessage(pszCommand);
- vSend << a1;
+ ssSend << a1;
EndMessage();
}
catch (...)
@@ -420,7 +468,7 @@ public:
try
{
BeginMessage(pszCommand);
- vSend << a1 << a2;
+ ssSend << a1 << a2;
EndMessage();
}
catch (...)
@@ -436,7 +484,7 @@ public:
try
{
BeginMessage(pszCommand);
- vSend << a1 << a2 << a3;
+ ssSend << a1 << a2 << a3;
EndMessage();
}
catch (...)
@@ -452,7 +500,7 @@ public:
try
{
BeginMessage(pszCommand);
- vSend << a1 << a2 << a3 << a4;
+ ssSend << a1 << a2 << a3 << a4;
EndMessage();
}
catch (...)
@@ -468,7 +516,7 @@ public:
try
{
BeginMessage(pszCommand);
- vSend << a1 << a2 << a3 << a4 << a5;
+ ssSend << a1 << a2 << a3 << a4 << a5;
EndMessage();
}
catch (...)
@@ -484,7 +532,7 @@ public:
try
{
BeginMessage(pszCommand);
- vSend << a1 << a2 << a3 << a4 << a5 << a6;
+ ssSend << a1 << a2 << a3 << a4 << a5 << a6;
EndMessage();
}
catch (...)
@@ -500,7 +548,7 @@ public:
try
{
BeginMessage(pszCommand);
- vSend << a1 << a2 << a3 << a4 << a5 << a6 << a7;
+ ssSend << a1 << a2 << a3 << a4 << a5 << a6 << a7;
EndMessage();
}
catch (...)
@@ -516,7 +564,7 @@ public:
try
{
BeginMessage(pszCommand);
- vSend << a1 << a2 << a3 << a4 << a5 << a6 << a7 << a8;
+ ssSend << a1 << a2 << a3 << a4 << a5 << a6 << a7 << a8;
EndMessage();
}
catch (...)
@@ -532,7 +580,7 @@ public:
try
{
BeginMessage(pszCommand);
- vSend << a1 << a2 << a3 << a4 << a5 << a6 << a7 << a8 << a9;
+ ssSend << a1 << a2 << a3 << a4 << a5 << a6 << a7 << a8 << a9;
EndMessage();
}
catch (...)
diff --git a/src/protocol.h b/src/protocol.h
index f5c162054e..4998425070 100644
--- a/src/protocol.h
+++ b/src/protocol.h
@@ -56,7 +56,8 @@ class CMessageHeader
CHECKSUM_SIZE=sizeof(int),
MESSAGE_SIZE_OFFSET=MESSAGE_START_SIZE+COMMAND_SIZE,
- CHECKSUM_OFFSET=MESSAGE_SIZE_OFFSET+MESSAGE_SIZE_SIZE
+ CHECKSUM_OFFSET=MESSAGE_SIZE_OFFSET+MESSAGE_SIZE_SIZE,
+ HEADER_SIZE=MESSAGE_START_SIZE+COMMAND_SIZE+MESSAGE_SIZE_SIZE+CHECKSUM_SIZE
};
char pchMessageStart[MESSAGE_START_SIZE];
char pchCommand[COMMAND_SIZE];
diff --git a/src/qt/addressbookpage.cpp b/src/qt/addressbookpage.cpp
index f4696d5a3b..cc3d27d01d 100644
--- a/src/qt/addressbookpage.cpp
+++ b/src/qt/addressbookpage.cpp
@@ -8,15 +8,15 @@
#include "csvmodelwriter.h"
#include "guiutil.h"
+#ifdef USE_QRCODE
+#include "qrcodedialog.h"
+#endif
+
#include <QSortFilterProxyModel>
#include <QClipboard>
#include <QMessageBox>
#include <QMenu>
-#ifdef USE_QRCODE
-#include "qrcodedialog.h"
-#endif
-
AddressBookPage::AddressBookPage(Mode mode, Tabs tab, QWidget *parent) :
QDialog(parent),
ui(new Ui::AddressBookPage),
@@ -51,24 +51,26 @@ AddressBookPage::AddressBookPage(Mode mode, Tabs tab, QWidget *parent) :
switch(tab)
{
case SendingTab:
- ui->labelExplanation->setVisible(false);
- ui->deleteButton->setVisible(true);
+ ui->labelExplanation->setText(tr("These are your Bitcoin addresses for sending payments. Always check the amount and the receiving address before sending coins."));
+ ui->deleteAddress->setVisible(true);
ui->signMessage->setVisible(false);
break;
case ReceivingTab:
- ui->deleteButton->setVisible(false);
+ ui->labelExplanation->setText(tr("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."));
+ ui->deleteAddress->setVisible(false);
ui->signMessage->setVisible(true);
break;
}
// Context menu actions
- QAction *copyAddressAction = new QAction(ui->copyToClipboard->text(), this);
+ QAction *copyAddressAction = new QAction(ui->copyAddress->text(), this);
QAction *copyLabelAction = new QAction(tr("Copy &Label"), this);
QAction *editAction = new QAction(tr("&Edit"), this);
+ QAction *sendCoinsAction = new QAction(tr("Send &Coins"), this);
QAction *showQRCodeAction = new QAction(ui->showQRCode->text(), this);
QAction *signMessageAction = new QAction(ui->signMessage->text(), this);
QAction *verifyMessageAction = new QAction(ui->verifyMessage->text(), this);
- deleteAction = new QAction(ui->deleteButton->text(), this);
+ deleteAction = new QAction(ui->deleteAddress->text(), this);
// Build context menu
contextMenu = new QMenu();
@@ -78,6 +80,8 @@ AddressBookPage::AddressBookPage(Mode mode, Tabs tab, QWidget *parent) :
if(tab == SendingTab)
contextMenu->addAction(deleteAction);
contextMenu->addSeparator();
+ if(tab == SendingTab)
+ contextMenu->addAction(sendCoinsAction);
#ifdef USE_QRCODE
contextMenu->addAction(showQRCodeAction);
#endif
@@ -87,10 +91,11 @@ AddressBookPage::AddressBookPage(Mode mode, Tabs tab, QWidget *parent) :
contextMenu->addAction(verifyMessageAction);
// Connect signals for context menu actions
- connect(copyAddressAction, SIGNAL(triggered()), this, SLOT(on_copyToClipboard_clicked()));
+ connect(copyAddressAction, SIGNAL(triggered()), this, SLOT(on_copyAddress_clicked()));
connect(copyLabelAction, SIGNAL(triggered()), this, SLOT(onCopyLabelAction()));
connect(editAction, SIGNAL(triggered()), this, SLOT(onEditAction()));
- connect(deleteAction, SIGNAL(triggered()), this, SLOT(on_deleteButton_clicked()));
+ connect(deleteAction, SIGNAL(triggered()), this, SLOT(on_deleteAddress_clicked()));
+ connect(sendCoinsAction, SIGNAL(triggered()), this, SLOT(onSendCoinsAction()));
connect(showQRCodeAction, SIGNAL(triggered()), this, SLOT(on_showQRCode_clicked()));
connect(signMessageAction, SIGNAL(triggered()), this, SLOT(on_signMessage_clicked()));
connect(verifyMessageAction, SIGNAL(triggered()), this, SLOT(on_verifyMessage_clicked()));
@@ -134,17 +139,14 @@ void AddressBookPage::setModel(AddressTableModel *model)
ui->tableView->sortByColumn(0, Qt::AscendingOrder);
// Set column widths
- ui->tableView->horizontalHeader()->resizeSection(
- AddressTableModel::Address, 320);
- ui->tableView->horizontalHeader()->setResizeMode(
- AddressTableModel::Label, QHeaderView::Stretch);
+ ui->tableView->horizontalHeader()->setResizeMode(AddressTableModel::Label, QHeaderView::Stretch);
+ ui->tableView->horizontalHeader()->setResizeMode(AddressTableModel::Address, QHeaderView::ResizeToContents);
connect(ui->tableView->selectionModel(), SIGNAL(selectionChanged(QItemSelection,QItemSelection)),
this, SLOT(selectionChanged()));
// Select row for newly created address
- connect(model, SIGNAL(rowsInserted(QModelIndex,int,int)),
- this, SLOT(selectNewAddress(QModelIndex,int,int)));
+ connect(model, SIGNAL(rowsInserted(QModelIndex,int,int)), this, SLOT(selectNewAddress(QModelIndex,int,int)));
selectionChanged();
}
@@ -154,7 +156,7 @@ void AddressBookPage::setOptionsModel(OptionsModel *optionsModel)
this->optionsModel = optionsModel;
}
-void AddressBookPage::on_copyToClipboard_clicked()
+void AddressBookPage::on_copyAddress_clicked()
{
GUIUtil::copyEntryData(ui->tableView, AddressTableModel::Address);
}
@@ -206,7 +208,19 @@ void AddressBookPage::on_verifyMessage_clicked()
}
}
-void AddressBookPage::on_newAddressButton_clicked()
+void AddressBookPage::onSendCoinsAction()
+{
+ QTableView *table = ui->tableView;
+ QModelIndexList indexes = table->selectionModel()->selectedRows(AddressTableModel::Address);
+
+ foreach (QModelIndex index, indexes)
+ {
+ QString address = index.data().toString();
+ emit sendCoins(address);
+ }
+}
+
+void AddressBookPage::on_newAddress_clicked()
{
if(!model)
return;
@@ -222,7 +236,7 @@ void AddressBookPage::on_newAddressButton_clicked()
}
}
-void AddressBookPage::on_deleteButton_clicked()
+void AddressBookPage::on_deleteAddress_clicked()
{
QTableView *table = ui->tableView;
if(!table->selectionModel())
@@ -248,8 +262,8 @@ void AddressBookPage::selectionChanged()
{
case SendingTab:
// In sending tab, allow deletion of selection
- ui->deleteButton->setEnabled(true);
- ui->deleteButton->setVisible(true);
+ ui->deleteAddress->setEnabled(true);
+ ui->deleteAddress->setVisible(true);
deleteAction->setEnabled(true);
ui->signMessage->setEnabled(false);
ui->signMessage->setVisible(false);
@@ -258,8 +272,8 @@ void AddressBookPage::selectionChanged()
break;
case ReceivingTab:
// Deleting receiving addresses, however, is not allowed
- ui->deleteButton->setEnabled(false);
- ui->deleteButton->setVisible(false);
+ ui->deleteAddress->setEnabled(false);
+ ui->deleteAddress->setVisible(false);
deleteAction->setEnabled(false);
ui->signMessage->setEnabled(true);
ui->signMessage->setVisible(true);
@@ -267,14 +281,14 @@ void AddressBookPage::selectionChanged()
ui->verifyMessage->setVisible(false);
break;
}
- ui->copyToClipboard->setEnabled(true);
+ ui->copyAddress->setEnabled(true);
ui->showQRCode->setEnabled(true);
}
else
{
- ui->deleteButton->setEnabled(false);
+ ui->deleteAddress->setEnabled(false);
ui->showQRCode->setEnabled(false);
- ui->copyToClipboard->setEnabled(false);
+ ui->copyAddress->setEnabled(false);
ui->signMessage->setEnabled(false);
ui->verifyMessage->setEnabled(false);
}
diff --git a/src/qt/addressbookpage.h b/src/qt/addressbookpage.h
index c676d1e941..0631781685 100644
--- a/src/qt/addressbookpage.h
+++ b/src/qt/addressbookpage.h
@@ -59,15 +59,17 @@ private:
private slots:
/** Delete currently selected address entry */
- void on_deleteButton_clicked();
+ void on_deleteAddress_clicked();
/** Create a new address for receiving coins and / or add a new address book entry */
- void on_newAddressButton_clicked();
+ void on_newAddress_clicked();
/** Copy address of currently selected address entry to clipboard */
- void on_copyToClipboard_clicked();
+ void on_copyAddress_clicked();
/** Open the sign message tab in the Sign/Verify Message dialog with currently selected address */
void on_signMessage_clicked();
/** Open the verify message tab in the Sign/Verify Message dialog with currently selected address */
void on_verifyMessage_clicked();
+ /** Open send coins dialog for currently selected address (no button) */
+ void onSendCoinsAction();
/** Generate a QR Code from the currently selected address */
void on_showQRCode_clicked();
/** Copy label of currently selected address entry to clipboard (no button) */
@@ -85,6 +87,7 @@ private slots:
signals:
void signMessage(QString addr);
void verifyMessage(QString addr);
+ void sendCoins(QString addr);
};
#endif // ADDRESSBOOKPAGE_H
diff --git a/src/qt/addresstablemodel.cpp b/src/qt/addresstablemodel.cpp
index 03b09cdceb..1801444521 100644
--- a/src/qt/addresstablemodel.cpp
+++ b/src/qt/addresstablemodel.cpp
@@ -1,4 +1,5 @@
#include "addresstablemodel.h"
+
#include "guiutil.h"
#include "walletmodel.h"
@@ -6,7 +7,6 @@
#include "base58.h"
#include <QFont>
-#include <QColor>
const QString AddressTableModel::Send = "S";
const QString AddressTableModel::Receive = "R";
diff --git a/src/qt/addresstablemodel.h b/src/qt/addresstablemodel.h
index ae3e3b2f04..48baff5e54 100644
--- a/src/qt/addresstablemodel.h
+++ b/src/qt/addresstablemodel.h
@@ -14,6 +14,7 @@ class WalletModel;
class AddressTableModel : public QAbstractTableModel
{
Q_OBJECT
+
public:
explicit AddressTableModel(CWallet *wallet, WalletModel *parent = 0);
~AddressTableModel();
diff --git a/src/qt/askpassphrasedialog.cpp b/src/qt/askpassphrasedialog.cpp
index cf35ee2457..f165c11cb1 100644
--- a/src/qt/askpassphrasedialog.cpp
+++ b/src/qt/askpassphrasedialog.cpp
@@ -235,7 +235,7 @@ bool AskPassphraseDialog::eventFilter(QObject *object, QEvent *event)
if (str.length() != 0) {
const QChar *psz = str.unicode();
bool fShift = (ke->modifiers() & Qt::ShiftModifier) != 0;
- if ((fShift && psz->isLower()) || (!fShift && psz->isUpper())) {
+ if ((fShift && *psz >= 'a' && *psz <= 'z') || (!fShift && *psz >= 'A' && *psz <= 'Z')) {
fCapsLock = true;
ui->capsLabel->setText(tr("Warning: The Caps Lock key is on!"));
} else if (psz->isLetter()) {
diff --git a/src/qt/askpassphrasedialog.h b/src/qt/askpassphrasedialog.h
index 338853ce22..9df002da2c 100644
--- a/src/qt/askpassphrasedialog.h
+++ b/src/qt/askpassphrasedialog.h
@@ -6,7 +6,6 @@
namespace Ui {
class AskPassphraseDialog;
}
-
class WalletModel;
/** Multifunctional dialog to ask for passphrases. Used for encryption, unlocking, and changing the passphrase.
diff --git a/src/qt/bitcoin.cpp b/src/qt/bitcoin.cpp
index afd8d71a0e..f079f3b0e9 100644
--- a/src/qt/bitcoin.cpp
+++ b/src/qt/bitcoin.cpp
@@ -1,6 +1,9 @@
/*
* W.J. van der Laan 2011-2012
*/
+
+#include <QApplication>
+
#include "bitcoingui.h"
#include "clientmodel.h"
#include "walletmodel.h"
@@ -8,13 +11,14 @@
#include "guiutil.h"
#include "guiconstants.h"
#include "init.h"
+#include "util.h"
#include "ui_interface.h"
-#include "qtipcserver.h"
+#include "paymentserver.h"
-#include <QApplication>
#include <QMessageBox>
#include <QTextCodec>
#include <QLocale>
+#include <QTimer>
#include <QTranslator>
#include <QSplashScreen>
#include <QLibraryInfo>
@@ -74,30 +78,16 @@ static bool ThreadSafeAskFee(int64 nFeeRequired)
return payFee;
}
-static void ThreadSafeHandleURI(const std::string& strURI)
-{
- if(!guiref)
- return;
-
- QMetaObject::invokeMethod(guiref, "handleURI", GUIUtil::blockingGUIThreadConnection(),
- Q_ARG(QString, QString::fromStdString(strURI)));
-}
-
static void InitMessage(const std::string &message)
{
if(splashref)
{
splashref->showMessage(QString::fromStdString(message), Qt::AlignBottom|Qt::AlignHCenter, QColor(255,255,200));
- QApplication::instance()->processEvents();
+ qApp->processEvents();
}
printf("init message: %s\n", message.c_str());
}
-static void QueueShutdown()
-{
- QMetaObject::invokeMethod(QCoreApplication::instance(), "quit", Qt::QueuedConnection);
-}
-
/*
Translate string to current locale using Qt.
*/
@@ -121,14 +111,6 @@ int main(int argc, char *argv[])
// Command-line options take precedence:
ParseParameters(argc, argv);
- if(GetBoolArg("-testnet")) // Separate message queue name for testnet
- strBitcoinURIQueueName = BITCOINURI_QUEUE_NAME_TESTNET;
- else
- strBitcoinURIQueueName = BITCOINURI_QUEUE_NAME_MAINNET;
-
- // Do this early as we don't want to bother initializing if we are just calling IPC
- ipcScanRelay(argc, argv);
-
// Internal string conversion is all UTF-8
QTextCodec::setCodecForTr(QTextCodec::codecForName("UTF-8"));
QTextCodec::setCodecForCStrings(QTextCodec::codecForTr());
@@ -136,6 +118,12 @@ int main(int argc, char *argv[])
Q_INIT_RESOURCE(bitcoin);
QApplication app(argc, argv);
+ // Do this early as we don't want to bother initializing if we are just calling IPC
+ // ... but do it after creating app, so QCoreApplication::arguments is initialized:
+ if (PaymentServer::ipcSendCommandLine())
+ exit(0);
+ PaymentServer* paymentServer = new PaymentServer(&app);
+
// Install global event filter that makes sure that long tooltips can be word-wrapped
app.installEventFilter(new GUIUtil::ToolTipToRichTextFilter(TOOLTIP_WRAP_THRESHOLD, &app));
@@ -192,9 +180,7 @@ int main(int argc, char *argv[])
// Subscribe to global signals from core
uiInterface.ThreadSafeMessageBox.connect(ThreadSafeMessageBox);
uiInterface.ThreadSafeAskFee.connect(ThreadSafeAskFee);
- uiInterface.ThreadSafeHandleURI.connect(ThreadSafeHandleURI);
uiInterface.InitMessage.connect(InitMessage);
- uiInterface.QueueShutdown.connect(QueueShutdown);
uiInterface.Translate.connect(Translate);
// Show help message immediately after parsing command-line options (for "-lang") and setting locale,
@@ -224,9 +210,16 @@ int main(int argc, char *argv[])
if (GUIUtil::GetStartOnSystemStartup())
GUIUtil::SetStartOnSystemStartup(true);
+ boost::thread_group threadGroup;
+
BitcoinGUI window;
guiref = &window;
- if(AppInit2())
+
+ QTimer* pollShutdownTimer = new QTimer(guiref);
+ QObject::connect(pollShutdownTimer, SIGNAL(timeout()), guiref, SLOT(detectShutdown()));
+ pollShutdownTimer->start(200);
+
+ if(AppInit2(threadGroup))
{
{
// Put this in a block, so that the Model objects are cleaned up before
@@ -241,7 +234,8 @@ int main(int argc, char *argv[])
WalletModel walletModel(pwalletMain, &optionsModel);
window.setClientModel(&clientModel);
- window.setWalletModel(&walletModel);
+ window.addWallet("~Default", &walletModel);
+ window.setCurrentWallet("~Default");
// If -min option passed, start window minimized.
if(GetBoolArg("-min"))
@@ -253,18 +247,22 @@ int main(int argc, char *argv[])
window.show();
}
- // Place this here as guiref has to be defined if we don't want to lose URIs
- ipcInit(argc, argv);
+ // Now that initialization/startup is done, process any command-line
+ // bitcoin: URIs
+ QObject::connect(paymentServer, SIGNAL(receivedURI(QString)), &window, SLOT(handleURI(QString)));
+ QTimer::singleShot(100, paymentServer, SLOT(uiReady()));
app.exec();
window.hide();
window.setClientModel(0);
- window.setWalletModel(0);
+ window.removeAllWallets();
guiref = 0;
}
// Shutdown the core and its threads, but don't exit Bitcoin-Qt here
- Shutdown(NULL);
+ threadGroup.interrupt_all();
+ threadGroup.join_all();
+ Shutdown();
}
else
{
diff --git a/src/qt/bitcoin.qrc b/src/qt/bitcoin.qrc
index b13a87dd24..fd5f3b523c 100644
--- a/src/qt/bitcoin.qrc
+++ b/src/qt/bitcoin.qrc
@@ -1,4 +1,4 @@
-<RCC>
+<!DOCTYPE RCC><RCC version="1.0">
<qresource prefix="/icons">
<file alias="bitcoin">res/icons/bitcoin.png</file>
<file alias="address-book">res/icons/address-book.png</file>
@@ -50,12 +50,16 @@
</qresource>
<qresource prefix="/translations">
<file alias="bg">locale/bitcoin_bg.qm</file>
+ <file alias="bs">locale/bitcoin_bs.ts</file>
+ <file alias="ca">locale/bitcoin_ca.ts</file>
<file alias="ca_ES">locale/bitcoin_ca_ES.qm</file>
<file alias="cs">locale/bitcoin_cs.qm</file>
+ <file alias="cy">locale/bitcoin_cy.ts</file>
<file alias="da">locale/bitcoin_da.qm</file>
<file alias="de">locale/bitcoin_de.qm</file>
<file alias="el_GR">locale/bitcoin_el_GR.qm</file>
<file alias="en">locale/bitcoin_en.qm</file>
+ <file alias="eo">locale/bitcoin_eo.ts</file>
<file alias="es">locale/bitcoin_es.qm</file>
<file alias="es_CL">locale/bitcoin_es_CL.qm</file>
<file alias="et">locale/bitcoin_et.qm</file>
@@ -65,11 +69,16 @@
<file alias="fi">locale/bitcoin_fi.qm</file>
<file alias="fr">locale/bitcoin_fr.qm</file>
<file alias="fr_CA">locale/bitcoin_fr_CA.qm</file>
+ <file alias="gu_IN">locale/bitcoin_gu_IN.ts</file>
<file alias="he">locale/bitcoin_he.qm</file>
+ <file alias="hi_IN">locale/bitcoin_hi_IN.ts</file>
<file alias="hr">locale/bitcoin_hr.qm</file>
<file alias="hu">locale/bitcoin_hu.qm</file>
<file alias="it">locale/bitcoin_it.qm</file>
+ <file alias="ja">locale/bitcoin_ja.ts</file>
+ <file alias="la">locale/bitcoin_la.ts</file>
<file alias="lt">locale/bitcoin_lt.qm</file>
+ <file alias="lv_LV">locale/bitcoin_lv_LV.ts</file>
<file alias="nb">locale/bitcoin_nb.qm</file>
<file alias="nl">locale/bitcoin_nl.qm</file>
<file alias="pl">locale/bitcoin_pl.qm</file>
@@ -80,6 +89,7 @@
<file alias="sk">locale/bitcoin_sk.qm</file>
<file alias="sr">locale/bitcoin_sr.qm</file>
<file alias="sv">locale/bitcoin_sv.qm</file>
+ <file alias="th_TH">locale/bitcoin_th_TH.ts</file>
<file alias="tr">locale/bitcoin_tr.qm</file>
<file alias="uk">locale/bitcoin_uk.qm</file>
<file alias="zh_CN">locale/bitcoin_zh_CN.qm</file>
diff --git a/src/qt/bitcoinaddressvalidator.h b/src/qt/bitcoinaddressvalidator.h
index 9710d122b6..2b6a59367d 100644
--- a/src/qt/bitcoinaddressvalidator.h
+++ b/src/qt/bitcoinaddressvalidator.h
@@ -1,7 +1,7 @@
#ifndef BITCOINADDRESSVALIDATOR_H
#define BITCOINADDRESSVALIDATOR_H
-#include <QRegExpValidator>
+#include <QValidator>
/** Base48 entry widget validator.
Corrects near-miss characters and refuses characters that are no part of base48.
@@ -9,16 +9,13 @@
class BitcoinAddressValidator : public QValidator
{
Q_OBJECT
+
public:
explicit BitcoinAddressValidator(QObject *parent = 0);
State validate(QString &input, int &pos) const;
static const int MaxAddressLength = 35;
-signals:
-
-public slots:
-
};
#endif // BITCOINADDRESSVALIDATOR_H
diff --git a/src/qt/bitcoinamountfield.cpp b/src/qt/bitcoinamountfield.cpp
index 9514ec8465..b12e296f99 100644
--- a/src/qt/bitcoinamountfield.cpp
+++ b/src/qt/bitcoinamountfield.cpp
@@ -1,18 +1,14 @@
#include "bitcoinamountfield.h"
+
#include "qvaluecombobox.h"
#include "bitcoinunits.h"
-
#include "guiconstants.h"
-#include <QLabel>
-#include <QLineEdit>
-#include <QRegExpValidator>
#include <QHBoxLayout>
#include <QKeyEvent>
#include <QDoubleSpinBox>
-#include <QComboBox>
#include <QApplication>
-#include <qmath.h>
+#include <qmath.h> // for qPow()
BitcoinAmountField::BitcoinAmountField(QWidget *parent):
QWidget(parent), amount(0), currentUnit(-1)
@@ -102,7 +98,7 @@ bool BitcoinAmountField::eventFilter(QObject *object, QEvent *event)
{
// Translate a comma into a period
QKeyEvent periodKeyEvent(event->type(), Qt::Key_Period, keyEvent->modifiers(), ".", keyEvent->isAutoRepeat(), keyEvent->count());
- qApp->sendEvent(object, &periodKeyEvent);
+ QApplication::sendEvent(object, &periodKeyEvent);
return true;
}
}
@@ -149,6 +145,11 @@ void BitcoinAmountField::unitChanged(int idx)
amount->setDecimals(BitcoinUnits::decimals(currentUnit));
amount->setMaximum(qPow(10, BitcoinUnits::amountDigits(currentUnit)) - qPow(10, -amount->decimals()));
+ if(currentUnit == BitcoinUnits::uBTC)
+ amount->setSingleStep(0.01);
+ else
+ amount->setSingleStep(0.001);
+
if(valid)
{
// If value was valid, re-place it in the widget with the new unit
diff --git a/src/qt/bitcoinamountfield.h b/src/qt/bitcoinamountfield.h
index 4797c4c882..dacbb395ec 100644
--- a/src/qt/bitcoinamountfield.h
+++ b/src/qt/bitcoinamountfield.h
@@ -13,7 +13,9 @@ QT_END_NAMESPACE
class BitcoinAmountField: public QWidget
{
Q_OBJECT
+
Q_PROPERTY(qint64 value READ value WRITE setValue NOTIFY textChanged USER true)
+
public:
explicit BitcoinAmountField(QWidget *parent = 0);
@@ -56,5 +58,4 @@ private slots:
};
-
#endif // BITCOINAMOUNTFIELD_H
diff --git a/src/qt/bitcoingui.cpp b/src/qt/bitcoingui.cpp
index d884701883..27272e69e1 100644
--- a/src/qt/bitcoingui.cpp
+++ b/src/qt/bitcoingui.cpp
@@ -4,46 +4,39 @@
* W.J. van der Laan 2011-2012
* The Bitcoin Developers 2011-2012
*/
+
+#include <QApplication>
+
#include "bitcoingui.h"
+
#include "transactiontablemodel.h"
-#include "addressbookpage.h"
-#include "sendcoinsdialog.h"
-#include "signverifymessagedialog.h"
#include "optionsdialog.h"
#include "aboutdialog.h"
#include "clientmodel.h"
#include "walletmodel.h"
-#include "editaddressdialog.h"
+#include "walletframe.h"
#include "optionsmodel.h"
#include "transactiondescdialog.h"
-#include "addresstablemodel.h"
-#include "transactionview.h"
-#include "overviewpage.h"
#include "bitcoinunits.h"
#include "guiconstants.h"
-#include "askpassphrasedialog.h"
#include "notificator.h"
#include "guiutil.h"
#include "rpcconsole.h"
#include "ui_interface.h"
+#include "wallet.h"
+#include "init.h"
#ifdef Q_OS_MAC
#include "macdockiconhandler.h"
#endif
-#include <QApplication>
-#include <QMainWindow>
#include <QMenuBar>
#include <QMenu>
#include <QIcon>
-#include <QTabWidget>
#include <QVBoxLayout>
#include <QToolBar>
#include <QStatusBar>
#include <QLabel>
-#include <QLineEdit>
-#include <QPushButton>
-#include <QLocale>
#include <QMessageBox>
#include <QProgressBar>
#include <QStackedWidget>
@@ -54,34 +47,45 @@
#include <QTimer>
#include <QDragEnterEvent>
#include <QUrl>
+#include <QMimeData>
#include <QStyle>
+#include <QSettings>
+#include <QDesktopWidget>
+#include <QListWidget>
#include <iostream>
-BitcoinGUI::BitcoinGUI(QWidget *parent):
+const QString BitcoinGUI::DEFAULT_WALLET = "~Default";
+
+BitcoinGUI::BitcoinGUI(QWidget *parent) :
QMainWindow(parent),
clientModel(0),
- walletModel(0),
encryptWalletAction(0),
changePassphraseAction(0),
aboutQtAction(0),
trayIcon(0),
notificator(0),
- rpcConsole(0)
+ rpcConsole(0),
+ prevBlocks(0)
{
- resize(850, 550);
+ restoreWindowGeometry();
setWindowTitle(tr("Bitcoin") + " - " + tr("Wallet"));
#ifndef Q_OS_MAC
- qApp->setWindowIcon(QIcon(":icons/bitcoin"));
+ QApplication::setWindowIcon(QIcon(":icons/bitcoin"));
setWindowIcon(QIcon(":icons/bitcoin"));
#else
setUnifiedTitleAndToolBarOnMac(true);
QApplication::setAttribute(Qt::AA_DontShowIconsInMenus);
#endif
+ // Create wallet frame and make it the central widget
+ walletFrame = new WalletFrame(this);
+ setCentralWidget(walletFrame);
+
// Accept D&D of URIs
setAcceptDrops(true);
// Create actions for the toolbar, menu bar and tray/dock icon
+ // Needs walletFrame to be initialized
createActions();
// Create application menu bar
@@ -93,31 +97,6 @@ BitcoinGUI::BitcoinGUI(QWidget *parent):
// Create system tray icon and notification
createTrayIcon();
- // Create tabs
- overviewPage = new OverviewPage();
-
- transactionsPage = new QWidget(this);
- QVBoxLayout *vbox = new QVBoxLayout();
- transactionView = new TransactionView(this);
- vbox->addWidget(transactionView);
- transactionsPage->setLayout(vbox);
-
- addressBookPage = new AddressBookPage(AddressBookPage::ForEditing, AddressBookPage::SendingTab);
-
- receiveCoinsPage = new AddressBookPage(AddressBookPage::ForEditing, AddressBookPage::ReceivingTab);
-
- sendCoinsPage = new SendCoinsDialog(this);
-
- signVerifyMessageDialog = new SignVerifyMessageDialog(this);
-
- centralWidget = new QStackedWidget(this);
- centralWidget->addWidget(overviewPage);
- centralWidget->addWidget(transactionsPage);
- centralWidget->addWidget(addressBookPage);
- centralWidget->addWidget(receiveCoinsPage);
- centralWidget->addWidget(sendCoinsPage);
- setCentralWidget(centralWidget);
-
// Create status bar
statusBar();
@@ -150,7 +129,7 @@ BitcoinGUI::BitcoinGUI(QWidget *parent):
// Override style sheet for progress bar for styles that have a segmented progress bar,
// as they make the text unreadable (workaround for issue #1071)
// See https://qt-project.org/doc/qt-4.8/gallery.html
- QString curStyle = qApp->style()->metaObject()->className();
+ QString curStyle = QApplication::style()->metaObject()->className();
if(curStyle == "QWindowsStyle" || curStyle == "QWindowsXPStyle")
{
progressBar->setStyleSheet("QProgressBar { background-color: #e8e8e8; border: 1px solid grey; border-radius: 7px; padding: 1px; text-align: center; } QProgressBar::chunk { background: QLinearGradient(x1: 0, y1: 0, x2: 1, y2: 0, stop: 0 #FF8000, stop: 1 orange); border-radius: 7px; margin: 0px; }");
@@ -162,29 +141,16 @@ BitcoinGUI::BitcoinGUI(QWidget *parent):
syncIconMovie = new QMovie(":/movies/update_spinner", "mng", this);
- // Clicking on a transaction on the overview page simply sends you to transaction history page
- connect(overviewPage, SIGNAL(transactionClicked(QModelIndex)), this, SLOT(gotoHistoryPage()));
- connect(overviewPage, SIGNAL(transactionClicked(QModelIndex)), transactionView, SLOT(focusTransaction(QModelIndex)));
-
- // Double-clicking on a transaction on the transaction history page shows details
- connect(transactionView, SIGNAL(doubleClicked(QModelIndex)), transactionView, SLOT(showDetails()));
-
rpcConsole = new RPCConsole(this);
connect(openRPCConsoleAction, SIGNAL(triggered()), rpcConsole, SLOT(show()));
- // Clicking on "Verify Message" in the address book sends you to the verify message tab
- connect(addressBookPage, SIGNAL(verifyMessage(QString)), this, SLOT(gotoVerifyMessageTab(QString)));
- // Clicking on "Sign Message" in the receive coins page sends you to the sign message tab
- connect(receiveCoinsPage, SIGNAL(signMessage(QString)), this, SLOT(gotoSignMessageTab(QString)));
-
// Install event filter to be able to catch status tip events (QEvent::StatusTip)
this->installEventFilter(this);
-
- gotoOverviewPage();
}
BitcoinGUI::~BitcoinGUI()
{
+ saveWindowGeometry();
if(trayIcon) // Hide tray icon, as deleting will let it linger until quit (on Ubuntu)
trayIcon->hide();
#ifdef Q_OS_MAC
@@ -203,14 +169,14 @@ void BitcoinGUI::createActions()
overviewAction->setShortcut(QKeySequence(Qt::ALT + Qt::Key_1));
tabGroup->addAction(overviewAction);
- sendCoinsAction = new QAction(QIcon(":/icons/send"), tr("&Send coins"), this);
+ sendCoinsAction = new QAction(QIcon(":/icons/send"), tr("&Send"), this);
sendCoinsAction->setStatusTip(tr("Send coins to a Bitcoin address"));
sendCoinsAction->setToolTip(sendCoinsAction->statusTip());
sendCoinsAction->setCheckable(true);
sendCoinsAction->setShortcut(QKeySequence(Qt::ALT + Qt::Key_2));
tabGroup->addAction(sendCoinsAction);
- receiveCoinsAction = new QAction(QIcon(":/icons/receiving_addresses"), tr("&Receive coins"), this);
+ receiveCoinsAction = new QAction(QIcon(":/icons/receiving_addresses"), tr("&Receive"), this);
receiveCoinsAction->setStatusTip(tr("Show the list of addresses for receiving payments"));
receiveCoinsAction->setToolTip(receiveCoinsAction->statusTip());
receiveCoinsAction->setCheckable(true);
@@ -224,7 +190,7 @@ void BitcoinGUI::createActions()
historyAction->setShortcut(QKeySequence(Qt::ALT + Qt::Key_4));
tabGroup->addAction(historyAction);
- addressBookAction = new QAction(QIcon(":/icons/address-book"), tr("&Address Book"), this);
+ addressBookAction = new QAction(QIcon(":/icons/address-book"), tr("&Addresses"), this);
addressBookAction->setStatusTip(tr("Edit the list of stored addresses and labels"));
addressBookAction->setToolTip(addressBookAction->statusTip());
addressBookAction->setCheckable(true);
@@ -257,6 +223,7 @@ void BitcoinGUI::createActions()
optionsAction->setMenuRole(QAction::PreferencesRole);
toggleHideAction = new QAction(QIcon(":/icons/bitcoin"), tr("&Show / Hide"), this);
toggleHideAction->setStatusTip(tr("Show or hide the main Window"));
+
encryptWalletAction = new QAction(QIcon(":/icons/lock_closed"), tr("&Encrypt Wallet..."), this);
encryptWalletAction->setStatusTip(tr("Encrypt the private keys that belong to your wallet"));
encryptWalletAction->setCheckable(true);
@@ -280,9 +247,9 @@ void BitcoinGUI::createActions()
connect(aboutQtAction, SIGNAL(triggered()), qApp, SLOT(aboutQt()));
connect(optionsAction, SIGNAL(triggered()), this, SLOT(optionsClicked()));
connect(toggleHideAction, SIGNAL(triggered()), this, SLOT(toggleHidden()));
- connect(encryptWalletAction, SIGNAL(triggered(bool)), this, SLOT(encryptWallet(bool)));
- connect(backupWalletAction, SIGNAL(triggered()), this, SLOT(backupWallet()));
- connect(changePassphraseAction, SIGNAL(triggered()), this, SLOT(changePassphrase()));
+ connect(encryptWalletAction, SIGNAL(triggered(bool)), walletFrame, SLOT(encryptWallet(bool)));
+ connect(backupWalletAction, SIGNAL(triggered()), walletFrame, SLOT(backupWallet()));
+ connect(changePassphraseAction, SIGNAL(triggered()), walletFrame, SLOT(changePassphrase()));
connect(signMessageAction, SIGNAL(triggered()), this, SLOT(gotoSignMessageTab()));
connect(verifyMessageAction, SIGNAL(triggered()), this, SLOT(gotoVerifyMessageTab()));
}
@@ -344,7 +311,7 @@ void BitcoinGUI::setClientModel(ClientModel *clientModel)
{
setWindowTitle(windowTitle() + QString(" ") + tr("[testnet]"));
#ifndef Q_OS_MAC
- qApp->setWindowIcon(QIcon(":icons/bitcoin_testnet"));
+ QApplication::setWindowIcon(QIcon(":icons/bitcoin_testnet"));
setWindowIcon(QIcon(":icons/bitcoin_testnet"));
#else
MacDockIconHandler::instance()->setIcon(QIcon(":icons/bitcoin_testnet"));
@@ -362,8 +329,7 @@ void BitcoinGUI::setClientModel(ClientModel *clientModel)
// Create system tray menu (or setup the dock menu) that late to prevent users from calling actions,
// while the client has not yet fully loaded
- if(trayIcon)
- createTrayIconMenu();
+ createTrayIconMenu();
// Keep up to date with client
setNumConnections(clientModel->getNumConnections());
@@ -375,39 +341,24 @@ void BitcoinGUI::setClientModel(ClientModel *clientModel)
// Receive and report messages from network/worker thread
connect(clientModel, SIGNAL(message(QString,QString,unsigned int)), this, SLOT(message(QString,QString,unsigned int)));
- overviewPage->setClientModel(clientModel);
rpcConsole->setClientModel(clientModel);
- addressBookPage->setOptionsModel(clientModel->getOptionsModel());
- receiveCoinsPage->setOptionsModel(clientModel->getOptionsModel());
+ walletFrame->setClientModel(clientModel);
}
}
-void BitcoinGUI::setWalletModel(WalletModel *walletModel)
+bool BitcoinGUI::addWallet(const QString& name, WalletModel *walletModel)
{
- this->walletModel = walletModel;
- if(walletModel)
- {
- // Receive and report messages from wallet thread
- connect(walletModel, SIGNAL(message(QString,QString,unsigned int)), this, SLOT(message(QString,QString,unsigned int)));
-
- // Put transaction list in tabs
- transactionView->setModel(walletModel);
- overviewPage->setWalletModel(walletModel);
- addressBookPage->setModel(walletModel->getAddressTableModel());
- receiveCoinsPage->setModel(walletModel->getAddressTableModel());
- sendCoinsPage->setModel(walletModel);
- signVerifyMessageDialog->setModel(walletModel);
-
- setEncryptionStatus(walletModel->getEncryptionStatus());
- connect(walletModel, SIGNAL(encryptionStatusChanged(int)), this, SLOT(setEncryptionStatus(int)));
-
- // Balloon pop-up for new transaction
- connect(walletModel->getTransactionTableModel(), SIGNAL(rowsInserted(QModelIndex,int,int)),
- this, SLOT(incomingTransaction(QModelIndex,int,int)));
-
- // Ask for passphrase if needed
- connect(walletModel, SIGNAL(requireUnlock()), this, SLOT(unlockWallet()));
- }
+ return walletFrame->addWallet(name, walletModel);
+}
+
+bool BitcoinGUI::setCurrentWallet(const QString& name)
+{
+ return walletFrame->setCurrentWallet(name);
+}
+
+void BitcoinGUI::removeAllWallets()
+{
+ walletFrame->removeAllWallets();
}
void BitcoinGUI::createTrayIcon()
@@ -420,13 +371,17 @@ void BitcoinGUI::createTrayIcon()
trayIcon->show();
#endif
- notificator = new Notificator(qApp->applicationName(), trayIcon);
+ notificator = new Notificator(QApplication::applicationName(), trayIcon);
}
void BitcoinGUI::createTrayIconMenu()
{
QMenu *trayIconMenu;
#ifndef Q_OS_MAC
+ // return if trayIcon is unset (only on non-Mac OSes)
+ if (!trayIcon)
+ return;
+
trayIconMenu = new QMenu(this);
trayIcon->setContextMenu(trayIconMenu);
@@ -466,6 +421,28 @@ void BitcoinGUI::trayIconActivated(QSystemTrayIcon::ActivationReason reason)
}
#endif
+void BitcoinGUI::saveWindowGeometry()
+{
+ QSettings settings;
+ settings.setValue("nWindowPos", pos());
+ settings.setValue("nWindowSize", size());
+}
+
+void BitcoinGUI::restoreWindowGeometry()
+{
+ QSettings settings;
+ QPoint pos = settings.value("nWindowPos").toPoint();
+ QSize size = settings.value("nWindowSize", QSize(850, 550)).toSize();
+ if (!pos.x() && !pos.y())
+ {
+ QRect screen = QApplication::desktop()->screenGeometry();
+ pos.setX((screen.width()-size.width())/2);
+ pos.setY((screen.height()-size.height())/2);
+ }
+ resize(size);
+ move(pos);
+}
+
void BitcoinGUI::optionsClicked()
{
if(!clientModel || !clientModel->getOptionsModel())
@@ -482,6 +459,41 @@ void BitcoinGUI::aboutClicked()
dlg.exec();
}
+void BitcoinGUI::gotoOverviewPage()
+{
+ if (walletFrame) walletFrame->gotoOverviewPage();
+}
+
+void BitcoinGUI::gotoHistoryPage()
+{
+ if (walletFrame) walletFrame->gotoHistoryPage();
+}
+
+void BitcoinGUI::gotoAddressBookPage()
+{
+ if (walletFrame) walletFrame->gotoAddressBookPage();
+}
+
+void BitcoinGUI::gotoReceiveCoinsPage()
+{
+ if (walletFrame) walletFrame->gotoReceiveCoinsPage();
+}
+
+void BitcoinGUI::gotoSendCoinsPage(QString addr)
+{
+ if (walletFrame) walletFrame->gotoSendCoinsPage(addr);
+}
+
+void BitcoinGUI::gotoSignMessageTab(QString addr)
+{
+ if (walletFrame) walletFrame->gotoSignMessageTab(addr);
+}
+
+void BitcoinGUI::gotoVerifyMessageTab(QString addr)
+{
+ if (walletFrame) walletFrame->gotoVerifyMessageTab(addr);
+}
+
void BitcoinGUI::setNumConnections(int count)
{
QString icon;
@@ -527,52 +539,17 @@ void BitcoinGUI::setNumBlocks(int count, int nTotalBlocks)
importText = tr("Reindexing blocks on disk...");
}
- if(count < nTotalBlocks)
- {
- int nRemainingBlocks = nTotalBlocks - count;
- float nPercentageDone = count / (nTotalBlocks * 0.01f);
-
- progressBarLabel->setText(importText);
- progressBarLabel->setVisible(true);
- progressBar->setFormat(tr("~%n block(s) remaining", "", nRemainingBlocks));
- progressBar->setMaximum(nTotalBlocks);
- progressBar->setValue(count);
- progressBar->setVisible(true);
-
- tooltip = tr("Processed %1 of %2 blocks of transaction history (%3% done).").arg(count).arg(nTotalBlocks).arg(nPercentageDone, 0, 'f', 2);
- }
- else
- {
- progressBarLabel->setVisible(false);
-
- progressBar->setVisible(false);
- tooltip = tr("Processed %1 blocks of transaction history.").arg(count);
- }
-
QDateTime lastBlockDate = clientModel->getLastBlockDate();
- int secs = lastBlockDate.secsTo(QDateTime::currentDateTime());
- QString text;
+ QDateTime currentDate = QDateTime::currentDateTime();
+ int secs = lastBlockDate.secsTo(currentDate);
- // Represent time from last generated block in human readable text
- if(secs <= 0)
- {
- // Fully up to date. Leave text empty.
- }
- else if(secs < 60)
- {
- text = tr("%n second(s) ago","",secs);
- }
- else if(secs < 60*60)
- {
- text = tr("%n minute(s) ago","",secs/60);
- }
- else if(secs < 24*60*60)
+ if(count < nTotalBlocks)
{
- text = tr("%n hour(s) ago","",secs/(60*60));
+ tooltip = tr("Processed %1 of %2 (estimated) blocks of transaction history.").arg(count).arg(nTotalBlocks);
}
else
{
- text = tr("%n day(s) ago","",secs/(60*60*24));
+ tooltip = tr("Processed %1 blocks of transaction history.").arg(count);
}
// Set icon state: spinning if catching up, tick otherwise
@@ -581,21 +558,47 @@ void BitcoinGUI::setNumBlocks(int count, int nTotalBlocks)
tooltip = tr("Up to date") + QString(".<br>") + tooltip;
labelBlocksIcon->setPixmap(QIcon(":/icons/synced").pixmap(STATUSBAR_ICONSIZE, STATUSBAR_ICONSIZE));
- overviewPage->showOutOfSyncWarning(false);
+ walletFrame->showOutOfSyncWarning(false);
+
+ progressBarLabel->setVisible(false);
+ progressBar->setVisible(false);
}
else
{
+ // Represent time from last generated block in human readable text
+ QString timeBehindText;
+ if(secs < 48*60*60)
+ {
+ timeBehindText = tr("%n hour(s)","",secs/(60*60));
+ }
+ else if(secs < 14*24*60*60)
+ {
+ timeBehindText = tr("%n day(s)","",secs/(24*60*60));
+ }
+ else
+ {
+ timeBehindText = tr("%n week(s)","",secs/(7*24*60*60));
+ }
+
+ progressBarLabel->setText(importText);
+ progressBarLabel->setVisible(true);
+ progressBar->setFormat(tr("%1 behind").arg(timeBehindText));
+ progressBar->setMaximum(1000000000);
+ progressBar->setValue(clientModel->getVerificationProgress() * 1000000000.0 + 0.5);
+ progressBar->setVisible(true);
+
tooltip = tr("Catching up...") + QString("<br>") + tooltip;
labelBlocksIcon->setMovie(syncIconMovie);
- syncIconMovie->start();
+ if(count != prevBlocks)
+ syncIconMovie->jumpToNextFrame();
+ prevBlocks = count;
- overviewPage->showOutOfSyncWarning(true);
- }
+ walletFrame->showOutOfSyncWarning(true);
- if(!text.isEmpty())
- {
tooltip += QString("<br>");
- tooltip += tr("Last received block was generated %1.").arg(text);
+ tooltip += tr("Last received block was generated %1 ago.").arg(timeBehindText);
+ tooltip += QString("<br>");
+ tooltip += tr("Transactions after this will not yet be visible.");
}
// Don't word-wrap this (fixed-width) tooltip
@@ -681,7 +684,7 @@ void BitcoinGUI::closeEvent(QCloseEvent *event)
if(!clientModel->getOptionsModel()->getMinimizeToTray() &&
!clientModel->getOptionsModel()->getMinimizeOnClose())
{
- qApp->quit();
+ QApplication::quit();
}
#endif
}
@@ -699,23 +702,8 @@ void BitcoinGUI::askFee(qint64 nFeeRequired, bool *payFee)
*payFee = (retval == QMessageBox::Yes);
}
-void BitcoinGUI::incomingTransaction(const QModelIndex& parent, int start, int /*end*/)
+void BitcoinGUI::incomingTransaction(const QString& date, int unit, qint64 amount, const QString& type, const QString& address)
{
- // Prevent balloon-spam when initial block download is in progress
- if(!walletModel || !clientModel || clientModel->inInitialBlockDownload())
- return;
-
- TransactionTableModel *ttm = walletModel->getTransactionTableModel();
-
- QString date = ttm->index(start, TransactionTableModel::Date, parent)
- .data().toString();
- qint64 amount = ttm->index(start, TransactionTableModel::Amount, parent)
- .data(Qt::EditRole).toULongLong();
- QString type = ttm->index(start, TransactionTableModel::Type, parent)
- .data().toString();
- QString address = ttm->index(start, TransactionTableModel::ToAddress, parent)
- .data().toString();
-
// On new transaction, make an info balloon
message((amount)<0 ? tr("Sent transaction") : tr("Incoming transaction"),
tr("Date: %1\n"
@@ -723,77 +711,11 @@ void BitcoinGUI::incomingTransaction(const QModelIndex& parent, int start, int /
"Type: %3\n"
"Address: %4\n")
.arg(date)
- .arg(BitcoinUnits::formatWithUnit(walletModel->getOptionsModel()->getDisplayUnit(), amount, true))
+ .arg(BitcoinUnits::formatWithUnit(unit, amount, true))
.arg(type)
.arg(address), CClientUIInterface::MSG_INFORMATION);
}
-void BitcoinGUI::gotoOverviewPage()
-{
- overviewAction->setChecked(true);
- centralWidget->setCurrentWidget(overviewPage);
-
- exportAction->setEnabled(false);
- disconnect(exportAction, SIGNAL(triggered()), 0, 0);
-}
-
-void BitcoinGUI::gotoHistoryPage()
-{
- historyAction->setChecked(true);
- centralWidget->setCurrentWidget(transactionsPage);
-
- exportAction->setEnabled(true);
- disconnect(exportAction, SIGNAL(triggered()), 0, 0);
- connect(exportAction, SIGNAL(triggered()), transactionView, SLOT(exportClicked()));
-}
-
-void BitcoinGUI::gotoAddressBookPage()
-{
- addressBookAction->setChecked(true);
- centralWidget->setCurrentWidget(addressBookPage);
-
- exportAction->setEnabled(true);
- disconnect(exportAction, SIGNAL(triggered()), 0, 0);
- connect(exportAction, SIGNAL(triggered()), addressBookPage, SLOT(exportClicked()));
-}
-
-void BitcoinGUI::gotoReceiveCoinsPage()
-{
- receiveCoinsAction->setChecked(true);
- centralWidget->setCurrentWidget(receiveCoinsPage);
-
- exportAction->setEnabled(true);
- disconnect(exportAction, SIGNAL(triggered()), 0, 0);
- connect(exportAction, SIGNAL(triggered()), receiveCoinsPage, SLOT(exportClicked()));
-}
-
-void BitcoinGUI::gotoSendCoinsPage()
-{
- sendCoinsAction->setChecked(true);
- centralWidget->setCurrentWidget(sendCoinsPage);
-
- exportAction->setEnabled(false);
- disconnect(exportAction, SIGNAL(triggered()), 0, 0);
-}
-
-void BitcoinGUI::gotoSignMessageTab(QString addr)
-{
- // call show() in showTab_SM()
- signVerifyMessageDialog->showTab_SM(true);
-
- if(!addr.isEmpty())
- signVerifyMessageDialog->setAddress_SM(addr);
-}
-
-void BitcoinGUI::gotoVerifyMessageTab(QString addr)
-{
- // call show() in showTab_VM()
- signVerifyMessageDialog->showTab_VM(true);
-
- if(!addr.isEmpty())
- signVerifyMessageDialog->setAddress_VM(addr);
-}
-
void BitcoinGUI::dragEnterEvent(QDragEnterEvent *event)
{
// Accept only URIs
@@ -809,13 +731,13 @@ void BitcoinGUI::dropEvent(QDropEvent *event)
QList<QUrl> uris = event->mimeData()->urls();
foreach(const QUrl &uri, uris)
{
- if (sendCoinsPage->handleURI(uri.toString()))
+ if (walletFrame->handleURI(uri.toString()))
nValidUrisFound++;
}
// if valid URIs were found
if (nValidUrisFound)
- gotoSendCoinsPage();
+ walletFrame->gotoSendCoinsPage();
else
message(tr("URI handling"), tr("URI can not be parsed! This can be caused by an invalid Bitcoin address or malformed URI parameters."),
CClientUIInterface::ICON_WARNING);
@@ -830,7 +752,7 @@ bool BitcoinGUI::eventFilter(QObject *object, QEvent *event)
if (event->type() == QEvent::StatusTip)
{
// Prevent adding text from setStatusTip(), if we currently use the status bar for displaying other stuff
- if (progressBarLabel->isVisible() && progressBar->isVisible())
+ if (progressBarLabel->isVisible() || progressBar->isVisible())
return true;
}
return QMainWindow::eventFilter(object, event);
@@ -839,12 +761,7 @@ bool BitcoinGUI::eventFilter(QObject *object, QEvent *event)
void BitcoinGUI::handleURI(QString strURI)
{
// URI has to be valid
- if (sendCoinsPage->handleURI(strURI))
- {
- showNormalIfMinimized();
- gotoSendCoinsPage();
- }
- else
+ if (!walletFrame->handleURI(strURI))
message(tr("URI handling"), tr("URI can not be parsed! This can be caused by an invalid Bitcoin address or malformed URI parameters."),
CClientUIInterface::ICON_WARNING);
}
@@ -878,53 +795,6 @@ void BitcoinGUI::setEncryptionStatus(int status)
}
}
-void BitcoinGUI::encryptWallet(bool status)
-{
- if(!walletModel)
- return;
- AskPassphraseDialog dlg(status ? AskPassphraseDialog::Encrypt:
- AskPassphraseDialog::Decrypt, this);
- dlg.setModel(walletModel);
- dlg.exec();
-
- setEncryptionStatus(walletModel->getEncryptionStatus());
-}
-
-void BitcoinGUI::backupWallet()
-{
- QString saveDir = QDesktopServices::storageLocation(QDesktopServices::DocumentsLocation);
- QString filename = QFileDialog::getSaveFileName(this, tr("Backup Wallet"), saveDir, tr("Wallet Data (*.dat)"));
- if(!filename.isEmpty()) {
- if(!walletModel->backupWallet(filename)) {
- message(tr("Backup Failed"), tr("There was an error trying to save the wallet data to the new location."),
- CClientUIInterface::MSG_ERROR);
- }
- else
- message(tr("Backup Successful"), tr("The wallet data was successfully saved to the new location."),
- CClientUIInterface::MSG_INFORMATION);
- }
-}
-
-void BitcoinGUI::changePassphrase()
-{
- AskPassphraseDialog dlg(AskPassphraseDialog::ChangePass, this);
- dlg.setModel(walletModel);
- dlg.exec();
-}
-
-void BitcoinGUI::unlockWallet()
-{
- if(!walletModel)
- return;
- // Unlock wallet when requested by wallet model
- if(walletModel->getEncryptionStatus() == WalletModel::Locked)
- {
- AskPassphraseDialog dlg(AskPassphraseDialog::Unlock, this);
- dlg.setModel(walletModel);
- dlg.exec();
- }
-}
-
void BitcoinGUI::showNormalIfMinimized(bool fToggleHidden)
{
// activateWindow() (sometimes) helps with keyboard focus on Windows
@@ -951,3 +821,9 @@ void BitcoinGUI::toggleHidden()
{
showNormalIfMinimized(true);
}
+
+void BitcoinGUI::detectShutdown()
+{
+ if (ShutdownRequested())
+ QMetaObject::invokeMethod(QCoreApplication::instance(), "quit", Qt::QueuedConnection);
+}
diff --git a/src/qt/bitcoingui.h b/src/qt/bitcoingui.h
index c684fcf249..5f7ef746f9 100644
--- a/src/qt/bitcoingui.h
+++ b/src/qt/bitcoingui.h
@@ -3,10 +3,14 @@
#include <QMainWindow>
#include <QSystemTrayIcon>
+#include <QMap>
class TransactionTableModel;
+class WalletFrame;
+class WalletView;
class ClientModel;
class WalletModel;
+class WalletStack;
class TransactionView;
class OverviewPage;
class AddressBookPage;
@@ -15,15 +19,17 @@ class SignVerifyMessageDialog;
class Notificator;
class RPCConsole;
+class CWallet;
+
QT_BEGIN_NAMESPACE
class QLabel;
-class QLineEdit;
-class QTableView;
-class QAbstractItemModel;
class QModelIndex;
class QProgressBar;
class QStackedWidget;
class QUrl;
+class QListWidget;
+class QPushButton;
+class QAction;
QT_END_NAMESPACE
/**
@@ -33,7 +39,10 @@ QT_END_NAMESPACE
class BitcoinGUI : public QMainWindow
{
Q_OBJECT
+
public:
+ static const QString DEFAULT_WALLET;
+
explicit BitcoinGUI(QWidget *parent = 0);
~BitcoinGUI();
@@ -45,7 +54,20 @@ public:
The wallet model represents a bitcoin wallet, and offers access to the list of transactions, address book and sending
functionality.
*/
- void setWalletModel(WalletModel *walletModel);
+
+ bool addWallet(const QString& name, WalletModel *walletModel);
+ bool setCurrentWallet(const QString& name);
+
+ void removeAllWallets();
+
+ /** Used by WalletView to allow access to needed QActions */
+ // Todo: Use Qt signals for these
+ QAction * getOverviewAction() { return overviewAction; }
+ QAction * getHistoryAction() { return historyAction; }
+ QAction * getAddressBookAction() { return addressBookAction; }
+ QAction * getReceiveCoinsAction() { return receiveCoinsAction; }
+ QAction * getSendCoinsAction() { return sendCoinsAction; }
+ QAction * getExportAction() { return exportAction; }
protected:
void changeEvent(QEvent *e);
@@ -56,16 +78,7 @@ protected:
private:
ClientModel *clientModel;
- WalletModel *walletModel;
-
- QStackedWidget *centralWidget;
-
- OverviewPage *overviewPage;
- QWidget *transactionsPage;
- AddressBookPage *addressBookPage;
- AddressBookPage *receiveCoinsPage;
- SendCoinsDialog *sendCoinsPage;
- SignVerifyMessageDialog *signVerifyMessageDialog;
+ WalletFrame *walletFrame;
QLabel *labelEncryptionIcon;
QLabel *labelConnectionsIcon;
@@ -98,6 +111,8 @@ private:
RPCConsole *rpcConsole;
QMovie *syncIconMovie;
+ /** Keep track of previous number of blocks, to detect progress */
+ int prevBlocks;
/** Create the main UI actions. */
void createActions();
@@ -109,6 +124,10 @@ private:
void createTrayIcon();
/** Create system tray menu (or setup the dock menu) */
void createTrayIconMenu();
+ /** Save window size and position */
+ void saveWindowGeometry();
+ /** Restore window size and position */
+ void restoreWindowGeometry();
public slots:
/** Set number of connections shown in the UI */
@@ -140,6 +159,9 @@ public slots:
void askFee(qint64 nFeeRequired, bool *payFee);
void handleURI(QString strURI);
+ /** Show incoming transaction notification for new transactions. */
+ void incomingTransaction(const QString& date, int unit, qint64 amount, const QString& type, const QString& address);
+
private slots:
/** Switch to overview (home) page */
void gotoOverviewPage();
@@ -150,7 +172,7 @@ private slots:
/** Switch to receive coins page */
void gotoReceiveCoinsPage();
/** Switch to send coins page */
- void gotoSendCoinsPage();
+ void gotoSendCoinsPage(QString addr = "");
/** Show Sign/Verify Message dialog and switch to sign message tab */
void gotoSignMessageTab(QString addr = "");
@@ -165,24 +187,14 @@ private slots:
/** Handle tray icon clicked */
void trayIconActivated(QSystemTrayIcon::ActivationReason reason);
#endif
- /** Show incoming transaction notification for new transactions.
-
- The new items are those between start and end inclusive, under the given parent item.
- */
- void incomingTransaction(const QModelIndex& parent, int start, int /*end*/);
- /** Encrypt the wallet */
- void encryptWallet(bool status);
- /** Backup the wallet */
- void backupWallet();
- /** Change encrypted wallet passphrase */
- void changePassphrase();
- /** Ask for passphrase to unlock wallet temporarily */
- void unlockWallet();
/** Show window if hidden, unminimize when minimized, rise when obscured or show if hidden and fToggleHidden is true */
void showNormalIfMinimized(bool fToggleHidden = false);
/** Simply calls showNormalIfMinimized(true) for use in SLOT() macro */
void toggleHidden();
+
+ /** called by a timer to check if fRequestShutdown has been set **/
+ void detectShutdown();
};
#endif // BITCOINGUI_H
diff --git a/src/qt/bitcoinstrings.cpp b/src/qt/bitcoinstrings.cpp
index 2c3d859c82..2c500f4fe1 100644
--- a/src/qt/bitcoinstrings.cpp
+++ b/src/qt/bitcoinstrings.cpp
@@ -8,14 +8,16 @@
static const char UNUSED *bitcoin_strings[] = {
QT_TRANSLATE_NOOP("bitcoin-core", ""
"%s, you must set a rpcpassword in the configuration file:\n"
-" %s\n"
+"%s\n"
"It is recommended you use the following random password:\n"
"rpcuser=bitcoinrpc\n"
"rpcpassword=%s\n"
"(you do not need to remember this password)\n"
"The username and password MUST NOT be the same.\n"
"If the file does not exist, create it with owner-readable-only file "
-"permissions.\n"),
+"permissions.\n"
+"It is also recommended to set alertnotify so you are notified of problems;\n"
+"for example: alertnotify=echo %%s | mail -s \"Bitcoin Alert\" admin@foo.com\n"),
QT_TRANSLATE_NOOP("bitcoin-core", ""
"Acceptable ciphers (default: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:"
"@STRENGTH)"),
@@ -31,8 +33,6 @@ QT_TRANSLATE_NOOP("bitcoin-core", ""
"Cannot obtain a lock on data directory %s. Bitcoin is probably already "
"running."),
QT_TRANSLATE_NOOP("bitcoin-core", ""
-"Corrupted block database detected. Please restart the client with -reindex."),
-QT_TRANSLATE_NOOP("bitcoin-core", ""
"Error initializing database environment %s! To recover, BACKUP THAT "
"DIRECTORY, then remove everything from it except for wallet.dat."),
QT_TRANSLATE_NOOP("bitcoin-core", ""
@@ -43,6 +43,12 @@ QT_TRANSLATE_NOOP("bitcoin-core", ""
"Error: This transaction requires a transaction fee of at least %s because of "
"its amount, complexity, or use of recently received funds!"),
QT_TRANSLATE_NOOP("bitcoin-core", ""
+"Execute command when a relevant alert is received (%s in cmd is replaced by "
+"message)"),
+QT_TRANSLATE_NOOP("bitcoin-core", ""
+"Execute command when a wallet transaction changes (%s in cmd is replaced by "
+"TxID)"),
+QT_TRANSLATE_NOOP("bitcoin-core", ""
"Execute command when the best block changes (%s in cmd is replaced by block "
"hash)"),
QT_TRANSLATE_NOOP("bitcoin-core", ""
@@ -97,14 +103,18 @@ QT_TRANSLATE_NOOP("bitcoin-core", "Cannot write default address"),
QT_TRANSLATE_NOOP("bitcoin-core", "Connect only to the specified node(s)"),
QT_TRANSLATE_NOOP("bitcoin-core", "Connect through socks proxy"),
QT_TRANSLATE_NOOP("bitcoin-core", "Connect to a node to retrieve peer addresses, and disconnect"),
+QT_TRANSLATE_NOOP("bitcoin-core", "Corrupted block database detected"),
QT_TRANSLATE_NOOP("bitcoin-core", "Discover own IP address (default: 1 when listening and no -externalip)"),
+QT_TRANSLATE_NOOP("bitcoin-core", "Do you want to rebuild the block database now?"),
QT_TRANSLATE_NOOP("bitcoin-core", "Don't generate coins"),
QT_TRANSLATE_NOOP("bitcoin-core", "Done loading"),
QT_TRANSLATE_NOOP("bitcoin-core", "Error initializing block database"),
+QT_TRANSLATE_NOOP("bitcoin-core", "Error initializing wallet database environment %s!"),
QT_TRANSLATE_NOOP("bitcoin-core", "Error loading block database"),
QT_TRANSLATE_NOOP("bitcoin-core", "Error loading wallet.dat"),
QT_TRANSLATE_NOOP("bitcoin-core", "Error loading wallet.dat: Wallet corrupted"),
QT_TRANSLATE_NOOP("bitcoin-core", "Error loading wallet.dat: Wallet requires newer version of Bitcoin"),
+QT_TRANSLATE_NOOP("bitcoin-core", "Error opening block database"),
QT_TRANSLATE_NOOP("bitcoin-core", "Error"),
QT_TRANSLATE_NOOP("bitcoin-core", "Error: Disk space is low!"),
QT_TRANSLATE_NOOP("bitcoin-core", "Error: Transaction creation failed!"),
@@ -124,12 +134,10 @@ QT_TRANSLATE_NOOP("bitcoin-core", "Failed to write transaction index"),
QT_TRANSLATE_NOOP("bitcoin-core", "Failed to write undo data"),
QT_TRANSLATE_NOOP("bitcoin-core", "Fee per KB to add to transactions you send"),
QT_TRANSLATE_NOOP("bitcoin-core", "Find peers using DNS lookup (default: 1 unless -connect)"),
-QT_TRANSLATE_NOOP("bitcoin-core", "Find peers using internet relay chat (default: 0)"),
QT_TRANSLATE_NOOP("bitcoin-core", "Generate coins"),
QT_TRANSLATE_NOOP("bitcoin-core", "Get help for a command"),
QT_TRANSLATE_NOOP("bitcoin-core", "How many blocks to check at startup (default: 288, 0 = all)"),
QT_TRANSLATE_NOOP("bitcoin-core", "How thorough the block verification is (0-4, default: 3)"),
-QT_TRANSLATE_NOOP("bitcoin-core", "Importing blocks from block database..."),
QT_TRANSLATE_NOOP("bitcoin-core", "Imports blocks from external blk000??.dat file"),
QT_TRANSLATE_NOOP("bitcoin-core", "Information"),
QT_TRANSLATE_NOOP("bitcoin-core", "Insufficient funds"),
@@ -153,7 +161,7 @@ QT_TRANSLATE_NOOP("bitcoin-core", "Output extra debugging information. Implies a
QT_TRANSLATE_NOOP("bitcoin-core", "Output extra network debugging information"),
QT_TRANSLATE_NOOP("bitcoin-core", "Password for JSON-RPC connections"),
QT_TRANSLATE_NOOP("bitcoin-core", "Prepend debug output with timestamp"),
-QT_TRANSLATE_NOOP("bitcoin-core", "Rebuild blockchain index from current blk000??.dat files"),
+QT_TRANSLATE_NOOP("bitcoin-core", "Rebuild block chain index from current blk000??.dat files"),
QT_TRANSLATE_NOOP("bitcoin-core", "Rescan the block chain for missing wallet transactions"),
QT_TRANSLATE_NOOP("bitcoin-core", "Rescanning..."),
QT_TRANSLATE_NOOP("bitcoin-core", "Run in the background as a daemon and accept commands"),
@@ -190,8 +198,8 @@ QT_TRANSLATE_NOOP("bitcoin-core", "Use UPnP to map the listening port (default:
QT_TRANSLATE_NOOP("bitcoin-core", "Use proxy to reach tor hidden services (default: same as -proxy)"),
QT_TRANSLATE_NOOP("bitcoin-core", "Use the test network"),
QT_TRANSLATE_NOOP("bitcoin-core", "Username for JSON-RPC connections"),
-QT_TRANSLATE_NOOP("bitcoin-core", "Verifying block database integrity..."),
-QT_TRANSLATE_NOOP("bitcoin-core", "Verifying wallet integrity..."),
+QT_TRANSLATE_NOOP("bitcoin-core", "Verifying blocks..."),
+QT_TRANSLATE_NOOP("bitcoin-core", "Verifying wallet..."),
QT_TRANSLATE_NOOP("bitcoin-core", "Wallet needed to be rewritten: restart Bitcoin to complete"),
QT_TRANSLATE_NOOP("bitcoin-core", "Warning"),
QT_TRANSLATE_NOOP("bitcoin-core", "Warning: This version is obsolete, upgrade required!"),
diff --git a/src/qt/bitcoinunits.h b/src/qt/bitcoinunits.h
index 9b7c9e160e..6e96cef59d 100644
--- a/src/qt/bitcoinunits.h
+++ b/src/qt/bitcoinunits.h
@@ -9,6 +9,8 @@
*/
class BitcoinUnits: public QAbstractListModel
{
+ Q_OBJECT
+
public:
explicit BitcoinUnits(QObject *parent);
@@ -58,6 +60,7 @@ public:
int rowCount(const QModelIndex &parent) const;
QVariant data(const QModelIndex &index, int role) const;
///@}
+
private:
QList<BitcoinUnits::Unit> unitlist;
};
diff --git a/src/qt/clientmodel.cpp b/src/qt/clientmodel.cpp
index 084ad12a56..863176aa1b 100644
--- a/src/qt/clientmodel.cpp
+++ b/src/qt/clientmodel.cpp
@@ -1,4 +1,5 @@
#include "clientmodel.h"
+
#include "guiconstants.h"
#include "optionsmodel.h"
#include "addresstablemodel.h"
@@ -6,6 +7,7 @@
#include "alert.h"
#include "main.h"
+#include "checkpoints.h"
#include "ui_interface.h"
#include <QDateTime>
@@ -50,8 +52,15 @@ QDateTime ClientModel::getLastBlockDate() const
{
if (pindexBest)
return QDateTime::fromTime_t(pindexBest->GetBlockTime());
- else
+ else if(!isTestNet())
return QDateTime::fromTime_t(1231006505); // Genesis block's time
+ else
+ return QDateTime::fromTime_t(1296688602); // Genesis block's time (testnet)
+}
+
+double ClientModel::getVerificationProgress() const
+{
+ return Checkpoints::GuessVerificationProgress(pindexBest);
}
void ClientModel::updateTimer()
diff --git a/src/qt/clientmodel.h b/src/qt/clientmodel.h
index 1afccb7859..3ba34b2786 100644
--- a/src/qt/clientmodel.h
+++ b/src/qt/clientmodel.h
@@ -24,6 +24,7 @@ enum BlockSource {
class ClientModel : public QObject
{
Q_OBJECT
+
public:
explicit ClientModel(OptionsModel *optionsModel, QObject *parent = 0);
~ClientModel();
@@ -34,6 +35,7 @@ public:
int getNumBlocks() const;
int getNumBlocksAtStartup();
+ double getVerificationProgress() const;
QDateTime getLastBlockDate() const;
//! Return true if client connected to testnet
@@ -65,6 +67,7 @@ private:
void subscribeToCoreSignals();
void unsubscribeFromCoreSignals();
+
signals:
void numConnectionsChanged(int count);
void numBlocksChanged(int count, int countOfPeers);
diff --git a/src/qt/csvmodelwriter.h b/src/qt/csvmodelwriter.h
index 6c9dcbaf3b..c4504ee91a 100644
--- a/src/qt/csvmodelwriter.h
+++ b/src/qt/csvmodelwriter.h
@@ -14,6 +14,7 @@ QT_END_NAMESPACE
class CSVModelWriter : public QObject
{
Q_OBJECT
+
public:
explicit CSVModelWriter(const QString &filename, QObject *parent = 0);
@@ -36,11 +37,6 @@ private:
int role;
};
QList<Column> columns;
-
-signals:
-
-public slots:
-
};
#endif // CSVMODELWRITER_H
diff --git a/src/qt/editaddressdialog.cpp b/src/qt/editaddressdialog.cpp
index 5cfcb34b95..9abad7647c 100644
--- a/src/qt/editaddressdialog.cpp
+++ b/src/qt/editaddressdialog.cpp
@@ -1,5 +1,6 @@
#include "editaddressdialog.h"
#include "ui_editaddressdialog.h"
+
#include "addresstablemodel.h"
#include "guiutil.h"
diff --git a/src/qt/editaddressdialog.h b/src/qt/editaddressdialog.h
index 0e4183bd52..44e5023d25 100644
--- a/src/qt/editaddressdialog.h
+++ b/src/qt/editaddressdialog.h
@@ -3,15 +3,15 @@
#include <QDialog>
-QT_BEGIN_NAMESPACE
-class QDataWidgetMapper;
-QT_END_NAMESPACE
-
namespace Ui {
class EditAddressDialog;
}
class AddressTableModel;
+QT_BEGIN_NAMESPACE
+class QDataWidgetMapper;
+QT_END_NAMESPACE
+
/** Dialog for editing an address and associated information.
*/
class EditAddressDialog : public QDialog
diff --git a/src/qt/forms/addressbookpage.ui b/src/qt/forms/addressbookpage.ui
index 71ab75ca3f..3cf307384a 100644
--- a/src/qt/forms/addressbookpage.ui
+++ b/src/qt/forms/addressbookpage.ui
@@ -16,9 +16,6 @@
<layout class="QVBoxLayout" name="verticalLayout">
<item>
<widget class="QLabel" name="labelExplanation">
- <property name="text">
- <string>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.</string>
- </property>
<property name="textFormat">
<enum>Qt::PlainText</enum>
</property>
@@ -58,7 +55,7 @@
<item>
<layout class="QHBoxLayout" name="horizontalLayout">
<item>
- <widget class="QPushButton" name="newAddressButton">
+ <widget class="QPushButton" name="newAddress">
<property name="toolTip">
<string>Create a new address</string>
</property>
@@ -72,7 +69,7 @@
</widget>
</item>
<item>
- <widget class="QPushButton" name="copyToClipboard">
+ <widget class="QPushButton" name="copyAddress">
<property name="toolTip">
<string>Copy the currently selected address to the system clipboard</string>
</property>
@@ -125,7 +122,7 @@
</widget>
</item>
<item>
- <widget class="QPushButton" name="deleteButton">
+ <widget class="QPushButton" name="deleteAddress">
<property name="toolTip">
<string>Delete the currently selected address from the list</string>
</property>
diff --git a/src/qt/forms/overviewpage.ui b/src/qt/forms/overviewpage.ui
index 970e6c671d..57aa624cc2 100644
--- a/src/qt/forms/overviewpage.ui
+++ b/src/qt/forms/overviewpage.ui
@@ -49,7 +49,6 @@
<widget class="QLabel" name="label_5">
<property name="font">
<font>
- <pointsize>11</pointsize>
<weight>75</weight>
<bold>true</bold>
</font>
@@ -159,23 +158,6 @@
</property>
</widget>
</item>
- <item row="3" column="0">
- <widget class="QLabel" name="label_2">
- <property name="text">
- <string>Number of transactions:</string>
- </property>
- </widget>
- </item>
- <item row="3" column="1">
- <widget class="QLabel" name="labelNumTransactions">
- <property name="toolTip">
- <string>Total number of transactions in wallet</string>
- </property>
- <property name="text">
- <string notr="true">0</string>
- </property>
- </widget>
- </item>
<item row="2" column="0">
<widget class="QLabel" name="labelImmatureText">
<property name="text">
diff --git a/src/qt/guiconstants.h b/src/qt/guiconstants.h
index 405ba396b7..92417834ec 100644
--- a/src/qt/guiconstants.h
+++ b/src/qt/guiconstants.h
@@ -2,7 +2,7 @@
#define GUICONSTANTS_H
/* Milliseconds between model updates */
-static const int MODEL_UPDATE_DELAY = 500;
+static const int MODEL_UPDATE_DELAY = 250;
/* AskPassphraseDialog -- Maximum passphrase length */
static const int MAX_PASSPHRASE_SIZE = 1024;
diff --git a/src/qt/guiutil.cpp b/src/qt/guiutil.cpp
index d4e73adf96..2105f0730e 100644
--- a/src/qt/guiutil.cpp
+++ b/src/qt/guiutil.cpp
@@ -1,11 +1,14 @@
+#include <QApplication>
+
#include "guiutil.h"
+
#include "bitcoinaddressvalidator.h"
#include "walletmodel.h"
#include "bitcoinunits.h"
+
#include "util.h"
#include "init.h"
-#include <QString>
#include <QDateTime>
#include <QDoubleValidator>
#include <QFont>
@@ -13,7 +16,6 @@
#include <QUrl>
#include <QTextDocument> // For Qt::escape
#include <QAbstractItemView>
-#include <QApplication>
#include <QClipboard>
#include <QFileDialog>
#include <QDesktopServices>
@@ -158,8 +160,10 @@ void copyEntryData(QAbstractItemView *view, int column, int role)
if(!selection.isEmpty())
{
- // Copy first item
- QApplication::clipboard()->setText(selection.at(0).data(role).toString());
+ // Copy first item (global clipboard)
+ QApplication::clipboard()->setText(selection.at(0).data(role).toString(), QClipboard::Clipboard);
+ // Copy first item (global mouse selection for e.g. X11 - NOP on Windows)
+ QApplication::clipboard()->setText(selection.at(0).data(role).toString(), QClipboard::Selection);
}
}
@@ -211,7 +215,7 @@ QString getSaveFileName(QWidget *parent, const QString &caption,
Qt::ConnectionType blockingGUIThreadConnection()
{
- if(QThread::currentThread() != QCoreApplication::instance()->thread())
+ if(QThread::currentThread() != qApp->thread())
{
return Qt::BlockingQueuedConnection;
}
@@ -223,7 +227,7 @@ Qt::ConnectionType blockingGUIThreadConnection()
bool checkPoint(const QPoint &p, const QWidget *w)
{
- QWidget *atW = qApp->widgetAt(w->mapToGlobal(p));
+ QWidget *atW = QApplication::widgetAt(w->mapToGlobal(p));
if (!atW) return false;
return atW->topLevelWidget() == w;
}
@@ -455,4 +459,3 @@ void HelpMessageBox::showOrPrint()
}
} // namespace GUIUtil
-
diff --git a/src/qt/guiutil.h b/src/qt/guiutil.h
index db100bdb73..e2c7d18aa2 100644
--- a/src/qt/guiutil.h
+++ b/src/qt/guiutil.h
@@ -5,6 +5,8 @@
#include <QObject>
#include <QMessageBox>
+class SendCoinsRecipient;
+
QT_BEGIN_NAMESPACE
class QFont;
class QLineEdit;
@@ -13,7 +15,6 @@ class QDateTime;
class QUrl;
class QAbstractItemView;
QT_END_NAMESPACE
-class SendCoinsRecipient;
/** Utility functions used by the Bitcoin Qt UI.
*/
diff --git a/src/qt/locale/bitcoin_bg.ts b/src/qt/locale/bitcoin_bg.ts
index 39b41ab3cf..170004f341 100644
--- a/src/qt/locale/bitcoin_bg.ts
+++ b/src/qt/locale/bitcoin_bg.ts
@@ -13,12 +13,7 @@
<translation>&lt;b&gt;Биткоин&lt;/b&gt; верÑиÑ</translation>
</message>
<message>
- <location line="+41"/>
- <source>Copyright © 2009-2012 The Bitcoin developers</source>
- <translation>Copyright © 2009-2012 Биткоин разработчици</translation>
- </message>
- <message>
- <location line="+13"/>
+ <location line="+57"/>
<source>
This is experimental software.
@@ -32,6 +27,16 @@ This product includes software developed by the OpenSSL Project for use in the O
Използван е Ñофтуер, разработен от OpenSSL Project за употреба в OpenSSL Toolkit (http://www.openssl.org/), криптографÑки Ñофтуер разработен от Eric Young (eay@cryptsoft.com) и UPnP Ñофтуер разработен от Thomas Bernard.</translation>
</message>
+ <message>
+ <location filename="../aboutdialog.cpp" line="+17"/>
+ <source>Copyright</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>2009-%1 The Bitcoin developers</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>AddressBookPage</name>
@@ -106,17 +111,22 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation>&amp;Изтрий</translation>
</message>
<message>
- <location filename="../addressbookpage.cpp" line="+65"/>
+ <location filename="../addressbookpage.cpp" line="+66"/>
<source>Copy &amp;Label</source>
<translation>Копирай &amp;име</translation>
</message>
<message>
- <location line="+2"/>
+ <location line="+1"/>
<source>&amp;Edit</source>
<translation>&amp;Редактирай</translation>
</message>
<message>
- <location line="+250"/>
+ <location line="+1"/>
+ <source>Send &amp;Coins</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+263"/>
<source>Export Address Book Data</source>
<translation>Запазване на адреÑи</translation>
</message>
@@ -139,7 +149,7 @@ This product includes software developed by the OpenSSL Project for use in the O
<context>
<name>AddressTableModel</name>
<message>
- <location filename="../addresstablemodel.cpp" line="+142"/>
+ <location filename="../addresstablemodel.cpp" line="+144"/>
<source>Label</source>
<translation>Име</translation>
</message>
@@ -298,17 +308,17 @@ This product includes software developed by the OpenSSL Project for use in the O
<context>
<name>BitcoinGUI</name>
<message>
- <location filename="../bitcoingui.cpp" line="+267"/>
+ <location filename="../bitcoingui.cpp" line="+231"/>
<source>Sign &amp;message...</source>
<translation>ПодпиÑване на &amp;Ñъобщение...</translation>
</message>
<message>
- <location line="+254"/>
+ <location line="+299"/>
<source>Synchronizing with network...</source>
<translation>Синхронизиране Ñ Ð¼Ñ€ÐµÐ¶Ð°Ñ‚Ð°...</translation>
</message>
<message>
- <location line="-322"/>
+ <location line="-367"/>
<source>&amp;Overview</source>
<translation>&amp;БаланÑ</translation>
</message>
@@ -328,32 +338,17 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation>ИÑÑ‚Ð¾Ñ€Ð¸Ñ Ð½Ð° входÑщите и изходÑщи транзакции</translation>
</message>
<message>
- <location line="+6"/>
- <source>&amp;Address Book</source>
- <translation>&amp;ÐдреÑи</translation>
- </message>
- <message>
- <location line="+1"/>
+ <location line="+7"/>
<source>Edit the list of stored addresses and labels</source>
<translation>Редактиране на адреÑи</translation>
</message>
<message>
- <location line="-15"/>
- <source>&amp;Receive coins</source>
- <translation>&amp;Получаване</translation>
- </message>
- <message>
- <location line="+1"/>
+ <location line="-14"/>
<source>Show the list of addresses for receiving payments</source>
<translation>СпиÑък на адреÑите за получаване</translation>
</message>
<message>
- <location line="-8"/>
- <source>&amp;Send coins</source>
- <translation>&amp;Изпращане</translation>
- </message>
- <message>
- <location line="+39"/>
+ <location line="+31"/>
<source>E&amp;xit</source>
<translation>Из&amp;ход</translation>
</message>
@@ -398,7 +393,7 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation>&amp;СмÑна на паролата...</translation>
</message>
<message>
- <location line="+259"/>
+ <location line="+304"/>
<source>Importing blocks from disk...</source>
<translation type="unfinished"/>
</message>
@@ -407,13 +402,8 @@ This product includes software developed by the OpenSSL Project for use in the O
<source>Reindexing blocks on disk...</source>
<translation type="unfinished"/>
</message>
- <message numerus="yes">
- <location line="+10"/>
- <source>~%n block(s) remaining</source>
- <translation><numerusform>оÑтава ~%n блок</numerusform><numerusform>оÑтават ~%n блока</numerusform></translation>
- </message>
<message>
- <location line="-265"/>
+ <location line="-300"/>
<source>&amp;Export...</source>
<translation>&amp;ЕкÑпорт...</translation>
</message>
@@ -458,18 +448,33 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation>&amp;Проверка на Ñъобщение...</translation>
</message>
<message>
- <location line="-196"/>
- <location line="+538"/>
+ <location line="-162"/>
+ <location line="+540"/>
<source>Bitcoin</source>
<translation>Биткоин</translation>
</message>
<message>
- <location line="-538"/>
+ <location line="-540"/>
<source>Wallet</source>
<translation>Портфейл</translation>
</message>
<message>
- <location line="+176"/>
+ <location line="+99"/>
+ <source>&amp;Send</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+7"/>
+ <source>&amp;Receive</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+14"/>
+ <source>&amp;Addresses</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+22"/>
<source>&amp;About Bitcoin</source>
<translation>&amp;За Биткоин</translation>
</message>
@@ -530,97 +535,92 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation>[testnet]</translation>
</message>
<message>
- <location line="+63"/>
+ <location line="+47"/>
<source>Bitcoin client</source>
<translation type="unfinished"/>
</message>
<message numerus="yes">
- <location line="+79"/>
+ <location line="+140"/>
<source>%n active connection(s) to Bitcoin network</source>
<translation><numerusform>%n връзка към Биткоин мрежата</numerusform><numerusform>%n връзки към Биткоин мрежата</numerusform></translation>
</message>
<message>
- <location line="+45"/>
- <source>Processed %1 of %2 blocks of transaction history (%3% done).</source>
+ <location line="+39"/>
+ <source>Processed %1 of %2 (estimated) blocks of transaction history.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+7"/>
+ <location line="+4"/>
<source>Processed %1 blocks of transaction history.</source>
<translation type="unfinished"/>
</message>
+ <message numerus="yes">
+ <location line="+20"/>
+ <source>%n hour(s)</source>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
+ <message numerus="yes">
+ <location line="+4"/>
+ <source>%n day(s)</source>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
+ <message numerus="yes">
+ <location line="+4"/>
+ <source>%n week(s)</source>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
<message>
- <location line="+70"/>
- <source>Error</source>
+ <location line="+5"/>
+ <source>%1 behind</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+3"/>
- <source>Warning</source>
+ <location line="+14"/>
+ <source>Last received block was generated %1 ago.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+3"/>
- <source>Information</source>
+ <location line="+2"/>
+ <source>Transactions after this will not yet be visible.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+66"/>
- <source>This transaction is over the size limit. You can still send it for a fee of %1, which goes to the nodes that process your transaction and helps to support the network. Do you want to pay the fee?</source>
+ <location line="+21"/>
+ <source>Error</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+210"/>
- <source>Backup Successful</source>
+ <location line="+3"/>
+ <source>Warning</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+0"/>
- <source>The wallet data was successfully saved to the new location.</source>
+ <location line="+3"/>
+ <source>Information</source>
<translation type="unfinished"/>
</message>
- <message numerus="yes">
- <location line="-338"/>
- <source>%n second(s) ago</source>
- <translation><numerusform>%n Ñекунда</numerusform><numerusform>%n Ñекунди</numerusform></translation>
- </message>
- <message numerus="yes">
- <location line="+4"/>
- <source>%n minute(s) ago</source>
- <translation><numerusform>%n минута</numerusform><numerusform>%n минути</numerusform></translation>
- </message>
- <message numerus="yes">
- <location line="+4"/>
- <source>%n hour(s) ago</source>
- <translation><numerusform>%n чаÑ</numerusform><numerusform>%n чаÑа</numerusform></translation>
- </message>
- <message numerus="yes">
- <location line="+4"/>
- <source>%n day(s) ago</source>
- <translation><numerusform>%n ден</numerusform><numerusform>%n дни</numerusform></translation>
+ <message>
+ <location line="+68"/>
+ <source>This transaction is over the size limit. You can still send it for a fee of %1, which goes to the nodes that process your transaction and helps to support the network. Do you want to pay the fee?</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location line="+6"/>
+ <location line="-138"/>
<source>Up to date</source>
<translation>Синхронизиран</translation>
</message>
<message>
- <location line="+7"/>
+ <location line="+32"/>
<source>Catching up...</source>
<translation>Зарежда блокове...</translation>
</message>
<message>
- <location line="+10"/>
- <source>Last received block was generated %1.</source>
- <translation>ПоÑледниÑÑ‚ блок е от %1.</translation>
- </message>
- <message>
- <location line="+97"/>
+ <location line="+110"/>
<source>Confirm transaction fee</source>
<translation>Потвърждение за такÑа</translation>
</message>
<message>
- <location line="+23"/>
+ <location line="+8"/>
<source>Sent transaction</source>
<translation>ИзходÑща транзакциÑ</translation>
</message>
@@ -639,14 +639,14 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+99"/>
- <location line="+28"/>
+ <location line="+33"/>
+ <location line="+23"/>
<source>URI handling</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-28"/>
- <location line="+28"/>
+ <location line="-23"/>
+ <location line="+23"/>
<source>URI can not be parsed! This can be caused by an invalid Bitcoin address or malformed URI parameters.</source>
<translation type="unfinished"/>
</message>
@@ -661,27 +661,7 @@ Address: %4
<translation>Портфейлът е &lt;b&gt;криптиран&lt;/b&gt; и &lt;b&gt;заключен&lt;/b&gt;</translation>
</message>
<message>
- <location line="+23"/>
- <source>Backup Wallet</source>
- <translation>Запазване на портфейла</translation>
- </message>
- <message>
- <location line="+0"/>
- <source>Wallet Data (*.dat)</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+3"/>
- <source>Backup Failed</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+0"/>
- <source>There was an error trying to save the wallet data to the new location.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../bitcoin.cpp" line="+109"/>
+ <location filename="../bitcoin.cpp" line="+108"/>
<source>A fatal error occurred. Bitcoin can no longer continue safely and will quit.</source>
<translation type="unfinished"/>
</message>
@@ -689,7 +669,7 @@ Address: %4
<context>
<name>ClientModel</name>
<message>
- <location filename="../clientmodel.cpp" line="+86"/>
+ <location filename="../clientmodel.cpp" line="+96"/>
<source>Network Alert</source>
<translation type="unfinished"/>
</message>
@@ -722,7 +702,7 @@ Address: %4
<translation>ÐдреÑÑŠÑ‚ Ñвързан Ñ Ñ‚Ð¾Ð·Ð¸ Ð·Ð°Ð¿Ð¸Ñ Ð² ÑпиÑъка Ñ Ð°Ð´Ñ€ÐµÑи. Може да Ñе Ð¿Ñ€Ð¾Ð¼ÐµÐ½Ñ Ñамо за изходÑщи адреÑи.</translation>
</message>
<message>
- <location filename="../editaddressdialog.cpp" line="+20"/>
+ <location filename="../editaddressdialog.cpp" line="+21"/>
<source>New receiving address</source>
<translation>Ðов Ð°Ð´Ñ€ÐµÑ Ð·Ð° получаване</translation>
</message>
@@ -742,17 +722,17 @@ Address: %4
<translation>Редактиране на изходÑщ адреÑ</translation>
</message>
<message>
- <location line="+60"/>
+ <location line="+76"/>
<source>The entered address &quot;%1&quot; is already in the address book.</source>
<translation>Вече има Ð°Ð´Ñ€ÐµÑ &quot;%1&quot; в ÑпиÑъка Ñ Ð°Ð´Ñ€ÐµÑи.</translation>
</message>
<message>
- <location line="+5"/>
+ <location line="-5"/>
<source>The entered address &quot;%1&quot; is not a valid Bitcoin address.</source>
<translation>&quot;%1&quot; не е валиден Биткоин адреÑ.</translation>
</message>
<message>
- <location line="+5"/>
+ <location line="+10"/>
<source>Could not unlock wallet.</source>
<translation>Отключването на портфейла беше неуÑпешно.</translation>
</message>
@@ -765,7 +745,7 @@ Address: %4
<context>
<name>GUIUtil::HelpMessageBox</name>
<message>
- <location filename="../guiutil.cpp" line="+419"/>
+ <location filename="../guiutil.cpp" line="+422"/>
<location line="+12"/>
<source>Bitcoin-Qt</source>
<translation type="unfinished"/>
@@ -979,7 +959,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location filename="../optionsdialog.cpp" line="+55"/>
+ <location filename="../optionsdialog.cpp" line="+53"/>
<source>default</source>
<translation type="unfinished"/>
</message>
@@ -1024,23 +1004,18 @@ Address: %4
<translation>Форма</translation>
</message>
<message>
- <location line="+51"/>
- <location line="+183"/>
+ <location line="+50"/>
+ <location line="+166"/>
<source>The displayed information may be out of date. Your wallet automatically synchronizes with the Bitcoin network after a connection is established, but this process has not completed yet.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-141"/>
+ <location line="-124"/>
<source>Balance:</source>
<translation>БаланÑ:</translation>
</message>
<message>
- <location line="+58"/>
- <source>Number of transactions:</source>
- <translation>Брой транзакции:</translation>
- </message>
- <message>
- <location line="-29"/>
+ <location line="+29"/>
<source>Unconfirmed:</source>
<translation>Ðепотвърдени:</translation>
</message>
@@ -1050,7 +1025,7 @@ Address: %4
<translation>Портфейл</translation>
</message>
<message>
- <location line="+124"/>
+ <location line="+107"/>
<source>Immature:</source>
<translation type="unfinished"/>
</message>
@@ -1065,7 +1040,7 @@ Address: %4
<translation>&lt;b&gt;ПоÑледни транзакции&lt;/b&gt;</translation>
</message>
<message>
- <location line="-118"/>
+ <location line="-101"/>
<source>Your current balance</source>
<translation>ВашиÑÑ‚ текущ баланÑ</translation>
</message>
@@ -1075,11 +1050,6 @@ Address: %4
<translation>Сборът на вÑе още непотвърдените транзакции, които не Ñа чаÑÑ‚ от Ñ‚ÐµÐºÑƒÑ‰Ð¸Ñ Ð±Ð°Ð»Ð°Ð½Ñ</translation>
</message>
<message>
- <location line="+20"/>
- <source>Total number of transactions in wallet</source>
- <translation>Общ брой транзакции</translation>
- </message>
- <message>
<location filename="../overviewpage.cpp" line="+115"/>
<location line="+1"/>
<source>out of sync</source>
@@ -1087,6 +1057,14 @@ Address: %4
</message>
</context>
<context>
+ <name>PaymentServer</name>
+ <message>
+ <location filename="../paymentserver.cpp" line="+107"/>
+ <source>Cannot start bitcoin: click-to-pay handler</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>QRCodeDialog</name>
<message>
<location filename="../forms/qrcodedialog.ui" line="+14"/>
@@ -1425,7 +1403,7 @@ Address: %4
</message>
<message>
<location line="+60"/>
- <location filename="../sendcoinsentry.cpp" line="+25"/>
+ <location filename="../sendcoinsentry.cpp" line="+26"/>
<source>Enter a label for this address to add it to your address book</source>
<translation>Въведете име за този адреÑ, за да го добавите в ÑпиÑъка Ñ Ð°Ð´Ñ€ÐµÑи</translation>
</message>
@@ -1661,7 +1639,7 @@ Address: %4
<context>
<name>TransactionDesc</name>
<message>
- <location filename="../transactiondesc.cpp" line="+19"/>
+ <location filename="../transactiondesc.cpp" line="+20"/>
<source>Open until %1</source>
<translation>Подлежи на промÑна до %1</translation>
</message>
@@ -1848,7 +1826,7 @@ Address: %4
<context>
<name>TransactionTableModel</name>
<message>
- <location filename="../transactiontablemodel.cpp" line="+226"/>
+ <location filename="../transactiontablemodel.cpp" line="+225"/>
<source>Date</source>
<translation>Дата</translation>
</message>
@@ -1966,7 +1944,7 @@ Address: %4
<context>
<name>TransactionView</name>
<message>
- <location filename="../transactionview.cpp" line="+55"/>
+ <location filename="../transactionview.cpp" line="+52"/>
<location line="+16"/>
<source>All</source>
<translation>Ð’Ñички</translation>
@@ -2053,6 +2031,11 @@ Address: %4
</message>
<message>
<location line="+1"/>
+ <source>Copy transaction ID</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Edit label</source>
<translation>Редактирай име</translation>
</message>
@@ -2062,7 +2045,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+142"/>
+ <location line="+139"/>
<source>Export Transaction Data</source>
<translation type="unfinished"/>
</message>
@@ -2117,7 +2100,7 @@ Address: %4
<translation>ÐеуÑпешен Ð·Ð°Ð¿Ð¸Ñ Ð² %1.</translation>
</message>
<message>
- <location line="+95"/>
+ <location line="+100"/>
<source>Range:</source>
<translation>От:</translation>
</message>
@@ -2128,29 +2111,172 @@ Address: %4
</message>
</context>
<context>
+ <name>WalletView</name>
+ <message>
+ <location filename="../walletview.cpp" line="+95"/>
+ <source>&amp;Overview</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Show general overview of wallet</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>&amp;Send coins</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Send coins to a Bitcoin address</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>&amp;Receive coins</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Show the list of addresses for receiving payments</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>&amp;Transactions</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Browse transaction history</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>&amp;Address Book</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Edit the list of stored addresses and labels</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+12"/>
+ <source>&amp;Encrypt Wallet...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Encrypt the private keys that belong to your wallet</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>&amp;Backup Wallet...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Backup wallet to another location</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>&amp;Change Passphrase...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Change the passphrase used for wallet encryption</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Sign &amp;message...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Sign messages with your Bitcoin addresses to prove you own them</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>&amp;Verify message...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Verify messages to ensure they were signed with specified Bitcoin addresses</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>&amp;Export...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Export the data in the current tab to a file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+180"/>
+ <source>Backup Wallet</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>Wallet Data (*.dat)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Backup Failed</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>There was an error trying to save the wallet data to the new location.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>Backup Successful</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>The wallet data was successfully saved to the new location.</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>bitcoin-core</name>
<message>
- <location filename="../bitcoinstrings.cpp" line="+88"/>
+ <location filename="../bitcoinstrings.cpp" line="+96"/>
<source>Bitcoin version</source>
<translation>Биткоин верÑиÑ</translation>
</message>
<message>
- <location line="+82"/>
+ <location line="+98"/>
<source>Usage:</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-23"/>
+ <location line="-24"/>
<source>Send command to -server or bitcoind</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-21"/>
+ <location line="-22"/>
<source>List commands</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-11"/>
+ <location line="-10"/>
<source>Get help for a command</source>
<translation type="unfinished"/>
</message>
@@ -2175,12 +2301,12 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="-15"/>
+ <location line="-28"/>
<source>Don&apos;t generate coins</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+61"/>
+ <location line="+74"/>
<source>Specify data directory</source>
<translation type="unfinished"/>
</message>
@@ -2190,80 +2316,82 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="-26"/>
+ <location line="-27"/>
<source>Listen for connections on &lt;port&gt; (default: 8333 or testnet: 18333)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+4"/>
+ <location line="+5"/>
<source>Maintain at most &lt;n&gt; connections to peers (default: 125)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-34"/>
+ <location line="-49"/>
<source>Connect to a node to retrieve peer addresses, and disconnect</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+65"/>
+ <location line="+80"/>
<source>Specify your own public address</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+2"/>
+ <location line="+3"/>
<source>Threshold for disconnecting misbehaving peers (default: 100)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-114"/>
+ <location line="-132"/>
<source>Number of seconds to keep misbehaving peers from reconnecting (default: 86400)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-28"/>
+ <location line="-32"/>
<source>An error occurred while setting up the RPC port %u for listening on IPv4: %s</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+26"/>
+ <location line="+30"/>
<source>Listen for JSON-RPC connections on &lt;port&gt; (default: 8332 or testnet: 18332)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+34"/>
+ <location line="+36"/>
<source>Accept command line and JSON-RPC commands</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+62"/>
+ <location line="+77"/>
<source>Run in the background as a daemon and accept commands</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+31"/>
+ <location line="+32"/>
<source>Use the test network</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-92"/>
+ <location line="-108"/>
<source>Accept connections from outside (default: 1 if no -proxy or -connect)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-74"/>
+ <location line="-82"/>
<source>%s, you must set a rpcpassword in the configuration file:
- %s
+%s
It is recommended you use the following random password:
rpcuser=bitcoinrpc
rpcpassword=%s
(you do not need to remember this password)
The username and password MUST NOT be the same.
If the file does not exist, create it with owner-readable-only file permissions.
+It is also recommended to set alertnotify so you are notified of problems;
+for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.com
</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+15"/>
+ <location line="+17"/>
<source>An error occurred while setting up the RPC port %u for listening on IPv6, falling back to IPv4: %s</source>
<translation type="unfinished"/>
</message>
@@ -2279,11 +2407,6 @@ If the file does not exist, create it with owner-readable-only file permissions.
</message>
<message>
<location line="+3"/>
- <source>Corrupted block database detected. Please restart the client with -reindex.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+2"/>
<source>Error initializing database environment %s! To recover, BACKUP THAT DIRECTORY, then remove everything from it except for wallet.dat.</source>
<translation type="unfinished"/>
</message>
@@ -2298,12 +2421,27 @@ If the file does not exist, create it with owner-readable-only file permissions.
<translation type="unfinished"/>
</message>
<message>
+ <location line="+3"/>
+ <source>Execute command when a relevant alert is received (%s in cmd is replaced by message)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Execute command when a wallet transaction changes (%s in cmd is replaced by TxID)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location line="+11"/>
<source>Set maximum size of high-priority/low-fee transactions in bytes (default: 27000)</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+3"/>
+ <source>Set the number of script verification threads (1-16, 0=auto, default: 0)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
<source>This is a pre-release test build - use at your own risk - do not use for mining or merchant applications</source>
<translation type="unfinished"/>
</message>
@@ -2349,16 +2487,41 @@ If the file does not exist, create it with owner-readable-only file permissions.
</message>
<message>
<location line="+3"/>
+ <source>Corrupted block database detected</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Discover own IP address (default: 1 when listening and no -externalip)</source>
<translation type="unfinished"/>
</message>
<message>
+ <location line="+1"/>
+ <source>Do you want to rebuild the block database now?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location line="+3"/>
+ <source>Error initializing block database</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Error initializing wallet database environment %s!</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Error loading block database</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+5"/>
+ <location line="+4"/>
+ <source>Error opening block database</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
<source>Error: Disk space is low!</source>
<translation type="unfinished"/>
</message>
@@ -2374,26 +2537,96 @@ If the file does not exist, create it with owner-readable-only file permissions.
</message>
<message>
<location line="+2"/>
+ <source>Error: system error: </source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Failed to listen on any port. Use -listen=0 if you want this.</source>
<translation type="unfinished"/>
</message>
<message>
+ <location line="+1"/>
+ <source>Failed to read block info</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Failed to read block</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Failed to sync block index</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Failed to write block index</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Failed to write block info</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Failed to write block</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Failed to write file info</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Failed to write to coin database</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Failed to write transaction index</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Failed to write undo data</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location line="+2"/>
<source>Find peers using DNS lookup (default: 1 unless -connect)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+5"/>
- <source>How thorough the block verification is (0-4, default: 3)</source>
+ <location line="+3"/>
+ <source>How many blocks to check at startup (default: 288, 0 = all)</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+1"/>
- <source>Importing blocks from block database...</source>
+ <source>How thorough the block verification is (0-4, default: 3)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+24"/>
+ <source>Rebuild block chain index from current blk000??.dat files</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+37"/>
+ <source>Verifying blocks...</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+1"/>
+ <source>Verifying wallet...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-61"/>
<source>Imports blocks from external blk000??.dat file</source>
<translation type="unfinished"/>
</message>
@@ -2408,7 +2641,12 @@ If the file does not exist, create it with owner-readable-only file permissions.
<translation>Ðевалиден -tor адреÑ: &apos;%s&apos;</translation>
</message>
<message>
- <location line="+9"/>
+ <location line="+8"/>
+ <source>Maintain a full transaction index (default: 0)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
<source>Maximum per-connection receive buffer, &lt;n&gt;*1000 bytes (default: 5000)</source>
<translation type="unfinished"/>
</message>
@@ -2443,12 +2681,7 @@ If the file does not exist, create it with owner-readable-only file permissions.
<translation type="unfinished"/>
</message>
<message>
- <location line="+1"/>
- <source>Rebuild blockchain index from current blk000??.dat files</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+4"/>
+ <location line="+5"/>
<source>SSL options: (see the Bitcoin Wiki for SSL setup instructions)</source>
<translation type="unfinished"/>
</message>
@@ -2488,7 +2721,12 @@ If the file does not exist, create it with owner-readable-only file permissions.
<translation type="unfinished"/>
</message>
<message>
- <location line="+13"/>
+ <location line="+4"/>
+ <source>System error: </source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+10"/>
<source>Use UPnP to map the listening port (default: 0)</source>
<translation type="unfinished"/>
</message>
@@ -2519,36 +2757,41 @@ If the file does not exist, create it with owner-readable-only file permissions.
</message>
<message>
<location line="+1"/>
+ <source>You need to rebuild the databases using -reindex to change -txindex</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>wallet.dat corrupt, salvage failed</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-43"/>
+ <location line="-45"/>
<source>Password for JSON-RPC connections</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-53"/>
+ <location line="-68"/>
<source>Allow JSON-RPC connections from specified IP address</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+62"/>
+ <location line="+77"/>
<source>Send commands to node running on &lt;ip&gt; (default: 127.0.0.1)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-103"/>
+ <location line="-120"/>
<source>Execute command when the best block changes (%s in cmd is replaced by block hash)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+124"/>
+ <location line="+142"/>
<source>Upgrade wallet to latest format</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-15"/>
+ <location line="-16"/>
<source>Set key pool size to &lt;n&gt; (default: 100)</source>
<translation type="unfinished"/>
</message>
@@ -2558,17 +2801,12 @@ If the file does not exist, create it with owner-readable-only file permissions.
<translation type="unfinished"/>
</message>
<message>
- <location line="-26"/>
- <source>How many blocks to check at startup (default: 2500, 0 = all)</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+55"/>
+ <location line="+30"/>
<source>Use OpenSSL (https) for JSON-RPC connections</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-20"/>
+ <location line="-21"/>
<source>Server certificate file (default: server.cert)</source>
<translation type="unfinished"/>
</message>
@@ -2578,12 +2816,12 @@ If the file does not exist, create it with owner-readable-only file permissions.
<translation type="unfinished"/>
</message>
<message>
- <location line="-133"/>
+ <location line="-154"/>
<source>Acceptable ciphers (default: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+144"/>
+ <location line="+166"/>
<source>This help message</source>
<translation type="unfinished"/>
</message>
@@ -2593,7 +2831,7 @@ If the file does not exist, create it with owner-readable-only file permissions.
<translation type="unfinished"/>
</message>
<message>
- <location line="-70"/>
+ <location line="-86"/>
<source>Connect through socks proxy</source>
<translation type="unfinished"/>
</message>
@@ -2603,12 +2841,12 @@ If the file does not exist, create it with owner-readable-only file permissions.
<translation type="unfinished"/>
</message>
<message>
- <location line="+43"/>
+ <location line="+57"/>
<source>Loading addresses...</source>
<translation>Зареждане на адреÑите...</translation>
</message>
<message>
- <location line="-25"/>
+ <location line="-35"/>
<source>Error loading wallet.dat: Wallet corrupted</source>
<translation type="unfinished"/>
</message>
@@ -2618,32 +2856,22 @@ If the file does not exist, create it with owner-readable-only file permissions.
<translation type="unfinished"/>
</message>
<message>
- <location line="+73"/>
- <source>Verifying block database integrity...</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+1"/>
- <source>Verifying wallet integrity...</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+1"/>
+ <location line="+87"/>
<source>Wallet needed to be rewritten: restart Bitcoin to complete</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-77"/>
+ <location line="-89"/>
<source>Error loading wallet.dat</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+20"/>
+ <location line="+30"/>
<source>Invalid -proxy address: &apos;%s&apos;</source>
<translation>Ðевалиден -proxy address: &apos;%s&apos;</translation>
</message>
<message>
- <location line="+46"/>
+ <location line="+48"/>
<source>Unknown network specified in -onlynet: &apos;%s&apos;</source>
<translation type="unfinished"/>
</message>
@@ -2653,7 +2881,7 @@ If the file does not exist, create it with owner-readable-only file permissions.
<translation type="unfinished"/>
</message>
<message>
- <location line="-75"/>
+ <location line="-91"/>
<source>Cannot resolve -bind address: &apos;%s&apos;</source>
<translation type="unfinished"/>
</message>
@@ -2663,17 +2891,17 @@ If the file does not exist, create it with owner-readable-only file permissions.
<translation type="unfinished"/>
</message>
<message>
- <location line="+31"/>
+ <location line="+45"/>
<source>Invalid amount for -paytxfee=&lt;amount&gt;: &apos;%s&apos;</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-15"/>
+ <location line="-24"/>
<source>Error: could not start node</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+16"/>
+ <location line="+25"/>
<source>Invalid amount</source>
<translation type="unfinished"/>
</message>
@@ -2688,7 +2916,7 @@ If the file does not exist, create it with owner-readable-only file permissions.
<translation>Зареждане на блок индекÑа...</translation>
</message>
<message>
- <location line="-45"/>
+ <location line="-59"/>
<source>Add a node to connect to and attempt to keep the connection open</source>
<translation type="unfinished"/>
</message>
@@ -2698,22 +2926,17 @@ If the file does not exist, create it with owner-readable-only file permissions.
<translation type="unfinished"/>
</message>
<message>
- <location line="+54"/>
- <source>Find peers using internet relay chat (default: 0)</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="-2"/>
+ <location line="+68"/>
<source>Fee per KB to add to transactions you send</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+19"/>
+ <location line="+17"/>
<source>Loading wallet...</source>
<translation>Зареждане на портфейла...</translation>
</message>
<message>
- <location line="-40"/>
+ <location line="-54"/>
<source>Cannot downgrade wallet</source>
<translation type="unfinished"/>
</message>
@@ -2728,27 +2951,27 @@ If the file does not exist, create it with owner-readable-only file permissions.
<translation type="unfinished"/>
</message>
<message>
- <location line="+49"/>
+ <location line="+64"/>
<source>Rescanning...</source>
<translation>Преразглеждане на поÑледовтелноÑтта от блокове...</translation>
</message>
<message>
- <location line="-43"/>
+ <location line="-56"/>
<source>Done loading</source>
<translation>Зареждането е завършено</translation>
</message>
<message>
- <location line="+65"/>
+ <location line="+79"/>
<source>To use the %s option</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-60"/>
+ <location line="-71"/>
<source>Error</source>
<translation>Грешка</translation>
</message>
<message>
- <location line="-28"/>
+ <location line="-33"/>
<source>You must set rpcpassword=&lt;password&gt; in the configuration file:
%s
If the file does not exist, create it with owner-readable-only file permissions.</source>
diff --git a/src/qt/locale/bitcoin_bs.ts b/src/qt/locale/bitcoin_bs.ts
new file mode 100644
index 0000000000..5177345b20
--- /dev/null
+++ b/src/qt/locale/bitcoin_bs.ts
@@ -0,0 +1,2976 @@
+<?xml version="1.0" ?><!DOCTYPE TS><TS language="bs" version="2.0">
+<defaultcodec>UTF-8</defaultcodec>
+<context>
+ <name>AboutDialog</name>
+ <message>
+ <location filename="../forms/aboutdialog.ui" line="+14"/>
+ <source>About Bitcoin</source>
+ <translation>O Bitcoinu</translation>
+ </message>
+ <message>
+ <location line="+39"/>
+ <source>&lt;b&gt;Bitcoin&lt;/b&gt; version</source>
+ <translation>&lt;b&gt;Bitcoin&lt;/b&gt; verzija</translation>
+ </message>
+ <message>
+ <location line="+57"/>
+ <source>
+This is experimental software.
+
+Distributed under the MIT/X11 software license, see the accompanying file COPYING or http://www.opensource.org/licenses/mit-license.php.
+
+This product includes software developed by the OpenSSL Project for use in the OpenSSL Toolkit (http://www.openssl.org/) and cryptographic software written by Eric Young (eay@cryptsoft.com) and UPnP software written by Thomas Bernard.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../aboutdialog.cpp" line="+17"/>
+ <source>Copyright</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>2009-%1 The Bitcoin developers</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
+ <name>AddressBookPage</name>
+ <message>
+ <location filename="../forms/addressbookpage.ui" line="+14"/>
+ <source>Address Book</source>
+ <translation>Adresar</translation>
+ </message>
+ <message>
+ <location line="+22"/>
+ <source>Double-click to edit address or label</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+27"/>
+ <source>Create a new address</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+14"/>
+ <source>Copy the currently selected address to the system clipboard</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-11"/>
+ <source>&amp;New Address</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-46"/>
+ <source>These are your Bitcoin addresses for receiving payments. You may want to give a different one to each sender so you can keep track of who is paying you.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+60"/>
+ <source>&amp;Copy Address</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+11"/>
+ <source>Show &amp;QR Code</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+11"/>
+ <source>Sign a message to prove you own a Bitcoin address</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Sign &amp;Message</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+25"/>
+ <source>Delete the currently selected address from the list</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-14"/>
+ <source>Verify a message to ensure it was signed with a specified Bitcoin address</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>&amp;Verify Message</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+14"/>
+ <source>&amp;Delete</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../addressbookpage.cpp" line="+66"/>
+ <source>Copy &amp;Label</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>&amp;Edit</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Send &amp;Coins</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+263"/>
+ <source>Export Address Book Data</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Comma separated file (*.csv)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+13"/>
+ <source>Error exporting</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>Could not write to file %1.</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
+ <name>AddressTableModel</name>
+ <message>
+ <location filename="../addresstablemodel.cpp" line="+144"/>
+ <source>Label</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>Address</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+36"/>
+ <source>(no label)</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
+ <name>AskPassphraseDialog</name>
+ <message>
+ <location filename="../forms/askpassphrasedialog.ui" line="+26"/>
+ <source>Passphrase Dialog</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+21"/>
+ <source>Enter passphrase</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+14"/>
+ <source>New passphrase</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+14"/>
+ <source>Repeat new passphrase</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../askpassphrasedialog.cpp" line="+33"/>
+ <source>Enter the new passphrase to the wallet.&lt;br/&gt;Please use a passphrase of &lt;b&gt;10 or more random characters&lt;/b&gt;, or &lt;b&gt;eight or more words&lt;/b&gt;.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Encrypt wallet</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>This operation needs your wallet passphrase to unlock the wallet.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+5"/>
+ <source>Unlock wallet</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>This operation needs your wallet passphrase to decrypt the wallet.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+5"/>
+ <source>Decrypt wallet</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Change passphrase</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Enter the old and new passphrase to the wallet.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+46"/>
+ <source>Confirm wallet encryption</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Warning: If you encrypt your wallet and lose your passphrase, you will &lt;b&gt;LOSE ALL OF YOUR BITCOINS&lt;/b&gt;!</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>Are you sure you wish to encrypt your wallet?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+15"/>
+ <source>IMPORTANT: Any previous backups you have made of your wallet file should be replaced with the newly generated, encrypted wallet file. For security reasons, previous backups of the unencrypted wallet file will become useless as soon as you start using the new, encrypted wallet.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+100"/>
+ <location line="+24"/>
+ <source>Warning: The Caps Lock key is on!</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-130"/>
+ <location line="+58"/>
+ <source>Wallet encrypted</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-56"/>
+ <source>Bitcoin will close now to finish the encryption process. Remember that encrypting your wallet cannot fully protect your bitcoins from being stolen by malware infecting your computer.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+13"/>
+ <location line="+7"/>
+ <location line="+42"/>
+ <location line="+6"/>
+ <source>Wallet encryption failed</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-54"/>
+ <source>Wallet encryption failed due to an internal error. Your wallet was not encrypted.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+7"/>
+ <location line="+48"/>
+ <source>The supplied passphrases do not match.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-37"/>
+ <source>Wallet unlock failed</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <location line="+11"/>
+ <location line="+19"/>
+ <source>The passphrase entered for the wallet decryption was incorrect.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-20"/>
+ <source>Wallet decryption failed</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+14"/>
+ <source>Wallet passphrase was successfully changed.</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
+ <name>BitcoinGUI</name>
+ <message>
+ <location filename="../bitcoingui.cpp" line="+231"/>
+ <source>Sign &amp;message...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+299"/>
+ <source>Synchronizing with network...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-367"/>
+ <source>&amp;Overview</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Show general overview of wallet</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+20"/>
+ <source>&amp;Transactions</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Browse transaction history</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+7"/>
+ <source>Edit the list of stored addresses and labels</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-14"/>
+ <source>Show the list of addresses for receiving payments</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+31"/>
+ <source>E&amp;xit</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Quit application</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>Show information about Bitcoin</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>About &amp;Qt</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Show information about Qt</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>&amp;Options...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+5"/>
+ <source>&amp;Encrypt Wallet...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>&amp;Backup Wallet...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>&amp;Change Passphrase...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+304"/>
+ <source>Importing blocks from disk...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Reindexing blocks on disk...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-300"/>
+ <source>&amp;Export...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-65"/>
+ <source>Send coins to a Bitcoin address</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+49"/>
+ <source>Modify configuration options for Bitcoin</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+17"/>
+ <source>Export the data in the current tab to a file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-9"/>
+ <source>Backup wallet to another location</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Change the passphrase used for wallet encryption</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+9"/>
+ <source>&amp;Debug window</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Open debugging and diagnostic console</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-7"/>
+ <source>&amp;Verify message...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-162"/>
+ <location line="+540"/>
+ <source>Bitcoin</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-540"/>
+ <source>Wallet</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+99"/>
+ <source>&amp;Send</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+7"/>
+ <source>&amp;Receive</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+14"/>
+ <source>&amp;Addresses</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+22"/>
+ <source>&amp;About Bitcoin</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+9"/>
+ <source>&amp;Show / Hide</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Show or hide the main Window</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Encrypt the private keys that belong to your wallet</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+7"/>
+ <source>Sign messages with your Bitcoin addresses to prove you own them</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Verify messages to ensure they were signed with specified Bitcoin addresses</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+31"/>
+ <source>&amp;File</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+8"/>
+ <source>&amp;Settings</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>&amp;Help</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+9"/>
+ <source>Tabs toolbar</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+8"/>
+ <source>Actions toolbar</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+13"/>
+ <location line="+10"/>
+ <source>[testnet]</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+47"/>
+ <source>Bitcoin client</source>
+ <translation type="unfinished"/>
+ </message>
+ <message numerus="yes">
+ <location line="+140"/>
+ <source>%n active connection(s) to Bitcoin network</source>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
+ <message>
+ <location line="+39"/>
+ <source>Processed %1 of %2 (estimated) blocks of transaction history.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>Processed %1 blocks of transaction history.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message numerus="yes">
+ <location line="+20"/>
+ <source>%n hour(s)</source>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
+ <message numerus="yes">
+ <location line="+4"/>
+ <source>%n day(s)</source>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
+ <message numerus="yes">
+ <location line="+4"/>
+ <source>%n week(s)</source>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
+ <message>
+ <location line="+5"/>
+ <source>%1 behind</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+14"/>
+ <source>Last received block was generated %1 ago.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Transactions after this will not yet be visible.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+21"/>
+ <source>Error</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Warning</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Information</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+68"/>
+ <source>This transaction is over the size limit. You can still send it for a fee of %1, which goes to the nodes that process your transaction and helps to support the network. Do you want to pay the fee?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-138"/>
+ <source>Up to date</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+32"/>
+ <source>Catching up...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+110"/>
+ <source>Confirm transaction fee</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+8"/>
+ <source>Sent transaction</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>Incoming transaction</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Date: %1
+Amount: %2
+Type: %3
+Address: %4
+</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+33"/>
+ <location line="+23"/>
+ <source>URI handling</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-23"/>
+ <location line="+23"/>
+ <source>URI can not be parsed! This can be caused by an invalid Bitcoin address or malformed URI parameters.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+17"/>
+ <source>Wallet is &lt;b&gt;encrypted&lt;/b&gt; and currently &lt;b&gt;unlocked&lt;/b&gt;</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+8"/>
+ <source>Wallet is &lt;b&gt;encrypted&lt;/b&gt; and currently &lt;b&gt;locked&lt;/b&gt;</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../bitcoin.cpp" line="+108"/>
+ <source>A fatal error occurred. Bitcoin can no longer continue safely and will quit.</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
+ <name>ClientModel</name>
+ <message>
+ <location filename="../clientmodel.cpp" line="+96"/>
+ <source>Network Alert</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
+ <name>EditAddressDialog</name>
+ <message>
+ <location filename="../forms/editaddressdialog.ui" line="+14"/>
+ <source>Edit Address</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+11"/>
+ <source>&amp;Label</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+10"/>
+ <source>The label associated with this address book entry</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+7"/>
+ <source>&amp;Address</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+10"/>
+ <source>The address associated with this address book entry. This can only be modified for sending addresses.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../editaddressdialog.cpp" line="+21"/>
+ <source>New receiving address</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>New sending address</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Edit receiving address</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>Edit sending address</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+76"/>
+ <source>The entered address &quot;%1&quot; is already in the address book.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-5"/>
+ <source>The entered address &quot;%1&quot; is not a valid Bitcoin address.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+10"/>
+ <source>Could not unlock wallet.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+5"/>
+ <source>New key generation failed.</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
+ <name>GUIUtil::HelpMessageBox</name>
+ <message>
+ <location filename="../guiutil.cpp" line="+422"/>
+ <location line="+12"/>
+ <source>Bitcoin-Qt</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-12"/>
+ <source>version</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Usage:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>command-line options</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>UI options</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Set language, for example &quot;de_DE&quot; (default: system locale)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Start minimized</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Show splash screen on startup (default: 1)</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
+ <name>OptionsDialog</name>
+ <message>
+ <location filename="../forms/optionsdialog.ui" line="+14"/>
+ <source>Options</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+16"/>
+ <source>&amp;Main</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>Optional transaction fee per kB that helps make sure your transactions are processed quickly. Most transactions are 1 kB. Fee 0.01 recommended.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+15"/>
+ <source>Pay transaction &amp;fee</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+31"/>
+ <source>Automatically start Bitcoin after logging in to the system.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>&amp;Start Bitcoin on system login</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+35"/>
+ <source>Reset all client options to default.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>&amp;Reset Options</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+13"/>
+ <source>&amp;Network</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>Automatically open the Bitcoin client port on the router. This only works when your router supports UPnP and it is enabled.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Map port using &amp;UPnP</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+7"/>
+ <source>Connect to the Bitcoin network through a SOCKS proxy (e.g. when connecting through Tor).</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>&amp;Connect through SOCKS proxy:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+9"/>
+ <source>Proxy &amp;IP:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+19"/>
+ <source>IP address of the proxy (e.g. 127.0.0.1)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+7"/>
+ <source>&amp;Port:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+19"/>
+ <source>Port of the proxy (e.g. 9050)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+7"/>
+ <source>SOCKS &amp;Version:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+13"/>
+ <source>SOCKS version of the proxy (e.g. 5)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+36"/>
+ <source>&amp;Window</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>Show only a tray icon after minimizing the window.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>&amp;Minimize to the tray instead of the taskbar</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+7"/>
+ <source>Minimize instead of exit the application when the window is closed. When this option is enabled, the application will be closed only after selecting Quit in the menu.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>M&amp;inimize on close</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+21"/>
+ <source>&amp;Display</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+8"/>
+ <source>User Interface &amp;language:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+13"/>
+ <source>The user interface language can be set here. This setting will take effect after restarting Bitcoin.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+11"/>
+ <source>&amp;Unit to show amounts in:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+13"/>
+ <source>Choose the default subdivision unit to show in the interface and when sending coins.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+9"/>
+ <source>Whether to show Bitcoin addresses in the transaction list or not.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>&amp;Display addresses in transaction list</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+71"/>
+ <source>&amp;OK</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+7"/>
+ <source>&amp;Cancel</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+10"/>
+ <source>&amp;Apply</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../optionsdialog.cpp" line="+53"/>
+ <source>default</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+130"/>
+ <source>Confirm options reset</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Some settings may require a client restart to take effect.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>Do you want to proceed?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+42"/>
+ <location line="+9"/>
+ <source>Warning</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-9"/>
+ <location line="+9"/>
+ <source>This setting will take effect after restarting Bitcoin.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+29"/>
+ <source>The supplied proxy address is invalid.</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
+ <name>OverviewPage</name>
+ <message>
+ <location filename="../forms/overviewpage.ui" line="+14"/>
+ <source>Form</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+50"/>
+ <location line="+166"/>
+ <source>The displayed information may be out of date. Your wallet automatically synchronizes with the Bitcoin network after a connection is established, but this process has not completed yet.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-124"/>
+ <source>Balance:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+29"/>
+ <source>Unconfirmed:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-78"/>
+ <source>Wallet</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+107"/>
+ <source>Immature:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+13"/>
+ <source>Mined balance that has not yet matured</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+46"/>
+ <source>&lt;b&gt;Recent transactions&lt;/b&gt;</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-101"/>
+ <source>Your current balance</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+29"/>
+ <source>Total of transactions that have yet to be confirmed, and do not yet count toward the current balance</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../overviewpage.cpp" line="+115"/>
+ <location line="+1"/>
+ <source>out of sync</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
+ <name>PaymentServer</name>
+ <message>
+ <location filename="../paymentserver.cpp" line="+107"/>
+ <source>Cannot start bitcoin: click-to-pay handler</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
+ <name>QRCodeDialog</name>
+ <message>
+ <location filename="../forms/qrcodedialog.ui" line="+14"/>
+ <source>QR Code Dialog</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+59"/>
+ <source>Request Payment</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+56"/>
+ <source>Amount:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-44"/>
+ <source>Label:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+19"/>
+ <source>Message:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+71"/>
+ <source>&amp;Save As...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../qrcodedialog.cpp" line="+62"/>
+ <source>Error encoding URI into QR Code.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+40"/>
+ <source>The entered amount is invalid, please check.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+23"/>
+ <source>Resulting URI too long, try to reduce the text for label / message.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+25"/>
+ <source>Save QR Code</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>PNG Images (*.png)</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
+ <name>RPCConsole</name>
+ <message>
+ <location filename="../forms/rpcconsole.ui" line="+46"/>
+ <source>Client name</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+10"/>
+ <location line="+23"/>
+ <location line="+26"/>
+ <location line="+23"/>
+ <location line="+23"/>
+ <location line="+36"/>
+ <location line="+53"/>
+ <location line="+23"/>
+ <location line="+23"/>
+ <location filename="../rpcconsole.cpp" line="+344"/>
+ <source>N/A</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-217"/>
+ <source>Client version</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-45"/>
+ <source>&amp;Information</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+68"/>
+ <source>Using OpenSSL version</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+49"/>
+ <source>Startup time</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+29"/>
+ <source>Network</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+7"/>
+ <source>Number of connections</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+23"/>
+ <source>On testnet</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+23"/>
+ <source>Block chain</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+7"/>
+ <source>Current number of blocks</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+23"/>
+ <source>Estimated total blocks</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+23"/>
+ <source>Last block time</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+52"/>
+ <source>&amp;Open</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+16"/>
+ <source>Command-line options</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+7"/>
+ <source>Show the Bitcoin-Qt help message to get a list with possible Bitcoin command-line options.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>&amp;Show</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+24"/>
+ <source>&amp;Console</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-260"/>
+ <source>Build date</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-104"/>
+ <source>Bitcoin - Debug window</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+25"/>
+ <source>Bitcoin Core</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+279"/>
+ <source>Debug log file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+7"/>
+ <source>Open the Bitcoin debug log file from the current data directory. This can take a few seconds for large log files.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+102"/>
+ <source>Clear console</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../rpcconsole.cpp" line="-30"/>
+ <source>Welcome to the Bitcoin RPC console.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Use up and down arrows to navigate history, and &lt;b&gt;Ctrl-L&lt;/b&gt; to clear screen.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Type &lt;b&gt;help&lt;/b&gt; for an overview of available commands.</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
+ <name>SendCoinsDialog</name>
+ <message>
+ <location filename="../forms/sendcoinsdialog.ui" line="+14"/>
+ <location filename="../sendcoinsdialog.cpp" line="+124"/>
+ <location line="+5"/>
+ <location line="+5"/>
+ <location line="+5"/>
+ <location line="+6"/>
+ <location line="+5"/>
+ <location line="+5"/>
+ <source>Send Coins</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+50"/>
+ <source>Send to multiple recipients at once</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Add &amp;Recipient</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+20"/>
+ <source>Remove all transaction fields</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Clear &amp;All</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+22"/>
+ <source>Balance:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+10"/>
+ <source>123.456 BTC</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+31"/>
+ <source>Confirm the send action</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>S&amp;end</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../sendcoinsdialog.cpp" line="-59"/>
+ <source>&lt;b&gt;%1&lt;/b&gt; to %2 (%3)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+5"/>
+ <source>Confirm send coins</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Are you sure you want to send %1?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source> and </source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+23"/>
+ <source>The recipient address is not valid, please recheck.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+5"/>
+ <source>The amount to pay must be larger than 0.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+5"/>
+ <source>The amount exceeds your balance.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+5"/>
+ <source>The total exceeds your balance when the %1 transaction fee is included.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>Duplicate address found, can only send to each address once per send operation.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+5"/>
+ <source>Error: Transaction creation failed!</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+5"/>
+ <source>Error: The transaction was rejected. This might happen if some of the coins in your wallet were already spent, such as if you used a copy of wallet.dat and coins were spent in the copy but not marked as spent here.</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
+ <name>SendCoinsEntry</name>
+ <message>
+ <location filename="../forms/sendcoinsentry.ui" line="+14"/>
+ <source>Form</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+15"/>
+ <source>A&amp;mount:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+13"/>
+ <source>Pay &amp;To:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+34"/>
+ <source>The address to send the payment to (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+60"/>
+ <location filename="../sendcoinsentry.cpp" line="+26"/>
+ <source>Enter a label for this address to add it to your address book</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-78"/>
+ <source>&amp;Label:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+28"/>
+ <source>Choose address from address book</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+10"/>
+ <source>Alt+A</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+7"/>
+ <source>Paste address from clipboard</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+10"/>
+ <source>Alt+P</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+7"/>
+ <source>Remove this recipient</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../sendcoinsentry.cpp" line="+1"/>
+ <source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
+ <name>SignVerifyMessageDialog</name>
+ <message>
+ <location filename="../forms/signverifymessagedialog.ui" line="+14"/>
+ <source>Signatures - Sign / Verify a Message</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+13"/>
+ <source>&amp;Sign Message</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>You can sign messages with your addresses to prove you own them. Be careful not to sign anything vague, as phishing attacks may try to trick you into signing your identity over to them. Only sign fully-detailed statements you agree to.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+18"/>
+ <source>The address to sign the message with (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+10"/>
+ <location line="+213"/>
+ <source>Choose an address from the address book</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-203"/>
+ <location line="+213"/>
+ <source>Alt+A</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-203"/>
+ <source>Paste address from clipboard</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+10"/>
+ <source>Alt+P</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+12"/>
+ <source>Enter the message you want to sign here</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+7"/>
+ <source>Signature</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+27"/>
+ <source>Copy the current signature to the system clipboard</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+21"/>
+ <source>Sign the message to prove you own this Bitcoin address</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Sign &amp;Message</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+14"/>
+ <source>Reset all sign message fields</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <location line="+146"/>
+ <source>Clear &amp;All</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-87"/>
+ <source>&amp;Verify Message</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>Enter the signing address, message (ensure you copy line breaks, spaces, tabs, etc. exactly) and signature below to verify the message. Be careful not to read more into the signature than what is in the signed message itself, to avoid being tricked by a man-in-the-middle attack.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+21"/>
+ <source>The address the message was signed with (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+40"/>
+ <source>Verify the message to ensure it was signed with the specified Bitcoin address</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Verify &amp;Message</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+14"/>
+ <source>Reset all verify message fields</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../signverifymessagedialog.cpp" line="+27"/>
+ <location line="+3"/>
+ <source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-2"/>
+ <source>Click &quot;Sign Message&quot; to generate signature</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Enter Bitcoin signature</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+82"/>
+ <location line="+81"/>
+ <source>The entered address is invalid.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-81"/>
+ <location line="+8"/>
+ <location line="+73"/>
+ <location line="+8"/>
+ <source>Please check the address and try again.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-81"/>
+ <location line="+81"/>
+ <source>The entered address does not refer to a key.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-73"/>
+ <source>Wallet unlock was cancelled.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+8"/>
+ <source>Private key for the entered address is not available.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+12"/>
+ <source>Message signing failed.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+5"/>
+ <source>Message signed.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+59"/>
+ <source>The signature could not be decoded.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+0"/>
+ <location line="+13"/>
+ <source>Please check the signature and try again.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>The signature did not match the message digest.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+7"/>
+ <source>Message verification failed.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+5"/>
+ <source>Message verified.</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
+ <name>TransactionDesc</name>
+ <message>
+ <location filename="../transactiondesc.cpp" line="+20"/>
+ <source>Open until %1</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>%1/offline</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>%1/unconfirmed</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>%1 confirmations</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+18"/>
+ <source>Status</source>
+ <translation type="unfinished"/>
+ </message>
+ <message numerus="yes">
+ <location line="+7"/>
+ <source>, broadcast through %n node(s)</source>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>Date</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+7"/>
+ <source>Source</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>Generated</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+5"/>
+ <location line="+17"/>
+ <source>From</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <location line="+22"/>
+ <location line="+58"/>
+ <source>To</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-77"/>
+ <location line="+2"/>
+ <source>own address</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-2"/>
+ <source>label</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+37"/>
+ <location line="+12"/>
+ <location line="+45"/>
+ <location line="+17"/>
+ <location line="+30"/>
+ <source>Credit</source>
+ <translation type="unfinished"/>
+ </message>
+ <message numerus="yes">
+ <location line="-102"/>
+ <source>matures in %n more block(s)</source>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>not accepted</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+44"/>
+ <location line="+8"/>
+ <location line="+15"/>
+ <location line="+30"/>
+ <source>Debit</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-39"/>
+ <source>Transaction fee</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+16"/>
+ <source>Net amount</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>Message</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Comment</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Transaction ID</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Generated coins must mature 120 blocks before they can be spent. When you generated this block, it was broadcast to the network to be added to the block chain. If it fails to get into the chain, its state will change to &quot;not accepted&quot; and it won&apos;t be spendable. This may occasionally happen if another node generates a block within a few seconds of yours.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+7"/>
+ <source>Debug information</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+8"/>
+ <source>Transaction</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Inputs</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+23"/>
+ <source>Amount</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>true</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>false</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-209"/>
+ <source>, has not been successfully broadcast yet</source>
+ <translation type="unfinished"/>
+ </message>
+ <message numerus="yes">
+ <location line="-35"/>
+ <source>Open for %n more block(s)</source>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
+ <message>
+ <location line="+70"/>
+ <source>unknown</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
+ <name>TransactionDescDialog</name>
+ <message>
+ <location filename="../forms/transactiondescdialog.ui" line="+14"/>
+ <source>Transaction details</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>This pane shows a detailed description of the transaction</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
+ <name>TransactionTableModel</name>
+ <message>
+ <location filename="../transactiontablemodel.cpp" line="+225"/>
+ <source>Date</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>Type</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>Address</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>Amount</source>
+ <translation type="unfinished"/>
+ </message>
+ <message numerus="yes">
+ <location line="+57"/>
+ <source>Open for %n more block(s)</source>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Open until %1</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Offline (%1 confirmations)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Unconfirmed (%1 of %2 confirmations)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Confirmed (%1 confirmations)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message numerus="yes">
+ <location line="+8"/>
+ <source>Mined balance will be available when it matures in %n more block(s)</source>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
+ <message>
+ <location line="+5"/>
+ <source>This block was not received by any other nodes and will probably not be accepted!</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Generated but not accepted</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+43"/>
+ <source>Received with</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Received from</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Sent to</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Payment to yourself</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Mined</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+38"/>
+ <source>(n/a)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+199"/>
+ <source>Transaction status. Hover over this field to show number of confirmations.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Date and time that the transaction was received.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Type of transaction.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Destination address of transaction.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Amount removed from or added to balance.</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
+ <name>TransactionView</name>
+ <message>
+ <location filename="../transactionview.cpp" line="+52"/>
+ <location line="+16"/>
+ <source>All</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-15"/>
+ <source>Today</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>This week</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>This month</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Last month</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>This year</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Range...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+11"/>
+ <source>Received with</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Sent to</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>To yourself</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Mined</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Other</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+7"/>
+ <source>Enter address or label to search</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+7"/>
+ <source>Min amount</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+34"/>
+ <source>Copy address</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy label</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy amount</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy transaction ID</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Edit label</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Show transaction details</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+139"/>
+ <source>Export Transaction Data</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Comma separated file (*.csv)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+8"/>
+ <source>Confirmed</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Date</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Type</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Label</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Address</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Amount</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>ID</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>Error exporting</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>Could not write to file %1.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+100"/>
+ <source>Range:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+8"/>
+ <source>to</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
+ <name>WalletView</name>
+ <message>
+ <location filename="../walletview.cpp" line="+95"/>
+ <source>&amp;Overview</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Show general overview of wallet</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>&amp;Send coins</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Send coins to a Bitcoin address</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>&amp;Receive coins</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Show the list of addresses for receiving payments</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>&amp;Transactions</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Browse transaction history</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>&amp;Address Book</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Edit the list of stored addresses and labels</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+12"/>
+ <source>&amp;Encrypt Wallet...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Encrypt the private keys that belong to your wallet</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>&amp;Backup Wallet...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Backup wallet to another location</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>&amp;Change Passphrase...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Change the passphrase used for wallet encryption</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Sign &amp;message...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Sign messages with your Bitcoin addresses to prove you own them</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>&amp;Verify message...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Verify messages to ensure they were signed with specified Bitcoin addresses</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>&amp;Export...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Export the data in the current tab to a file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+180"/>
+ <source>Backup Wallet</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>Wallet Data (*.dat)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Backup Failed</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>There was an error trying to save the wallet data to the new location.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>Backup Successful</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>The wallet data was successfully saved to the new location.</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
+ <name>bitcoin-core</name>
+ <message>
+ <location filename="../bitcoinstrings.cpp" line="+96"/>
+ <source>Bitcoin version</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+98"/>
+ <source>Usage:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-24"/>
+ <source>Send command to -server or bitcoind</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-22"/>
+ <source>List commands</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-10"/>
+ <source>Get help for a command</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+21"/>
+ <source>Options:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+22"/>
+ <source>Specify configuration file (default: bitcoin.conf)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Specify pid file (default: bitcoind.pid)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-47"/>
+ <source>Generate coins</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-28"/>
+ <source>Don&apos;t generate coins</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+74"/>
+ <source>Specify data directory</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-7"/>
+ <source>Set database cache size in megabytes (default: 25)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-27"/>
+ <source>Listen for connections on &lt;port&gt; (default: 8333 or testnet: 18333)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+5"/>
+ <source>Maintain at most &lt;n&gt; connections to peers (default: 125)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-49"/>
+ <source>Connect to a node to retrieve peer addresses, and disconnect</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+80"/>
+ <source>Specify your own public address</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Threshold for disconnecting misbehaving peers (default: 100)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-132"/>
+ <source>Number of seconds to keep misbehaving peers from reconnecting (default: 86400)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-32"/>
+ <source>An error occurred while setting up the RPC port %u for listening on IPv4: %s</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+30"/>
+ <source>Listen for JSON-RPC connections on &lt;port&gt; (default: 8332 or testnet: 18332)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+36"/>
+ <source>Accept command line and JSON-RPC commands</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+77"/>
+ <source>Run in the background as a daemon and accept commands</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+32"/>
+ <source>Use the test network</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-108"/>
+ <source>Accept connections from outside (default: 1 if no -proxy or -connect)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-82"/>
+ <source>%s, you must set a rpcpassword in the configuration file:
+%s
+It is recommended you use the following random password:
+rpcuser=bitcoinrpc
+rpcpassword=%s
+(you do not need to remember this password)
+The username and password MUST NOT be the same.
+If the file does not exist, create it with owner-readable-only file permissions.
+It is also recommended to set alertnotify so you are notified of problems;
+for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.com
+</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+17"/>
+ <source>An error occurred while setting up the RPC port %u for listening on IPv6, falling back to IPv4: %s</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Bind to given address and always listen on it. Use [host]:port notation for IPv6</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Cannot obtain a lock on data directory %s. Bitcoin is probably already running.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Error initializing database environment %s! To recover, BACKUP THAT DIRECTORY, then remove everything from it except for wallet.dat.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Error: The transaction was rejected! This might happen if some of the coins in your wallet were already spent, such as if you used a copy of wallet.dat and coins were spent in the copy but not marked as spent here.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>Error: This transaction requires a transaction fee of at least %s because of its amount, complexity, or use of recently received funds!</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Execute command when a relevant alert is received (%s in cmd is replaced by message)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Execute command when a wallet transaction changes (%s in cmd is replaced by TxID)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+11"/>
+ <source>Set maximum size of high-priority/low-fee transactions in bytes (default: 27000)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Set the number of script verification threads (1-16, 0=auto, default: 0)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>This is a pre-release test build - use at your own risk - do not use for mining or merchant applications</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+5"/>
+ <source>Warning: -paytxfee is set very high! This is the transaction fee you will pay if you send a transaction.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Warning: Displayed transactions may not be correct! You may need to upgrade, or other nodes may need to upgrade.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Warning: Please check that your computer&apos;s date and time are correct! If your clock is wrong Bitcoin will not work properly.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Warning: error reading wallet.dat! All keys read correctly, but transaction data or address book entries might be missing or incorrect.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Warning: wallet.dat corrupt, data salvaged! Original wallet.dat saved as wallet.{timestamp}.bak in %s; if your balance or transactions are incorrect you should restore from a backup.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+14"/>
+ <source>Attempt to recover private keys from a corrupt wallet.dat</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Block creation options:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>Connect only to the specified node(s)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Corrupted block database detected</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Discover own IP address (default: 1 when listening and no -externalip)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Do you want to rebuild the block database now?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Error initializing block database</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Error initializing wallet database environment %s!</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Error loading block database</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>Error opening block database</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Error: Disk space is low!</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Error: Transaction creation failed!</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Error: Wallet locked, unable to create transaction!</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Error: system error: </source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Failed to listen on any port. Use -listen=0 if you want this.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Failed to read block info</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Failed to read block</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Failed to sync block index</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Failed to write block index</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Failed to write block info</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Failed to write block</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Failed to write file info</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Failed to write to coin database</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Failed to write transaction index</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Failed to write undo data</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Find peers using DNS lookup (default: 1 unless -connect)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>How many blocks to check at startup (default: 288, 0 = all)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>How thorough the block verification is (0-4, default: 3)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+24"/>
+ <source>Rebuild block chain index from current blk000??.dat files</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+37"/>
+ <source>Verifying blocks...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Verifying wallet...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-61"/>
+ <source>Imports blocks from external blk000??.dat file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Information</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Invalid -tor address: &apos;%s&apos;</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+8"/>
+ <source>Maintain a full transaction index (default: 0)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Maximum per-connection receive buffer, &lt;n&gt;*1000 bytes (default: 5000)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Maximum per-connection send buffer, &lt;n&gt;*1000 bytes (default: 1000)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Only accept block chain matching built-in checkpoints (default: 1)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Only connect to nodes in network &lt;net&gt; (IPv4, IPv6 or Tor)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Output extra debugging information. Implies all other -debug* options</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Output extra network debugging information</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Prepend debug output with timestamp</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+5"/>
+ <source>SSL options: (see the Bitcoin Wiki for SSL setup instructions)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Select the version of socks proxy to use (4-5, default: 5)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Send trace/debug info to console instead of debug.log file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Send trace/debug info to debugger</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+5"/>
+ <source>Set maximum block size in bytes (default: 250000)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Set minimum block size in bytes (default: 0)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Shrink debug.log file on client startup (default: 1 when no -debug)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Specify connection timeout in milliseconds (default: 5000)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>System error: </source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+10"/>
+ <source>Use UPnP to map the listening port (default: 0)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Use UPnP to map the listening port (default: 1 when listening)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Use proxy to reach tor hidden services (default: same as -proxy)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Username for JSON-RPC connections</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>Warning</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Warning: This version is obsolete, upgrade required!</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>You need to rebuild the databases using -reindex to change -txindex</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>wallet.dat corrupt, salvage failed</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-45"/>
+ <source>Password for JSON-RPC connections</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-68"/>
+ <source>Allow JSON-RPC connections from specified IP address</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+77"/>
+ <source>Send commands to node running on &lt;ip&gt; (default: 127.0.0.1)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-120"/>
+ <source>Execute command when the best block changes (%s in cmd is replaced by block hash)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+142"/>
+ <source>Upgrade wallet to latest format</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-16"/>
+ <source>Set key pool size to &lt;n&gt; (default: 100)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-12"/>
+ <source>Rescan the block chain for missing wallet transactions</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+30"/>
+ <source>Use OpenSSL (https) for JSON-RPC connections</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-21"/>
+ <source>Server certificate file (default: server.cert)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Server private key (default: server.pem)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-154"/>
+ <source>Acceptable ciphers (default: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+166"/>
+ <source>This help message</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Unable to bind to %s on this computer (bind returned error %d, %s)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-86"/>
+ <source>Connect through socks proxy</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-11"/>
+ <source>Allow DNS lookups for -addnode, -seednode and -connect</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+57"/>
+ <source>Loading addresses...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-35"/>
+ <source>Error loading wallet.dat: Wallet corrupted</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Error loading wallet.dat: Wallet requires newer version of Bitcoin</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+87"/>
+ <source>Wallet needed to be rewritten: restart Bitcoin to complete</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-89"/>
+ <source>Error loading wallet.dat</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+30"/>
+ <source>Invalid -proxy address: &apos;%s&apos;</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+48"/>
+ <source>Unknown network specified in -onlynet: &apos;%s&apos;</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-1"/>
+ <source>Unknown -socks proxy version requested: %i</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-91"/>
+ <source>Cannot resolve -bind address: &apos;%s&apos;</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Cannot resolve -externalip address: &apos;%s&apos;</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+45"/>
+ <source>Invalid amount for -paytxfee=&lt;amount&gt;: &apos;%s&apos;</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-24"/>
+ <source>Error: could not start node</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+25"/>
+ <source>Invalid amount</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-4"/>
+ <source>Insufficient funds</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+8"/>
+ <source>Loading block index...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-59"/>
+ <source>Add a node to connect to and attempt to keep the connection open</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-25"/>
+ <source>Unable to bind to %s on this computer. Bitcoin is probably already running.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+68"/>
+ <source>Fee per KB to add to transactions you send</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+17"/>
+ <source>Loading wallet...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-54"/>
+ <source>Cannot downgrade wallet</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Cannot initialize keypool</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Cannot write default address</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+64"/>
+ <source>Rescanning...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-56"/>
+ <source>Done loading</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+79"/>
+ <source>To use the %s option</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-71"/>
+ <source>Error</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-33"/>
+ <source>You must set rpcpassword=&lt;password&gt; in the configuration file:
+%s
+If the file does not exist, create it with owner-readable-only file permissions.</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+</TS> \ No newline at end of file
diff --git a/src/qt/locale/bitcoin_ca.ts b/src/qt/locale/bitcoin_ca.ts
new file mode 100644
index 0000000000..53807f052e
--- /dev/null
+++ b/src/qt/locale/bitcoin_ca.ts
@@ -0,0 +1,2976 @@
+<?xml version="1.0" ?><!DOCTYPE TS><TS language="ca" version="2.0">
+<defaultcodec>UTF-8</defaultcodec>
+<context>
+ <name>AboutDialog</name>
+ <message>
+ <location filename="../forms/aboutdialog.ui" line="+14"/>
+ <source>About Bitcoin</source>
+ <translation>A prop de Bitcoin</translation>
+ </message>
+ <message>
+ <location line="+39"/>
+ <source>&lt;b&gt;Bitcoin&lt;/b&gt; version</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+57"/>
+ <source>
+This is experimental software.
+
+Distributed under the MIT/X11 software license, see the accompanying file COPYING or http://www.opensource.org/licenses/mit-license.php.
+
+This product includes software developed by the OpenSSL Project for use in the OpenSSL Toolkit (http://www.openssl.org/) and cryptographic software written by Eric Young (eay@cryptsoft.com) and UPnP software written by Thomas Bernard.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../aboutdialog.cpp" line="+17"/>
+ <source>Copyright</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>2009-%1 The Bitcoin developers</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
+ <name>AddressBookPage</name>
+ <message>
+ <location filename="../forms/addressbookpage.ui" line="+14"/>
+ <source>Address Book</source>
+ <translation>Llibreta d&apos;adreçes</translation>
+ </message>
+ <message>
+ <location line="+22"/>
+ <source>Double-click to edit address or label</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+27"/>
+ <source>Create a new address</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+14"/>
+ <source>Copy the currently selected address to the system clipboard</source>
+ <translation>Copia la selecció actual al porta-retalls del sistema</translation>
+ </message>
+ <message>
+ <location line="-11"/>
+ <source>&amp;New Address</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-46"/>
+ <source>These are your Bitcoin addresses for receiving payments. You may want to give a different one to each sender so you can keep track of who is paying you.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+60"/>
+ <source>&amp;Copy Address</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+11"/>
+ <source>Show &amp;QR Code</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+11"/>
+ <source>Sign a message to prove you own a Bitcoin address</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Sign &amp;Message</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+25"/>
+ <source>Delete the currently selected address from the list</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-14"/>
+ <source>Verify a message to ensure it was signed with a specified Bitcoin address</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>&amp;Verify Message</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+14"/>
+ <source>&amp;Delete</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../addressbookpage.cpp" line="+66"/>
+ <source>Copy &amp;Label</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>&amp;Edit</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Send &amp;Coins</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+263"/>
+ <source>Export Address Book Data</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Comma separated file (*.csv)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+13"/>
+ <source>Error exporting</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>Could not write to file %1.</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
+ <name>AddressTableModel</name>
+ <message>
+ <location filename="../addresstablemodel.cpp" line="+144"/>
+ <source>Label</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>Address</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+36"/>
+ <source>(no label)</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
+ <name>AskPassphraseDialog</name>
+ <message>
+ <location filename="../forms/askpassphrasedialog.ui" line="+26"/>
+ <source>Passphrase Dialog</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+21"/>
+ <source>Enter passphrase</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+14"/>
+ <source>New passphrase</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+14"/>
+ <source>Repeat new passphrase</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../askpassphrasedialog.cpp" line="+33"/>
+ <source>Enter the new passphrase to the wallet.&lt;br/&gt;Please use a passphrase of &lt;b&gt;10 or more random characters&lt;/b&gt;, or &lt;b&gt;eight or more words&lt;/b&gt;.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Encrypt wallet</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>This operation needs your wallet passphrase to unlock the wallet.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+5"/>
+ <source>Unlock wallet</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>This operation needs your wallet passphrase to decrypt the wallet.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+5"/>
+ <source>Decrypt wallet</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Change passphrase</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Enter the old and new passphrase to the wallet.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+46"/>
+ <source>Confirm wallet encryption</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Warning: If you encrypt your wallet and lose your passphrase, you will &lt;b&gt;LOSE ALL OF YOUR BITCOINS&lt;/b&gt;!</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>Are you sure you wish to encrypt your wallet?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+15"/>
+ <source>IMPORTANT: Any previous backups you have made of your wallet file should be replaced with the newly generated, encrypted wallet file. For security reasons, previous backups of the unencrypted wallet file will become useless as soon as you start using the new, encrypted wallet.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+100"/>
+ <location line="+24"/>
+ <source>Warning: The Caps Lock key is on!</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-130"/>
+ <location line="+58"/>
+ <source>Wallet encrypted</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-56"/>
+ <source>Bitcoin will close now to finish the encryption process. Remember that encrypting your wallet cannot fully protect your bitcoins from being stolen by malware infecting your computer.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+13"/>
+ <location line="+7"/>
+ <location line="+42"/>
+ <location line="+6"/>
+ <source>Wallet encryption failed</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-54"/>
+ <source>Wallet encryption failed due to an internal error. Your wallet was not encrypted.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+7"/>
+ <location line="+48"/>
+ <source>The supplied passphrases do not match.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-37"/>
+ <source>Wallet unlock failed</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <location line="+11"/>
+ <location line="+19"/>
+ <source>The passphrase entered for the wallet decryption was incorrect.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-20"/>
+ <source>Wallet decryption failed</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+14"/>
+ <source>Wallet passphrase was successfully changed.</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
+ <name>BitcoinGUI</name>
+ <message>
+ <location filename="../bitcoingui.cpp" line="+231"/>
+ <source>Sign &amp;message...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+299"/>
+ <source>Synchronizing with network...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-367"/>
+ <source>&amp;Overview</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Show general overview of wallet</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+20"/>
+ <source>&amp;Transactions</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Browse transaction history</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+7"/>
+ <source>Edit the list of stored addresses and labels</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-14"/>
+ <source>Show the list of addresses for receiving payments</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+31"/>
+ <source>E&amp;xit</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Quit application</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>Show information about Bitcoin</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>About &amp;Qt</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Show information about Qt</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>&amp;Options...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+5"/>
+ <source>&amp;Encrypt Wallet...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>&amp;Backup Wallet...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>&amp;Change Passphrase...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+304"/>
+ <source>Importing blocks from disk...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Reindexing blocks on disk...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-300"/>
+ <source>&amp;Export...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-65"/>
+ <source>Send coins to a Bitcoin address</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+49"/>
+ <source>Modify configuration options for Bitcoin</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+17"/>
+ <source>Export the data in the current tab to a file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-9"/>
+ <source>Backup wallet to another location</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Change the passphrase used for wallet encryption</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+9"/>
+ <source>&amp;Debug window</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Open debugging and diagnostic console</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-7"/>
+ <source>&amp;Verify message...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-162"/>
+ <location line="+540"/>
+ <source>Bitcoin</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-540"/>
+ <source>Wallet</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+99"/>
+ <source>&amp;Send</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+7"/>
+ <source>&amp;Receive</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+14"/>
+ <source>&amp;Addresses</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+22"/>
+ <source>&amp;About Bitcoin</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+9"/>
+ <source>&amp;Show / Hide</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Show or hide the main Window</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Encrypt the private keys that belong to your wallet</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+7"/>
+ <source>Sign messages with your Bitcoin addresses to prove you own them</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Verify messages to ensure they were signed with specified Bitcoin addresses</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+31"/>
+ <source>&amp;File</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+8"/>
+ <source>&amp;Settings</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>&amp;Help</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+9"/>
+ <source>Tabs toolbar</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+8"/>
+ <source>Actions toolbar</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+13"/>
+ <location line="+10"/>
+ <source>[testnet]</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+47"/>
+ <source>Bitcoin client</source>
+ <translation type="unfinished"/>
+ </message>
+ <message numerus="yes">
+ <location line="+140"/>
+ <source>%n active connection(s) to Bitcoin network</source>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
+ <message>
+ <location line="+39"/>
+ <source>Processed %1 of %2 (estimated) blocks of transaction history.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>Processed %1 blocks of transaction history.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message numerus="yes">
+ <location line="+20"/>
+ <source>%n hour(s)</source>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
+ <message numerus="yes">
+ <location line="+4"/>
+ <source>%n day(s)</source>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
+ <message numerus="yes">
+ <location line="+4"/>
+ <source>%n week(s)</source>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
+ <message>
+ <location line="+5"/>
+ <source>%1 behind</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+14"/>
+ <source>Last received block was generated %1 ago.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Transactions after this will not yet be visible.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+21"/>
+ <source>Error</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Warning</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Information</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+68"/>
+ <source>This transaction is over the size limit. You can still send it for a fee of %1, which goes to the nodes that process your transaction and helps to support the network. Do you want to pay the fee?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-138"/>
+ <source>Up to date</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+32"/>
+ <source>Catching up...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+110"/>
+ <source>Confirm transaction fee</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+8"/>
+ <source>Sent transaction</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>Incoming transaction</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Date: %1
+Amount: %2
+Type: %3
+Address: %4
+</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+33"/>
+ <location line="+23"/>
+ <source>URI handling</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-23"/>
+ <location line="+23"/>
+ <source>URI can not be parsed! This can be caused by an invalid Bitcoin address or malformed URI parameters.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+17"/>
+ <source>Wallet is &lt;b&gt;encrypted&lt;/b&gt; and currently &lt;b&gt;unlocked&lt;/b&gt;</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+8"/>
+ <source>Wallet is &lt;b&gt;encrypted&lt;/b&gt; and currently &lt;b&gt;locked&lt;/b&gt;</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../bitcoin.cpp" line="+108"/>
+ <source>A fatal error occurred. Bitcoin can no longer continue safely and will quit.</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
+ <name>ClientModel</name>
+ <message>
+ <location filename="../clientmodel.cpp" line="+96"/>
+ <source>Network Alert</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
+ <name>EditAddressDialog</name>
+ <message>
+ <location filename="../forms/editaddressdialog.ui" line="+14"/>
+ <source>Edit Address</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+11"/>
+ <source>&amp;Label</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+10"/>
+ <source>The label associated with this address book entry</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+7"/>
+ <source>&amp;Address</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+10"/>
+ <source>The address associated with this address book entry. This can only be modified for sending addresses.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../editaddressdialog.cpp" line="+21"/>
+ <source>New receiving address</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>New sending address</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Edit receiving address</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>Edit sending address</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+76"/>
+ <source>The entered address &quot;%1&quot; is already in the address book.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-5"/>
+ <source>The entered address &quot;%1&quot; is not a valid Bitcoin address.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+10"/>
+ <source>Could not unlock wallet.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+5"/>
+ <source>New key generation failed.</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
+ <name>GUIUtil::HelpMessageBox</name>
+ <message>
+ <location filename="../guiutil.cpp" line="+422"/>
+ <location line="+12"/>
+ <source>Bitcoin-Qt</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-12"/>
+ <source>version</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Usage:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>command-line options</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>UI options</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Set language, for example &quot;de_DE&quot; (default: system locale)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Start minimized</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Show splash screen on startup (default: 1)</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
+ <name>OptionsDialog</name>
+ <message>
+ <location filename="../forms/optionsdialog.ui" line="+14"/>
+ <source>Options</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+16"/>
+ <source>&amp;Main</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>Optional transaction fee per kB that helps make sure your transactions are processed quickly. Most transactions are 1 kB. Fee 0.01 recommended.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+15"/>
+ <source>Pay transaction &amp;fee</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+31"/>
+ <source>Automatically start Bitcoin after logging in to the system.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>&amp;Start Bitcoin on system login</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+35"/>
+ <source>Reset all client options to default.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>&amp;Reset Options</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+13"/>
+ <source>&amp;Network</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>Automatically open the Bitcoin client port on the router. This only works when your router supports UPnP and it is enabled.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Map port using &amp;UPnP</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+7"/>
+ <source>Connect to the Bitcoin network through a SOCKS proxy (e.g. when connecting through Tor).</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>&amp;Connect through SOCKS proxy:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+9"/>
+ <source>Proxy &amp;IP:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+19"/>
+ <source>IP address of the proxy (e.g. 127.0.0.1)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+7"/>
+ <source>&amp;Port:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+19"/>
+ <source>Port of the proxy (e.g. 9050)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+7"/>
+ <source>SOCKS &amp;Version:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+13"/>
+ <source>SOCKS version of the proxy (e.g. 5)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+36"/>
+ <source>&amp;Window</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>Show only a tray icon after minimizing the window.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>&amp;Minimize to the tray instead of the taskbar</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+7"/>
+ <source>Minimize instead of exit the application when the window is closed. When this option is enabled, the application will be closed only after selecting Quit in the menu.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>M&amp;inimize on close</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+21"/>
+ <source>&amp;Display</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+8"/>
+ <source>User Interface &amp;language:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+13"/>
+ <source>The user interface language can be set here. This setting will take effect after restarting Bitcoin.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+11"/>
+ <source>&amp;Unit to show amounts in:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+13"/>
+ <source>Choose the default subdivision unit to show in the interface and when sending coins.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+9"/>
+ <source>Whether to show Bitcoin addresses in the transaction list or not.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>&amp;Display addresses in transaction list</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+71"/>
+ <source>&amp;OK</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+7"/>
+ <source>&amp;Cancel</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+10"/>
+ <source>&amp;Apply</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../optionsdialog.cpp" line="+53"/>
+ <source>default</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+130"/>
+ <source>Confirm options reset</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Some settings may require a client restart to take effect.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>Do you want to proceed?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+42"/>
+ <location line="+9"/>
+ <source>Warning</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-9"/>
+ <location line="+9"/>
+ <source>This setting will take effect after restarting Bitcoin.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+29"/>
+ <source>The supplied proxy address is invalid.</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
+ <name>OverviewPage</name>
+ <message>
+ <location filename="../forms/overviewpage.ui" line="+14"/>
+ <source>Form</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+50"/>
+ <location line="+166"/>
+ <source>The displayed information may be out of date. Your wallet automatically synchronizes with the Bitcoin network after a connection is established, but this process has not completed yet.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-124"/>
+ <source>Balance:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+29"/>
+ <source>Unconfirmed:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-78"/>
+ <source>Wallet</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+107"/>
+ <source>Immature:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+13"/>
+ <source>Mined balance that has not yet matured</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+46"/>
+ <source>&lt;b&gt;Recent transactions&lt;/b&gt;</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-101"/>
+ <source>Your current balance</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+29"/>
+ <source>Total of transactions that have yet to be confirmed, and do not yet count toward the current balance</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../overviewpage.cpp" line="+115"/>
+ <location line="+1"/>
+ <source>out of sync</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
+ <name>PaymentServer</name>
+ <message>
+ <location filename="../paymentserver.cpp" line="+107"/>
+ <source>Cannot start bitcoin: click-to-pay handler</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
+ <name>QRCodeDialog</name>
+ <message>
+ <location filename="../forms/qrcodedialog.ui" line="+14"/>
+ <source>QR Code Dialog</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+59"/>
+ <source>Request Payment</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+56"/>
+ <source>Amount:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-44"/>
+ <source>Label:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+19"/>
+ <source>Message:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+71"/>
+ <source>&amp;Save As...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../qrcodedialog.cpp" line="+62"/>
+ <source>Error encoding URI into QR Code.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+40"/>
+ <source>The entered amount is invalid, please check.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+23"/>
+ <source>Resulting URI too long, try to reduce the text for label / message.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+25"/>
+ <source>Save QR Code</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>PNG Images (*.png)</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
+ <name>RPCConsole</name>
+ <message>
+ <location filename="../forms/rpcconsole.ui" line="+46"/>
+ <source>Client name</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+10"/>
+ <location line="+23"/>
+ <location line="+26"/>
+ <location line="+23"/>
+ <location line="+23"/>
+ <location line="+36"/>
+ <location line="+53"/>
+ <location line="+23"/>
+ <location line="+23"/>
+ <location filename="../rpcconsole.cpp" line="+344"/>
+ <source>N/A</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-217"/>
+ <source>Client version</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-45"/>
+ <source>&amp;Information</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+68"/>
+ <source>Using OpenSSL version</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+49"/>
+ <source>Startup time</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+29"/>
+ <source>Network</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+7"/>
+ <source>Number of connections</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+23"/>
+ <source>On testnet</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+23"/>
+ <source>Block chain</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+7"/>
+ <source>Current number of blocks</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+23"/>
+ <source>Estimated total blocks</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+23"/>
+ <source>Last block time</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+52"/>
+ <source>&amp;Open</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+16"/>
+ <source>Command-line options</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+7"/>
+ <source>Show the Bitcoin-Qt help message to get a list with possible Bitcoin command-line options.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>&amp;Show</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+24"/>
+ <source>&amp;Console</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-260"/>
+ <source>Build date</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-104"/>
+ <source>Bitcoin - Debug window</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+25"/>
+ <source>Bitcoin Core</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+279"/>
+ <source>Debug log file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+7"/>
+ <source>Open the Bitcoin debug log file from the current data directory. This can take a few seconds for large log files.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+102"/>
+ <source>Clear console</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../rpcconsole.cpp" line="-30"/>
+ <source>Welcome to the Bitcoin RPC console.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Use up and down arrows to navigate history, and &lt;b&gt;Ctrl-L&lt;/b&gt; to clear screen.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Type &lt;b&gt;help&lt;/b&gt; for an overview of available commands.</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
+ <name>SendCoinsDialog</name>
+ <message>
+ <location filename="../forms/sendcoinsdialog.ui" line="+14"/>
+ <location filename="../sendcoinsdialog.cpp" line="+124"/>
+ <location line="+5"/>
+ <location line="+5"/>
+ <location line="+5"/>
+ <location line="+6"/>
+ <location line="+5"/>
+ <location line="+5"/>
+ <source>Send Coins</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+50"/>
+ <source>Send to multiple recipients at once</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Add &amp;Recipient</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+20"/>
+ <source>Remove all transaction fields</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Clear &amp;All</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+22"/>
+ <source>Balance:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+10"/>
+ <source>123.456 BTC</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+31"/>
+ <source>Confirm the send action</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>S&amp;end</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../sendcoinsdialog.cpp" line="-59"/>
+ <source>&lt;b&gt;%1&lt;/b&gt; to %2 (%3)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+5"/>
+ <source>Confirm send coins</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Are you sure you want to send %1?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source> and </source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+23"/>
+ <source>The recipient address is not valid, please recheck.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+5"/>
+ <source>The amount to pay must be larger than 0.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+5"/>
+ <source>The amount exceeds your balance.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+5"/>
+ <source>The total exceeds your balance when the %1 transaction fee is included.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>Duplicate address found, can only send to each address once per send operation.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+5"/>
+ <source>Error: Transaction creation failed!</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+5"/>
+ <source>Error: The transaction was rejected. This might happen if some of the coins in your wallet were already spent, such as if you used a copy of wallet.dat and coins were spent in the copy but not marked as spent here.</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
+ <name>SendCoinsEntry</name>
+ <message>
+ <location filename="../forms/sendcoinsentry.ui" line="+14"/>
+ <source>Form</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+15"/>
+ <source>A&amp;mount:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+13"/>
+ <source>Pay &amp;To:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+34"/>
+ <source>The address to send the payment to (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+60"/>
+ <location filename="../sendcoinsentry.cpp" line="+26"/>
+ <source>Enter a label for this address to add it to your address book</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-78"/>
+ <source>&amp;Label:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+28"/>
+ <source>Choose address from address book</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+10"/>
+ <source>Alt+A</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+7"/>
+ <source>Paste address from clipboard</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+10"/>
+ <source>Alt+P</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+7"/>
+ <source>Remove this recipient</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../sendcoinsentry.cpp" line="+1"/>
+ <source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
+ <name>SignVerifyMessageDialog</name>
+ <message>
+ <location filename="../forms/signverifymessagedialog.ui" line="+14"/>
+ <source>Signatures - Sign / Verify a Message</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+13"/>
+ <source>&amp;Sign Message</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>You can sign messages with your addresses to prove you own them. Be careful not to sign anything vague, as phishing attacks may try to trick you into signing your identity over to them. Only sign fully-detailed statements you agree to.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+18"/>
+ <source>The address to sign the message with (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+10"/>
+ <location line="+213"/>
+ <source>Choose an address from the address book</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-203"/>
+ <location line="+213"/>
+ <source>Alt+A</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-203"/>
+ <source>Paste address from clipboard</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+10"/>
+ <source>Alt+P</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+12"/>
+ <source>Enter the message you want to sign here</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+7"/>
+ <source>Signature</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+27"/>
+ <source>Copy the current signature to the system clipboard</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+21"/>
+ <source>Sign the message to prove you own this Bitcoin address</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Sign &amp;Message</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+14"/>
+ <source>Reset all sign message fields</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <location line="+146"/>
+ <source>Clear &amp;All</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-87"/>
+ <source>&amp;Verify Message</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>Enter the signing address, message (ensure you copy line breaks, spaces, tabs, etc. exactly) and signature below to verify the message. Be careful not to read more into the signature than what is in the signed message itself, to avoid being tricked by a man-in-the-middle attack.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+21"/>
+ <source>The address the message was signed with (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+40"/>
+ <source>Verify the message to ensure it was signed with the specified Bitcoin address</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Verify &amp;Message</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+14"/>
+ <source>Reset all verify message fields</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../signverifymessagedialog.cpp" line="+27"/>
+ <location line="+3"/>
+ <source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-2"/>
+ <source>Click &quot;Sign Message&quot; to generate signature</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Enter Bitcoin signature</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+82"/>
+ <location line="+81"/>
+ <source>The entered address is invalid.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-81"/>
+ <location line="+8"/>
+ <location line="+73"/>
+ <location line="+8"/>
+ <source>Please check the address and try again.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-81"/>
+ <location line="+81"/>
+ <source>The entered address does not refer to a key.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-73"/>
+ <source>Wallet unlock was cancelled.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+8"/>
+ <source>Private key for the entered address is not available.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+12"/>
+ <source>Message signing failed.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+5"/>
+ <source>Message signed.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+59"/>
+ <source>The signature could not be decoded.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+0"/>
+ <location line="+13"/>
+ <source>Please check the signature and try again.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>The signature did not match the message digest.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+7"/>
+ <source>Message verification failed.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+5"/>
+ <source>Message verified.</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
+ <name>TransactionDesc</name>
+ <message>
+ <location filename="../transactiondesc.cpp" line="+20"/>
+ <source>Open until %1</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>%1/offline</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>%1/unconfirmed</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>%1 confirmations</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+18"/>
+ <source>Status</source>
+ <translation type="unfinished"/>
+ </message>
+ <message numerus="yes">
+ <location line="+7"/>
+ <source>, broadcast through %n node(s)</source>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>Date</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+7"/>
+ <source>Source</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>Generated</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+5"/>
+ <location line="+17"/>
+ <source>From</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <location line="+22"/>
+ <location line="+58"/>
+ <source>To</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-77"/>
+ <location line="+2"/>
+ <source>own address</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-2"/>
+ <source>label</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+37"/>
+ <location line="+12"/>
+ <location line="+45"/>
+ <location line="+17"/>
+ <location line="+30"/>
+ <source>Credit</source>
+ <translation type="unfinished"/>
+ </message>
+ <message numerus="yes">
+ <location line="-102"/>
+ <source>matures in %n more block(s)</source>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>not accepted</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+44"/>
+ <location line="+8"/>
+ <location line="+15"/>
+ <location line="+30"/>
+ <source>Debit</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-39"/>
+ <source>Transaction fee</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+16"/>
+ <source>Net amount</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>Message</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Comment</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Transaction ID</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Generated coins must mature 120 blocks before they can be spent. When you generated this block, it was broadcast to the network to be added to the block chain. If it fails to get into the chain, its state will change to &quot;not accepted&quot; and it won&apos;t be spendable. This may occasionally happen if another node generates a block within a few seconds of yours.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+7"/>
+ <source>Debug information</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+8"/>
+ <source>Transaction</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Inputs</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+23"/>
+ <source>Amount</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>true</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>false</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-209"/>
+ <source>, has not been successfully broadcast yet</source>
+ <translation type="unfinished"/>
+ </message>
+ <message numerus="yes">
+ <location line="-35"/>
+ <source>Open for %n more block(s)</source>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
+ <message>
+ <location line="+70"/>
+ <source>unknown</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
+ <name>TransactionDescDialog</name>
+ <message>
+ <location filename="../forms/transactiondescdialog.ui" line="+14"/>
+ <source>Transaction details</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>This pane shows a detailed description of the transaction</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
+ <name>TransactionTableModel</name>
+ <message>
+ <location filename="../transactiontablemodel.cpp" line="+225"/>
+ <source>Date</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>Type</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>Address</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>Amount</source>
+ <translation type="unfinished"/>
+ </message>
+ <message numerus="yes">
+ <location line="+57"/>
+ <source>Open for %n more block(s)</source>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Open until %1</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Offline (%1 confirmations)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Unconfirmed (%1 of %2 confirmations)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Confirmed (%1 confirmations)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message numerus="yes">
+ <location line="+8"/>
+ <source>Mined balance will be available when it matures in %n more block(s)</source>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
+ <message>
+ <location line="+5"/>
+ <source>This block was not received by any other nodes and will probably not be accepted!</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Generated but not accepted</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+43"/>
+ <source>Received with</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Received from</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Sent to</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Payment to yourself</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Mined</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+38"/>
+ <source>(n/a)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+199"/>
+ <source>Transaction status. Hover over this field to show number of confirmations.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Date and time that the transaction was received.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Type of transaction.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Destination address of transaction.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Amount removed from or added to balance.</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
+ <name>TransactionView</name>
+ <message>
+ <location filename="../transactionview.cpp" line="+52"/>
+ <location line="+16"/>
+ <source>All</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-15"/>
+ <source>Today</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>This week</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>This month</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Last month</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>This year</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Range...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+11"/>
+ <source>Received with</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Sent to</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>To yourself</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Mined</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Other</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+7"/>
+ <source>Enter address or label to search</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+7"/>
+ <source>Min amount</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+34"/>
+ <source>Copy address</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy label</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy amount</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy transaction ID</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Edit label</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Show transaction details</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+139"/>
+ <source>Export Transaction Data</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Comma separated file (*.csv)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+8"/>
+ <source>Confirmed</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Date</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Type</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Label</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Address</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Amount</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>ID</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>Error exporting</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>Could not write to file %1.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+100"/>
+ <source>Range:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+8"/>
+ <source>to</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
+ <name>WalletView</name>
+ <message>
+ <location filename="../walletview.cpp" line="+95"/>
+ <source>&amp;Overview</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Show general overview of wallet</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>&amp;Send coins</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Send coins to a Bitcoin address</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>&amp;Receive coins</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Show the list of addresses for receiving payments</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>&amp;Transactions</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Browse transaction history</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>&amp;Address Book</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Edit the list of stored addresses and labels</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+12"/>
+ <source>&amp;Encrypt Wallet...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Encrypt the private keys that belong to your wallet</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>&amp;Backup Wallet...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Backup wallet to another location</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>&amp;Change Passphrase...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Change the passphrase used for wallet encryption</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Sign &amp;message...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Sign messages with your Bitcoin addresses to prove you own them</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>&amp;Verify message...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Verify messages to ensure they were signed with specified Bitcoin addresses</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>&amp;Export...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Export the data in the current tab to a file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+180"/>
+ <source>Backup Wallet</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>Wallet Data (*.dat)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Backup Failed</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>There was an error trying to save the wallet data to the new location.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>Backup Successful</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>The wallet data was successfully saved to the new location.</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
+ <name>bitcoin-core</name>
+ <message>
+ <location filename="../bitcoinstrings.cpp" line="+96"/>
+ <source>Bitcoin version</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+98"/>
+ <source>Usage:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-24"/>
+ <source>Send command to -server or bitcoind</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-22"/>
+ <source>List commands</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-10"/>
+ <source>Get help for a command</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+21"/>
+ <source>Options:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+22"/>
+ <source>Specify configuration file (default: bitcoin.conf)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Specify pid file (default: bitcoind.pid)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-47"/>
+ <source>Generate coins</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-28"/>
+ <source>Don&apos;t generate coins</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+74"/>
+ <source>Specify data directory</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-7"/>
+ <source>Set database cache size in megabytes (default: 25)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-27"/>
+ <source>Listen for connections on &lt;port&gt; (default: 8333 or testnet: 18333)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+5"/>
+ <source>Maintain at most &lt;n&gt; connections to peers (default: 125)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-49"/>
+ <source>Connect to a node to retrieve peer addresses, and disconnect</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+80"/>
+ <source>Specify your own public address</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Threshold for disconnecting misbehaving peers (default: 100)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-132"/>
+ <source>Number of seconds to keep misbehaving peers from reconnecting (default: 86400)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-32"/>
+ <source>An error occurred while setting up the RPC port %u for listening on IPv4: %s</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+30"/>
+ <source>Listen for JSON-RPC connections on &lt;port&gt; (default: 8332 or testnet: 18332)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+36"/>
+ <source>Accept command line and JSON-RPC commands</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+77"/>
+ <source>Run in the background as a daemon and accept commands</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+32"/>
+ <source>Use the test network</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-108"/>
+ <source>Accept connections from outside (default: 1 if no -proxy or -connect)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-82"/>
+ <source>%s, you must set a rpcpassword in the configuration file:
+%s
+It is recommended you use the following random password:
+rpcuser=bitcoinrpc
+rpcpassword=%s
+(you do not need to remember this password)
+The username and password MUST NOT be the same.
+If the file does not exist, create it with owner-readable-only file permissions.
+It is also recommended to set alertnotify so you are notified of problems;
+for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.com
+</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+17"/>
+ <source>An error occurred while setting up the RPC port %u for listening on IPv6, falling back to IPv4: %s</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Bind to given address and always listen on it. Use [host]:port notation for IPv6</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Cannot obtain a lock on data directory %s. Bitcoin is probably already running.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Error initializing database environment %s! To recover, BACKUP THAT DIRECTORY, then remove everything from it except for wallet.dat.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Error: The transaction was rejected! This might happen if some of the coins in your wallet were already spent, such as if you used a copy of wallet.dat and coins were spent in the copy but not marked as spent here.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>Error: This transaction requires a transaction fee of at least %s because of its amount, complexity, or use of recently received funds!</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Execute command when a relevant alert is received (%s in cmd is replaced by message)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Execute command when a wallet transaction changes (%s in cmd is replaced by TxID)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+11"/>
+ <source>Set maximum size of high-priority/low-fee transactions in bytes (default: 27000)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Set the number of script verification threads (1-16, 0=auto, default: 0)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>This is a pre-release test build - use at your own risk - do not use for mining or merchant applications</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+5"/>
+ <source>Warning: -paytxfee is set very high! This is the transaction fee you will pay if you send a transaction.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Warning: Displayed transactions may not be correct! You may need to upgrade, or other nodes may need to upgrade.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Warning: Please check that your computer&apos;s date and time are correct! If your clock is wrong Bitcoin will not work properly.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Warning: error reading wallet.dat! All keys read correctly, but transaction data or address book entries might be missing or incorrect.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Warning: wallet.dat corrupt, data salvaged! Original wallet.dat saved as wallet.{timestamp}.bak in %s; if your balance or transactions are incorrect you should restore from a backup.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+14"/>
+ <source>Attempt to recover private keys from a corrupt wallet.dat</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Block creation options:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>Connect only to the specified node(s)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Corrupted block database detected</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Discover own IP address (default: 1 when listening and no -externalip)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Do you want to rebuild the block database now?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Error initializing block database</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Error initializing wallet database environment %s!</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Error loading block database</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>Error opening block database</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Error: Disk space is low!</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Error: Transaction creation failed!</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Error: Wallet locked, unable to create transaction!</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Error: system error: </source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Failed to listen on any port. Use -listen=0 if you want this.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Failed to read block info</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Failed to read block</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Failed to sync block index</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Failed to write block index</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Failed to write block info</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Failed to write block</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Failed to write file info</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Failed to write to coin database</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Failed to write transaction index</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Failed to write undo data</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Find peers using DNS lookup (default: 1 unless -connect)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>How many blocks to check at startup (default: 288, 0 = all)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>How thorough the block verification is (0-4, default: 3)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+24"/>
+ <source>Rebuild block chain index from current blk000??.dat files</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+37"/>
+ <source>Verifying blocks...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Verifying wallet...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-61"/>
+ <source>Imports blocks from external blk000??.dat file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Information</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Invalid -tor address: &apos;%s&apos;</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+8"/>
+ <source>Maintain a full transaction index (default: 0)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Maximum per-connection receive buffer, &lt;n&gt;*1000 bytes (default: 5000)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Maximum per-connection send buffer, &lt;n&gt;*1000 bytes (default: 1000)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Only accept block chain matching built-in checkpoints (default: 1)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Only connect to nodes in network &lt;net&gt; (IPv4, IPv6 or Tor)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Output extra debugging information. Implies all other -debug* options</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Output extra network debugging information</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Prepend debug output with timestamp</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+5"/>
+ <source>SSL options: (see the Bitcoin Wiki for SSL setup instructions)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Select the version of socks proxy to use (4-5, default: 5)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Send trace/debug info to console instead of debug.log file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Send trace/debug info to debugger</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+5"/>
+ <source>Set maximum block size in bytes (default: 250000)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Set minimum block size in bytes (default: 0)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Shrink debug.log file on client startup (default: 1 when no -debug)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Specify connection timeout in milliseconds (default: 5000)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>System error: </source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+10"/>
+ <source>Use UPnP to map the listening port (default: 0)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Use UPnP to map the listening port (default: 1 when listening)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Use proxy to reach tor hidden services (default: same as -proxy)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Username for JSON-RPC connections</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>Warning</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Warning: This version is obsolete, upgrade required!</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>You need to rebuild the databases using -reindex to change -txindex</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>wallet.dat corrupt, salvage failed</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-45"/>
+ <source>Password for JSON-RPC connections</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-68"/>
+ <source>Allow JSON-RPC connections from specified IP address</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+77"/>
+ <source>Send commands to node running on &lt;ip&gt; (default: 127.0.0.1)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-120"/>
+ <source>Execute command when the best block changes (%s in cmd is replaced by block hash)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+142"/>
+ <source>Upgrade wallet to latest format</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-16"/>
+ <source>Set key pool size to &lt;n&gt; (default: 100)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-12"/>
+ <source>Rescan the block chain for missing wallet transactions</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+30"/>
+ <source>Use OpenSSL (https) for JSON-RPC connections</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-21"/>
+ <source>Server certificate file (default: server.cert)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Server private key (default: server.pem)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-154"/>
+ <source>Acceptable ciphers (default: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+166"/>
+ <source>This help message</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Unable to bind to %s on this computer (bind returned error %d, %s)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-86"/>
+ <source>Connect through socks proxy</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-11"/>
+ <source>Allow DNS lookups for -addnode, -seednode and -connect</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+57"/>
+ <source>Loading addresses...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-35"/>
+ <source>Error loading wallet.dat: Wallet corrupted</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Error loading wallet.dat: Wallet requires newer version of Bitcoin</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+87"/>
+ <source>Wallet needed to be rewritten: restart Bitcoin to complete</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-89"/>
+ <source>Error loading wallet.dat</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+30"/>
+ <source>Invalid -proxy address: &apos;%s&apos;</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+48"/>
+ <source>Unknown network specified in -onlynet: &apos;%s&apos;</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-1"/>
+ <source>Unknown -socks proxy version requested: %i</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-91"/>
+ <source>Cannot resolve -bind address: &apos;%s&apos;</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Cannot resolve -externalip address: &apos;%s&apos;</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+45"/>
+ <source>Invalid amount for -paytxfee=&lt;amount&gt;: &apos;%s&apos;</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-24"/>
+ <source>Error: could not start node</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+25"/>
+ <source>Invalid amount</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-4"/>
+ <source>Insufficient funds</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+8"/>
+ <source>Loading block index...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-59"/>
+ <source>Add a node to connect to and attempt to keep the connection open</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-25"/>
+ <source>Unable to bind to %s on this computer. Bitcoin is probably already running.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+68"/>
+ <source>Fee per KB to add to transactions you send</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+17"/>
+ <source>Loading wallet...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-54"/>
+ <source>Cannot downgrade wallet</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Cannot initialize keypool</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Cannot write default address</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+64"/>
+ <source>Rescanning...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-56"/>
+ <source>Done loading</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+79"/>
+ <source>To use the %s option</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-71"/>
+ <source>Error</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-33"/>
+ <source>You must set rpcpassword=&lt;password&gt; in the configuration file:
+%s
+If the file does not exist, create it with owner-readable-only file permissions.</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+</TS> \ No newline at end of file
diff --git a/src/qt/locale/bitcoin_ca_ES.ts b/src/qt/locale/bitcoin_ca_ES.ts
index e005ef277d..b7db58dfce 100644
--- a/src/qt/locale/bitcoin_ca_ES.ts
+++ b/src/qt/locale/bitcoin_ca_ES.ts
@@ -13,19 +13,24 @@
<translation>&lt;b&gt;Bitcoin&lt;/b&gt; versió</translation>
</message>
<message>
- <location line="+41"/>
- <source>Copyright © 2009-2012 The Bitcoin developers</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+13"/>
+ <location line="+57"/>
<source>
This is experimental software.
Distributed under the MIT/X11 software license, see the accompanying file COPYING or http://www.opensource.org/licenses/mit-license.php.
This product includes software developed by the OpenSSL Project for use in the OpenSSL Toolkit (http://www.openssl.org/) and cryptographic software written by Eric Young (eay@cryptsoft.com) and UPnP software written by Thomas Bernard.</source>
- <translation type="unfinished"/>
+ <translation>\n Aquest és software experimental.\n\n Distribuït sota llicència de software MIT/11, veure l&apos;arxiu COPYING o http://www.opensource.org/licenses/mit-license.php.\n\nAquest producte inclou software desarrollat pel projecte OpenSSL per a l&apos;ús de OppenSSL Toolkit (http://www.openssl.org/) i de softwqre criptogràfic escrit per l&apos;Eric Young (eay@cryptsoft.com) i software UPnP escrit per en Thomas Bernard.</translation>
+ </message>
+ <message>
+ <location filename="../aboutdialog.cpp" line="+17"/>
+ <source>Copyright</source>
+ <translation>Copyright</translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>2009-%1 The Bitcoin developers</source>
+ <translation>2009-%1 Els creadors de Bitcoin</translation>
</message>
</context>
<context>
@@ -33,12 +38,12 @@ This product includes software developed by the OpenSSL Project for use in the O
<message>
<location filename="../forms/addressbookpage.ui" line="+14"/>
<source>Address Book</source>
- <translation>llibreta d&apos;adreces</translation>
+ <translation>Llibreta d&apos;adreces</translation>
</message>
<message>
<location line="+22"/>
<source>Double-click to edit address or label</source>
- <translation>Feu doble clic per editar la direcció o l&apos;etiqueta</translation>
+ <translation>Feu doble clic per editar l&apos;adreça o l&apos;etiqueta</translation>
</message>
<message>
<location line="+27"/>
@@ -48,105 +53,110 @@ This product includes software developed by the OpenSSL Project for use in the O
<message>
<location line="+14"/>
<source>Copy the currently selected address to the system clipboard</source>
- <translation>Copieu l&apos;adreça seleccionada al porta-retalls del sistema</translation>
+ <translation>Copiar l&apos;adreça seleccionada al porta-retalls del sistema</translation>
</message>
<message>
<location line="-11"/>
<source>&amp;New Address</source>
- <translation type="unfinished"/>
+ <translation>&amp;Nova adreça</translation>
</message>
<message>
<location line="-46"/>
<source>These are your Bitcoin addresses for receiving payments. You may want to give a different one to each sender so you can keep track of who is paying you.</source>
- <translation type="unfinished"/>
+ <translation>Aquestes són les teves adreces Bitcoin per a rebre pagaments. Pot interesar-te proveïr diferents adreces a cadascun dels enviadors així pots identificar qui et va pagant.</translation>
</message>
<message>
<location line="+60"/>
<source>&amp;Copy Address</source>
- <translation type="unfinished"/>
+ <translation>&amp;Copiar adreça</translation>
</message>
<message>
<location line="+11"/>
<source>Show &amp;QR Code</source>
- <translation type="unfinished"/>
+ <translation>Mostrar codi &amp;QR</translation>
</message>
<message>
<location line="+11"/>
<source>Sign a message to prove you own a Bitcoin address</source>
- <translation type="unfinished"/>
+ <translation>Signa el missatge per provar que ets propietari de l&apos;adreça Bitcoin</translation>
</message>
<message>
<location line="+3"/>
<source>Sign &amp;Message</source>
- <translation type="unfinished"/>
+ <translation>Signar &amp;Missatge</translation>
</message>
<message>
<location line="+25"/>
<source>Delete the currently selected address from the list</source>
- <translation type="unfinished"/>
+ <translation>Esborrar l&apos;adreça sel·leccionada</translation>
</message>
<message>
<location line="-14"/>
<source>Verify a message to ensure it was signed with a specified Bitcoin address</source>
- <translation type="unfinished"/>
+ <translation>Verificar un missatge per asegurar-se que ha estat signat amb una adreça Bitcoin específica</translation>
</message>
<message>
<location line="+3"/>
<source>&amp;Verify Message</source>
- <translation type="unfinished"/>
+ <translation>&amp;Verificar el missatge</translation>
</message>
<message>
<location line="+14"/>
<source>&amp;Delete</source>
- <translation>&amp;Borrar</translation>
+ <translation>&amp;Esborrar</translation>
</message>
<message>
- <location filename="../addressbookpage.cpp" line="+65"/>
+ <location filename="../addressbookpage.cpp" line="+66"/>
<source>Copy &amp;Label</source>
- <translation type="unfinished"/>
+ <translation>Copiar &amp;Etiqueta</translation>
</message>
<message>
- <location line="+2"/>
+ <location line="+1"/>
<source>&amp;Edit</source>
- <translation type="unfinished"/>
+ <translation>&amp;Editar</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Send &amp;Coins</source>
+ <translation>Enviar &amp;Monedes</translation>
</message>
<message>
- <location line="+250"/>
+ <location line="+263"/>
<source>Export Address Book Data</source>
- <translation type="unfinished"/>
+ <translation>Exporta llibreta d&apos;adreces</translation>
</message>
<message>
<location line="+1"/>
<source>Comma separated file (*.csv)</source>
- <translation type="unfinished"/>
+ <translation>Arxiu de separació per comes (*.csv)</translation>
</message>
<message>
<location line="+13"/>
<source>Error exporting</source>
- <translation type="unfinished"/>
+ <translation>Error en l&apos;exportació</translation>
</message>
<message>
<location line="+0"/>
<source>Could not write to file %1.</source>
- <translation type="unfinished"/>
+ <translation>No s&apos;ha pogut escriure a l&apos;arxiu %1.</translation>
</message>
</context>
<context>
<name>AddressTableModel</name>
<message>
- <location filename="../addresstablemodel.cpp" line="+142"/>
+ <location filename="../addresstablemodel.cpp" line="+144"/>
<source>Label</source>
<translation>Etiqueta</translation>
</message>
<message>
<location line="+0"/>
<source>Address</source>
- <translation>Direcció</translation>
+ <translation>Adreça</translation>
</message>
<message>
<location line="+36"/>
<source>(no label)</source>
- <translation type="unfinished"/>
+ <translation>(sense etiqueta)</translation>
</message>
</context>
<context>
@@ -154,27 +164,27 @@ This product includes software developed by the OpenSSL Project for use in the O
<message>
<location filename="../forms/askpassphrasedialog.ui" line="+26"/>
<source>Passphrase Dialog</source>
- <translation type="unfinished"/>
+ <translation>Dialeg de contrasenya</translation>
</message>
<message>
<location line="+21"/>
<source>Enter passphrase</source>
- <translation type="unfinished"/>
+ <translation>Introdueix contrasenya</translation>
</message>
<message>
<location line="+14"/>
<source>New passphrase</source>
- <translation type="unfinished"/>
+ <translation>Nova contrasenya</translation>
</message>
<message>
<location line="+14"/>
<source>Repeat new passphrase</source>
- <translation type="unfinished"/>
+ <translation>Repeteix la nova contrasenya</translation>
</message>
<message>
<location filename="../askpassphrasedialog.cpp" line="+33"/>
<source>Enter the new passphrase to the wallet.&lt;br/&gt;Please use a passphrase of &lt;b&gt;10 or more random characters&lt;/b&gt;, or &lt;b&gt;eight or more words&lt;/b&gt;.</source>
- <translation type="unfinished"/>
+ <translation>Introdueixi la nova contrasenya al moneder&lt;br/&gt;Si us plau useu una contrasenya de &lt;b&gt;10 o més caracters aleatoris&lt;/b&gt;, o &lt;b&gt;vuit o més paraules&lt;/b&gt;.</translation>
</message>
<message>
<location line="+1"/>
@@ -184,69 +194,69 @@ This product includes software developed by the OpenSSL Project for use in the O
<message>
<location line="+3"/>
<source>This operation needs your wallet passphrase to unlock the wallet.</source>
- <translation type="unfinished"/>
+ <translation>Aquesta operació requereix la seva contrasenya del moneder per a desbloquejar-lo.</translation>
</message>
<message>
<location line="+5"/>
<source>Unlock wallet</source>
- <translation type="unfinished"/>
+ <translation>Desbloqueja el moneder</translation>
</message>
<message>
<location line="+3"/>
<source>This operation needs your wallet passphrase to decrypt the wallet.</source>
- <translation type="unfinished"/>
+ <translation>Aquesta operació requereix la seva contrasenya del moneder per a desencriptar-lo.</translation>
</message>
<message>
<location line="+5"/>
<source>Decrypt wallet</source>
- <translation type="unfinished"/>
+ <translation>Desencripta el moneder</translation>
</message>
<message>
<location line="+3"/>
<source>Change passphrase</source>
- <translation type="unfinished"/>
+ <translation>Canviar la contrasenya</translation>
</message>
<message>
<location line="+1"/>
<source>Enter the old and new passphrase to the wallet.</source>
- <translation type="unfinished"/>
+ <translation>Introdueixi tant l&apos;antiga com la nova contrasenya de moneder.</translation>
</message>
<message>
<location line="+46"/>
<source>Confirm wallet encryption</source>
- <translation type="unfinished"/>
+ <translation>Confirmar l&apos;encriptació del moneder</translation>
</message>
<message>
<location line="+1"/>
<source>Warning: If you encrypt your wallet and lose your passphrase, you will &lt;b&gt;LOSE ALL OF YOUR BITCOINS&lt;/b&gt;!</source>
- <translation type="unfinished"/>
+ <translation>Advertència: Si encripteu el vostre moneder i perdeu la constrasenya, &lt;b&gt;PERDREU TOTS ELS VOSTRES BITCOINS&lt;/b&gt;!</translation>
</message>
<message>
<location line="+0"/>
<source>Are you sure you wish to encrypt your wallet?</source>
- <translation type="unfinished"/>
+ <translation>Esteu segur que voleu encriptar el vostre moneder?</translation>
</message>
<message>
<location line="+15"/>
<source>IMPORTANT: Any previous backups you have made of your wallet file should be replaced with the newly generated, encrypted wallet file. For security reasons, previous backups of the unencrypted wallet file will become useless as soon as you start using the new, encrypted wallet.</source>
- <translation type="unfinished"/>
+ <translation>IMPORTANT: Tota copia de seguretat que hagis realitzat hauria de ser reemplaçada pel, recentment generat, arxiu encriptat del moneder.</translation>
</message>
<message>
<location line="+100"/>
<location line="+24"/>
<source>Warning: The Caps Lock key is on!</source>
- <translation type="unfinished"/>
+ <translation>Advertència: Les lletres majúscules estàn activades!</translation>
</message>
<message>
<location line="-130"/>
<location line="+58"/>
<source>Wallet encrypted</source>
- <translation type="unfinished"/>
+ <translation>Moneder encriptat</translation>
</message>
<message>
<location line="-56"/>
<source>Bitcoin will close now to finish the encryption process. Remember that encrypting your wallet cannot fully protect your bitcoins from being stolen by malware infecting your computer.</source>
- <translation type="unfinished"/>
+ <translation>Bitcoin es tancarà ara per acabar el procés d&apos;encriptació. Recorda que encriptar el teu moneder no protegeix completament els teus bitcoins de ser robades per programari maliciós instal·lat al teu ordinador.</translation>
</message>
<message>
<location line="+13"/>
@@ -254,68 +264,68 @@ This product includes software developed by the OpenSSL Project for use in the O
<location line="+42"/>
<location line="+6"/>
<source>Wallet encryption failed</source>
- <translation type="unfinished"/>
+ <translation>L&apos;encriptació del moneder ha fallat</translation>
</message>
<message>
<location line="-54"/>
<source>Wallet encryption failed due to an internal error. Your wallet was not encrypted.</source>
- <translation type="unfinished"/>
+ <translation>L&apos;encriptació del moneder ha fallat per un error intern. El seu moneder no ha estat encriptat.</translation>
</message>
<message>
<location line="+7"/>
<location line="+48"/>
<source>The supplied passphrases do not match.</source>
- <translation type="unfinished"/>
+ <translation>La contrasenya introduïda no coincideix.</translation>
</message>
<message>
<location line="-37"/>
<source>Wallet unlock failed</source>
- <translation type="unfinished"/>
+ <translation>El desbloqueig del moneder ha fallat</translation>
</message>
<message>
<location line="+1"/>
<location line="+11"/>
<location line="+19"/>
<source>The passphrase entered for the wallet decryption was incorrect.</source>
- <translation type="unfinished"/>
+ <translation>La contrasenya introduïda per a desencriptar el moneder és incorrecte.</translation>
</message>
<message>
<location line="-20"/>
<source>Wallet decryption failed</source>
- <translation type="unfinished"/>
+ <translation>La desencriptació del moneder ha fallat</translation>
</message>
<message>
<location line="+14"/>
<source>Wallet passphrase was successfully changed.</source>
- <translation type="unfinished"/>
+ <translation>La contrasenya del moneder ha estat modificada correctament.</translation>
</message>
</context>
<context>
<name>BitcoinGUI</name>
<message>
- <location filename="../bitcoingui.cpp" line="+267"/>
+ <location filename="../bitcoingui.cpp" line="+231"/>
<source>Sign &amp;message...</source>
- <translation type="unfinished"/>
+ <translation>Signar &amp;missatge...</translation>
</message>
<message>
- <location line="+254"/>
+ <location line="+299"/>
<source>Synchronizing with network...</source>
- <translation>Sincronització amb la xarxa ...</translation>
+ <translation>Sincronitzant amb la xarxa ...</translation>
</message>
<message>
- <location line="-322"/>
+ <location line="-367"/>
<source>&amp;Overview</source>
- <translation type="unfinished"/>
+ <translation>&amp;Panorama general</translation>
</message>
<message>
<location line="+1"/>
<source>Show general overview of wallet</source>
- <translation>Mostra panorama general de la cartera</translation>
+ <translation>Mostra panorama general del moneder</translation>
</message>
<message>
<location line="+20"/>
<source>&amp;Transactions</source>
- <translation type="unfinished"/>
+ <translation>&amp;Transaccions</translation>
</message>
<message>
<location line="+1"/>
@@ -323,34 +333,19 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation>Cerca a l&apos;historial de transaccions</translation>
</message>
<message>
- <location line="+6"/>
- <source>&amp;Address Book</source>
- <translation>llibreta d&apos;&amp;adreces</translation>
- </message>
- <message>
- <location line="+1"/>
+ <location line="+7"/>
<source>Edit the list of stored addresses and labels</source>
<translation>Edita la llista d&apos;adreces emmagatzemada i etiquetes</translation>
</message>
<message>
- <location line="-15"/>
- <source>&amp;Receive coins</source>
- <translation>&amp;Rebre monedes</translation>
- </message>
- <message>
- <location line="+1"/>
+ <location line="-14"/>
<source>Show the list of addresses for receiving payments</source>
- <translation type="unfinished"/>
+ <translation>Mostra el llistat d&apos;adreces per rebre pagaments</translation>
</message>
<message>
- <location line="-8"/>
- <source>&amp;Send coins</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+39"/>
+ <location line="+31"/>
<source>E&amp;xit</source>
- <translation type="unfinished"/>
+ <translation>S&amp;ortir</translation>
</message>
<message>
<location line="+1"/>
@@ -370,52 +365,47 @@ This product includes software developed by the OpenSSL Project for use in the O
<message>
<location line="+1"/>
<source>Show information about Qt</source>
- <translation type="unfinished"/>
+ <translation>Mostra informació sobre Qt</translation>
</message>
<message>
<location line="+2"/>
<source>&amp;Options...</source>
- <translation>&amp;Opcions ...</translation>
+ <translation>&amp;Opcions...</translation>
</message>
<message>
<location line="+5"/>
<source>&amp;Encrypt Wallet...</source>
- <translation type="unfinished"/>
+ <translation>&amp;Xifrar moneder</translation>
</message>
<message>
<location line="+3"/>
<source>&amp;Backup Wallet...</source>
- <translation type="unfinished"/>
+ <translation>&amp;Realitzant copia de seguretat del moneder...</translation>
</message>
<message>
<location line="+2"/>
<source>&amp;Change Passphrase...</source>
- <translation type="unfinished"/>
+ <translation>&amp;Canviar contrasenya...</translation>
</message>
<message>
- <location line="+259"/>
+ <location line="+304"/>
<source>Importing blocks from disk...</source>
- <translation type="unfinished"/>
+ <translation>Important blocs del disc..</translation>
</message>
<message>
<location line="+3"/>
<source>Reindexing blocks on disk...</source>
- <translation type="unfinished"/>
- </message>
- <message numerus="yes">
- <location line="+10"/>
- <source>~%n block(s) remaining</source>
- <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+ <translation>Re-indexant blocs al disc...</translation>
</message>
<message>
- <location line="-265"/>
+ <location line="-300"/>
<source>&amp;Export...</source>
- <translation type="unfinished"/>
+ <translation>&amp;Exporta...</translation>
</message>
<message>
<location line="-65"/>
<source>Send coins to a Bitcoin address</source>
- <translation type="unfinished"/>
+ <translation>Enviar monedes a una adreça Bitcoin</translation>
</message>
<message>
<location line="+49"/>
@@ -425,83 +415,98 @@ This product includes software developed by the OpenSSL Project for use in the O
<message>
<location line="+17"/>
<source>Export the data in the current tab to a file</source>
- <translation type="unfinished"/>
+ <translation>Exportar dades de la pestanya actual a un fitxer</translation>
</message>
<message>
<location line="-9"/>
<source>Backup wallet to another location</source>
- <translation type="unfinished"/>
+ <translation>Realitzar còpia de seguretat del moneder a un altre directori</translation>
</message>
<message>
<location line="+2"/>
<source>Change the passphrase used for wallet encryption</source>
- <translation type="unfinished"/>
+ <translation>Canviar la constrasenya d&apos;encriptació del moneder</translation>
</message>
<message>
<location line="+9"/>
<source>&amp;Debug window</source>
- <translation type="unfinished"/>
+ <translation>&amp;Finestra de debug</translation>
</message>
<message>
<location line="+1"/>
<source>Open debugging and diagnostic console</source>
- <translation type="unfinished"/>
+ <translation>Obrir la consola de diagnòstic i debugging</translation>
</message>
<message>
<location line="-7"/>
<source>&amp;Verify message...</source>
- <translation type="unfinished"/>
+ <translation>&amp;Verifica el missatge..</translation>
</message>
<message>
- <location line="-196"/>
- <location line="+538"/>
+ <location line="-162"/>
+ <location line="+540"/>
<source>Bitcoin</source>
- <translation type="unfinished"/>
+ <translation>Bitcoin</translation>
</message>
<message>
- <location line="-538"/>
+ <location line="-540"/>
<source>Wallet</source>
- <translation type="unfinished"/>
+ <translation>Moneder</translation>
+ </message>
+ <message>
+ <location line="+99"/>
+ <source>&amp;Send</source>
+ <translation>&amp;Enviar</translation>
+ </message>
+ <message>
+ <location line="+7"/>
+ <source>&amp;Receive</source>
+ <translation>&amp;Rebre</translation>
+ </message>
+ <message>
+ <location line="+14"/>
+ <source>&amp;Addresses</source>
+ <translation>&amp;Adreces</translation>
</message>
<message>
- <location line="+176"/>
+ <location line="+22"/>
<source>&amp;About Bitcoin</source>
<translation>&amp;Sobre Bitcoin</translation>
</message>
<message>
<location line="+9"/>
<source>&amp;Show / Hide</source>
- <translation type="unfinished"/>
+ <translation>&amp;Mostrar / Amagar</translation>
</message>
<message>
<location line="+1"/>
<source>Show or hide the main Window</source>
- <translation type="unfinished"/>
+ <translation>Mostrar o amagar la finestra principal</translation>
</message>
<message>
<location line="+2"/>
<source>Encrypt the private keys that belong to your wallet</source>
- <translation type="unfinished"/>
+ <translation>Xifrar les claus privades pertanyents al seu moneder</translation>
</message>
<message>
<location line="+7"/>
<source>Sign messages with your Bitcoin addresses to prove you own them</source>
- <translation type="unfinished"/>
+ <translation>Signa el missatges amb la seva adreça de Bitcoin per provar que les poseeixes</translation>
</message>
<message>
<location line="+2"/>
<source>Verify messages to ensure they were signed with specified Bitcoin addresses</source>
- <translation type="unfinished"/>
+ <translation>Verificar els missatges per assegurar-te que han estat signades amb una adreça Bitcoin específica.</translation>
</message>
<message>
<location line="+31"/>
<source>&amp;File</source>
- <translation type="unfinished"/>
+ <translation>&amp;Arxiu</translation>
</message>
<message>
<location line="+8"/>
<source>&amp;Settings</source>
- <translation type="unfinished"/>
+ <translation>&amp;Configuració</translation>
</message>
<message>
<location line="+6"/>
@@ -511,118 +516,113 @@ This product includes software developed by the OpenSSL Project for use in the O
<message>
<location line="+9"/>
<source>Tabs toolbar</source>
- <translation type="unfinished"/>
+ <translation>Barra d&apos;eines de seccions</translation>
</message>
<message>
<location line="+8"/>
<source>Actions toolbar</source>
- <translation>Accions de la barra d&apos;eines</translation>
+ <translation>Barra d&apos;eines d&apos;accions</translation>
</message>
<message>
<location line="+13"/>
<location line="+10"/>
<source>[testnet]</source>
- <translation type="unfinished"/>
+ <translation>[testnet]</translation>
</message>
<message>
- <location line="+63"/>
+ <location line="+47"/>
<source>Bitcoin client</source>
- <translation type="unfinished"/>
+ <translation>Client Bitcoin</translation>
</message>
<message numerus="yes">
- <location line="+79"/>
+ <location line="+140"/>
<source>%n active connection(s) to Bitcoin network</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message>
- <location line="+45"/>
- <source>Processed %1 of %2 blocks of transaction history (%3% done).</source>
- <translation type="unfinished"/>
+ <location line="+39"/>
+ <source>Processed %1 of %2 (estimated) blocks of transaction history.</source>
+ <translation>Processat el %1 de %2 (estimat) dels blocs del històric de transaccions.</translation>
</message>
<message>
- <location line="+7"/>
+ <location line="+4"/>
<source>Processed %1 blocks of transaction history.</source>
- <translation type="unfinished"/>
+ <translation>Proccessats %1 blocs del històric de transaccions.</translation>
+ </message>
+ <message numerus="yes">
+ <location line="+20"/>
+ <source>%n hour(s)</source>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
+ <message numerus="yes">
+ <location line="+4"/>
+ <source>%n day(s)</source>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
+ <message numerus="yes">
+ <location line="+4"/>
+ <source>%n week(s)</source>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message>
- <location line="+70"/>
+ <location line="+5"/>
+ <source>%1 behind</source>
+ <translation>%1 radera</translation>
+ </message>
+ <message>
+ <location line="+14"/>
+ <source>Last received block was generated %1 ago.</source>
+ <translation>Lúltim bloc rebut ha estat generat fa %1.</translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Transactions after this will not yet be visible.</source>
+ <translation>Les transaccions a partir d&apos;això no seràn visibles.</translation>
+ </message>
+ <message>
+ <location line="+21"/>
<source>Error</source>
- <translation type="unfinished"/>
+ <translation>Error</translation>
</message>
<message>
<location line="+3"/>
<source>Warning</source>
- <translation type="unfinished"/>
+ <translation>Avís</translation>
</message>
<message>
<location line="+3"/>
<source>Information</source>
- <translation type="unfinished"/>
+ <translation>Informació</translation>
</message>
<message>
- <location line="+66"/>
+ <location line="+68"/>
<source>This transaction is over the size limit. You can still send it for a fee of %1, which goes to the nodes that process your transaction and helps to support the network. Do you want to pay the fee?</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+210"/>
- <source>Backup Successful</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+0"/>
- <source>The wallet data was successfully saved to the new location.</source>
- <translation type="unfinished"/>
- </message>
- <message numerus="yes">
- <location line="-338"/>
- <source>%n second(s) ago</source>
- <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
- </message>
- <message numerus="yes">
- <location line="+4"/>
- <source>%n minute(s) ago</source>
- <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
- </message>
- <message numerus="yes">
- <location line="+4"/>
- <source>%n hour(s) ago</source>
- <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
- </message>
- <message numerus="yes">
- <location line="+4"/>
- <source>%n day(s) ago</source>
- <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+ <translation>Aquesta transacció supera el límit de tamany. Tot i així pots enviar-la amb una comissió de %1, que es destinen als nodes que processen la seva transacció i ajuda a donar suport a la xarxa. Vols pagar la comissió?</translation>
</message>
<message>
- <location line="+6"/>
+ <location line="-138"/>
<source>Up to date</source>
<translation>Al dia</translation>
</message>
<message>
- <location line="+7"/>
+ <location line="+32"/>
<source>Catching up...</source>
<translation>Posar-se al dia ...</translation>
</message>
<message>
- <location line="+10"/>
- <source>Last received block was generated %1.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+97"/>
+ <location line="+110"/>
<source>Confirm transaction fee</source>
- <translation type="unfinished"/>
+ <translation>Confirmar comisió de transacció</translation>
</message>
<message>
- <location line="+23"/>
+ <location line="+8"/>
<source>Sent transaction</source>
<translation>Transacció enviada</translation>
</message>
<message>
<location line="+0"/>
<source>Incoming transaction</source>
- <translation type="unfinished"/>
+ <translation>Transacció entrant</translation>
</message>
<message>
<location line="+1"/>
@@ -631,62 +631,42 @@ Amount: %2
Type: %3
Address: %4
</source>
- <translation type="unfinished"/>
+ <translation>Data: %1\nQuantitat %2\n Tipus: %3\n Adreça: %4\n</translation>
</message>
<message>
- <location line="+99"/>
- <location line="+28"/>
+ <location line="+33"/>
+ <location line="+23"/>
<source>URI handling</source>
- <translation type="unfinished"/>
+ <translation>Manejant URI</translation>
</message>
<message>
- <location line="-28"/>
- <location line="+28"/>
+ <location line="-23"/>
+ <location line="+23"/>
<source>URI can not be parsed! This can be caused by an invalid Bitcoin address or malformed URI parameters.</source>
- <translation type="unfinished"/>
+ <translation>la URI no pot ser processada! Això es pot ser causat per una adreça Bitcoin invalida o paràmetres URI malformats.</translation>
</message>
<message>
<location line="+17"/>
<source>Wallet is &lt;b&gt;encrypted&lt;/b&gt; and currently &lt;b&gt;unlocked&lt;/b&gt;</source>
- <translation type="unfinished"/>
+ <translation>El moneder està &lt;b&gt;encriptat&lt;/b&gt; i actualment &lt;b&gt;desbloquejat&lt;/b&gt;</translation>
</message>
<message>
<location line="+8"/>
<source>Wallet is &lt;b&gt;encrypted&lt;/b&gt; and currently &lt;b&gt;locked&lt;/b&gt;</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+23"/>
- <source>Backup Wallet</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+0"/>
- <source>Wallet Data (*.dat)</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+3"/>
- <source>Backup Failed</source>
- <translation type="unfinished"/>
+ <translation>El moneder està &lt;b&gt;encriptat&lt;/b&gt; i actualment &lt;b&gt;bloquejat&lt;/b&gt;</translation>
</message>
<message>
- <location line="+0"/>
- <source>There was an error trying to save the wallet data to the new location.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../bitcoin.cpp" line="+109"/>
+ <location filename="../bitcoin.cpp" line="+108"/>
<source>A fatal error occurred. Bitcoin can no longer continue safely and will quit.</source>
- <translation type="unfinished"/>
+ <translation>Ha tingut lloc un error fatal. Bitcoin no pot continuar executant-se de manera segura i es tancará.</translation>
</message>
</context>
<context>
<name>ClientModel</name>
<message>
- <location filename="../clientmodel.cpp" line="+86"/>
+ <location filename="../clientmodel.cpp" line="+96"/>
<source>Network Alert</source>
- <translation type="unfinished"/>
+ <translation>Alerta de xarxa</translation>
</message>
</context>
<context>
@@ -704,7 +684,7 @@ Address: %4
<message>
<location line="+10"/>
<source>The label associated with this address book entry</source>
- <translation type="unfinished"/>
+ <translation>Etiqueta associada amb aquesta entrada de la llibreta d&apos;adreces</translation>
</message>
<message>
<location line="+7"/>
@@ -714,91 +694,91 @@ Address: %4
<message>
<location line="+10"/>
<source>The address associated with this address book entry. This can only be modified for sending addresses.</source>
- <translation type="unfinished"/>
+ <translation>Adreça associada amb aquesta entrada de la llibreta d&apos;adreces. Només pot ser modificat per a enviar adreces.</translation>
</message>
<message>
- <location filename="../editaddressdialog.cpp" line="+20"/>
+ <location filename="../editaddressdialog.cpp" line="+21"/>
<source>New receiving address</source>
- <translation type="unfinished"/>
+ <translation>Nova adreça de recepció.</translation>
</message>
<message>
<location line="+4"/>
<source>New sending address</source>
- <translation type="unfinished"/>
+ <translation>Nova adreça d&apos;enviament</translation>
</message>
<message>
<location line="+3"/>
<source>Edit receiving address</source>
- <translation type="unfinished"/>
+ <translation>Editar adreces de recepció</translation>
</message>
<message>
<location line="+4"/>
<source>Edit sending address</source>
- <translation type="unfinished"/>
+ <translation>Editar adreces d&apos;enviament</translation>
</message>
<message>
- <location line="+60"/>
+ <location line="+76"/>
<source>The entered address &quot;%1&quot; is already in the address book.</source>
- <translation type="unfinished"/>
+ <translation>L&apos;adreça introduïda &quot;%1&quot; ja és present a la llibreta d&apos;adreces.</translation>
</message>
<message>
- <location line="+5"/>
+ <location line="-5"/>
<source>The entered address &quot;%1&quot; is not a valid Bitcoin address.</source>
- <translation type="unfinished"/>
+ <translation>L&apos;adreça introduida &quot;%1&quot; no és una adreça Bitcoin valida.</translation>
</message>
<message>
- <location line="+5"/>
+ <location line="+10"/>
<source>Could not unlock wallet.</source>
- <translation type="unfinished"/>
+ <translation>No s&apos;ha pogut desbloquejar el moneder.</translation>
</message>
<message>
<location line="+5"/>
<source>New key generation failed.</source>
- <translation type="unfinished"/>
+ <translation>Ha fallat la generació d&apos;una nova clau.</translation>
</message>
</context>
<context>
<name>GUIUtil::HelpMessageBox</name>
<message>
- <location filename="../guiutil.cpp" line="+419"/>
+ <location filename="../guiutil.cpp" line="+422"/>
<location line="+12"/>
<source>Bitcoin-Qt</source>
- <translation type="unfinished"/>
+ <translation>Bitcoin-Qt</translation>
</message>
<message>
<location line="-12"/>
<source>version</source>
- <translation type="unfinished"/>
+ <translation>versió</translation>
</message>
<message>
<location line="+2"/>
<source>Usage:</source>
- <translation type="unfinished"/>
+ <translation>Ús:</translation>
</message>
<message>
<location line="+1"/>
<source>command-line options</source>
- <translation type="unfinished"/>
+ <translation>Opcions de la línia d&apos;ordres</translation>
</message>
<message>
<location line="+4"/>
<source>UI options</source>
- <translation type="unfinished"/>
+ <translation>Opcions de IU</translation>
</message>
<message>
<location line="+1"/>
<source>Set language, for example &quot;de_DE&quot; (default: system locale)</source>
- <translation type="unfinished"/>
+ <translation>Definir llenguatge, per exemple &quot;de_DE&quot; (per defecte: Preferències locals de sistema)</translation>
</message>
<message>
<location line="+1"/>
<source>Start minimized</source>
- <translation type="unfinished"/>
+ <translation>Iniciar minimitzat</translation>
</message>
<message>
<location line="+1"/>
<source>Show splash screen on startup (default: 1)</source>
- <translation type="unfinished"/>
+ <translation>Mostrar finestra de benvinguda a l&apos;inici (per defecte: 1)</translation>
</message>
</context>
<context>
@@ -811,47 +791,47 @@ Address: %4
<message>
<location line="+16"/>
<source>&amp;Main</source>
- <translation type="unfinished"/>
+ <translation>&amp;Principal</translation>
</message>
<message>
<location line="+6"/>
<source>Optional transaction fee per kB that helps make sure your transactions are processed quickly. Most transactions are 1 kB. Fee 0.01 recommended.</source>
- <translation type="unfinished"/>
+ <translation>Commisió de transacció opcional per kB que ajuda a garantir que les teves transaccions son processades ràpidament. La majoría de transaccions són de 1kB. Commisió recomanada de 0,01.</translation>
</message>
<message>
<location line="+15"/>
<source>Pay transaction &amp;fee</source>
- <translation type="unfinished"/>
+ <translation>Pagar &amp;comisió de transacció</translation>
</message>
<message>
<location line="+31"/>
<source>Automatically start Bitcoin after logging in to the system.</source>
- <translation type="unfinished"/>
+ <translation>Iniciar automàticament Bitcoin després de l&apos;inici de sessió del sistema.</translation>
</message>
<message>
<location line="+3"/>
<source>&amp;Start Bitcoin on system login</source>
- <translation type="unfinished"/>
+ <translation>&amp;Iniciar Bitcoin al inici de sessió del sistema.</translation>
</message>
<message>
<location line="+35"/>
<source>Reset all client options to default.</source>
- <translation type="unfinished"/>
+ <translation>Reestablir totes les opcions del client.</translation>
</message>
<message>
<location line="+3"/>
<source>&amp;Reset Options</source>
- <translation type="unfinished"/>
+ <translation>&amp;Reestablir Opcions</translation>
</message>
<message>
<location line="+13"/>
<source>&amp;Network</source>
- <translation type="unfinished"/>
+ <translation>&amp;Xarxa</translation>
</message>
<message>
<location line="+6"/>
<source>Automatically open the Bitcoin client port on the router. This only works when your router supports UPnP and it is enabled.</source>
- <translation type="unfinished"/>
+ <translation>Obrir el port del client de Bitcoin al router de forma automàtica. Això només funciona quan el teu router implementa UPnP i l&apos;opció està activada.</translation>
</message>
<message>
<location line="+3"/>
@@ -861,154 +841,154 @@ Address: %4
<message>
<location line="+7"/>
<source>Connect to the Bitcoin network through a SOCKS proxy (e.g. when connecting through Tor).</source>
- <translation type="unfinished"/>
+ <translation>Connectar a la xarxa Bitcoin a través de un SOCKS proxy (per exemple connectant a través de Tor).</translation>
</message>
<message>
<location line="+3"/>
<source>&amp;Connect through SOCKS proxy:</source>
- <translation type="unfinished"/>
+ <translation>&amp;Connecta a través de un proxy SOCKS:</translation>
</message>
<message>
<location line="+9"/>
<source>Proxy &amp;IP:</source>
- <translation type="unfinished"/>
+ <translation>&amp;IP del proxy:</translation>
</message>
<message>
<location line="+19"/>
<source>IP address of the proxy (e.g. 127.0.0.1)</source>
- <translation type="unfinished"/>
+ <translation>Adreça IP del proxy (per exemple 127.0.0.1)</translation>
</message>
<message>
<location line="+7"/>
<source>&amp;Port:</source>
- <translation type="unfinished"/>
+ <translation>&amp;Port:</translation>
</message>
<message>
<location line="+19"/>
<source>Port of the proxy (e.g. 9050)</source>
- <translation type="unfinished"/>
+ <translation>Port del proxy (per exemple 9050)</translation>
</message>
<message>
<location line="+7"/>
<source>SOCKS &amp;Version:</source>
- <translation type="unfinished"/>
+ <translation>&amp;Versió de SOCKS:</translation>
</message>
<message>
<location line="+13"/>
<source>SOCKS version of the proxy (e.g. 5)</source>
- <translation type="unfinished"/>
+ <translation>Versió SOCKS del proxy (per exemple 5)</translation>
</message>
<message>
<location line="+36"/>
<source>&amp;Window</source>
- <translation type="unfinished"/>
+ <translation>&amp;Finestra</translation>
</message>
<message>
<location line="+6"/>
<source>Show only a tray icon after minimizing the window.</source>
- <translation type="unfinished"/>
+ <translation>Mostrar només l&apos;icona de la barra al minimitzar l&apos;aplicació.</translation>
</message>
<message>
<location line="+3"/>
<source>&amp;Minimize to the tray instead of the taskbar</source>
- <translation type="unfinished"/>
+ <translation>&amp;Minimitzar a la barra d&apos;aplicacions</translation>
</message>
<message>
<location line="+7"/>
<source>Minimize instead of exit the application when the window is closed. When this option is enabled, the application will be closed only after selecting Quit in the menu.</source>
- <translation type="unfinished"/>
+ <translation>Minimitza en comptes de sortir de la aplicació al tancar la finestra. Quan aquesta opció està activa, la aplicació només es tancarà al seleccionar Sortir al menú.</translation>
</message>
<message>
<location line="+3"/>
<source>M&amp;inimize on close</source>
- <translation type="unfinished"/>
+ <translation>M&amp;inimitzar al tancar</translation>
</message>
<message>
<location line="+21"/>
<source>&amp;Display</source>
- <translation type="unfinished"/>
+ <translation>&amp;Pantalla</translation>
</message>
<message>
<location line="+8"/>
<source>User Interface &amp;language:</source>
- <translation type="unfinished"/>
+ <translation>Llenguatge de la Interfície d&apos;Usuari:</translation>
</message>
<message>
<location line="+13"/>
<source>The user interface language can be set here. This setting will take effect after restarting Bitcoin.</source>
- <translation type="unfinished"/>
+ <translation>Aquí pots definir el llenguatge de l&apos;aplicatiu. Aquesta configuració tindrà efecte un cop es reiniciï Bitcoin.</translation>
</message>
<message>
<location line="+11"/>
<source>&amp;Unit to show amounts in:</source>
- <translation type="unfinished"/>
+ <translation>&amp;Unitats per mostrar les quantitats en:</translation>
</message>
<message>
<location line="+13"/>
<source>Choose the default subdivision unit to show in the interface and when sending coins.</source>
- <translation type="unfinished"/>
+ <translation>Sel·lecciona la unitat de subdivisió per defecte per mostrar en la interficie quan s&apos;envien monedes.</translation>
</message>
<message>
<location line="+9"/>
<source>Whether to show Bitcoin addresses in the transaction list or not.</source>
- <translation type="unfinished"/>
+ <translation>Mostrar adreces Bitcoin als llistats de transaccions o no.</translation>
</message>
<message>
<location line="+3"/>
<source>&amp;Display addresses in transaction list</source>
- <translation type="unfinished"/>
+ <translation>&amp;Mostrar adreces al llistat de transaccions</translation>
</message>
<message>
<location line="+71"/>
<source>&amp;OK</source>
- <translation type="unfinished"/>
+ <translation>&amp;OK</translation>
</message>
<message>
<location line="+7"/>
<source>&amp;Cancel</source>
- <translation type="unfinished"/>
+ <translation>&amp;Cancel·la</translation>
</message>
<message>
<location line="+10"/>
<source>&amp;Apply</source>
- <translation type="unfinished"/>
+ <translation>&amp;Aplicar</translation>
</message>
<message>
- <location filename="../optionsdialog.cpp" line="+55"/>
+ <location filename="../optionsdialog.cpp" line="+53"/>
<source>default</source>
- <translation type="unfinished"/>
+ <translation>Per defecte</translation>
</message>
<message>
<location line="+130"/>
<source>Confirm options reset</source>
- <translation type="unfinished"/>
+ <translation>Confirmi el reestabliment de les opcions</translation>
</message>
<message>
<location line="+1"/>
<source>Some settings may require a client restart to take effect.</source>
- <translation type="unfinished"/>
+ <translation>Algunes configuracions poden requerir reiniciar el client per a que tinguin efecte.</translation>
</message>
<message>
<location line="+0"/>
<source>Do you want to proceed?</source>
- <translation type="unfinished"/>
+ <translation>Vols procedir?</translation>
</message>
<message>
<location line="+42"/>
<location line="+9"/>
<source>Warning</source>
- <translation type="unfinished"/>
+ <translation>Avís</translation>
</message>
<message>
<location line="-9"/>
<location line="+9"/>
<source>This setting will take effect after restarting Bitcoin.</source>
- <translation type="unfinished"/>
+ <translation>Aquesta configuració tindrà efecte un cop es reiniciï Bitcoin.</translation>
</message>
<message>
<location line="+29"/>
<source>The supplied proxy address is invalid.</source>
- <translation type="unfinished"/>
+ <translation>L&apos;adreça proxy introduïda és invalida.</translation>
</message>
</context>
<context>
@@ -1016,69 +996,67 @@ Address: %4
<message>
<location filename="../forms/overviewpage.ui" line="+14"/>
<source>Form</source>
- <translation type="unfinished"/>
+ <translation>Formulari</translation>
</message>
<message>
- <location line="+51"/>
- <location line="+183"/>
+ <location line="+50"/>
+ <location line="+166"/>
<source>The displayed information may be out of date. Your wallet automatically synchronizes with the Bitcoin network after a connection is established, but this process has not completed yet.</source>
- <translation type="unfinished"/>
+ <translation>La informació mostrada pot no estar al día. El teu moneder es sincronitza automàticament amb la xarxa Bitcoin un cop s&apos;ha establert connexió, però aquest proces no s&apos;ha completat encara.</translation>
</message>
<message>
- <location line="-141"/>
+ <location line="-124"/>
<source>Balance:</source>
<translation>Balanç:</translation>
</message>
<message>
- <location line="+58"/>
- <source>Number of transactions:</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="-29"/>
+ <location line="+29"/>
<source>Unconfirmed:</source>
<translation>Sense confirmar:</translation>
</message>
<message>
<location line="-78"/>
<source>Wallet</source>
- <translation type="unfinished"/>
+ <translation>Moneder</translation>
</message>
<message>
- <location line="+124"/>
+ <location line="+107"/>
<source>Immature:</source>
- <translation type="unfinished"/>
+ <translation>Immatur:</translation>
</message>
<message>
<location line="+13"/>
<source>Mined balance that has not yet matured</source>
- <translation type="unfinished"/>
+ <translation>Balanç minat que encara no ha madurat</translation>
</message>
<message>
<location line="+46"/>
<source>&lt;b&gt;Recent transactions&lt;/b&gt;</source>
- <translation type="unfinished"/>
+ <translation>&lt;b&gt;Transaccions recents&lt;/b&gt;</translation>
</message>
<message>
- <location line="-118"/>
+ <location line="-101"/>
<source>Your current balance</source>
<translation>El seu balanç actual</translation>
</message>
<message>
<location line="+29"/>
<source>Total of transactions that have yet to be confirmed, and do not yet count toward the current balance</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+20"/>
- <source>Total number of transactions in wallet</source>
- <translation type="unfinished"/>
+ <translation>Total de transaccions encara sense confirmar, que encara no es content en el balanç actual</translation>
</message>
<message>
<location filename="../overviewpage.cpp" line="+115"/>
<location line="+1"/>
<source>out of sync</source>
- <translation type="unfinished"/>
+ <translation>Fora de sincronia</translation>
+ </message>
+</context>
+<context>
+ <name>PaymentServer</name>
+ <message>
+ <location filename="../paymentserver.cpp" line="+107"/>
+ <source>Cannot start bitcoin: click-to-pay handler</source>
+ <translation>No es pot iniciar bitcoin: manejador clicla-per-pagar</translation>
</message>
</context>
<context>
@@ -1086,17 +1064,17 @@ Address: %4
<message>
<location filename="../forms/qrcodedialog.ui" line="+14"/>
<source>QR Code Dialog</source>
- <translation type="unfinished"/>
+ <translation>Dialeg del codi QR</translation>
</message>
<message>
<location line="+59"/>
<source>Request Payment</source>
- <translation type="unfinished"/>
+ <translation>Reclamar pagament</translation>
</message>
<message>
<location line="+56"/>
<source>Amount:</source>
- <translation type="unfinished"/>
+ <translation>Quantitat:</translation>
</message>
<message>
<location line="-44"/>
@@ -1106,37 +1084,37 @@ Address: %4
<message>
<location line="+19"/>
<source>Message:</source>
- <translation type="unfinished"/>
+ <translation>Missatge:</translation>
</message>
<message>
<location line="+71"/>
<source>&amp;Save As...</source>
- <translation type="unfinished"/>
+ <translation>&amp;Desar com...</translation>
</message>
<message>
<location filename="../qrcodedialog.cpp" line="+62"/>
<source>Error encoding URI into QR Code.</source>
- <translation type="unfinished"/>
+ <translation>Error codificant la URI en un codi QR.</translation>
</message>
<message>
<location line="+40"/>
<source>The entered amount is invalid, please check.</source>
- <translation type="unfinished"/>
+ <translation>La quantitat introduïda és invalida, si us plau comprovi-la.</translation>
</message>
<message>
<location line="+23"/>
<source>Resulting URI too long, try to reduce the text for label / message.</source>
- <translation type="unfinished"/>
+ <translation>URI resultant massa llarga, intenta reduir el text per a la etiqueta / missatge</translation>
</message>
<message>
<location line="+25"/>
<source>Save QR Code</source>
- <translation type="unfinished"/>
+ <translation>Desar codi QR</translation>
</message>
<message>
<location line="+0"/>
<source>PNG Images (*.png)</source>
- <translation type="unfinished"/>
+ <translation>Imatges PNG (*.png)</translation>
</message>
</context>
<context>
@@ -1144,7 +1122,7 @@ Address: %4
<message>
<location filename="../forms/rpcconsole.ui" line="+46"/>
<source>Client name</source>
- <translation type="unfinished"/>
+ <translation>Nom del client</translation>
</message>
<message>
<location line="+10"/>
@@ -1158,132 +1136,132 @@ Address: %4
<location line="+23"/>
<location filename="../rpcconsole.cpp" line="+344"/>
<source>N/A</source>
- <translation type="unfinished"/>
+ <translation>N/A</translation>
</message>
<message>
<location line="-217"/>
<source>Client version</source>
- <translation type="unfinished"/>
+ <translation>Versió del client</translation>
</message>
<message>
<location line="-45"/>
<source>&amp;Information</source>
- <translation type="unfinished"/>
+ <translation>&amp;Informació</translation>
</message>
<message>
<location line="+68"/>
<source>Using OpenSSL version</source>
- <translation type="unfinished"/>
+ <translation>Utilitzant OpenSSL versió</translation>
</message>
<message>
<location line="+49"/>
<source>Startup time</source>
- <translation type="unfinished"/>
+ <translation>&amp;Temps d&apos;inici</translation>
</message>
<message>
<location line="+29"/>
<source>Network</source>
- <translation type="unfinished"/>
+ <translation>Xarxa</translation>
</message>
<message>
<location line="+7"/>
<source>Number of connections</source>
- <translation type="unfinished"/>
+ <translation>Nombre de connexions</translation>
</message>
<message>
<location line="+23"/>
<source>On testnet</source>
- <translation type="unfinished"/>
+ <translation>A testnet</translation>
</message>
<message>
<location line="+23"/>
<source>Block chain</source>
- <translation type="unfinished"/>
+ <translation>Bloquejar cadena</translation>
</message>
<message>
<location line="+7"/>
<source>Current number of blocks</source>
- <translation type="unfinished"/>
+ <translation>Nombre de blocs actuals</translation>
</message>
<message>
<location line="+23"/>
<source>Estimated total blocks</source>
- <translation type="unfinished"/>
+ <translation>Total estimat de blocs</translation>
</message>
<message>
<location line="+23"/>
<source>Last block time</source>
- <translation type="unfinished"/>
+ <translation>Últim temps de bloc</translation>
</message>
<message>
<location line="+52"/>
<source>&amp;Open</source>
- <translation type="unfinished"/>
+ <translation>&amp;Obrir</translation>
</message>
<message>
<location line="+16"/>
<source>Command-line options</source>
- <translation type="unfinished"/>
+ <translation>Opcions de línia d&apos;ordres</translation>
</message>
<message>
<location line="+7"/>
<source>Show the Bitcoin-Qt help message to get a list with possible Bitcoin command-line options.</source>
- <translation type="unfinished"/>
+ <translation>Mostrar el missatge d&apos;ajuda de Bitcoin-Qt per a obtenir un llistat de possibles ordres per a la línia d&apos;ordres de Bitcoin.</translation>
</message>
<message>
<location line="+3"/>
<source>&amp;Show</source>
- <translation type="unfinished"/>
+ <translation>&amp;Mostrar</translation>
</message>
<message>
<location line="+24"/>
<source>&amp;Console</source>
- <translation type="unfinished"/>
+ <translation>&amp;Consola</translation>
</message>
<message>
<location line="-260"/>
<source>Build date</source>
- <translation type="unfinished"/>
+ <translation>Data de compilació</translation>
</message>
<message>
<location line="-104"/>
<source>Bitcoin - Debug window</source>
- <translation type="unfinished"/>
+ <translation>Bitcoin -Finestra de debug</translation>
</message>
<message>
<location line="+25"/>
<source>Bitcoin Core</source>
- <translation type="unfinished"/>
+ <translation>Nucli de Bitcoin</translation>
</message>
<message>
<location line="+279"/>
<source>Debug log file</source>
- <translation type="unfinished"/>
+ <translation>Dietàri de debug</translation>
</message>
<message>
<location line="+7"/>
<source>Open the Bitcoin debug log file from the current data directory. This can take a few seconds for large log files.</source>
- <translation type="unfinished"/>
+ <translation>Obrir el dietari de debug de Bitcoin del directori de dades actual. Aixó pot trigar uns quants segons per a dietàris grossos.</translation>
</message>
<message>
<location line="+102"/>
<source>Clear console</source>
- <translation type="unfinished"/>
+ <translation>Netejar consola</translation>
</message>
<message>
<location filename="../rpcconsole.cpp" line="-30"/>
<source>Welcome to the Bitcoin RPC console.</source>
- <translation type="unfinished"/>
+ <translation>Benvingut a la consola RPC de Bitcoin</translation>
</message>
<message>
<location line="+1"/>
<source>Use up and down arrows to navigate history, and &lt;b&gt;Ctrl-L&lt;/b&gt; to clear screen.</source>
- <translation type="unfinished"/>
+ <translation>Utilitza les fletxes d&apos;amunt i avall per navegar per l&apos;històric, i &lt;b&gt;Ctrl-L&lt;\b&gt; per netejar la pantalla.</translation>
</message>
<message>
<location line="+1"/>
<source>Type &lt;b&gt;help&lt;/b&gt; for an overview of available commands.</source>
- <translation type="unfinished"/>
+ <translation>Escriu &lt;b&gt;help&lt;\b&gt; per a obtenir una llistat de les ordres disponibles.</translation>
</message>
</context>
<context>
@@ -1303,22 +1281,22 @@ Address: %4
<message>
<location line="+50"/>
<source>Send to multiple recipients at once</source>
- <translation type="unfinished"/>
+ <translation>Enviar a multiples destinataris al mateix temps</translation>
</message>
<message>
<location line="+3"/>
<source>Add &amp;Recipient</source>
- <translation type="unfinished"/>
+ <translation>Affegir &amp;Destinatari</translation>
</message>
<message>
<location line="+20"/>
<source>Remove all transaction fields</source>
- <translation type="unfinished"/>
+ <translation>Netejar tots els camps de la transacció</translation>
</message>
<message>
<location line="+3"/>
<source>Clear &amp;All</source>
- <translation type="unfinished"/>
+ <translation>Esborrar &amp;Tot</translation>
</message>
<message>
<location line="+22"/>
@@ -1328,42 +1306,42 @@ Address: %4
<message>
<location line="+10"/>
<source>123.456 BTC</source>
- <translation type="unfinished"/>
+ <translation>123.456 BTC</translation>
</message>
<message>
<location line="+31"/>
<source>Confirm the send action</source>
- <translation type="unfinished"/>
+ <translation>Confirmi l&apos;acció d&apos;enviament</translation>
</message>
<message>
<location line="+3"/>
<source>S&amp;end</source>
- <translation type="unfinished"/>
+ <translation>E&amp;nviar</translation>
</message>
<message>
<location filename="../sendcoinsdialog.cpp" line="-59"/>
<source>&lt;b&gt;%1&lt;/b&gt; to %2 (%3)</source>
- <translation type="unfinished"/>
+ <translation>&lt;b&gt;%1&lt;/b&gt; to %2 (%3)</translation>
</message>
<message>
<location line="+5"/>
<source>Confirm send coins</source>
- <translation type="unfinished"/>
+ <translation>Confirmar l&apos;enviament de monedes</translation>
</message>
<message>
<location line="+1"/>
<source>Are you sure you want to send %1?</source>
- <translation type="unfinished"/>
+ <translation>Estas segur que vols enviar %1?</translation>
</message>
<message>
<location line="+0"/>
<source> and </source>
- <translation type="unfinished"/>
+ <translation>i</translation>
</message>
<message>
<location line="+23"/>
<source>The recipient address is not valid, please recheck.</source>
- <translation type="unfinished"/>
+ <translation>L&apos;adreça remetent no és vàlida, si us plau comprovi-la.</translation>
</message>
<message>
<location line="+5"/>
@@ -1378,22 +1356,22 @@ Address: %4
<message>
<location line="+5"/>
<source>The total exceeds your balance when the %1 transaction fee is included.</source>
- <translation type="unfinished"/>
+ <translation>El total excedeix el teu balanç quan s&apos;afegeix la comisió a la transacció %1.</translation>
</message>
<message>
<location line="+6"/>
<source>Duplicate address found, can only send to each address once per send operation.</source>
- <translation type="unfinished"/>
+ <translation>S&apos;ha trobat una adreça duplicada, tan sols es pot enviar a cada adreça un cop per ordre de enviament.</translation>
</message>
<message>
<location line="+5"/>
<source>Error: Transaction creation failed!</source>
- <translation type="unfinished"/>
+ <translation>Error: La ceació de la transacció ha fallat!</translation>
</message>
<message>
<location line="+5"/>
<source>Error: The transaction was rejected. This might happen if some of the coins in your wallet were already spent, such as if you used a copy of wallet.dat and coins were spent in the copy but not marked as spent here.</source>
- <translation type="unfinished"/>
+ <translation>Error: La transacció ha estat rebutjada. Això pot passar si alguna de les monedes del teu moneder ja s&apos;han gastat, com si haguesis usat una copia de l&apos;arxiu wallet.dat i s&apos;haguessin gastat monedes de la copia però sense marcar com gastades en aquest.</translation>
</message>
</context>
<context>
@@ -1401,63 +1379,63 @@ Address: %4
<message>
<location filename="../forms/sendcoinsentry.ui" line="+14"/>
<source>Form</source>
- <translation type="unfinished"/>
+ <translation>Formulari</translation>
</message>
<message>
<location line="+15"/>
<source>A&amp;mount:</source>
- <translation type="unfinished"/>
+ <translation>Q&amp;uantitat:</translation>
</message>
<message>
<location line="+13"/>
<source>Pay &amp;To:</source>
- <translation type="unfinished"/>
+ <translation>Pagar &amp;A:</translation>
</message>
<message>
<location line="+34"/>
<source>The address to send the payment to (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
- <translation type="unfinished"/>
+ <translation>La adreça a on envia el pagament (per exemple: 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation>
</message>
<message>
<location line="+60"/>
- <location filename="../sendcoinsentry.cpp" line="+25"/>
+ <location filename="../sendcoinsentry.cpp" line="+26"/>
<source>Enter a label for this address to add it to your address book</source>
- <translation type="unfinished"/>
+ <translation>Introdueixi una etiquera per a aquesta adreça per afegir-la a la llibreta d&apos;adreces</translation>
</message>
<message>
<location line="-78"/>
<source>&amp;Label:</source>
- <translation type="unfinished"/>
+ <translation>&amp;Etiqueta:</translation>
</message>
<message>
<location line="+28"/>
<source>Choose address from address book</source>
- <translation type="unfinished"/>
+ <translation>Escollir adreça del llibre d&apos;adreces</translation>
</message>
<message>
<location line="+10"/>
<source>Alt+A</source>
- <translation type="unfinished"/>
+ <translation>Alta+A</translation>
</message>
<message>
<location line="+7"/>
<source>Paste address from clipboard</source>
- <translation type="unfinished"/>
+ <translation>Enganxar adreça del porta-retalls</translation>
</message>
<message>
<location line="+10"/>
<source>Alt+P</source>
- <translation type="unfinished"/>
+ <translation>Alt+P</translation>
</message>
<message>
<location line="+7"/>
<source>Remove this recipient</source>
- <translation type="unfinished"/>
+ <translation>Eliminar aquest destinatari</translation>
</message>
<message>
<location filename="../sendcoinsentry.cpp" line="+1"/>
<source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
- <translation type="unfinished"/>
+ <translation>Introdueixi una adreça de Bitcoin (per exemple 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation>
</message>
</context>
<context>
@@ -1465,132 +1443,132 @@ Address: %4
<message>
<location filename="../forms/signverifymessagedialog.ui" line="+14"/>
<source>Signatures - Sign / Verify a Message</source>
- <translation type="unfinished"/>
+ <translation>Signatures .Signar/Verificar un Missatge</translation>
</message>
<message>
<location line="+13"/>
<source>&amp;Sign Message</source>
- <translation type="unfinished"/>
+ <translation>&amp;Signar Missatge</translation>
</message>
<message>
<location line="+6"/>
<source>You can sign messages with your addresses to prove you own them. Be careful not to sign anything vague, as phishing attacks may try to trick you into signing your identity over to them. Only sign fully-detailed statements you agree to.</source>
- <translation type="unfinished"/>
+ <translation>Pots signar missatges amb la teva adreça per provar que són teus. Sigues cautelòs al signar qualsevol cosa, ja que els atacs phising poden intentar confondre&apos;t per a que els hi signis amb la teva identitat. Tan sols signa als documents completament detallats amb els que hi estàs d&apos;acord.</translation>
</message>
<message>
<location line="+18"/>
<source>The address to sign the message with (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
- <translation type="unfinished"/>
+ <translation>La adreça amb la que signat els missatges (per exemple 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation>
</message>
<message>
<location line="+10"/>
<location line="+213"/>
<source>Choose an address from the address book</source>
- <translation type="unfinished"/>
+ <translation>Escollir una adreça de la llibreta de direccions</translation>
</message>
<message>
<location line="-203"/>
<location line="+213"/>
<source>Alt+A</source>
- <translation type="unfinished"/>
+ <translation>Alta+A</translation>
</message>
<message>
<location line="-203"/>
<source>Paste address from clipboard</source>
- <translation type="unfinished"/>
+ <translation>Enganxar adreça del porta-retalls</translation>
</message>
<message>
<location line="+10"/>
<source>Alt+P</source>
- <translation type="unfinished"/>
+ <translation>Alt+P</translation>
</message>
<message>
<location line="+12"/>
<source>Enter the message you want to sign here</source>
- <translation type="unfinished"/>
+ <translation>Introdueix aqui el missatge que vols signar</translation>
</message>
<message>
<location line="+7"/>
<source>Signature</source>
- <translation type="unfinished"/>
+ <translation>Signatura</translation>
</message>
<message>
<location line="+27"/>
<source>Copy the current signature to the system clipboard</source>
- <translation type="unfinished"/>
+ <translation>Copiar la signatura actual al porta-retalls del sistema</translation>
</message>
<message>
<location line="+21"/>
<source>Sign the message to prove you own this Bitcoin address</source>
- <translation type="unfinished"/>
+ <translation>Signa el missatge per provar que ets propietari d&apos;aquesta adreça Bitcoin</translation>
</message>
<message>
<location line="+3"/>
<source>Sign &amp;Message</source>
- <translation type="unfinished"/>
+ <translation>Signar &amp;Missatge</translation>
</message>
<message>
<location line="+14"/>
<source>Reset all sign message fields</source>
- <translation type="unfinished"/>
+ <translation>Neteja tots els camps de clau</translation>
</message>
<message>
<location line="+3"/>
<location line="+146"/>
<source>Clear &amp;All</source>
- <translation type="unfinished"/>
+ <translation>Esborrar &amp;Tot</translation>
</message>
<message>
<location line="-87"/>
<source>&amp;Verify Message</source>
- <translation type="unfinished"/>
+ <translation>&amp;Verificar el missatge</translation>
</message>
<message>
<location line="+6"/>
<source>Enter the signing address, message (ensure you copy line breaks, spaces, tabs, etc. exactly) and signature below to verify the message. Be careful not to read more into the signature than what is in the signed message itself, to avoid being tricked by a man-in-the-middle attack.</source>
- <translation type="unfinished"/>
+ <translation>Introdueixi l&apos;adreça signant, missatge (assegura&apos;t que copies salts de línia, espais, tabuladors, etc excactament tot el text) i la signatura a sota per verificar el missatge. Per evitar ser enganyat per un atac home-entre-mig, vés amb compte de no llegir més en la signatura del que hi ha al missatge signat mateix.</translation>
</message>
<message>
<location line="+21"/>
<source>The address the message was signed with (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
- <translation type="unfinished"/>
+ <translation>La adreça amb el que el missatge va ser signat (per exemple 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation>
</message>
<message>
<location line="+40"/>
<source>Verify the message to ensure it was signed with the specified Bitcoin address</source>
- <translation type="unfinished"/>
+ <translation>Verificar el missatge per assegurar-se que ha estat signat amb una adreça Bitcoin específica</translation>
</message>
<message>
<location line="+3"/>
<source>Verify &amp;Message</source>
- <translation type="unfinished"/>
+ <translation>Verificar &amp;Missatge</translation>
</message>
<message>
<location line="+14"/>
<source>Reset all verify message fields</source>
- <translation type="unfinished"/>
+ <translation>Neteja tots els camps de verificació de missatge</translation>
</message>
<message>
<location filename="../signverifymessagedialog.cpp" line="+27"/>
<location line="+3"/>
<source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
- <translation type="unfinished"/>
+ <translation>Introdueixi una adreça de Bitcoin (per exemple 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation>
</message>
<message>
<location line="-2"/>
<source>Click &quot;Sign Message&quot; to generate signature</source>
- <translation type="unfinished"/>
+ <translation>Clica &quot;Signar Missatge&quot; per a generar una signatura</translation>
</message>
<message>
<location line="+3"/>
<source>Enter Bitcoin signature</source>
- <translation type="unfinished"/>
+ <translation>Introduïr una clau Bitcoin</translation>
</message>
<message>
<location line="+82"/>
<location line="+81"/>
<source>The entered address is invalid.</source>
- <translation type="unfinished"/>
+ <translation>L&apos;adreça intoduïda és invàlida.</translation>
</message>
<message>
<location line="-81"/>
@@ -1598,87 +1576,87 @@ Address: %4
<location line="+73"/>
<location line="+8"/>
<source>Please check the address and try again.</source>
- <translation type="unfinished"/>
+ <translation>Siu us plau, comprovi l&apos;adreça i provi de nou.</translation>
</message>
<message>
<location line="-81"/>
<location line="+81"/>
<source>The entered address does not refer to a key.</source>
- <translation type="unfinished"/>
+ <translation>L&apos;adreça introduïda no referencia a cap clau.</translation>
</message>
<message>
<location line="-73"/>
<source>Wallet unlock was cancelled.</source>
- <translation type="unfinished"/>
+ <translation>El desbloqueig del moneder ha estat cancelat.</translation>
</message>
<message>
<location line="+8"/>
<source>Private key for the entered address is not available.</source>
- <translation type="unfinished"/>
+ <translation>La clau privada per a la adreça introduïda no està disponible.</translation>
</message>
<message>
<location line="+12"/>
<source>Message signing failed.</source>
- <translation type="unfinished"/>
+ <translation>El signat del missatge ha fallat.</translation>
</message>
<message>
<location line="+5"/>
<source>Message signed.</source>
- <translation type="unfinished"/>
+ <translation>Missatge signat.</translation>
</message>
<message>
<location line="+59"/>
<source>The signature could not be decoded.</source>
- <translation type="unfinished"/>
+ <translation>La signatura no s&apos;ha pogut decodificar .</translation>
</message>
<message>
<location line="+0"/>
<location line="+13"/>
<source>Please check the signature and try again.</source>
- <translation type="unfinished"/>
+ <translation>Su us plau, comprovi la signatura i provi de nou.</translation>
</message>
<message>
<location line="+0"/>
<source>The signature did not match the message digest.</source>
- <translation type="unfinished"/>
+ <translation>La signatura no coincideix amb el resum del missatge.</translation>
</message>
<message>
<location line="+7"/>
<source>Message verification failed.</source>
- <translation type="unfinished"/>
+ <translation>Ha fallat la verificació del missatge.</translation>
</message>
<message>
<location line="+5"/>
<source>Message verified.</source>
- <translation type="unfinished"/>
+ <translation>Missatge verificat.</translation>
</message>
</context>
<context>
<name>TransactionDesc</name>
<message>
- <location filename="../transactiondesc.cpp" line="+19"/>
+ <location filename="../transactiondesc.cpp" line="+20"/>
<source>Open until %1</source>
- <translation type="unfinished"/>
+ <translation>Obert fins %1</translation>
</message>
<message>
<location line="+6"/>
<source>%1/offline</source>
- <translation type="unfinished"/>
+ <translation>%1/offline</translation>
</message>
<message>
<location line="+2"/>
<source>%1/unconfirmed</source>
- <translation type="unfinished"/>
+ <translation>%1/sense confirmar</translation>
</message>
<message>
<location line="+2"/>
<source>%1 confirmations</source>
- <translation type="unfinished"/>
+ <translation>%1 confrimacions</translation>
</message>
<message>
<location line="+18"/>
<source>Status</source>
- <translation type="unfinished"/>
+ <translation>Estat</translation>
</message>
<message numerus="yes">
<location line="+7"/>
@@ -1688,41 +1666,41 @@ Address: %4
<message>
<location line="+4"/>
<source>Date</source>
- <translation type="unfinished"/>
+ <translation>Data</translation>
</message>
<message>
<location line="+7"/>
<source>Source</source>
- <translation type="unfinished"/>
+ <translation>Font</translation>
</message>
<message>
<location line="+0"/>
<source>Generated</source>
- <translation type="unfinished"/>
+ <translation>Generat</translation>
</message>
<message>
<location line="+5"/>
<location line="+17"/>
<source>From</source>
- <translation type="unfinished"/>
+ <translation>Des de</translation>
</message>
<message>
<location line="+1"/>
<location line="+22"/>
<location line="+58"/>
<source>To</source>
- <translation type="unfinished"/>
+ <translation>A</translation>
</message>
<message>
<location line="-77"/>
<location line="+2"/>
<source>own address</source>
- <translation type="unfinished"/>
+ <translation>Adreça pròpia</translation>
</message>
<message>
<location line="-2"/>
<source>label</source>
- <translation type="unfinished"/>
+ <translation>etiqueta</translation>
</message>
<message>
<location line="+37"/>
@@ -1731,7 +1709,7 @@ Address: %4
<location line="+17"/>
<location line="+30"/>
<source>Credit</source>
- <translation type="unfinished"/>
+ <translation>Crèdit</translation>
</message>
<message numerus="yes">
<location line="-102"/>
@@ -1741,7 +1719,7 @@ Address: %4
<message>
<location line="+2"/>
<source>not accepted</source>
- <translation type="unfinished"/>
+ <translation>no acceptat</translation>
</message>
<message>
<location line="+44"/>
@@ -1749,72 +1727,72 @@ Address: %4
<location line="+15"/>
<location line="+30"/>
<source>Debit</source>
- <translation type="unfinished"/>
+ <translation>Dèbit</translation>
</message>
<message>
<location line="-39"/>
<source>Transaction fee</source>
- <translation type="unfinished"/>
+ <translation>Comissió de transacció</translation>
</message>
<message>
<location line="+16"/>
<source>Net amount</source>
- <translation type="unfinished"/>
+ <translation>Quantitat neta</translation>
</message>
<message>
<location line="+6"/>
<source>Message</source>
- <translation type="unfinished"/>
+ <translation>Missatge</translation>
</message>
<message>
<location line="+2"/>
<source>Comment</source>
- <translation type="unfinished"/>
+ <translation>Comentar</translation>
</message>
<message>
<location line="+2"/>
<source>Transaction ID</source>
- <translation type="unfinished"/>
+ <translation>ID de transacció</translation>
</message>
<message>
<location line="+3"/>
<source>Generated coins must mature 120 blocks before they can be spent. When you generated this block, it was broadcast to the network to be added to the block chain. If it fails to get into the chain, its state will change to &quot;not accepted&quot; and it won&apos;t be spendable. This may occasionally happen if another node generates a block within a few seconds of yours.</source>
- <translation type="unfinished"/>
+ <translation>Les monedes generades han de madurar 120 blocs abans de poder ser gastades. Quan has generat aquest bloc, aquest ha estat transmés a la xarxa per a ser afegit a la cadena de blocs. Si no arriba a ser acceptat a la cadena, el seu estat passará a &quot;no acceptat&quot; i no podrá ser gastat. Això pot ocòrrer ocasionalment si un altre node genera un bloc a pocs segons del teu.</translation>
</message>
<message>
<location line="+7"/>
<source>Debug information</source>
- <translation type="unfinished"/>
+ <translation>Informació de debug</translation>
</message>
<message>
<location line="+8"/>
<source>Transaction</source>
- <translation type="unfinished"/>
+ <translation>Transacció</translation>
</message>
<message>
<location line="+3"/>
<source>Inputs</source>
- <translation type="unfinished"/>
+ <translation>Entrades</translation>
</message>
<message>
<location line="+23"/>
<source>Amount</source>
- <translation type="unfinished"/>
+ <translation>Quantitat</translation>
</message>
<message>
<location line="+1"/>
<source>true</source>
- <translation type="unfinished"/>
+ <translation>cert</translation>
</message>
<message>
<location line="+0"/>
<source>false</source>
- <translation type="unfinished"/>
+ <translation>fals</translation>
</message>
<message>
<location line="-209"/>
<source>, has not been successfully broadcast yet</source>
- <translation type="unfinished"/>
+ <translation>, encara no ha estat emès correctement</translation>
</message>
<message numerus="yes">
<location line="-35"/>
@@ -1824,7 +1802,7 @@ Address: %4
<message>
<location line="+70"/>
<source>unknown</source>
- <translation type="unfinished"/>
+ <translation>desconegut</translation>
</message>
</context>
<context>
@@ -1832,25 +1810,25 @@ Address: %4
<message>
<location filename="../forms/transactiondescdialog.ui" line="+14"/>
<source>Transaction details</source>
- <translation type="unfinished"/>
+ <translation>Detall de la transacció</translation>
</message>
<message>
<location line="+6"/>
<source>This pane shows a detailed description of the transaction</source>
- <translation type="unfinished"/>
+ <translation>Aquest panell mostra una descripció detallada de la transacció</translation>
</message>
</context>
<context>
<name>TransactionTableModel</name>
<message>
- <location filename="../transactiontablemodel.cpp" line="+226"/>
+ <location filename="../transactiontablemodel.cpp" line="+225"/>
<source>Date</source>
- <translation type="unfinished"/>
+ <translation>Data</translation>
</message>
<message>
<location line="+0"/>
<source>Type</source>
- <translation type="unfinished"/>
+ <translation>Tipus</translation>
</message>
<message>
<location line="+0"/>
@@ -1860,7 +1838,7 @@ Address: %4
<message>
<location line="+0"/>
<source>Amount</source>
- <translation type="unfinished"/>
+ <translation>Quantitat</translation>
</message>
<message numerus="yes">
<location line="+57"/>
@@ -1870,22 +1848,22 @@ Address: %4
<message>
<location line="+3"/>
<source>Open until %1</source>
- <translation type="unfinished"/>
+ <translation>Obert fins %1</translation>
</message>
<message>
<location line="+3"/>
<source>Offline (%1 confirmations)</source>
- <translation type="unfinished"/>
+ <translation>Sense connexió (%1 confirmacions)</translation>
</message>
<message>
<location line="+3"/>
<source>Unconfirmed (%1 of %2 confirmations)</source>
- <translation type="unfinished"/>
+ <translation>Sense confirmar (%1 de %2 confirmacions)</translation>
</message>
<message>
<location line="+3"/>
<source>Confirmed (%1 confirmations)</source>
- <translation type="unfinished"/>
+ <translation>Confirmat (%1 confirmacions)</translation>
</message>
<message numerus="yes">
<location line="+8"/>
@@ -1895,191 +1873,196 @@ Address: %4
<message>
<location line="+5"/>
<source>This block was not received by any other nodes and will probably not be accepted!</source>
- <translation type="unfinished"/>
+ <translation>Aquest bloc no ha estat rebut per cap altre node i probablement no serà acceptat!</translation>
</message>
<message>
<location line="+3"/>
<source>Generated but not accepted</source>
- <translation type="unfinished"/>
+ <translation>Generat però no acceptat</translation>
</message>
<message>
<location line="+43"/>
<source>Received with</source>
- <translation type="unfinished"/>
+ <translation>Rebut amb</translation>
</message>
<message>
<location line="+2"/>
<source>Received from</source>
- <translation type="unfinished"/>
+ <translation>Rebut de</translation>
</message>
<message>
<location line="+3"/>
<source>Sent to</source>
- <translation type="unfinished"/>
+ <translation>Enviat a</translation>
</message>
<message>
<location line="+2"/>
<source>Payment to yourself</source>
- <translation type="unfinished"/>
+ <translation>Pagament a un mateix</translation>
</message>
<message>
<location line="+2"/>
<source>Mined</source>
- <translation type="unfinished"/>
+ <translation>Minat</translation>
</message>
<message>
<location line="+38"/>
<source>(n/a)</source>
- <translation type="unfinished"/>
+ <translation>(n/a)</translation>
</message>
<message>
<location line="+199"/>
<source>Transaction status. Hover over this field to show number of confirmations.</source>
- <translation type="unfinished"/>
+ <translation>Estat de la transacció. Desplaça&apos;t per aquí sobre per mostrar el nombre de confirmacions.</translation>
</message>
<message>
<location line="+2"/>
<source>Date and time that the transaction was received.</source>
- <translation type="unfinished"/>
+ <translation>Data i hora en que la transacció va ser rebuda.</translation>
</message>
<message>
<location line="+2"/>
<source>Type of transaction.</source>
- <translation type="unfinished"/>
+ <translation>Tipus de transacció.</translation>
</message>
<message>
<location line="+2"/>
<source>Destination address of transaction.</source>
- <translation type="unfinished"/>
+ <translation>Adreça del destinatari de la transacció.</translation>
</message>
<message>
<location line="+2"/>
<source>Amount removed from or added to balance.</source>
- <translation type="unfinished"/>
+ <translation>Quantitat extreta o afegida del balanç.</translation>
</message>
</context>
<context>
<name>TransactionView</name>
<message>
- <location filename="../transactionview.cpp" line="+55"/>
+ <location filename="../transactionview.cpp" line="+52"/>
<location line="+16"/>
<source>All</source>
- <translation type="unfinished"/>
+ <translation>Tot</translation>
</message>
<message>
<location line="-15"/>
<source>Today</source>
- <translation type="unfinished"/>
+ <translation>Avui</translation>
</message>
<message>
<location line="+1"/>
<source>This week</source>
- <translation type="unfinished"/>
+ <translation>Aquesta setmana</translation>
</message>
<message>
<location line="+1"/>
<source>This month</source>
- <translation type="unfinished"/>
+ <translation>Aquest mes</translation>
</message>
<message>
<location line="+1"/>
<source>Last month</source>
- <translation type="unfinished"/>
+ <translation>El mes passat</translation>
</message>
<message>
<location line="+1"/>
<source>This year</source>
- <translation type="unfinished"/>
+ <translation>Enguany</translation>
</message>
<message>
<location line="+1"/>
<source>Range...</source>
- <translation type="unfinished"/>
+ <translation>Rang...</translation>
</message>
<message>
<location line="+11"/>
<source>Received with</source>
- <translation type="unfinished"/>
+ <translation>Rebut amb</translation>
</message>
<message>
<location line="+2"/>
<source>Sent to</source>
- <translation type="unfinished"/>
+ <translation>Enviat a</translation>
</message>
<message>
<location line="+2"/>
<source>To yourself</source>
- <translation type="unfinished"/>
+ <translation>A tu mateix</translation>
</message>
<message>
<location line="+1"/>
<source>Mined</source>
- <translation type="unfinished"/>
+ <translation>Minat</translation>
</message>
<message>
<location line="+1"/>
<source>Other</source>
- <translation type="unfinished"/>
+ <translation>Altres</translation>
</message>
<message>
<location line="+7"/>
<source>Enter address or label to search</source>
- <translation type="unfinished"/>
+ <translation>Introdueix una adreça o una etiqueta per cercar</translation>
</message>
<message>
<location line="+7"/>
<source>Min amount</source>
- <translation type="unfinished"/>
+ <translation>Quantitat mínima</translation>
</message>
<message>
<location line="+34"/>
<source>Copy address</source>
- <translation type="unfinished"/>
+ <translation>Copiar adreça </translation>
</message>
<message>
<location line="+1"/>
<source>Copy label</source>
- <translation type="unfinished"/>
+ <translation>Copiar etiqueta</translation>
</message>
<message>
<location line="+1"/>
<source>Copy amount</source>
- <translation type="unfinished"/>
+ <translation>Copiar quantitat</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy transaction ID</source>
+ <translation>Copiar ID de transacció</translation>
</message>
<message>
<location line="+1"/>
<source>Edit label</source>
- <translation type="unfinished"/>
+ <translation>Editar etiqueta</translation>
</message>
<message>
<location line="+1"/>
<source>Show transaction details</source>
- <translation type="unfinished"/>
+ <translation>Mostra detalls de la transacció</translation>
</message>
<message>
- <location line="+142"/>
+ <location line="+139"/>
<source>Export Transaction Data</source>
- <translation type="unfinished"/>
+ <translation>Exportar detalls de la transacció </translation>
</message>
<message>
<location line="+1"/>
<source>Comma separated file (*.csv)</source>
- <translation type="unfinished"/>
+ <translation>Arxiu de separació per comes (*.csv)</translation>
</message>
<message>
<location line="+8"/>
<source>Confirmed</source>
- <translation type="unfinished"/>
+ <translation>Confirmat</translation>
</message>
<message>
<location line="+1"/>
<source>Date</source>
- <translation type="unfinished"/>
+ <translation>Data</translation>
</message>
<message>
<location line="+1"/>
<source>Type</source>
- <translation type="unfinished"/>
+ <translation>Tipus</translation>
</message>
<message>
<location line="+1"/>
@@ -2094,660 +2077,900 @@ Address: %4
<message>
<location line="+1"/>
<source>Amount</source>
- <translation type="unfinished"/>
+ <translation>Quantitat</translation>
</message>
<message>
<location line="+1"/>
<source>ID</source>
- <translation type="unfinished"/>
+ <translation>ID</translation>
</message>
<message>
<location line="+4"/>
<source>Error exporting</source>
- <translation type="unfinished"/>
+ <translation>Error en l&apos;exportació</translation>
</message>
<message>
<location line="+0"/>
<source>Could not write to file %1.</source>
- <translation type="unfinished"/>
+ <translation>No s&apos;ha pogut escriure a l&apos;arxiu %1.</translation>
</message>
<message>
- <location line="+95"/>
+ <location line="+100"/>
<source>Range:</source>
- <translation type="unfinished"/>
+ <translation>Rang:</translation>
</message>
<message>
<location line="+8"/>
<source>to</source>
- <translation type="unfinished"/>
+ <translation>a</translation>
+ </message>
+</context>
+<context>
+ <name>WalletView</name>
+ <message>
+ <location filename="../walletview.cpp" line="+95"/>
+ <source>&amp;Overview</source>
+ <translation>&amp;Panorama general</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Show general overview of wallet</source>
+ <translation>Mostra panorama general del moneder</translation>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>&amp;Send coins</source>
+ <translation>&amp;Enviar monedes</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Send coins to a Bitcoin address</source>
+ <translation>Enviar monedes a una adreça Bitcoin</translation>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>&amp;Receive coins</source>
+ <translation>&amp;Rebre monedes</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Show the list of addresses for receiving payments</source>
+ <translation>Mostra el llistat d&apos;adreces per rebre pagaments</translation>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>&amp;Transactions</source>
+ <translation>&amp;Transaccions</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Browse transaction history</source>
+ <translation>Examinar l&apos;històric de transaccions</translation>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>&amp;Address Book</source>
+ <translation>&amp;Llibreta d&apos;adreces</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Edit the list of stored addresses and labels</source>
+ <translation>Editar llistat de les adreces i etiquetes emmagatzemades.</translation>
+ </message>
+ <message>
+ <location line="+12"/>
+ <source>&amp;Encrypt Wallet...</source>
+ <translation>&amp;Xifrar moneder</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Encrypt the private keys that belong to your wallet</source>
+ <translation>Xifrar les claus privades pertanyents al seu moneder</translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>&amp;Backup Wallet...</source>
+ <translation>&amp;Realitzant copia de seguretat del moneder...</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Backup wallet to another location</source>
+ <translation>Realitzar còpia de seguretat del moneder a un altre directori</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>&amp;Change Passphrase...</source>
+ <translation>&amp;Canviar contrasenya...</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Change the passphrase used for wallet encryption</source>
+ <translation>Canviar la constrasenya d&apos;encriptació del moneder</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Sign &amp;message...</source>
+ <translation>Signar &amp;missatge...</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Sign messages with your Bitcoin addresses to prove you own them</source>
+ <translation>Signa el missatges amb la seva adreça de Bitcoin per provar que les poseeixes </translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>&amp;Verify message...</source>
+ <translation>&amp;Verifica el missatge..</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Verify messages to ensure they were signed with specified Bitcoin addresses</source>
+ <translation>Verificar els missatges per assegurar-te que han estat signades amb una adreça Bitcoin específica.</translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>&amp;Export...</source>
+ <translation>&amp;Exporta...</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Export the data in the current tab to a file</source>
+ <translation>Exportar dades de la pestanya actual a un fitxer</translation>
+ </message>
+ <message>
+ <location line="+180"/>
+ <source>Backup Wallet</source>
+ <translation>Realitzar còpia de seguretat del moneder</translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>Wallet Data (*.dat)</source>
+ <translation>Dades del moneder (*.dat)</translation>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Backup Failed</source>
+ <translation>Còpia de seguretat faillida</translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>There was an error trying to save the wallet data to the new location.</source>
+ <translation>Hi ha hagut un error intentant desar les dades del moneder al nou directori</translation>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>Backup Successful</source>
+ <translation>Copia de seguretat realitzada correctament</translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>The wallet data was successfully saved to the new location.</source>
+ <translation>Les dades del moneder han estat desades cirrectament al nou emplaçament.</translation>
</message>
</context>
<context>
<name>bitcoin-core</name>
<message>
- <location filename="../bitcoinstrings.cpp" line="+88"/>
+ <location filename="../bitcoinstrings.cpp" line="+96"/>
<source>Bitcoin version</source>
- <translation type="unfinished"/>
+ <translation>Versió de Bitcoin</translation>
</message>
<message>
- <location line="+82"/>
+ <location line="+98"/>
<source>Usage:</source>
- <translation type="unfinished"/>
+ <translation>Ús:</translation>
</message>
<message>
- <location line="-23"/>
+ <location line="-24"/>
<source>Send command to -server or bitcoind</source>
- <translation type="unfinished"/>
+ <translation>Enviar comanda a -servidor o bitcoind</translation>
</message>
<message>
- <location line="-21"/>
+ <location line="-22"/>
<source>List commands</source>
- <translation type="unfinished"/>
+ <translation>Llista d&apos;ordres</translation>
</message>
<message>
- <location line="-11"/>
+ <location line="-10"/>
<source>Get help for a command</source>
- <translation type="unfinished"/>
+ <translation>Obtenir ajuda per a un ordre.</translation>
</message>
<message>
<location line="+21"/>
<source>Options:</source>
- <translation type="unfinished"/>
+ <translation>Opcions:</translation>
</message>
<message>
<location line="+22"/>
<source>Specify configuration file (default: bitcoin.conf)</source>
- <translation type="unfinished"/>
+ <translation>Especificat arxiu de configuració (per defecte: bitcoin.conf)</translation>
</message>
<message>
<location line="+3"/>
<source>Specify pid file (default: bitcoind.pid)</source>
- <translation type="unfinished"/>
+ <translation>Especificar arxiu pid (per defecte: bitcoind.pid)</translation>
</message>
<message>
<location line="-47"/>
<source>Generate coins</source>
- <translation type="unfinished"/>
+ <translation>Generar monedes</translation>
</message>
<message>
- <location line="-15"/>
+ <location line="-28"/>
<source>Don&apos;t generate coins</source>
- <translation type="unfinished"/>
+ <translation>No generar monedes</translation>
</message>
<message>
- <location line="+61"/>
+ <location line="+74"/>
<source>Specify data directory</source>
- <translation type="unfinished"/>
+ <translation>Especificar directori de dades</translation>
</message>
<message>
<location line="-7"/>
<source>Set database cache size in megabytes (default: 25)</source>
- <translation type="unfinished"/>
+ <translation>Establir tamany de la memoria cau en megabytes (per defecte: 25)</translation>
</message>
<message>
- <location line="-26"/>
+ <location line="-27"/>
<source>Listen for connections on &lt;port&gt; (default: 8333 or testnet: 18333)</source>
- <translation type="unfinished"/>
+ <translation>Escoltar connexions a &lt;port&gt; (per defecte: 8333 o testnet: 18333)</translation>
</message>
<message>
- <location line="+4"/>
+ <location line="+5"/>
<source>Maintain at most &lt;n&gt; connections to peers (default: 125)</source>
- <translation type="unfinished"/>
+ <translation>Mantenir com a molt &lt;n&gt; connexions a peers (per defecte: 125)</translation>
</message>
<message>
- <location line="-34"/>
+ <location line="-49"/>
<source>Connect to a node to retrieve peer addresses, and disconnect</source>
- <translation type="unfinished"/>
+ <translation>Connectar al node per obtenir les adreces de les connexions, i desconectar</translation>
</message>
<message>
- <location line="+65"/>
+ <location line="+80"/>
<source>Specify your own public address</source>
- <translation type="unfinished"/>
+ <translation>Especificar la teva adreça pública</translation>
</message>
<message>
- <location line="+2"/>
+ <location line="+3"/>
<source>Threshold for disconnecting misbehaving peers (default: 100)</source>
- <translation type="unfinished"/>
+ <translation>Límit per a desconectar connexions errònies (per defecte: 100)</translation>
</message>
<message>
- <location line="-114"/>
+ <location line="-132"/>
<source>Number of seconds to keep misbehaving peers from reconnecting (default: 86400)</source>
- <translation type="unfinished"/>
+ <translation>Nombre de segons abans de reconectar amb connexions errònies (per defecte: 86400)</translation>
</message>
<message>
- <location line="-28"/>
+ <location line="-32"/>
<source>An error occurred while setting up the RPC port %u for listening on IPv4: %s</source>
- <translation type="unfinished"/>
+ <translation>Ha sorgit un error al configurar el port RPC %u escoltant a IPv4: %s</translation>
</message>
<message>
- <location line="+26"/>
+ <location line="+30"/>
<source>Listen for JSON-RPC connections on &lt;port&gt; (default: 8332 or testnet: 18332)</source>
- <translation type="unfinished"/>
+ <translation>Escoltar connexions JSON-RPC al port &lt;port&gt; (per defecte: 8332 o testnet:18332)</translation>
</message>
<message>
- <location line="+34"/>
+ <location line="+36"/>
<source>Accept command line and JSON-RPC commands</source>
- <translation type="unfinished"/>
+ <translation>Acceptar línia d&apos;ordres i ordres JSON-RPC </translation>
</message>
<message>
- <location line="+62"/>
+ <location line="+77"/>
<source>Run in the background as a daemon and accept commands</source>
- <translation type="unfinished"/>
+ <translation>Executar en segon pla com a programa dimoni i acceptar ordres</translation>
</message>
<message>
- <location line="+31"/>
+ <location line="+32"/>
<source>Use the test network</source>
- <translation type="unfinished"/>
+ <translation>Usar la xarxa de prova</translation>
</message>
<message>
- <location line="-92"/>
+ <location line="-108"/>
<source>Accept connections from outside (default: 1 if no -proxy or -connect)</source>
- <translation type="unfinished"/>
+ <translation>Aceptar connexions d&apos;afora (per defecte: 1 si no -proxy o -connect)</translation>
</message>
<message>
- <location line="-74"/>
+ <location line="-82"/>
<source>%s, you must set a rpcpassword in the configuration file:
- %s
+%s
It is recommended you use the following random password:
rpcuser=bitcoinrpc
rpcpassword=%s
(you do not need to remember this password)
The username and password MUST NOT be the same.
If the file does not exist, create it with owner-readable-only file permissions.
+It is also recommended to set alertnotify so you are notified of problems;
+for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.com
</source>
- <translation type="unfinished"/>
+ <translation>%s has de establir una contrasenya RPC a l&apos;arxiu de configuració:\n%s\nEs recomana que useu la següent constrasenya aleatòria:\nrpcuser=bitcoinrpc\nrpcpassword=%s\n(no necesiteu recordar aquesta contrsenya)\nEl nom d&apos;usuari i contrasenya NO HAN de ser els mateixos.\nSi l&apos;arxiu no existeix, crea&apos;l amb els permisos d&apos;arxiu de només lectura per al propietari.\nTambé es recomana establir la notificació d&apos;alertes i així seràs notificat de les incidències;\nper exemple: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.com</translation>
</message>
<message>
- <location line="+15"/>
+ <location line="+17"/>
<source>An error occurred while setting up the RPC port %u for listening on IPv6, falling back to IPv4: %s</source>
- <translation type="unfinished"/>
+ <translation>Ha sorgit un error al configurar el port RPC %u escoltant a IPv6, retrocedint a IPv4: %s</translation>
</message>
<message>
<location line="+3"/>
<source>Bind to given address and always listen on it. Use [host]:port notation for IPv6</source>
- <translation type="unfinished"/>
+ <translation>Vincular a una adreça específica i sempre escoltar-hi. Utilitza la notació [host]:port per IPv6</translation>
</message>
<message>
<location line="+3"/>
<source>Cannot obtain a lock on data directory %s. Bitcoin is probably already running.</source>
- <translation type="unfinished"/>
+ <translation>No es pot bloquejar el directori de dades %s. Probablement Bitcoin ja estigui en execució.</translation>
</message>
<message>
<location line="+3"/>
- <source>Corrupted block database detected. Please restart the client with -reindex.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+2"/>
<source>Error initializing database environment %s! To recover, BACKUP THAT DIRECTORY, then remove everything from it except for wallet.dat.</source>
- <translation type="unfinished"/>
+ <translation>Error inicialitzant l&apos;entorn de la base de dades %s! Per recuperar, FES UNA COPIA DE SEGURETAT D&apos;AQUEST DIRECTORI, aleshores elimina tot el contingut TRET DEL wallet.dat.</translation>
</message>
<message>
<location line="+3"/>
<source>Error: The transaction was rejected! This might happen if some of the coins in your wallet were already spent, such as if you used a copy of wallet.dat and coins were spent in the copy but not marked as spent here.</source>
- <translation type="unfinished"/>
+ <translation>Error: La transacció ha estat rebutjada. Això pot passar si alguna de les monedes del teu moneder ja s&apos;han gastat, com si haguesis usat una copia de l&apos;arxiu wallet.dat i s&apos;haguessin gastat monedes de la copia però sense marcar com gastades en aquest.</translation>
</message>
<message>
<location line="+4"/>
<source>Error: This transaction requires a transaction fee of at least %s because of its amount, complexity, or use of recently received funds!</source>
- <translation type="unfinished"/>
+ <translation>Error: Aquesta transacció requereix una comissió d&apos;almenys %s degut al seu import, complexitat o per l&apos;ús de fons recentment rebuts!</translation>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Execute command when a relevant alert is received (%s in cmd is replaced by message)</source>
+ <translation>Executar ordre al rebre una alerta rellevant (%s al cmd es reemplaça per message)</translation>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Execute command when a wallet transaction changes (%s in cmd is replaced by TxID)</source>
+ <translation>Executar una ordre quan una transacció del moneder canviï (%s in cmd es canvia per TxID)</translation>
</message>
<message>
<location line="+11"/>
<source>Set maximum size of high-priority/low-fee transactions in bytes (default: 27000)</source>
- <translation type="unfinished"/>
+ <translation>Establir una mida màxima de transaccions d&apos;alta prioritat/baixa comisió en bytes (per defecte: 27000)</translation>
</message>
<message>
<location line="+3"/>
+ <source>Set the number of script verification threads (1-16, 0=auto, default: 0)</source>
+ <translation>Establir el nombre d&apos;execucions en paralel del script de verificació (1-16, 0=auto, per defecte: 0)</translation>
+ </message>
+ <message>
+ <location line="+2"/>
<source>This is a pre-release test build - use at your own risk - do not use for mining or merchant applications</source>
- <translation type="unfinished"/>
+ <translation>Aquesta és una versió de pre-llançament - utilitza-la sota la teva responsabilitat - No usar per a minería o aplicacions de compra-venda</translation>
</message>
<message>
<location line="+5"/>
<source>Warning: -paytxfee is set very high! This is the transaction fee you will pay if you send a transaction.</source>
- <translation type="unfinished"/>
+ <translation>Advertència: el -paytxfee és molt elevat! Aquesta és la comissió de transacció que pagaràs quan enviis una transacció.</translation>
</message>
<message>
<location line="+3"/>
<source>Warning: Displayed transactions may not be correct! You may need to upgrade, or other nodes may need to upgrade.</source>
- <translation type="unfinished"/>
+ <translation>Advertència: Les transaccions mostrades poden no ser correctes! Pot esser que necessitis actualitzar, o bé que altres nodes ho necessitin.</translation>
</message>
<message>
<location line="+3"/>
<source>Warning: Please check that your computer&apos;s date and time are correct! If your clock is wrong Bitcoin will not work properly.</source>
- <translation type="unfinished"/>
+ <translation>Advertència: Si us plau comprovi que la data i hora del seu computador siguin correctes! Si el seu rellotge està mal configurat, Bitcoin no funcionará de manera apropiada.</translation>
</message>
<message>
<location line="+3"/>
<source>Warning: error reading wallet.dat! All keys read correctly, but transaction data or address book entries might be missing or incorrect.</source>
- <translation type="unfinished"/>
+ <translation>Advertència: Error llegint l&apos;arxiu wallet.dat!! Totes les claus es llegeixen correctament, però hi ha dades de transaccions o entrades del llibre d&apos;adreces absents o bé son incorrectes.</translation>
</message>
<message>
<location line="+3"/>
<source>Warning: wallet.dat corrupt, data salvaged! Original wallet.dat saved as wallet.{timestamp}.bak in %s; if your balance or transactions are incorrect you should restore from a backup.</source>
- <translation type="unfinished"/>
+ <translation>Advertència: L&apos;arxiu wallet.dat és corrupte, dades rescatades! L&apos;arxiu wallet.dat original ha estat desat com wallet.{estampa_temporal}.bak al directori %s; si el teu balanç o transaccions son incorrectes hauries de restaurar-lo de un backup.</translation>
</message>
<message>
<location line="+14"/>
<source>Attempt to recover private keys from a corrupt wallet.dat</source>
- <translation type="unfinished"/>
+ <translation>Intentar recuperar les claus privades d&apos;un arxiu wallet.dat corrupte</translation>
</message>
<message>
<location line="+2"/>
<source>Block creation options:</source>
- <translation type="unfinished"/>
+ <translation>Opcions de la creació de blocs:</translation>
</message>
<message>
<location line="+6"/>
<source>Connect only to the specified node(s)</source>
- <translation type="unfinished"/>
+ <translation>Connectar només al(s) node(s) especificats</translation>
</message>
<message>
<location line="+3"/>
+ <source>Corrupted block database detected</source>
+ <translation>S&apos;ha detectat una base de dades de blocs corrupta</translation>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Discover own IP address (default: 1 when listening and no -externalip)</source>
- <translation type="unfinished"/>
+ <translation>Descobrir la pròpia adreça IP (per defecte: 1 quan escoltant i no -externalip)</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Do you want to rebuild the block database now?</source>
+ <translation>Vols reconstruir la base de dades de blocs ara?</translation>
</message>
<message>
<location line="+3"/>
+ <source>Error initializing block database</source>
+ <translation>Error carregant la base de dades de blocs</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Error initializing wallet database environment %s!</source>
+ <translation>Error inicialitzant l&apos;entorn de la base de dades del moneder %s!</translation>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Error loading block database</source>
- <translation type="unfinished"/>
+ <translation>Error carregant la base de dades del bloc</translation>
</message>
<message>
- <location line="+5"/>
+ <location line="+4"/>
+ <source>Error opening block database</source>
+ <translation>Error obrint la base de dades de blocs</translation>
+ </message>
+ <message>
+ <location line="+2"/>
<source>Error: Disk space is low!</source>
- <translation type="unfinished"/>
+ <translation>Error: Espai al disc baix!</translation>
</message>
<message>
<location line="+1"/>
<source>Error: Transaction creation failed!</source>
- <translation type="unfinished"/>
+ <translation>Error: La ceació de la transacció ha fallat!</translation>
</message>
<message>
<location line="+1"/>
<source>Error: Wallet locked, unable to create transaction!</source>
- <translation type="unfinished"/>
+ <translation>Error: El moneder està blocat, no és possible crear la transacció!</translation>
</message>
<message>
<location line="+2"/>
+ <source>Error: system error: </source>
+ <translation>Error: error de sistema:</translation>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Failed to listen on any port. Use -listen=0 if you want this.</source>
- <translation type="unfinished"/>
+ <translation>Error al escoltar a qualsevol port. Utilitza -listen=0 si vols això.</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Failed to read block info</source>
+ <translation>Ha fallat la lectura de la informació del bloc</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Failed to read block</source>
+ <translation>Ha fallat la lectura del bloc</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Failed to sync block index</source>
+ <translation>Ha fallat la sincronització de l&apos;índex de bloc</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Failed to write block index</source>
+ <translation>Ha fallat la escriptura de l&apos;índex de blocs</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Failed to write block info</source>
+ <translation>Ha fallat la escriptura de la informació de bloc</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Failed to write block</source>
+ <translation>Ha fallat l&apos;escriptura del bloc</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Failed to write file info</source>
+ <translation>Ha fallat l&apos;escriptura de l&apos;arxiu info</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Failed to write to coin database</source>
+ <translation>Ha fallat l&apos;escriptura de la basse de dades de monedes</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Failed to write transaction index</source>
+ <translation>Ha fallat l&apos;escriptura de l&apos;índex de transaccions</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Failed to write undo data</source>
+ <translation>Ha fallat el desfer de dades</translation>
</message>
<message>
<location line="+2"/>
<source>Find peers using DNS lookup (default: 1 unless -connect)</source>
- <translation type="unfinished"/>
+ <translation>Cerca punts de connexió usant rastreig de DNS (per defecte: 1 tret d&apos;usar -connect)</translation>
</message>
<message>
- <location line="+5"/>
- <source>How thorough the block verification is (0-4, default: 3)</source>
- <translation type="unfinished"/>
+ <location line="+3"/>
+ <source>How many blocks to check at startup (default: 288, 0 = all)</source>
+ <translation>Quants blocs s&apos;han de confirmar a l&apos;inici (per defecte: 288, 0 = tots)</translation>
</message>
<message>
<location line="+1"/>
- <source>Importing blocks from block database...</source>
- <translation type="unfinished"/>
+ <source>How thorough the block verification is (0-4, default: 3)</source>
+ <translation>Com verificar el bloc (0-4, per defecte 3)</translation>
+ </message>
+ <message>
+ <location line="+24"/>
+ <source>Rebuild block chain index from current blk000??.dat files</source>
+ <translation>Reconstruir l&apos;índex de la cadena de blocs dels arxius actuals blk000??.dat</translation>
+ </message>
+ <message>
+ <location line="+37"/>
+ <source>Verifying blocks...</source>
+ <translation>Verificant blocs...</translation>
</message>
<message>
<location line="+1"/>
+ <source>Verifying wallet...</source>
+ <translation>Verificant moneder...</translation>
+ </message>
+ <message>
+ <location line="-61"/>
<source>Imports blocks from external blk000??.dat file</source>
- <translation type="unfinished"/>
+ <translation>Importa blocs de un fitxer blk000??.dat extern</translation>
</message>
<message>
<location line="+1"/>
<source>Information</source>
- <translation type="unfinished"/>
+ <translation>&amp;Informació</translation>
</message>
<message>
<location line="+3"/>
<source>Invalid -tor address: &apos;%s&apos;</source>
- <translation type="unfinished"/>
+ <translation>Adreça -tor invàlida: &apos;%s&apos;</translation>
</message>
<message>
- <location line="+9"/>
+ <location line="+8"/>
+ <source>Maintain a full transaction index (default: 0)</source>
+ <translation>Mantenir tot l&apos;índex de transaccions (per defecte: 0)</translation>
+ </message>
+ <message>
+ <location line="+2"/>
<source>Maximum per-connection receive buffer, &lt;n&gt;*1000 bytes (default: 5000)</source>
- <translation type="unfinished"/>
+ <translation>Mida màxima del buffer de recepció per a cada connexió, &lt;n&gt;*1000 bytes (default: 5000)</translation>
</message>
<message>
<location line="+1"/>
<source>Maximum per-connection send buffer, &lt;n&gt;*1000 bytes (default: 1000)</source>
- <translation type="unfinished"/>
+ <translation>Mida màxima del buffer d&apos;enviament per a cada connexió, &lt;n&gt;*1000 bytes (default: 5000)</translation>
</message>
<message>
<location line="+1"/>
<source>Only accept block chain matching built-in checkpoints (default: 1)</source>
- <translation type="unfinished"/>
+ <translation>Tan sols acceptar cadenes de blocs que coincideixin amb els punts de prova (per defecte: 1)</translation>
</message>
<message>
<location line="+1"/>
<source>Only connect to nodes in network &lt;net&gt; (IPv4, IPv6 or Tor)</source>
- <translation type="unfinished"/>
+ <translation>Només connectar als nodes de la xarxa &lt;net&gt; (IPv4, IPv6 o Tor)</translation>
</message>
<message>
<location line="+2"/>
<source>Output extra debugging information. Implies all other -debug* options</source>
- <translation type="unfinished"/>
+ <translation>Sortida de la informació extra de debugging. Implica totes les demés opcions -debug*</translation>
</message>
<message>
<location line="+1"/>
<source>Output extra network debugging information</source>
- <translation type="unfinished"/>
+ <translation>Sortida de la informació extra de debugging de xarxa.</translation>
</message>
<message>
<location line="+2"/>
<source>Prepend debug output with timestamp</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+1"/>
- <source>Rebuild blockchain index from current blk000??.dat files</source>
- <translation type="unfinished"/>
+ <translation>Anteposar estampa temporal a les dades de debug</translation>
</message>
<message>
- <location line="+4"/>
+ <location line="+5"/>
<source>SSL options: (see the Bitcoin Wiki for SSL setup instructions)</source>
- <translation type="unfinished"/>
+ <translation>Opcions SSL: (veure la Wiki de Bitcoin per a instruccions de configuració SSL)</translation>
</message>
<message>
<location line="+1"/>
<source>Select the version of socks proxy to use (4-5, default: 5)</source>
- <translation type="unfinished"/>
+ <translation>Selecciona la versió de socks proxy a utilitzar (4-5, per defecte: 5)</translation>
</message>
<message>
<location line="+3"/>
<source>Send trace/debug info to console instead of debug.log file</source>
- <translation type="unfinished"/>
+ <translation>Enviar informació de traça/debug a la consola en comptes del arxiu debug.log</translation>
</message>
<message>
<location line="+1"/>
<source>Send trace/debug info to debugger</source>
- <translation type="unfinished"/>
+ <translation>Enviar informació de traça/debug a un debugger</translation>
</message>
<message>
<location line="+5"/>
<source>Set maximum block size in bytes (default: 250000)</source>
- <translation type="unfinished"/>
+ <translation>Establir una mida màxima de bloc en bytes (per defecte: 250000)</translation>
</message>
<message>
<location line="+1"/>
<source>Set minimum block size in bytes (default: 0)</source>
- <translation type="unfinished"/>
+ <translation>Establir una mida mínima de bloc en bytes (per defecte: 0)</translation>
</message>
<message>
<location line="+1"/>
<source>Shrink debug.log file on client startup (default: 1 when no -debug)</source>
- <translation type="unfinished"/>
+ <translation>Reduir l&apos;arxiu debug.log al iniciar el client (per defecte 1 quan no -debug)</translation>
</message>
<message>
<location line="+2"/>
<source>Specify connection timeout in milliseconds (default: 5000)</source>
- <translation type="unfinished"/>
+ <translation>Especificar el temps limit per a un intent de connexió en milisegons (per defecte: 5000)</translation>
</message>
<message>
- <location line="+13"/>
+ <location line="+4"/>
+ <source>System error: </source>
+ <translation>Error de sistema:</translation>
+ </message>
+ <message>
+ <location line="+10"/>
<source>Use UPnP to map the listening port (default: 0)</source>
- <translation type="unfinished"/>
+ <translation>Utilitza UPnP per a mapejar els ports d&apos;escolta (per defecte: 0)</translation>
</message>
<message>
<location line="+1"/>
<source>Use UPnP to map the listening port (default: 1 when listening)</source>
- <translation type="unfinished"/>
+ <translation>Utilitza UPnP per a mapejar els ports d&apos;escolta (per defecte: 1 quan s&apos;escolta)</translation>
</message>
<message>
<location line="+1"/>
<source>Use proxy to reach tor hidden services (default: same as -proxy)</source>
- <translation type="unfinished"/>
+ <translation>Utilitzar proxy per arribar als serveis tor amagats (per defecte: el mateix que -proxy)</translation>
</message>
<message>
<location line="+2"/>
<source>Username for JSON-RPC connections</source>
- <translation type="unfinished"/>
+ <translation>Nom d&apos;usuari per a connexions JSON-RPC</translation>
</message>
<message>
<location line="+4"/>
<source>Warning</source>
- <translation type="unfinished"/>
+ <translation>Avís</translation>
</message>
<message>
<location line="+1"/>
<source>Warning: This version is obsolete, upgrade required!</source>
- <translation type="unfinished"/>
+ <translation>Advertència: Aquetsa versió està obsoleta, és necessari actualitzar!</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>You need to rebuild the databases using -reindex to change -txindex</source>
+ <translation>Necessiteu reconstruir les bases de dades usant -reindex per canviar -txindex</translation>
</message>
<message>
<location line="+1"/>
<source>wallet.dat corrupt, salvage failed</source>
- <translation type="unfinished"/>
+ <translation>L&apos;arxiu wallet.data és corrupte, el rescat de les dades ha fallat</translation>
</message>
<message>
- <location line="-43"/>
+ <location line="-45"/>
<source>Password for JSON-RPC connections</source>
- <translation type="unfinished"/>
+ <translation>Contrasenya per a connexions JSON-RPC</translation>
</message>
<message>
- <location line="-53"/>
+ <location line="-68"/>
<source>Allow JSON-RPC connections from specified IP address</source>
- <translation type="unfinished"/>
+ <translation>Permetre connexions JSON-RPC d&apos;adreces IP específiques</translation>
</message>
<message>
- <location line="+62"/>
+ <location line="+77"/>
<source>Send commands to node running on &lt;ip&gt; (default: 127.0.0.1)</source>
- <translation type="unfinished"/>
+ <translation>Enviar ordre al node en execució a &lt;ip&gt; (per defecte: 127.0.0.1)</translation>
</message>
<message>
- <location line="-103"/>
+ <location line="-120"/>
<source>Execute command when the best block changes (%s in cmd is replaced by block hash)</source>
- <translation type="unfinished"/>
+ <translation>Executar orde quan el millor bloc canviï (%s al cmd es reemplaça per un bloc de hash)</translation>
</message>
<message>
- <location line="+124"/>
+ <location line="+142"/>
<source>Upgrade wallet to latest format</source>
- <translation type="unfinished"/>
+ <translation>Actualitzar moneder a l&apos;últim format</translation>
</message>
<message>
- <location line="-15"/>
+ <location line="-16"/>
<source>Set key pool size to &lt;n&gt; (default: 100)</source>
- <translation type="unfinished"/>
+ <translation>Establir límit de nombre de claus a &lt;n&gt; (per defecte: 100)</translation>
</message>
<message>
<location line="-12"/>
<source>Rescan the block chain for missing wallet transactions</source>
- <translation type="unfinished"/>
+ <translation>Re-escanejar cadena de blocs en cerca de transaccions de moneder perdudes</translation>
</message>
<message>
- <location line="-26"/>
- <source>How many blocks to check at startup (default: 2500, 0 = all)</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+55"/>
+ <location line="+30"/>
<source>Use OpenSSL (https) for JSON-RPC connections</source>
- <translation type="unfinished"/>
+ <translation>Utilitzar OpenSSL (https) per a connexions JSON-RPC</translation>
</message>
<message>
- <location line="-20"/>
+ <location line="-21"/>
<source>Server certificate file (default: server.cert)</source>
- <translation type="unfinished"/>
+ <translation>Arxiu del certificat de servidor (per defecte: server.cert)</translation>
</message>
<message>
<location line="+1"/>
<source>Server private key (default: server.pem)</source>
- <translation type="unfinished"/>
+ <translation>Clau privada del servidor (per defecte: server.pem)</translation>
</message>
<message>
- <location line="-133"/>
+ <location line="-154"/>
<source>Acceptable ciphers (default: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH)</source>
- <translation type="unfinished"/>
+ <translation>Xifrats acceptats (per defecte: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH)</translation>
</message>
<message>
- <location line="+144"/>
+ <location line="+166"/>
<source>This help message</source>
- <translation type="unfinished"/>
+ <translation>Aquest misatge d&apos;ajuda</translation>
</message>
<message>
<location line="+3"/>
<source>Unable to bind to %s on this computer (bind returned error %d, %s)</source>
- <translation type="unfinished"/>
+ <translation>Impossible d&apos;unir %s a aquest ordinador (s&apos;ha retornat l&apos;error %d, %s)</translation>
</message>
<message>
- <location line="-70"/>
+ <location line="-86"/>
<source>Connect through socks proxy</source>
- <translation type="unfinished"/>
+ <translation>Connectar a través de socks proxy</translation>
</message>
<message>
<location line="-11"/>
<source>Allow DNS lookups for -addnode, -seednode and -connect</source>
- <translation type="unfinished"/>
+ <translation>Permetre consultes DNS per a -addnode, -seednode i -connect</translation>
</message>
<message>
- <location line="+43"/>
+ <location line="+57"/>
<source>Loading addresses...</source>
- <translation type="unfinished"/>
+ <translation>Carregant adreces...</translation>
</message>
<message>
- <location line="-25"/>
+ <location line="-35"/>
<source>Error loading wallet.dat: Wallet corrupted</source>
- <translation type="unfinished"/>
+ <translation>Error carregant wallet.dat: Moneder corrupte</translation>
</message>
<message>
<location line="+1"/>
<source>Error loading wallet.dat: Wallet requires newer version of Bitcoin</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+73"/>
- <source>Verifying block database integrity...</source>
- <translation type="unfinished"/>
+ <translation>Error carregant wallet.dat: El moneder requereix una versió de Bitcoin més moderna</translation>
</message>
<message>
- <location line="+1"/>
- <source>Verifying wallet integrity...</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+1"/>
+ <location line="+87"/>
<source>Wallet needed to be rewritten: restart Bitcoin to complete</source>
- <translation type="unfinished"/>
+ <translation>El moneder necesita ser re-escrit: re-inicia Bitcoin per a completar la tasca</translation>
</message>
<message>
- <location line="-77"/>
+ <location line="-89"/>
<source>Error loading wallet.dat</source>
- <translation type="unfinished"/>
+ <translation>Error carregant wallet.dat</translation>
</message>
<message>
- <location line="+20"/>
+ <location line="+30"/>
<source>Invalid -proxy address: &apos;%s&apos;</source>
- <translation type="unfinished"/>
+ <translation>Adreça -proxy invalida: &apos;%s&apos;</translation>
</message>
<message>
- <location line="+46"/>
+ <location line="+48"/>
<source>Unknown network specified in -onlynet: &apos;%s&apos;</source>
- <translation type="unfinished"/>
+ <translation>Xarxa desconeguda especificada a -onlynet: &apos;%s&apos;</translation>
</message>
<message>
<location line="-1"/>
<source>Unknown -socks proxy version requested: %i</source>
- <translation type="unfinished"/>
+ <translation>S&apos;ha demanat una versió desconeguda de -socks proxy: %i</translation>
</message>
<message>
- <location line="-75"/>
+ <location line="-91"/>
<source>Cannot resolve -bind address: &apos;%s&apos;</source>
- <translation type="unfinished"/>
+ <translation>No es pot resoldre l&apos;adreça -bind: &apos;%s&apos;</translation>
</message>
<message>
<location line="+1"/>
<source>Cannot resolve -externalip address: &apos;%s&apos;</source>
- <translation type="unfinished"/>
+ <translation>No es pot resoldre l&apos;adreça -externalip: &apos;%s&apos;</translation>
</message>
<message>
- <location line="+31"/>
+ <location line="+45"/>
<source>Invalid amount for -paytxfee=&lt;amount&gt;: &apos;%s&apos;</source>
- <translation type="unfinished"/>
+ <translation>Quantitat invalida per a -paytxfee=&lt;amount&gt;: &apos;%s&apos;</translation>
</message>
<message>
- <location line="-15"/>
+ <location line="-24"/>
<source>Error: could not start node</source>
- <translation type="unfinished"/>
+ <translation>Error: no s&apos;ha pogut inicialitzar el node</translation>
</message>
<message>
- <location line="+16"/>
+ <location line="+25"/>
<source>Invalid amount</source>
- <translation type="unfinished"/>
+ <translation>Quanitat invalida</translation>
</message>
<message>
<location line="-4"/>
<source>Insufficient funds</source>
- <translation type="unfinished"/>
+ <translation>Balanç insuficient</translation>
</message>
<message>
<location line="+8"/>
<source>Loading block index...</source>
- <translation type="unfinished"/>
+ <translation>Carregant índex de blocs...</translation>
</message>
<message>
- <location line="-45"/>
+ <location line="-59"/>
<source>Add a node to connect to and attempt to keep the connection open</source>
- <translation type="unfinished"/>
+ <translation>Afegir un node per a connectar&apos;s-hi i intentar mantenir la connexió oberta</translation>
</message>
<message>
<location line="-25"/>
<source>Unable to bind to %s on this computer. Bitcoin is probably already running.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+54"/>
- <source>Find peers using internet relay chat (default: 0)</source>
- <translation type="unfinished"/>
+ <translation>Impossible d&apos;unir %s en aquest ordinador. Probablement Bitcoin ja estigui en execució.</translation>
</message>
<message>
- <location line="-2"/>
+ <location line="+68"/>
<source>Fee per KB to add to transactions you send</source>
- <translation type="unfinished"/>
+ <translation>Comisió a afegir per cada KB de transaccions que enviïs</translation>
</message>
<message>
- <location line="+19"/>
+ <location line="+17"/>
<source>Loading wallet...</source>
- <translation type="unfinished"/>
+ <translation>Carregant moneder...</translation>
</message>
<message>
- <location line="-40"/>
+ <location line="-54"/>
<source>Cannot downgrade wallet</source>
- <translation type="unfinished"/>
+ <translation>No es pot reduir la versió del moneder</translation>
</message>
<message>
<location line="+1"/>
<source>Cannot initialize keypool</source>
- <translation type="unfinished"/>
+ <translation>No es pot inicialitzar el conjunt de claus</translation>
</message>
<message>
<location line="+3"/>
<source>Cannot write default address</source>
- <translation type="unfinished"/>
+ <translation>No es pot escriure l&apos;adreça per defecte</translation>
</message>
<message>
- <location line="+49"/>
+ <location line="+64"/>
<source>Rescanning...</source>
- <translation type="unfinished"/>
+ <translation>Re-escanejant...</translation>
</message>
<message>
- <location line="-43"/>
+ <location line="-56"/>
<source>Done loading</source>
- <translation type="unfinished"/>
+ <translation>Càrrega acabada</translation>
</message>
<message>
- <location line="+65"/>
+ <location line="+79"/>
<source>To use the %s option</source>
- <translation type="unfinished"/>
+ <translation>Utilitza la opció %s</translation>
</message>
<message>
- <location line="-60"/>
+ <location line="-71"/>
<source>Error</source>
- <translation type="unfinished"/>
+ <translation>Error</translation>
</message>
<message>
- <location line="-28"/>
+ <location line="-33"/>
<source>You must set rpcpassword=&lt;password&gt; in the configuration file:
%s
If the file does not exist, create it with owner-readable-only file permissions.</source>
- <translation type="unfinished"/>
+ <translation>Has de configurar el rpcpassword=&lt;password&gt; a l&apos;arxiu de configuració:\n %s\n Si l&apos;arxiu no existeix, crea&apos;l amb els permís owner-readable-only.</translation>
</message>
</context>
</TS> \ No newline at end of file
diff --git a/src/qt/locale/bitcoin_cs.ts b/src/qt/locale/bitcoin_cs.ts
index c4c6c7289a..60f1565a69 100644
--- a/src/qt/locale/bitcoin_cs.ts
+++ b/src/qt/locale/bitcoin_cs.ts
@@ -13,12 +13,7 @@
<translation>&lt;b&gt;Bitcoin&lt;/b&gt; verze</translation>
</message>
<message>
- <location line="+41"/>
- <source>Copyright © 2009-2012 The Bitcoin developers</source>
- <translation>Copyright © 2009-2012 Vývojáři Bitcoinu</translation>
- </message>
- <message>
- <location line="+13"/>
+ <location line="+57"/>
<source>
This is experimental software.
@@ -32,6 +27,16 @@ Tohle je experimentální program.
Tento produkt zahrnuje programy vyvinuté OpenSSL Projektem pro použití v OpenSSL Toolkitu (http://www.openssl.org/) a kryptografický program od Erika Younga (eay@cryptsoft.com) a program UPnP od Thomase Bernarda.</translation>
</message>
+ <message>
+ <location filename="../aboutdialog.cpp" line="+17"/>
+ <source>Copyright</source>
+ <translation>Copyright</translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>2009-%1 The Bitcoin developers</source>
+ <translation>2009-%1 Vývojáři Bitcoinu</translation>
+ </message>
</context>
<context>
<name>AddressBookPage</name>
@@ -63,7 +68,7 @@ Tento produkt zahrnuje programy vyvinuté OpenSSL Projektem pro použití v Open
<message>
<location line="-46"/>
<source>These are your Bitcoin addresses for receiving payments. You may want to give a different one to each sender so you can keep track of who is paying you.</source>
- <translation>Tohle jsou tvé Bitcoinové adresy pro příjem plateb. Můžeš pokaždé dát každému odesílateli jinou adresu, abys věděl, kdo ti kdy kolik platil.</translation>
+ <translation>Tohle jsou tvé Bitcoinové adresy pro příjem plateb. Můžeš dát pokaždé každému plátci novou adresu, abys věděl, kdo ti kdy kolik platil.</translation>
</message>
<message>
<location line="+60"/>
@@ -106,17 +111,22 @@ Tento produkt zahrnuje programy vyvinuté OpenSSL Projektem pro použití v Open
<translation>S&amp;maž</translation>
</message>
<message>
- <location filename="../addressbookpage.cpp" line="+65"/>
+ <location filename="../addressbookpage.cpp" line="+66"/>
<source>Copy &amp;Label</source>
<translation>Kopíruj &amp;oznaÄení</translation>
</message>
<message>
- <location line="+2"/>
+ <location line="+1"/>
<source>&amp;Edit</source>
<translation>&amp;Uprav</translation>
</message>
<message>
- <location line="+250"/>
+ <location line="+1"/>
+ <source>Send &amp;Coins</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+263"/>
<source>Export Address Book Data</source>
<translation>Exportuj data adresáře</translation>
</message>
@@ -139,7 +149,7 @@ Tento produkt zahrnuje programy vyvinuté OpenSSL Projektem pro použití v Open
<context>
<name>AddressTableModel</name>
<message>
- <location filename="../addresstablemodel.cpp" line="+142"/>
+ <location filename="../addresstablemodel.cpp" line="+144"/>
<source>Label</source>
<translation>OznaÄení</translation>
</message>
@@ -298,17 +308,17 @@ Tento produkt zahrnuje programy vyvinuté OpenSSL Projektem pro použití v Open
<context>
<name>BitcoinGUI</name>
<message>
- <location filename="../bitcoingui.cpp" line="+267"/>
+ <location filename="../bitcoingui.cpp" line="+231"/>
<source>Sign &amp;message...</source>
<translation>Po&amp;depiš zprávu...</translation>
</message>
<message>
- <location line="+254"/>
+ <location line="+299"/>
<source>Synchronizing with network...</source>
- <translation>Synchronizuji se sítí...</translation>
+ <translation>Synchronizuji se se sítí...</translation>
</message>
<message>
- <location line="-322"/>
+ <location line="-367"/>
<source>&amp;Overview</source>
<translation>&amp;Přehled</translation>
</message>
@@ -325,42 +335,27 @@ Tento produkt zahrnuje programy vyvinuté OpenSSL Projektem pro použití v Open
<message>
<location line="+1"/>
<source>Browse transaction history</source>
- <translation>Procházet historii transakcí</translation>
+ <translation>Procházej historii transakcí</translation>
</message>
<message>
- <location line="+6"/>
- <source>&amp;Address Book</source>
- <translation>&amp;Adresář</translation>
- </message>
- <message>
- <location line="+1"/>
+ <location line="+7"/>
<source>Edit the list of stored addresses and labels</source>
<translation>Uprav seznam uložených adres a jejich oznaÄení</translation>
</message>
<message>
- <location line="-15"/>
- <source>&amp;Receive coins</source>
- <translation>Pří&amp;jem mincí</translation>
- </message>
- <message>
- <location line="+1"/>
+ <location line="-14"/>
<source>Show the list of addresses for receiving payments</source>
<translation>Zobraz seznam adres pro příjem plateb</translation>
</message>
<message>
- <location line="-8"/>
- <source>&amp;Send coins</source>
- <translation>P&amp;oslání mincí</translation>
- </message>
- <message>
- <location line="+39"/>
+ <location line="+31"/>
<source>E&amp;xit</source>
<translation>&amp;Konec</translation>
</message>
<message>
<location line="+1"/>
<source>Quit application</source>
- <translation>UkonÄit aplikaci</translation>
+ <translation>UkonÄi aplikaci</translation>
</message>
<message>
<location line="+4"/>
@@ -398,7 +393,7 @@ Tento produkt zahrnuje programy vyvinuté OpenSSL Projektem pro použití v Open
<translation>Změň &amp;heslo...</translation>
</message>
<message>
- <location line="+259"/>
+ <location line="+304"/>
<source>Importing blocks from disk...</source>
<translation>Importuji bloky z disku...</translation>
</message>
@@ -407,13 +402,8 @@ Tento produkt zahrnuje programy vyvinuté OpenSSL Projektem pro použití v Open
<source>Reindexing blocks on disk...</source>
<translation>Vytvářím nový index bloků na disku...</translation>
</message>
- <message numerus="yes">
- <location line="+10"/>
- <source>~%n block(s) remaining</source>
- <translation><numerusform>zbývá ~%n blok</numerusform><numerusform>zbývá ~%n bloky</numerusform><numerusform>zbývá ~%n bloků</numerusform></translation>
- </message>
<message>
- <location line="-265"/>
+ <location line="-300"/>
<source>&amp;Export...</source>
<translation>&amp;Export...</translation>
</message>
@@ -430,7 +420,7 @@ Tento produkt zahrnuje programy vyvinuté OpenSSL Projektem pro použití v Open
<message>
<location line="+17"/>
<source>Export the data in the current tab to a file</source>
- <translation>Exportovat data z tohoto panelu do souboru</translation>
+ <translation>Exportuj data z tohoto panelu do souboru</translation>
</message>
<message>
<location line="-9"/>
@@ -458,18 +448,33 @@ Tento produkt zahrnuje programy vyvinuté OpenSSL Projektem pro použití v Open
<translation>&amp;Ověř zprávu...</translation>
</message>
<message>
- <location line="-196"/>
- <location line="+538"/>
+ <location line="-162"/>
+ <location line="+540"/>
<source>Bitcoin</source>
<translation>Bitcoin</translation>
</message>
<message>
- <location line="-538"/>
+ <location line="-540"/>
<source>Wallet</source>
<translation>Peněženka</translation>
</message>
<message>
- <location line="+176"/>
+ <location line="+99"/>
+ <source>&amp;Send</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+7"/>
+ <source>&amp;Receive</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+14"/>
+ <source>&amp;Addresses</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+22"/>
<source>&amp;About Bitcoin</source>
<translation>O &amp;Bitcoinu</translation>
</message>
@@ -530,27 +535,57 @@ Tento produkt zahrnuje programy vyvinuté OpenSSL Projektem pro použití v Open
<translation>[testnet]</translation>
</message>
<message>
- <location line="+63"/>
+ <location line="+47"/>
<source>Bitcoin client</source>
<translation>Bitcoin klient</translation>
</message>
<message numerus="yes">
- <location line="+79"/>
+ <location line="+140"/>
<source>%n active connection(s) to Bitcoin network</source>
<translation><numerusform>%n aktivní spojení do Bitcoinové sítě</numerusform><numerusform>%n aktivní spojení do Bitcoinové sítě</numerusform><numerusform>%n aktivních spojení do Bitcoinové sítě</numerusform></translation>
</message>
<message>
- <location line="+45"/>
- <source>Processed %1 of %2 blocks of transaction history (%3% done).</source>
- <translation>Zpracováno %1 z %2 bloků transakÄní historie (%3 % hotovo).</translation>
+ <location line="+39"/>
+ <source>Processed %1 of %2 (estimated) blocks of transaction history.</source>
+ <translation>Zpracováno %1 z pÅ™ibližnÄ› %2 bloků transakÄní historie.</translation>
</message>
<message>
- <location line="+7"/>
+ <location line="+4"/>
<source>Processed %1 blocks of transaction history.</source>
<translation>Zpracováno %1 bloků transakÄní historie.</translation>
</message>
+ <message numerus="yes">
+ <location line="+20"/>
+ <source>%n hour(s)</source>
+ <translation><numerusform>před hodinou</numerusform><numerusform>před %n hodinami</numerusform><numerusform>před %n hodinami</numerusform></translation>
+ </message>
+ <message numerus="yes">
+ <location line="+4"/>
+ <source>%n day(s)</source>
+ <translation><numerusform>vÄera</numerusform><numerusform>pÅ™ed %n dny</numerusform><numerusform>pÅ™ed %n dny</numerusform></translation>
+ </message>
+ <message numerus="yes">
+ <location line="+4"/>
+ <source>%n week(s)</source>
+ <translation><numerusform>minulý týden</numerusform><numerusform>před %n týdny</numerusform><numerusform>před %n týdny</numerusform></translation>
+ </message>
<message>
- <location line="+70"/>
+ <location line="+5"/>
+ <source>%1 behind</source>
+ <translation>Schází %1</translation>
+ </message>
+ <message>
+ <location line="+14"/>
+ <source>Last received block was generated %1 ago.</source>
+ <translation>Poslední stažený blok byl vygenerován %1.</translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Transactions after this will not yet be visible.</source>
+ <translation>Následné transakce ještě nebudou vidět.</translation>
+ </message>
+ <message>
+ <location line="+21"/>
<source>Error</source>
<translation>Chyba</translation>
</message>
@@ -565,62 +600,27 @@ Tento produkt zahrnuje programy vyvinuté OpenSSL Projektem pro použití v Open
<translation>Informace</translation>
</message>
<message>
- <location line="+66"/>
+ <location line="+68"/>
<source>This transaction is over the size limit. You can still send it for a fee of %1, which goes to the nodes that process your transaction and helps to support the network. Do you want to pay the fee?</source>
<translation>Tahle transakce přesahuje velikostní limit. I tak ji ale můžeš poslat, pokud za ni zaplatíš poplatek %1, který půjde uzlům, které tvou transakci zpracují, a navíc tak podpoříš síť. Chceš zaplatit poplatek?</translation>
</message>
<message>
- <location line="+210"/>
- <source>Backup Successful</source>
- <translation>Úspěšně zazálohováno</translation>
- </message>
- <message>
- <location line="+0"/>
- <source>The wallet data was successfully saved to the new location.</source>
- <translation>Data z peněženky byly v pořádku uloženy na nové místo.</translation>
- </message>
- <message numerus="yes">
- <location line="-338"/>
- <source>%n second(s) ago</source>
- <translation><numerusform>před vteřinou</numerusform><numerusform>před %n vteřinami</numerusform><numerusform>před %n vteřinami</numerusform></translation>
- </message>
- <message numerus="yes">
- <location line="+4"/>
- <source>%n minute(s) ago</source>
- <translation><numerusform>před minutou</numerusform><numerusform>před %n minutami</numerusform><numerusform>před %n minutami</numerusform></translation>
- </message>
- <message numerus="yes">
- <location line="+4"/>
- <source>%n hour(s) ago</source>
- <translation><numerusform>před hodinou</numerusform><numerusform>před %n hodinami</numerusform><numerusform>před %n hodinami</numerusform></translation>
- </message>
- <message numerus="yes">
- <location line="+4"/>
- <source>%n day(s) ago</source>
- <translation><numerusform>vÄera</numerusform><numerusform>pÅ™ed %n dny</numerusform><numerusform>pÅ™ed %n dny</numerusform></translation>
- </message>
- <message>
- <location line="+6"/>
+ <location line="-138"/>
<source>Up to date</source>
<translation>Aktuální</translation>
</message>
<message>
- <location line="+7"/>
+ <location line="+32"/>
<source>Catching up...</source>
<translation>Stahuji...</translation>
</message>
<message>
- <location line="+10"/>
- <source>Last received block was generated %1.</source>
- <translation>Poslední stažený blok byl vygenerován %1.</translation>
- </message>
- <message>
- <location line="+97"/>
+ <location line="+110"/>
<source>Confirm transaction fee</source>
<translation>PotvrÄ transakÄní poplatek</translation>
</message>
<message>
- <location line="+23"/>
+ <location line="+8"/>
<source>Sent transaction</source>
<translation>Odeslané transakce</translation>
</message>
@@ -643,14 +643,14 @@ Adresa: %4
</translation>
</message>
<message>
- <location line="+99"/>
- <location line="+28"/>
+ <location line="+33"/>
+ <location line="+23"/>
<source>URI handling</source>
<translation>Zpracování URI</translation>
</message>
<message>
- <location line="-28"/>
- <location line="+28"/>
+ <location line="-23"/>
+ <location line="+23"/>
<source>URI can not be parsed! This can be caused by an invalid Bitcoin address or malformed URI parameters.</source>
<translation>Nepodařilo se analyzovat URI! Důvodem může být neplatná Bitcoinová adresa nebo poškozené parametry URI.</translation>
</message>
@@ -665,27 +665,7 @@ Adresa: %4
<translation>Peněženka je &lt;b&gt;zaÅ¡ifrovaná&lt;/b&gt; a momentálnÄ› &lt;b&gt;zamÄená&lt;/b&gt;</translation>
</message>
<message>
- <location line="+23"/>
- <source>Backup Wallet</source>
- <translation>Záloha peněženky</translation>
- </message>
- <message>
- <location line="+0"/>
- <source>Wallet Data (*.dat)</source>
- <translation>Data peněženky (*.dat)</translation>
- </message>
- <message>
- <location line="+3"/>
- <source>Backup Failed</source>
- <translation>Zálohování selhalo</translation>
- </message>
- <message>
- <location line="+0"/>
- <source>There was an error trying to save the wallet data to the new location.</source>
- <translation>Při ukládání peněženky na nové místo se přihodila nějaká chyba.</translation>
- </message>
- <message>
- <location filename="../bitcoin.cpp" line="+109"/>
+ <location filename="../bitcoin.cpp" line="+108"/>
<source>A fatal error occurred. Bitcoin can no longer continue safely and will quit.</source>
<translation>Stala se fatální chyba. Bitcoin nemůže bezpeÄnÄ› pokraÄovat v Äinnosti, a proto skonÄí.</translation>
</message>
@@ -693,7 +673,7 @@ Adresa: %4
<context>
<name>ClientModel</name>
<message>
- <location filename="../clientmodel.cpp" line="+86"/>
+ <location filename="../clientmodel.cpp" line="+96"/>
<source>Network Alert</source>
<translation>Upozornění sítě</translation>
</message>
@@ -726,7 +706,7 @@ Adresa: %4
<translation>Adresa spojená s tímto záznamem v adresáři. Lze upravovat jen pro odesílací adresy.</translation>
</message>
<message>
- <location filename="../editaddressdialog.cpp" line="+20"/>
+ <location filename="../editaddressdialog.cpp" line="+21"/>
<source>New receiving address</source>
<translation>Nová přijímací adresa</translation>
</message>
@@ -746,17 +726,17 @@ Adresa: %4
<translation>Uprav odesílací adresu</translation>
</message>
<message>
- <location line="+60"/>
+ <location line="+76"/>
<source>The entered address &quot;%1&quot; is already in the address book.</source>
<translation>Zadaná adresa &quot;%1&quot; už v adresáři je.</translation>
</message>
<message>
- <location line="+5"/>
+ <location line="-5"/>
<source>The entered address &quot;%1&quot; is not a valid Bitcoin address.</source>
<translation>Zadaná adresa &quot;%1&quot; není platná Bitcoinová adresa.</translation>
</message>
<message>
- <location line="+5"/>
+ <location line="+10"/>
<source>Could not unlock wallet.</source>
<translation>Nemohu odemknout peněženku.</translation>
</message>
@@ -769,7 +749,7 @@ Adresa: %4
<context>
<name>GUIUtil::HelpMessageBox</name>
<message>
- <location filename="../guiutil.cpp" line="+419"/>
+ <location filename="../guiutil.cpp" line="+422"/>
<location line="+12"/>
<source>Bitcoin-Qt</source>
<translation>Bitcoin-Qt</translation>
@@ -802,12 +782,12 @@ Adresa: %4
<message>
<location line="+1"/>
<source>Start minimized</source>
- <translation>Startovat minimalizovanÄ›</translation>
+ <translation>Nastartovat minimalizovanÄ›</translation>
</message>
<message>
<location line="+1"/>
<source>Show splash screen on startup (default: 1)</source>
- <translation>Zobrazovat startovací obrazovku (výchozí: 1)</translation>
+ <translation>Zobrazit startovací obrazovku (výchozí: 1)</translation>
</message>
</context>
<context>
@@ -840,7 +820,7 @@ Adresa: %4
<message>
<location line="+3"/>
<source>&amp;Start Bitcoin on system login</source>
- <translation>&amp;Spustit Bitcoin po přihlášení do systému</translation>
+ <translation>S&amp;pustit Bitcoin po přihlášení do systému</translation>
</message>
<message>
<location line="+35"/>
@@ -890,7 +870,7 @@ Adresa: %4
<message>
<location line="+7"/>
<source>&amp;Port:</source>
- <translation>P&amp;ort:</translation>
+ <translation>Por&amp;t:</translation>
</message>
<message>
<location line="+19"/>
@@ -910,7 +890,7 @@ Adresa: %4
<message>
<location line="+36"/>
<source>&amp;Window</source>
- <translation>&amp;Okno</translation>
+ <translation>O&amp;kno</translation>
</message>
<message>
<location line="+6"/>
@@ -930,12 +910,12 @@ Adresa: %4
<message>
<location line="+3"/>
<source>M&amp;inimize on close</source>
- <translation>&amp;Zavřením minimalizovat</translation>
+ <translation>Za&amp;vřením minimalizovat</translation>
</message>
<message>
<location line="+21"/>
<source>&amp;Display</source>
- <translation>&amp;Zobrazení</translation>
+ <translation>Zobr&amp;azení</translation>
</message>
<message>
<location line="+8"/>
@@ -950,7 +930,7 @@ Adresa: %4
<message>
<location line="+11"/>
<source>&amp;Unit to show amounts in:</source>
- <translation>&amp;Jednotka pro Äástky: </translation>
+ <translation>J&amp;ednotka pro Äástky: </translation>
</message>
<message>
<location line="+13"/>
@@ -965,7 +945,7 @@ Adresa: %4
<message>
<location line="+3"/>
<source>&amp;Display addresses in transaction list</source>
- <translation>&amp;Ukazovat adresy ve výpisu transakcí</translation>
+ <translation>Ukazo&amp;vat adresy ve výpisu transakcí</translation>
</message>
<message>
<location line="+71"/>
@@ -983,7 +963,7 @@ Adresa: %4
<translation>&amp;Uložit</translation>
</message>
<message>
- <location filename="../optionsdialog.cpp" line="+55"/>
+ <location filename="../optionsdialog.cpp" line="+53"/>
<source>default</source>
<translation>výchozí</translation>
</message>
@@ -1028,23 +1008,18 @@ Adresa: %4
<translation>Formulář</translation>
</message>
<message>
- <location line="+51"/>
- <location line="+183"/>
+ <location line="+50"/>
+ <location line="+166"/>
<source>The displayed information may be out of date. Your wallet automatically synchronizes with the Bitcoin network after a connection is established, but this process has not completed yet.</source>
<translation>Zobrazené informace nemusí být aktuální. Tvá peněženka se automaticky sesynchronizuje s Bitcoinovou sítí, jakmile se s ní spojí. Zatím ale jeÅ¡tÄ› není synchronizace dokonÄena.</translation>
</message>
<message>
- <location line="-141"/>
+ <location line="-124"/>
<source>Balance:</source>
<translation>Stav úÄtu:</translation>
</message>
<message>
- <location line="+58"/>
- <source>Number of transactions:</source>
- <translation>PoÄet transakcí:</translation>
- </message>
- <message>
- <location line="-29"/>
+ <location line="+29"/>
<source>Unconfirmed:</source>
<translation>Nepotvrzeno:</translation>
</message>
@@ -1054,7 +1029,7 @@ Adresa: %4
<translation>Peněženka</translation>
</message>
<message>
- <location line="+124"/>
+ <location line="+107"/>
<source>Immature:</source>
<translation>Nedozráno:</translation>
</message>
@@ -1069,7 +1044,7 @@ Adresa: %4
<translation>&lt;b&gt;Poslední transakce&lt;/b&gt;</translation>
</message>
<message>
- <location line="-118"/>
+ <location line="-101"/>
<source>Your current balance</source>
<translation>Aktuální stav tvého úÄtu</translation>
</message>
@@ -1079,11 +1054,6 @@ Adresa: %4
<translation>Celkem z transakcí, které jeÅ¡tÄ› nejsou potvrzené a které se jeÅ¡tÄ› nezapoÄítávají do celkového stavu úÄtu</translation>
</message>
<message>
- <location line="+20"/>
- <source>Total number of transactions in wallet</source>
- <translation>Celkový poÄet transakcí v peněžence</translation>
- </message>
- <message>
<location filename="../overviewpage.cpp" line="+115"/>
<location line="+1"/>
<source>out of sync</source>
@@ -1091,6 +1061,14 @@ Adresa: %4
</message>
</context>
<context>
+ <name>PaymentServer</name>
+ <message>
+ <location filename="../paymentserver.cpp" line="+107"/>
+ <source>Cannot start bitcoin: click-to-pay handler</source>
+ <translation>Nemůžu spustit bitcoin: obsluha click-to-pay</translation>
+ </message>
+</context>
+<context>
<name>QRCodeDialog</name>
<message>
<location filename="../forms/qrcodedialog.ui" line="+14"/>
@@ -1287,7 +1265,7 @@ Adresa: %4
<message>
<location line="+1"/>
<source>Use up and down arrows to navigate history, and &lt;b&gt;Ctrl-L&lt;/b&gt; to clear screen.</source>
- <translation>V historii se pohybujeÅ¡ Å¡ipkami nahoru a dolů a pomocí &lt;b&gt;Ctrl-L&lt;/b&gt; vyÄistíš obrazovku.</translation>
+ <translation>V historii se pohybujeÅ¡ Å¡ipkami nahoru a dolů a pomocí &lt;b&gt;Ctrl-L&lt;/b&gt; Äistíš obrazovku.</translation>
</message>
<message>
<location line="+1"/>
@@ -1327,7 +1305,7 @@ Adresa: %4
<message>
<location line="+3"/>
<source>Clear &amp;All</source>
- <translation>Všechno &amp;smaž</translation>
+ <translation>Všechno s&amp;maž</translation>
</message>
<message>
<location line="+22"/>
@@ -1347,7 +1325,7 @@ Adresa: %4
<message>
<location line="+3"/>
<source>S&amp;end</source>
- <translation>&amp;Pošli</translation>
+ <translation>P&amp;ošli</translation>
</message>
<message>
<location filename="../sendcoinsdialog.cpp" line="-59"/>
@@ -1415,7 +1393,7 @@ Adresa: %4
<message>
<location line="+15"/>
<source>A&amp;mount:</source>
- <translation>Čá&amp;stka:</translation>
+ <translation>Čás&amp;tka:</translation>
</message>
<message>
<location line="+13"/>
@@ -1429,14 +1407,14 @@ Adresa: %4
</message>
<message>
<location line="+60"/>
- <location filename="../sendcoinsentry.cpp" line="+25"/>
+ <location filename="../sendcoinsentry.cpp" line="+26"/>
<source>Enter a label for this address to add it to your address book</source>
<translation>Zadej oznaÄení této adresy; obojí se ti pak uloží do adresáře</translation>
</message>
<message>
<location line="-78"/>
<source>&amp;Label:</source>
- <translation>&amp;OznaÄení:</translation>
+ <translation>O&amp;znaÄení:</translation>
</message>
<message>
<location line="+28"/>
@@ -1572,7 +1550,7 @@ Adresa: %4
<message>
<location line="+3"/>
<source>Verify &amp;Message</source>
- <translation>&amp;Ověř zprávu</translation>
+ <translation>O&amp;věř zprávu</translation>
</message>
<message>
<location line="+14"/>
@@ -1665,7 +1643,7 @@ Adresa: %4
<context>
<name>TransactionDesc</name>
<message>
- <location filename="../transactiondesc.cpp" line="+19"/>
+ <location filename="../transactiondesc.cpp" line="+20"/>
<source>Open until %1</source>
<translation>Otřevřeno dokud %1</translation>
</message>
@@ -1852,7 +1830,7 @@ Adresa: %4
<context>
<name>TransactionTableModel</name>
<message>
- <location filename="../transactiontablemodel.cpp" line="+226"/>
+ <location filename="../transactiontablemodel.cpp" line="+225"/>
<source>Date</source>
<translation>Datum</translation>
</message>
@@ -1970,7 +1948,7 @@ Adresa: %4
<context>
<name>TransactionView</name>
<message>
- <location filename="../transactionview.cpp" line="+55"/>
+ <location filename="../transactionview.cpp" line="+52"/>
<location line="+16"/>
<source>All</source>
<translation>VÅ¡e</translation>
@@ -2057,6 +2035,11 @@ Adresa: %4
</message>
<message>
<location line="+1"/>
+ <source>Copy transaction ID</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Edit label</source>
<translation>Uprav oznaÄení</translation>
</message>
@@ -2066,7 +2049,7 @@ Adresa: %4
<translation>Zobraz detaily transakce</translation>
</message>
<message>
- <location line="+142"/>
+ <location line="+139"/>
<source>Export Transaction Data</source>
<translation>Exportuj transakÄní data</translation>
</message>
@@ -2121,7 +2104,7 @@ Adresa: %4
<translation>Nemohu zapisovat do souboru %1.</translation>
</message>
<message>
- <location line="+95"/>
+ <location line="+100"/>
<source>Range:</source>
<translation>Rozsah:</translation>
</message>
@@ -2132,29 +2115,172 @@ Adresa: %4
</message>
</context>
<context>
+ <name>WalletView</name>
+ <message>
+ <location filename="../walletview.cpp" line="+95"/>
+ <source>&amp;Overview</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Show general overview of wallet</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>&amp;Send coins</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Send coins to a Bitcoin address</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>&amp;Receive coins</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Show the list of addresses for receiving payments</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>&amp;Transactions</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Browse transaction history</source>
+ <translation>Procházej historii transakcí</translation>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>&amp;Address Book</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Edit the list of stored addresses and labels</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+12"/>
+ <source>&amp;Encrypt Wallet...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Encrypt the private keys that belong to your wallet</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>&amp;Backup Wallet...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Backup wallet to another location</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>&amp;Change Passphrase...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Change the passphrase used for wallet encryption</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Sign &amp;message...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Sign messages with your Bitcoin addresses to prove you own them</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>&amp;Verify message...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Verify messages to ensure they were signed with specified Bitcoin addresses</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>&amp;Export...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Export the data in the current tab to a file</source>
+ <translation>Exportuj data z tohoto panelu do souboru</translation>
+ </message>
+ <message>
+ <location line="+180"/>
+ <source>Backup Wallet</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>Wallet Data (*.dat)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Backup Failed</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>There was an error trying to save the wallet data to the new location.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>Backup Successful</source>
+ <translation>Úspěšně zazálohováno</translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>The wallet data was successfully saved to the new location.</source>
+ <translation>Data z peněženky byly v pořádku uloženy na nové místo.</translation>
+ </message>
+</context>
+<context>
<name>bitcoin-core</name>
<message>
- <location filename="../bitcoinstrings.cpp" line="+88"/>
+ <location filename="../bitcoinstrings.cpp" line="+96"/>
<source>Bitcoin version</source>
<translation>Verze Bitcoinu</translation>
</message>
<message>
- <location line="+82"/>
+ <location line="+98"/>
<source>Usage:</source>
<translation>Užití:</translation>
</message>
<message>
- <location line="-23"/>
+ <location line="-24"/>
<source>Send command to -server or bitcoind</source>
<translation>Poslat příkaz pro -server nebo bitcoind</translation>
</message>
<message>
- <location line="-21"/>
+ <location line="-22"/>
<source>List commands</source>
<translation>Výpis příkazů</translation>
</message>
<message>
- <location line="-11"/>
+ <location line="-10"/>
<source>Get help for a command</source>
<translation>Získat nápovědu pro příkaz</translation>
</message>
@@ -2179,12 +2305,12 @@ Adresa: %4
<translation>Generovat mince</translation>
</message>
<message>
- <location line="-15"/>
+ <location line="-28"/>
<source>Don&apos;t generate coins</source>
<translation>Negenerovat mince</translation>
</message>
<message>
- <location line="+61"/>
+ <location line="+74"/>
<source>Specify data directory</source>
<translation>Adresář pro data</translation>
</message>
@@ -2194,88 +2320,82 @@ Adresa: %4
<translation>Nastavit velikost databázové vyrovnávací paměti v megabajtech (výchozí: 25)</translation>
</message>
<message>
- <location line="-26"/>
+ <location line="-27"/>
<source>Listen for connections on &lt;port&gt; (default: 8333 or testnet: 18333)</source>
<translation>Čekat na spojení na &lt;portu&gt; (výchozí: 8333 nebo testnet: 18333)</translation>
</message>
<message>
- <location line="+4"/>
+ <location line="+5"/>
<source>Maintain at most &lt;n&gt; connections to peers (default: 125)</source>
- <translation>Povol nejvýše &lt;n&gt; připojení k uzlům (výchozí: 125)</translation>
+ <translation>Povolit nejvýše &lt;n&gt; připojení k uzlům (výchozí: 125)</translation>
</message>
<message>
- <location line="-34"/>
+ <location line="-49"/>
<source>Connect to a node to retrieve peer addresses, and disconnect</source>
<translation>Připojit se k uzlu, získat adresy jeho protějšků a odpojit se</translation>
</message>
<message>
- <location line="+65"/>
+ <location line="+80"/>
<source>Specify your own public address</source>
<translation>Specifikuj svou veřejnou adresu</translation>
</message>
<message>
- <location line="+2"/>
+ <location line="+3"/>
<source>Threshold for disconnecting misbehaving peers (default: 100)</source>
- <translation>Práh pro odpojování nesprávně se chovajících uzlů (výchozí: 100)</translation>
+ <translation>Práh pro odpojování zlobivých uzlů (výchozí: 100)</translation>
</message>
<message>
- <location line="-114"/>
+ <location line="-132"/>
<source>Number of seconds to keep misbehaving peers from reconnecting (default: 86400)</source>
- <translation>Doba ve vteřinách, po kterou se nebudou moci nesprávně se chovající uzly znovu připojit (výchozí: 86400)</translation>
+ <translation>Doba ve vteřinách, po kterou se nebudou moci zlobivé uzly znovu připojit (výchozí: 86400)</translation>
</message>
<message>
- <location line="-28"/>
+ <location line="-32"/>
<source>An error occurred while setting up the RPC port %u for listening on IPv4: %s</source>
<translation>Při nastavování naslouchacího RPC portu %i pro IPv4 nastala chyba: %s</translation>
</message>
<message>
- <location line="+26"/>
+ <location line="+30"/>
<source>Listen for JSON-RPC connections on &lt;port&gt; (default: 8332 or testnet: 18332)</source>
<translation>Čekat na JSON RPC spojení na &lt;portu&gt; (výchozí: 8332 nebo testnet: 18332)</translation>
</message>
<message>
- <location line="+34"/>
+ <location line="+36"/>
<source>Accept command line and JSON-RPC commands</source>
<translation>Akceptovat příkazy z příkazové řádky a přes JSON-RPC</translation>
</message>
<message>
- <location line="+62"/>
+ <location line="+77"/>
<source>Run in the background as a daemon and accept commands</source>
<translation>Běžet na pozadí jako démon a akceptovat příkazy</translation>
</message>
<message>
- <location line="+31"/>
+ <location line="+32"/>
<source>Use the test network</source>
<translation>Použít testovací síť (testnet)</translation>
</message>
<message>
- <location line="-92"/>
+ <location line="-108"/>
<source>Accept connections from outside (default: 1 if no -proxy or -connect)</source>
<translation>PÅ™ijímat spojení zvenÄí (výchozí: 1, pokud není zadáno -proxy nebo -connect)</translation>
</message>
<message>
- <location line="-74"/>
+ <location line="-82"/>
<source>%s, you must set a rpcpassword in the configuration file:
- %s
+%s
It is recommended you use the following random password:
rpcuser=bitcoinrpc
rpcpassword=%s
(you do not need to remember this password)
The username and password MUST NOT be the same.
If the file does not exist, create it with owner-readable-only file permissions.
+It is also recommended to set alertnotify so you are notified of problems;
+for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.com
</source>
- <translation>%s, musíš nastavit rpcpassword v konfiguraÄním souboru:
- %s
-Je vhodné použít následující náhodné heslo:
-rpcuser=bitcoinrpc
-rpcpassword=%s
-(není potřeba si ho pamatovat)
-rpcuser a rpcpassword NESMà být stejné.
-Pokud konfiguraÄní soubor jeÅ¡tÄ› neexistuje, vytvoÅ™ ho tak, aby ho mohl Äíst pouze vlastník.
-</translation>
+ <translation type="unfinished"/>
</message>
<message>
- <location line="+15"/>
+ <location line="+17"/>
<source>An error occurred while setting up the RPC port %u for listening on IPv6, falling back to IPv4: %s</source>
<translation>Při nastavování naslouchacího RPC portu %u pro IPv6 nastala chyba, vracím se k IPv4: %s</translation>
</message>
@@ -2291,11 +2411,6 @@ Pokud konfiguraÄní soubor jeÅ¡tÄ› neexistuje, vytvoÅ™ ho tak, aby ho mohl Äí
</message>
<message>
<location line="+3"/>
- <source>Corrupted block database detected. Please restart the client with -reindex.</source>
- <translation>Zjistil jsem, že je poškozená databáze bloků. Restartuj prosím klienta s volbou -reindex.</translation>
- </message>
- <message>
- <location line="+2"/>
<source>Error initializing database environment %s! To recover, BACKUP THAT DIRECTORY, then remove everything from it except for wallet.dat.</source>
<translation>Nastala chyba pÅ™i inicializaci databázového prostÅ™edí %s! ŘeÅ¡ení: ZAZÃLOHUJ TENTO ADRESÃŘ, a pak v nÄ›m smaž vÅ¡e kromÄ› wallet.dat.</translation>
</message>
@@ -2310,14 +2425,29 @@ Pokud konfiguraÄní soubor jeÅ¡tÄ› neexistuje, vytvoÅ™ ho tak, aby ho mohl Äí
<translation>Chyba: Tahle transakce vyžaduje transakÄní poplatek nejménÄ› %s kvůli velikosti zasílané Äástky, komplexnosti nebo použití nedávno pÅ™ijatých mincí!</translation>
</message>
<message>
+ <location line="+3"/>
+ <source>Execute command when a relevant alert is received (%s in cmd is replaced by message)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Execute command when a wallet transaction changes (%s in cmd is replaced by TxID)</source>
+ <translation>Spustit příkaz, když se objeví transakce týkající se peněženky (%s se v příkazu nahradí za TxID)</translation>
+ </message>
+ <message>
<location line="+11"/>
<source>Set maximum size of high-priority/low-fee transactions in bytes (default: 27000)</source>
<translation>Nastavit maximální velikost prioritních/nízkopoplatkových transakcí v bajtech (výchozí: 27000)</translation>
</message>
<message>
<location line="+3"/>
+ <source>Set the number of script verification threads (1-16, 0=auto, default: 0)</source>
+ <translation>Nastavení poÄtu vláken pro verifikaci skriptů (1-16, 0=automaticky, výchozí: 0)</translation>
+ </message>
+ <message>
+ <location line="+2"/>
<source>This is a pre-release test build - use at your own risk - do not use for mining or merchant applications</source>
- <translation>Tohle je testovací verze - používej ji jen na vlastní riziko - ale rozhodně ji nepoužívej k těžbě nebo pro obchodní aplikace</translation>
+ <translation>Tohle je testovací verze – používej ji jen na vlastní riziko, ale rozhodně ji nepoužívej k těžbě nebo pro obchodní aplikace</translation>
</message>
<message>
<location line="+5"/>
@@ -2357,20 +2487,45 @@ Pokud konfiguraÄní soubor jeÅ¡tÄ› neexistuje, vytvoÅ™ ho tak, aby ho mohl Äí
<message>
<location line="+6"/>
<source>Connect only to the specified node(s)</source>
- <translation>Připojovat se pouze k zadaným uzlům</translation>
+ <translation>Připojit se pouze k zadanému uzlu (příp. zadaným uzlům)</translation>
</message>
<message>
<location line="+3"/>
+ <source>Corrupted block database detected</source>
+ <translation>Bylo zjištěno poškození databáze bloků</translation>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Discover own IP address (default: 1 when listening and no -externalip)</source>
<translation>Zjistit vlastní IP adresu (výchozí: 1, pokud naslouchá a není zadáno -externalip)</translation>
</message>
<message>
+ <location line="+1"/>
+ <source>Do you want to rebuild the block database now?</source>
+ <translation>ChceÅ¡ pÅ™estavÄ›t databázi bloků hned teÄ?</translation>
+ </message>
+ <message>
<location line="+3"/>
+ <source>Error initializing block database</source>
+ <translation>Chyba při zakládání databáze bloků</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Error initializing wallet database environment %s!</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Error loading block database</source>
<translation>Chyba pÅ™i naÄítání databáze bloků</translation>
</message>
<message>
- <location line="+5"/>
+ <location line="+4"/>
+ <source>Error opening block database</source>
+ <translation>Chyba při otevírání databáze bloků</translation>
+ </message>
+ <message>
+ <location line="+2"/>
<source>Error: Disk space is low!</source>
<translation>Problém: Na disku je málo místa!</translation>
</message>
@@ -2386,28 +2541,98 @@ Pokud konfiguraÄní soubor jeÅ¡tÄ› neexistuje, vytvoÅ™ ho tak, aby ho mohl Äí
</message>
<message>
<location line="+2"/>
+ <source>Error: system error: </source>
+ <translation>Chyba: systémová chyba: </translation>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Failed to listen on any port. Use -listen=0 if you want this.</source>
<translation>Nepodařilo se naslouchat na žádném portu. Použij -listen=0, pokud to byl tvůj záměr.</translation>
</message>
<message>
+ <location line="+1"/>
+ <source>Failed to read block info</source>
+ <translation>NepodaÅ™ilo se pÅ™eÄíst informace o bloku</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Failed to read block</source>
+ <translation>NepodaÅ™ilo se pÅ™eÄíst blok</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Failed to sync block index</source>
+ <translation>Nepodařilo se sesynchronizovat index bloků</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Failed to write block index</source>
+ <translation>Nepodařilo se zapsat index bloků</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Failed to write block info</source>
+ <translation>Nepodařilo se zapsat informace o bloku</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Failed to write block</source>
+ <translation>Nepodařilo se zapsat blok</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Failed to write file info</source>
+ <translation>Nepodařilo se zapsat informace o souboru</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Failed to write to coin database</source>
+ <translation>Selhal zápis do databáze mincí</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Failed to write transaction index</source>
+ <translation>Nepodařilo se zapsat index transakcí</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Failed to write undo data</source>
+ <translation>Nepodařilo se zapsat data o vracení změn</translation>
+ </message>
+ <message>
<location line="+2"/>
<source>Find peers using DNS lookup (default: 1 unless -connect)</source>
<translation>Hledat uzly přes DNS (výchozí: 1, pokud není zadáno -connect)</translation>
</message>
<message>
- <location line="+5"/>
- <source>How thorough the block verification is (0-4, default: 3)</source>
- <translation>Jak moc důkladná má být verifikace bloků (0–4, výchozí: 3)</translation>
+ <location line="+3"/>
+ <source>How many blocks to check at startup (default: 288, 0 = all)</source>
+ <translation>Kolik bloků při startu zkontrolovat (výchozí: 288, 0 = všechny)</translation>
</message>
<message>
<location line="+1"/>
- <source>Importing blocks from block database...</source>
- <translation>Importuji bloky z databáze bloků...</translation>
+ <source>How thorough the block verification is (0-4, default: 3)</source>
+ <translation>Jak moc důkladná má být verifikace bloků (0-4, výchozí: 3)</translation>
+ </message>
+ <message>
+ <location line="+24"/>
+ <source>Rebuild block chain index from current blk000??.dat files</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+37"/>
+ <source>Verifying blocks...</source>
+ <translation type="unfinished"/>
</message>
<message>
<location line="+1"/>
+ <source>Verifying wallet...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-61"/>
<source>Imports blocks from external blk000??.dat file</source>
- <translation>Importuje bloky z externího souboru blk000?.dat</translation>
+ <translation>Importovat bloky z externího souboru blk000??.dat</translation>
</message>
<message>
<location line="+1"/>
@@ -2420,7 +2645,12 @@ Pokud konfiguraÄní soubor jeÅ¡tÄ› neexistuje, vytvoÅ™ ho tak, aby ho mohl Äí
<translation>Neplatná -tor adresa: &apos;%s&apos;</translation>
</message>
<message>
- <location line="+9"/>
+ <location line="+8"/>
+ <source>Maintain a full transaction index (default: 0)</source>
+ <translation>Spravovat úplný index transakcí (výchozí: 0)</translation>
+ </message>
+ <message>
+ <location line="+2"/>
<source>Maximum per-connection receive buffer, &lt;n&gt;*1000 bytes (default: 5000)</source>
<translation>Maximální velikost přijímacího bufferu pro každé spojení, &lt;n&gt;*1000 bajtů (výchozí: 5000)</translation>
</message>
@@ -2437,12 +2667,12 @@ Pokud konfiguraÄní soubor jeÅ¡tÄ› neexistuje, vytvoÅ™ ho tak, aby ho mohl Äí
<message>
<location line="+1"/>
<source>Only connect to nodes in network &lt;net&gt; (IPv4, IPv6 or Tor)</source>
- <translation>Připojovat se pouze k uzlům v &lt;net&gt; síti (IPv4, IPv6 nebo Tor)</translation>
+ <translation>Připojit se pouze k uzlům v &lt;net&gt; síti (IPv4, IPv6 nebo Tor)</translation>
</message>
<message>
<location line="+2"/>
<source>Output extra debugging information. Implies all other -debug* options</source>
- <translation>Tisknout speciální ladicí informace. Implikuje použití všechny -debug* voleb</translation>
+ <translation>Tisknout speciální ladicí informace. Implikuje použití všech -debug* voleb</translation>
</message>
<message>
<location line="+1"/>
@@ -2455,12 +2685,7 @@ Pokud konfiguraÄní soubor jeÅ¡tÄ› neexistuje, vytvoÅ™ ho tak, aby ho mohl Äí
<translation>PÅ™ipojit pÅ™ed ladicí výstup Äasové razítko</translation>
</message>
<message>
- <location line="+1"/>
- <source>Rebuild blockchain index from current blk000??.dat files</source>
- <translation>Znovu vytvořit index řetězce bloků z aktuálních blk000??.dat souborů</translation>
- </message>
- <message>
- <location line="+4"/>
+ <location line="+5"/>
<source>SSL options: (see the Bitcoin Wiki for SSL setup instructions)</source>
<translation>Možnosti SSL: (viz instrukce nastavení SSL v Bitcoin Wiki)</translation>
</message>
@@ -2500,7 +2725,12 @@ Pokud konfiguraÄní soubor jeÅ¡tÄ› neexistuje, vytvoÅ™ ho tak, aby ho mohl Äí
<translation>Zadej Äasový limit spojení v milisekundách (výchozí: 5000)</translation>
</message>
<message>
- <location line="+13"/>
+ <location line="+4"/>
+ <source>System error: </source>
+ <translation>Systémová chyba: </translation>
+ </message>
+ <message>
+ <location line="+10"/>
<source>Use UPnP to map the listening port (default: 0)</source>
<translation>Použít UPnP k namapování naslouchacího portu (výchozí: 0)</translation>
</message>
@@ -2531,36 +2761,41 @@ Pokud konfiguraÄní soubor jeÅ¡tÄ› neexistuje, vytvoÅ™ ho tak, aby ho mohl Äí
</message>
<message>
<location line="+1"/>
+ <source>You need to rebuild the databases using -reindex to change -txindex</source>
+ <translation>Je třeba přestavět databázi použitím -reindex, aby bylo možné změnit -txindex</translation>
+ </message>
+ <message>
+ <location line="+1"/>
<source>wallet.dat corrupt, salvage failed</source>
<translation>Soubor wallet.dat je poškozen, jeho záchrana se nezdařila</translation>
</message>
<message>
- <location line="-43"/>
+ <location line="-45"/>
<source>Password for JSON-RPC connections</source>
<translation>Heslo pro JSON-RPC spojení</translation>
</message>
<message>
- <location line="-53"/>
+ <location line="-68"/>
<source>Allow JSON-RPC connections from specified IP address</source>
<translation>Povolit JSON-RPC spojení ze specifikované IP adresy</translation>
</message>
<message>
- <location line="+62"/>
+ <location line="+77"/>
<source>Send commands to node running on &lt;ip&gt; (default: 127.0.0.1)</source>
<translation>Posílat příkazy uzlu běžícím na &lt;ip&gt; (výchozí: 127.0.0.1)</translation>
</message>
<message>
- <location line="-103"/>
+ <location line="-120"/>
<source>Execute command when the best block changes (%s in cmd is replaced by block hash)</source>
<translation>Spustit příkaz, když se změní nejlepší blok (%s se v příkazu nahradí hashem bloku)</translation>
</message>
<message>
- <location line="+124"/>
+ <location line="+142"/>
<source>Upgrade wallet to latest format</source>
<translation>Převést peněženku na nejnovější formát</translation>
</message>
<message>
- <location line="-15"/>
+ <location line="-16"/>
<source>Set key pool size to &lt;n&gt; (default: 100)</source>
<translation>Nastavit zásobník klíÄů na velikost &lt;n&gt; (výchozí: 100)</translation>
</message>
@@ -2570,17 +2805,12 @@ Pokud konfiguraÄní soubor jeÅ¡tÄ› neexistuje, vytvoÅ™ ho tak, aby ho mohl Äí
<translation>Přeskenovat řetězec bloků na chybějící transakce tvé pěněženky</translation>
</message>
<message>
- <location line="-26"/>
- <source>How many blocks to check at startup (default: 2500, 0 = all)</source>
- <translation>Kolik bloků při startu zkontrolovat (výchozí: 2500, 0 = všechny)</translation>
- </message>
- <message>
- <location line="+55"/>
+ <location line="+30"/>
<source>Use OpenSSL (https) for JSON-RPC connections</source>
<translation>Použít OpenSSL (https) pro JSON-RPC spojení</translation>
</message>
<message>
- <location line="-20"/>
+ <location line="-21"/>
<source>Server certificate file (default: server.cert)</source>
<translation>Soubor se serverovým certifikátem (výchozí: server.cert)</translation>
</message>
@@ -2590,12 +2820,12 @@ Pokud konfiguraÄní soubor jeÅ¡tÄ› neexistuje, vytvoÅ™ ho tak, aby ho mohl Äí
<translation>Soubor se serverovým soukromým klíÄem (výchozí: server.pem)</translation>
</message>
<message>
- <location line="-133"/>
+ <location line="-154"/>
<source>Acceptable ciphers (default: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH)</source>
<translation>Akceptovatelné šifry (výchozí: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH)</translation>
</message>
<message>
- <location line="+144"/>
+ <location line="+166"/>
<source>This help message</source>
<translation>Tato nápověda</translation>
</message>
@@ -2605,9 +2835,9 @@ Pokud konfiguraÄní soubor jeÅ¡tÄ› neexistuje, vytvoÅ™ ho tak, aby ho mohl Äí
<translation>Nedaří se mi pÅ™ipojit na %s na tomhle poÄítaÄi (operace bind vrátila chybu %d, %s)</translation>
</message>
<message>
- <location line="-70"/>
+ <location line="-86"/>
<source>Connect through socks proxy</source>
- <translation>Připojovat se přes socks proxy</translation>
+ <translation>Připojit se přes socks proxy</translation>
</message>
<message>
<location line="-11"/>
@@ -2615,12 +2845,12 @@ Pokud konfiguraÄní soubor jeÅ¡tÄ› neexistuje, vytvoÅ™ ho tak, aby ho mohl Äí
<translation>Povolit DNS dotazy pro -addnode (přidání uzlu), -seednode a -connect (připojení)</translation>
</message>
<message>
- <location line="+43"/>
+ <location line="+57"/>
<source>Loading addresses...</source>
<translation>NaÄítám adresy...</translation>
</message>
<message>
- <location line="-25"/>
+ <location line="-35"/>
<source>Error loading wallet.dat: Wallet corrupted</source>
<translation>Chyba pÅ™i naÄítání wallet.dat: peněženka je poÅ¡kozená</translation>
</message>
@@ -2630,32 +2860,22 @@ Pokud konfiguraÄní soubor jeÅ¡tÄ› neexistuje, vytvoÅ™ ho tak, aby ho mohl Äí
<translation>Chyba pÅ™i naÄítání wallet.dat: peněženka vyžaduje novÄ›jší verzi Bitcoinu</translation>
</message>
<message>
- <location line="+73"/>
- <source>Verifying block database integrity...</source>
- <translation>Kontroluji integritu databáze bloků...</translation>
- </message>
- <message>
- <location line="+1"/>
- <source>Verifying wallet integrity...</source>
- <translation>Kontroluji integritu peněženky...</translation>
- </message>
- <message>
- <location line="+1"/>
+ <location line="+87"/>
<source>Wallet needed to be rewritten: restart Bitcoin to complete</source>
<translation>Soubor s peněženkou potÅ™eboval pÅ™epsat: restartuj Bitcoin, aby se operace dokonÄila</translation>
</message>
<message>
- <location line="-77"/>
+ <location line="-89"/>
<source>Error loading wallet.dat</source>
<translation>Chyba pÅ™i naÄítání wallet.dat</translation>
</message>
<message>
- <location line="+20"/>
+ <location line="+30"/>
<source>Invalid -proxy address: &apos;%s&apos;</source>
<translation>Neplatná -proxy adresa: &apos;%s&apos;</translation>
</message>
<message>
- <location line="+46"/>
+ <location line="+48"/>
<source>Unknown network specified in -onlynet: &apos;%s&apos;</source>
<translation>V -onlynet byla uvedena neznámá síť: &apos;%s&apos;</translation>
</message>
@@ -2665,7 +2885,7 @@ Pokud konfiguraÄní soubor jeÅ¡tÄ› neexistuje, vytvoÅ™ ho tak, aby ho mohl Äí
<translation>V -socks byla požadována neznámá verze proxy: %i</translation>
</message>
<message>
- <location line="-75"/>
+ <location line="-91"/>
<source>Cannot resolve -bind address: &apos;%s&apos;</source>
<translation>Nemohu přeložit -bind adresu: &apos;%s&apos;</translation>
</message>
@@ -2675,17 +2895,17 @@ Pokud konfiguraÄní soubor jeÅ¡tÄ› neexistuje, vytvoÅ™ ho tak, aby ho mohl Äí
<translation>Nemohu přeložit -externalip adresu: &apos;%s&apos;</translation>
</message>
<message>
- <location line="+31"/>
+ <location line="+45"/>
<source>Invalid amount for -paytxfee=&lt;amount&gt;: &apos;%s&apos;</source>
<translation>Neplatná Äástka pro -paytxfee=&lt;Äástka&gt;: &apos;%s&apos;</translation>
</message>
<message>
- <location line="-15"/>
+ <location line="-24"/>
<source>Error: could not start node</source>
<translation>Chyba: nemohu nastartovat uzel</translation>
</message>
<message>
- <location line="+16"/>
+ <location line="+25"/>
<source>Invalid amount</source>
<translation>Neplatná Äástka</translation>
</message>
@@ -2700,7 +2920,7 @@ Pokud konfiguraÄní soubor jeÅ¡tÄ› neexistuje, vytvoÅ™ ho tak, aby ho mohl Äí
<translation>NaÄítám index bloků...</translation>
</message>
<message>
- <location line="-45"/>
+ <location line="-59"/>
<source>Add a node to connect to and attempt to keep the connection open</source>
<translation>Přidat uzel, ke kterému se připojit a snažit se spojení udržet</translation>
</message>
@@ -2710,22 +2930,17 @@ Pokud konfiguraÄní soubor jeÅ¡tÄ› neexistuje, vytvoÅ™ ho tak, aby ho mohl Äí
<translation>Nedaří se mi pÅ™ipojit na %s na tomhle poÄítaÄi. Bitcoin už pravdÄ›podobnÄ› jednou běží.</translation>
</message>
<message>
- <location line="+54"/>
- <source>Find peers using internet relay chat (default: 0)</source>
- <translation>Hledat uzly přes IRC (výchozí: 0)</translation>
- </message>
- <message>
- <location line="-2"/>
+ <location line="+68"/>
<source>Fee per KB to add to transactions you send</source>
- <translation>Poplatek za KB, který se přidá ke každé odeslané transakci</translation>
+ <translation>Poplatek za kB, který se přidá ke každé odeslané transakci</translation>
</message>
<message>
- <location line="+19"/>
+ <location line="+17"/>
<source>Loading wallet...</source>
<translation>NaÄítám peněženku...</translation>
</message>
<message>
- <location line="-40"/>
+ <location line="-54"/>
<source>Cannot downgrade wallet</source>
<translation>Nemohu převést peněženku do staršího formátu</translation>
</message>
@@ -2740,27 +2955,27 @@ Pokud konfiguraÄní soubor jeÅ¡tÄ› neexistuje, vytvoÅ™ ho tak, aby ho mohl Äí
<translation>Nemohu napsat výchozí adresu</translation>
</message>
<message>
- <location line="+49"/>
+ <location line="+64"/>
<source>Rescanning...</source>
<translation>Přeskenovávám...</translation>
</message>
<message>
- <location line="-43"/>
+ <location line="-56"/>
<source>Done loading</source>
<translation>NaÄítání dokonÄeno</translation>
</message>
<message>
- <location line="+65"/>
+ <location line="+79"/>
<source>To use the %s option</source>
<translation>K použití volby %s</translation>
</message>
<message>
- <location line="-60"/>
+ <location line="-71"/>
<source>Error</source>
<translation>Chyba</translation>
</message>
<message>
- <location line="-28"/>
+ <location line="-33"/>
<source>You must set rpcpassword=&lt;password&gt; in the configuration file:
%s
If the file does not exist, create it with owner-readable-only file permissions.</source>
diff --git a/src/qt/locale/bitcoin_cy.ts b/src/qt/locale/bitcoin_cy.ts
new file mode 100644
index 0000000000..b9422e053a
--- /dev/null
+++ b/src/qt/locale/bitcoin_cy.ts
@@ -0,0 +1,2976 @@
+<?xml version="1.0" ?><!DOCTYPE TS><TS language="cy" version="2.0">
+<defaultcodec>UTF-8</defaultcodec>
+<context>
+ <name>AboutDialog</name>
+ <message>
+ <location filename="../forms/aboutdialog.ui" line="+14"/>
+ <source>About Bitcoin</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+39"/>
+ <source>&lt;b&gt;Bitcoin&lt;/b&gt; version</source>
+ <translation>Fersiwn &lt;b&gt;Bitcoin&lt;/b&gt;</translation>
+ </message>
+ <message>
+ <location line="+57"/>
+ <source>
+This is experimental software.
+
+Distributed under the MIT/X11 software license, see the accompanying file COPYING or http://www.opensource.org/licenses/mit-license.php.
+
+This product includes software developed by the OpenSSL Project for use in the OpenSSL Toolkit (http://www.openssl.org/) and cryptographic software written by Eric Young (eay@cryptsoft.com) and UPnP software written by Thomas Bernard.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../aboutdialog.cpp" line="+17"/>
+ <source>Copyright</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>2009-%1 The Bitcoin developers</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
+ <name>AddressBookPage</name>
+ <message>
+ <location filename="../forms/addressbookpage.ui" line="+14"/>
+ <source>Address Book</source>
+ <translation>Llyfr Cyfeiriadau</translation>
+ </message>
+ <message>
+ <location line="+22"/>
+ <source>Double-click to edit address or label</source>
+ <translation>Clicio dwywaith i olygu cyfeiriad neu label</translation>
+ </message>
+ <message>
+ <location line="+27"/>
+ <source>Create a new address</source>
+ <translation>Creu cyfeiriad newydd</translation>
+ </message>
+ <message>
+ <location line="+14"/>
+ <source>Copy the currently selected address to the system clipboard</source>
+ <translation>Copio&apos;r cyfeiriad sydd wedi&apos;i ddewis i&apos;r clipfwrdd system</translation>
+ </message>
+ <message>
+ <location line="-11"/>
+ <source>&amp;New Address</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-46"/>
+ <source>These are your Bitcoin addresses for receiving payments. You may want to give a different one to each sender so you can keep track of who is paying you.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+60"/>
+ <source>&amp;Copy Address</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+11"/>
+ <source>Show &amp;QR Code</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+11"/>
+ <source>Sign a message to prove you own a Bitcoin address</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Sign &amp;Message</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+25"/>
+ <source>Delete the currently selected address from the list</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-14"/>
+ <source>Verify a message to ensure it was signed with a specified Bitcoin address</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>&amp;Verify Message</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+14"/>
+ <source>&amp;Delete</source>
+ <translation>&amp;Dileu</translation>
+ </message>
+ <message>
+ <location filename="../addressbookpage.cpp" line="+66"/>
+ <source>Copy &amp;Label</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>&amp;Edit</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Send &amp;Coins</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+263"/>
+ <source>Export Address Book Data</source>
+ <translation>Allforio Data Llyfr Cyfeiriad</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Comma separated file (*.csv)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+13"/>
+ <source>Error exporting</source>
+ <translation>Gwall allforio</translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>Could not write to file %1.</source>
+ <translation>Ni ellir ysgrifennu i ffeil %1.</translation>
+ </message>
+</context>
+<context>
+ <name>AddressTableModel</name>
+ <message>
+ <location filename="../addresstablemodel.cpp" line="+144"/>
+ <source>Label</source>
+ <translation>Label</translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>Address</source>
+ <translation>Cyfeiriad</translation>
+ </message>
+ <message>
+ <location line="+36"/>
+ <source>(no label)</source>
+ <translation>(heb label)</translation>
+ </message>
+</context>
+<context>
+ <name>AskPassphraseDialog</name>
+ <message>
+ <location filename="../forms/askpassphrasedialog.ui" line="+26"/>
+ <source>Passphrase Dialog</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+21"/>
+ <source>Enter passphrase</source>
+ <translation>Teipiwch gyfrinymadrodd</translation>
+ </message>
+ <message>
+ <location line="+14"/>
+ <source>New passphrase</source>
+ <translation>Cyfrinymadrodd newydd</translation>
+ </message>
+ <message>
+ <location line="+14"/>
+ <source>Repeat new passphrase</source>
+ <translation>Ailadroddwch gyfrinymadrodd newydd</translation>
+ </message>
+ <message>
+ <location filename="../askpassphrasedialog.cpp" line="+33"/>
+ <source>Enter the new passphrase to the wallet.&lt;br/&gt;Please use a passphrase of &lt;b&gt;10 or more random characters&lt;/b&gt;, or &lt;b&gt;eight or more words&lt;/b&gt;.</source>
+ <translation>Dewiswch gyfrinymadrodd newydd ar gyfer y waled. &lt;br/&gt; Defnyddiwch cyfrinymadrodd o &lt;b&gt;10 neu fwy o lythyrennau hapgyrch&lt;/b&gt;, neu &lt;b&gt; wyth neu fwy o eiriau.</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Encrypt wallet</source>
+ <translation>Amgryptio&apos;r waled</translation>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>This operation needs your wallet passphrase to unlock the wallet.</source>
+ <translation>Mae angen i&apos;r gweithred hon ddefnyddio&apos;ch cyfrinymadrodd er mwyn datgloi&apos;r waled.</translation>
+ </message>
+ <message>
+ <location line="+5"/>
+ <source>Unlock wallet</source>
+ <translation>Datgloi&apos;r waled</translation>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>This operation needs your wallet passphrase to decrypt the wallet.</source>
+ <translation>Mae angen i&apos;r gweithred hon ddefnyddio&apos;ch cyfrinymadrodd er mwyn dadgryptio&apos;r waled.</translation>
+ </message>
+ <message>
+ <location line="+5"/>
+ <source>Decrypt wallet</source>
+ <translation>Dadgryptio&apos;r waled</translation>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Change passphrase</source>
+ <translation>Newid cyfrinymadrodd</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Enter the old and new passphrase to the wallet.</source>
+ <translation>Teipiwch yr hen cyfrinymadrodd a chyfrinymadrodd newydd i mewn i&apos;r waled.</translation>
+ </message>
+ <message>
+ <location line="+46"/>
+ <source>Confirm wallet encryption</source>
+ <translation>Cadarnau amgryptiad y waled</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Warning: If you encrypt your wallet and lose your passphrase, you will &lt;b&gt;LOSE ALL OF YOUR BITCOINS&lt;/b&gt;!</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>Are you sure you wish to encrypt your wallet?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+15"/>
+ <source>IMPORTANT: Any previous backups you have made of your wallet file should be replaced with the newly generated, encrypted wallet file. For security reasons, previous backups of the unencrypted wallet file will become useless as soon as you start using the new, encrypted wallet.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+100"/>
+ <location line="+24"/>
+ <source>Warning: The Caps Lock key is on!</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-130"/>
+ <location line="+58"/>
+ <source>Wallet encrypted</source>
+ <translation>Waled wedi&apos;i amgryptio</translation>
+ </message>
+ <message>
+ <location line="-56"/>
+ <source>Bitcoin will close now to finish the encryption process. Remember that encrypting your wallet cannot fully protect your bitcoins from being stolen by malware infecting your computer.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+13"/>
+ <location line="+7"/>
+ <location line="+42"/>
+ <location line="+6"/>
+ <source>Wallet encryption failed</source>
+ <translation>Amgryptiad waled wedi methu</translation>
+ </message>
+ <message>
+ <location line="-54"/>
+ <source>Wallet encryption failed due to an internal error. Your wallet was not encrypted.</source>
+ <translation>Methodd amgryptiad y waled oherwydd gwall mewnol. Ni amgryptwyd eich waled.</translation>
+ </message>
+ <message>
+ <location line="+7"/>
+ <location line="+48"/>
+ <source>The supplied passphrases do not match.</source>
+ <translation>Dydy&apos;r cyfrinymadroddion a ddarparwyd ddim yn cyd-fynd â&apos;u gilydd.</translation>
+ </message>
+ <message>
+ <location line="-37"/>
+ <source>Wallet unlock failed</source>
+ <translation>Methodd ddatgloi&apos;r waled</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <location line="+11"/>
+ <location line="+19"/>
+ <source>The passphrase entered for the wallet decryption was incorrect.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-20"/>
+ <source>Wallet decryption failed</source>
+ <translation>Methodd dadgryptiad y waled</translation>
+ </message>
+ <message>
+ <location line="+14"/>
+ <source>Wallet passphrase was successfully changed.</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
+ <name>BitcoinGUI</name>
+ <message>
+ <location filename="../bitcoingui.cpp" line="+231"/>
+ <source>Sign &amp;message...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+299"/>
+ <source>Synchronizing with network...</source>
+ <translation>Cysoni â&apos;r rhwydwaith...</translation>
+ </message>
+ <message>
+ <location line="-367"/>
+ <source>&amp;Overview</source>
+ <translation>&amp;Trosolwg</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Show general overview of wallet</source>
+ <translation>Dangos trosolwg cyffredinol y waled</translation>
+ </message>
+ <message>
+ <location line="+20"/>
+ <source>&amp;Transactions</source>
+ <translation>&amp;Trafodion</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Browse transaction history</source>
+ <translation>Pori hanes trafodion</translation>
+ </message>
+ <message>
+ <location line="+7"/>
+ <source>Edit the list of stored addresses and labels</source>
+ <translation>Golygu&apos;r rhestr o cyfeiriadau a labeli ar gadw</translation>
+ </message>
+ <message>
+ <location line="-14"/>
+ <source>Show the list of addresses for receiving payments</source>
+ <translation>Dangos rhestr o gyfeiriadau ar gyfer derbyn taliadau</translation>
+ </message>
+ <message>
+ <location line="+31"/>
+ <source>E&amp;xit</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Quit application</source>
+ <translation>Gadael rhaglen</translation>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>Show information about Bitcoin</source>
+ <translation>Dangos gwybodaeth am Bitcoin</translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>About &amp;Qt</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Show information about Qt</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>&amp;Options...</source>
+ <translation>&amp;Opsiynau</translation>
+ </message>
+ <message>
+ <location line="+5"/>
+ <source>&amp;Encrypt Wallet...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>&amp;Backup Wallet...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>&amp;Change Passphrase...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+304"/>
+ <source>Importing blocks from disk...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Reindexing blocks on disk...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-300"/>
+ <source>&amp;Export...</source>
+ <translation>&amp;Allforio...</translation>
+ </message>
+ <message>
+ <location line="-65"/>
+ <source>Send coins to a Bitcoin address</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+49"/>
+ <source>Modify configuration options for Bitcoin</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+17"/>
+ <source>Export the data in the current tab to a file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-9"/>
+ <source>Backup wallet to another location</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Change the passphrase used for wallet encryption</source>
+ <translation>Newid y cyfrinymadrodd a ddefnyddiwyd ar gyfer amgryptio&apos;r waled</translation>
+ </message>
+ <message>
+ <location line="+9"/>
+ <source>&amp;Debug window</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Open debugging and diagnostic console</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-7"/>
+ <source>&amp;Verify message...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-162"/>
+ <location line="+540"/>
+ <source>Bitcoin</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-540"/>
+ <source>Wallet</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+99"/>
+ <source>&amp;Send</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+7"/>
+ <source>&amp;Receive</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+14"/>
+ <source>&amp;Addresses</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+22"/>
+ <source>&amp;About Bitcoin</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+9"/>
+ <source>&amp;Show / Hide</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Show or hide the main Window</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Encrypt the private keys that belong to your wallet</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+7"/>
+ <source>Sign messages with your Bitcoin addresses to prove you own them</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Verify messages to ensure they were signed with specified Bitcoin addresses</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+31"/>
+ <source>&amp;File</source>
+ <translation>&amp;Ffeil</translation>
+ </message>
+ <message>
+ <location line="+8"/>
+ <source>&amp;Settings</source>
+ <translation>&amp;Gosodiadau</translation>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>&amp;Help</source>
+ <translation>&amp;Cymorth</translation>
+ </message>
+ <message>
+ <location line="+9"/>
+ <source>Tabs toolbar</source>
+ <translation>Bar offer tabiau</translation>
+ </message>
+ <message>
+ <location line="+8"/>
+ <source>Actions toolbar</source>
+ <translation>Bar offer camau gweithredu</translation>
+ </message>
+ <message>
+ <location line="+13"/>
+ <location line="+10"/>
+ <source>[testnet]</source>
+ <translation>[testnet]</translation>
+ </message>
+ <message>
+ <location line="+47"/>
+ <source>Bitcoin client</source>
+ <translation type="unfinished"/>
+ </message>
+ <message numerus="yes">
+ <location line="+140"/>
+ <source>%n active connection(s) to Bitcoin network</source>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
+ <message>
+ <location line="+39"/>
+ <source>Processed %1 of %2 (estimated) blocks of transaction history.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>Processed %1 blocks of transaction history.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message numerus="yes">
+ <location line="+20"/>
+ <source>%n hour(s)</source>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
+ <message numerus="yes">
+ <location line="+4"/>
+ <source>%n day(s)</source>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
+ <message numerus="yes">
+ <location line="+4"/>
+ <source>%n week(s)</source>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
+ <message>
+ <location line="+5"/>
+ <source>%1 behind</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+14"/>
+ <source>Last received block was generated %1 ago.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Transactions after this will not yet be visible.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+21"/>
+ <source>Error</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Warning</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Information</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+68"/>
+ <source>This transaction is over the size limit. You can still send it for a fee of %1, which goes to the nodes that process your transaction and helps to support the network. Do you want to pay the fee?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-138"/>
+ <source>Up to date</source>
+ <translation>Cyfamserol</translation>
+ </message>
+ <message>
+ <location line="+32"/>
+ <source>Catching up...</source>
+ <translation>Dal i fyny</translation>
+ </message>
+ <message>
+ <location line="+110"/>
+ <source>Confirm transaction fee</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+8"/>
+ <source>Sent transaction</source>
+ <translation>Trafodiad a anfonwyd</translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>Incoming transaction</source>
+ <translation>Trafodiad sy&apos;n cyrraedd</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Date: %1
+Amount: %2
+Type: %3
+Address: %4
+</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+33"/>
+ <location line="+23"/>
+ <source>URI handling</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-23"/>
+ <location line="+23"/>
+ <source>URI can not be parsed! This can be caused by an invalid Bitcoin address or malformed URI parameters.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+17"/>
+ <source>Wallet is &lt;b&gt;encrypted&lt;/b&gt; and currently &lt;b&gt;unlocked&lt;/b&gt;</source>
+ <translation>Mae&apos;r waled &lt;b&gt;wedi&apos;i amgryptio&lt;/b&gt; ac &lt;b&gt;heb ei gloi&lt;/b&gt; ar hyn o bryd</translation>
+ </message>
+ <message>
+ <location line="+8"/>
+ <source>Wallet is &lt;b&gt;encrypted&lt;/b&gt; and currently &lt;b&gt;locked&lt;/b&gt;</source>
+ <translation>Mae&apos;r waled &lt;b&gt;wedi&apos;i amgryptio&lt;/b&gt; ac &lt;b&gt;ar glo&lt;/b&gt; ar hyn o bryd</translation>
+ </message>
+ <message>
+ <location filename="../bitcoin.cpp" line="+108"/>
+ <source>A fatal error occurred. Bitcoin can no longer continue safely and will quit.</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
+ <name>ClientModel</name>
+ <message>
+ <location filename="../clientmodel.cpp" line="+96"/>
+ <source>Network Alert</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
+ <name>EditAddressDialog</name>
+ <message>
+ <location filename="../forms/editaddressdialog.ui" line="+14"/>
+ <source>Edit Address</source>
+ <translation>Golygu&apos;r cyfeiriad</translation>
+ </message>
+ <message>
+ <location line="+11"/>
+ <source>&amp;Label</source>
+ <translation>&amp;Label</translation>
+ </message>
+ <message>
+ <location line="+10"/>
+ <source>The label associated with this address book entry</source>
+ <translation>Mae&apos;r label hon yn cysylltiedig gyda&apos;r cofnod llyfr cyfeiriad hon</translation>
+ </message>
+ <message>
+ <location line="+7"/>
+ <source>&amp;Address</source>
+ <translation>&amp;Cyfeiriad</translation>
+ </message>
+ <message>
+ <location line="+10"/>
+ <source>The address associated with this address book entry. This can only be modified for sending addresses.</source>
+ <translation>Mae&apos;r cyfeiriad hon yn cysylltiedig gyda&apos;r cofnod llyfr cyfeiriad hon. Gall hyn gael ei olygu dim ond ar gyfer y pwrpas o anfon cyfeiriadau.</translation>
+ </message>
+ <message>
+ <location filename="../editaddressdialog.cpp" line="+21"/>
+ <source>New receiving address</source>
+ <translation>Cyfeiriad derbyn newydd</translation>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>New sending address</source>
+ <translation>Cyfeiriad anfon newydd</translation>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Edit receiving address</source>
+ <translation>Golygu&apos;r cyfeiriad derbyn</translation>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>Edit sending address</source>
+ <translation>Golygu&apos;r cyfeiriad anfon</translation>
+ </message>
+ <message>
+ <location line="+76"/>
+ <source>The entered address &quot;%1&quot; is already in the address book.</source>
+ <translation>Mae&apos;r cyfeiriad &quot;%1&quot; sydd newydd gael ei geisio gennych yn y llyfr cyfeiriad yn barod.</translation>
+ </message>
+ <message>
+ <location line="-5"/>
+ <source>The entered address &quot;%1&quot; is not a valid Bitcoin address.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+10"/>
+ <source>Could not unlock wallet.</source>
+ <translation>Methodd ddatgloi&apos;r waled.</translation>
+ </message>
+ <message>
+ <location line="+5"/>
+ <source>New key generation failed.</source>
+ <translation>Methodd gynhyrchu allwedd newydd.</translation>
+ </message>
+</context>
+<context>
+ <name>GUIUtil::HelpMessageBox</name>
+ <message>
+ <location filename="../guiutil.cpp" line="+422"/>
+ <location line="+12"/>
+ <source>Bitcoin-Qt</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-12"/>
+ <source>version</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Usage:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>command-line options</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>UI options</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Set language, for example &quot;de_DE&quot; (default: system locale)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Start minimized</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Show splash screen on startup (default: 1)</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
+ <name>OptionsDialog</name>
+ <message>
+ <location filename="../forms/optionsdialog.ui" line="+14"/>
+ <source>Options</source>
+ <translation>Opsiynau</translation>
+ </message>
+ <message>
+ <location line="+16"/>
+ <source>&amp;Main</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>Optional transaction fee per kB that helps make sure your transactions are processed quickly. Most transactions are 1 kB. Fee 0.01 recommended.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+15"/>
+ <source>Pay transaction &amp;fee</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+31"/>
+ <source>Automatically start Bitcoin after logging in to the system.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>&amp;Start Bitcoin on system login</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+35"/>
+ <source>Reset all client options to default.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>&amp;Reset Options</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+13"/>
+ <source>&amp;Network</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>Automatically open the Bitcoin client port on the router. This only works when your router supports UPnP and it is enabled.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Map port using &amp;UPnP</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+7"/>
+ <source>Connect to the Bitcoin network through a SOCKS proxy (e.g. when connecting through Tor).</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>&amp;Connect through SOCKS proxy:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+9"/>
+ <source>Proxy &amp;IP:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+19"/>
+ <source>IP address of the proxy (e.g. 127.0.0.1)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+7"/>
+ <source>&amp;Port:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+19"/>
+ <source>Port of the proxy (e.g. 9050)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+7"/>
+ <source>SOCKS &amp;Version:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+13"/>
+ <source>SOCKS version of the proxy (e.g. 5)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+36"/>
+ <source>&amp;Window</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>Show only a tray icon after minimizing the window.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>&amp;Minimize to the tray instead of the taskbar</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+7"/>
+ <source>Minimize instead of exit the application when the window is closed. When this option is enabled, the application will be closed only after selecting Quit in the menu.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>M&amp;inimize on close</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+21"/>
+ <source>&amp;Display</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+8"/>
+ <source>User Interface &amp;language:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+13"/>
+ <source>The user interface language can be set here. This setting will take effect after restarting Bitcoin.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+11"/>
+ <source>&amp;Unit to show amounts in:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+13"/>
+ <source>Choose the default subdivision unit to show in the interface and when sending coins.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+9"/>
+ <source>Whether to show Bitcoin addresses in the transaction list or not.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>&amp;Display addresses in transaction list</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+71"/>
+ <source>&amp;OK</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+7"/>
+ <source>&amp;Cancel</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+10"/>
+ <source>&amp;Apply</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../optionsdialog.cpp" line="+53"/>
+ <source>default</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+130"/>
+ <source>Confirm options reset</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Some settings may require a client restart to take effect.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>Do you want to proceed?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+42"/>
+ <location line="+9"/>
+ <source>Warning</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-9"/>
+ <location line="+9"/>
+ <source>This setting will take effect after restarting Bitcoin.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+29"/>
+ <source>The supplied proxy address is invalid.</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
+ <name>OverviewPage</name>
+ <message>
+ <location filename="../forms/overviewpage.ui" line="+14"/>
+ <source>Form</source>
+ <translation>Ffurflen</translation>
+ </message>
+ <message>
+ <location line="+50"/>
+ <location line="+166"/>
+ <source>The displayed information may be out of date. Your wallet automatically synchronizes with the Bitcoin network after a connection is established, but this process has not completed yet.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-124"/>
+ <source>Balance:</source>
+ <translation>Gweddill:</translation>
+ </message>
+ <message>
+ <location line="+29"/>
+ <source>Unconfirmed:</source>
+ <translation>Nas cadarnheir:</translation>
+ </message>
+ <message>
+ <location line="-78"/>
+ <source>Wallet</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+107"/>
+ <source>Immature:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+13"/>
+ <source>Mined balance that has not yet matured</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+46"/>
+ <source>&lt;b&gt;Recent transactions&lt;/b&gt;</source>
+ <translation>&lt;b&gt;Trafodion diweddar&lt;/b&gt;</translation>
+ </message>
+ <message>
+ <location line="-101"/>
+ <source>Your current balance</source>
+ <translation>Eich gweddill presennol</translation>
+ </message>
+ <message>
+ <location line="+29"/>
+ <source>Total of transactions that have yet to be confirmed, and do not yet count toward the current balance</source>
+ <translation>Cyfanswm o drafodion sydd heb eu cadarnhau a heb eu cyfri tuag at y gweddill presennol</translation>
+ </message>
+ <message>
+ <location filename="../overviewpage.cpp" line="+115"/>
+ <location line="+1"/>
+ <source>out of sync</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
+ <name>PaymentServer</name>
+ <message>
+ <location filename="../paymentserver.cpp" line="+107"/>
+ <source>Cannot start bitcoin: click-to-pay handler</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
+ <name>QRCodeDialog</name>
+ <message>
+ <location filename="../forms/qrcodedialog.ui" line="+14"/>
+ <source>QR Code Dialog</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+59"/>
+ <source>Request Payment</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+56"/>
+ <source>Amount:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-44"/>
+ <source>Label:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+19"/>
+ <source>Message:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+71"/>
+ <source>&amp;Save As...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../qrcodedialog.cpp" line="+62"/>
+ <source>Error encoding URI into QR Code.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+40"/>
+ <source>The entered amount is invalid, please check.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+23"/>
+ <source>Resulting URI too long, try to reduce the text for label / message.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+25"/>
+ <source>Save QR Code</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>PNG Images (*.png)</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
+ <name>RPCConsole</name>
+ <message>
+ <location filename="../forms/rpcconsole.ui" line="+46"/>
+ <source>Client name</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+10"/>
+ <location line="+23"/>
+ <location line="+26"/>
+ <location line="+23"/>
+ <location line="+23"/>
+ <location line="+36"/>
+ <location line="+53"/>
+ <location line="+23"/>
+ <location line="+23"/>
+ <location filename="../rpcconsole.cpp" line="+344"/>
+ <source>N/A</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-217"/>
+ <source>Client version</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-45"/>
+ <source>&amp;Information</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+68"/>
+ <source>Using OpenSSL version</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+49"/>
+ <source>Startup time</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+29"/>
+ <source>Network</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+7"/>
+ <source>Number of connections</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+23"/>
+ <source>On testnet</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+23"/>
+ <source>Block chain</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+7"/>
+ <source>Current number of blocks</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+23"/>
+ <source>Estimated total blocks</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+23"/>
+ <source>Last block time</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+52"/>
+ <source>&amp;Open</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+16"/>
+ <source>Command-line options</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+7"/>
+ <source>Show the Bitcoin-Qt help message to get a list with possible Bitcoin command-line options.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>&amp;Show</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+24"/>
+ <source>&amp;Console</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-260"/>
+ <source>Build date</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-104"/>
+ <source>Bitcoin - Debug window</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+25"/>
+ <source>Bitcoin Core</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+279"/>
+ <source>Debug log file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+7"/>
+ <source>Open the Bitcoin debug log file from the current data directory. This can take a few seconds for large log files.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+102"/>
+ <source>Clear console</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../rpcconsole.cpp" line="-30"/>
+ <source>Welcome to the Bitcoin RPC console.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Use up and down arrows to navigate history, and &lt;b&gt;Ctrl-L&lt;/b&gt; to clear screen.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Type &lt;b&gt;help&lt;/b&gt; for an overview of available commands.</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
+ <name>SendCoinsDialog</name>
+ <message>
+ <location filename="../forms/sendcoinsdialog.ui" line="+14"/>
+ <location filename="../sendcoinsdialog.cpp" line="+124"/>
+ <location line="+5"/>
+ <location line="+5"/>
+ <location line="+5"/>
+ <location line="+6"/>
+ <location line="+5"/>
+ <location line="+5"/>
+ <source>Send Coins</source>
+ <translation>Anfon arian</translation>
+ </message>
+ <message>
+ <location line="+50"/>
+ <source>Send to multiple recipients at once</source>
+ <translation>Anfon at pobl lluosog ar yr un pryd</translation>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Add &amp;Recipient</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+20"/>
+ <source>Remove all transaction fields</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Clear &amp;All</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+22"/>
+ <source>Balance:</source>
+ <translation>Gweddill:</translation>
+ </message>
+ <message>
+ <location line="+10"/>
+ <source>123.456 BTC</source>
+ <translation>123.456 BTC</translation>
+ </message>
+ <message>
+ <location line="+31"/>
+ <source>Confirm the send action</source>
+ <translation>Cadarnhau&apos;r gweithrediad anfon</translation>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>S&amp;end</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../sendcoinsdialog.cpp" line="-59"/>
+ <source>&lt;b&gt;%1&lt;/b&gt; to %2 (%3)</source>
+ <translation>&lt;b&gt;%1&lt;/b&gt; to %2 (%3)</translation>
+ </message>
+ <message>
+ <location line="+5"/>
+ <source>Confirm send coins</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Are you sure you want to send %1?</source>
+ <translation>Ydych chi&apos;n siwr eich bod chi eisiau anfon %1?</translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source> and </source>
+ <translation>a</translation>
+ </message>
+ <message>
+ <location line="+23"/>
+ <source>The recipient address is not valid, please recheck.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+5"/>
+ <source>The amount to pay must be larger than 0.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+5"/>
+ <source>The amount exceeds your balance.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+5"/>
+ <source>The total exceeds your balance when the %1 transaction fee is included.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>Duplicate address found, can only send to each address once per send operation.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+5"/>
+ <source>Error: Transaction creation failed!</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+5"/>
+ <source>Error: The transaction was rejected. This might happen if some of the coins in your wallet were already spent, such as if you used a copy of wallet.dat and coins were spent in the copy but not marked as spent here.</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
+ <name>SendCoinsEntry</name>
+ <message>
+ <location filename="../forms/sendcoinsentry.ui" line="+14"/>
+ <source>Form</source>
+ <translation>Ffurflen</translation>
+ </message>
+ <message>
+ <location line="+15"/>
+ <source>A&amp;mount:</source>
+ <translation>&amp;Maint</translation>
+ </message>
+ <message>
+ <location line="+13"/>
+ <source>Pay &amp;To:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+34"/>
+ <source>The address to send the payment to (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+60"/>
+ <location filename="../sendcoinsentry.cpp" line="+26"/>
+ <source>Enter a label for this address to add it to your address book</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-78"/>
+ <source>&amp;Label:</source>
+ <translation>&amp;Label:</translation>
+ </message>
+ <message>
+ <location line="+28"/>
+ <source>Choose address from address book</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+10"/>
+ <source>Alt+A</source>
+ <translation>Alt+A</translation>
+ </message>
+ <message>
+ <location line="+7"/>
+ <source>Paste address from clipboard</source>
+ <translation>Gludo cyfeiriad o&apos;r glipfwrdd</translation>
+ </message>
+ <message>
+ <location line="+10"/>
+ <source>Alt+P</source>
+ <translation>Alt+P</translation>
+ </message>
+ <message>
+ <location line="+7"/>
+ <source>Remove this recipient</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../sendcoinsentry.cpp" line="+1"/>
+ <source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
+ <name>SignVerifyMessageDialog</name>
+ <message>
+ <location filename="../forms/signverifymessagedialog.ui" line="+14"/>
+ <source>Signatures - Sign / Verify a Message</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+13"/>
+ <source>&amp;Sign Message</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>You can sign messages with your addresses to prove you own them. Be careful not to sign anything vague, as phishing attacks may try to trick you into signing your identity over to them. Only sign fully-detailed statements you agree to.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+18"/>
+ <source>The address to sign the message with (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+10"/>
+ <location line="+213"/>
+ <source>Choose an address from the address book</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-203"/>
+ <location line="+213"/>
+ <source>Alt+A</source>
+ <translation>Alt+A</translation>
+ </message>
+ <message>
+ <location line="-203"/>
+ <source>Paste address from clipboard</source>
+ <translation>Gludo cyfeiriad o&apos;r glipfwrdd</translation>
+ </message>
+ <message>
+ <location line="+10"/>
+ <source>Alt+P</source>
+ <translation>Alt+P</translation>
+ </message>
+ <message>
+ <location line="+12"/>
+ <source>Enter the message you want to sign here</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+7"/>
+ <source>Signature</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+27"/>
+ <source>Copy the current signature to the system clipboard</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+21"/>
+ <source>Sign the message to prove you own this Bitcoin address</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Sign &amp;Message</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+14"/>
+ <source>Reset all sign message fields</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <location line="+146"/>
+ <source>Clear &amp;All</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-87"/>
+ <source>&amp;Verify Message</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>Enter the signing address, message (ensure you copy line breaks, spaces, tabs, etc. exactly) and signature below to verify the message. Be careful not to read more into the signature than what is in the signed message itself, to avoid being tricked by a man-in-the-middle attack.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+21"/>
+ <source>The address the message was signed with (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+40"/>
+ <source>Verify the message to ensure it was signed with the specified Bitcoin address</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Verify &amp;Message</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+14"/>
+ <source>Reset all verify message fields</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../signverifymessagedialog.cpp" line="+27"/>
+ <location line="+3"/>
+ <source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-2"/>
+ <source>Click &quot;Sign Message&quot; to generate signature</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Enter Bitcoin signature</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+82"/>
+ <location line="+81"/>
+ <source>The entered address is invalid.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-81"/>
+ <location line="+8"/>
+ <location line="+73"/>
+ <location line="+8"/>
+ <source>Please check the address and try again.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-81"/>
+ <location line="+81"/>
+ <source>The entered address does not refer to a key.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-73"/>
+ <source>Wallet unlock was cancelled.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+8"/>
+ <source>Private key for the entered address is not available.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+12"/>
+ <source>Message signing failed.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+5"/>
+ <source>Message signed.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+59"/>
+ <source>The signature could not be decoded.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+0"/>
+ <location line="+13"/>
+ <source>Please check the signature and try again.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>The signature did not match the message digest.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+7"/>
+ <source>Message verification failed.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+5"/>
+ <source>Message verified.</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
+ <name>TransactionDesc</name>
+ <message>
+ <location filename="../transactiondesc.cpp" line="+20"/>
+ <source>Open until %1</source>
+ <translation>Agor tan %1</translation>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>%1/offline</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>%1/unconfirmed</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>%1 confirmations</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+18"/>
+ <source>Status</source>
+ <translation type="unfinished"/>
+ </message>
+ <message numerus="yes">
+ <location line="+7"/>
+ <source>, broadcast through %n node(s)</source>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>Date</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+7"/>
+ <source>Source</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>Generated</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+5"/>
+ <location line="+17"/>
+ <source>From</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <location line="+22"/>
+ <location line="+58"/>
+ <source>To</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-77"/>
+ <location line="+2"/>
+ <source>own address</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-2"/>
+ <source>label</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+37"/>
+ <location line="+12"/>
+ <location line="+45"/>
+ <location line="+17"/>
+ <location line="+30"/>
+ <source>Credit</source>
+ <translation type="unfinished"/>
+ </message>
+ <message numerus="yes">
+ <location line="-102"/>
+ <source>matures in %n more block(s)</source>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>not accepted</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+44"/>
+ <location line="+8"/>
+ <location line="+15"/>
+ <location line="+30"/>
+ <source>Debit</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-39"/>
+ <source>Transaction fee</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+16"/>
+ <source>Net amount</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>Message</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Comment</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Transaction ID</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Generated coins must mature 120 blocks before they can be spent. When you generated this block, it was broadcast to the network to be added to the block chain. If it fails to get into the chain, its state will change to &quot;not accepted&quot; and it won&apos;t be spendable. This may occasionally happen if another node generates a block within a few seconds of yours.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+7"/>
+ <source>Debug information</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+8"/>
+ <source>Transaction</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Inputs</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+23"/>
+ <source>Amount</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>true</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>false</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-209"/>
+ <source>, has not been successfully broadcast yet</source>
+ <translation type="unfinished"/>
+ </message>
+ <message numerus="yes">
+ <location line="-35"/>
+ <source>Open for %n more block(s)</source>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
+ <message>
+ <location line="+70"/>
+ <source>unknown</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
+ <name>TransactionDescDialog</name>
+ <message>
+ <location filename="../forms/transactiondescdialog.ui" line="+14"/>
+ <source>Transaction details</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>This pane shows a detailed description of the transaction</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
+ <name>TransactionTableModel</name>
+ <message>
+ <location filename="../transactiontablemodel.cpp" line="+225"/>
+ <source>Date</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>Type</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>Address</source>
+ <translation>Cyfeiriad</translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>Amount</source>
+ <translation type="unfinished"/>
+ </message>
+ <message numerus="yes">
+ <location line="+57"/>
+ <source>Open for %n more block(s)</source>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Open until %1</source>
+ <translation>Agor tan %1</translation>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Offline (%1 confirmations)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Unconfirmed (%1 of %2 confirmations)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Confirmed (%1 confirmations)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message numerus="yes">
+ <location line="+8"/>
+ <source>Mined balance will be available when it matures in %n more block(s)</source>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
+ <message>
+ <location line="+5"/>
+ <source>This block was not received by any other nodes and will probably not be accepted!</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Generated but not accepted</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+43"/>
+ <source>Received with</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Received from</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Sent to</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Payment to yourself</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Mined</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+38"/>
+ <source>(n/a)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+199"/>
+ <source>Transaction status. Hover over this field to show number of confirmations.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Date and time that the transaction was received.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Type of transaction.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Destination address of transaction.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Amount removed from or added to balance.</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
+ <name>TransactionView</name>
+ <message>
+ <location filename="../transactionview.cpp" line="+52"/>
+ <location line="+16"/>
+ <source>All</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-15"/>
+ <source>Today</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>This week</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>This month</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Last month</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>This year</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Range...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+11"/>
+ <source>Received with</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Sent to</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>To yourself</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Mined</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Other</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+7"/>
+ <source>Enter address or label to search</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+7"/>
+ <source>Min amount</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+34"/>
+ <source>Copy address</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy label</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy amount</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy transaction ID</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Edit label</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Show transaction details</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+139"/>
+ <source>Export Transaction Data</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Comma separated file (*.csv)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+8"/>
+ <source>Confirmed</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Date</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Type</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Label</source>
+ <translation>Label</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Address</source>
+ <translation>Cyfeiriad</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Amount</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>ID</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>Error exporting</source>
+ <translation>Gwall allforio</translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>Could not write to file %1.</source>
+ <translation>Ni ellir ysgrifennu i ffeil %1.</translation>
+ </message>
+ <message>
+ <location line="+100"/>
+ <source>Range:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+8"/>
+ <source>to</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
+ <name>WalletView</name>
+ <message>
+ <location filename="../walletview.cpp" line="+95"/>
+ <source>&amp;Overview</source>
+ <translation>&amp;Trosolwg</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Show general overview of wallet</source>
+ <translation>Dangos trosolwg cyffredinol y waled</translation>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>&amp;Send coins</source>
+ <translation>&amp;Anfon arian</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Send coins to a Bitcoin address</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>&amp;Receive coins</source>
+ <translation>&amp;Derbyn arian</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Show the list of addresses for receiving payments</source>
+ <translation>Dangos rhestr o gyfeiriadau ar gyfer derbyn taliadau</translation>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>&amp;Transactions</source>
+ <translation>&amp;Trafodion</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Browse transaction history</source>
+ <translation>Pori hanes trafodion</translation>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>&amp;Address Book</source>
+ <translation>&amp;Llyfr Cyfeiriad</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Edit the list of stored addresses and labels</source>
+ <translation>Golygu&apos;r rhestr o cyfeiriadau a labeli ar gadw</translation>
+ </message>
+ <message>
+ <location line="+12"/>
+ <source>&amp;Encrypt Wallet...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Encrypt the private keys that belong to your wallet</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>&amp;Backup Wallet...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Backup wallet to another location</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>&amp;Change Passphrase...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Change the passphrase used for wallet encryption</source>
+ <translation>Newid y cyfrinymadrodd a ddefnyddiwyd ar gyfer amgryptio&apos;r waled</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Sign &amp;message...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Sign messages with your Bitcoin addresses to prove you own them</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>&amp;Verify message...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Verify messages to ensure they were signed with specified Bitcoin addresses</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>&amp;Export...</source>
+ <translation>&amp;Allforio...</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Export the data in the current tab to a file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+180"/>
+ <source>Backup Wallet</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>Wallet Data (*.dat)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Backup Failed</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>There was an error trying to save the wallet data to the new location.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>Backup Successful</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>The wallet data was successfully saved to the new location.</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
+ <name>bitcoin-core</name>
+ <message>
+ <location filename="../bitcoinstrings.cpp" line="+96"/>
+ <source>Bitcoin version</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+98"/>
+ <source>Usage:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-24"/>
+ <source>Send command to -server or bitcoind</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-22"/>
+ <source>List commands</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-10"/>
+ <source>Get help for a command</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+21"/>
+ <source>Options:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+22"/>
+ <source>Specify configuration file (default: bitcoin.conf)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Specify pid file (default: bitcoind.pid)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-47"/>
+ <source>Generate coins</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-28"/>
+ <source>Don&apos;t generate coins</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+74"/>
+ <source>Specify data directory</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-7"/>
+ <source>Set database cache size in megabytes (default: 25)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-27"/>
+ <source>Listen for connections on &lt;port&gt; (default: 8333 or testnet: 18333)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+5"/>
+ <source>Maintain at most &lt;n&gt; connections to peers (default: 125)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-49"/>
+ <source>Connect to a node to retrieve peer addresses, and disconnect</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+80"/>
+ <source>Specify your own public address</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Threshold for disconnecting misbehaving peers (default: 100)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-132"/>
+ <source>Number of seconds to keep misbehaving peers from reconnecting (default: 86400)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-32"/>
+ <source>An error occurred while setting up the RPC port %u for listening on IPv4: %s</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+30"/>
+ <source>Listen for JSON-RPC connections on &lt;port&gt; (default: 8332 or testnet: 18332)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+36"/>
+ <source>Accept command line and JSON-RPC commands</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+77"/>
+ <source>Run in the background as a daemon and accept commands</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+32"/>
+ <source>Use the test network</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-108"/>
+ <source>Accept connections from outside (default: 1 if no -proxy or -connect)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-82"/>
+ <source>%s, you must set a rpcpassword in the configuration file:
+%s
+It is recommended you use the following random password:
+rpcuser=bitcoinrpc
+rpcpassword=%s
+(you do not need to remember this password)
+The username and password MUST NOT be the same.
+If the file does not exist, create it with owner-readable-only file permissions.
+It is also recommended to set alertnotify so you are notified of problems;
+for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.com
+</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+17"/>
+ <source>An error occurred while setting up the RPC port %u for listening on IPv6, falling back to IPv4: %s</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Bind to given address and always listen on it. Use [host]:port notation for IPv6</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Cannot obtain a lock on data directory %s. Bitcoin is probably already running.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Error initializing database environment %s! To recover, BACKUP THAT DIRECTORY, then remove everything from it except for wallet.dat.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Error: The transaction was rejected! This might happen if some of the coins in your wallet were already spent, such as if you used a copy of wallet.dat and coins were spent in the copy but not marked as spent here.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>Error: This transaction requires a transaction fee of at least %s because of its amount, complexity, or use of recently received funds!</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Execute command when a relevant alert is received (%s in cmd is replaced by message)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Execute command when a wallet transaction changes (%s in cmd is replaced by TxID)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+11"/>
+ <source>Set maximum size of high-priority/low-fee transactions in bytes (default: 27000)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Set the number of script verification threads (1-16, 0=auto, default: 0)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>This is a pre-release test build - use at your own risk - do not use for mining or merchant applications</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+5"/>
+ <source>Warning: -paytxfee is set very high! This is the transaction fee you will pay if you send a transaction.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Warning: Displayed transactions may not be correct! You may need to upgrade, or other nodes may need to upgrade.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Warning: Please check that your computer&apos;s date and time are correct! If your clock is wrong Bitcoin will not work properly.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Warning: error reading wallet.dat! All keys read correctly, but transaction data or address book entries might be missing or incorrect.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Warning: wallet.dat corrupt, data salvaged! Original wallet.dat saved as wallet.{timestamp}.bak in %s; if your balance or transactions are incorrect you should restore from a backup.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+14"/>
+ <source>Attempt to recover private keys from a corrupt wallet.dat</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Block creation options:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>Connect only to the specified node(s)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Corrupted block database detected</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Discover own IP address (default: 1 when listening and no -externalip)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Do you want to rebuild the block database now?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Error initializing block database</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Error initializing wallet database environment %s!</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Error loading block database</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>Error opening block database</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Error: Disk space is low!</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Error: Transaction creation failed!</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Error: Wallet locked, unable to create transaction!</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Error: system error: </source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Failed to listen on any port. Use -listen=0 if you want this.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Failed to read block info</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Failed to read block</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Failed to sync block index</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Failed to write block index</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Failed to write block info</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Failed to write block</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Failed to write file info</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Failed to write to coin database</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Failed to write transaction index</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Failed to write undo data</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Find peers using DNS lookup (default: 1 unless -connect)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>How many blocks to check at startup (default: 288, 0 = all)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>How thorough the block verification is (0-4, default: 3)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+24"/>
+ <source>Rebuild block chain index from current blk000??.dat files</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+37"/>
+ <source>Verifying blocks...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Verifying wallet...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-61"/>
+ <source>Imports blocks from external blk000??.dat file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Information</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Invalid -tor address: &apos;%s&apos;</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+8"/>
+ <source>Maintain a full transaction index (default: 0)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Maximum per-connection receive buffer, &lt;n&gt;*1000 bytes (default: 5000)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Maximum per-connection send buffer, &lt;n&gt;*1000 bytes (default: 1000)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Only accept block chain matching built-in checkpoints (default: 1)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Only connect to nodes in network &lt;net&gt; (IPv4, IPv6 or Tor)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Output extra debugging information. Implies all other -debug* options</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Output extra network debugging information</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Prepend debug output with timestamp</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+5"/>
+ <source>SSL options: (see the Bitcoin Wiki for SSL setup instructions)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Select the version of socks proxy to use (4-5, default: 5)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Send trace/debug info to console instead of debug.log file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Send trace/debug info to debugger</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+5"/>
+ <source>Set maximum block size in bytes (default: 250000)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Set minimum block size in bytes (default: 0)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Shrink debug.log file on client startup (default: 1 when no -debug)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Specify connection timeout in milliseconds (default: 5000)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>System error: </source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+10"/>
+ <source>Use UPnP to map the listening port (default: 0)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Use UPnP to map the listening port (default: 1 when listening)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Use proxy to reach tor hidden services (default: same as -proxy)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Username for JSON-RPC connections</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>Warning</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Warning: This version is obsolete, upgrade required!</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>You need to rebuild the databases using -reindex to change -txindex</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>wallet.dat corrupt, salvage failed</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-45"/>
+ <source>Password for JSON-RPC connections</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-68"/>
+ <source>Allow JSON-RPC connections from specified IP address</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+77"/>
+ <source>Send commands to node running on &lt;ip&gt; (default: 127.0.0.1)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-120"/>
+ <source>Execute command when the best block changes (%s in cmd is replaced by block hash)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+142"/>
+ <source>Upgrade wallet to latest format</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-16"/>
+ <source>Set key pool size to &lt;n&gt; (default: 100)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-12"/>
+ <source>Rescan the block chain for missing wallet transactions</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+30"/>
+ <source>Use OpenSSL (https) for JSON-RPC connections</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-21"/>
+ <source>Server certificate file (default: server.cert)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Server private key (default: server.pem)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-154"/>
+ <source>Acceptable ciphers (default: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+166"/>
+ <source>This help message</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Unable to bind to %s on this computer (bind returned error %d, %s)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-86"/>
+ <source>Connect through socks proxy</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-11"/>
+ <source>Allow DNS lookups for -addnode, -seednode and -connect</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+57"/>
+ <source>Loading addresses...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-35"/>
+ <source>Error loading wallet.dat: Wallet corrupted</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Error loading wallet.dat: Wallet requires newer version of Bitcoin</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+87"/>
+ <source>Wallet needed to be rewritten: restart Bitcoin to complete</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-89"/>
+ <source>Error loading wallet.dat</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+30"/>
+ <source>Invalid -proxy address: &apos;%s&apos;</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+48"/>
+ <source>Unknown network specified in -onlynet: &apos;%s&apos;</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-1"/>
+ <source>Unknown -socks proxy version requested: %i</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-91"/>
+ <source>Cannot resolve -bind address: &apos;%s&apos;</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Cannot resolve -externalip address: &apos;%s&apos;</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+45"/>
+ <source>Invalid amount for -paytxfee=&lt;amount&gt;: &apos;%s&apos;</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-24"/>
+ <source>Error: could not start node</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+25"/>
+ <source>Invalid amount</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-4"/>
+ <source>Insufficient funds</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+8"/>
+ <source>Loading block index...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-59"/>
+ <source>Add a node to connect to and attempt to keep the connection open</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-25"/>
+ <source>Unable to bind to %s on this computer. Bitcoin is probably already running.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+68"/>
+ <source>Fee per KB to add to transactions you send</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+17"/>
+ <source>Loading wallet...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-54"/>
+ <source>Cannot downgrade wallet</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Cannot initialize keypool</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Cannot write default address</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+64"/>
+ <source>Rescanning...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-56"/>
+ <source>Done loading</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+79"/>
+ <source>To use the %s option</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-71"/>
+ <source>Error</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-33"/>
+ <source>You must set rpcpassword=&lt;password&gt; in the configuration file:
+%s
+If the file does not exist, create it with owner-readable-only file permissions.</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+</TS> \ No newline at end of file
diff --git a/src/qt/locale/bitcoin_da.ts b/src/qt/locale/bitcoin_da.ts
index 01f9c8a54b..12b5441064 100644
--- a/src/qt/locale/bitcoin_da.ts
+++ b/src/qt/locale/bitcoin_da.ts
@@ -13,12 +13,7 @@
<translation>&lt;b&gt;Bitcoin&lt;/b&gt; version</translation>
</message>
<message>
- <location line="+41"/>
- <source>Copyright © 2009-2012 The Bitcoin developers</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+13"/>
+ <location line="+57"/>
<source>
This is experimental software.
@@ -32,6 +27,16 @@ Det er gjort tilgængeligt under MIT/X11 softwarelicensen. Se den tilhørende fi
Produktet indeholder software som er udviklet af OpenSSL Project til brug i OpenSSL Toolkit (http://www.openssl.org/), kryptografisk software skrevet af Eric Young (eay@cryptsoft.com) og UPnP-software skrevet by Thomas Bernard.</translation>
</message>
+ <message>
+ <location filename="../aboutdialog.cpp" line="+17"/>
+ <source>Copyright</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>2009-%1 The Bitcoin developers</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>AddressBookPage</name>
@@ -73,7 +78,7 @@ Produktet indeholder software som er udviklet af OpenSSL Project til brug i Open
<message>
<location line="+11"/>
<source>Show &amp;QR Code</source>
- <translation type="unfinished"/>
+ <translation>Vis &amp;QR kode</translation>
</message>
<message>
<location line="+11"/>
@@ -106,17 +111,22 @@ Produktet indeholder software som er udviklet af OpenSSL Project til brug i Open
<translation>&amp;Slet</translation>
</message>
<message>
- <location filename="../addressbookpage.cpp" line="+65"/>
+ <location filename="../addressbookpage.cpp" line="+66"/>
<source>Copy &amp;Label</source>
<translation>Kopier &amp;etiket</translation>
</message>
<message>
- <location line="+2"/>
+ <location line="+1"/>
<source>&amp;Edit</source>
<translation>R&amp;ediger</translation>
</message>
<message>
- <location line="+250"/>
+ <location line="+1"/>
+ <source>Send &amp;Coins</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+263"/>
<source>Export Address Book Data</source>
<translation>Eksporter Adressekartoteketsdata</translation>
</message>
@@ -139,7 +149,7 @@ Produktet indeholder software som er udviklet af OpenSSL Project til brug i Open
<context>
<name>AddressTableModel</name>
<message>
- <location filename="../addresstablemodel.cpp" line="+142"/>
+ <location filename="../addresstablemodel.cpp" line="+144"/>
<source>Label</source>
<translation>Etiket</translation>
</message>
@@ -298,17 +308,17 @@ Produktet indeholder software som er udviklet af OpenSSL Project til brug i Open
<context>
<name>BitcoinGUI</name>
<message>
- <location filename="../bitcoingui.cpp" line="+267"/>
+ <location filename="../bitcoingui.cpp" line="+231"/>
<source>Sign &amp;message...</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+254"/>
+ <location line="+299"/>
<source>Synchronizing with network...</source>
<translation>Synkroniserer med netværk ...</translation>
</message>
<message>
- <location line="-322"/>
+ <location line="-367"/>
<source>&amp;Overview</source>
<translation>&amp;Oversigt</translation>
</message>
@@ -328,32 +338,17 @@ Produktet indeholder software som er udviklet af OpenSSL Project til brug i Open
<translation>Gennemse transaktionshistorik</translation>
</message>
<message>
- <location line="+6"/>
- <source>&amp;Address Book</source>
- <translation>&amp;Adressebog</translation>
- </message>
- <message>
- <location line="+1"/>
+ <location line="+7"/>
<source>Edit the list of stored addresses and labels</source>
<translation>Rediger listen over gemte adresser og etiketter</translation>
</message>
<message>
- <location line="-15"/>
- <source>&amp;Receive coins</source>
- <translation>&amp;Modtag coins</translation>
- </message>
- <message>
- <location line="+1"/>
+ <location line="-14"/>
<source>Show the list of addresses for receiving payments</source>
<translation>Vis listen over adresser for at modtage betalinger</translation>
</message>
<message>
- <location line="-8"/>
- <source>&amp;Send coins</source>
- <translation>&amp;Send coins</translation>
- </message>
- <message>
- <location line="+39"/>
+ <location line="+31"/>
<source>E&amp;xit</source>
<translation>&amp;Luk</translation>
</message>
@@ -398,7 +393,7 @@ Produktet indeholder software som er udviklet af OpenSSL Project til brug i Open
<translation>&amp;Skift adgangskode...</translation>
</message>
<message>
- <location line="+259"/>
+ <location line="+304"/>
<source>Importing blocks from disk...</source>
<translation type="unfinished"/>
</message>
@@ -407,13 +402,8 @@ Produktet indeholder software som er udviklet af OpenSSL Project til brug i Open
<source>Reindexing blocks on disk...</source>
<translation type="unfinished"/>
</message>
- <message numerus="yes">
- <location line="+10"/>
- <source>~%n block(s) remaining</source>
- <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
- </message>
<message>
- <location line="-265"/>
+ <location line="-300"/>
<source>&amp;Export...</source>
<translation>&amp;Eksporter...</translation>
</message>
@@ -435,7 +425,7 @@ Produktet indeholder software som er udviklet af OpenSSL Project til brug i Open
<message>
<location line="-9"/>
<source>Backup wallet to another location</source>
- <translation type="unfinished"/>
+ <translation>Lav sikkerhedskopi af tegnebogen til et andet sted</translation>
</message>
<message>
<location line="+2"/>
@@ -458,18 +448,33 @@ Produktet indeholder software som er udviklet af OpenSSL Project til brug i Open
<translation type="unfinished"/>
</message>
<message>
- <location line="-196"/>
- <location line="+538"/>
+ <location line="-162"/>
+ <location line="+540"/>
<source>Bitcoin</source>
<translation>Bitcoin</translation>
</message>
<message>
- <location line="-538"/>
+ <location line="-540"/>
<source>Wallet</source>
<translation>tegnebog</translation>
</message>
<message>
- <location line="+176"/>
+ <location line="+99"/>
+ <source>&amp;Send</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+7"/>
+ <source>&amp;Receive</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+14"/>
+ <source>&amp;Addresses</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+22"/>
<source>&amp;About Bitcoin</source>
<translation>&amp;Om Bitcoin</translation>
</message>
@@ -530,97 +535,92 @@ Produktet indeholder software som er udviklet af OpenSSL Project til brug i Open
<translation>[testnet]</translation>
</message>
<message>
- <location line="+63"/>
+ <location line="+47"/>
<source>Bitcoin client</source>
- <translation type="unfinished"/>
+ <translation>Bitcoin klient</translation>
</message>
<message numerus="yes">
- <location line="+79"/>
+ <location line="+140"/>
<source>%n active connection(s) to Bitcoin network</source>
<translation><numerusform>%n aktiv(e) forbindelse(r) til Bitcoinnetværket</numerusform><numerusform>%n aktiv(e) forbindelse(r) til Bitcoinnetværket</numerusform></translation>
</message>
<message>
- <location line="+45"/>
- <source>Processed %1 of %2 blocks of transaction history (%3% done).</source>
+ <location line="+39"/>
+ <source>Processed %1 of %2 (estimated) blocks of transaction history.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+7"/>
+ <location line="+4"/>
<source>Processed %1 blocks of transaction history.</source>
<translation type="unfinished"/>
</message>
+ <message numerus="yes">
+ <location line="+20"/>
+ <source>%n hour(s)</source>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
+ <message numerus="yes">
+ <location line="+4"/>
+ <source>%n day(s)</source>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
+ <message numerus="yes">
+ <location line="+4"/>
+ <source>%n week(s)</source>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
<message>
- <location line="+70"/>
- <source>Error</source>
+ <location line="+5"/>
+ <source>%1 behind</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+3"/>
- <source>Warning</source>
+ <location line="+14"/>
+ <source>Last received block was generated %1 ago.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+3"/>
- <source>Information</source>
+ <location line="+2"/>
+ <source>Transactions after this will not yet be visible.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+66"/>
- <source>This transaction is over the size limit. You can still send it for a fee of %1, which goes to the nodes that process your transaction and helps to support the network. Do you want to pay the fee?</source>
- <translation type="unfinished"/>
+ <location line="+21"/>
+ <source>Error</source>
+ <translation>Fejl</translation>
</message>
<message>
- <location line="+210"/>
- <source>Backup Successful</source>
+ <location line="+3"/>
+ <source>Warning</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+0"/>
- <source>The wallet data was successfully saved to the new location.</source>
+ <location line="+3"/>
+ <source>Information</source>
<translation type="unfinished"/>
</message>
- <message numerus="yes">
- <location line="-338"/>
- <source>%n second(s) ago</source>
- <translation><numerusform>%n sekund(er) siden</numerusform><numerusform>%n sekund(er) siden</numerusform></translation>
- </message>
- <message numerus="yes">
- <location line="+4"/>
- <source>%n minute(s) ago</source>
- <translation><numerusform>%n minut(ter) siden</numerusform><numerusform>%n minut(ter) siden</numerusform></translation>
- </message>
- <message numerus="yes">
- <location line="+4"/>
- <source>%n hour(s) ago</source>
- <translation><numerusform>%n time(r) siden</numerusform><numerusform>%n time(r) siden</numerusform></translation>
- </message>
- <message numerus="yes">
- <location line="+4"/>
- <source>%n day(s) ago</source>
- <translation><numerusform>%n dag(e) siden</numerusform><numerusform>%n dag(e) siden</numerusform></translation>
+ <message>
+ <location line="+68"/>
+ <source>This transaction is over the size limit. You can still send it for a fee of %1, which goes to the nodes that process your transaction and helps to support the network. Do you want to pay the fee?</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location line="+6"/>
+ <location line="-138"/>
<source>Up to date</source>
<translation>Opdateret</translation>
</message>
<message>
- <location line="+7"/>
+ <location line="+32"/>
<source>Catching up...</source>
<translation>Indhenter...</translation>
</message>
<message>
- <location line="+10"/>
- <source>Last received block was generated %1.</source>
- <translation>Sidst modtagne blok blev genereret %1.</translation>
- </message>
- <message>
- <location line="+97"/>
+ <location line="+110"/>
<source>Confirm transaction fee</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+23"/>
+ <location line="+8"/>
<source>Sent transaction</source>
<translation>Afsendt transaktion</translation>
</message>
@@ -643,14 +643,14 @@ Adresse: %4
</translation>
</message>
<message>
- <location line="+99"/>
- <location line="+28"/>
+ <location line="+33"/>
+ <location line="+23"/>
<source>URI handling</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-28"/>
- <location line="+28"/>
+ <location line="-23"/>
+ <location line="+23"/>
<source>URI can not be parsed! This can be caused by an invalid Bitcoin address or malformed URI parameters.</source>
<translation type="unfinished"/>
</message>
@@ -665,27 +665,7 @@ Adresse: %4
<translation>Tegnebog er &lt;b&gt;krypteret&lt;/b&gt; og i øjeblikket &lt;b&gt;låst&lt;/b&gt;</translation>
</message>
<message>
- <location line="+23"/>
- <source>Backup Wallet</source>
- <translation>Backup tegnebog</translation>
- </message>
- <message>
- <location line="+0"/>
- <source>Wallet Data (*.dat)</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+3"/>
- <source>Backup Failed</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+0"/>
- <source>There was an error trying to save the wallet data to the new location.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../bitcoin.cpp" line="+109"/>
+ <location filename="../bitcoin.cpp" line="+108"/>
<source>A fatal error occurred. Bitcoin can no longer continue safely and will quit.</source>
<translation type="unfinished"/>
</message>
@@ -693,7 +673,7 @@ Adresse: %4
<context>
<name>ClientModel</name>
<message>
- <location filename="../clientmodel.cpp" line="+86"/>
+ <location filename="../clientmodel.cpp" line="+96"/>
<source>Network Alert</source>
<translation type="unfinished"/>
</message>
@@ -726,7 +706,7 @@ Adresse: %4
<translation>Adressen tilknyttet til denne post i adressekartoteket. Dette kan kun ændres for afsendelsesadresser.</translation>
</message>
<message>
- <location filename="../editaddressdialog.cpp" line="+20"/>
+ <location filename="../editaddressdialog.cpp" line="+21"/>
<source>New receiving address</source>
<translation>Ny modtagelsesadresse</translation>
</message>
@@ -746,17 +726,17 @@ Adresse: %4
<translation>Rediger afsendelsesadresse</translation>
</message>
<message>
- <location line="+60"/>
+ <location line="+76"/>
<source>The entered address &quot;%1&quot; is already in the address book.</source>
<translation>Den indtastede adresse &quot;%1&quot; er allerede i adressebogen.</translation>
</message>
<message>
- <location line="+5"/>
+ <location line="-5"/>
<source>The entered address &quot;%1&quot; is not a valid Bitcoin address.</source>
<translation>Den indtastede adresse &quot;%1&quot; er ikke en gyldig bitcoinadresse.</translation>
</message>
<message>
- <location line="+5"/>
+ <location line="+10"/>
<source>Could not unlock wallet.</source>
<translation>Kunne ikke låse tegnebog op.</translation>
</message>
@@ -769,7 +749,7 @@ Adresse: %4
<context>
<name>GUIUtil::HelpMessageBox</name>
<message>
- <location filename="../guiutil.cpp" line="+419"/>
+ <location filename="../guiutil.cpp" line="+422"/>
<location line="+12"/>
<source>Bitcoin-Qt</source>
<translation type="unfinished"/>
@@ -984,7 +964,7 @@ Adresse: %4
<translation type="unfinished"/>
</message>
<message>
- <location filename="../optionsdialog.cpp" line="+55"/>
+ <location filename="../optionsdialog.cpp" line="+53"/>
<source>default</source>
<translation type="unfinished"/>
</message>
@@ -1029,23 +1009,18 @@ Adresse: %4
<translation>Formular</translation>
</message>
<message>
- <location line="+51"/>
- <location line="+183"/>
+ <location line="+50"/>
+ <location line="+166"/>
<source>The displayed information may be out of date. Your wallet automatically synchronizes with the Bitcoin network after a connection is established, but this process has not completed yet.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-141"/>
+ <location line="-124"/>
<source>Balance:</source>
<translation>Saldo:</translation>
</message>
<message>
- <location line="+58"/>
- <source>Number of transactions:</source>
- <translation>Antal transaktioner:</translation>
- </message>
- <message>
- <location line="-29"/>
+ <location line="+29"/>
<source>Unconfirmed:</source>
<translation>Ubekræftede:</translation>
</message>
@@ -1055,7 +1030,7 @@ Adresse: %4
<translation>tegnebog</translation>
</message>
<message>
- <location line="+124"/>
+ <location line="+107"/>
<source>Immature:</source>
<translation type="unfinished"/>
</message>
@@ -1070,7 +1045,7 @@ Adresse: %4
<translation>&lt;b&gt;Nyeste transaktioner&lt;/b&gt;</translation>
</message>
<message>
- <location line="-118"/>
+ <location line="-101"/>
<source>Your current balance</source>
<translation>Din nuværende saldo</translation>
</message>
@@ -1080,11 +1055,6 @@ Adresse: %4
<translation>Summen af ​​transaktioner, der endnu ikke er bekræftet, og endnu ikke er inkluderet i den nuværende saldo</translation>
</message>
<message>
- <location line="+20"/>
- <source>Total number of transactions in wallet</source>
- <translation>Samlede antal transaktioner i tegnebogen</translation>
- </message>
- <message>
<location filename="../overviewpage.cpp" line="+115"/>
<location line="+1"/>
<source>out of sync</source>
@@ -1092,6 +1062,14 @@ Adresse: %4
</message>
</context>
<context>
+ <name>PaymentServer</name>
+ <message>
+ <location filename="../paymentserver.cpp" line="+107"/>
+ <source>Cannot start bitcoin: click-to-pay handler</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>QRCodeDialog</name>
<message>
<location filename="../forms/qrcodedialog.ui" line="+14"/>
@@ -1101,7 +1079,7 @@ Adresse: %4
<message>
<location line="+59"/>
<source>Request Payment</source>
- <translation type="unfinished"/>
+ <translation>Anmod om Betaling</translation>
</message>
<message>
<location line="+56"/>
@@ -1121,7 +1099,7 @@ Adresse: %4
<message>
<location line="+71"/>
<source>&amp;Save As...</source>
- <translation type="unfinished"/>
+ <translation>&amp;Gem Som...</translation>
</message>
<message>
<location filename="../qrcodedialog.cpp" line="+62"/>
@@ -1136,7 +1114,7 @@ Adresse: %4
<message>
<location line="+23"/>
<source>Resulting URI too long, try to reduce the text for label / message.</source>
- <translation type="unfinished"/>
+ <translation>Resulterende URI var for lang, prøv at forkorte teksten til mærkaten / beskeden.</translation>
</message>
<message>
<location line="+25"/>
@@ -1146,7 +1124,7 @@ Adresse: %4
<message>
<location line="+0"/>
<source>PNG Images (*.png)</source>
- <translation type="unfinished"/>
+ <translation>PNG Billeder (*.png)</translation>
</message>
</context>
<context>
@@ -1323,7 +1301,7 @@ Adresse: %4
<message>
<location line="+20"/>
<source>Remove all transaction fields</source>
- <translation type="unfinished"/>
+ <translation>Fjern alle transaktionsfelter</translation>
</message>
<message>
<location line="+3"/>
@@ -1430,7 +1408,7 @@ Adresse: %4
</message>
<message>
<location line="+60"/>
- <location filename="../sendcoinsentry.cpp" line="+25"/>
+ <location filename="../sendcoinsentry.cpp" line="+26"/>
<source>Enter a label for this address to add it to your address book</source>
<translation>Indtast en etiket for denne adresse for at føje den til din adressebog</translation>
</message>
@@ -1666,7 +1644,7 @@ Adresse: %4
<context>
<name>TransactionDesc</name>
<message>
- <location filename="../transactiondesc.cpp" line="+19"/>
+ <location filename="../transactiondesc.cpp" line="+20"/>
<source>Open until %1</source>
<translation>Ã…ben indtil %1</translation>
</message>
@@ -1853,7 +1831,7 @@ Adresse: %4
<context>
<name>TransactionTableModel</name>
<message>
- <location filename="../transactiontablemodel.cpp" line="+226"/>
+ <location filename="../transactiontablemodel.cpp" line="+225"/>
<source>Date</source>
<translation>Dato</translation>
</message>
@@ -1971,7 +1949,7 @@ Adresse: %4
<context>
<name>TransactionView</name>
<message>
- <location filename="../transactionview.cpp" line="+55"/>
+ <location filename="../transactionview.cpp" line="+52"/>
<location line="+16"/>
<source>All</source>
<translation>Alle</translation>
@@ -2054,6 +2032,11 @@ Adresse: %4
<message>
<location line="+1"/>
<source>Copy amount</source>
+ <translation>Kopier beløb</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy transaction ID</source>
<translation type="unfinished"/>
</message>
<message>
@@ -2067,7 +2050,7 @@ Adresse: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+142"/>
+ <location line="+139"/>
<source>Export Transaction Data</source>
<translation>Eksportér Transaktionsdata</translation>
</message>
@@ -2122,7 +2105,7 @@ Adresse: %4
<translation>Kunne ikke skrive til filen %1.</translation>
</message>
<message>
- <location line="+95"/>
+ <location line="+100"/>
<source>Range:</source>
<translation>Interval:</translation>
</message>
@@ -2133,31 +2116,174 @@ Adresse: %4
</message>
</context>
<context>
+ <name>WalletView</name>
+ <message>
+ <location filename="../walletview.cpp" line="+95"/>
+ <source>&amp;Overview</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Show general overview of wallet</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>&amp;Send coins</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Send coins to a Bitcoin address</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>&amp;Receive coins</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Show the list of addresses for receiving payments</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>&amp;Transactions</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Browse transaction history</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>&amp;Address Book</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Edit the list of stored addresses and labels</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+12"/>
+ <source>&amp;Encrypt Wallet...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Encrypt the private keys that belong to your wallet</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>&amp;Backup Wallet...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Backup wallet to another location</source>
+ <translation>Lav sikkerhedskopi af tegnebogen til et andet sted</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>&amp;Change Passphrase...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Change the passphrase used for wallet encryption</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Sign &amp;message...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Sign messages with your Bitcoin addresses to prove you own them</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>&amp;Verify message...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Verify messages to ensure they were signed with specified Bitcoin addresses</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>&amp;Export...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Export the data in the current tab to a file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+180"/>
+ <source>Backup Wallet</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>Wallet Data (*.dat)</source>
+ <translation>Tegnebogsdata (*.dat)</translation>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Backup Failed</source>
+ <translation>Foretagelse af sikkerhedskopi fejlede</translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>There was an error trying to save the wallet data to the new location.</source>
+ <translation>Der opstod en fejl i forbindelse emd at gemme tegnebogsdata til det nye sted</translation>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>Backup Successful</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>The wallet data was successfully saved to the new location.</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>bitcoin-core</name>
<message>
- <location filename="../bitcoinstrings.cpp" line="+88"/>
+ <location filename="../bitcoinstrings.cpp" line="+96"/>
<source>Bitcoin version</source>
<translation>Bitcoinversion</translation>
</message>
<message>
- <location line="+82"/>
+ <location line="+98"/>
<source>Usage:</source>
<translation>Anvendelse:</translation>
</message>
<message>
- <location line="-23"/>
+ <location line="-24"/>
<source>Send command to -server or bitcoind</source>
<translation>Send kommando til -server eller bitcoind
</translation>
</message>
<message>
- <location line="-21"/>
+ <location line="-22"/>
<source>List commands</source>
<translation>Liste over kommandoer
</translation>
</message>
<message>
- <location line="-11"/>
+ <location line="-10"/>
<source>Get help for a command</source>
<translation>Få hjælp til en kommando
</translation>
@@ -2187,13 +2313,13 @@ Adresse: %4
</translation>
</message>
<message>
- <location line="-15"/>
+ <location line="-28"/>
<source>Don&apos;t generate coins</source>
<translation>Generér ikke coins
</translation>
</message>
<message>
- <location line="+61"/>
+ <location line="+74"/>
<source>Specify data directory</source>
<translation>Angiv databibliotek
</translation>
@@ -2201,86 +2327,88 @@ Adresse: %4
<message>
<location line="-7"/>
<source>Set database cache size in megabytes (default: 25)</source>
- <translation type="unfinished"/>
+ <translation>Sæt database cachestørrelse i megabytes (standard 25)</translation>
</message>
<message>
- <location line="-26"/>
+ <location line="-27"/>
<source>Listen for connections on &lt;port&gt; (default: 8333 or testnet: 18333)</source>
<translation>Lyt til forbindelser på &lt;port&gt; (standard: 8333 or testnet: 18333)</translation>
</message>
<message>
- <location line="+4"/>
+ <location line="+5"/>
<source>Maintain at most &lt;n&gt; connections to peers (default: 125)</source>
- <translation type="unfinished"/>
+ <translation>Oprethold højest &lt;n&gt; forbindelser til andre i netværket (standard: 125)</translation>
</message>
<message>
- <location line="-34"/>
+ <location line="-49"/>
<source>Connect to a node to retrieve peer addresses, and disconnect</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+65"/>
+ <location line="+80"/>
<source>Specify your own public address</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+2"/>
+ <location line="+3"/>
<source>Threshold for disconnecting misbehaving peers (default: 100)</source>
- <translation type="unfinished"/>
+ <translation>Grænse for afbrydelse til dårlige forbindelser (standard: 100)</translation>
</message>
<message>
- <location line="-114"/>
+ <location line="-132"/>
<source>Number of seconds to keep misbehaving peers from reconnecting (default: 86400)</source>
- <translation type="unfinished"/>
+ <translation>Antal sekunder dårlige forbindelser skal vente før reetablering (standard: 86400)</translation>
</message>
<message>
- <location line="-28"/>
+ <location line="-32"/>
<source>An error occurred while setting up the RPC port %u for listening on IPv4: %s</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+26"/>
+ <location line="+30"/>
<source>Listen for JSON-RPC connections on &lt;port&gt; (default: 8332 or testnet: 18332)</source>
<translation>Lyt til JSON-RPC-forbindelser på &lt;port&gt; (standard: 8332 or testnet: 18332)</translation>
</message>
<message>
- <location line="+34"/>
+ <location line="+36"/>
<source>Accept command line and JSON-RPC commands</source>
<translation>Accepter kommandolinje- og JSON-RPC-kommandoer
</translation>
</message>
<message>
- <location line="+62"/>
+ <location line="+77"/>
<source>Run in the background as a daemon and accept commands</source>
<translation>Kør i baggrunden som en service, og acceptér kommandoer
</translation>
</message>
<message>
- <location line="+31"/>
+ <location line="+32"/>
<source>Use the test network</source>
<translation>Brug test-netværket
</translation>
</message>
<message>
- <location line="-92"/>
+ <location line="-108"/>
<source>Accept connections from outside (default: 1 if no -proxy or -connect)</source>
<translation>Acceptér forbindelser udefra (default: 1 if no -proxy or -connect)</translation>
</message>
<message>
- <location line="-74"/>
+ <location line="-82"/>
<source>%s, you must set a rpcpassword in the configuration file:
- %s
+%s
It is recommended you use the following random password:
rpcuser=bitcoinrpc
rpcpassword=%s
(you do not need to remember this password)
The username and password MUST NOT be the same.
If the file does not exist, create it with owner-readable-only file permissions.
+It is also recommended to set alertnotify so you are notified of problems;
+for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.com
</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+15"/>
+ <location line="+17"/>
<source>An error occurred while setting up the RPC port %u for listening on IPv6, falling back to IPv4: %s</source>
<translation type="unfinished"/>
</message>
@@ -2296,11 +2424,6 @@ If the file does not exist, create it with owner-readable-only file permissions.
</message>
<message>
<location line="+3"/>
- <source>Corrupted block database detected. Please restart the client with -reindex.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+2"/>
<source>Error initializing database environment %s! To recover, BACKUP THAT DIRECTORY, then remove everything from it except for wallet.dat.</source>
<translation type="unfinished"/>
</message>
@@ -2315,12 +2438,27 @@ If the file does not exist, create it with owner-readable-only file permissions.
<translation type="unfinished"/>
</message>
<message>
+ <location line="+3"/>
+ <source>Execute command when a relevant alert is received (%s in cmd is replaced by message)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Execute command when a wallet transaction changes (%s in cmd is replaced by TxID)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location line="+11"/>
<source>Set maximum size of high-priority/low-fee transactions in bytes (default: 27000)</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+3"/>
+ <source>Set the number of script verification threads (1-16, 0=auto, default: 0)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
<source>This is a pre-release test build - use at your own risk - do not use for mining or merchant applications</source>
<translation type="unfinished"/>
</message>
@@ -2366,16 +2504,41 @@ If the file does not exist, create it with owner-readable-only file permissions.
</message>
<message>
<location line="+3"/>
+ <source>Corrupted block database detected</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Discover own IP address (default: 1 when listening and no -externalip)</source>
<translation type="unfinished"/>
</message>
<message>
+ <location line="+1"/>
+ <source>Do you want to rebuild the block database now?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location line="+3"/>
+ <source>Error initializing block database</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Error initializing wallet database environment %s!</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Error loading block database</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+5"/>
+ <location line="+4"/>
+ <source>Error opening block database</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
<source>Error: Disk space is low!</source>
<translation type="unfinished"/>
</message>
@@ -2391,26 +2554,96 @@ If the file does not exist, create it with owner-readable-only file permissions.
</message>
<message>
<location line="+2"/>
+ <source>Error: system error: </source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Failed to listen on any port. Use -listen=0 if you want this.</source>
<translation type="unfinished"/>
</message>
<message>
+ <location line="+1"/>
+ <source>Failed to read block info</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Failed to read block</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Failed to sync block index</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Failed to write block index</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Failed to write block info</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Failed to write block</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Failed to write file info</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Failed to write to coin database</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Failed to write transaction index</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Failed to write undo data</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location line="+2"/>
<source>Find peers using DNS lookup (default: 1 unless -connect)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+5"/>
- <source>How thorough the block verification is (0-4, default: 3)</source>
+ <location line="+3"/>
+ <source>How many blocks to check at startup (default: 288, 0 = all)</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+1"/>
- <source>Importing blocks from block database...</source>
+ <source>How thorough the block verification is (0-4, default: 3)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+24"/>
+ <source>Rebuild block chain index from current blk000??.dat files</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+37"/>
+ <source>Verifying blocks...</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+1"/>
+ <source>Verifying wallet...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-61"/>
<source>Imports blocks from external blk000??.dat file</source>
<translation type="unfinished"/>
</message>
@@ -2425,7 +2658,12 @@ If the file does not exist, create it with owner-readable-only file permissions.
<translation>Ugyldig -tor address: &apos;%s&apos;</translation>
</message>
<message>
- <location line="+9"/>
+ <location line="+8"/>
+ <source>Maintain a full transaction index (default: 0)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
<source>Maximum per-connection receive buffer, &lt;n&gt;*1000 bytes (default: 5000)</source>
<translation type="unfinished"/>
</message>
@@ -2457,15 +2695,10 @@ If the file does not exist, create it with owner-readable-only file permissions.
<message>
<location line="+2"/>
<source>Prepend debug output with timestamp</source>
- <translation type="unfinished"/>
+ <translation>Tilføj debug output med tidsstempel</translation>
</message>
<message>
- <location line="+1"/>
- <source>Rebuild blockchain index from current blk000??.dat files</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+4"/>
+ <location line="+5"/>
<source>SSL options: (see the Bitcoin Wiki for SSL setup instructions)</source>
<translation>SSL-indstillinger: (se Bitcoin Wiki for SSL opsætningsinstruktioner)</translation>
</message>
@@ -2477,12 +2710,12 @@ If the file does not exist, create it with owner-readable-only file permissions.
<message>
<location line="+3"/>
<source>Send trace/debug info to console instead of debug.log file</source>
- <translation type="unfinished"/>
+ <translation>Send trace/debug info til konsollen i stedet for debug.log filen</translation>
</message>
<message>
<location line="+1"/>
<source>Send trace/debug info to debugger</source>
- <translation type="unfinished"/>
+ <translation>Send trace/debug info til debuggeren</translation>
</message>
<message>
<location line="+5"/>
@@ -2505,7 +2738,12 @@ If the file does not exist, create it with owner-readable-only file permissions.
<translation>Angiv tilslutningstimeout i millisekunder (standard: 5000)</translation>
</message>
<message>
- <location line="+13"/>
+ <location line="+4"/>
+ <source>System error: </source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+10"/>
<source>Use UPnP to map the listening port (default: 0)</source>
<translation>Forsøg at bruge UPnP til at kofnigurere den lyttende port (standard: 0)</translation>
</message>
@@ -2537,39 +2775,44 @@ If the file does not exist, create it with owner-readable-only file permissions.
</message>
<message>
<location line="+1"/>
+ <source>You need to rebuild the databases using -reindex to change -txindex</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>wallet.dat corrupt, salvage failed</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-43"/>
+ <location line="-45"/>
<source>Password for JSON-RPC connections</source>
<translation>Password til JSON-RPC-forbindelser
</translation>
</message>
<message>
- <location line="-53"/>
+ <location line="-68"/>
<source>Allow JSON-RPC connections from specified IP address</source>
<translation>Tillad JSON-RPC-forbindelser fra bestemt IP-adresse
</translation>
</message>
<message>
- <location line="+62"/>
+ <location line="+77"/>
<source>Send commands to node running on &lt;ip&gt; (default: 127.0.0.1)</source>
<translation>Send kommandoer til node, der kører på &lt;ip&gt; (standard: 127.0.0.1)
</translation>
</message>
<message>
- <location line="-103"/>
+ <location line="-120"/>
<source>Execute command when the best block changes (%s in cmd is replaced by block hash)</source>
- <translation type="unfinished"/>
+ <translation>Udfør kommando når den bedste blok ændres (%s i cmd erstattes med blok hash)</translation>
</message>
<message>
- <location line="+124"/>
+ <location line="+142"/>
<source>Upgrade wallet to latest format</source>
- <translation type="unfinished"/>
+ <translation>Opgrader tegnebog til seneste format</translation>
</message>
<message>
- <location line="-15"/>
+ <location line="-16"/>
<source>Set key pool size to &lt;n&gt; (default: 100)</source>
<translation>Sæt nøglepoolstørrelse til &lt;n&gt; (standard: 100)
</translation>
@@ -2581,18 +2824,13 @@ If the file does not exist, create it with owner-readable-only file permissions.
</translation>
</message>
<message>
- <location line="-26"/>
- <source>How many blocks to check at startup (default: 2500, 0 = all)</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+55"/>
+ <location line="+30"/>
<source>Use OpenSSL (https) for JSON-RPC connections</source>
<translation>Brug OpenSSL (https) for JSON-RPC-forbindelser
</translation>
</message>
<message>
- <location line="-20"/>
+ <location line="-21"/>
<source>Server certificate file (default: server.cert)</source>
<translation>Servercertifikat-fil (standard: server.cert)
</translation>
@@ -2604,13 +2842,13 @@ If the file does not exist, create it with owner-readable-only file permissions.
</translation>
</message>
<message>
- <location line="-133"/>
+ <location line="-154"/>
<source>Acceptable ciphers (default: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH)</source>
<translation>Acceptabele ciphers (standard: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH)
</translation>
</message>
<message>
- <location line="+144"/>
+ <location line="+166"/>
<source>This help message</source>
<translation>Denne hjælpebesked
</translation>
@@ -2621,7 +2859,7 @@ If the file does not exist, create it with owner-readable-only file permissions.
<translation>Kunne ikke binde sig til %s på denne computer (bind returned error %d, %s)</translation>
</message>
<message>
- <location line="-70"/>
+ <location line="-86"/>
<source>Connect through socks proxy</source>
<translation>Tilslut via SOCKS proxy</translation>
</message>
@@ -2631,12 +2869,12 @@ If the file does not exist, create it with owner-readable-only file permissions.
<translation>Tillad DNS-opslag for addnode og connect</translation>
</message>
<message>
- <location line="+43"/>
+ <location line="+57"/>
<source>Loading addresses...</source>
<translation>Indlæser adresser...</translation>
</message>
<message>
- <location line="-25"/>
+ <location line="-35"/>
<source>Error loading wallet.dat: Wallet corrupted</source>
<translation>Fejl ved indlæsning af wallet.dat: Tegnebog ødelagt</translation>
</message>
@@ -2646,32 +2884,22 @@ If the file does not exist, create it with owner-readable-only file permissions.
<translation>Fejl ved indlæsning af wallet.dat: Tegnebog kræver en nyere version af Bitcoin</translation>
</message>
<message>
- <location line="+73"/>
- <source>Verifying block database integrity...</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+1"/>
- <source>Verifying wallet integrity...</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+1"/>
+ <location line="+87"/>
<source>Wallet needed to be rewritten: restart Bitcoin to complete</source>
- <translation type="unfinished"/>
+ <translation>Det var nødvendigt at genskrive tegnebogen: genstart Bitcoin for at gennemføre</translation>
</message>
<message>
- <location line="-77"/>
+ <location line="-89"/>
<source>Error loading wallet.dat</source>
<translation>Fejl ved indlæsning af wallet.dat</translation>
</message>
<message>
- <location line="+20"/>
+ <location line="+30"/>
<source>Invalid -proxy address: &apos;%s&apos;</source>
<translation>Ugyldig -proxy adresse: &apos;%s&apos;</translation>
</message>
<message>
- <location line="+46"/>
+ <location line="+48"/>
<source>Unknown network specified in -onlynet: &apos;%s&apos;</source>
<translation type="unfinished"/>
</message>
@@ -2681,7 +2909,7 @@ If the file does not exist, create it with owner-readable-only file permissions.
<translation type="unfinished"/>
</message>
<message>
- <location line="-75"/>
+ <location line="-91"/>
<source>Cannot resolve -bind address: &apos;%s&apos;</source>
<translation type="unfinished"/>
</message>
@@ -2691,17 +2919,17 @@ If the file does not exist, create it with owner-readable-only file permissions.
<translation type="unfinished"/>
</message>
<message>
- <location line="+31"/>
+ <location line="+45"/>
<source>Invalid amount for -paytxfee=&lt;amount&gt;: &apos;%s&apos;</source>
<translation>Ugyldigt beløb for -paytxfee=&lt;amount&gt;: &apos;%s&apos;</translation>
</message>
<message>
- <location line="-15"/>
+ <location line="-24"/>
<source>Error: could not start node</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+16"/>
+ <location line="+25"/>
<source>Invalid amount</source>
<translation>Ugyldigt beløb</translation>
</message>
@@ -2716,7 +2944,7 @@ If the file does not exist, create it with owner-readable-only file permissions.
<translation>Indlæser blok-indeks...</translation>
</message>
<message>
- <location line="-45"/>
+ <location line="-59"/>
<source>Add a node to connect to and attempt to keep the connection open</source>
<translation>Tilføj en node til at forbinde til and attempt to keep the connection open</translation>
</message>
@@ -2726,57 +2954,52 @@ If the file does not exist, create it with owner-readable-only file permissions.
<translation>Kunne ikke binde sig til %s på denne computer. Bitcoin kører sikkert allerede.</translation>
</message>
<message>
- <location line="+54"/>
- <source>Find peers using internet relay chat (default: 0)</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="-2"/>
+ <location line="+68"/>
<source>Fee per KB to add to transactions you send</source>
<translation>Gebyr pr. kB, som skal tilføjes til transaktioner du sender</translation>
</message>
<message>
- <location line="+19"/>
+ <location line="+17"/>
<source>Loading wallet...</source>
<translation>Indlæser tegnebog...</translation>
</message>
<message>
- <location line="-40"/>
+ <location line="-54"/>
<source>Cannot downgrade wallet</source>
- <translation type="unfinished"/>
+ <translation>Kan ikke nedgradere tegnebog</translation>
</message>
<message>
<location line="+1"/>
<source>Cannot initialize keypool</source>
- <translation type="unfinished"/>
+ <translation>Kan ikke påbegynde nøglepulje</translation>
</message>
<message>
<location line="+3"/>
<source>Cannot write default address</source>
- <translation type="unfinished"/>
+ <translation>Kan ikke skrive standard adresse</translation>
</message>
<message>
- <location line="+49"/>
+ <location line="+64"/>
<source>Rescanning...</source>
<translation>Genindlæser...</translation>
</message>
<message>
- <location line="-43"/>
+ <location line="-56"/>
<source>Done loading</source>
<translation>Indlæsning gennemført</translation>
</message>
<message>
- <location line="+65"/>
+ <location line="+79"/>
<source>To use the %s option</source>
- <translation type="unfinished"/>
+ <translation>For at bruge %s mulighed</translation>
</message>
<message>
- <location line="-60"/>
+ <location line="-71"/>
<source>Error</source>
- <translation type="unfinished"/>
+ <translation>Fejl</translation>
</message>
<message>
- <location line="-28"/>
+ <location line="-33"/>
<source>You must set rpcpassword=&lt;password&gt; in the configuration file:
%s
If the file does not exist, create it with owner-readable-only file permissions.</source>
diff --git a/src/qt/locale/bitcoin_de.ts b/src/qt/locale/bitcoin_de.ts
index 27168c876f..86e0982316 100644
--- a/src/qt/locale/bitcoin_de.ts
+++ b/src/qt/locale/bitcoin_de.ts
@@ -13,12 +13,7 @@
<translation>&lt;b&gt;Bitcoin&lt;/b&gt;-Version</translation>
</message>
<message>
- <location line="+41"/>
- <source>Copyright © 2009-2012 The Bitcoin developers</source>
- <translation>Copyright © 2009-2012 Die Bitcoinentwickler</translation>
- </message>
- <message>
- <location line="+13"/>
+ <location line="+57"/>
<source>
This is experimental software.
@@ -32,6 +27,16 @@ Veröffentlicht unter der MIT/X11-Softwarelizenz, siehe beiligende Datei COPYING
Dieses Produkt enthält Software, die vom OpenSSL-Projekt zur Verwendung im OpenSSL-Toolkit (http://www.openssl.org/) entwickelt wurde, sowie kryptographische Software geschrieben von Eric Young (eay@cryptsoft.com) und UPnP-Software geschrieben von Thomas Bernard.</translation>
</message>
+ <message>
+ <location filename="../aboutdialog.cpp" line="+17"/>
+ <source>Copyright</source>
+ <translation>Copyright</translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>2009-%1 The Bitcoin developers</source>
+ <translation>2009-%1 Die Bitcoinentwickler</translation>
+ </message>
</context>
<context>
<name>AddressBookPage</name>
@@ -106,17 +111,22 @@ Dieses Produkt enthält Software, die vom OpenSSL-Projekt zur Verwendung im Open
<translation>&amp;Löschen</translation>
</message>
<message>
- <location filename="../addressbookpage.cpp" line="+65"/>
+ <location filename="../addressbookpage.cpp" line="+66"/>
<source>Copy &amp;Label</source>
<translation>&amp;Bezeichnung kopieren</translation>
</message>
<message>
- <location line="+2"/>
+ <location line="+1"/>
<source>&amp;Edit</source>
<translation>&amp;Editieren</translation>
</message>
<message>
- <location line="+250"/>
+ <location line="+1"/>
+ <source>Send &amp;Coins</source>
+ <translation>Bitcoins &amp;überweisen</translation>
+ </message>
+ <message>
+ <location line="+263"/>
<source>Export Address Book Data</source>
<translation>Adressbuch exportieren</translation>
</message>
@@ -139,7 +149,7 @@ Dieses Produkt enthält Software, die vom OpenSSL-Projekt zur Verwendung im Open
<context>
<name>AddressTableModel</name>
<message>
- <location filename="../addresstablemodel.cpp" line="+142"/>
+ <location filename="../addresstablemodel.cpp" line="+144"/>
<source>Label</source>
<translation>Bezeichnung</translation>
</message>
@@ -298,17 +308,17 @@ Dieses Produkt enthält Software, die vom OpenSSL-Projekt zur Verwendung im Open
<context>
<name>BitcoinGUI</name>
<message>
- <location filename="../bitcoingui.cpp" line="+267"/>
+ <location filename="../bitcoingui.cpp" line="+231"/>
<source>Sign &amp;message...</source>
<translation>Nachricht s&amp;ignieren...</translation>
</message>
<message>
- <location line="+254"/>
+ <location line="+299"/>
<source>Synchronizing with network...</source>
<translation>Synchronisiere mit Netzwerk...</translation>
</message>
<message>
- <location line="-322"/>
+ <location line="-367"/>
<source>&amp;Overview</source>
<translation>&amp;Ãœbersicht</translation>
</message>
@@ -328,32 +338,17 @@ Dieses Produkt enthält Software, die vom OpenSSL-Projekt zur Verwendung im Open
<translation>Transaktionsverlauf durchsehen</translation>
</message>
<message>
- <location line="+6"/>
- <source>&amp;Address Book</source>
- <translation>&amp;Adressbuch</translation>
- </message>
- <message>
- <location line="+1"/>
+ <location line="+7"/>
<source>Edit the list of stored addresses and labels</source>
<translation>Liste der gespeicherten Zahlungsadressen und Bezeichnungen bearbeiten</translation>
</message>
<message>
- <location line="-15"/>
- <source>&amp;Receive coins</source>
- <translation>Bitcoins &amp;empfangen</translation>
- </message>
- <message>
- <location line="+1"/>
+ <location line="-14"/>
<source>Show the list of addresses for receiving payments</source>
<translation>Liste der Empfangsadressen anzeigen</translation>
</message>
<message>
- <location line="-8"/>
- <source>&amp;Send coins</source>
- <translation>Bitcoins &amp;überweisen</translation>
- </message>
- <message>
- <location line="+39"/>
+ <location line="+31"/>
<source>E&amp;xit</source>
<translation>&amp;Beenden</translation>
</message>
@@ -398,7 +393,7 @@ Dieses Produkt enthält Software, die vom OpenSSL-Projekt zur Verwendung im Open
<translation>Passphrase &amp;ändern...</translation>
</message>
<message>
- <location line="+259"/>
+ <location line="+304"/>
<source>Importing blocks from disk...</source>
<translation>Importiere Blöcke von Laufwerk...</translation>
</message>
@@ -407,13 +402,8 @@ Dieses Produkt enthält Software, die vom OpenSSL-Projekt zur Verwendung im Open
<source>Reindexing blocks on disk...</source>
<translation>Reindiziere Blöcke auf Laufwerk...</translation>
</message>
- <message numerus="yes">
- <location line="+10"/>
- <source>~%n block(s) remaining</source>
- <translation><numerusform>~%n Block verbleibend</numerusform><numerusform>~%n Blöcke verbleibend</numerusform></translation>
- </message>
<message>
- <location line="-265"/>
+ <location line="-300"/>
<source>&amp;Export...</source>
<translation>&amp;Exportieren...</translation>
</message>
@@ -458,18 +448,33 @@ Dieses Produkt enthält Software, die vom OpenSSL-Projekt zur Verwendung im Open
<translation>Nachricht &amp;verifizieren...</translation>
</message>
<message>
- <location line="-196"/>
- <location line="+538"/>
+ <location line="-162"/>
+ <location line="+540"/>
<source>Bitcoin</source>
<translation>Bitcoin</translation>
</message>
<message>
- <location line="-538"/>
+ <location line="-540"/>
<source>Wallet</source>
<translation>Brieftasche</translation>
</message>
<message>
- <location line="+176"/>
+ <location line="+99"/>
+ <source>&amp;Send</source>
+ <translation>Ãœberweisen</translation>
+ </message>
+ <message>
+ <location line="+7"/>
+ <source>&amp;Receive</source>
+ <translation>&amp;Empfangen</translation>
+ </message>
+ <message>
+ <location line="+14"/>
+ <source>&amp;Addresses</source>
+ <translation>&amp;Adressen</translation>
+ </message>
+ <message>
+ <location line="+22"/>
<source>&amp;About Bitcoin</source>
<translation>&amp;Ãœber Bitcoin</translation>
</message>
@@ -530,27 +535,57 @@ Dieses Produkt enthält Software, die vom OpenSSL-Projekt zur Verwendung im Open
<translation>[Testnetz]</translation>
</message>
<message>
- <location line="+63"/>
+ <location line="+47"/>
<source>Bitcoin client</source>
<translation>Bitcoin-Client</translation>
</message>
<message numerus="yes">
- <location line="+79"/>
+ <location line="+140"/>
<source>%n active connection(s) to Bitcoin network</source>
<translation><numerusform>%n aktive Verbindung zum Bitcoin-Netzwerk</numerusform><numerusform>%n aktive Verbindungen zum Bitcoin-Netzwerk</numerusform></translation>
</message>
<message>
- <location line="+45"/>
- <source>Processed %1 of %2 blocks of transaction history (%3% done).</source>
- <translation>%1 von %2 Blöcken des Transaktionsverlaufs verarbeitet (%3% fertig).</translation>
+ <location line="+39"/>
+ <source>Processed %1 of %2 (estimated) blocks of transaction history.</source>
+ <translation>%1 von (geschätzten) %2 Blöcken des Transaktionsverlaufs verarbeitet.</translation>
</message>
<message>
- <location line="+7"/>
+ <location line="+4"/>
<source>Processed %1 blocks of transaction history.</source>
<translation>%1 Blöcke des Transaktionsverlaufs verarbeitet.</translation>
</message>
+ <message numerus="yes">
+ <location line="+20"/>
+ <source>%n hour(s)</source>
+ <translation><numerusform>%n Stunde</numerusform><numerusform>%n Stunden</numerusform></translation>
+ </message>
+ <message numerus="yes">
+ <location line="+4"/>
+ <source>%n day(s)</source>
+ <translation><numerusform>%n Tag</numerusform><numerusform>%n Tage</numerusform></translation>
+ </message>
+ <message numerus="yes">
+ <location line="+4"/>
+ <source>%n week(s)</source>
+ <translation><numerusform>%n Woche</numerusform><numerusform>%n Wochen</numerusform></translation>
+ </message>
<message>
- <location line="+70"/>
+ <location line="+5"/>
+ <source>%1 behind</source>
+ <translation>%1 im Rückstand</translation>
+ </message>
+ <message>
+ <location line="+14"/>
+ <source>Last received block was generated %1 ago.</source>
+ <translation>Der letzte empfangene Block ist %1 alt.</translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Transactions after this will not yet be visible.</source>
+ <translation>Transaktionen hiernach werden noch nicht angezeigt.</translation>
+ </message>
+ <message>
+ <location line="+21"/>
<source>Error</source>
<translation>Fehler</translation>
</message>
@@ -565,62 +600,27 @@ Dieses Produkt enthält Software, die vom OpenSSL-Projekt zur Verwendung im Open
<translation>Hinweis</translation>
</message>
<message>
- <location line="+66"/>
+ <location line="+68"/>
<source>This transaction is over the size limit. You can still send it for a fee of %1, which goes to the nodes that process your transaction and helps to support the network. Do you want to pay the fee?</source>
<translation>Die Transaktion übersteigt das Größenlimit. Sie können sie trotzdem senden, wenn Sie eine zusätzliche Transaktionsgebühr in Höhe von %1 zahlen. Diese wird an die Knoten verteilt, die Ihre Transaktion bearbeiten und unterstützt damit das Bitcoin-Netzwerk. Möchten Sie die Gebühr bezahlen?</translation>
</message>
<message>
- <location line="+210"/>
- <source>Backup Successful</source>
- <translation>Sicherung erfolgreich</translation>
- </message>
- <message>
- <location line="+0"/>
- <source>The wallet data was successfully saved to the new location.</source>
- <translation>Speichern der Brieftaschendaten an die neue Position war erfolgreich.</translation>
- </message>
- <message numerus="yes">
- <location line="-338"/>
- <source>%n second(s) ago</source>
- <translation><numerusform>vor %n Sekunde</numerusform><numerusform>vor %n Sekunden</numerusform></translation>
- </message>
- <message numerus="yes">
- <location line="+4"/>
- <source>%n minute(s) ago</source>
- <translation><numerusform>vor %n Minute</numerusform><numerusform>vor %n Minuten</numerusform></translation>
- </message>
- <message numerus="yes">
- <location line="+4"/>
- <source>%n hour(s) ago</source>
- <translation><numerusform>vor %n Stunde</numerusform><numerusform>vor %n Stunden</numerusform></translation>
- </message>
- <message numerus="yes">
- <location line="+4"/>
- <source>%n day(s) ago</source>
- <translation><numerusform>vor %n Tag</numerusform><numerusform>vor %n Tagen</numerusform></translation>
- </message>
- <message>
- <location line="+6"/>
+ <location line="-138"/>
<source>Up to date</source>
<translation>Auf aktuellem Stand</translation>
</message>
<message>
- <location line="+7"/>
+ <location line="+32"/>
<source>Catching up...</source>
<translation>Hole auf...</translation>
</message>
<message>
- <location line="+10"/>
- <source>Last received block was generated %1.</source>
- <translation>Der letzte empfangene Block wurde %1 generiert.</translation>
- </message>
- <message>
- <location line="+97"/>
+ <location line="+110"/>
<source>Confirm transaction fee</source>
<translation>Transaktionsgebühr bestätigen</translation>
</message>
<message>
- <location line="+23"/>
+ <location line="+8"/>
<source>Sent transaction</source>
<translation>Gesendete Transaktion</translation>
</message>
@@ -642,14 +642,14 @@ Typ: %3
Adresse: %4</translation>
</message>
<message>
- <location line="+99"/>
- <location line="+28"/>
+ <location line="+33"/>
+ <location line="+23"/>
<source>URI handling</source>
<translation>URI Verarbeitung</translation>
</message>
<message>
- <location line="-28"/>
- <location line="+28"/>
+ <location line="-23"/>
+ <location line="+23"/>
<source>URI can not be parsed! This can be caused by an invalid Bitcoin address or malformed URI parameters.</source>
<translation>URI kann nicht analysiert werden! Dies kann durch eine ungültige Bitcoin-Adresse oder fehlerhafte URI-Parameter verursacht werden.</translation>
</message>
@@ -664,27 +664,7 @@ Adresse: %4</translation>
<translation>Brieftasche ist &lt;b&gt;verschlüsselt&lt;/b&gt; und aktuell &lt;b&gt;gesperrt&lt;/b&gt;</translation>
</message>
<message>
- <location line="+23"/>
- <source>Backup Wallet</source>
- <translation>Brieftasche sichern</translation>
- </message>
- <message>
- <location line="+0"/>
- <source>Wallet Data (*.dat)</source>
- <translation>Brieftaschendaten (*.dat)</translation>
- </message>
- <message>
- <location line="+3"/>
- <source>Backup Failed</source>
- <translation>Sicherung fehlgeschlagen</translation>
- </message>
- <message>
- <location line="+0"/>
- <source>There was an error trying to save the wallet data to the new location.</source>
- <translation>Beim Speichern der Brieftaschendaten an die neue Position ist ein Fehler aufgetreten.</translation>
- </message>
- <message>
- <location filename="../bitcoin.cpp" line="+109"/>
+ <location filename="../bitcoin.cpp" line="+108"/>
<source>A fatal error occurred. Bitcoin can no longer continue safely and will quit.</source>
<translation>Ein schwerer Fehler ist aufgetreten. Bitcoin kann nicht stabil weiter ausgeführt werden und wird beendet.</translation>
</message>
@@ -692,7 +672,7 @@ Adresse: %4</translation>
<context>
<name>ClientModel</name>
<message>
- <location filename="../clientmodel.cpp" line="+86"/>
+ <location filename="../clientmodel.cpp" line="+96"/>
<source>Network Alert</source>
<translation>Netzwerkalarm</translation>
</message>
@@ -725,7 +705,7 @@ Adresse: %4</translation>
<translation>Die Adresse des Adressbucheintrags. Diese kann nur für Zahlungsadressen bearbeitet werden.</translation>
</message>
<message>
- <location filename="../editaddressdialog.cpp" line="+20"/>
+ <location filename="../editaddressdialog.cpp" line="+21"/>
<source>New receiving address</source>
<translation>Neue Empfangsadresse</translation>
</message>
@@ -745,17 +725,17 @@ Adresse: %4</translation>
<translation>Zahlungsadresse bearbeiten</translation>
</message>
<message>
- <location line="+60"/>
+ <location line="+76"/>
<source>The entered address &quot;%1&quot; is already in the address book.</source>
<translation>Die eingegebene Adresse &quot;%1&quot; befindet sich bereits im Adressbuch.</translation>
</message>
<message>
- <location line="+5"/>
+ <location line="-5"/>
<source>The entered address &quot;%1&quot; is not a valid Bitcoin address.</source>
<translation>Die eingegebene Adresse &quot;%1&quot; ist keine gültige Bitcoin-Adresse.</translation>
</message>
<message>
- <location line="+5"/>
+ <location line="+10"/>
<source>Could not unlock wallet.</source>
<translation>Die Brieftasche konnte nicht entsperrt werden.</translation>
</message>
@@ -768,7 +748,7 @@ Adresse: %4</translation>
<context>
<name>GUIUtil::HelpMessageBox</name>
<message>
- <location filename="../guiutil.cpp" line="+419"/>
+ <location filename="../guiutil.cpp" line="+422"/>
<location line="+12"/>
<source>Bitcoin-Qt</source>
<translation>Bitcoin-Qt</translation>
@@ -982,7 +962,7 @@ Adresse: %4</translation>
<translation>&amp;Ãœbernehmen</translation>
</message>
<message>
- <location filename="../optionsdialog.cpp" line="+55"/>
+ <location filename="../optionsdialog.cpp" line="+53"/>
<source>default</source>
<translation>Standard</translation>
</message>
@@ -1027,23 +1007,18 @@ Adresse: %4</translation>
<translation>Formular</translation>
</message>
<message>
- <location line="+51"/>
- <location line="+183"/>
+ <location line="+50"/>
+ <location line="+166"/>
<source>The displayed information may be out of date. Your wallet automatically synchronizes with the Bitcoin network after a connection is established, but this process has not completed yet.</source>
<translation>Die angezeigten Informationen sind möglicherweise nicht mehr aktuell. Ihre Brieftasche wird automatisch synchronisiert, nachdem eine Verbindung zum Bitcoin-Netzwerk hergestellt wurde. Dieser Prozess ist jedoch derzeit noch nicht abgeschlossen.</translation>
</message>
<message>
- <location line="-141"/>
+ <location line="-124"/>
<source>Balance:</source>
<translation>Kontostand:</translation>
</message>
<message>
- <location line="+58"/>
- <source>Number of transactions:</source>
- <translation>Anzahl der Transaktionen:</translation>
- </message>
- <message>
- <location line="-29"/>
+ <location line="+29"/>
<source>Unconfirmed:</source>
<translation>Unbestätigt:</translation>
</message>
@@ -1053,7 +1028,7 @@ Adresse: %4</translation>
<translation>Brieftasche</translation>
</message>
<message>
- <location line="+124"/>
+ <location line="+107"/>
<source>Immature:</source>
<translation>Unreif:</translation>
</message>
@@ -1068,7 +1043,7 @@ Adresse: %4</translation>
<translation>&lt;b&gt;Letzte Transaktionen&lt;/b&gt;</translation>
</message>
<message>
- <location line="-118"/>
+ <location line="-101"/>
<source>Your current balance</source>
<translation>Ihr aktueller Kontostand</translation>
</message>
@@ -1078,11 +1053,6 @@ Adresse: %4</translation>
<translation>Betrag aus unbestätigten Transaktionen, der noch nicht im aktuellen Kontostand enthalten ist</translation>
</message>
<message>
- <location line="+20"/>
- <source>Total number of transactions in wallet</source>
- <translation>Anzahl aller Transaktionen in der Brieftasche</translation>
- </message>
- <message>
<location filename="../overviewpage.cpp" line="+115"/>
<location line="+1"/>
<source>out of sync</source>
@@ -1090,6 +1060,14 @@ Adresse: %4</translation>
</message>
</context>
<context>
+ <name>PaymentServer</name>
+ <message>
+ <location filename="../paymentserver.cpp" line="+107"/>
+ <source>Cannot start bitcoin: click-to-pay handler</source>
+ <translation>&quot;bitcoin: Klicken-zum-Bezahlen&quot;-Handler konnte nicht gestartet werden</translation>
+ </message>
+</context>
+<context>
<name>QRCodeDialog</name>
<message>
<location filename="../forms/qrcodedialog.ui" line="+14"/>
@@ -1428,7 +1406,7 @@ Adresse: %4</translation>
</message>
<message>
<location line="+60"/>
- <location filename="../sendcoinsentry.cpp" line="+25"/>
+ <location filename="../sendcoinsentry.cpp" line="+26"/>
<source>Enter a label for this address to add it to your address book</source>
<translation>Adressbezeichnung eingeben (diese wird zusammen mit der Adresse dem Adressbuch hinzugefügt)</translation>
</message>
@@ -1664,7 +1642,7 @@ Adresse: %4</translation>
<context>
<name>TransactionDesc</name>
<message>
- <location filename="../transactiondesc.cpp" line="+19"/>
+ <location filename="../transactiondesc.cpp" line="+20"/>
<source>Open until %1</source>
<translation>Offen bis %1</translation>
</message>
@@ -1851,7 +1829,7 @@ Adresse: %4</translation>
<context>
<name>TransactionTableModel</name>
<message>
- <location filename="../transactiontablemodel.cpp" line="+226"/>
+ <location filename="../transactiontablemodel.cpp" line="+225"/>
<source>Date</source>
<translation>Datum</translation>
</message>
@@ -1969,7 +1947,7 @@ Adresse: %4</translation>
<context>
<name>TransactionView</name>
<message>
- <location filename="../transactionview.cpp" line="+55"/>
+ <location filename="../transactionview.cpp" line="+52"/>
<location line="+16"/>
<source>All</source>
<translation>Alle</translation>
@@ -2056,6 +2034,11 @@ Adresse: %4</translation>
</message>
<message>
<location line="+1"/>
+ <source>Copy transaction ID</source>
+ <translation>Transaktions-ID kopieren</translation>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Edit label</source>
<translation>Bezeichnung bearbeiten</translation>
</message>
@@ -2065,7 +2048,7 @@ Adresse: %4</translation>
<translation>Transaktionsdetails anzeigen</translation>
</message>
<message>
- <location line="+142"/>
+ <location line="+139"/>
<source>Export Transaction Data</source>
<translation>Transaktionen exportieren</translation>
</message>
@@ -2120,7 +2103,7 @@ Adresse: %4</translation>
<translation>Konnte nicht in Datei %1 schreiben.</translation>
</message>
<message>
- <location line="+95"/>
+ <location line="+100"/>
<source>Range:</source>
<translation>Zeitraum:</translation>
</message>
@@ -2131,29 +2114,172 @@ Adresse: %4</translation>
</message>
</context>
<context>
+ <name>WalletView</name>
+ <message>
+ <location filename="../walletview.cpp" line="+95"/>
+ <source>&amp;Overview</source>
+ <translation>Ãœbersicht</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Show general overview of wallet</source>
+ <translation>Allgemeine Ãœbersicht der Brieftasche anzeigen</translation>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>&amp;Send coins</source>
+ <translation>Bitcoins senden</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Send coins to a Bitcoin address</source>
+ <translation>Bitcoins an eine Bitcoin-Adresse überweisen</translation>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>&amp;Receive coins</source>
+ <translation>Bitcoins empfangen</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Show the list of addresses for receiving payments</source>
+ <translation>Empfangsadressen anzeigen</translation>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>&amp;Transactions</source>
+ <translation>Transaktionen</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Browse transaction history</source>
+ <translation>Transaktionsverlauf durchsehen</translation>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>&amp;Address Book</source>
+ <translation>Adressbuch</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Edit the list of stored addresses and labels</source>
+ <translation>Adressen bearbeiten</translation>
+ </message>
+ <message>
+ <location line="+12"/>
+ <source>&amp;Encrypt Wallet...</source>
+ <translation>Brieftasche &amp;verschlüsseln...</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Encrypt the private keys that belong to your wallet</source>
+ <translation>Verschlüsselt die zu Ihrer Brieftasche gehörenden privaten Schlüssel</translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>&amp;Backup Wallet...</source>
+ <translation>Brieftasche &amp;sichern...</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Backup wallet to another location</source>
+ <translation>Eine Sicherungskopie der Brieftasche erstellen und abspeichern</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>&amp;Change Passphrase...</source>
+ <translation>Passphrase &amp;ändern...</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Change the passphrase used for wallet encryption</source>
+ <translation>Ändert die Passphrase, die für die Verschlüsselung der Brieftasche benutzt wird</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Sign &amp;message...</source>
+ <translation>Nachricht s&amp;ignieren...</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Sign messages with your Bitcoin addresses to prove you own them</source>
+ <translation>Nachrichten signieren, um den Besitz Ihrer Bitcoin-Adressen zu beweisen</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>&amp;Verify message...</source>
+ <translation>Nachricht &amp;verifizieren...</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Verify messages to ensure they were signed with specified Bitcoin addresses</source>
+ <translation>Nachrichten verifizieren, um sicherzustellen, dass diese mit den angegebenen Bitcoin-Adressen signiert wurden</translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>&amp;Export...</source>
+ <translation>Exportieren...</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Export the data in the current tab to a file</source>
+ <translation>Daten der aktuellen Ansicht in eine Datei exportieren</translation>
+ </message>
+ <message>
+ <location line="+180"/>
+ <source>Backup Wallet</source>
+ <translation>Brieftasche sichern</translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>Wallet Data (*.dat)</source>
+ <translation>Brieftaschendaten (*.dat)</translation>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Backup Failed</source>
+ <translation>Sicherung fehlgeschlagen</translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>There was an error trying to save the wallet data to the new location.</source>
+ <translation>Beim Speichern der Brieftaschendaten an die neue Position ist ein Fehler aufgetreten.</translation>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>Backup Successful</source>
+ <translation>Sicherung erfolgreich</translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>The wallet data was successfully saved to the new location.</source>
+ <translation>Speichern der Brieftaschendaten an die neue Position war erfolgreich.</translation>
+ </message>
+</context>
+<context>
<name>bitcoin-core</name>
<message>
- <location filename="../bitcoinstrings.cpp" line="+88"/>
+ <location filename="../bitcoinstrings.cpp" line="+96"/>
<source>Bitcoin version</source>
<translation>Bitcoin-Version</translation>
</message>
<message>
- <location line="+82"/>
+ <location line="+98"/>
<source>Usage:</source>
<translation>Benutzung:</translation>
</message>
<message>
- <location line="-23"/>
+ <location line="-24"/>
<source>Send command to -server or bitcoind</source>
<translation>Befehl an -server oder bitcoind senden</translation>
</message>
<message>
- <location line="-21"/>
+ <location line="-22"/>
<source>List commands</source>
<translation>Befehle auflisten</translation>
</message>
<message>
- <location line="-11"/>
+ <location line="-10"/>
<source>Get help for a command</source>
<translation>Hilfe zu einem Befehl erhalten</translation>
</message>
@@ -2178,12 +2304,12 @@ Adresse: %4</translation>
<translation>Bitcoins generieren</translation>
</message>
<message>
- <location line="-15"/>
+ <location line="-28"/>
<source>Don&apos;t generate coins</source>
<translation>Keine Bitcoins generieren</translation>
</message>
<message>
- <location line="+61"/>
+ <location line="+74"/>
<source>Specify data directory</source>
<translation>Datenverzeichnis festlegen</translation>
</message>
@@ -2193,86 +2319,92 @@ Adresse: %4</translation>
<translation>Größe des Datenbankcaches in MB festlegen (Standard: 25)</translation>
</message>
<message>
- <location line="-26"/>
+ <location line="-27"/>
<source>Listen for connections on &lt;port&gt; (default: 8333 or testnet: 18333)</source>
<translation>&lt;port&gt; nach Verbindungen abhören (Standard: 8333 oder Testnetz: 18333)</translation>
</message>
<message>
- <location line="+4"/>
+ <location line="+5"/>
<source>Maintain at most &lt;n&gt; connections to peers (default: 125)</source>
<translation>Maximal &lt;n&gt; Verbindungen zu Gegenstellen aufrechterhalten (Standard: 125)</translation>
</message>
<message>
- <location line="-34"/>
+ <location line="-49"/>
<source>Connect to a node to retrieve peer addresses, and disconnect</source>
<translation>Mit dem Knoten verbinden um Adressen von Gegenstellen abzufragen, danach trennen</translation>
</message>
<message>
- <location line="+65"/>
+ <location line="+80"/>
<source>Specify your own public address</source>
<translation>Die eigene öffentliche Adresse angeben</translation>
</message>
<message>
- <location line="+2"/>
+ <location line="+3"/>
<source>Threshold for disconnecting misbehaving peers (default: 100)</source>
<translation>Schwellenwert, um Verbindungen zu sich nicht konform verhaltenden Gegenstellen zu beenden (Standard: 100)</translation>
</message>
<message>
- <location line="-114"/>
+ <location line="-132"/>
<source>Number of seconds to keep misbehaving peers from reconnecting (default: 86400)</source>
<translation>Anzahl Sekunden, während denen sich nicht konform verhaltenden Gegenstellen die Wiederverbindung verweigert wird (Standard: 86400)</translation>
</message>
<message>
- <location line="-28"/>
+ <location line="-32"/>
<source>An error occurred while setting up the RPC port %u for listening on IPv4: %s</source>
<translation>Beim Einrichten des abzuhörenden RPC-Ports %u für IPv4 ist ein Fehler aufgetreten: %s</translation>
</message>
<message>
- <location line="+26"/>
+ <location line="+30"/>
<source>Listen for JSON-RPC connections on &lt;port&gt; (default: 8332 or testnet: 18332)</source>
<translation>&lt;port&gt; nach JSON-RPC-Verbindungen abhören (Standard: 8332 oder Testnetz: 18332)</translation>
</message>
<message>
- <location line="+34"/>
+ <location line="+36"/>
<source>Accept command line and JSON-RPC commands</source>
<translation>Kommandozeilenbefehle und JSON-RPC-Befehle annehmen</translation>
</message>
<message>
- <location line="+62"/>
+ <location line="+77"/>
<source>Run in the background as a daemon and accept commands</source>
<translation>Als Hintergrunddienst starten und Befehle annehmen</translation>
</message>
<message>
- <location line="+31"/>
+ <location line="+32"/>
<source>Use the test network</source>
<translation>Das Testnetz verwenden</translation>
</message>
<message>
- <location line="-92"/>
+ <location line="-108"/>
<source>Accept connections from outside (default: 1 if no -proxy or -connect)</source>
<translation>Eingehende Verbindungen annehmen (Standard: 1, wenn nicht -proxy oder -connect)</translation>
</message>
<message>
- <location line="-74"/>
+ <location line="-82"/>
<source>%s, you must set a rpcpassword in the configuration file:
- %s
+%s
It is recommended you use the following random password:
rpcuser=bitcoinrpc
rpcpassword=%s
(you do not need to remember this password)
The username and password MUST NOT be the same.
If the file does not exist, create it with owner-readable-only file permissions.
+It is also recommended to set alertnotify so you are notified of problems;
+for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.com
</source>
- <translation>%s, Sie müssen den Wert rpcpasswort in der Konfigurationsdatei %s angeben
+ <translation>%s, Sie müssen den Wert rpcpasswort in dieser Konfigurationsdatei angeben:
+%s
Es wird empfohlen das folgende Zufallspasswort zu verwenden:
rpcuser=bitcoinrpc
rpcpassword=%s
(Sie müssen sich dieses Passwort nicht merken!)
-Der Benutzername und das Passwort dürfen nicht identisch sein.
-Falls die Konfigurationsdatei nicht existiert, erzeugen Sie diese bitte mit Leserechten nur für den Dateibesitzer.</translation>
+Der Benutzername und das Passwort dürfen NICHT identisch sein.
+Falls die Konfigurationsdatei nicht existiert, erzeugen Sie diese bitte mit Leserechten nur für den Dateibesitzer.
+Es wird ebenfalls empfohlen alertnotify anzugeben, um im Problemfall benachrichtig zu werden;
+zum Beispiel: alertnotify=echo %%s | mail -s \&quot;Bitcoin Alert\&quot; admin@foo.com
+</translation>
</message>
<message>
- <location line="+15"/>
+ <location line="+17"/>
<source>An error occurred while setting up the RPC port %u for listening on IPv6, falling back to IPv4: %s</source>
<translation>Beim Einrichten des abzuhörenden RPC-Ports %u für IPv6 ist ein Fehler aufgetreten, es wird auf IPv4 zurückgegriffen: %s</translation>
</message>
@@ -2288,13 +2420,8 @@ Falls die Konfigurationsdatei nicht existiert, erzeugen Sie diese bitte mit Lese
</message>
<message>
<location line="+3"/>
- <source>Corrupted block database detected. Please restart the client with -reindex.</source>
- <translation>Beschädigte Blockdatenbank erkannt. Bitte starten Sie den Client mit -reindex neu.</translation>
- </message>
- <message>
- <location line="+2"/>
<source>Error initializing database environment %s! To recover, BACKUP THAT DIRECTORY, then remove everything from it except for wallet.dat.</source>
- <translation>Fehler beim initialisieren der Datenbankumgebung %s! Zur Wiederherstellung, sichern Sie dieses Verzeichnis und löschen darin dann alles, außer wallet.dat.</translation>
+ <translation>Fehler beim Initialisieren der Datenbankumgebung %s! Zur Wiederherstellung, sichern Sie dieses Verzeichnis und löschen darin dann alles, außer wallet.dat.</translation>
</message>
<message>
<location line="+3"/>
@@ -2307,12 +2434,27 @@ Falls die Konfigurationsdatei nicht existiert, erzeugen Sie diese bitte mit Lese
<translation>Fehler: Diese Transaktion benötigt aufgrund ihres Betrags, ihrer Komplexität oder der Nutzung kürzlich erhaltener Zahlungen eine Transaktionsgebühr in Höhe von mindestens %s!</translation>
</message>
<message>
+ <location line="+3"/>
+ <source>Execute command when a relevant alert is received (%s in cmd is replaced by message)</source>
+ <translation>Kommando ausführen wenn ein relevanter Alarm empfangen wird (%s im Kommando wird durch die Nachricht ersetzt)</translation>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Execute command when a wallet transaction changes (%s in cmd is replaced by TxID)</source>
+ <translation>Kommando ausführen wenn sich eine Transaktion der Briefrasche verändert (%s im Kommando wird durch die TxID ersetzt)</translation>
+ </message>
+ <message>
<location line="+11"/>
<source>Set maximum size of high-priority/low-fee transactions in bytes (default: 27000)</source>
<translation>Maximale Größe von &quot;high-priority/low-fee&quot;-Transaktionen in Byte festlegen (Standard: 27000)</translation>
</message>
<message>
<location line="+3"/>
+ <source>Set the number of script verification threads (1-16, 0=auto, default: 0)</source>
+ <translation>Maximale Anzahl an Skript-Verifizierungs-Threads festlegen (1-16, 0 = automatisch, Standard: 0)</translation>
+ </message>
+ <message>
+ <location line="+2"/>
<source>This is a pre-release test build - use at your own risk - do not use for mining or merchant applications</source>
<translation>Dies ist eine Vorab-Testversion - Verwendung auf eigene Gefahr - nicht für Mining- oder Handelsanwendungen nutzen!</translation>
</message>
@@ -2358,16 +2500,41 @@ Falls die Konfigurationsdatei nicht existiert, erzeugen Sie diese bitte mit Lese
</message>
<message>
<location line="+3"/>
+ <source>Corrupted block database detected</source>
+ <translation>Beschädigte Blockdatenbank erkannt</translation>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Discover own IP address (default: 1 when listening and no -externalip)</source>
<translation>Eigene IP-Adresse erkennen (Standard: 1, wenn abgehört wird und nicht -externalip)</translation>
</message>
<message>
+ <location line="+1"/>
+ <source>Do you want to rebuild the block database now?</source>
+ <translation>Möchte Sie die Blockdatenbank nun neu aufbauen?</translation>
+ </message>
+ <message>
<location line="+3"/>
+ <source>Error initializing block database</source>
+ <translation>Fehler beim Initialisieren der Blockdatenbank</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Error initializing wallet database environment %s!</source>
+ <translation>Fehler beim Initialisieren der Brieftaschen-Datenbankumgebung %s!</translation>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Error loading block database</source>
<translation>Fehler beim Laden der Blockdatenbank</translation>
</message>
<message>
- <location line="+5"/>
+ <location line="+4"/>
+ <source>Error opening block database</source>
+ <translation>Fehler beim Öffnen der Blockdatenbank</translation>
+ </message>
+ <message>
+ <location line="+2"/>
<source>Error: Disk space is low!</source>
<translation>Fehler: Zu wenig freier Laufwerksspeicherplatz!</translation>
</message>
@@ -2383,26 +2550,96 @@ Falls die Konfigurationsdatei nicht existiert, erzeugen Sie diese bitte mit Lese
</message>
<message>
<location line="+2"/>
+ <source>Error: system error: </source>
+ <translation>Fehler: Systemfehler: </translation>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Failed to listen on any port. Use -listen=0 if you want this.</source>
<translation>Fehler, es konnte kein Port abgehört werden. Wenn dies so gewünscht wird -listen=0 verwenden.</translation>
</message>
<message>
+ <location line="+1"/>
+ <source>Failed to read block info</source>
+ <translation>Lesen der Blockinformationen fehlgeschlagen</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Failed to read block</source>
+ <translation>Lesen des Blocks fehlgeschlagen</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Failed to sync block index</source>
+ <translation>Synchronisation des Blockindex fehlgeschlagen</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Failed to write block index</source>
+ <translation>Schreiben des Blockindex fehlgeschlagen</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Failed to write block info</source>
+ <translation>Schreiben der Blockinformationen fehlgeschlagen</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Failed to write block</source>
+ <translation>Schreiben des Blocks fehlgeschlagen</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Failed to write file info</source>
+ <translation>Schreiben der Dateiinformationen fehlgeschlagen</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Failed to write to coin database</source>
+ <translation>Schreiben in die Münzendatenbank fehlgeschlagen</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Failed to write transaction index</source>
+ <translation>Schreiben des Transaktionsindex fehlgeschlagen</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Failed to write undo data</source>
+ <translation>Schreiben der Rücksetzdaten fehlgeschlagen</translation>
+ </message>
+ <message>
<location line="+2"/>
<source>Find peers using DNS lookup (default: 1 unless -connect)</source>
<translation>Gegenstellen via DNS-Namensauflösung finden (Standard: 1, außer bei -connect)</translation>
</message>
<message>
- <location line="+5"/>
+ <location line="+3"/>
+ <source>How many blocks to check at startup (default: 288, 0 = all)</source>
+ <translation>Wieviele Blöcke sollen beim Starten geprüft werden (Standard: 288, 0 = alle)</translation>
+ </message>
+ <message>
+ <location line="+1"/>
<source>How thorough the block verification is (0-4, default: 3)</source>
<translation>Wie gründlich soll die Blockprüfung sein (0-4, Standard: 3)</translation>
</message>
<message>
- <location line="+1"/>
- <source>Importing blocks from block database...</source>
- <translation>Importiere Blöcke aus Blockdatenbank...</translation>
+ <location line="+24"/>
+ <source>Rebuild block chain index from current blk000??.dat files</source>
+ <translation>Blockkettenindex aus aktuellen Dateien blk000??.dat wiederaufbauen</translation>
+ </message>
+ <message>
+ <location line="+37"/>
+ <source>Verifying blocks...</source>
+ <translation>Verifiziere Blöcke...</translation>
</message>
<message>
<location line="+1"/>
+ <source>Verifying wallet...</source>
+ <translation>Verifiziere Brieftasche...</translation>
+ </message>
+ <message>
+ <location line="-61"/>
<source>Imports blocks from external blk000??.dat file</source>
<translation>Blöcke aus externer Datei blk000??.dat importieren</translation>
</message>
@@ -2417,7 +2654,12 @@ Falls die Konfigurationsdatei nicht existiert, erzeugen Sie diese bitte mit Lese
<translation>Ungültige Adresse in -tor: &apos;%s&apos;</translation>
</message>
<message>
- <location line="+9"/>
+ <location line="+8"/>
+ <source>Maintain a full transaction index (default: 0)</source>
+ <translation>Einen vollständigen Transaktionsindex pflegen (Standard: 0)</translation>
+ </message>
+ <message>
+ <location line="+2"/>
<source>Maximum per-connection receive buffer, &lt;n&gt;*1000 bytes (default: 5000)</source>
<translation>Maximale Größe, &lt;n&gt; * 1000 Byte, des Empfangspuffers pro Verbindung (Standard: 5000)</translation>
</message>
@@ -2429,7 +2671,7 @@ Falls die Konfigurationsdatei nicht existiert, erzeugen Sie diese bitte mit Lese
<message>
<location line="+1"/>
<source>Only accept block chain matching built-in checkpoints (default: 1)</source>
- <translation>Blockkette nur akzeptieren, wenn sie mit den integrierten Prüfpunkten zusammenpasst (Standard: 1)</translation>
+ <translation>Blockkette nur akzeptieren, wenn sie mit den integrierten Prüfpunkten übereinstimmt (Standard: 1)</translation>
</message>
<message>
<location line="+1"/>
@@ -2452,12 +2694,7 @@ Falls die Konfigurationsdatei nicht existiert, erzeugen Sie diese bitte mit Lese
<translation>Der Debugausgabe einen Zeitstempel voranstellen</translation>
</message>
<message>
- <location line="+1"/>
- <source>Rebuild blockchain index from current blk000??.dat files</source>
- <translation>Blockkettenindex aus aktuellen Dateien blk000??.dat wiederaufbauen</translation>
- </message>
- <message>
- <location line="+4"/>
+ <location line="+5"/>
<source>SSL options: (see the Bitcoin Wiki for SSL setup instructions)</source>
<translation>SSL-Optionen: (siehe Bitcoin-Wiki für SSL-Installationsanweisungen)</translation>
</message>
@@ -2497,7 +2734,12 @@ Falls die Konfigurationsdatei nicht existiert, erzeugen Sie diese bitte mit Lese
<translation>Verbindungstimeout in Millisekunden festlegen (Standard: 5000)</translation>
</message>
<message>
- <location line="+13"/>
+ <location line="+4"/>
+ <source>System error: </source>
+ <translation>Systemfehler: </translation>
+ </message>
+ <message>
+ <location line="+10"/>
<source>Use UPnP to map the listening port (default: 0)</source>
<translation>UPnP verwenden, um die Portweiterleitung einzurichten (Standard: 0)</translation>
</message>
@@ -2528,36 +2770,41 @@ Falls die Konfigurationsdatei nicht existiert, erzeugen Sie diese bitte mit Lese
</message>
<message>
<location line="+1"/>
+ <source>You need to rebuild the databases using -reindex to change -txindex</source>
+ <translation>Sie müssen die Datenbanken mit Hilfe von -reindex neu aufbauen, um -txindex verändern zu können.</translation>
+ </message>
+ <message>
+ <location line="+1"/>
<source>wallet.dat corrupt, salvage failed</source>
<translation>wallet.dat beschädigt, Rettung fehlgeschlagen</translation>
</message>
<message>
- <location line="-43"/>
+ <location line="-45"/>
<source>Password for JSON-RPC connections</source>
<translation>Passwort für JSON-RPC-Verbindungen</translation>
</message>
<message>
- <location line="-53"/>
+ <location line="-68"/>
<source>Allow JSON-RPC connections from specified IP address</source>
<translation>JSON-RPC-Verbindungen von der angegebenen IP-Adresse erlauben</translation>
</message>
<message>
- <location line="+62"/>
+ <location line="+77"/>
<source>Send commands to node running on &lt;ip&gt; (default: 127.0.0.1)</source>
<translation>Sende Befehle an Knoten &lt;ip&gt; (Standard: 127.0.0.1)</translation>
</message>
<message>
- <location line="-103"/>
+ <location line="-120"/>
<source>Execute command when the best block changes (%s in cmd is replaced by block hash)</source>
<translation>Kommando ausführen wenn der beste Block wechselt (%s im Kommando wird durch den Hash des Blocks ersetzt)</translation>
</message>
<message>
- <location line="+124"/>
+ <location line="+142"/>
<source>Upgrade wallet to latest format</source>
<translation>Brieftasche auf das neueste Format aktualisieren</translation>
</message>
<message>
- <location line="-15"/>
+ <location line="-16"/>
<source>Set key pool size to &lt;n&gt; (default: 100)</source>
<translation>Größe des Schlüsselpools festlegen auf &lt;n&gt; (Standard: 100)</translation>
</message>
@@ -2567,17 +2814,12 @@ Falls die Konfigurationsdatei nicht existiert, erzeugen Sie diese bitte mit Lese
<translation>Blockkette erneut nach fehlenden Transaktionen der Brieftasche durchsuchen</translation>
</message>
<message>
- <location line="-26"/>
- <source>How many blocks to check at startup (default: 2500, 0 = all)</source>
- <translation>Wieviele Blöcke sollen beim Starten geprüft werden (Standard: 2500, 0 = alle)</translation>
- </message>
- <message>
- <location line="+55"/>
+ <location line="+30"/>
<source>Use OpenSSL (https) for JSON-RPC connections</source>
<translation>OpenSSL (https) für JSON-RPC-Verbindungen verwenden</translation>
</message>
<message>
- <location line="-20"/>
+ <location line="-21"/>
<source>Server certificate file (default: server.cert)</source>
<translation>Serverzertifikat (Standard: server.cert)</translation>
</message>
@@ -2587,12 +2829,12 @@ Falls die Konfigurationsdatei nicht existiert, erzeugen Sie diese bitte mit Lese
<translation>Privater Serverschlüssel (Standard: server.pem)</translation>
</message>
<message>
- <location line="-133"/>
+ <location line="-154"/>
<source>Acceptable ciphers (default: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH)</source>
<translation>Akzeptierte Chiffren (Standard: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH)</translation>
</message>
<message>
- <location line="+144"/>
+ <location line="+166"/>
<source>This help message</source>
<translation>Dieser Hilfetext</translation>
</message>
@@ -2602,7 +2844,7 @@ Falls die Konfigurationsdatei nicht existiert, erzeugen Sie diese bitte mit Lese
<translation>Kann auf diesem Computer nicht an %s binden (von bind zurückgegebener Fehler %d, %s)</translation>
</message>
<message>
- <location line="-70"/>
+ <location line="-86"/>
<source>Connect through socks proxy</source>
<translation>Verbindung über SOCKS-Proxy herstellen</translation>
</message>
@@ -2612,12 +2854,12 @@ Falls die Konfigurationsdatei nicht existiert, erzeugen Sie diese bitte mit Lese
<translation>Erlaube DNS-Namensauflösung für -addnode, -seednode und -connect</translation>
</message>
<message>
- <location line="+43"/>
+ <location line="+57"/>
<source>Loading addresses...</source>
<translation>Lade Adressen...</translation>
</message>
<message>
- <location line="-25"/>
+ <location line="-35"/>
<source>Error loading wallet.dat: Wallet corrupted</source>
<translation>Fehler beim Laden von wallet.dat: Brieftasche beschädigt</translation>
</message>
@@ -2627,32 +2869,22 @@ Falls die Konfigurationsdatei nicht existiert, erzeugen Sie diese bitte mit Lese
<translation>Fehler beim Laden von wallet.dat: Brieftasche benötigt neuere Version von Bitcoin</translation>
</message>
<message>
- <location line="+73"/>
- <source>Verifying block database integrity...</source>
- <translation>Verifiziere Integrität der Blockdatenbank...</translation>
- </message>
- <message>
- <location line="+1"/>
- <source>Verifying wallet integrity...</source>
- <translation>Verifiziere Integrität der Brieftasche...</translation>
- </message>
- <message>
- <location line="+1"/>
+ <location line="+87"/>
<source>Wallet needed to be rewritten: restart Bitcoin to complete</source>
<translation>Brieftasche muss neu geschrieben werden: Starten Sie Bitcoin zur Fertigstellung neu</translation>
</message>
<message>
- <location line="-77"/>
+ <location line="-89"/>
<source>Error loading wallet.dat</source>
<translation>Fehler beim Laden von wallet.dat (Brieftasche)</translation>
</message>
<message>
- <location line="+20"/>
+ <location line="+30"/>
<source>Invalid -proxy address: &apos;%s&apos;</source>
<translation>Ungültige Adresse in -proxy: &apos;%s&apos;</translation>
</message>
<message>
- <location line="+46"/>
+ <location line="+48"/>
<source>Unknown network specified in -onlynet: &apos;%s&apos;</source>
<translation>Unbekannter Netztyp in -onlynet angegeben: &apos;%s&apos;</translation>
</message>
@@ -2662,7 +2894,7 @@ Falls die Konfigurationsdatei nicht existiert, erzeugen Sie diese bitte mit Lese
<translation>Unbekannte Proxyversion in -socks angefordert: %i</translation>
</message>
<message>
- <location line="-75"/>
+ <location line="-91"/>
<source>Cannot resolve -bind address: &apos;%s&apos;</source>
<translation>Kann Adresse in -bind nicht auflösen: &apos;%s&apos;</translation>
</message>
@@ -2672,17 +2904,17 @@ Falls die Konfigurationsdatei nicht existiert, erzeugen Sie diese bitte mit Lese
<translation>Kann Adresse in -externalip nicht auflösen: &apos;%s&apos;</translation>
</message>
<message>
- <location line="+31"/>
+ <location line="+45"/>
<source>Invalid amount for -paytxfee=&lt;amount&gt;: &apos;%s&apos;</source>
<translation>Falscher Betrag für -paytxfee=&lt;Betrag&gt;: &apos;%s&apos;</translation>
</message>
<message>
- <location line="-15"/>
+ <location line="-24"/>
<source>Error: could not start node</source>
<translation>Fehler: Knoten konnte nicht gestartet weden</translation>
</message>
<message>
- <location line="+16"/>
+ <location line="+25"/>
<source>Invalid amount</source>
<translation>Ungültige Angabe</translation>
</message>
@@ -2697,7 +2929,7 @@ Falls die Konfigurationsdatei nicht existiert, erzeugen Sie diese bitte mit Lese
<translation>Lade Blockindex...</translation>
</message>
<message>
- <location line="-45"/>
+ <location line="-59"/>
<source>Add a node to connect to and attempt to keep the connection open</source>
<translation>Mit dem Knoten verbinden und versuchen die Verbindung aufrecht zu halten</translation>
</message>
@@ -2707,22 +2939,17 @@ Falls die Konfigurationsdatei nicht existiert, erzeugen Sie diese bitte mit Lese
<translation>Kann auf diesem Computer nicht an %s binden. Evtl. wurde Bitcoin bereits gestartet.</translation>
</message>
<message>
- <location line="+54"/>
- <source>Find peers using internet relay chat (default: 0)</source>
- <translation>Gegenstellen via Internet Relay Chat finden (Standard: 0)</translation>
- </message>
- <message>
- <location line="-2"/>
+ <location line="+68"/>
<source>Fee per KB to add to transactions you send</source>
<translation>Gebühr pro KB, die gesendeten Transaktionen hinzugefügt wird</translation>
</message>
<message>
- <location line="+19"/>
+ <location line="+17"/>
<source>Loading wallet...</source>
<translation>Lade Brieftasche...</translation>
</message>
<message>
- <location line="-40"/>
+ <location line="-54"/>
<source>Cannot downgrade wallet</source>
<translation>Brieftasche kann nicht auf eine ältere Version herabgestuft werden</translation>
</message>
@@ -2737,27 +2964,27 @@ Falls die Konfigurationsdatei nicht existiert, erzeugen Sie diese bitte mit Lese
<translation>Standardadresse kann nicht geschrieben werden</translation>
</message>
<message>
- <location line="+49"/>
+ <location line="+64"/>
<source>Rescanning...</source>
<translation>Durchsuche erneut...</translation>
</message>
<message>
- <location line="-43"/>
+ <location line="-56"/>
<source>Done loading</source>
<translation>Laden abgeschlossen</translation>
</message>
<message>
- <location line="+65"/>
+ <location line="+79"/>
<source>To use the %s option</source>
<translation>Zur Nutzung der %s Option</translation>
</message>
<message>
- <location line="-60"/>
+ <location line="-71"/>
<source>Error</source>
<translation>Fehler</translation>
</message>
<message>
- <location line="-28"/>
+ <location line="-33"/>
<source>You must set rpcpassword=&lt;password&gt; in the configuration file:
%s
If the file does not exist, create it with owner-readable-only file permissions.</source>
diff --git a/src/qt/locale/bitcoin_el_GR.ts b/src/qt/locale/bitcoin_el_GR.ts
index ba5f0ac9fc..51f44e5d9b 100644
--- a/src/qt/locale/bitcoin_el_GR.ts
+++ b/src/qt/locale/bitcoin_el_GR.ts
@@ -10,15 +10,10 @@
<message>
<location line="+39"/>
<source>&lt;b&gt;Bitcoin&lt;/b&gt; version</source>
- <translation>&lt;b&gt;Bitcoin&lt;/b&gt;έκδοση</translation>
+ <translation>Έκδοση &lt;b&gt;Bitcoin&lt;/b&gt;</translation>
</message>
<message>
- <location line="+41"/>
- <source>Copyright © 2009-2012 The Bitcoin developers</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+13"/>
+ <location line="+57"/>
<source>
This is experimental software.
@@ -27,6 +22,16 @@ Distributed under the MIT/X11 software license, see the accompanying file COPYIN
This product includes software developed by the OpenSSL Project for use in the OpenSSL Toolkit (http://www.openssl.org/) and cryptographic software written by Eric Young (eay@cryptsoft.com) and UPnP software written by Thomas Bernard.</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../aboutdialog.cpp" line="+17"/>
+ <source>Copyright</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>2009-%1 The Bitcoin developers</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>AddressBookPage</name>
@@ -53,7 +58,7 @@ This product includes software developed by the OpenSSL Project for use in the O
<message>
<location line="-11"/>
<source>&amp;New Address</source>
- <translation type="unfinished"/>
+ <translation>&amp;Îέα διεÏθυνση</translation>
</message>
<message>
<location line="-46"/>
@@ -101,17 +106,22 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation>&amp;ΔιαγÏαφή</translation>
</message>
<message>
- <location filename="../addressbookpage.cpp" line="+65"/>
+ <location filename="../addressbookpage.cpp" line="+66"/>
<source>Copy &amp;Label</source>
<translation>ΑντιγÏαφή &amp;επιγÏαφής</translation>
</message>
<message>
- <location line="+2"/>
+ <location line="+1"/>
<source>&amp;Edit</source>
<translation>&amp;ΕπεξεÏγασία</translation>
</message>
<message>
- <location line="+250"/>
+ <location line="+1"/>
+ <source>Send &amp;Coins</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+263"/>
<source>Export Address Book Data</source>
<translation>Εξαγωγή Δεδομενων Βιβλίου ΔιευθÏνσεων</translation>
</message>
@@ -134,7 +144,7 @@ This product includes software developed by the OpenSSL Project for use in the O
<context>
<name>AddressTableModel</name>
<message>
- <location filename="../addresstablemodel.cpp" line="+142"/>
+ <location filename="../addresstablemodel.cpp" line="+144"/>
<source>Label</source>
<translation>Ετικέτα</translation>
</message>
@@ -293,17 +303,17 @@ This product includes software developed by the OpenSSL Project for use in the O
<context>
<name>BitcoinGUI</name>
<message>
- <location filename="../bitcoingui.cpp" line="+267"/>
+ <location filename="../bitcoingui.cpp" line="+231"/>
<source>Sign &amp;message...</source>
<translation>ΥπογÏαφή &amp;ΜηνÏματος...</translation>
</message>
<message>
- <location line="+254"/>
+ <location line="+299"/>
<source>Synchronizing with network...</source>
<translation>ΣυγχÏονισμός με το δίκτυο...</translation>
</message>
<message>
- <location line="-322"/>
+ <location line="-367"/>
<source>&amp;Overview</source>
<translation>&amp;Επισκόπηση</translation>
</message>
@@ -323,32 +333,17 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation>ΠεÏιήγηση στο ιστοÏικο συνναλαγων</translation>
</message>
<message>
- <location line="+6"/>
- <source>&amp;Address Book</source>
- <translation>&amp;Βιβλίο ΔιευθÏνσεων</translation>
- </message>
- <message>
- <location line="+1"/>
+ <location line="+7"/>
<source>Edit the list of stored addresses and labels</source>
<translation>ΕξεÏγασια της λιστας των αποθηκευμενων διευθÏνσεων και ετικετων</translation>
</message>
<message>
- <location line="-15"/>
- <source>&amp;Receive coins</source>
- <translation>&amp;ΠαÏαλαβή νομισματων</translation>
- </message>
- <message>
- <location line="+1"/>
+ <location line="-14"/>
<source>Show the list of addresses for receiving payments</source>
<translation>Εμφάνισε την λίστα των διευθÏνσεων για την παÏαλαβή πληÏωμων</translation>
</message>
<message>
- <location line="-8"/>
- <source>&amp;Send coins</source>
- <translation>&amp;Αποστολη νομισματων</translation>
- </message>
- <message>
- <location line="+39"/>
+ <location line="+31"/>
<source>E&amp;xit</source>
<translation>Έ&amp;ξοδος</translation>
</message>
@@ -393,7 +388,7 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation>&amp;Άλλαξε κωδικο Ï€Ïόσβασης</translation>
</message>
<message>
- <location line="+259"/>
+ <location line="+304"/>
<source>Importing blocks from disk...</source>
<translation type="unfinished"/>
</message>
@@ -402,13 +397,8 @@ This product includes software developed by the OpenSSL Project for use in the O
<source>Reindexing blocks on disk...</source>
<translation type="unfinished"/>
</message>
- <message numerus="yes">
- <location line="+10"/>
- <source>~%n block(s) remaining</source>
- <translation><numerusform>~%n μπλοκ απέμεινε</numerusform><numerusform>~%n μπλοκ απέμειναν</numerusform></translation>
- </message>
<message>
- <location line="-265"/>
+ <location line="-300"/>
<source>&amp;Export...</source>
<translation>&amp;Εξαγωγή</translation>
</message>
@@ -453,18 +443,33 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation type="unfinished"/>
</message>
<message>
- <location line="-196"/>
- <location line="+538"/>
+ <location line="-162"/>
+ <location line="+540"/>
<source>Bitcoin</source>
<translation>Bitcoin</translation>
</message>
<message>
- <location line="-538"/>
+ <location line="-540"/>
<source>Wallet</source>
<translation>ΠοÏτοφόλι</translation>
</message>
<message>
- <location line="+176"/>
+ <location line="+99"/>
+ <source>&amp;Send</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+7"/>
+ <source>&amp;Receive</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+14"/>
+ <source>&amp;Addresses</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+22"/>
<source>&amp;About Bitcoin</source>
<translation>&amp;Σχετικα:Bitcoin</translation>
</message>
@@ -525,97 +530,92 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation>[testnet]</translation>
</message>
<message>
- <location line="+63"/>
+ <location line="+47"/>
<source>Bitcoin client</source>
<translation>Πελάτης Bitcoin</translation>
</message>
<message numerus="yes">
- <location line="+79"/>
+ <location line="+140"/>
<source>%n active connection(s) to Bitcoin network</source>
<translation><numerusform>%n ενεÏγή σÏνδεση στο δίκτυο Bitcoin</numerusform><numerusform>%n ενεÏγές συνδέσεις στο δίκτυο Î’itcoin</numerusform></translation>
</message>
<message>
- <location line="+45"/>
- <source>Processed %1 of %2 blocks of transaction history (%3% done).</source>
+ <location line="+39"/>
+ <source>Processed %1 of %2 (estimated) blocks of transaction history.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+7"/>
+ <location line="+4"/>
<source>Processed %1 blocks of transaction history.</source>
<translation type="unfinished"/>
</message>
+ <message numerus="yes">
+ <location line="+20"/>
+ <source>%n hour(s)</source>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
+ <message numerus="yes">
+ <location line="+4"/>
+ <source>%n day(s)</source>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
+ <message numerus="yes">
+ <location line="+4"/>
+ <source>%n week(s)</source>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
<message>
- <location line="+70"/>
- <source>Error</source>
+ <location line="+5"/>
+ <source>%1 behind</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+3"/>
- <source>Warning</source>
+ <location line="+14"/>
+ <source>Last received block was generated %1 ago.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+3"/>
- <source>Information</source>
+ <location line="+2"/>
+ <source>Transactions after this will not yet be visible.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+66"/>
- <source>This transaction is over the size limit. You can still send it for a fee of %1, which goes to the nodes that process your transaction and helps to support the network. Do you want to pay the fee?</source>
- <translation type="unfinished"/>
+ <location line="+21"/>
+ <source>Error</source>
+ <translation>Σφάλμα</translation>
</message>
<message>
- <location line="+210"/>
- <source>Backup Successful</source>
+ <location line="+3"/>
+ <source>Warning</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+0"/>
- <source>The wallet data was successfully saved to the new location.</source>
+ <location line="+3"/>
+ <source>Information</source>
<translation type="unfinished"/>
</message>
- <message numerus="yes">
- <location line="-338"/>
- <source>%n second(s) ago</source>
- <translation><numerusform>%n δευτεÏόλεπτο Ï€Ïιν</numerusform><numerusform>%n δευτεÏόλεπτα Ï€Ïιν</numerusform></translation>
- </message>
- <message numerus="yes">
- <location line="+4"/>
- <source>%n minute(s) ago</source>
- <translation><numerusform>%n λεπτό Ï€Ïιν</numerusform><numerusform>%n λεπτά Ï€Ïιν</numerusform></translation>
- </message>
- <message numerus="yes">
- <location line="+4"/>
- <source>%n hour(s) ago</source>
- <translation><numerusform>%n ÏŽÏα Ï€Ïιν</numerusform><numerusform>%n ÏŽÏες Ï€Ïιν</numerusform></translation>
- </message>
- <message numerus="yes">
- <location line="+4"/>
- <source>%n day(s) ago</source>
- <translation><numerusform>%n ημέÏα Ï€Ïιν</numerusform><numerusform>%n ημέÏες Ï€Ïιν</numerusform></translation>
+ <message>
+ <location line="+68"/>
+ <source>This transaction is over the size limit. You can still send it for a fee of %1, which goes to the nodes that process your transaction and helps to support the network. Do you want to pay the fee?</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location line="+6"/>
+ <location line="-138"/>
<source>Up to date</source>
<translation>ΕνημεÏωμένο</translation>
</message>
<message>
- <location line="+7"/>
+ <location line="+32"/>
<source>Catching up...</source>
<translation>ΕνημέÏωση...</translation>
</message>
<message>
- <location line="+10"/>
- <source>Last received block was generated %1.</source>
- <translation>Το τελευταίο μπλοκ που ελήφθη %1.</translation>
- </message>
- <message>
- <location line="+97"/>
+ <location line="+110"/>
<source>Confirm transaction fee</source>
<translation>Επιβεβαίωση αμοιβής συναλλαγής</translation>
</message>
<message>
- <location line="+23"/>
+ <location line="+8"/>
<source>Sent transaction</source>
<translation>Η συναλλαγή απεστάλη</translation>
</message>
@@ -638,14 +638,14 @@ Address: %4
</translation>
</message>
<message>
- <location line="+99"/>
- <location line="+28"/>
+ <location line="+33"/>
+ <location line="+23"/>
<source>URI handling</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-28"/>
- <location line="+28"/>
+ <location line="-23"/>
+ <location line="+23"/>
<source>URI can not be parsed! This can be caused by an invalid Bitcoin address or malformed URI parameters.</source>
<translation type="unfinished"/>
</message>
@@ -660,27 +660,7 @@ Address: %4
<translation>Το ποÏτοφόλι είναι &lt;b&gt;κÏυπτογÏαφημένο&lt;/b&gt; και &lt;b&gt;κλειδωμένο&lt;/b&gt;</translation>
</message>
<message>
- <location line="+23"/>
- <source>Backup Wallet</source>
- <translation>ΑντίγÏαφο ασφαλείας του ποÏτοφολιοÏ</translation>
- </message>
- <message>
- <location line="+0"/>
- <source>Wallet Data (*.dat)</source>
- <translation>ΑÏχεία δεδομένων ποÏÏ„Î¿Ï†Î¿Î»Î¹Î¿Ï (*.dat)</translation>
- </message>
- <message>
- <location line="+3"/>
- <source>Backup Failed</source>
- <translation>Αποτυχία κατά τη δημιουÏγία αντιγÏάφου</translation>
- </message>
- <message>
- <location line="+0"/>
- <source>There was an error trying to save the wallet data to the new location.</source>
- <translation>ΠαÏουσιάστηκε σφάλμα κατά την αποθήκευση των δεδομένων ποÏÏ„Î¿Ï†Î¿Î»Î¹Î¿Ï ÏƒÏ„Î· νέα τοποθεσία.</translation>
- </message>
- <message>
- <location filename="../bitcoin.cpp" line="+109"/>
+ <location filename="../bitcoin.cpp" line="+108"/>
<source>A fatal error occurred. Bitcoin can no longer continue safely and will quit.</source>
<translation type="unfinished"/>
</message>
@@ -688,7 +668,7 @@ Address: %4
<context>
<name>ClientModel</name>
<message>
- <location filename="../clientmodel.cpp" line="+86"/>
+ <location filename="../clientmodel.cpp" line="+96"/>
<source>Network Alert</source>
<translation type="unfinished"/>
</message>
@@ -721,7 +701,7 @@ Address: %4
<translation>Η διεÏθυνση που σχετίζεται με αυτή την καταχώÏηση του βιβλίου διευθÏνσεων. ΜποÏεί να Ï„Ïοποποιηθεί μόνο για τις διευθÏνσεις αποστολής.</translation>
</message>
<message>
- <location filename="../editaddressdialog.cpp" line="+20"/>
+ <location filename="../editaddressdialog.cpp" line="+21"/>
<source>New receiving address</source>
<translation>Îέα διεÏθυνση λήψης</translation>
</message>
@@ -741,17 +721,17 @@ Address: %4
<translation>ΕπεξεÏγασία διεÏθυνσης αποστολής</translation>
</message>
<message>
- <location line="+60"/>
+ <location line="+76"/>
<source>The entered address &quot;%1&quot; is already in the address book.</source>
<translation>Η διεÏθυνση &quot;%1&quot; βÏίσκεται ήδη στο βιβλίο διευθÏνσεων.</translation>
</message>
<message>
- <location line="+5"/>
+ <location line="-5"/>
<source>The entered address &quot;%1&quot; is not a valid Bitcoin address.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+5"/>
+ <location line="+10"/>
<source>Could not unlock wallet.</source>
<translation>Δεν είναι δυνατό το ξεκλείδωμα του ποÏτοφολιοÏ.</translation>
</message>
@@ -764,7 +744,7 @@ Address: %4
<context>
<name>GUIUtil::HelpMessageBox</name>
<message>
- <location filename="../guiutil.cpp" line="+419"/>
+ <location filename="../guiutil.cpp" line="+422"/>
<location line="+12"/>
<source>Bitcoin-Qt</source>
<translation type="unfinished"/>
@@ -815,7 +795,7 @@ Address: %4
<message>
<location line="+16"/>
<source>&amp;Main</source>
- <translation type="unfinished"/>
+ <translation>&amp;ΚÏÏιο</translation>
</message>
<message>
<location line="+6"/>
@@ -905,7 +885,7 @@ Address: %4
<message>
<location line="+36"/>
<source>&amp;Window</source>
- <translation type="unfinished"/>
+ <translation>&amp;ΠαÏάθυÏο</translation>
</message>
<message>
<location line="+6"/>
@@ -978,7 +958,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location filename="../optionsdialog.cpp" line="+55"/>
+ <location filename="../optionsdialog.cpp" line="+53"/>
<source>default</source>
<translation type="unfinished"/>
</message>
@@ -995,7 +975,7 @@ Address: %4
<message>
<location line="+0"/>
<source>Do you want to proceed?</source>
- <translation type="unfinished"/>
+ <translation>Θέλετε να Ï€ÏοχωÏήσετε;</translation>
</message>
<message>
<location line="+42"/>
@@ -1023,23 +1003,18 @@ Address: %4
<translation>ΦόÏμα</translation>
</message>
<message>
- <location line="+51"/>
- <location line="+183"/>
+ <location line="+50"/>
+ <location line="+166"/>
<source>The displayed information may be out of date. Your wallet automatically synchronizes with the Bitcoin network after a connection is established, but this process has not completed yet.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-141"/>
+ <location line="-124"/>
<source>Balance:</source>
<translation>Υπόλοιπο</translation>
</message>
<message>
- <location line="+58"/>
- <source>Number of transactions:</source>
- <translation>ΑÏιθμός συναλλαγών</translation>
- </message>
- <message>
- <location line="-29"/>
+ <location line="+29"/>
<source>Unconfirmed:</source>
<translation>Ανεπιβεβαίωτες</translation>
</message>
@@ -1049,7 +1024,7 @@ Address: %4
<translation>ΠοÏτοφόλι</translation>
</message>
<message>
- <location line="+124"/>
+ <location line="+107"/>
<source>Immature:</source>
<translation type="unfinished"/>
</message>
@@ -1064,7 +1039,7 @@ Address: %4
<translation>&lt;b&gt;ΠÏόσφατες συναλλαγές&lt;/b&gt;</translation>
</message>
<message>
- <location line="-118"/>
+ <location line="-101"/>
<source>Your current balance</source>
<translation>Το Ï„Ïέχον υπόλοιπο</translation>
</message>
@@ -1074,14 +1049,17 @@ Address: %4
<translation>Το άθÏοισμα των συναλλαγών που δεν έχουν ακόμα επιβεβαιωθεί και δεν Ï€ÏοσμετÏώνται στο Ï„Ïέχον υπόλοιπό σας</translation>
</message>
<message>
- <location line="+20"/>
- <source>Total number of transactions in wallet</source>
- <translation>ΣÏνολο συναλλαγών στο ποÏτοφόλι</translation>
- </message>
- <message>
<location filename="../overviewpage.cpp" line="+115"/>
<location line="+1"/>
<source>out of sync</source>
+ <translation>εκτός συγχÏονισμοÏ</translation>
+ </message>
+</context>
+<context>
+ <name>PaymentServer</name>
+ <message>
+ <location filename="../paymentserver.cpp" line="+107"/>
+ <source>Cannot start bitcoin: click-to-pay handler</source>
<translation type="unfinished"/>
</message>
</context>
@@ -1148,7 +1126,7 @@ Address: %4
<message>
<location filename="../forms/rpcconsole.ui" line="+46"/>
<source>Client name</source>
- <translation type="unfinished"/>
+ <translation>Όνομα Πελάτη</translation>
</message>
<message>
<location line="+10"/>
@@ -1167,12 +1145,12 @@ Address: %4
<message>
<location line="-217"/>
<source>Client version</source>
- <translation type="unfinished"/>
+ <translation>Έκδοση Πελάτη</translation>
</message>
<message>
<location line="-45"/>
<source>&amp;Information</source>
- <translation type="unfinished"/>
+ <translation>&amp;ΠληÏοφοÏία</translation>
</message>
<message>
<location line="+68"/>
@@ -1222,7 +1200,7 @@ Address: %4
<message>
<location line="+52"/>
<source>&amp;Open</source>
- <translation type="unfinished"/>
+ <translation>&amp;Άνοιγμα</translation>
</message>
<message>
<location line="+16"/>
@@ -1242,12 +1220,12 @@ Address: %4
<message>
<location line="+24"/>
<source>&amp;Console</source>
- <translation type="unfinished"/>
+ <translation>&amp;Κονσόλα</translation>
</message>
<message>
<location line="-260"/>
<source>Build date</source>
- <translation type="unfinished"/>
+ <translation>ΗμεÏομηνία κατασκευής</translation>
</message>
<message>
<location line="-104"/>
@@ -1424,7 +1402,7 @@ Address: %4
</message>
<message>
<location line="+60"/>
- <location filename="../sendcoinsentry.cpp" line="+25"/>
+ <location filename="../sendcoinsentry.cpp" line="+26"/>
<source>Enter a label for this address to add it to your address book</source>
<translation>Εισάγετε μια επιγÏαφή για αυτή τη διεÏθυνση ώστε να καταχωÏηθεί στο βιβλίο διευθÏνσεων</translation>
</message>
@@ -1516,7 +1494,7 @@ Address: %4
<message>
<location line="+7"/>
<source>Signature</source>
- <translation type="unfinished"/>
+ <translation>ΥπογÏαφή</translation>
</message>
<message>
<location line="+27"/>
@@ -1660,7 +1638,7 @@ Address: %4
<context>
<name>TransactionDesc</name>
<message>
- <location filename="../transactiondesc.cpp" line="+19"/>
+ <location filename="../transactiondesc.cpp" line="+20"/>
<source>Open until %1</source>
<translation>Ανοιχτό μέχÏι %1</translation>
</message>
@@ -1682,7 +1660,7 @@ Address: %4
<message>
<location line="+18"/>
<source>Status</source>
- <translation type="unfinished"/>
+ <translation>Κατάσταση</translation>
</message>
<message numerus="yes">
<location line="+7"/>
@@ -1708,14 +1686,14 @@ Address: %4
<location line="+5"/>
<location line="+17"/>
<source>From</source>
- <translation type="unfinished"/>
+ <translation>Από</translation>
</message>
<message>
<location line="+1"/>
<location line="+22"/>
<location line="+58"/>
<source>To</source>
- <translation type="unfinished"/>
+ <translation>ΠÏος</translation>
</message>
<message>
<location line="-77"/>
@@ -1847,7 +1825,7 @@ Address: %4
<context>
<name>TransactionTableModel</name>
<message>
- <location filename="../transactiontablemodel.cpp" line="+226"/>
+ <location filename="../transactiontablemodel.cpp" line="+225"/>
<source>Date</source>
<translation>ΗμεÏομηνία</translation>
</message>
@@ -1965,7 +1943,7 @@ Address: %4
<context>
<name>TransactionView</name>
<message>
- <location filename="../transactionview.cpp" line="+55"/>
+ <location filename="../transactionview.cpp" line="+52"/>
<location line="+16"/>
<source>All</source>
<translation>Όλα</translation>
@@ -2052,6 +2030,11 @@ Address: %4
</message>
<message>
<location line="+1"/>
+ <source>Copy transaction ID</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Edit label</source>
<translation>ΕπεξεÏγασία επιγÏαφής</translation>
</message>
@@ -2061,7 +2044,7 @@ Address: %4
<translation>Εμφάνιση λεπτομεÏειών συναλλαγής</translation>
</message>
<message>
- <location line="+142"/>
+ <location line="+139"/>
<source>Export Transaction Data</source>
<translation>Εξαγωγή Στοιχείων Συναλλαγών</translation>
</message>
@@ -2116,7 +2099,7 @@ Address: %4
<translation>Αδυναμία εγγÏαφής στο αÏχείο %1.</translation>
</message>
<message>
- <location line="+95"/>
+ <location line="+100"/>
<source>Range:</source>
<translation>Έκταση:</translation>
</message>
@@ -2127,29 +2110,172 @@ Address: %4
</message>
</context>
<context>
+ <name>WalletView</name>
+ <message>
+ <location filename="../walletview.cpp" line="+95"/>
+ <source>&amp;Overview</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Show general overview of wallet</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>&amp;Send coins</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Send coins to a Bitcoin address</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>&amp;Receive coins</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Show the list of addresses for receiving payments</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>&amp;Transactions</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Browse transaction history</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>&amp;Address Book</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Edit the list of stored addresses and labels</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+12"/>
+ <source>&amp;Encrypt Wallet...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Encrypt the private keys that belong to your wallet</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>&amp;Backup Wallet...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Backup wallet to another location</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>&amp;Change Passphrase...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Change the passphrase used for wallet encryption</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Sign &amp;message...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Sign messages with your Bitcoin addresses to prove you own them</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>&amp;Verify message...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Verify messages to ensure they were signed with specified Bitcoin addresses</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>&amp;Export...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Export the data in the current tab to a file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+180"/>
+ <source>Backup Wallet</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>Wallet Data (*.dat)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Backup Failed</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>There was an error trying to save the wallet data to the new location.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>Backup Successful</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>The wallet data was successfully saved to the new location.</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>bitcoin-core</name>
<message>
- <location filename="../bitcoinstrings.cpp" line="+88"/>
+ <location filename="../bitcoinstrings.cpp" line="+96"/>
<source>Bitcoin version</source>
<translation>Έκδοση Bitcoin</translation>
</message>
<message>
- <location line="+82"/>
+ <location line="+98"/>
<source>Usage:</source>
<translation>ΧÏήση:</translation>
</message>
<message>
- <location line="-23"/>
+ <location line="-24"/>
<source>Send command to -server or bitcoind</source>
<translation>Αποστολή εντολής στον εξυπηÏετητή ή στο bitcoind</translation>
</message>
<message>
- <location line="-21"/>
+ <location line="-22"/>
<source>List commands</source>
<translation>Λίστα εντολών</translation>
</message>
<message>
- <location line="-11"/>
+ <location line="-10"/>
<source>Get help for a command</source>
<translation>Επεξήγηση εντολής</translation>
</message>
@@ -2174,12 +2300,12 @@ Address: %4
<translation>ΔημιουÏγία νομισμάτων</translation>
</message>
<message>
- <location line="-15"/>
+ <location line="-28"/>
<source>Don&apos;t generate coins</source>
<translation>ΆÏνηση δημιουÏγίας νομισμάτων</translation>
</message>
<message>
- <location line="+61"/>
+ <location line="+74"/>
<source>Specify data directory</source>
<translation>ΟÏισμός φακέλου δεδομένων</translation>
</message>
@@ -2189,80 +2315,82 @@ Address: %4
<translation>ÎŒÏισε το μέγεθος της βάσης Ï€ÏοσωÏινής αποθήκευσης σε megabytes(Ï€Ïοεπιλογή:25)</translation>
</message>
<message>
- <location line="-26"/>
+ <location line="-27"/>
<source>Listen for connections on &lt;port&gt; (default: 8333 or testnet: 18333)</source>
<translation>ΕισεÏχόμενες συνδέσεις στη θÏÏα &lt;port&gt; (Ï€Ïοεπιλογή: 8333 ή στο testnet: 18333)</translation>
</message>
<message>
- <location line="+4"/>
+ <location line="+5"/>
<source>Maintain at most &lt;n&gt; connections to peers (default: 125)</source>
<translation>Μέγιστες αÏιθμός συνδέσεων με τους peers &lt;n&gt; (Ï€Ïοεπιλογή: 125)</translation>
</message>
<message>
- <location line="-34"/>
+ <location line="-49"/>
<source>Connect to a node to retrieve peer addresses, and disconnect</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+65"/>
+ <location line="+80"/>
<source>Specify your own public address</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+2"/>
+ <location line="+3"/>
<source>Threshold for disconnecting misbehaving peers (default: 100)</source>
<translation>ÎŒÏιο αποσÏνδεσης Ï€Ïοβληματικών peers (Ï€Ïοεπιλογή: 100)</translation>
</message>
<message>
- <location line="-114"/>
+ <location line="-132"/>
<source>Number of seconds to keep misbehaving peers from reconnecting (default: 86400)</source>
<translation>ΔευτεÏόλεπτα Ï€Ïιν επιτÏαπεί ξανά η σÏνδεση των Ï€Ïοβληματικών peers (Ï€Ïοεπιλογή: 86400)</translation>
</message>
<message>
- <location line="-28"/>
+ <location line="-32"/>
<source>An error occurred while setting up the RPC port %u for listening on IPv4: %s</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+26"/>
+ <location line="+30"/>
<source>Listen for JSON-RPC connections on &lt;port&gt; (default: 8332 or testnet: 18332)</source>
<translation>ΕισεÏχόμενες συνδέσεις JSON-RPC στη θÏÏα &lt;port&gt; (Ï€Ïοεπιλογή: 8332 or testnet: 18332)</translation>
</message>
<message>
- <location line="+34"/>
+ <location line="+36"/>
<source>Accept command line and JSON-RPC commands</source>
<translation>Αποδοχή εντολών κονσόλας και JSON-RPC</translation>
</message>
<message>
- <location line="+62"/>
+ <location line="+77"/>
<source>Run in the background as a daemon and accept commands</source>
<translation>Εκτέλεση στο παÏασκήνιο κι αποδοχή εντολών</translation>
</message>
<message>
- <location line="+31"/>
+ <location line="+32"/>
<source>Use the test network</source>
<translation>ΧÏήση του Î´Î¿ÎºÎ¹Î¼Î±ÏƒÏ„Î¹ÎºÎ¿Ï Î´Î¹ÎºÏ„Ïου</translation>
</message>
<message>
- <location line="-92"/>
+ <location line="-108"/>
<source>Accept connections from outside (default: 1 if no -proxy or -connect)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-74"/>
+ <location line="-82"/>
<source>%s, you must set a rpcpassword in the configuration file:
- %s
+%s
It is recommended you use the following random password:
rpcuser=bitcoinrpc
rpcpassword=%s
(you do not need to remember this password)
The username and password MUST NOT be the same.
If the file does not exist, create it with owner-readable-only file permissions.
+It is also recommended to set alertnotify so you are notified of problems;
+for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.com
</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+15"/>
+ <location line="+17"/>
<source>An error occurred while setting up the RPC port %u for listening on IPv6, falling back to IPv4: %s</source>
<translation type="unfinished"/>
</message>
@@ -2278,11 +2406,6 @@ If the file does not exist, create it with owner-readable-only file permissions.
</message>
<message>
<location line="+3"/>
- <source>Corrupted block database detected. Please restart the client with -reindex.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+2"/>
<source>Error initializing database environment %s! To recover, BACKUP THAT DIRECTORY, then remove everything from it except for wallet.dat.</source>
<translation type="unfinished"/>
</message>
@@ -2297,12 +2420,27 @@ If the file does not exist, create it with owner-readable-only file permissions.
<translation type="unfinished"/>
</message>
<message>
+ <location line="+3"/>
+ <source>Execute command when a relevant alert is received (%s in cmd is replaced by message)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Execute command when a wallet transaction changes (%s in cmd is replaced by TxID)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location line="+11"/>
<source>Set maximum size of high-priority/low-fee transactions in bytes (default: 27000)</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+3"/>
+ <source>Set the number of script verification threads (1-16, 0=auto, default: 0)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
<source>This is a pre-release test build - use at your own risk - do not use for mining or merchant applications</source>
<translation type="unfinished"/>
</message>
@@ -2348,16 +2486,41 @@ If the file does not exist, create it with owner-readable-only file permissions.
</message>
<message>
<location line="+3"/>
+ <source>Corrupted block database detected</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Discover own IP address (default: 1 when listening and no -externalip)</source>
<translation type="unfinished"/>
</message>
<message>
+ <location line="+1"/>
+ <source>Do you want to rebuild the block database now?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location line="+3"/>
+ <source>Error initializing block database</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Error initializing wallet database environment %s!</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Error loading block database</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+5"/>
+ <location line="+4"/>
+ <source>Error opening block database</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
<source>Error: Disk space is low!</source>
<translation type="unfinished"/>
</message>
@@ -2373,26 +2536,96 @@ If the file does not exist, create it with owner-readable-only file permissions.
</message>
<message>
<location line="+2"/>
+ <source>Error: system error: </source>
+ <translation>Λάθος: λάθος συστήματος:</translation>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Failed to listen on any port. Use -listen=0 if you want this.</source>
<translation type="unfinished"/>
</message>
<message>
+ <location line="+1"/>
+ <source>Failed to read block info</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Failed to read block</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Failed to sync block index</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Failed to write block index</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Failed to write block info</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Failed to write block</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Failed to write file info</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Failed to write to coin database</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Failed to write transaction index</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Failed to write undo data</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location line="+2"/>
<source>Find peers using DNS lookup (default: 1 unless -connect)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+5"/>
- <source>How thorough the block verification is (0-4, default: 3)</source>
+ <location line="+3"/>
+ <source>How many blocks to check at startup (default: 288, 0 = all)</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+1"/>
- <source>Importing blocks from block database...</source>
+ <source>How thorough the block verification is (0-4, default: 3)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+24"/>
+ <source>Rebuild block chain index from current blk000??.dat files</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+37"/>
+ <source>Verifying blocks...</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+1"/>
+ <source>Verifying wallet...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-61"/>
<source>Imports blocks from external blk000??.dat file</source>
<translation type="unfinished"/>
</message>
@@ -2407,7 +2640,12 @@ If the file does not exist, create it with owner-readable-only file permissions.
<translation type="unfinished"/>
</message>
<message>
- <location line="+9"/>
+ <location line="+8"/>
+ <source>Maintain a full transaction index (default: 0)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
<source>Maximum per-connection receive buffer, &lt;n&gt;*1000 bytes (default: 5000)</source>
<translation type="unfinished"/>
</message>
@@ -2442,12 +2680,7 @@ If the file does not exist, create it with owner-readable-only file permissions.
<translation>ΧÏονοσφÏαγίδα πληÏοφοÏιών ÎµÎ½Ï„Î¿Ï€Î¹ÏƒÎ¼Î¿Ï ÏƒÏ†Î±Î»Î¼Î¬Ï„Ï‰Î½</translation>
</message>
<message>
- <location line="+1"/>
- <source>Rebuild blockchain index from current blk000??.dat files</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+4"/>
+ <location line="+5"/>
<source>SSL options: (see the Bitcoin Wiki for SSL setup instructions)</source>
<translation type="unfinished"/>
</message>
@@ -2487,7 +2720,12 @@ If the file does not exist, create it with owner-readable-only file permissions.
<translation>ΟÏισμός λήξης χÏÎ¿Î½Î¹ÎºÎ¿Ï Î¿Ïίου σε χιλιοστά του δευτεÏολέπτου(Ï€Ïοεπιλογή:5000)</translation>
</message>
<message>
- <location line="+13"/>
+ <location line="+4"/>
+ <source>System error: </source>
+ <translation>Λάθος Συστήματος:</translation>
+ </message>
+ <message>
+ <location line="+10"/>
<source>Use UPnP to map the listening port (default: 0)</source>
<translation type="unfinished"/>
</message>
@@ -2518,36 +2756,41 @@ If the file does not exist, create it with owner-readable-only file permissions.
</message>
<message>
<location line="+1"/>
+ <source>You need to rebuild the databases using -reindex to change -txindex</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>wallet.dat corrupt, salvage failed</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-43"/>
+ <location line="-45"/>
<source>Password for JSON-RPC connections</source>
<translation>Κωδικός για τις συνδέσεις JSON-RPC</translation>
</message>
<message>
- <location line="-53"/>
+ <location line="-68"/>
<source>Allow JSON-RPC connections from specified IP address</source>
<translation>Αποδοχή συνδέσεων JSON-RPC από συγκεκÏιμένη διεÏθυνση IP</translation>
</message>
<message>
- <location line="+62"/>
+ <location line="+77"/>
<source>Send commands to node running on &lt;ip&gt; (default: 127.0.0.1)</source>
<translation>Αποστολή εντολών στον κόμβο &lt;ip&gt; (Ï€Ïοεπιλογή: 127.0.0.1)</translation>
</message>
<message>
- <location line="-103"/>
+ <location line="-120"/>
<source>Execute command when the best block changes (%s in cmd is replaced by block hash)</source>
<translation>Εκτέλεσε την εντολή όταν το καλÏτεÏο μπλοκ αλλάξει(%s στην εντολή αντικαθίσταται από το hash του μπλοκ)</translation>
</message>
<message>
- <location line="+124"/>
+ <location line="+142"/>
<source>Upgrade wallet to latest format</source>
<translation>Αναβάθμισε το ποÏτοφόλι στην τελευταία έκδοση</translation>
</message>
<message>
- <location line="-15"/>
+ <location line="-16"/>
<source>Set key pool size to &lt;n&gt; (default: 100)</source>
<translation>ÎŒÏιο πλήθους κλειδιών pool &lt;n&gt; (Ï€Ïοεπιλογή: 100)</translation>
</message>
@@ -2557,17 +2800,12 @@ If the file does not exist, create it with owner-readable-only file permissions.
<translation>Επανέλεγχος της αλυσίδας μπλοκ για αποÏσες συναλλαγές</translation>
</message>
<message>
- <location line="-26"/>
- <source>How many blocks to check at startup (default: 2500, 0 = all)</source>
- <translation>Πόσα μπλοκ να ελέγχω κατά την εκκίνηση (Ï€Ïοεπιλογή:2500,0=όλα)</translation>
- </message>
- <message>
- <location line="+55"/>
+ <location line="+30"/>
<source>Use OpenSSL (https) for JSON-RPC connections</source>
<translation>ΧÏήση του OpenSSL (https) για συνδέσεις JSON-RPC</translation>
</message>
<message>
- <location line="-20"/>
+ <location line="-21"/>
<source>Server certificate file (default: server.cert)</source>
<translation>ΑÏχείο Ï€Î¹ÏƒÏ„Î¿Ï€Î¿Î¹Î·Ï„Î¹ÎºÎ¿Ï Ï„Î¿Ï… διακομιστή (Ï€Ïοεπιλογή: server.cert)</translation>
</message>
@@ -2577,12 +2815,12 @@ If the file does not exist, create it with owner-readable-only file permissions.
<translation>ΠÏοσωπικό κλειδί του διακομιστή (Ï€Ïοεπιλογή: server.pem)</translation>
</message>
<message>
- <location line="-133"/>
+ <location line="-154"/>
<source>Acceptable ciphers (default: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH)</source>
<translation>Αποδεκτά κÏυπτογÏαφήματα (Ï€Ïοεπιλογή: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH)</translation>
</message>
<message>
- <location line="+144"/>
+ <location line="+166"/>
<source>This help message</source>
<translation>Αυτό το κείμενο βοήθειας</translation>
</message>
@@ -2592,7 +2830,7 @@ If the file does not exist, create it with owner-readable-only file permissions.
<translation type="unfinished"/>
</message>
<message>
- <location line="-70"/>
+ <location line="-86"/>
<source>Connect through socks proxy</source>
<translation>ΣÏνδεση μέσω διαμεσολαβητή socks</translation>
</message>
@@ -2602,12 +2840,12 @@ If the file does not exist, create it with owner-readable-only file permissions.
<translation type="unfinished"/>
</message>
<message>
- <location line="+43"/>
+ <location line="+57"/>
<source>Loading addresses...</source>
<translation>ΦόÏτωση διευθÏνσεων...</translation>
</message>
<message>
- <location line="-25"/>
+ <location line="-35"/>
<source>Error loading wallet.dat: Wallet corrupted</source>
<translation>Σφάλμα φόÏτωσης wallet.dat: ΚατεστÏαμμένο ΠοÏτοφόλι</translation>
</message>
@@ -2617,32 +2855,22 @@ If the file does not exist, create it with owner-readable-only file permissions.
<translation>Σφάλμα φόÏτωσης wallet.dat: Το ΠοÏτοφόλι απαιτεί μια νεότεÏη έκδοση του Bitcoin</translation>
</message>
<message>
- <location line="+73"/>
- <source>Verifying block database integrity...</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+1"/>
- <source>Verifying wallet integrity...</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+1"/>
+ <location line="+87"/>
<source>Wallet needed to be rewritten: restart Bitcoin to complete</source>
<translation>Απαιτείται η επανεγγÏαφή του ΠοÏτοφολιοÏ, η οποία θα ολοκληÏωθεί στην επανεκκίνηση του Bitcoin</translation>
</message>
<message>
- <location line="-77"/>
+ <location line="-89"/>
<source>Error loading wallet.dat</source>
<translation>Σφάλμα φόÏτωσης αÏχείου wallet.dat</translation>
</message>
<message>
- <location line="+20"/>
+ <location line="+30"/>
<source>Invalid -proxy address: &apos;%s&apos;</source>
<translation>Δεν είναι έγκυÏη η διεÏθυνση διαμεσολαβητή: &apos;%s&apos;</translation>
</message>
<message>
- <location line="+46"/>
+ <location line="+48"/>
<source>Unknown network specified in -onlynet: &apos;%s&apos;</source>
<translation type="unfinished"/>
</message>
@@ -2652,7 +2880,7 @@ If the file does not exist, create it with owner-readable-only file permissions.
<translation type="unfinished"/>
</message>
<message>
- <location line="-75"/>
+ <location line="-91"/>
<source>Cannot resolve -bind address: &apos;%s&apos;</source>
<translation type="unfinished"/>
</message>
@@ -2662,17 +2890,17 @@ If the file does not exist, create it with owner-readable-only file permissions.
<translation type="unfinished"/>
</message>
<message>
- <location line="+31"/>
+ <location line="+45"/>
<source>Invalid amount for -paytxfee=&lt;amount&gt;: &apos;%s&apos;</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-15"/>
+ <location line="-24"/>
<source>Error: could not start node</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+16"/>
+ <location line="+25"/>
<source>Invalid amount</source>
<translation>Λάθος ποσότητα</translation>
</message>
@@ -2687,7 +2915,7 @@ If the file does not exist, create it with owner-readable-only file permissions.
<translation>ΦόÏτωση ευÏετηÏίου μπλοκ...</translation>
</message>
<message>
- <location line="-45"/>
+ <location line="-59"/>
<source>Add a node to connect to and attempt to keep the connection open</source>
<translation>ΠÏοσέθεσε ένα κόμβο για σÏνδεση και Ï€Ïοσπάθησε να κÏατήσεις την σÏνδεση ανοιχτή</translation>
</message>
@@ -2697,22 +2925,17 @@ If the file does not exist, create it with owner-readable-only file permissions.
<translation type="unfinished"/>
</message>
<message>
- <location line="+54"/>
- <source>Find peers using internet relay chat (default: 0)</source>
- <translation>Î’Ïες ομότιμους υπολογιστές χÏησιμοποιώντας internet relay chat(ΠÏοεπιλογή:0)</translation>
- </message>
- <message>
- <location line="-2"/>
+ <location line="+68"/>
<source>Fee per KB to add to transactions you send</source>
<translation>Αμοιβή ανά KB που θα Ï€Ïοστίθεται στις συναλλαγές που στέλνεις</translation>
</message>
<message>
- <location line="+19"/>
+ <location line="+17"/>
<source>Loading wallet...</source>
<translation>ΦόÏτωση ποÏτοφολιοÏ...</translation>
</message>
<message>
- <location line="-40"/>
+ <location line="-54"/>
<source>Cannot downgrade wallet</source>
<translation>Δεν μποÏÏŽ να υποβαθμίσω το ποÏτοφόλι</translation>
</message>
@@ -2727,27 +2950,27 @@ If the file does not exist, create it with owner-readable-only file permissions.
<translation>Δεν μποÏÏŽ να γÏάψω την Ï€Ïοεπιλεγμένη διεÏθυνση</translation>
</message>
<message>
- <location line="+49"/>
+ <location line="+64"/>
<source>Rescanning...</source>
<translation>Ανίχνευση...</translation>
</message>
<message>
- <location line="-43"/>
+ <location line="-56"/>
<source>Done loading</source>
<translation>Η φόÏτωση ολοκληÏώθηκε</translation>
</message>
<message>
- <location line="+65"/>
+ <location line="+79"/>
<source>To use the %s option</source>
<translation>ΧÏήση της %s επιλογής</translation>
</message>
<message>
- <location line="-60"/>
+ <location line="-71"/>
<source>Error</source>
<translation>Σφάλμα</translation>
</message>
<message>
- <location line="-28"/>
+ <location line="-33"/>
<source>You must set rpcpassword=&lt;password&gt; in the configuration file:
%s
If the file does not exist, create it with owner-readable-only file permissions.</source>
diff --git a/src/qt/locale/bitcoin_en.ts b/src/qt/locale/bitcoin_en.ts
index 39062d0a2c..c74b11d3d6 100644
--- a/src/qt/locale/bitcoin_en.ts
+++ b/src/qt/locale/bitcoin_en.ts
@@ -123,7 +123,12 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation>&amp;Edit</translation>
</message>
<message>
- <location line="+248"/>
+ <location line="+1"/>
+ <source>Send &amp;Coins</source>
+ <translation>Send &amp;Coins</translation>
+ </message>
+ <message>
+ <location line="+263"/>
<source>Export Address Book Data</source>
<translation>Export Address Book Data</translation>
</message>
@@ -305,17 +310,17 @@ This product includes software developed by the OpenSSL Project for use in the O
<context>
<name>BitcoinGUI</name>
<message>
- <location filename="../bitcoingui.cpp" line="+267"/>
+ <location filename="../bitcoingui.cpp" line="+231"/>
<source>Sign &amp;message...</source>
<translation>Sign &amp;message...</translation>
</message>
<message>
- <location line="+254"/>
+ <location line="+299"/>
<source>Synchronizing with network...</source>
<translation>Synchronizing with network...</translation>
</message>
<message>
- <location line="-322"/>
+ <location line="-367"/>
<source>&amp;Overview</source>
<translation>&amp;Overview</translation>
</message>
@@ -335,32 +340,17 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation>Browse transaction history</translation>
</message>
<message>
- <location line="+6"/>
- <source>&amp;Address Book</source>
- <translation>&amp;Address Book</translation>
- </message>
- <message>
- <location line="+1"/>
+ <location line="+7"/>
<source>Edit the list of stored addresses and labels</source>
<translation>Edit the list of stored addresses and labels</translation>
</message>
<message>
- <location line="-15"/>
- <source>&amp;Receive coins</source>
- <translation>&amp;Receive coins</translation>
- </message>
- <message>
- <location line="+1"/>
+ <location line="-14"/>
<source>Show the list of addresses for receiving payments</source>
<translation>Show the list of addresses for receiving payments</translation>
</message>
<message>
- <location line="-8"/>
- <source>&amp;Send coins</source>
- <translation>&amp;Send coins</translation>
- </message>
- <message>
- <location line="+39"/>
+ <location line="+31"/>
<source>E&amp;xit</source>
<translation>E&amp;xit</translation>
</message>
@@ -405,7 +395,7 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation>&amp;Change Passphrase...</translation>
</message>
<message>
- <location line="+259"/>
+ <location line="+304"/>
<source>Importing blocks from disk...</source>
<translation>Importing blocks from disk...</translation>
</message>
@@ -414,16 +404,8 @@ This product includes software developed by the OpenSSL Project for use in the O
<source>Reindexing blocks on disk...</source>
<translation>Reindexing blocks on disk...</translation>
</message>
- <message numerus="yes">
- <location line="+10"/>
- <source>~%n block(s) remaining</source>
- <translation>
- <numerusform>~%n block remaining</numerusform>
- <numerusform>~%n blocks remaining</numerusform>
- </translation>
- </message>
<message>
- <location line="-265"/>
+ <location line="-300"/>
<source>&amp;Export...</source>
<translation>&amp;Export...</translation>
</message>
@@ -468,18 +450,33 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation>&amp;Verify message...</translation>
</message>
<message>
- <location line="-196"/>
- <location line="+538"/>
+ <location line="-162"/>
+ <location line="+540"/>
<source>Bitcoin</source>
<translation>Bitcoin</translation>
</message>
<message>
- <location line="-538"/>
+ <location line="-540"/>
<source>Wallet</source>
<translation>Wallet</translation>
</message>
<message>
- <location line="+176"/>
+ <location line="+99"/>
+ <source>&amp;Send</source>
+ <translation>&amp;Send</translation>
+ </message>
+ <message>
+ <location line="+7"/>
+ <source>&amp;Receive</source>
+ <translation>&amp;Receive</translation>
+ </message>
+ <message>
+ <location line="+14"/>
+ <source>&amp;Addresses</source>
+ <translation>&amp;Addresses</translation>
+ </message>
+ <message>
+ <location line="+22"/>
<source>&amp;About Bitcoin</source>
<translation>&amp;About Bitcoin</translation>
</message>
@@ -540,12 +537,12 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation>[testnet]</translation>
</message>
<message>
- <location line="+63"/>
+ <location line="+47"/>
<source>Bitcoin client</source>
<translation>Bitcoin client</translation>
</message>
<message numerus="yes">
- <location line="+79"/>
+ <location line="+140"/>
<source>%n active connection(s) to Bitcoin network</source>
<translation>
<numerusform>%n active connection to Bitcoin network</numerusform>
@@ -553,17 +550,56 @@ This product includes software developed by the OpenSSL Project for use in the O
</translation>
</message>
<message>
- <location line="+45"/>
- <source>Processed %1 of %2 blocks of transaction history (%3% done).</source>
- <translation>Processed %1 of %2 blocks of transaction history (%3% done).</translation>
+ <location line="+39"/>
+ <source>Processed %1 of %2 (estimated) blocks of transaction history.</source>
+ <translation>Processed %1 of %2 (estimated) blocks of transaction history.</translation>
</message>
<message>
- <location line="+7"/>
+ <location line="+4"/>
<source>Processed %1 blocks of transaction history.</source>
<translation>Processed %1 blocks of transaction history.</translation>
</message>
+ <message numerus="yes">
+ <location line="+20"/>
+ <source>%n hour(s)</source>
+ <translation>
+ <numerusform>%n hour</numerusform>
+ <numerusform>%n hours</numerusform>
+ </translation>
+ </message>
+ <message numerus="yes">
+ <location line="+4"/>
+ <source>%n day(s)</source>
+ <translation>
+ <numerusform>%n day</numerusform>
+ <numerusform>%n days</numerusform>
+ </translation>
+ </message>
+ <message numerus="yes">
+ <location line="+4"/>
+ <source>%n week(s)</source>
+ <translation>
+ <numerusform>%n week</numerusform>
+ <numerusform>%n weeks</numerusform>
+ </translation>
+ </message>
<message>
- <location line="+70"/>
+ <location line="+5"/>
+ <source>%1 behind</source>
+ <translation>%1 behind</translation>
+ </message>
+ <message>
+ <location line="+14"/>
+ <source>Last received block was generated %1 ago.</source>
+ <translation>Last received block was generated %1 ago.</translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Transactions after this will not yet be visible.</source>
+ <translation>Transactions after this will not yet be visible.</translation>
+ </message>
+ <message>
+ <location line="+21"/>
<source>Error</source>
<translation>Error</translation>
</message>
@@ -578,74 +614,27 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation>Information</translation>
</message>
<message>
- <location line="+66"/>
+ <location line="+68"/>
<source>This transaction is over the size limit. You can still send it for a fee of %1, which goes to the nodes that process your transaction and helps to support the network. Do you want to pay the fee?</source>
<translation>This transaction is over the size limit. You can still send it for a fee of %1, which goes to the nodes that process your transaction and helps to support the network. Do you want to pay the fee?</translation>
</message>
<message>
- <location line="+210"/>
- <source>Backup Successful</source>
- <translation>Backup Successful</translation>
- </message>
- <message>
- <location line="+0"/>
- <source>The wallet data was successfully saved to the new location.</source>
- <translation>The wallet data was successfully saved to the new location.</translation>
- </message>
- <message numerus="yes">
- <location line="-338"/>
- <source>%n second(s) ago</source>
- <translation>
- <numerusform>%n second ago</numerusform>
- <numerusform>%n seconds ago</numerusform>
- </translation>
- </message>
- <message numerus="yes">
- <location line="+4"/>
- <source>%n minute(s) ago</source>
- <translation>
- <numerusform>%n minute ago</numerusform>
- <numerusform>%n minutes ago</numerusform>
- </translation>
- </message>
- <message numerus="yes">
- <location line="+4"/>
- <source>%n hour(s) ago</source>
- <translation>
- <numerusform>%n hour ago</numerusform>
- <numerusform>%n hours ago</numerusform>
- </translation>
- </message>
- <message numerus="yes">
- <location line="+4"/>
- <source>%n day(s) ago</source>
- <translation>
- <numerusform>%n day ago</numerusform>
- <numerusform>%n days ago</numerusform>
- </translation>
- </message>
- <message>
- <location line="+6"/>
+ <location line="-138"/>
<source>Up to date</source>
<translation>Up to date</translation>
</message>
<message>
- <location line="+7"/>
+ <location line="+32"/>
<source>Catching up...</source>
<translation>Catching up...</translation>
</message>
<message>
- <location line="+10"/>
- <source>Last received block was generated %1.</source>
- <translation>Last received block was generated %1.</translation>
- </message>
- <message>
- <location line="+97"/>
+ <location line="+110"/>
<source>Confirm transaction fee</source>
<translation>Confirm transaction fee</translation>
</message>
<message>
- <location line="+23"/>
+ <location line="+8"/>
<source>Sent transaction</source>
<translation>Sent transaction</translation>
</message>
@@ -668,14 +657,14 @@ Address: %4
</translation>
</message>
<message>
- <location line="+99"/>
- <location line="+28"/>
+ <location line="+33"/>
+ <location line="+23"/>
<source>URI handling</source>
<translation>URI handling</translation>
</message>
<message>
- <location line="-28"/>
- <location line="+28"/>
+ <location line="-23"/>
+ <location line="+23"/>
<source>URI can not be parsed! This can be caused by an invalid Bitcoin address or malformed URI parameters.</source>
<translation>URI can not be parsed! This can be caused by an invalid Bitcoin address or malformed URI parameters.</translation>
</message>
@@ -690,27 +679,7 @@ Address: %4
<translation>Wallet is &lt;b&gt;encrypted&lt;/b&gt; and currently &lt;b&gt;locked&lt;/b&gt;</translation>
</message>
<message>
- <location line="+23"/>
- <source>Backup Wallet</source>
- <translation>Backup Wallet</translation>
- </message>
- <message>
- <location line="+0"/>
- <source>Wallet Data (*.dat)</source>
- <translation>Wallet Data (*.dat)</translation>
- </message>
- <message>
- <location line="+3"/>
- <source>Backup Failed</source>
- <translation>Backup Failed</translation>
- </message>
- <message>
- <location line="+0"/>
- <source>There was an error trying to save the wallet data to the new location.</source>
- <translation>There was an error trying to save the wallet data to the new location.</translation>
- </message>
- <message>
- <location filename="../bitcoin.cpp" line="+110"/>
+ <location filename="../bitcoin.cpp" line="+108"/>
<source>A fatal error occurred. Bitcoin can no longer continue safely and will quit.</source>
<translation>A fatal error occurred. Bitcoin can no longer continue safely and will quit.</translation>
</message>
@@ -718,7 +687,7 @@ Address: %4
<context>
<name>ClientModel</name>
<message>
- <location filename="../clientmodel.cpp" line="+89"/>
+ <location filename="../clientmodel.cpp" line="+96"/>
<source>Network Alert</source>
<translation>Network Alert</translation>
</message>
@@ -751,7 +720,7 @@ Address: %4
<translation>The address associated with this address book entry. This can only be modified for sending addresses.</translation>
</message>
<message>
- <location filename="../editaddressdialog.cpp" line="+20"/>
+ <location filename="../editaddressdialog.cpp" line="+21"/>
<source>New receiving address</source>
<translation>New receiving address</translation>
</message>
@@ -794,7 +763,7 @@ Address: %4
<context>
<name>GUIUtil::HelpMessageBox</name>
<message>
- <location filename="../guiutil.cpp" line="+420"/>
+ <location filename="../guiutil.cpp" line="+422"/>
<location line="+12"/>
<source>Bitcoin-Qt</source>
<translation>Bitcoin-Qt</translation>
@@ -1008,7 +977,7 @@ Address: %4
<translation>&amp;Apply</translation>
</message>
<message>
- <location filename="../optionsdialog.cpp" line="+55"/>
+ <location filename="../optionsdialog.cpp" line="+53"/>
<source>default</source>
<translation>default</translation>
</message>
@@ -1053,23 +1022,18 @@ Address: %4
<translation>Form</translation>
</message>
<message>
- <location line="+51"/>
- <location line="+183"/>
+ <location line="+50"/>
+ <location line="+166"/>
<source>The displayed information may be out of date. Your wallet automatically synchronizes with the Bitcoin network after a connection is established, but this process has not completed yet.</source>
<translation>The displayed information may be out of date. Your wallet automatically synchronizes with the Bitcoin network after a connection is established, but this process has not completed yet.</translation>
</message>
<message>
- <location line="-141"/>
+ <location line="-124"/>
<source>Balance:</source>
<translation>Balance:</translation>
</message>
<message>
- <location line="+58"/>
- <source>Number of transactions:</source>
- <translation>Number of transactions:</translation>
- </message>
- <message>
- <location line="-29"/>
+ <location line="+29"/>
<source>Unconfirmed:</source>
<translation>Unconfirmed:</translation>
</message>
@@ -1079,7 +1043,7 @@ Address: %4
<translation>Wallet</translation>
</message>
<message>
- <location line="+124"/>
+ <location line="+107"/>
<source>Immature:</source>
<translation>Immature:</translation>
</message>
@@ -1094,7 +1058,7 @@ Address: %4
<translation>&lt;b&gt;Recent transactions&lt;/b&gt;</translation>
</message>
<message>
- <location line="-118"/>
+ <location line="-101"/>
<source>Your current balance</source>
<translation>Your current balance</translation>
</message>
@@ -1104,11 +1068,6 @@ Address: %4
<translation>Total of transactions that have yet to be confirmed, and do not yet count toward the current balance</translation>
</message>
<message>
- <location line="+20"/>
- <source>Total number of transactions in wallet</source>
- <translation>Total number of transactions in wallet</translation>
- </message>
- <message>
<location filename="../overviewpage.cpp" line="+115"/>
<location line="+1"/>
<source>out of sync</source>
@@ -1116,6 +1075,14 @@ Address: %4
</message>
</context>
<context>
+ <name>PaymentServer</name>
+ <message>
+ <location filename="../paymentserver.cpp" line="+107"/>
+ <source>Cannot start bitcoin: click-to-pay handler</source>
+ <translation>Cannot start bitcoin: click-to-pay handler</translation>
+ </message>
+</context>
+<context>
<name>QRCodeDialog</name>
<message>
<location filename="../forms/qrcodedialog.ui" line="+14"/>
@@ -1454,7 +1421,7 @@ Address: %4
</message>
<message>
<location line="+60"/>
- <location filename="../sendcoinsentry.cpp" line="+25"/>
+ <location filename="../sendcoinsentry.cpp" line="+26"/>
<source>Enter a label for this address to add it to your address book</source>
<translation>Enter a label for this address to add it to your address book</translation>
</message>
@@ -1690,7 +1657,7 @@ Address: %4
<context>
<name>TransactionDesc</name>
<message>
- <location filename="../transactiondesc.cpp" line="+19"/>
+ <location filename="../transactiondesc.cpp" line="+20"/>
<source>Open until %1</source>
<translation>Open until %1</translation>
</message>
@@ -1886,7 +1853,7 @@ Address: %4
<context>
<name>TransactionTableModel</name>
<message>
- <location filename="../transactiontablemodel.cpp" line="+226"/>
+ <location filename="../transactiontablemodel.cpp" line="+225"/>
<source>Date</source>
<translation>Date</translation>
</message>
@@ -2010,7 +1977,7 @@ Address: %4
<context>
<name>TransactionView</name>
<message>
- <location filename="../transactionview.cpp" line="+55"/>
+ <location filename="../transactionview.cpp" line="+52"/>
<location line="+16"/>
<source>All</source>
<translation>All</translation>
@@ -2097,6 +2064,11 @@ Address: %4
</message>
<message>
<location line="+1"/>
+ <source>Copy transaction ID</source>
+ <translation>Copy transaction ID</translation>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Edit label</source>
<translation>Edit label</translation>
</message>
@@ -2106,7 +2078,7 @@ Address: %4
<translation>Show transaction details</translation>
</message>
<message>
- <location line="+142"/>
+ <location line="+139"/>
<source>Export Transaction Data</source>
<translation>Export Transaction Data</translation>
</message>
@@ -2161,7 +2133,7 @@ Address: %4
<translation>Could not write to file %1.</translation>
</message>
<message>
- <location line="+95"/>
+ <location line="+100"/>
<source>Range:</source>
<translation>Range:</translation>
</message>
@@ -2172,14 +2144,157 @@ Address: %4
</message>
</context>
<context>
+ <name>WalletView</name>
+ <message>
+ <location filename="../walletview.cpp" line="+95"/>
+ <source>&amp;Overview</source>
+ <translation>&amp;Overview</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Show general overview of wallet</source>
+ <translation>Show general overview of wallet</translation>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>&amp;Send coins</source>
+ <translation>&amp;Send coins</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Send coins to a Bitcoin address</source>
+ <translation>Send coins to a Bitcoin address</translation>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>&amp;Receive coins</source>
+ <translation>&amp;Receive coins</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Show the list of addresses for receiving payments</source>
+ <translation>Show the list of addresses for receiving payments</translation>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>&amp;Transactions</source>
+ <translation>&amp;Transactions</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Browse transaction history</source>
+ <translation>Browse transaction history</translation>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>&amp;Address Book</source>
+ <translation>&amp;Address Book</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Edit the list of stored addresses and labels</source>
+ <translation>Edit the list of stored addresses and labels</translation>
+ </message>
+ <message>
+ <location line="+12"/>
+ <source>&amp;Encrypt Wallet...</source>
+ <translation>&amp;Encrypt Wallet...</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Encrypt the private keys that belong to your wallet</source>
+ <translation>Encrypt the private keys that belong to your wallet</translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>&amp;Backup Wallet...</source>
+ <translation>&amp;Backup Wallet...</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Backup wallet to another location</source>
+ <translation>Backup wallet to another location</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>&amp;Change Passphrase...</source>
+ <translation>&amp;Change Passphrase...</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Change the passphrase used for wallet encryption</source>
+ <translation>Change the passphrase used for wallet encryption</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Sign &amp;message...</source>
+ <translation>Sign &amp;message...</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Sign messages with your Bitcoin addresses to prove you own them</source>
+ <translation>Sign messages with your Bitcoin addresses to prove you own them</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>&amp;Verify message...</source>
+ <translation>&amp;Verify message...</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Verify messages to ensure they were signed with specified Bitcoin addresses</source>
+ <translation>Verify messages to ensure they were signed with specified Bitcoin addresses</translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>&amp;Export...</source>
+ <translation>&amp;Export...</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Export the data in the current tab to a file</source>
+ <translation>Export the data in the current tab to a file</translation>
+ </message>
+ <message>
+ <location line="+180"/>
+ <source>Backup Wallet</source>
+ <translation>Backup Wallet</translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>Wallet Data (*.dat)</source>
+ <translation>Wallet Data (*.dat)</translation>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Backup Failed</source>
+ <translation>Backup Failed</translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>There was an error trying to save the wallet data to the new location.</source>
+ <translation>There was an error trying to save the wallet data to the new location.</translation>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>Backup Successful</source>
+ <translation>Backup Successful</translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>The wallet data was successfully saved to the new location.</source>
+ <translation>The wallet data was successfully saved to the new location.</translation>
+ </message>
+</context>
+<context>
<name>bitcoin-core</name>
<message>
- <location filename="../bitcoinstrings.cpp" line="+90"/>
+ <location filename="../bitcoinstrings.cpp" line="+96"/>
<source>Bitcoin version</source>
<translation>Bitcoin version</translation>
</message>
<message>
- <location line="+96"/>
+ <location line="+98"/>
<source>Usage:</source>
<translation>Usage:</translation>
</message>
@@ -2194,12 +2309,12 @@ Address: %4
<translation>List commands</translation>
</message>
<message>
- <location line="-11"/>
+ <location line="-10"/>
<source>Get help for a command</source>
<translation>Get help for a command</translation>
</message>
<message>
- <location line="+22"/>
+ <location line="+21"/>
<source>Options:</source>
<translation>Options:</translation>
</message>
@@ -2214,12 +2329,12 @@ Address: %4
<translation>Specify pid file (default: bitcoind.pid)</translation>
</message>
<message>
- <location line="-48"/>
+ <location line="-47"/>
<source>Generate coins</source>
<translation>Generate coins</translation>
</message>
<message>
- <location line="-27"/>
+ <location line="-28"/>
<source>Don&apos;t generate coins</source>
<translation>Don&apos;t generate coins</translation>
</message>
@@ -2244,12 +2359,12 @@ Address: %4
<translation>Maintain at most &lt;n&gt; connections to peers (default: 125)</translation>
</message>
<message>
- <location line="-47"/>
+ <location line="-49"/>
<source>Connect to a node to retrieve peer addresses, and disconnect</source>
<translation>Connect to a node to retrieve peer addresses, and disconnect</translation>
</message>
<message>
- <location line="+78"/>
+ <location line="+80"/>
<source>Specify your own public address</source>
<translation>Specify your own public address</translation>
</message>
@@ -2259,17 +2374,17 @@ Address: %4
<translation>Threshold for disconnecting misbehaving peers (default: 100)</translation>
</message>
<message>
- <location line="-130"/>
+ <location line="-132"/>
<source>Number of seconds to keep misbehaving peers from reconnecting (default: 86400)</source>
<translation>Number of seconds to keep misbehaving peers from reconnecting (default: 86400)</translation>
</message>
<message>
- <location line="-28"/>
+ <location line="-32"/>
<source>An error occurred while setting up the RPC port %u for listening on IPv4: %s</source>
<translation>An error occurred while setting up the RPC port %u for listening on IPv4: %s</translation>
</message>
<message>
- <location line="+26"/>
+ <location line="+30"/>
<source>Listen for JSON-RPC connections on &lt;port&gt; (default: 8332 or testnet: 18332)</source>
<translation>Listen for JSON-RPC connections on &lt;port&gt; (default: 8332 or testnet: 18332)</translation>
</message>
@@ -2279,7 +2394,7 @@ Address: %4
<translation>Accept command line and JSON-RPC commands</translation>
</message>
<message>
- <location line="+75"/>
+ <location line="+77"/>
<source>Run in the background as a daemon and accept commands</source>
<translation>Run in the background as a daemon and accept commands</translation>
</message>
@@ -2289,32 +2404,37 @@ Address: %4
<translation>Use the test network</translation>
</message>
<message>
- <location line="-106"/>
+ <location line="-108"/>
<source>Accept connections from outside (default: 1 if no -proxy or -connect)</source>
<translation>Accept connections from outside (default: 1 if no -proxy or -connect)</translation>
</message>
<message>
- <location line="-76"/>
+ <location line="-82"/>
<source>%s, you must set a rpcpassword in the configuration file:
- %s
+%s
It is recommended you use the following random password:
rpcuser=bitcoinrpc
rpcpassword=%s
(you do not need to remember this password)
The username and password MUST NOT be the same.
If the file does not exist, create it with owner-readable-only file permissions.
+It is also recommended to set alertnotify so you are notified of problems;
+for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.com
</source>
<translation>%s, you must set a rpcpassword in the configuration file:
- %s
+%s
It is recommended you use the following random password:
rpcuser=bitcoinrpc
rpcpassword=%s
(you do not need to remember this password)
The username and password MUST NOT be the same.
-If the file does not exist, create it with owner-readable-only file permissions.</translation>
+If the file does not exist, create it with owner-readable-only file permissions.
+It is also recommended to set alertnotify so you are notified of problems;
+for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.com
+</translation>
</message>
<message>
- <location line="+15"/>
+ <location line="+17"/>
<source>An error occurred while setting up the RPC port %u for listening on IPv6, falling back to IPv4: %s</source>
<translation>An error occurred while setting up the RPC port %u for listening on IPv6, falling back to IPv4: %s</translation>
</message>
@@ -2330,11 +2450,6 @@ If the file does not exist, create it with owner-readable-only file permissions.
</message>
<message>
<location line="+3"/>
- <source>Corrupted block database detected. Please restart the client with -reindex.</source>
- <translation>Corrupted block database detected. Please restart the client with -reindex.</translation>
- </message>
- <message>
- <location line="+2"/>
<source>Error initializing database environment %s! To recover, BACKUP THAT DIRECTORY, then remove everything from it except for wallet.dat.</source>
<translation>Error initializing database environment %s! To recover, BACKUP THAT DIRECTORY, then remove everything from it except for wallet.dat.</translation>
</message>
@@ -2349,6 +2464,16 @@ If the file does not exist, create it with owner-readable-only file permissions.
<translation>Error: This transaction requires a transaction fee of at least %s because of its amount, complexity, or use of recently received funds!</translation>
</message>
<message>
+ <location line="+3"/>
+ <source>Execute command when a relevant alert is received (%s in cmd is replaced by message)</source>
+ <translation>Execute command when a relevant alert is received (%s in cmd is replaced by message)</translation>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Execute command when a wallet transaction changes (%s in cmd is replaced by TxID)</source>
+ <translation>Execute command when a wallet transaction changes (%s in cmd is replaced by TxID)</translation>
+ </message>
+ <message>
<location line="+11"/>
<source>Set maximum size of high-priority/low-fee transactions in bytes (default: 27000)</source>
<translation>Set maximum size of high-priority/low-fee transactions in bytes (default: 27000)</translation>
@@ -2405,21 +2530,41 @@ If the file does not exist, create it with owner-readable-only file permissions.
</message>
<message>
<location line="+3"/>
+ <source>Corrupted block database detected</source>
+ <translation>Corrupted block database detected</translation>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Discover own IP address (default: 1 when listening and no -externalip)</source>
<translation>Discover own IP address (default: 1 when listening and no -externalip)</translation>
</message>
<message>
+ <location line="+1"/>
+ <source>Do you want to rebuild the block database now?</source>
+ <translation>Do you want to rebuild the block database now?</translation>
+ </message>
+ <message>
<location line="+3"/>
<source>Error initializing block database</source>
<translation>Error initializing block database</translation>
</message>
<message>
<location line="+1"/>
+ <source>Error initializing wallet database environment %s!</source>
+ <translation>Error initializing wallet database environment %s!</translation>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Error loading block database</source>
<translation>Error loading block database</translation>
</message>
<message>
- <location line="+5"/>
+ <location line="+4"/>
+ <source>Error opening block database</source>
+ <translation>Error opening block database</translation>
+ </message>
+ <message>
+ <location line="+2"/>
<source>Error: Disk space is low!</source>
<translation>Error: Disk space is low!</translation>
</message>
@@ -2499,7 +2644,7 @@ If the file does not exist, create it with owner-readable-only file permissions.
<translation>Find peers using DNS lookup (default: 1 unless -connect)</translation>
</message>
<message>
- <location line="+4"/>
+ <location line="+3"/>
<source>How many blocks to check at startup (default: 288, 0 = all)</source>
<translation>How many blocks to check at startup (default: 288, 0 = all)</translation>
</message>
@@ -2509,12 +2654,22 @@ If the file does not exist, create it with owner-readable-only file permissions.
<translation>How thorough the block verification is (0-4, default: 3)</translation>
</message>
<message>
- <location line="+1"/>
- <source>Importing blocks from block database...</source>
- <translation>Importing blocks from block database...</translation>
+ <location line="+24"/>
+ <source>Rebuild block chain index from current blk000??.dat files</source>
+ <translation>Rebuild block chain index from current blk000??.dat files</translation>
+ </message>
+ <message>
+ <location line="+37"/>
+ <source>Verifying blocks...</source>
+ <translation>Verifying blocks...</translation>
</message>
<message>
<location line="+1"/>
+ <source>Verifying wallet...</source>
+ <translation>Verifying wallet...</translation>
+ </message>
+ <message>
+ <location line="-61"/>
<source>Imports blocks from external blk000??.dat file</source>
<translation>Imports blocks from external blk000??.dat file</translation>
</message>
@@ -2569,12 +2724,7 @@ If the file does not exist, create it with owner-readable-only file permissions.
<translation>Prepend debug output with timestamp</translation>
</message>
<message>
- <location line="+1"/>
- <source>Rebuild blockchain index from current blk000??.dat files</source>
- <translation>Rebuild blockchain index from current blk000??.dat files</translation>
- </message>
- <message>
- <location line="+4"/>
+ <location line="+5"/>
<source>SSL options: (see the Bitcoin Wiki for SSL setup instructions)</source>
<translation>SSL options: (see the Bitcoin Wiki for SSL setup instructions)</translation>
</message>
@@ -2664,22 +2814,22 @@ If the file does not exist, create it with owner-readable-only file permissions.
<translation>Password for JSON-RPC connections</translation>
</message>
<message>
- <location line="-66"/>
+ <location line="-68"/>
<source>Allow JSON-RPC connections from specified IP address</source>
<translation>Allow JSON-RPC connections from specified IP address</translation>
</message>
<message>
- <location line="+75"/>
+ <location line="+77"/>
<source>Send commands to node running on &lt;ip&gt; (default: 127.0.0.1)</source>
<translation>Send commands to node running on &lt;ip&gt; (default: 127.0.0.1)</translation>
</message>
<message>
- <location line="-118"/>
+ <location line="-120"/>
<source>Execute command when the best block changes (%s in cmd is replaced by block hash)</source>
<translation>Execute command when the best block changes (%s in cmd is replaced by block hash)</translation>
</message>
<message>
- <location line="+140"/>
+ <location line="+142"/>
<source>Upgrade wallet to latest format</source>
<translation>Upgrade wallet to latest format</translation>
</message>
@@ -2709,12 +2859,12 @@ If the file does not exist, create it with owner-readable-only file permissions.
<translation>Server private key (default: server.pem)</translation>
</message>
<message>
- <location line="-148"/>
+ <location line="-154"/>
<source>Acceptable ciphers (default: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH)</source>
<translation>Acceptable ciphers (default: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH)</translation>
</message>
<message>
- <location line="+160"/>
+ <location line="+166"/>
<source>This help message</source>
<translation>This help message</translation>
</message>
@@ -2724,7 +2874,7 @@ If the file does not exist, create it with owner-readable-only file permissions.
<translation>Unable to bind to %s on this computer (bind returned error %d, %s)</translation>
</message>
<message>
- <location line="-84"/>
+ <location line="-86"/>
<source>Connect through socks proxy</source>
<translation>Connect through socks proxy</translation>
</message>
@@ -2734,12 +2884,12 @@ If the file does not exist, create it with owner-readable-only file permissions.
<translation>Allow DNS lookups for -addnode, -seednode and -connect</translation>
</message>
<message>
- <location line="+55"/>
+ <location line="+57"/>
<source>Loading addresses...</source>
<translation>Loading addresses...</translation>
</message>
<message>
- <location line="-36"/>
+ <location line="-35"/>
<source>Error loading wallet.dat: Wallet corrupted</source>
<translation>Error loading wallet.dat: Wallet corrupted</translation>
</message>
@@ -2749,27 +2899,17 @@ If the file does not exist, create it with owner-readable-only file permissions.
<translation>Error loading wallet.dat: Wallet requires newer version of Bitcoin</translation>
</message>
<message>
- <location line="+86"/>
- <source>Verifying block database integrity...</source>
- <translation>Verifying block database integrity...</translation>
- </message>
- <message>
- <location line="+1"/>
- <source>Verifying wallet integrity...</source>
- <translation>Verifying wallet integrity...</translation>
- </message>
- <message>
- <location line="+1"/>
+ <location line="+87"/>
<source>Wallet needed to be rewritten: restart Bitcoin to complete</source>
<translation>Wallet needed to be rewritten: restart Bitcoin to complete</translation>
</message>
<message>
- <location line="-90"/>
+ <location line="-89"/>
<source>Error loading wallet.dat</source>
<translation>Error loading wallet.dat</translation>
</message>
<message>
- <location line="+31"/>
+ <location line="+30"/>
<source>Invalid -proxy address: &apos;%s&apos;</source>
<translation>Invalid -proxy address: &apos;%s&apos;</translation>
</message>
@@ -2784,7 +2924,7 @@ If the file does not exist, create it with owner-readable-only file permissions.
<translation>Unknown -socks proxy version requested: %i</translation>
</message>
<message>
- <location line="-89"/>
+ <location line="-91"/>
<source>Cannot resolve -bind address: &apos;%s&apos;</source>
<translation>Cannot resolve -bind address: &apos;%s&apos;</translation>
</message>
@@ -2794,17 +2934,17 @@ If the file does not exist, create it with owner-readable-only file permissions.
<translation>Cannot resolve -externalip address: &apos;%s&apos;</translation>
</message>
<message>
- <location line="+43"/>
+ <location line="+45"/>
<source>Invalid amount for -paytxfee=&lt;amount&gt;: &apos;%s&apos;</source>
<translation>Invalid amount for -paytxfee=&lt;amount&gt;: &apos;%s&apos;</translation>
</message>
<message>
- <location line="-26"/>
+ <location line="-24"/>
<source>Error: could not start node</source>
<translation>Error: could not start node</translation>
</message>
<message>
- <location line="+27"/>
+ <location line="+25"/>
<source>Invalid amount</source>
<translation>Invalid amount</translation>
</message>
@@ -2819,7 +2959,7 @@ If the file does not exist, create it with owner-readable-only file permissions.
<translation>Loading block index...</translation>
</message>
<message>
- <location line="-57"/>
+ <location line="-59"/>
<source>Add a node to connect to and attempt to keep the connection open</source>
<translation>Add a node to connect to and attempt to keep the connection open</translation>
</message>
@@ -2829,22 +2969,17 @@ If the file does not exist, create it with owner-readable-only file permissions.
<translation>Unable to bind to %s on this computer. Bitcoin is probably already running.</translation>
</message>
<message>
- <location line="+66"/>
- <source>Find peers using internet relay chat (default: 0)</source>
- <translation>Find peers using internet relay chat (default: 0)</translation>
- </message>
- <message>
- <location line="-2"/>
+ <location line="+68"/>
<source>Fee per KB to add to transactions you send</source>
<translation>Fee per KB to add to transactions you send</translation>
</message>
<message>
- <location line="+19"/>
+ <location line="+17"/>
<source>Loading wallet...</source>
<translation>Loading wallet...</translation>
</message>
<message>
- <location line="-52"/>
+ <location line="-54"/>
<source>Cannot downgrade wallet</source>
<translation>Cannot downgrade wallet</translation>
</message>
@@ -2859,7 +2994,7 @@ If the file does not exist, create it with owner-readable-only file permissions.
<translation>Cannot write default address</translation>
</message>
<message>
- <location line="+62"/>
+ <location line="+64"/>
<source>Rescanning...</source>
<translation>Rescanning...</translation>
</message>
@@ -2874,12 +3009,12 @@ If the file does not exist, create it with owner-readable-only file permissions.
<translation>To use the %s option</translation>
</message>
<message>
- <location line="-73"/>
+ <location line="-71"/>
<source>Error</source>
<translation>Error</translation>
</message>
<message>
- <location line="-29"/>
+ <location line="-33"/>
<source>You must set rpcpassword=&lt;password&gt; in the configuration file:
%s
If the file does not exist, create it with owner-readable-only file permissions.</source>
diff --git a/src/qt/locale/bitcoin_eo.ts b/src/qt/locale/bitcoin_eo.ts
new file mode 100644
index 0000000000..77867ee5a8
--- /dev/null
+++ b/src/qt/locale/bitcoin_eo.ts
@@ -0,0 +1,2976 @@
+<?xml version="1.0" ?><!DOCTYPE TS><TS language="eo" version="2.0">
+<defaultcodec>UTF-8</defaultcodec>
+<context>
+ <name>AboutDialog</name>
+ <message>
+ <location filename="../forms/aboutdialog.ui" line="+14"/>
+ <source>About Bitcoin</source>
+ <translation>Pri Bitcoin</translation>
+ </message>
+ <message>
+ <location line="+39"/>
+ <source>&lt;b&gt;Bitcoin&lt;/b&gt; version</source>
+ <translation>&lt;b&gt;Bitcoin&lt;/b&gt;-a versio</translation>
+ </message>
+ <message>
+ <location line="+57"/>
+ <source>
+This is experimental software.
+
+Distributed under the MIT/X11 software license, see the accompanying file COPYING or http://www.opensource.org/licenses/mit-license.php.
+
+This product includes software developed by the OpenSSL Project for use in the OpenSSL Toolkit (http://www.openssl.org/) and cryptographic software written by Eric Young (eay@cryptsoft.com) and UPnP software written by Thomas Bernard.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../aboutdialog.cpp" line="+17"/>
+ <source>Copyright</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>2009-%1 The Bitcoin developers</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
+ <name>AddressBookPage</name>
+ <message>
+ <location filename="../forms/addressbookpage.ui" line="+14"/>
+ <source>Address Book</source>
+ <translation>Adresaro</translation>
+ </message>
+ <message>
+ <location line="+22"/>
+ <source>Double-click to edit address or label</source>
+ <translation>Duoble-klaku por redakti adreson aÅ­ etikedon</translation>
+ </message>
+ <message>
+ <location line="+27"/>
+ <source>Create a new address</source>
+ <translation>Kreu novan adreson</translation>
+ </message>
+ <message>
+ <location line="+14"/>
+ <source>Copy the currently selected address to the system clipboard</source>
+ <translation>Kopiu elektitan adreson al la tondejo</translation>
+ </message>
+ <message>
+ <location line="-11"/>
+ <source>&amp;New Address</source>
+ <translation>&amp;Nova Adreso</translation>
+ </message>
+ <message>
+ <location line="-46"/>
+ <source>These are your Bitcoin addresses for receiving payments. You may want to give a different one to each sender so you can keep track of who is paying you.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+60"/>
+ <source>&amp;Copy Address</source>
+ <translation>&amp;Kopiu Adreson</translation>
+ </message>
+ <message>
+ <location line="+11"/>
+ <source>Show &amp;QR Code</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+11"/>
+ <source>Sign a message to prove you own a Bitcoin address</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Sign &amp;Message</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+25"/>
+ <source>Delete the currently selected address from the list</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-14"/>
+ <source>Verify a message to ensure it was signed with a specified Bitcoin address</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>&amp;Verify Message</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+14"/>
+ <source>&amp;Delete</source>
+ <translation>&amp;ForviÅu</translation>
+ </message>
+ <message>
+ <location filename="../addressbookpage.cpp" line="+66"/>
+ <source>Copy &amp;Label</source>
+ <translation>Kopiu &amp;Etikedon</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>&amp;Edit</source>
+ <translation>&amp;Redaktu</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Send &amp;Coins</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+263"/>
+ <source>Export Address Book Data</source>
+ <translation>Eksportu Adresarajn Datumojn</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Comma separated file (*.csv)</source>
+ <translation>Diskoma dosiero (*.csv)</translation>
+ </message>
+ <message>
+ <location line="+13"/>
+ <source>Error exporting</source>
+ <translation>Eraro dum eksportado</translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>Could not write to file %1.</source>
+ <translation>Ne eblis skribi al dosiero %1.</translation>
+ </message>
+</context>
+<context>
+ <name>AddressTableModel</name>
+ <message>
+ <location filename="../addresstablemodel.cpp" line="+144"/>
+ <source>Label</source>
+ <translation>Etikedo</translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>Address</source>
+ <translation>Adreso</translation>
+ </message>
+ <message>
+ <location line="+36"/>
+ <source>(no label)</source>
+ <translation>(ne etikedo)</translation>
+ </message>
+</context>
+<context>
+ <name>AskPassphraseDialog</name>
+ <message>
+ <location filename="../forms/askpassphrasedialog.ui" line="+26"/>
+ <source>Passphrase Dialog</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+21"/>
+ <source>Enter passphrase</source>
+ <translation>Enigu pasfrazon</translation>
+ </message>
+ <message>
+ <location line="+14"/>
+ <source>New passphrase</source>
+ <translation>Nova pasfrazo</translation>
+ </message>
+ <message>
+ <location line="+14"/>
+ <source>Repeat new passphrase</source>
+ <translation>Ripetu novan pasfrazon</translation>
+ </message>
+ <message>
+ <location filename="../askpassphrasedialog.cpp" line="+33"/>
+ <source>Enter the new passphrase to the wallet.&lt;br/&gt;Please use a passphrase of &lt;b&gt;10 or more random characters&lt;/b&gt;, or &lt;b&gt;eight or more words&lt;/b&gt;.</source>
+ <translation>Enigu novan pasfrazon por la monujo.&lt;br/&gt;Bonvolu, uzu pasfrazon kun &lt;b&gt;10 aÅ­ pli hazardaj signoj&lt;/b&gt;, aÅ­ &lt;b&gt;ok aÅ­ pli vortoj&lt;/b&gt;.</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Encrypt wallet</source>
+ <translation>Ĉifru monujon</translation>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>This operation needs your wallet passphrase to unlock the wallet.</source>
+ <translation>Ĉi tiu operacio devas vian monujan pasfrazon, por malÅlosi la monujon.</translation>
+ </message>
+ <message>
+ <location line="+5"/>
+ <source>Unlock wallet</source>
+ <translation>MalÅlosu monujon</translation>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>This operation needs your wallet passphrase to decrypt the wallet.</source>
+ <translation>Ĉi tiu operacio devas vian monujan pasfrazon, por malĉifri la monujon.</translation>
+ </message>
+ <message>
+ <location line="+5"/>
+ <source>Decrypt wallet</source>
+ <translation>Malĉifru monujon</translation>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Change passphrase</source>
+ <translation>AnstataÅ­igu pasfrazon</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Enter the old and new passphrase to the wallet.</source>
+ <translation>Enigu la malnovan kaj novan monujan pasfrazon.</translation>
+ </message>
+ <message>
+ <location line="+46"/>
+ <source>Confirm wallet encryption</source>
+ <translation>Konfirmu ĉifrado de monujo</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Warning: If you encrypt your wallet and lose your passphrase, you will &lt;b&gt;LOSE ALL OF YOUR BITCOINS&lt;/b&gt;!</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>Are you sure you wish to encrypt your wallet?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+15"/>
+ <source>IMPORTANT: Any previous backups you have made of your wallet file should be replaced with the newly generated, encrypted wallet file. For security reasons, previous backups of the unencrypted wallet file will become useless as soon as you start using the new, encrypted wallet.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+100"/>
+ <location line="+24"/>
+ <source>Warning: The Caps Lock key is on!</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-130"/>
+ <location line="+58"/>
+ <source>Wallet encrypted</source>
+ <translation>Monujo ĉifrita</translation>
+ </message>
+ <message>
+ <location line="-56"/>
+ <source>Bitcoin will close now to finish the encryption process. Remember that encrypting your wallet cannot fully protect your bitcoins from being stolen by malware infecting your computer.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+13"/>
+ <location line="+7"/>
+ <location line="+42"/>
+ <location line="+6"/>
+ <source>Wallet encryption failed</source>
+ <translation>Monujo ĉifrado fiaskis</translation>
+ </message>
+ <message>
+ <location line="-54"/>
+ <source>Wallet encryption failed due to an internal error. Your wallet was not encrypted.</source>
+ <translation>Ĉifrado de monujo fiaskis, kaŭze de interna eraro. Via monujo ne ĉifritas.</translation>
+ </message>
+ <message>
+ <location line="+7"/>
+ <location line="+48"/>
+ <source>The supplied passphrases do not match.</source>
+ <translation>La pasfrazoj enigitaj ne samas.</translation>
+ </message>
+ <message>
+ <location line="-37"/>
+ <source>Wallet unlock failed</source>
+ <translation>Monujo malÅlosado fiaskis</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <location line="+11"/>
+ <location line="+19"/>
+ <source>The passphrase entered for the wallet decryption was incorrect.</source>
+ <translation>La pasfrazo enigita por ĉifrado de monujo ne konformas.</translation>
+ </message>
+ <message>
+ <location line="-20"/>
+ <source>Wallet decryption failed</source>
+ <translation>Monujo malĉifrado fiaskis</translation>
+ </message>
+ <message>
+ <location line="+14"/>
+ <source>Wallet passphrase was successfully changed.</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
+ <name>BitcoinGUI</name>
+ <message>
+ <location filename="../bitcoingui.cpp" line="+231"/>
+ <source>Sign &amp;message...</source>
+ <translation>Subskribu &amp;mesaÄon...</translation>
+ </message>
+ <message>
+ <location line="+299"/>
+ <source>Synchronizing with network...</source>
+ <translation>Sinkronigante kun reto...</translation>
+ </message>
+ <message>
+ <location line="-367"/>
+ <source>&amp;Overview</source>
+ <translation>&amp;Superrigardo</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Show general overview of wallet</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+20"/>
+ <source>&amp;Transactions</source>
+ <translation>&amp;Transakcioj</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Browse transaction history</source>
+ <translation>Esploru historion de transakcioj</translation>
+ </message>
+ <message>
+ <location line="+7"/>
+ <source>Edit the list of stored addresses and labels</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-14"/>
+ <source>Show the list of addresses for receiving payments</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+31"/>
+ <source>E&amp;xit</source>
+ <translation>&amp;Eliru</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Quit application</source>
+ <translation>Eliru de aplikaĵo</translation>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>Show information about Bitcoin</source>
+ <translation>Vidigu informaĵon pri Bitmono</translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>About &amp;Qt</source>
+ <translation>Pri &amp;QT</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Show information about Qt</source>
+ <translation>Vidigu informaĵon pri Qt</translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>&amp;Options...</source>
+ <translation>&amp;Opcioj...</translation>
+ </message>
+ <message>
+ <location line="+5"/>
+ <source>&amp;Encrypt Wallet...</source>
+ <translation>&amp;Ĉifru Monujon...</translation>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>&amp;Backup Wallet...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>&amp;Change Passphrase...</source>
+ <translation>&amp;AnstataÅ­igu pasfrazon...</translation>
+ </message>
+ <message>
+ <location line="+304"/>
+ <source>Importing blocks from disk...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Reindexing blocks on disk...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-300"/>
+ <source>&amp;Export...</source>
+ <translation>&amp;Eksportu...</translation>
+ </message>
+ <message>
+ <location line="-65"/>
+ <source>Send coins to a Bitcoin address</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+49"/>
+ <source>Modify configuration options for Bitcoin</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+17"/>
+ <source>Export the data in the current tab to a file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-9"/>
+ <source>Backup wallet to another location</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Change the passphrase used for wallet encryption</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+9"/>
+ <source>&amp;Debug window</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Open debugging and diagnostic console</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-7"/>
+ <source>&amp;Verify message...</source>
+ <translation>&amp;Kontrolu mesaÄon...</translation>
+ </message>
+ <message>
+ <location line="-162"/>
+ <location line="+540"/>
+ <source>Bitcoin</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-540"/>
+ <source>Wallet</source>
+ <translation>Monujo</translation>
+ </message>
+ <message>
+ <location line="+99"/>
+ <source>&amp;Send</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+7"/>
+ <source>&amp;Receive</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+14"/>
+ <source>&amp;Addresses</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+22"/>
+ <source>&amp;About Bitcoin</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+9"/>
+ <source>&amp;Show / Hide</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Show or hide the main Window</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Encrypt the private keys that belong to your wallet</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+7"/>
+ <source>Sign messages with your Bitcoin addresses to prove you own them</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Verify messages to ensure they were signed with specified Bitcoin addresses</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+31"/>
+ <source>&amp;File</source>
+ <translation>&amp;Dosiero</translation>
+ </message>
+ <message>
+ <location line="+8"/>
+ <source>&amp;Settings</source>
+ <translation>&amp;Agordoj</translation>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>&amp;Help</source>
+ <translation>&amp;Helpo</translation>
+ </message>
+ <message>
+ <location line="+9"/>
+ <source>Tabs toolbar</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+8"/>
+ <source>Actions toolbar</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+13"/>
+ <location line="+10"/>
+ <source>[testnet]</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+47"/>
+ <source>Bitcoin client</source>
+ <translation type="unfinished"/>
+ </message>
+ <message numerus="yes">
+ <location line="+140"/>
+ <source>%n active connection(s) to Bitcoin network</source>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
+ <message>
+ <location line="+39"/>
+ <source>Processed %1 of %2 (estimated) blocks of transaction history.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>Processed %1 blocks of transaction history.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message numerus="yes">
+ <location line="+20"/>
+ <source>%n hour(s)</source>
+ <translation><numerusform>%n horo</numerusform><numerusform>%n horoj</numerusform></translation>
+ </message>
+ <message numerus="yes">
+ <location line="+4"/>
+ <source>%n day(s)</source>
+ <translation><numerusform>%n tago</numerusform><numerusform>%n tagoj</numerusform></translation>
+ </message>
+ <message numerus="yes">
+ <location line="+4"/>
+ <source>%n week(s)</source>
+ <translation><numerusform>%n semajno</numerusform><numerusform>%n semajnoj</numerusform></translation>
+ </message>
+ <message>
+ <location line="+5"/>
+ <source>%1 behind</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+14"/>
+ <source>Last received block was generated %1 ago.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Transactions after this will not yet be visible.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+21"/>
+ <source>Error</source>
+ <translation>Eraro</translation>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Warning</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Information</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+68"/>
+ <source>This transaction is over the size limit. You can still send it for a fee of %1, which goes to the nodes that process your transaction and helps to support the network. Do you want to pay the fee?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-138"/>
+ <source>Up to date</source>
+ <translation>Äœisdata</translation>
+ </message>
+ <message>
+ <location line="+32"/>
+ <source>Catching up...</source>
+ <translation>Äœisdatigante...</translation>
+ </message>
+ <message>
+ <location line="+110"/>
+ <source>Confirm transaction fee</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+8"/>
+ <source>Sent transaction</source>
+ <translation>Sendita transakcio</translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>Incoming transaction</source>
+ <translation>Envenanta transakcio</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Date: %1
+Amount: %2
+Type: %3
+Address: %4
+</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+33"/>
+ <location line="+23"/>
+ <source>URI handling</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-23"/>
+ <location line="+23"/>
+ <source>URI can not be parsed! This can be caused by an invalid Bitcoin address or malformed URI parameters.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+17"/>
+ <source>Wallet is &lt;b&gt;encrypted&lt;/b&gt; and currently &lt;b&gt;unlocked&lt;/b&gt;</source>
+ <translation>Monujo estas &lt;b&gt;ĉifrita&lt;/b&gt; kaj nun &lt;b&gt;malÅlosita&lt;/b&gt;</translation>
+ </message>
+ <message>
+ <location line="+8"/>
+ <source>Wallet is &lt;b&gt;encrypted&lt;/b&gt; and currently &lt;b&gt;locked&lt;/b&gt;</source>
+ <translation>Monujo estas &lt;b&gt;ĉifrita&lt;/b&gt; kaj nun &lt;b&gt;Ålosita&lt;/b&gt;</translation>
+ </message>
+ <message>
+ <location filename="../bitcoin.cpp" line="+108"/>
+ <source>A fatal error occurred. Bitcoin can no longer continue safely and will quit.</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
+ <name>ClientModel</name>
+ <message>
+ <location filename="../clientmodel.cpp" line="+96"/>
+ <source>Network Alert</source>
+ <translation>Reta Averto</translation>
+ </message>
+</context>
+<context>
+ <name>EditAddressDialog</name>
+ <message>
+ <location filename="../forms/editaddressdialog.ui" line="+14"/>
+ <source>Edit Address</source>
+ <translation>Redaktu Adreson</translation>
+ </message>
+ <message>
+ <location line="+11"/>
+ <source>&amp;Label</source>
+ <translation>&amp;Etikedo</translation>
+ </message>
+ <message>
+ <location line="+10"/>
+ <source>The label associated with this address book entry</source>
+ <translation>La etikedo interrilatita kun ĉi tiun adreso</translation>
+ </message>
+ <message>
+ <location line="+7"/>
+ <source>&amp;Address</source>
+ <translation>&amp;Adreso</translation>
+ </message>
+ <message>
+ <location line="+10"/>
+ <source>The address associated with this address book entry. This can only be modified for sending addresses.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../editaddressdialog.cpp" line="+21"/>
+ <source>New receiving address</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>New sending address</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Edit receiving address</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>Edit sending address</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+76"/>
+ <source>The entered address &quot;%1&quot; is already in the address book.</source>
+ <translation>La adreso enigita &quot;%1&quot; jam ekzistas en la adresaro.</translation>
+ </message>
+ <message>
+ <location line="-5"/>
+ <source>The entered address &quot;%1&quot; is not a valid Bitcoin address.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+10"/>
+ <source>Could not unlock wallet.</source>
+ <translation>Ne eblis malÅlosi monujon</translation>
+ </message>
+ <message>
+ <location line="+5"/>
+ <source>New key generation failed.</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
+ <name>GUIUtil::HelpMessageBox</name>
+ <message>
+ <location filename="../guiutil.cpp" line="+422"/>
+ <location line="+12"/>
+ <source>Bitcoin-Qt</source>
+ <translation>Bitcoin-Qt</translation>
+ </message>
+ <message>
+ <location line="-12"/>
+ <source>version</source>
+ <translation>versio</translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Usage:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>command-line options</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>UI options</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Set language, for example &quot;de_DE&quot; (default: system locale)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Start minimized</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Show splash screen on startup (default: 1)</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
+ <name>OptionsDialog</name>
+ <message>
+ <location filename="../forms/optionsdialog.ui" line="+14"/>
+ <source>Options</source>
+ <translation>Opcioj</translation>
+ </message>
+ <message>
+ <location line="+16"/>
+ <source>&amp;Main</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>Optional transaction fee per kB that helps make sure your transactions are processed quickly. Most transactions are 1 kB. Fee 0.01 recommended.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+15"/>
+ <source>Pay transaction &amp;fee</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+31"/>
+ <source>Automatically start Bitcoin after logging in to the system.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>&amp;Start Bitcoin on system login</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+35"/>
+ <source>Reset all client options to default.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>&amp;Reset Options</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+13"/>
+ <source>&amp;Network</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>Automatically open the Bitcoin client port on the router. This only works when your router supports UPnP and it is enabled.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Map port using &amp;UPnP</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+7"/>
+ <source>Connect to the Bitcoin network through a SOCKS proxy (e.g. when connecting through Tor).</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>&amp;Connect through SOCKS proxy:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+9"/>
+ <source>Proxy &amp;IP:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+19"/>
+ <source>IP address of the proxy (e.g. 127.0.0.1)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+7"/>
+ <source>&amp;Port:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+19"/>
+ <source>Port of the proxy (e.g. 9050)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+7"/>
+ <source>SOCKS &amp;Version:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+13"/>
+ <source>SOCKS version of the proxy (e.g. 5)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+36"/>
+ <source>&amp;Window</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>Show only a tray icon after minimizing the window.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>&amp;Minimize to the tray instead of the taskbar</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+7"/>
+ <source>Minimize instead of exit the application when the window is closed. When this option is enabled, the application will be closed only after selecting Quit in the menu.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>M&amp;inimize on close</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+21"/>
+ <source>&amp;Display</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+8"/>
+ <source>User Interface &amp;language:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+13"/>
+ <source>The user interface language can be set here. This setting will take effect after restarting Bitcoin.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+11"/>
+ <source>&amp;Unit to show amounts in:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+13"/>
+ <source>Choose the default subdivision unit to show in the interface and when sending coins.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+9"/>
+ <source>Whether to show Bitcoin addresses in the transaction list or not.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>&amp;Display addresses in transaction list</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+71"/>
+ <source>&amp;OK</source>
+ <translation>&amp;OK</translation>
+ </message>
+ <message>
+ <location line="+7"/>
+ <source>&amp;Cancel</source>
+ <translation>&amp;Nuligu</translation>
+ </message>
+ <message>
+ <location line="+10"/>
+ <source>&amp;Apply</source>
+ <translation>&amp;Apliku</translation>
+ </message>
+ <message>
+ <location filename="../optionsdialog.cpp" line="+53"/>
+ <source>default</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+130"/>
+ <source>Confirm options reset</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Some settings may require a client restart to take effect.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>Do you want to proceed?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+42"/>
+ <location line="+9"/>
+ <source>Warning</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-9"/>
+ <location line="+9"/>
+ <source>This setting will take effect after restarting Bitcoin.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+29"/>
+ <source>The supplied proxy address is invalid.</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
+ <name>OverviewPage</name>
+ <message>
+ <location filename="../forms/overviewpage.ui" line="+14"/>
+ <source>Form</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+50"/>
+ <location line="+166"/>
+ <source>The displayed information may be out of date. Your wallet automatically synchronizes with the Bitcoin network after a connection is established, but this process has not completed yet.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-124"/>
+ <source>Balance:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+29"/>
+ <source>Unconfirmed:</source>
+ <translation>Nekonfirmita:</translation>
+ </message>
+ <message>
+ <location line="-78"/>
+ <source>Wallet</source>
+ <translation>Monujo</translation>
+ </message>
+ <message>
+ <location line="+107"/>
+ <source>Immature:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+13"/>
+ <source>Mined balance that has not yet matured</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+46"/>
+ <source>&lt;b&gt;Recent transactions&lt;/b&gt;</source>
+ <translation>&lt;b&gt;Lastaj transakcioj&lt;/b&gt;</translation>
+ </message>
+ <message>
+ <location line="-101"/>
+ <source>Your current balance</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+29"/>
+ <source>Total of transactions that have yet to be confirmed, and do not yet count toward the current balance</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../overviewpage.cpp" line="+115"/>
+ <location line="+1"/>
+ <source>out of sync</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
+ <name>PaymentServer</name>
+ <message>
+ <location filename="../paymentserver.cpp" line="+107"/>
+ <source>Cannot start bitcoin: click-to-pay handler</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
+ <name>QRCodeDialog</name>
+ <message>
+ <location filename="../forms/qrcodedialog.ui" line="+14"/>
+ <source>QR Code Dialog</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+59"/>
+ <source>Request Payment</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+56"/>
+ <source>Amount:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-44"/>
+ <source>Label:</source>
+ <translation>Etikedo:</translation>
+ </message>
+ <message>
+ <location line="+19"/>
+ <source>Message:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+71"/>
+ <source>&amp;Save As...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../qrcodedialog.cpp" line="+62"/>
+ <source>Error encoding URI into QR Code.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+40"/>
+ <source>The entered amount is invalid, please check.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+23"/>
+ <source>Resulting URI too long, try to reduce the text for label / message.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+25"/>
+ <source>Save QR Code</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>PNG Images (*.png)</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
+ <name>RPCConsole</name>
+ <message>
+ <location filename="../forms/rpcconsole.ui" line="+46"/>
+ <source>Client name</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+10"/>
+ <location line="+23"/>
+ <location line="+26"/>
+ <location line="+23"/>
+ <location line="+23"/>
+ <location line="+36"/>
+ <location line="+53"/>
+ <location line="+23"/>
+ <location line="+23"/>
+ <location filename="../rpcconsole.cpp" line="+344"/>
+ <source>N/A</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-217"/>
+ <source>Client version</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-45"/>
+ <source>&amp;Information</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+68"/>
+ <source>Using OpenSSL version</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+49"/>
+ <source>Startup time</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+29"/>
+ <source>Network</source>
+ <translation>Reto</translation>
+ </message>
+ <message>
+ <location line="+7"/>
+ <source>Number of connections</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+23"/>
+ <source>On testnet</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+23"/>
+ <source>Block chain</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+7"/>
+ <source>Current number of blocks</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+23"/>
+ <source>Estimated total blocks</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+23"/>
+ <source>Last block time</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+52"/>
+ <source>&amp;Open</source>
+ <translation>&amp;Malfermu</translation>
+ </message>
+ <message>
+ <location line="+16"/>
+ <source>Command-line options</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+7"/>
+ <source>Show the Bitcoin-Qt help message to get a list with possible Bitcoin command-line options.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>&amp;Show</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+24"/>
+ <source>&amp;Console</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-260"/>
+ <source>Build date</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-104"/>
+ <source>Bitcoin - Debug window</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+25"/>
+ <source>Bitcoin Core</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+279"/>
+ <source>Debug log file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+7"/>
+ <source>Open the Bitcoin debug log file from the current data directory. This can take a few seconds for large log files.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+102"/>
+ <source>Clear console</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../rpcconsole.cpp" line="-30"/>
+ <source>Welcome to the Bitcoin RPC console.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Use up and down arrows to navigate history, and &lt;b&gt;Ctrl-L&lt;/b&gt; to clear screen.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Type &lt;b&gt;help&lt;/b&gt; for an overview of available commands.</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
+ <name>SendCoinsDialog</name>
+ <message>
+ <location filename="../forms/sendcoinsdialog.ui" line="+14"/>
+ <location filename="../sendcoinsdialog.cpp" line="+124"/>
+ <location line="+5"/>
+ <location line="+5"/>
+ <location line="+5"/>
+ <location line="+6"/>
+ <location line="+5"/>
+ <location line="+5"/>
+ <source>Send Coins</source>
+ <translation>Sendu Monojn</translation>
+ </message>
+ <message>
+ <location line="+50"/>
+ <source>Send to multiple recipients at once</source>
+ <translation>Sendu samtempe al multaj ricevantoj</translation>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Add &amp;Recipient</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+20"/>
+ <source>Remove all transaction fields</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Clear &amp;All</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+22"/>
+ <source>Balance:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+10"/>
+ <source>123.456 BTC</source>
+ <translation>123,456 BTC</translation>
+ </message>
+ <message>
+ <location line="+31"/>
+ <source>Confirm the send action</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>S&amp;end</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../sendcoinsdialog.cpp" line="-59"/>
+ <source>&lt;b&gt;%1&lt;/b&gt; to %2 (%3)</source>
+ <translation>&lt;b&gt;%1&lt;/b&gt; al %2 (%3)</translation>
+ </message>
+ <message>
+ <location line="+5"/>
+ <source>Confirm send coins</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Are you sure you want to send %1?</source>
+ <translation>Ĉu vi vere volas sendi %1?</translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source> and </source>
+ <translation>kaj</translation>
+ </message>
+ <message>
+ <location line="+23"/>
+ <source>The recipient address is not valid, please recheck.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+5"/>
+ <source>The amount to pay must be larger than 0.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+5"/>
+ <source>The amount exceeds your balance.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+5"/>
+ <source>The total exceeds your balance when the %1 transaction fee is included.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>Duplicate address found, can only send to each address once per send operation.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+5"/>
+ <source>Error: Transaction creation failed!</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+5"/>
+ <source>Error: The transaction was rejected. This might happen if some of the coins in your wallet were already spent, such as if you used a copy of wallet.dat and coins were spent in the copy but not marked as spent here.</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
+ <name>SendCoinsEntry</name>
+ <message>
+ <location filename="../forms/sendcoinsentry.ui" line="+14"/>
+ <source>Form</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+15"/>
+ <source>A&amp;mount:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+13"/>
+ <source>Pay &amp;To:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+34"/>
+ <source>The address to send the payment to (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+60"/>
+ <location filename="../sendcoinsentry.cpp" line="+26"/>
+ <source>Enter a label for this address to add it to your address book</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-78"/>
+ <source>&amp;Label:</source>
+ <translation>&amp;Etikedo:</translation>
+ </message>
+ <message>
+ <location line="+28"/>
+ <source>Choose address from address book</source>
+ <translation>Elektu adreson el adresaro</translation>
+ </message>
+ <message>
+ <location line="+10"/>
+ <source>Alt+A</source>
+ <translation>Alt+A</translation>
+ </message>
+ <message>
+ <location line="+7"/>
+ <source>Paste address from clipboard</source>
+ <translation>Algluu adreson de tondejo</translation>
+ </message>
+ <message>
+ <location line="+10"/>
+ <source>Alt+P</source>
+ <translation>Alt+P</translation>
+ </message>
+ <message>
+ <location line="+7"/>
+ <source>Remove this recipient</source>
+ <translation>Forigu ĉi tiun ricevanton</translation>
+ </message>
+ <message>
+ <location filename="../sendcoinsentry.cpp" line="+1"/>
+ <source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
+ <name>SignVerifyMessageDialog</name>
+ <message>
+ <location filename="../forms/signverifymessagedialog.ui" line="+14"/>
+ <source>Signatures - Sign / Verify a Message</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+13"/>
+ <source>&amp;Sign Message</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>You can sign messages with your addresses to prove you own them. Be careful not to sign anything vague, as phishing attacks may try to trick you into signing your identity over to them. Only sign fully-detailed statements you agree to.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+18"/>
+ <source>The address to sign the message with (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+10"/>
+ <location line="+213"/>
+ <source>Choose an address from the address book</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-203"/>
+ <location line="+213"/>
+ <source>Alt+A</source>
+ <translation>Alt+A</translation>
+ </message>
+ <message>
+ <location line="-203"/>
+ <source>Paste address from clipboard</source>
+ <translation>Algluu adreson de tondejo</translation>
+ </message>
+ <message>
+ <location line="+10"/>
+ <source>Alt+P</source>
+ <translation>Alt+P</translation>
+ </message>
+ <message>
+ <location line="+12"/>
+ <source>Enter the message you want to sign here</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+7"/>
+ <source>Signature</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+27"/>
+ <source>Copy the current signature to the system clipboard</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+21"/>
+ <source>Sign the message to prove you own this Bitcoin address</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Sign &amp;Message</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+14"/>
+ <source>Reset all sign message fields</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <location line="+146"/>
+ <source>Clear &amp;All</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-87"/>
+ <source>&amp;Verify Message</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>Enter the signing address, message (ensure you copy line breaks, spaces, tabs, etc. exactly) and signature below to verify the message. Be careful not to read more into the signature than what is in the signed message itself, to avoid being tricked by a man-in-the-middle attack.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+21"/>
+ <source>The address the message was signed with (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+40"/>
+ <source>Verify the message to ensure it was signed with the specified Bitcoin address</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Verify &amp;Message</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+14"/>
+ <source>Reset all verify message fields</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../signverifymessagedialog.cpp" line="+27"/>
+ <location line="+3"/>
+ <source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-2"/>
+ <source>Click &quot;Sign Message&quot; to generate signature</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Enter Bitcoin signature</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+82"/>
+ <location line="+81"/>
+ <source>The entered address is invalid.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-81"/>
+ <location line="+8"/>
+ <location line="+73"/>
+ <location line="+8"/>
+ <source>Please check the address and try again.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-81"/>
+ <location line="+81"/>
+ <source>The entered address does not refer to a key.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-73"/>
+ <source>Wallet unlock was cancelled.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+8"/>
+ <source>Private key for the entered address is not available.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+12"/>
+ <source>Message signing failed.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+5"/>
+ <source>Message signed.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+59"/>
+ <source>The signature could not be decoded.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+0"/>
+ <location line="+13"/>
+ <source>Please check the signature and try again.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>The signature did not match the message digest.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+7"/>
+ <source>Message verification failed.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+5"/>
+ <source>Message verified.</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
+ <name>TransactionDesc</name>
+ <message>
+ <location filename="../transactiondesc.cpp" line="+20"/>
+ <source>Open until %1</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>%1/offline</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>%1/unconfirmed</source>
+ <translation>%1/nekonfirmita</translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>%1 confirmations</source>
+ <translation>%1 konfirmoj</translation>
+ </message>
+ <message>
+ <location line="+18"/>
+ <source>Status</source>
+ <translation type="unfinished"/>
+ </message>
+ <message numerus="yes">
+ <location line="+7"/>
+ <source>, broadcast through %n node(s)</source>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>Date</source>
+ <translation>Dato</translation>
+ </message>
+ <message>
+ <location line="+7"/>
+ <source>Source</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>Generated</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+5"/>
+ <location line="+17"/>
+ <source>From</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <location line="+22"/>
+ <location line="+58"/>
+ <source>To</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-77"/>
+ <location line="+2"/>
+ <source>own address</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-2"/>
+ <source>label</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+37"/>
+ <location line="+12"/>
+ <location line="+45"/>
+ <location line="+17"/>
+ <location line="+30"/>
+ <source>Credit</source>
+ <translation type="unfinished"/>
+ </message>
+ <message numerus="yes">
+ <location line="-102"/>
+ <source>matures in %n more block(s)</source>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>not accepted</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+44"/>
+ <location line="+8"/>
+ <location line="+15"/>
+ <location line="+30"/>
+ <source>Debit</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-39"/>
+ <source>Transaction fee</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+16"/>
+ <source>Net amount</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>Message</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Comment</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Transaction ID</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Generated coins must mature 120 blocks before they can be spent. When you generated this block, it was broadcast to the network to be added to the block chain. If it fails to get into the chain, its state will change to &quot;not accepted&quot; and it won&apos;t be spendable. This may occasionally happen if another node generates a block within a few seconds of yours.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+7"/>
+ <source>Debug information</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+8"/>
+ <source>Transaction</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Inputs</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+23"/>
+ <source>Amount</source>
+ <translation>Sumo</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>true</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>false</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-209"/>
+ <source>, has not been successfully broadcast yet</source>
+ <translation>, ankoraÅ­ ne elsendita sukcese</translation>
+ </message>
+ <message numerus="yes">
+ <location line="-35"/>
+ <source>Open for %n more block(s)</source>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
+ <message>
+ <location line="+70"/>
+ <source>unknown</source>
+ <translation>nekonata</translation>
+ </message>
+</context>
+<context>
+ <name>TransactionDescDialog</name>
+ <message>
+ <location filename="../forms/transactiondescdialog.ui" line="+14"/>
+ <source>Transaction details</source>
+ <translation>Transakciaj detaloj</translation>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>This pane shows a detailed description of the transaction</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
+ <name>TransactionTableModel</name>
+ <message>
+ <location filename="../transactiontablemodel.cpp" line="+225"/>
+ <source>Date</source>
+ <translation>Dato</translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>Type</source>
+ <translation>Tipo</translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>Address</source>
+ <translation>Adreso</translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>Amount</source>
+ <translation>Sumo</translation>
+ </message>
+ <message numerus="yes">
+ <location line="+57"/>
+ <source>Open for %n more block(s)</source>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Open until %1</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Offline (%1 confirmations)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Unconfirmed (%1 of %2 confirmations)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Confirmed (%1 confirmations)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message numerus="yes">
+ <location line="+8"/>
+ <source>Mined balance will be available when it matures in %n more block(s)</source>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
+ <message>
+ <location line="+5"/>
+ <source>This block was not received by any other nodes and will probably not be accepted!</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Generated but not accepted</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+43"/>
+ <source>Received with</source>
+ <translation>Ricevita kun</translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Received from</source>
+ <translation>Ricevita de</translation>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Sent to</source>
+ <translation>Sendita al</translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Payment to yourself</source>
+ <translation>Pago al vi mem</translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Mined</source>
+ <translation>Minita</translation>
+ </message>
+ <message>
+ <location line="+38"/>
+ <source>(n/a)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+199"/>
+ <source>Transaction status. Hover over this field to show number of confirmations.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Date and time that the transaction was received.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Type of transaction.</source>
+ <translation>Transakcia tipo.</translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Destination address of transaction.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Amount removed from or added to balance.</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
+ <name>TransactionView</name>
+ <message>
+ <location filename="../transactionview.cpp" line="+52"/>
+ <location line="+16"/>
+ <source>All</source>
+ <translation>Ĉiuj</translation>
+ </message>
+ <message>
+ <location line="-15"/>
+ <source>Today</source>
+ <translation>HodiaÅ­</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>This week</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>This month</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Last month</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>This year</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Range...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+11"/>
+ <source>Received with</source>
+ <translation>Ricevita kun</translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Sent to</source>
+ <translation>Sendita al</translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>To yourself</source>
+ <translation>Al vi mem</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Mined</source>
+ <translation>Minita</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Other</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+7"/>
+ <source>Enter address or label to search</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+7"/>
+ <source>Min amount</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+34"/>
+ <source>Copy address</source>
+ <translation>Kopiu adreson</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy label</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy amount</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy transaction ID</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Edit label</source>
+ <translation>Redaktu etikedon</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Show transaction details</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+139"/>
+ <source>Export Transaction Data</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Comma separated file (*.csv)</source>
+ <translation>Diskoma dosiero (*.csv)</translation>
+ </message>
+ <message>
+ <location line="+8"/>
+ <source>Confirmed</source>
+ <translation>Konfirmita</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Date</source>
+ <translation>Dato</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Type</source>
+ <translation>Tipo</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Label</source>
+ <translation>Etikedo</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Address</source>
+ <translation>Adreso</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Amount</source>
+ <translation>Sumo</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>ID</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>Error exporting</source>
+ <translation>Eraro dum eksportado</translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>Could not write to file %1.</source>
+ <translation>Ne eblis skribi al dosiero %1.</translation>
+ </message>
+ <message>
+ <location line="+100"/>
+ <source>Range:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+8"/>
+ <source>to</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
+ <name>WalletView</name>
+ <message>
+ <location filename="../walletview.cpp" line="+95"/>
+ <source>&amp;Overview</source>
+ <translation>&amp;Superrigardo</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Show general overview of wallet</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>&amp;Send coins</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Send coins to a Bitcoin address</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>&amp;Receive coins</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Show the list of addresses for receiving payments</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>&amp;Transactions</source>
+ <translation>&amp;Transakcioj</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Browse transaction history</source>
+ <translation>Esploru historion de transakcioj</translation>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>&amp;Address Book</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Edit the list of stored addresses and labels</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+12"/>
+ <source>&amp;Encrypt Wallet...</source>
+ <translation>&amp;Ĉifru Monujon...</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Encrypt the private keys that belong to your wallet</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>&amp;Backup Wallet...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Backup wallet to another location</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>&amp;Change Passphrase...</source>
+ <translation>&amp;AnstataÅ­igu pasfrazon...</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Change the passphrase used for wallet encryption</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Sign &amp;message...</source>
+ <translation>Subskribu &amp;mesaÄon...</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Sign messages with your Bitcoin addresses to prove you own them</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>&amp;Verify message...</source>
+ <translation>&amp;Kontrolu mesaÄon...</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Verify messages to ensure they were signed with specified Bitcoin addresses</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>&amp;Export...</source>
+ <translation>&amp;Eksportu...</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Export the data in the current tab to a file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+180"/>
+ <source>Backup Wallet</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>Wallet Data (*.dat)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Backup Failed</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>There was an error trying to save the wallet data to the new location.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>Backup Successful</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>The wallet data was successfully saved to the new location.</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
+ <name>bitcoin-core</name>
+ <message>
+ <location filename="../bitcoinstrings.cpp" line="+96"/>
+ <source>Bitcoin version</source>
+ <translation>Bitcoin-a versio</translation>
+ </message>
+ <message>
+ <location line="+98"/>
+ <source>Usage:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-24"/>
+ <source>Send command to -server or bitcoind</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-22"/>
+ <source>List commands</source>
+ <translation>Listigu instrukciojn</translation>
+ </message>
+ <message>
+ <location line="-10"/>
+ <source>Get help for a command</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+21"/>
+ <source>Options:</source>
+ <translation>Opcioj:</translation>
+ </message>
+ <message>
+ <location line="+22"/>
+ <source>Specify configuration file (default: bitcoin.conf)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Specify pid file (default: bitcoind.pid)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-47"/>
+ <source>Generate coins</source>
+ <translation>Generu monerojn</translation>
+ </message>
+ <message>
+ <location line="-28"/>
+ <source>Don&apos;t generate coins</source>
+ <translation>Ne generu monerojn</translation>
+ </message>
+ <message>
+ <location line="+74"/>
+ <source>Specify data directory</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-7"/>
+ <source>Set database cache size in megabytes (default: 25)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-27"/>
+ <source>Listen for connections on &lt;port&gt; (default: 8333 or testnet: 18333)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+5"/>
+ <source>Maintain at most &lt;n&gt; connections to peers (default: 125)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-49"/>
+ <source>Connect to a node to retrieve peer addresses, and disconnect</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+80"/>
+ <source>Specify your own public address</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Threshold for disconnecting misbehaving peers (default: 100)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-132"/>
+ <source>Number of seconds to keep misbehaving peers from reconnecting (default: 86400)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-32"/>
+ <source>An error occurred while setting up the RPC port %u for listening on IPv4: %s</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+30"/>
+ <source>Listen for JSON-RPC connections on &lt;port&gt; (default: 8332 or testnet: 18332)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+36"/>
+ <source>Accept command line and JSON-RPC commands</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+77"/>
+ <source>Run in the background as a daemon and accept commands</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+32"/>
+ <source>Use the test network</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-108"/>
+ <source>Accept connections from outside (default: 1 if no -proxy or -connect)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-82"/>
+ <source>%s, you must set a rpcpassword in the configuration file:
+%s
+It is recommended you use the following random password:
+rpcuser=bitcoinrpc
+rpcpassword=%s
+(you do not need to remember this password)
+The username and password MUST NOT be the same.
+If the file does not exist, create it with owner-readable-only file permissions.
+It is also recommended to set alertnotify so you are notified of problems;
+for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.com
+</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+17"/>
+ <source>An error occurred while setting up the RPC port %u for listening on IPv6, falling back to IPv4: %s</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Bind to given address and always listen on it. Use [host]:port notation for IPv6</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Cannot obtain a lock on data directory %s. Bitcoin is probably already running.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Error initializing database environment %s! To recover, BACKUP THAT DIRECTORY, then remove everything from it except for wallet.dat.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Error: The transaction was rejected! This might happen if some of the coins in your wallet were already spent, such as if you used a copy of wallet.dat and coins were spent in the copy but not marked as spent here.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>Error: This transaction requires a transaction fee of at least %s because of its amount, complexity, or use of recently received funds!</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Execute command when a relevant alert is received (%s in cmd is replaced by message)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Execute command when a wallet transaction changes (%s in cmd is replaced by TxID)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+11"/>
+ <source>Set maximum size of high-priority/low-fee transactions in bytes (default: 27000)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Set the number of script verification threads (1-16, 0=auto, default: 0)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>This is a pre-release test build - use at your own risk - do not use for mining or merchant applications</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+5"/>
+ <source>Warning: -paytxfee is set very high! This is the transaction fee you will pay if you send a transaction.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Warning: Displayed transactions may not be correct! You may need to upgrade, or other nodes may need to upgrade.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Warning: Please check that your computer&apos;s date and time are correct! If your clock is wrong Bitcoin will not work properly.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Warning: error reading wallet.dat! All keys read correctly, but transaction data or address book entries might be missing or incorrect.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Warning: wallet.dat corrupt, data salvaged! Original wallet.dat saved as wallet.{timestamp}.bak in %s; if your balance or transactions are incorrect you should restore from a backup.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+14"/>
+ <source>Attempt to recover private keys from a corrupt wallet.dat</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Block creation options:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>Connect only to the specified node(s)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Corrupted block database detected</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Discover own IP address (default: 1 when listening and no -externalip)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Do you want to rebuild the block database now?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Error initializing block database</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Error initializing wallet database environment %s!</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Error loading block database</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>Error opening block database</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Error: Disk space is low!</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Error: Transaction creation failed!</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Error: Wallet locked, unable to create transaction!</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Error: system error: </source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Failed to listen on any port. Use -listen=0 if you want this.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Failed to read block info</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Failed to read block</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Failed to sync block index</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Failed to write block index</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Failed to write block info</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Failed to write block</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Failed to write file info</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Failed to write to coin database</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Failed to write transaction index</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Failed to write undo data</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Find peers using DNS lookup (default: 1 unless -connect)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>How many blocks to check at startup (default: 288, 0 = all)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>How thorough the block verification is (0-4, default: 3)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+24"/>
+ <source>Rebuild block chain index from current blk000??.dat files</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+37"/>
+ <source>Verifying blocks...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Verifying wallet...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-61"/>
+ <source>Imports blocks from external blk000??.dat file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Information</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Invalid -tor address: &apos;%s&apos;</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+8"/>
+ <source>Maintain a full transaction index (default: 0)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Maximum per-connection receive buffer, &lt;n&gt;*1000 bytes (default: 5000)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Maximum per-connection send buffer, &lt;n&gt;*1000 bytes (default: 1000)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Only accept block chain matching built-in checkpoints (default: 1)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Only connect to nodes in network &lt;net&gt; (IPv4, IPv6 or Tor)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Output extra debugging information. Implies all other -debug* options</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Output extra network debugging information</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Prepend debug output with timestamp</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+5"/>
+ <source>SSL options: (see the Bitcoin Wiki for SSL setup instructions)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Select the version of socks proxy to use (4-5, default: 5)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Send trace/debug info to console instead of debug.log file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Send trace/debug info to debugger</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+5"/>
+ <source>Set maximum block size in bytes (default: 250000)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Set minimum block size in bytes (default: 0)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Shrink debug.log file on client startup (default: 1 when no -debug)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Specify connection timeout in milliseconds (default: 5000)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>System error: </source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+10"/>
+ <source>Use UPnP to map the listening port (default: 0)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Use UPnP to map the listening port (default: 1 when listening)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Use proxy to reach tor hidden services (default: same as -proxy)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Username for JSON-RPC connections</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>Warning</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Warning: This version is obsolete, upgrade required!</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>You need to rebuild the databases using -reindex to change -txindex</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>wallet.dat corrupt, salvage failed</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-45"/>
+ <source>Password for JSON-RPC connections</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-68"/>
+ <source>Allow JSON-RPC connections from specified IP address</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+77"/>
+ <source>Send commands to node running on &lt;ip&gt; (default: 127.0.0.1)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-120"/>
+ <source>Execute command when the best block changes (%s in cmd is replaced by block hash)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+142"/>
+ <source>Upgrade wallet to latest format</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-16"/>
+ <source>Set key pool size to &lt;n&gt; (default: 100)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-12"/>
+ <source>Rescan the block chain for missing wallet transactions</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+30"/>
+ <source>Use OpenSSL (https) for JSON-RPC connections</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-21"/>
+ <source>Server certificate file (default: server.cert)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Server private key (default: server.pem)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-154"/>
+ <source>Acceptable ciphers (default: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+166"/>
+ <source>This help message</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Unable to bind to %s on this computer (bind returned error %d, %s)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-86"/>
+ <source>Connect through socks proxy</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-11"/>
+ <source>Allow DNS lookups for -addnode, -seednode and -connect</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+57"/>
+ <source>Loading addresses...</source>
+ <translation>ÅœarÄante adresojn...</translation>
+ </message>
+ <message>
+ <location line="-35"/>
+ <source>Error loading wallet.dat: Wallet corrupted</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Error loading wallet.dat: Wallet requires newer version of Bitcoin</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+87"/>
+ <source>Wallet needed to be rewritten: restart Bitcoin to complete</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-89"/>
+ <source>Error loading wallet.dat</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+30"/>
+ <source>Invalid -proxy address: &apos;%s&apos;</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+48"/>
+ <source>Unknown network specified in -onlynet: &apos;%s&apos;</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-1"/>
+ <source>Unknown -socks proxy version requested: %i</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-91"/>
+ <source>Cannot resolve -bind address: &apos;%s&apos;</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Cannot resolve -externalip address: &apos;%s&apos;</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+45"/>
+ <source>Invalid amount for -paytxfee=&lt;amount&gt;: &apos;%s&apos;</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-24"/>
+ <source>Error: could not start node</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+25"/>
+ <source>Invalid amount</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-4"/>
+ <source>Insufficient funds</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+8"/>
+ <source>Loading block index...</source>
+ <translation>ÅœarÄante blok-indekson...</translation>
+ </message>
+ <message>
+ <location line="-59"/>
+ <source>Add a node to connect to and attempt to keep the connection open</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-25"/>
+ <source>Unable to bind to %s on this computer. Bitcoin is probably already running.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+68"/>
+ <source>Fee per KB to add to transactions you send</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+17"/>
+ <source>Loading wallet...</source>
+ <translation>ÅœarÄante monujon...</translation>
+ </message>
+ <message>
+ <location line="-54"/>
+ <source>Cannot downgrade wallet</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Cannot initialize keypool</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Cannot write default address</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+64"/>
+ <source>Rescanning...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-56"/>
+ <source>Done loading</source>
+ <translation>ÅœarÄado finitas</translation>
+ </message>
+ <message>
+ <location line="+79"/>
+ <source>To use the %s option</source>
+ <translation>Por uzi la opcion %s</translation>
+ </message>
+ <message>
+ <location line="-71"/>
+ <source>Error</source>
+ <translation>Eraro</translation>
+ </message>
+ <message>
+ <location line="-33"/>
+ <source>You must set rpcpassword=&lt;password&gt; in the configuration file:
+%s
+If the file does not exist, create it with owner-readable-only file permissions.</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+</TS> \ No newline at end of file
diff --git a/src/qt/locale/bitcoin_es.ts b/src/qt/locale/bitcoin_es.ts
index a330cbfb89..1eb24b8879 100644
--- a/src/qt/locale/bitcoin_es.ts
+++ b/src/qt/locale/bitcoin_es.ts
@@ -13,12 +13,7 @@
<translation>&lt;b&gt;Bitcoin&lt;/b&gt; versión</translation>
</message>
<message>
- <location line="+41"/>
- <source>Copyright © 2009-2012 The Bitcoin developers</source>
- <translation>Copyright © 2009-2012 Los desarrolladores de Bitcoin</translation>
- </message>
- <message>
- <location line="+13"/>
+ <location line="+57"/>
<source>
This is experimental software.
@@ -35,6 +30,16 @@ Este producto incluye software desarrollado por OpenSSL Project para su uso en
el OpenSSL Toolkit (http://www.openssl.org/) y software criptográfico escrito por
Eric Young (eay@cryptsoft.com) y el software UPnP escrito por Thomas Bernard.</translation>
</message>
+ <message>
+ <location filename="../aboutdialog.cpp" line="+17"/>
+ <source>Copyright</source>
+ <translation>Copyright</translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>2009-%1 The Bitcoin developers</source>
+ <translation>2009-%1 Los desarrolladores de Bitcoin</translation>
+ </message>
</context>
<context>
<name>AddressBookPage</name>
@@ -66,7 +71,7 @@ Eric Young (eay@cryptsoft.com) y el software UPnP escrito por Thomas Bernard.</t
<message>
<location line="-46"/>
<source>These are your Bitcoin addresses for receiving payments. You may want to give a different one to each sender so you can keep track of who is paying you.</source>
- <translation>Estas son tus direcciones Bitcoin para recibir pagos. Puedes utilizar una diferente por cada persona emisora para saber quien te está pagando.</translation>
+ <translation>Estas son tus direcciones Bitcoin para recibir pagos. Puedes utilizar una diferente por cada persona emisora para saber quién te está pagando.</translation>
</message>
<message>
<location line="+60"/>
@@ -109,17 +114,22 @@ Eric Young (eay@cryptsoft.com) y el software UPnP escrito por Thomas Bernard.</t
<translation>&amp;Borrar</translation>
</message>
<message>
- <location filename="../addressbookpage.cpp" line="+65"/>
+ <location filename="../addressbookpage.cpp" line="+66"/>
<source>Copy &amp;Label</source>
<translation>Copiar &amp;etiqueta</translation>
</message>
<message>
- <location line="+2"/>
+ <location line="+1"/>
<source>&amp;Edit</source>
<translation>&amp;Editar</translation>
</message>
<message>
- <location line="+250"/>
+ <location line="+1"/>
+ <source>Send &amp;Coins</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+263"/>
<source>Export Address Book Data</source>
<translation>Exportar datos de la libreta de direcciones</translation>
</message>
@@ -142,7 +152,7 @@ Eric Young (eay@cryptsoft.com) y el software UPnP escrito por Thomas Bernard.</t
<context>
<name>AddressTableModel</name>
<message>
- <location filename="../addresstablemodel.cpp" line="+142"/>
+ <location filename="../addresstablemodel.cpp" line="+144"/>
<source>Label</source>
<translation>Etiqueta</translation>
</message>
@@ -301,17 +311,17 @@ Eric Young (eay@cryptsoft.com) y el software UPnP escrito por Thomas Bernard.</t
<context>
<name>BitcoinGUI</name>
<message>
- <location filename="../bitcoingui.cpp" line="+267"/>
+ <location filename="../bitcoingui.cpp" line="+231"/>
<source>Sign &amp;message...</source>
<translation>Firmar &amp;mensaje...</translation>
</message>
<message>
- <location line="+254"/>
+ <location line="+299"/>
<source>Synchronizing with network...</source>
<translation>Sincronizando con la red…</translation>
</message>
<message>
- <location line="-322"/>
+ <location line="-367"/>
<source>&amp;Overview</source>
<translation>&amp;Vista general</translation>
</message>
@@ -331,32 +341,17 @@ Eric Young (eay@cryptsoft.com) y el software UPnP escrito por Thomas Bernard.</t
<translation>Examinar el historial de transacciones</translation>
</message>
<message>
- <location line="+6"/>
- <source>&amp;Address Book</source>
- <translation>&amp;Libreta de direcciones</translation>
- </message>
- <message>
- <location line="+1"/>
+ <location line="+7"/>
<source>Edit the list of stored addresses and labels</source>
<translation>Editar la lista de las direcciones y etiquetas almacenadas</translation>
</message>
<message>
- <location line="-15"/>
- <source>&amp;Receive coins</source>
- <translation>&amp;Recibir monedas</translation>
- </message>
- <message>
- <location line="+1"/>
+ <location line="-14"/>
<source>Show the list of addresses for receiving payments</source>
<translation>Mostrar la lista de direcciones utilizadas para recibir pagos</translation>
</message>
<message>
- <location line="-8"/>
- <source>&amp;Send coins</source>
- <translation>&amp;Enviar monedas</translation>
- </message>
- <message>
- <location line="+39"/>
+ <location line="+31"/>
<source>E&amp;xit</source>
<translation>&amp;Salir</translation>
</message>
@@ -401,7 +396,7 @@ Eric Young (eay@cryptsoft.com) y el software UPnP escrito por Thomas Bernard.</t
<translation>&amp;Cambiar la contraseña…</translation>
</message>
<message>
- <location line="+259"/>
+ <location line="+304"/>
<source>Importing blocks from disk...</source>
<translation>Importando bloques de disco...</translation>
</message>
@@ -410,13 +405,8 @@ Eric Young (eay@cryptsoft.com) y el software UPnP escrito por Thomas Bernard.</t
<source>Reindexing blocks on disk...</source>
<translation>Reindexando bloques en disco...</translation>
</message>
- <message numerus="yes">
- <location line="+10"/>
- <source>~%n block(s) remaining</source>
- <translation><numerusform>~%n bloque restante</numerusform><numerusform>~%n bloques restantes</numerusform></translation>
- </message>
<message>
- <location line="-265"/>
+ <location line="-300"/>
<source>&amp;Export...</source>
<translation>&amp;Exportar…</translation>
</message>
@@ -461,18 +451,33 @@ Eric Young (eay@cryptsoft.com) y el software UPnP escrito por Thomas Bernard.</t
<translation>&amp;Verificar mensaje...</translation>
</message>
<message>
- <location line="-196"/>
- <location line="+538"/>
+ <location line="-162"/>
+ <location line="+540"/>
<source>Bitcoin</source>
<translation>Bitcoin</translation>
</message>
<message>
- <location line="-538"/>
+ <location line="-540"/>
<source>Wallet</source>
<translation>Monedero</translation>
</message>
<message>
- <location line="+176"/>
+ <location line="+99"/>
+ <source>&amp;Send</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+7"/>
+ <source>&amp;Receive</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+14"/>
+ <source>&amp;Addresses</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+22"/>
<source>&amp;About Bitcoin</source>
<translation>&amp;Acerca de Bitcoin</translation>
</message>
@@ -533,27 +538,57 @@ Eric Young (eay@cryptsoft.com) y el software UPnP escrito por Thomas Bernard.</t
<translation>[testnet]</translation>
</message>
<message>
- <location line="+63"/>
+ <location line="+47"/>
<source>Bitcoin client</source>
<translation>Cliente Bitcoin</translation>
</message>
<message numerus="yes">
- <location line="+79"/>
+ <location line="+140"/>
<source>%n active connection(s) to Bitcoin network</source>
<translation><numerusform>%n conexión activa hacia la red Bitcoin</numerusform><numerusform>%n conexiones activas hacia la red Bitcoin</numerusform></translation>
</message>
<message>
- <location line="+45"/>
- <source>Processed %1 of %2 blocks of transaction history (%3% done).</source>
- <translation>Procesados %1 de %2 bloques del historial de transacciones (%3% completo).</translation>
+ <location line="+39"/>
+ <source>Processed %1 of %2 (estimated) blocks of transaction history.</source>
+ <translation>Se han procesado %1 de %2 (estimación) bloques de historia de transacción.</translation>
</message>
<message>
- <location line="+7"/>
+ <location line="+4"/>
<source>Processed %1 blocks of transaction history.</source>
<translation>Procesados %1 bloques del historial de transacciones.</translation>
</message>
+ <message numerus="yes">
+ <location line="+20"/>
+ <source>%n hour(s)</source>
+ <translation><numerusform>%n hora</numerusform><numerusform>%n horas</numerusform></translation>
+ </message>
+ <message numerus="yes">
+ <location line="+4"/>
+ <source>%n day(s)</source>
+ <translation><numerusform>%n día</numerusform><numerusform>%n días</numerusform></translation>
+ </message>
+ <message numerus="yes">
+ <location line="+4"/>
+ <source>%n week(s)</source>
+ <translation><numerusform>%n semana</numerusform><numerusform>%n semanas</numerusform></translation>
+ </message>
<message>
- <location line="+70"/>
+ <location line="+5"/>
+ <source>%1 behind</source>
+ <translation>%1 detrás</translation>
+ </message>
+ <message>
+ <location line="+14"/>
+ <source>Last received block was generated %1 ago.</source>
+ <translation>El último bloque recibido fue generado hace %1.</translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Transactions after this will not yet be visible.</source>
+ <translation>Las transacciones que vengan después de esta todavía no serán visibles.</translation>
+ </message>
+ <message>
+ <location line="+21"/>
<source>Error</source>
<translation>Error</translation>
</message>
@@ -568,62 +603,27 @@ Eric Young (eay@cryptsoft.com) y el software UPnP escrito por Thomas Bernard.</t
<translation>Información</translation>
</message>
<message>
- <location line="+66"/>
+ <location line="+68"/>
<source>This transaction is over the size limit. You can still send it for a fee of %1, which goes to the nodes that process your transaction and helps to support the network. Do you want to pay the fee?</source>
<translation>Esta transacción supera el límite de tamaño. Puede enviarla con una comisión de %1, destinada a los nodos que procesen su transacción para contribuir al mantenimiento de la red. ¿Desea pagar esta comisión?</translation>
</message>
<message>
- <location line="+210"/>
- <source>Backup Successful</source>
- <translation>Se ha completado con éxito la copia de respaldo</translation>
- </message>
- <message>
- <location line="+0"/>
- <source>The wallet data was successfully saved to the new location.</source>
- <translation>Los datos del monedero se han guardado con éxito en la nueva ubicación.</translation>
- </message>
- <message numerus="yes">
- <location line="-338"/>
- <source>%n second(s) ago</source>
- <translation><numerusform>hace %n segundo</numerusform><numerusform>hace %n segundos</numerusform></translation>
- </message>
- <message numerus="yes">
- <location line="+4"/>
- <source>%n minute(s) ago</source>
- <translation><numerusform>hace %n minuto</numerusform><numerusform>hace %n minutos</numerusform></translation>
- </message>
- <message numerus="yes">
- <location line="+4"/>
- <source>%n hour(s) ago</source>
- <translation><numerusform>hace %n hora</numerusform><numerusform>hace %n horas</numerusform></translation>
- </message>
- <message numerus="yes">
- <location line="+4"/>
- <source>%n day(s) ago</source>
- <translation><numerusform>hace %n día</numerusform><numerusform>hace %n días</numerusform></translation>
- </message>
- <message>
- <location line="+6"/>
+ <location line="-138"/>
<source>Up to date</source>
<translation>Actualizado</translation>
</message>
<message>
- <location line="+7"/>
+ <location line="+32"/>
<source>Catching up...</source>
<translation>Recuperando...</translation>
</message>
<message>
- <location line="+10"/>
- <source>Last received block was generated %1.</source>
- <translation>El último bloque recibido fue generado %1.</translation>
- </message>
- <message>
- <location line="+97"/>
+ <location line="+110"/>
<source>Confirm transaction fee</source>
<translation>Confirme la tarifa de la transacción</translation>
</message>
<message>
- <location line="+23"/>
+ <location line="+8"/>
<source>Sent transaction</source>
<translation>Transacción enviada</translation>
</message>
@@ -646,14 +646,14 @@ Dirección: %4
</translation>
</message>
<message>
- <location line="+99"/>
- <location line="+28"/>
+ <location line="+33"/>
+ <location line="+23"/>
<source>URI handling</source>
<translation>Gestión de URI</translation>
</message>
<message>
- <location line="-28"/>
- <location line="+28"/>
+ <location line="-23"/>
+ <location line="+23"/>
<source>URI can not be parsed! This can be caused by an invalid Bitcoin address or malformed URI parameters.</source>
<translation>¡No se puede interpretar la URI! Esto puede deberse a una dirección Bitcoin inválida o a parámetros de URI mal formados.</translation>
</message>
@@ -668,27 +668,7 @@ Dirección: %4
<translation>El monedero está &lt;b&gt;cifrado&lt;/b&gt; y actualmente &lt;b&gt;bloqueado&lt;/b&gt;</translation>
</message>
<message>
- <location line="+23"/>
- <source>Backup Wallet</source>
- <translation>Copia de seguridad del monedero</translation>
- </message>
- <message>
- <location line="+0"/>
- <source>Wallet Data (*.dat)</source>
- <translation>Datos del monedero (*.dat)</translation>
- </message>
- <message>
- <location line="+3"/>
- <source>Backup Failed</source>
- <translation>La copia de seguridad ha fallado</translation>
- </message>
- <message>
- <location line="+0"/>
- <source>There was an error trying to save the wallet data to the new location.</source>
- <translation>Ha habido un error al intentar guardar los datos del monedero en la nueva ubicación.</translation>
- </message>
- <message>
- <location filename="../bitcoin.cpp" line="+109"/>
+ <location filename="../bitcoin.cpp" line="+108"/>
<source>A fatal error occurred. Bitcoin can no longer continue safely and will quit.</source>
<translation>Ha ocurrido un error crítico. Bitcoin ya no puede continuar con seguridad y se cerrará.</translation>
</message>
@@ -696,7 +676,7 @@ Dirección: %4
<context>
<name>ClientModel</name>
<message>
- <location filename="../clientmodel.cpp" line="+86"/>
+ <location filename="../clientmodel.cpp" line="+96"/>
<source>Network Alert</source>
<translation>Alerta de red</translation>
</message>
@@ -729,7 +709,7 @@ Dirección: %4
<translation>La dirección asociada con esta entrada en la guía. Solo puede ser modificada para direcciones de envío.</translation>
</message>
<message>
- <location filename="../editaddressdialog.cpp" line="+20"/>
+ <location filename="../editaddressdialog.cpp" line="+21"/>
<source>New receiving address</source>
<translation>Nueva dirección para recibir</translation>
</message>
@@ -749,17 +729,17 @@ Dirección: %4
<translation>Editar dirección de envío</translation>
</message>
<message>
- <location line="+60"/>
+ <location line="+76"/>
<source>The entered address &quot;%1&quot; is already in the address book.</source>
<translation>La dirección introducida &quot;%1&quot; ya está presente en la libreta de direcciones.</translation>
</message>
<message>
- <location line="+5"/>
+ <location line="-5"/>
<source>The entered address &quot;%1&quot; is not a valid Bitcoin address.</source>
<translation>La dirección introducida &quot;%1&quot; no es una dirección Bitcoin válida.</translation>
</message>
<message>
- <location line="+5"/>
+ <location line="+10"/>
<source>Could not unlock wallet.</source>
<translation>No se pudo desbloquear el monedero.</translation>
</message>
@@ -772,7 +752,7 @@ Dirección: %4
<context>
<name>GUIUtil::HelpMessageBox</name>
<message>
- <location filename="../guiutil.cpp" line="+419"/>
+ <location filename="../guiutil.cpp" line="+422"/>
<location line="+12"/>
<source>Bitcoin-Qt</source>
<translation>Bitcoin-Qt</translation>
@@ -986,7 +966,7 @@ Dirección: %4
<translation>&amp;Aplicar</translation>
</message>
<message>
- <location filename="../optionsdialog.cpp" line="+55"/>
+ <location filename="../optionsdialog.cpp" line="+53"/>
<source>default</source>
<translation>predeterminado</translation>
</message>
@@ -1031,23 +1011,18 @@ Dirección: %4
<translation>Desde</translation>
</message>
<message>
- <location line="+51"/>
- <location line="+183"/>
+ <location line="+50"/>
+ <location line="+166"/>
<source>The displayed information may be out of date. Your wallet automatically synchronizes with the Bitcoin network after a connection is established, but this process has not completed yet.</source>
<translation>La información mostrada puede estar desactualizada. Su monedero se sincroniza automáticamente con la red Bitcoin después de que se haya establecido una conexión , pero este proceso aún no se ha completado.</translation>
</message>
<message>
- <location line="-141"/>
+ <location line="-124"/>
<source>Balance:</source>
<translation>Saldo:</translation>
</message>
<message>
- <location line="+58"/>
- <source>Number of transactions:</source>
- <translation>Número de movimientos:</translation>
- </message>
- <message>
- <location line="-29"/>
+ <location line="+29"/>
<source>Unconfirmed:</source>
<translation>No confirmado(s):</translation>
</message>
@@ -1057,7 +1032,7 @@ Dirección: %4
<translation>Monedero</translation>
</message>
<message>
- <location line="+124"/>
+ <location line="+107"/>
<source>Immature:</source>
<translation>No disponible:</translation>
</message>
@@ -1072,7 +1047,7 @@ Dirección: %4
<translation>&lt;b&gt;Movimientos recientes&lt;/b&gt;</translation>
</message>
<message>
- <location line="-118"/>
+ <location line="-101"/>
<source>Your current balance</source>
<translation>Saldo actual</translation>
</message>
@@ -1082,11 +1057,6 @@ Dirección: %4
<translation>Total de las transacciones que faltan por confirmar y que no contribuyen al saldo actual</translation>
</message>
<message>
- <location line="+20"/>
- <source>Total number of transactions in wallet</source>
- <translation>Número total de movimientos en el monedero</translation>
- </message>
- <message>
<location filename="../overviewpage.cpp" line="+115"/>
<location line="+1"/>
<source>out of sync</source>
@@ -1094,6 +1064,14 @@ Dirección: %4
</message>
</context>
<context>
+ <name>PaymentServer</name>
+ <message>
+ <location filename="../paymentserver.cpp" line="+107"/>
+ <source>Cannot start bitcoin: click-to-pay handler</source>
+ <translation>No se pudo iniciar bitcoin: manejador de pago-al-clic</translation>
+ </message>
+</context>
+<context>
<name>QRCodeDialog</name>
<message>
<location filename="../forms/qrcodedialog.ui" line="+14"/>
@@ -1432,7 +1410,7 @@ Dirección: %4
</message>
<message>
<location line="+60"/>
- <location filename="../sendcoinsentry.cpp" line="+25"/>
+ <location filename="../sendcoinsentry.cpp" line="+26"/>
<source>Enter a label for this address to add it to your address book</source>
<translation>Etiquete esta dirección para añadirla a la libreta</translation>
</message>
@@ -1668,7 +1646,7 @@ Dirección: %4
<context>
<name>TransactionDesc</name>
<message>
- <location filename="../transactiondesc.cpp" line="+19"/>
+ <location filename="../transactiondesc.cpp" line="+20"/>
<source>Open until %1</source>
<translation>Abierto hasta %1</translation>
</message>
@@ -1826,7 +1804,7 @@ Dirección: %4
<message>
<location line="-209"/>
<source>, has not been successfully broadcast yet</source>
- <translation>, no ha sido emitido satisfactoriamente todavía</translation>
+ <translation>, todavía no se ha sido difundido satisfactoriamente</translation>
</message>
<message numerus="yes">
<location line="-35"/>
@@ -1855,7 +1833,7 @@ Dirección: %4
<context>
<name>TransactionTableModel</name>
<message>
- <location filename="../transactiontablemodel.cpp" line="+226"/>
+ <location filename="../transactiontablemodel.cpp" line="+225"/>
<source>Date</source>
<translation>Fecha</translation>
</message>
@@ -1973,7 +1951,7 @@ Dirección: %4
<context>
<name>TransactionView</name>
<message>
- <location filename="../transactionview.cpp" line="+55"/>
+ <location filename="../transactionview.cpp" line="+52"/>
<location line="+16"/>
<source>All</source>
<translation>Todo</translation>
@@ -2060,6 +2038,11 @@ Dirección: %4
</message>
<message>
<location line="+1"/>
+ <source>Copy transaction ID</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Edit label</source>
<translation>Editar etiqueta</translation>
</message>
@@ -2069,7 +2052,7 @@ Dirección: %4
<translation>Mostrar detalles de la transacción</translation>
</message>
<message>
- <location line="+142"/>
+ <location line="+139"/>
<source>Export Transaction Data</source>
<translation>Exportar datos de la transacción</translation>
</message>
@@ -2124,7 +2107,7 @@ Dirección: %4
<translation>No se pudo escribir en el archivo %1.</translation>
</message>
<message>
- <location line="+95"/>
+ <location line="+100"/>
<source>Range:</source>
<translation>Rango:</translation>
</message>
@@ -2135,30 +2118,173 @@ Dirección: %4
</message>
</context>
<context>
+ <name>WalletView</name>
+ <message>
+ <location filename="../walletview.cpp" line="+95"/>
+ <source>&amp;Overview</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Show general overview of wallet</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>&amp;Send coins</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Send coins to a Bitcoin address</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>&amp;Receive coins</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Show the list of addresses for receiving payments</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>&amp;Transactions</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Browse transaction history</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>&amp;Address Book</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Edit the list of stored addresses and labels</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+12"/>
+ <source>&amp;Encrypt Wallet...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Encrypt the private keys that belong to your wallet</source>
+ <translation>Cifrar las claves privadas de su monedero</translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>&amp;Backup Wallet...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Backup wallet to another location</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>&amp;Change Passphrase...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Change the passphrase used for wallet encryption</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Sign &amp;message...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Sign messages with your Bitcoin addresses to prove you own them</source>
+ <translation>Firmar mensajes con sus direcciones Bitcoin para probar la propiedad</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>&amp;Verify message...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Verify messages to ensure they were signed with specified Bitcoin addresses</source>
+ <translation>Verificar mensajes comprobando que están firmados con direcciones Bitcoin concretas</translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>&amp;Export...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Export the data in the current tab to a file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+180"/>
+ <source>Backup Wallet</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>Wallet Data (*.dat)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Backup Failed</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>There was an error trying to save the wallet data to the new location.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>Backup Successful</source>
+ <translation>Se ha completado con éxito la copia de respaldo</translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>The wallet data was successfully saved to the new location.</source>
+ <translation>Los datos del monedero se han guardado con éxito en la nueva ubicación.</translation>
+ </message>
+</context>
+<context>
<name>bitcoin-core</name>
<message>
- <location filename="../bitcoinstrings.cpp" line="+88"/>
+ <location filename="../bitcoinstrings.cpp" line="+96"/>
<source>Bitcoin version</source>
<translation>Versión de Bitcoin</translation>
</message>
<message>
- <location line="+82"/>
+ <location line="+98"/>
<source>Usage:</source>
<translation>Uso:</translation>
</message>
<message>
- <location line="-23"/>
+ <location line="-24"/>
<source>Send command to -server or bitcoind</source>
<translation>Envíar comando a -server o bitcoind</translation>
</message>
<message>
- <location line="-21"/>
+ <location line="-22"/>
<source>List commands</source>
<translation>Muestra comandos
</translation>
</message>
<message>
- <location line="-11"/>
+ <location line="-10"/>
<source>Get help for a command</source>
<translation>Recibir ayuda para un comando
</translation>
@@ -2187,12 +2313,12 @@ Dirección: %4
<translation>Generar monedas</translation>
</message>
<message>
- <location line="-15"/>
+ <location line="-28"/>
<source>Don&apos;t generate coins</source>
<translation>No generar monedas</translation>
</message>
<message>
- <location line="+61"/>
+ <location line="+74"/>
<source>Specify data directory</source>
<translation>Especificar directorio para los datos</translation>
</message>
@@ -2202,90 +2328,85 @@ Dirección: %4
<translation>Establecer el tamaño de caché de la base de datos en megabytes (predeterminado: 25)</translation>
</message>
<message>
- <location line="-26"/>
+ <location line="-27"/>
<source>Listen for connections on &lt;port&gt; (default: 8333 or testnet: 18333)</source>
<translation>Escuchar conexiones en &lt;puerto&gt; (predeterminado: 8333 o testnet: 18333)</translation>
</message>
<message>
- <location line="+4"/>
+ <location line="+5"/>
<source>Maintain at most &lt;n&gt; connections to peers (default: 125)</source>
<translation>Mantener como máximo &lt;n&gt; conexiones a pares (predeterminado: 125)</translation>
</message>
<message>
- <location line="-34"/>
+ <location line="-49"/>
<source>Connect to a node to retrieve peer addresses, and disconnect</source>
<translation>Conectar a un nodo para obtener direcciones de pares y desconectar</translation>
</message>
<message>
- <location line="+65"/>
+ <location line="+80"/>
<source>Specify your own public address</source>
<translation>Especifique su propia dirección pública</translation>
</message>
<message>
- <location line="+2"/>
+ <location line="+3"/>
<source>Threshold for disconnecting misbehaving peers (default: 100)</source>
<translation>Umbral para la desconexión de pares con mal comportamiento (predeterminado: 100)</translation>
</message>
<message>
- <location line="-114"/>
+ <location line="-132"/>
<source>Number of seconds to keep misbehaving peers from reconnecting (default: 86400)</source>
<translation>Número de segundos en que se evita la reconexión de pares con mal comportamiento (predeterminado: 86400)</translation>
</message>
<message>
- <location line="-28"/>
+ <location line="-32"/>
<source>An error occurred while setting up the RPC port %u for listening on IPv4: %s</source>
<translation>Ha ocurrido un error al configurar el puerto RPC %u para escucha en IPv4: %s</translation>
</message>
<message>
- <location line="+26"/>
+ <location line="+30"/>
<source>Listen for JSON-RPC connections on &lt;port&gt; (default: 8332 or testnet: 18332)</source>
<translation>Escuchar conexiones JSON-RPC en &lt;puerto&gt; (predeterminado: 8332 o testnet:18332)</translation>
</message>
<message>
- <location line="+34"/>
+ <location line="+36"/>
<source>Accept command line and JSON-RPC commands</source>
<translation>Aceptar comandos consola y JSON-RPC
</translation>
</message>
<message>
- <location line="+62"/>
+ <location line="+77"/>
<source>Run in the background as a daemon and accept commands</source>
<translation>Correr como demonio y aceptar comandos
</translation>
</message>
<message>
- <location line="+31"/>
+ <location line="+32"/>
<source>Use the test network</source>
<translation>Usar la red de pruebas
</translation>
</message>
<message>
- <location line="-92"/>
+ <location line="-108"/>
<source>Accept connections from outside (default: 1 if no -proxy or -connect)</source>
<translation>Aceptar conexiones desde el exterior (predeterminado: 1 si no -proxy o -connect)</translation>
</message>
<message>
- <location line="-74"/>
+ <location line="-82"/>
<source>%s, you must set a rpcpassword in the configuration file:
- %s
+%s
It is recommended you use the following random password:
rpcuser=bitcoinrpc
rpcpassword=%s
(you do not need to remember this password)
The username and password MUST NOT be the same.
If the file does not exist, create it with owner-readable-only file permissions.
+It is also recommended to set alertnotify so you are notified of problems;
+for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.com
</source>
- <translation>%s, debe asignar un valor a rpcpassword en el archivo de configuración:
- %s
-Se recomienda que utilice la siguiente contraseña aleatoria:
-rpcuser=bitcoinrpc
-rpcpassword=%s
-(no necesita recordar esta contraseña)
-El nombre de usuario y la contraseña NO DEBEN ser iguales.
-Si el archivo no existe, créelo con permisos owner-readable-only.</translation>
+ <translation type="unfinished"/>
</message>
<message>
- <location line="+15"/>
+ <location line="+17"/>
<source>An error occurred while setting up the RPC port %u for listening on IPv6, falling back to IPv4: %s</source>
<translation>Ha ocurrido un error al configurar el puerto RPC %u para escuchar mediante IPv6. Recurriendo a IPv4: %s</translation>
</message>
@@ -2301,11 +2422,6 @@ Si el archivo no existe, créelo con permisos owner-readable-only.</translation>
</message>
<message>
<location line="+3"/>
- <source>Corrupted block database detected. Please restart the client with -reindex.</source>
- <translation>Detectada base de datos de bloques corrupta. Reinicie el cliente con -reindex.</translation>
- </message>
- <message>
- <location line="+2"/>
<source>Error initializing database environment %s! To recover, BACKUP THAT DIRECTORY, then remove everything from it except for wallet.dat.</source>
<translation>¡Error al inicializar el entorno de base de datos %s! Para restaurarlo, HAGA UNA COPIA DE SEGURIDAD DEL DIRECTORIO y borre todos sus contenidos excepto wallet.dat.</translation>
</message>
@@ -2320,12 +2436,27 @@ Si el archivo no existe, créelo con permisos owner-readable-only.</translation>
<translation>¡Error: Esta transacción requiere una comisión de al menos %s debido a su monto, complejidad, o al uso de fondos recién recibidos!</translation>
</message>
<message>
+ <location line="+3"/>
+ <source>Execute command when a relevant alert is received (%s in cmd is replaced by message)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Execute command when a wallet transaction changes (%s in cmd is replaced by TxID)</source>
+ <translation>Ejecutar comando cuando una transacción del monedero cambia (%s en cmd se remplazará por TxID)</translation>
+ </message>
+ <message>
<location line="+11"/>
<source>Set maximum size of high-priority/low-fee transactions in bytes (default: 27000)</source>
<translation>Establecer el tamaño máximo de las transacciones de alta prioridad/comisión baja en bytes (predeterminado:27000)</translation>
</message>
<message>
<location line="+3"/>
+ <source>Set the number of script verification threads (1-16, 0=auto, default: 0)</source>
+ <translation>Establecer el número de hilos para la verificación de scripts (1-16, 0=automático, predeterminado: 0)</translation>
+ </message>
+ <message>
+ <location line="+2"/>
<source>This is a pre-release test build - use at your own risk - do not use for mining or merchant applications</source>
<translation>Esta es una versión de prueba pre-release - utilícela bajo su propio riesgo. No la utilice para usos comerciales o de minería.</translation>
</message>
@@ -2371,16 +2502,41 @@ Si el archivo no existe, créelo con permisos owner-readable-only.</translation>
</message>
<message>
<location line="+3"/>
+ <source>Corrupted block database detected</source>
+ <translation>Corrupción de base de datos de bloques detectada.</translation>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Discover own IP address (default: 1 when listening and no -externalip)</source>
<translation>Descubrir dirección IP propia (predeterminado: 1 al escuchar sin -externalip)</translation>
</message>
<message>
+ <location line="+1"/>
+ <source>Do you want to rebuild the block database now?</source>
+ <translation>¿Quieres reconstruir la base de datos de bloques ahora?</translation>
+ </message>
+ <message>
<location line="+3"/>
+ <source>Error initializing block database</source>
+ <translation>Error al inicializar la base de datos de bloques</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Error initializing wallet database environment %s!</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Error loading block database</source>
<translation>Error cargando base de datos de bloques</translation>
</message>
<message>
- <location line="+5"/>
+ <location line="+4"/>
+ <source>Error opening block database</source>
+ <translation>Error al abrir base de datos de bloques.</translation>
+ </message>
+ <message>
+ <location line="+2"/>
<source>Error: Disk space is low!</source>
<translation>Error: ¡Espacio en disco bajo!</translation>
</message>
@@ -2396,26 +2552,96 @@ Si el archivo no existe, créelo con permisos owner-readable-only.</translation>
</message>
<message>
<location line="+2"/>
+ <source>Error: system error: </source>
+ <translation>Error: error de sistema: </translation>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Failed to listen on any port. Use -listen=0 if you want this.</source>
<translation>Ha fallado la escucha en todos los puertos. Use -listen=0 si desea esto.</translation>
</message>
<message>
+ <location line="+1"/>
+ <source>Failed to read block info</source>
+ <translation>No se ha podido leer la información de bloque</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Failed to read block</source>
+ <translation>No se ha podido leer el bloque</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Failed to sync block index</source>
+ <translation>No se ha podido sincronizar el índice de bloques</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Failed to write block index</source>
+ <translation>No se ha podido escribir en el índice de bloques</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Failed to write block info</source>
+ <translation>No se ha podido escribir la información de bloques</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Failed to write block</source>
+ <translation>No se ha podido escribir el bloque</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Failed to write file info</source>
+ <translation>No se ha podido escribir la información de archivo</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Failed to write to coin database</source>
+ <translation>No se ha podido escribir en la base de datos de monedas</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Failed to write transaction index</source>
+ <translation>No se ha podido escribir en el índice de transacciones</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Failed to write undo data</source>
+ <translation>No se han podido escribir los datos de deshacer</translation>
+ </message>
+ <message>
<location line="+2"/>
<source>Find peers using DNS lookup (default: 1 unless -connect)</source>
<translation>Encontrar pares mediante búsqueda de DNS (predeterminado: 1 salvo con -connect)</translation>
</message>
<message>
- <location line="+5"/>
+ <location line="+3"/>
+ <source>How many blocks to check at startup (default: 288, 0 = all)</source>
+ <translation>Cuántos bloques comprobar al iniciar (predeterminado: 288, 0 = todos)</translation>
+ </message>
+ <message>
+ <location line="+1"/>
<source>How thorough the block verification is (0-4, default: 3)</source>
<translation>Como es de exhaustiva la verificació de bloques (0-4, por defecto 3)</translation>
</message>
<message>
- <location line="+1"/>
- <source>Importing blocks from block database...</source>
- <translation>Importando bloques de la base de datos de bloques...</translation>
+ <location line="+24"/>
+ <source>Rebuild block chain index from current blk000??.dat files</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+37"/>
+ <source>Verifying blocks...</source>
+ <translation type="unfinished"/>
</message>
<message>
<location line="+1"/>
+ <source>Verifying wallet...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-61"/>
<source>Imports blocks from external blk000??.dat file</source>
<translation>Importa los bloques desde un archivo blk000??.dat externo</translation>
</message>
@@ -2430,7 +2656,12 @@ Si el archivo no existe, créelo con permisos owner-readable-only.</translation>
<translation>Dirección -tor inválida: &apos;%s&apos;</translation>
</message>
<message>
- <location line="+9"/>
+ <location line="+8"/>
+ <source>Maintain a full transaction index (default: 0)</source>
+ <translation>Mantener índice de transacciones completo (predeterminado: 0)</translation>
+ </message>
+ <message>
+ <location line="+2"/>
<source>Maximum per-connection receive buffer, &lt;n&gt;*1000 bytes (default: 5000)</source>
<translation>Búfer de recepción máximo por conexión, &lt;n&gt;*1000 bytes (predeterminado: 5000)</translation>
</message>
@@ -2465,12 +2696,7 @@ Si el archivo no existe, créelo con permisos owner-readable-only.</translation>
<translation>Anteponer marca temporal a la información de depuración</translation>
</message>
<message>
- <location line="+1"/>
- <source>Rebuild blockchain index from current blk000??.dat files</source>
- <translation>Reconstruir el índice de la cadena de bloques a partir de los archivos blk000??.dat actuales</translation>
- </message>
- <message>
- <location line="+4"/>
+ <location line="+5"/>
<source>SSL options: (see the Bitcoin Wiki for SSL setup instructions)</source>
<translation>Opciones SSL: (ver la Bitcoin Wiki para instrucciones de configuración SSL)</translation>
</message>
@@ -2510,7 +2736,12 @@ Si el archivo no existe, créelo con permisos owner-readable-only.</translation>
<translation>Especificar el tiempo máximo de conexión en milisegundos (predeterminado: 5000)</translation>
</message>
<message>
- <location line="+13"/>
+ <location line="+4"/>
+ <source>System error: </source>
+ <translation>Error de sistema: </translation>
+ </message>
+ <message>
+ <location line="+10"/>
<source>Use UPnP to map the listening port (default: 0)</source>
<translation>Usar UPnP para asignar el puerto de escucha (predeterminado: 0)</translation>
</message>
@@ -2542,39 +2773,44 @@ Si el archivo no existe, créelo con permisos owner-readable-only.</translation>
</message>
<message>
<location line="+1"/>
+ <source>You need to rebuild the databases using -reindex to change -txindex</source>
+ <translation>Necesita reconstruir las bases de datos con la opción -reindex para modificar -txindex</translation>
+ </message>
+ <message>
+ <location line="+1"/>
<source>wallet.dat corrupt, salvage failed</source>
<translation>wallet.dat corrupto. Ha fallado la recuperación.</translation>
</message>
<message>
- <location line="-43"/>
+ <location line="-45"/>
<source>Password for JSON-RPC connections</source>
<translation>Contraseña para las conexiones JSON-RPC
</translation>
</message>
<message>
- <location line="-53"/>
+ <location line="-68"/>
<source>Allow JSON-RPC connections from specified IP address</source>
<translation>Permitir conexiones JSON-RPC desde la dirección IP especificada
</translation>
</message>
<message>
- <location line="+62"/>
+ <location line="+77"/>
<source>Send commands to node running on &lt;ip&gt; (default: 127.0.0.1)</source>
<translation>Enviar comando al nodo situado en &lt;ip&gt; (predeterminado: 127.0.0.1)
</translation>
</message>
<message>
- <location line="-103"/>
+ <location line="-120"/>
<source>Execute command when the best block changes (%s in cmd is replaced by block hash)</source>
<translation>Ejecutar un comando cuando cambia el mejor bloque (%s en cmd se sustituye por el hash de bloque)</translation>
</message>
<message>
- <location line="+124"/>
+ <location line="+142"/>
<source>Upgrade wallet to latest format</source>
<translation>Actualizar el monedero al último formato</translation>
</message>
<message>
- <location line="-15"/>
+ <location line="-16"/>
<source>Set key pool size to &lt;n&gt; (default: 100)</source>
<translation>Ajustar el número de claves en reserva &lt;n&gt; (predeterminado: 100)
</translation>
@@ -2585,18 +2821,13 @@ Si el archivo no existe, créelo con permisos owner-readable-only.</translation>
<translation>Volver a examinar la cadena de bloques en busca de transacciones del monedero perdidas</translation>
</message>
<message>
- <location line="-26"/>
- <source>How many blocks to check at startup (default: 2500, 0 = all)</source>
- <translation>Cuántos bloques comprobar al iniciar (predeterminado: 2500, 0 = todos)</translation>
- </message>
- <message>
- <location line="+55"/>
+ <location line="+30"/>
<source>Use OpenSSL (https) for JSON-RPC connections</source>
<translation>Usar OpenSSL (https) para las conexiones JSON-RPC
</translation>
</message>
<message>
- <location line="-20"/>
+ <location line="-21"/>
<source>Server certificate file (default: server.cert)</source>
<translation>Certificado del servidor (predeterminado: server.cert)
</translation>
@@ -2608,13 +2839,13 @@ Si el archivo no existe, créelo con permisos owner-readable-only.</translation>
</translation>
</message>
<message>
- <location line="-133"/>
+ <location line="-154"/>
<source>Acceptable ciphers (default: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH)</source>
<translation>Cifrados aceptados (predeterminado: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH)
</translation>
</message>
<message>
- <location line="+144"/>
+ <location line="+166"/>
<source>This help message</source>
<translation>Este mensaje de ayuda
</translation>
@@ -2625,7 +2856,7 @@ Si el archivo no existe, créelo con permisos owner-readable-only.</translation>
<translation>No es posible conectar con %s en este sistema (bind ha dado el error %d, %s)</translation>
</message>
<message>
- <location line="-70"/>
+ <location line="-86"/>
<source>Connect through socks proxy</source>
<translation>Conectar mediante proxy socks</translation>
</message>
@@ -2635,12 +2866,12 @@ Si el archivo no existe, créelo con permisos owner-readable-only.</translation>
<translation>Permitir búsquedas DNS para -addnode, -seednode y -connect</translation>
</message>
<message>
- <location line="+43"/>
+ <location line="+57"/>
<source>Loading addresses...</source>
<translation>Cargando direcciones...</translation>
</message>
<message>
- <location line="-25"/>
+ <location line="-35"/>
<source>Error loading wallet.dat: Wallet corrupted</source>
<translation>Error al cargar wallet.dat: el monedero está dañado</translation>
</message>
@@ -2650,32 +2881,22 @@ Si el archivo no existe, créelo con permisos owner-readable-only.</translation>
<translation>Error al cargar wallet.dat: El monedero requiere una versión más reciente de Bitcoin</translation>
</message>
<message>
- <location line="+73"/>
- <source>Verifying block database integrity...</source>
- <translation>Verificando la integridad de la base de datos de bloques...</translation>
- </message>
- <message>
- <location line="+1"/>
- <source>Verifying wallet integrity...</source>
- <translation>Verificando la integridad del monedero...</translation>
- </message>
- <message>
- <location line="+1"/>
+ <location line="+87"/>
<source>Wallet needed to be rewritten: restart Bitcoin to complete</source>
<translation>El monedero ha necesitado ser reescrito. Reinicie Bitcoin para completar el proceso</translation>
</message>
<message>
- <location line="-77"/>
+ <location line="-89"/>
<source>Error loading wallet.dat</source>
<translation>Error al cargar wallet.dat</translation>
</message>
<message>
- <location line="+20"/>
+ <location line="+30"/>
<source>Invalid -proxy address: &apos;%s&apos;</source>
<translation>Dirección -proxy inválida: &apos;%s&apos;</translation>
</message>
<message>
- <location line="+46"/>
+ <location line="+48"/>
<source>Unknown network specified in -onlynet: &apos;%s&apos;</source>
<translation>La red especificada en -onlynet &apos;%s&apos; es desconocida</translation>
</message>
@@ -2685,7 +2906,7 @@ Si el archivo no existe, créelo con permisos owner-readable-only.</translation>
<translation>Solicitada versión de proxy -socks desconocida: %i</translation>
</message>
<message>
- <location line="-75"/>
+ <location line="-91"/>
<source>Cannot resolve -bind address: &apos;%s&apos;</source>
<translation>No se puede resolver la dirección de -bind: &apos;%s&apos;</translation>
</message>
@@ -2695,17 +2916,17 @@ Si el archivo no existe, créelo con permisos owner-readable-only.</translation>
<translation>No se puede resolver la dirección de -externalip: &apos;%s&apos;</translation>
</message>
<message>
- <location line="+31"/>
+ <location line="+45"/>
<source>Invalid amount for -paytxfee=&lt;amount&gt;: &apos;%s&apos;</source>
<translation>Cantidad inválida para -paytxfee=&lt;amount&gt;: &apos;%s&apos;</translation>
</message>
<message>
- <location line="-15"/>
+ <location line="-24"/>
<source>Error: could not start node</source>
<translation>Error: no se ha podido iniciar el nodo</translation>
</message>
<message>
- <location line="+16"/>
+ <location line="+25"/>
<source>Invalid amount</source>
<translation>Cuantía no válida</translation>
</message>
@@ -2720,7 +2941,7 @@ Si el archivo no existe, créelo con permisos owner-readable-only.</translation>
<translation>Cargando el índice de bloques...</translation>
</message>
<message>
- <location line="-45"/>
+ <location line="-59"/>
<source>Add a node to connect to and attempt to keep the connection open</source>
<translation>Añadir un nodo al que conectarse y tratar de mantener la conexión abierta</translation>
</message>
@@ -2730,22 +2951,17 @@ Si el archivo no existe, créelo con permisos owner-readable-only.</translation>
<translation>No es posible conectar con %s en este sistema. Probablemente Bitcoin ya está ejecutándose.</translation>
</message>
<message>
- <location line="+54"/>
- <source>Find peers using internet relay chat (default: 0)</source>
- <translation>Encontrar los pares utilizando Internet Relay Chat (predeterminado: 0)</translation>
- </message>
- <message>
- <location line="-2"/>
+ <location line="+68"/>
<source>Fee per KB to add to transactions you send</source>
<translation>Tarifa por KB que añadir a las transacciones que envíe</translation>
</message>
<message>
- <location line="+19"/>
+ <location line="+17"/>
<source>Loading wallet...</source>
<translation>Cargando monedero...</translation>
</message>
<message>
- <location line="-40"/>
+ <location line="-54"/>
<source>Cannot downgrade wallet</source>
<translation>No se puede rebajar el monedero</translation>
</message>
@@ -2760,27 +2976,27 @@ Si el archivo no existe, créelo con permisos owner-readable-only.</translation>
<translation>No se puede escribir la dirección predeterminada</translation>
</message>
<message>
- <location line="+49"/>
+ <location line="+64"/>
<source>Rescanning...</source>
<translation>Rescaneando...</translation>
</message>
<message>
- <location line="-43"/>
+ <location line="-56"/>
<source>Done loading</source>
<translation>Generado pero no aceptado</translation>
</message>
<message>
- <location line="+65"/>
+ <location line="+79"/>
<source>To use the %s option</source>
<translation>Para utilizar la opción %s</translation>
</message>
<message>
- <location line="-60"/>
+ <location line="-71"/>
<source>Error</source>
<translation>Error</translation>
</message>
<message>
- <location line="-28"/>
+ <location line="-33"/>
<source>You must set rpcpassword=&lt;password&gt; in the configuration file:
%s
If the file does not exist, create it with owner-readable-only file permissions.</source>
diff --git a/src/qt/locale/bitcoin_es_CL.ts b/src/qt/locale/bitcoin_es_CL.ts
index c7ce99eddd..290db3f305 100644
--- a/src/qt/locale/bitcoin_es_CL.ts
+++ b/src/qt/locale/bitcoin_es_CL.ts
@@ -13,12 +13,7 @@
<translation>&lt;b&gt;Bitcoin&lt;/b&gt; - versión </translation>
</message>
<message>
- <location line="+41"/>
- <source>Copyright © 2009-2012 The Bitcoin developers</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+13"/>
+ <location line="+57"/>
<source>
This is experimental software.
@@ -35,6 +30,16 @@ Este producto incluye software desarrollado por OpenSSL Project para su uso en
el OpenSSL Toolkit (http://www.openssl.org/), software criptográfico escrito por
Eric Young (eay@cryptsoft.com) y UPnP software escrito por Thomas Bernard.</translation>
</message>
+ <message>
+ <location filename="../aboutdialog.cpp" line="+17"/>
+ <source>Copyright</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>2009-%1 The Bitcoin developers</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>AddressBookPage</name>
@@ -109,17 +114,22 @@ Eric Young (eay@cryptsoft.com) y UPnP software escrito por Thomas Bernard.</tran
<translation>&amp;Borrar</translation>
</message>
<message>
- <location filename="../addressbookpage.cpp" line="+65"/>
+ <location filename="../addressbookpage.cpp" line="+66"/>
<source>Copy &amp;Label</source>
<translation>Copia &amp;etiqueta</translation>
</message>
<message>
- <location line="+2"/>
+ <location line="+1"/>
<source>&amp;Edit</source>
<translation>&amp;Editar</translation>
</message>
<message>
- <location line="+250"/>
+ <location line="+1"/>
+ <source>Send &amp;Coins</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+263"/>
<source>Export Address Book Data</source>
<translation>Exporta datos de la guia de direcciones</translation>
</message>
@@ -142,7 +152,7 @@ Eric Young (eay@cryptsoft.com) y UPnP software escrito por Thomas Bernard.</tran
<context>
<name>AddressTableModel</name>
<message>
- <location filename="../addresstablemodel.cpp" line="+142"/>
+ <location filename="../addresstablemodel.cpp" line="+144"/>
<source>Label</source>
<translation>Etiqueta</translation>
</message>
@@ -301,17 +311,17 @@ Eric Young (eay@cryptsoft.com) y UPnP software escrito por Thomas Bernard.</tran
<context>
<name>BitcoinGUI</name>
<message>
- <location filename="../bitcoingui.cpp" line="+267"/>
+ <location filename="../bitcoingui.cpp" line="+231"/>
<source>Sign &amp;message...</source>
<translation>Firmar &amp;Mensaje...</translation>
</message>
<message>
- <location line="+254"/>
+ <location line="+299"/>
<source>Synchronizing with network...</source>
<translation>Sincronizando con la red...</translation>
</message>
<message>
- <location line="-322"/>
+ <location line="-367"/>
<source>&amp;Overview</source>
<translation>&amp;Vista general</translation>
</message>
@@ -331,32 +341,17 @@ Eric Young (eay@cryptsoft.com) y UPnP software escrito por Thomas Bernard.</tran
<translation>Explora el historial de transacciónes</translation>
</message>
<message>
- <location line="+6"/>
- <source>&amp;Address Book</source>
- <translation>&amp;Guia de direcciónes</translation>
- </message>
- <message>
- <location line="+1"/>
+ <location line="+7"/>
<source>Edit the list of stored addresses and labels</source>
<translation>Edita la lista de direcciones y etiquetas almacenadas</translation>
</message>
<message>
- <location line="-15"/>
- <source>&amp;Receive coins</source>
- <translation>&amp;Recibir monedas</translation>
- </message>
- <message>
- <location line="+1"/>
+ <location line="-14"/>
<source>Show the list of addresses for receiving payments</source>
<translation>Muestra la lista de direcciónes utilizadas para recibir pagos</translation>
</message>
<message>
- <location line="-8"/>
- <source>&amp;Send coins</source>
- <translation>&amp;Envíar monedas</translation>
- </message>
- <message>
- <location line="+39"/>
+ <location line="+31"/>
<source>E&amp;xit</source>
<translation>&amp;Salir</translation>
</message>
@@ -401,7 +396,7 @@ Eric Young (eay@cryptsoft.com) y UPnP software escrito por Thomas Bernard.</tran
<translation>&amp;Cambiar la contraseña...</translation>
</message>
<message>
- <location line="+259"/>
+ <location line="+304"/>
<source>Importing blocks from disk...</source>
<translation type="unfinished"/>
</message>
@@ -410,13 +405,8 @@ Eric Young (eay@cryptsoft.com) y UPnP software escrito por Thomas Bernard.</tran
<source>Reindexing blocks on disk...</source>
<translation type="unfinished"/>
</message>
- <message numerus="yes">
- <location line="+10"/>
- <source>~%n block(s) remaining</source>
- <translation><numerusform>%n bloque restante</numerusform><numerusform>%n bloques restantes</numerusform></translation>
- </message>
<message>
- <location line="-265"/>
+ <location line="-300"/>
<source>&amp;Export...</source>
<translation>&amp;Exportar...</translation>
</message>
@@ -461,18 +451,33 @@ Eric Young (eay@cryptsoft.com) y UPnP software escrito por Thomas Bernard.</tran
<translation type="unfinished"/>
</message>
<message>
- <location line="-196"/>
- <location line="+538"/>
+ <location line="-162"/>
+ <location line="+540"/>
<source>Bitcoin</source>
<translation>Bitcoin</translation>
</message>
<message>
- <location line="-538"/>
+ <location line="-540"/>
<source>Wallet</source>
<translation>Cartera</translation>
</message>
<message>
- <location line="+176"/>
+ <location line="+99"/>
+ <source>&amp;Send</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+7"/>
+ <source>&amp;Receive</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+14"/>
+ <source>&amp;Addresses</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+22"/>
<source>&amp;About Bitcoin</source>
<translation>&amp;Sobre Bitcoin</translation>
</message>
@@ -533,97 +538,92 @@ Eric Young (eay@cryptsoft.com) y UPnP software escrito por Thomas Bernard.</tran
<translation>[red-de-pruebas]</translation>
</message>
<message>
- <location line="+63"/>
+ <location line="+47"/>
<source>Bitcoin client</source>
<translation>Cliente Bitcoin</translation>
</message>
<message numerus="yes">
- <location line="+79"/>
+ <location line="+140"/>
<source>%n active connection(s) to Bitcoin network</source>
<translation><numerusform>%n conexión activa hacia la red Bitcoin</numerusform><numerusform>%n conexiones activas hacia la red Bitcoin</numerusform></translation>
</message>
<message>
- <location line="+45"/>
- <source>Processed %1 of %2 blocks of transaction history (%3% done).</source>
+ <location line="+39"/>
+ <source>Processed %1 of %2 (estimated) blocks of transaction history.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+7"/>
+ <location line="+4"/>
<source>Processed %1 blocks of transaction history.</source>
<translation type="unfinished"/>
</message>
+ <message numerus="yes">
+ <location line="+20"/>
+ <source>%n hour(s)</source>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
+ <message numerus="yes">
+ <location line="+4"/>
+ <source>%n day(s)</source>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
+ <message numerus="yes">
+ <location line="+4"/>
+ <source>%n week(s)</source>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
<message>
- <location line="+70"/>
- <source>Error</source>
+ <location line="+5"/>
+ <source>%1 behind</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+3"/>
- <source>Warning</source>
+ <location line="+14"/>
+ <source>Last received block was generated %1 ago.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+3"/>
- <source>Information</source>
+ <location line="+2"/>
+ <source>Transactions after this will not yet be visible.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+66"/>
- <source>This transaction is over the size limit. You can still send it for a fee of %1, which goes to the nodes that process your transaction and helps to support the network. Do you want to pay the fee?</source>
+ <location line="+21"/>
+ <source>Error</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+210"/>
- <source>Backup Successful</source>
+ <location line="+3"/>
+ <source>Warning</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+0"/>
- <source>The wallet data was successfully saved to the new location.</source>
+ <location line="+3"/>
+ <source>Information</source>
<translation type="unfinished"/>
</message>
- <message numerus="yes">
- <location line="-338"/>
- <source>%n second(s) ago</source>
- <translation><numerusform>Hace %n segundo</numerusform><numerusform>Hace %n segundos</numerusform></translation>
- </message>
- <message numerus="yes">
- <location line="+4"/>
- <source>%n minute(s) ago</source>
- <translation><numerusform>Hace %n minuto</numerusform><numerusform>Hace %n minutos</numerusform></translation>
- </message>
- <message numerus="yes">
- <location line="+4"/>
- <source>%n hour(s) ago</source>
- <translation><numerusform>Hace %n hora</numerusform><numerusform>Hace %n horas</numerusform></translation>
- </message>
- <message numerus="yes">
- <location line="+4"/>
- <source>%n day(s) ago</source>
- <translation><numerusform>Hace %n día</numerusform><numerusform>Hace %n días</numerusform></translation>
+ <message>
+ <location line="+68"/>
+ <source>This transaction is over the size limit. You can still send it for a fee of %1, which goes to the nodes that process your transaction and helps to support the network. Do you want to pay the fee?</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location line="+6"/>
+ <location line="-138"/>
<source>Up to date</source>
<translation>Actualizado</translation>
</message>
<message>
- <location line="+7"/>
+ <location line="+32"/>
<source>Catching up...</source>
<translation>Recuperando...</translation>
</message>
<message>
- <location line="+10"/>
- <source>Last received block was generated %1.</source>
- <translation>El ultimo bloque recibido fue generado %1.</translation>
- </message>
- <message>
- <location line="+97"/>
+ <location line="+110"/>
<source>Confirm transaction fee</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+23"/>
+ <location line="+8"/>
<source>Sent transaction</source>
<translation>Transacción enviada</translation>
</message>
@@ -645,14 +645,14 @@ Tipo: %3
Dirección: %4</translation>
</message>
<message>
- <location line="+99"/>
- <location line="+28"/>
+ <location line="+33"/>
+ <location line="+23"/>
<source>URI handling</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-28"/>
- <location line="+28"/>
+ <location line="-23"/>
+ <location line="+23"/>
<source>URI can not be parsed! This can be caused by an invalid Bitcoin address or malformed URI parameters.</source>
<translation type="unfinished"/>
</message>
@@ -667,27 +667,7 @@ Dirección: %4</translation>
<translation>La billetera esta &lt;b&gt;codificada&lt;/b&gt; y actualmente &lt;b&gt;bloqueda&lt;/b&gt;</translation>
</message>
<message>
- <location line="+23"/>
- <source>Backup Wallet</source>
- <translation>Respaldar billetera</translation>
- </message>
- <message>
- <location line="+0"/>
- <source>Wallet Data (*.dat)</source>
- <translation>Datos de billetera (*.dat)</translation>
- </message>
- <message>
- <location line="+3"/>
- <source>Backup Failed</source>
- <translation>Ha fallado el respaldo</translation>
- </message>
- <message>
- <location line="+0"/>
- <source>There was an error trying to save the wallet data to the new location.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../bitcoin.cpp" line="+109"/>
+ <location filename="../bitcoin.cpp" line="+108"/>
<source>A fatal error occurred. Bitcoin can no longer continue safely and will quit.</source>
<translation type="unfinished"/>
</message>
@@ -695,7 +675,7 @@ Dirección: %4</translation>
<context>
<name>ClientModel</name>
<message>
- <location filename="../clientmodel.cpp" line="+86"/>
+ <location filename="../clientmodel.cpp" line="+96"/>
<source>Network Alert</source>
<translation type="unfinished"/>
</message>
@@ -728,7 +708,7 @@ Dirección: %4</translation>
<translation>La dirección asociada con esta entrada en la libreta de direcciones. Solo puede ser modificada para direcciónes de envío.</translation>
</message>
<message>
- <location filename="../editaddressdialog.cpp" line="+20"/>
+ <location filename="../editaddressdialog.cpp" line="+21"/>
<source>New receiving address</source>
<translation>Nueva dirección para recibir</translation>
</message>
@@ -748,17 +728,17 @@ Dirección: %4</translation>
<translation>Editar dirección de envio</translation>
</message>
<message>
- <location line="+60"/>
+ <location line="+76"/>
<source>The entered address &quot;%1&quot; is already in the address book.</source>
<translation>La dirección introducida &quot;%1&quot; ya esta guardada en la libreta de direcciones.</translation>
</message>
<message>
- <location line="+5"/>
+ <location line="-5"/>
<source>The entered address &quot;%1&quot; is not a valid Bitcoin address.</source>
<translation>La dirección introducida &quot;%1&quot; no es una dirección Bitcoin valida.</translation>
</message>
<message>
- <location line="+5"/>
+ <location line="+10"/>
<source>Could not unlock wallet.</source>
<translation>No se pudo desbloquear la billetera.</translation>
</message>
@@ -771,7 +751,7 @@ Dirección: %4</translation>
<context>
<name>GUIUtil::HelpMessageBox</name>
<message>
- <location filename="../guiutil.cpp" line="+419"/>
+ <location filename="../guiutil.cpp" line="+422"/>
<location line="+12"/>
<source>Bitcoin-Qt</source>
<translation type="unfinished"/>
@@ -986,7 +966,7 @@ Dirección: %4</translation>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../optionsdialog.cpp" line="+55"/>
+ <location filename="../optionsdialog.cpp" line="+53"/>
<source>default</source>
<translation type="unfinished"/>
</message>
@@ -1031,23 +1011,18 @@ Dirección: %4</translation>
<translation>Formulario</translation>
</message>
<message>
- <location line="+51"/>
- <location line="+183"/>
+ <location line="+50"/>
+ <location line="+166"/>
<source>The displayed information may be out of date. Your wallet automatically synchronizes with the Bitcoin network after a connection is established, but this process has not completed yet.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-141"/>
+ <location line="-124"/>
<source>Balance:</source>
<translation>Saldo:</translation>
</message>
<message>
- <location line="+58"/>
- <source>Number of transactions:</source>
- <translation>Numero de transacciones:</translation>
- </message>
- <message>
- <location line="-29"/>
+ <location line="+29"/>
<source>Unconfirmed:</source>
<translation>No confirmados:</translation>
</message>
@@ -1057,7 +1032,7 @@ Dirección: %4</translation>
<translation>Cartera</translation>
</message>
<message>
- <location line="+124"/>
+ <location line="+107"/>
<source>Immature:</source>
<translation type="unfinished"/>
</message>
@@ -1072,7 +1047,7 @@ Dirección: %4</translation>
<translation>&lt;b&gt;Transacciones recientes&lt;/b&gt;</translation>
</message>
<message>
- <location line="-118"/>
+ <location line="-101"/>
<source>Your current balance</source>
<translation>Tu saldo actual</translation>
</message>
@@ -1082,11 +1057,6 @@ Dirección: %4</translation>
<translation>Total de transacciones que no han sido confirmadas aun, y que no cuentan para el saldo actual.</translation>
</message>
<message>
- <location line="+20"/>
- <source>Total number of transactions in wallet</source>
- <translation>Número total de transacciones en la billetera</translation>
- </message>
- <message>
<location filename="../overviewpage.cpp" line="+115"/>
<location line="+1"/>
<source>out of sync</source>
@@ -1094,6 +1064,14 @@ Dirección: %4</translation>
</message>
</context>
<context>
+ <name>PaymentServer</name>
+ <message>
+ <location filename="../paymentserver.cpp" line="+107"/>
+ <source>Cannot start bitcoin: click-to-pay handler</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>QRCodeDialog</name>
<message>
<location filename="../forms/qrcodedialog.ui" line="+14"/>
@@ -1432,7 +1410,7 @@ Dirección: %4</translation>
</message>
<message>
<location line="+60"/>
- <location filename="../sendcoinsentry.cpp" line="+25"/>
+ <location filename="../sendcoinsentry.cpp" line="+26"/>
<source>Enter a label for this address to add it to your address book</source>
<translation>Introduce una etiqueta a esta dirección para añadirla a tu guia</translation>
</message>
@@ -1668,7 +1646,7 @@ Dirección: %4</translation>
<context>
<name>TransactionDesc</name>
<message>
- <location filename="../transactiondesc.cpp" line="+19"/>
+ <location filename="../transactiondesc.cpp" line="+20"/>
<source>Open until %1</source>
<translation>Abierto hasta %1</translation>
</message>
@@ -1855,7 +1833,7 @@ Dirección: %4</translation>
<context>
<name>TransactionTableModel</name>
<message>
- <location filename="../transactiontablemodel.cpp" line="+226"/>
+ <location filename="../transactiontablemodel.cpp" line="+225"/>
<source>Date</source>
<translation>Fecha</translation>
</message>
@@ -1973,7 +1951,7 @@ Dirección: %4</translation>
<context>
<name>TransactionView</name>
<message>
- <location filename="../transactionview.cpp" line="+55"/>
+ <location filename="../transactionview.cpp" line="+52"/>
<location line="+16"/>
<source>All</source>
<translation>Todo</translation>
@@ -2060,6 +2038,11 @@ Dirección: %4</translation>
</message>
<message>
<location line="+1"/>
+ <source>Copy transaction ID</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Edit label</source>
<translation>Edita etiqueta</translation>
</message>
@@ -2069,7 +2052,7 @@ Dirección: %4</translation>
<translation type="unfinished"/>
</message>
<message>
- <location line="+142"/>
+ <location line="+139"/>
<source>Export Transaction Data</source>
<translation>Exportar datos de transacción</translation>
</message>
@@ -2124,7 +2107,7 @@ Dirección: %4</translation>
<translation>No se pudo escribir en el archivo %1.</translation>
</message>
<message>
- <location line="+95"/>
+ <location line="+100"/>
<source>Range:</source>
<translation>Rango:</translation>
</message>
@@ -2135,31 +2118,174 @@ Dirección: %4</translation>
</message>
</context>
<context>
+ <name>WalletView</name>
+ <message>
+ <location filename="../walletview.cpp" line="+95"/>
+ <source>&amp;Overview</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Show general overview of wallet</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>&amp;Send coins</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Send coins to a Bitcoin address</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>&amp;Receive coins</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Show the list of addresses for receiving payments</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>&amp;Transactions</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Browse transaction history</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>&amp;Address Book</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Edit the list of stored addresses and labels</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+12"/>
+ <source>&amp;Encrypt Wallet...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Encrypt the private keys that belong to your wallet</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>&amp;Backup Wallet...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Backup wallet to another location</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>&amp;Change Passphrase...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Change the passphrase used for wallet encryption</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Sign &amp;message...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Sign messages with your Bitcoin addresses to prove you own them</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>&amp;Verify message...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Verify messages to ensure they were signed with specified Bitcoin addresses</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>&amp;Export...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Export the data in the current tab to a file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+180"/>
+ <source>Backup Wallet</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>Wallet Data (*.dat)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Backup Failed</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>There was an error trying to save the wallet data to the new location.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>Backup Successful</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>The wallet data was successfully saved to the new location.</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>bitcoin-core</name>
<message>
- <location filename="../bitcoinstrings.cpp" line="+88"/>
+ <location filename="../bitcoinstrings.cpp" line="+96"/>
<source>Bitcoin version</source>
<translation>Versión Bitcoin</translation>
</message>
<message>
- <location line="+82"/>
+ <location line="+98"/>
<source>Usage:</source>
<translation>Uso:</translation>
</message>
<message>
- <location line="-23"/>
+ <location line="-24"/>
<source>Send command to -server or bitcoind</source>
<translation>Envia comando a bitcoin lanzado con -server u bitcoind
</translation>
</message>
<message>
- <location line="-21"/>
+ <location line="-22"/>
<source>List commands</source>
<translation>Muestra comandos
</translation>
</message>
<message>
- <location line="-11"/>
+ <location line="-10"/>
<source>Get help for a command</source>
<translation>Recibir ayuda para un comando
</translation>
@@ -2189,13 +2315,13 @@ Dirección: %4</translation>
</translation>
</message>
<message>
- <location line="-15"/>
+ <location line="-28"/>
<source>Don&apos;t generate coins</source>
<translation>No generar monedas
</translation>
</message>
<message>
- <location line="+61"/>
+ <location line="+74"/>
<source>Specify data directory</source>
<translation>Especifica directorio para los datos
</translation>
@@ -2206,83 +2332,85 @@ Dirección: %4</translation>
<translation type="unfinished"/>
</message>
<message>
- <location line="-26"/>
+ <location line="-27"/>
<source>Listen for connections on &lt;port&gt; (default: 8333 or testnet: 18333)</source>
<translation>Escuchar por conecciones en &lt;puerto&gt; (Por defecto: 8333 o red de prueba: 18333)</translation>
</message>
<message>
- <location line="+4"/>
+ <location line="+5"/>
<source>Maintain at most &lt;n&gt; connections to peers (default: 125)</source>
<translation>Mantener al menos &lt;n&gt; conecciones por cliente (por defecto: 125) </translation>
</message>
<message>
- <location line="-34"/>
+ <location line="-49"/>
<source>Connect to a node to retrieve peer addresses, and disconnect</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+65"/>
+ <location line="+80"/>
<source>Specify your own public address</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+2"/>
+ <location line="+3"/>
<source>Threshold for disconnecting misbehaving peers (default: 100)</source>
<translation>Umbral de desconección de clientes con mal comportamiento (por defecto: 100)</translation>
</message>
<message>
- <location line="-114"/>
+ <location line="-132"/>
<source>Number of seconds to keep misbehaving peers from reconnecting (default: 86400)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-28"/>
+ <location line="-32"/>
<source>An error occurred while setting up the RPC port %u for listening on IPv4: %s</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+26"/>
+ <location line="+30"/>
<source>Listen for JSON-RPC connections on &lt;port&gt; (default: 8332 or testnet: 18332)</source>
<translation>Escucha conexiones JSON-RPC en el puerto &lt;port&gt; (predeterminado: 8332 or testnet: 18332)</translation>
</message>
<message>
- <location line="+34"/>
+ <location line="+36"/>
<source>Accept command line and JSON-RPC commands</source>
<translation>Aceptar comandos consola y JSON-RPC
</translation>
</message>
<message>
- <location line="+62"/>
+ <location line="+77"/>
<source>Run in the background as a daemon and accept commands</source>
<translation>Correr como demonio y acepta comandos
</translation>
</message>
<message>
- <location line="+31"/>
+ <location line="+32"/>
<source>Use the test network</source>
<translation>Usa la red de pruebas
</translation>
</message>
<message>
- <location line="-92"/>
+ <location line="-108"/>
<source>Accept connections from outside (default: 1 if no -proxy or -connect)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-74"/>
+ <location line="-82"/>
<source>%s, you must set a rpcpassword in the configuration file:
- %s
+%s
It is recommended you use the following random password:
rpcuser=bitcoinrpc
rpcpassword=%s
(you do not need to remember this password)
The username and password MUST NOT be the same.
If the file does not exist, create it with owner-readable-only file permissions.
+It is also recommended to set alertnotify so you are notified of problems;
+for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.com
</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+15"/>
+ <location line="+17"/>
<source>An error occurred while setting up the RPC port %u for listening on IPv6, falling back to IPv4: %s</source>
<translation type="unfinished"/>
</message>
@@ -2298,11 +2426,6 @@ If the file does not exist, create it with owner-readable-only file permissions.
</message>
<message>
<location line="+3"/>
- <source>Corrupted block database detected. Please restart the client with -reindex.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+2"/>
<source>Error initializing database environment %s! To recover, BACKUP THAT DIRECTORY, then remove everything from it except for wallet.dat.</source>
<translation type="unfinished"/>
</message>
@@ -2317,12 +2440,27 @@ If the file does not exist, create it with owner-readable-only file permissions.
<translation type="unfinished"/>
</message>
<message>
+ <location line="+3"/>
+ <source>Execute command when a relevant alert is received (%s in cmd is replaced by message)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Execute command when a wallet transaction changes (%s in cmd is replaced by TxID)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location line="+11"/>
<source>Set maximum size of high-priority/low-fee transactions in bytes (default: 27000)</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+3"/>
+ <source>Set the number of script verification threads (1-16, 0=auto, default: 0)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
<source>This is a pre-release test build - use at your own risk - do not use for mining or merchant applications</source>
<translation type="unfinished"/>
</message>
@@ -2369,16 +2507,41 @@ If the file does not exist, create it with owner-readable-only file permissions.
</message>
<message>
<location line="+3"/>
+ <source>Corrupted block database detected</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Discover own IP address (default: 1 when listening and no -externalip)</source>
<translation type="unfinished"/>
</message>
<message>
+ <location line="+1"/>
+ <source>Do you want to rebuild the block database now?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location line="+3"/>
+ <source>Error initializing block database</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Error initializing wallet database environment %s!</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Error loading block database</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+5"/>
+ <location line="+4"/>
+ <source>Error opening block database</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
<source>Error: Disk space is low!</source>
<translation type="unfinished"/>
</message>
@@ -2394,26 +2557,96 @@ If the file does not exist, create it with owner-readable-only file permissions.
</message>
<message>
<location line="+2"/>
+ <source>Error: system error: </source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Failed to listen on any port. Use -listen=0 if you want this.</source>
<translation type="unfinished"/>
</message>
<message>
+ <location line="+1"/>
+ <source>Failed to read block info</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Failed to read block</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Failed to sync block index</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Failed to write block index</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Failed to write block info</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Failed to write block</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Failed to write file info</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Failed to write to coin database</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Failed to write transaction index</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Failed to write undo data</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location line="+2"/>
<source>Find peers using DNS lookup (default: 1 unless -connect)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+5"/>
- <source>How thorough the block verification is (0-4, default: 3)</source>
+ <location line="+3"/>
+ <source>How many blocks to check at startup (default: 288, 0 = all)</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+1"/>
- <source>Importing blocks from block database...</source>
+ <source>How thorough the block verification is (0-4, default: 3)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+24"/>
+ <source>Rebuild block chain index from current blk000??.dat files</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+37"/>
+ <source>Verifying blocks...</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+1"/>
+ <source>Verifying wallet...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-61"/>
<source>Imports blocks from external blk000??.dat file</source>
<translation type="unfinished"/>
</message>
@@ -2428,7 +2661,12 @@ If the file does not exist, create it with owner-readable-only file permissions.
<translation>Dirección -tor invalida: &apos;%s&apos;</translation>
</message>
<message>
- <location line="+9"/>
+ <location line="+8"/>
+ <source>Maintain a full transaction index (default: 0)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
<source>Maximum per-connection receive buffer, &lt;n&gt;*1000 bytes (default: 5000)</source>
<translation type="unfinished"/>
</message>
@@ -2463,12 +2701,7 @@ If the file does not exist, create it with owner-readable-only file permissions.
<translation>Anteponer salida de depuracion con marca de tiempo</translation>
</message>
<message>
- <location line="+1"/>
- <source>Rebuild blockchain index from current blk000??.dat files</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+4"/>
+ <location line="+5"/>
<source>SSL options: (see the Bitcoin Wiki for SSL setup instructions)</source>
<translation>Opciones SSL: (ver la Bitcoin Wiki para instrucciones de configuración SSL)</translation>
</message>
@@ -2508,7 +2741,12 @@ If the file does not exist, create it with owner-readable-only file permissions.
<translation>Especifica tiempo de espera para conexion en milisegundos (predeterminado: 5000)</translation>
</message>
<message>
- <location line="+13"/>
+ <location line="+4"/>
+ <source>System error: </source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+10"/>
<source>Use UPnP to map the listening port (default: 0)</source>
<translation>Intenta usar UPnP para mapear el puerto de escucha (default: 0)</translation>
</message>
@@ -2540,39 +2778,44 @@ If the file does not exist, create it with owner-readable-only file permissions.
</message>
<message>
<location line="+1"/>
+ <source>You need to rebuild the databases using -reindex to change -txindex</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>wallet.dat corrupt, salvage failed</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-43"/>
+ <location line="-45"/>
<source>Password for JSON-RPC connections</source>
<translation>Contraseña para las conexiones JSON-RPC
</translation>
</message>
<message>
- <location line="-53"/>
+ <location line="-68"/>
<source>Allow JSON-RPC connections from specified IP address</source>
<translation>Permite conexiones JSON-RPC desde la dirección IP especificada
</translation>
</message>
<message>
- <location line="+62"/>
+ <location line="+77"/>
<source>Send commands to node running on &lt;ip&gt; (default: 127.0.0.1)</source>
<translation>Envia comando al nodo situado en &lt;ip&gt; (predeterminado: 127.0.0.1)
</translation>
</message>
<message>
- <location line="-103"/>
+ <location line="-120"/>
<source>Execute command when the best block changes (%s in cmd is replaced by block hash)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+124"/>
+ <location line="+142"/>
<source>Upgrade wallet to latest format</source>
<translation>Actualizar billetera al formato actual</translation>
</message>
<message>
- <location line="-15"/>
+ <location line="-16"/>
<source>Set key pool size to &lt;n&gt; (default: 100)</source>
<translation>Ajusta el numero de claves en reserva &lt;n&gt; (predeterminado: 100)
</translation>
@@ -2584,18 +2827,13 @@ If the file does not exist, create it with owner-readable-only file permissions.
</translation>
</message>
<message>
- <location line="-26"/>
- <source>How many blocks to check at startup (default: 2500, 0 = all)</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+55"/>
+ <location line="+30"/>
<source>Use OpenSSL (https) for JSON-RPC connections</source>
<translation>Usa OpenSSL (https) para las conexiones JSON-RPC
</translation>
</message>
<message>
- <location line="-20"/>
+ <location line="-21"/>
<source>Server certificate file (default: server.cert)</source>
<translation>Certificado del servidor (Predeterminado: server.cert)
</translation>
@@ -2607,13 +2845,13 @@ If the file does not exist, create it with owner-readable-only file permissions.
</translation>
</message>
<message>
- <location line="-133"/>
+ <location line="-154"/>
<source>Acceptable ciphers (default: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH)</source>
<translation>Cifrados aceptados (Predeterminado: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH)
</translation>
</message>
<message>
- <location line="+144"/>
+ <location line="+166"/>
<source>This help message</source>
<translation>Este mensaje de ayuda
</translation>
@@ -2624,7 +2862,7 @@ If the file does not exist, create it with owner-readable-only file permissions.
<translation>No es posible escuchar en el %s en este ordenador (bind returned error %d, %s)</translation>
</message>
<message>
- <location line="-70"/>
+ <location line="-86"/>
<source>Connect through socks proxy</source>
<translation>Conecta mediante proxy socks</translation>
</message>
@@ -2635,12 +2873,12 @@ If the file does not exist, create it with owner-readable-only file permissions.
</translation>
</message>
<message>
- <location line="+43"/>
+ <location line="+57"/>
<source>Loading addresses...</source>
<translation>Cargando direcciónes...</translation>
</message>
<message>
- <location line="-25"/>
+ <location line="-35"/>
<source>Error loading wallet.dat: Wallet corrupted</source>
<translation>Error cargando wallet.dat: Billetera corrupta</translation>
</message>
@@ -2650,32 +2888,22 @@ If the file does not exist, create it with owner-readable-only file permissions.
<translation>Error cargando wallet.dat: Billetera necesita una vercion reciente de Bitcoin</translation>
</message>
<message>
- <location line="+73"/>
- <source>Verifying block database integrity...</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+1"/>
- <source>Verifying wallet integrity...</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+1"/>
+ <location line="+87"/>
<source>Wallet needed to be rewritten: restart Bitcoin to complete</source>
<translation>La billetera necesita ser reescrita: reinicie Bitcoin para completar</translation>
</message>
<message>
- <location line="-77"/>
+ <location line="-89"/>
<source>Error loading wallet.dat</source>
<translation>Error cargando wallet.dat</translation>
</message>
<message>
- <location line="+20"/>
+ <location line="+30"/>
<source>Invalid -proxy address: &apos;%s&apos;</source>
<translation>Dirección -proxy invalida: &apos;%s&apos;</translation>
</message>
<message>
- <location line="+46"/>
+ <location line="+48"/>
<source>Unknown network specified in -onlynet: &apos;%s&apos;</source>
<translation type="unfinished"/>
</message>
@@ -2685,7 +2913,7 @@ If the file does not exist, create it with owner-readable-only file permissions.
<translation type="unfinished"/>
</message>
<message>
- <location line="-75"/>
+ <location line="-91"/>
<source>Cannot resolve -bind address: &apos;%s&apos;</source>
<translation type="unfinished"/>
</message>
@@ -2695,17 +2923,17 @@ If the file does not exist, create it with owner-readable-only file permissions.
<translation type="unfinished"/>
</message>
<message>
- <location line="+31"/>
+ <location line="+45"/>
<source>Invalid amount for -paytxfee=&lt;amount&gt;: &apos;%s&apos;</source>
<translation>Cantidad inválida para -paytxfee=&lt;amount&gt;: &apos;%s&apos;</translation>
</message>
<message>
- <location line="-15"/>
+ <location line="-24"/>
<source>Error: could not start node</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+16"/>
+ <location line="+25"/>
<source>Invalid amount</source>
<translation>Cantidad inválida</translation>
</message>
@@ -2720,7 +2948,7 @@ If the file does not exist, create it with owner-readable-only file permissions.
<translation>Cargando el index de bloques...</translation>
</message>
<message>
- <location line="-45"/>
+ <location line="-59"/>
<source>Add a node to connect to and attempt to keep the connection open</source>
<translation>Agrega un nodo para conectarse and attempt to keep the connection open</translation>
</message>
@@ -2730,22 +2958,17 @@ If the file does not exist, create it with owner-readable-only file permissions.
<translation>No es posible escuchar en el %s en este ordenador. Probablemente Bitcoin ya se está ejecutando.</translation>
</message>
<message>
- <location line="+54"/>
- <source>Find peers using internet relay chat (default: 0)</source>
- <translation>Buscar pares usando &apos;internet relay chat (IRC)&apos; (predeterminado: 0)</translation>
- </message>
- <message>
- <location line="-2"/>
+ <location line="+68"/>
<source>Fee per KB to add to transactions you send</source>
<translation>Comisión por kB para adicionarla a las transacciones enviadas</translation>
</message>
<message>
- <location line="+19"/>
+ <location line="+17"/>
<source>Loading wallet...</source>
<translation>Cargando cartera...</translation>
</message>
<message>
- <location line="-40"/>
+ <location line="-54"/>
<source>Cannot downgrade wallet</source>
<translation type="unfinished"/>
</message>
@@ -2760,27 +2983,27 @@ If the file does not exist, create it with owner-readable-only file permissions.
<translation type="unfinished"/>
</message>
<message>
- <location line="+49"/>
+ <location line="+64"/>
<source>Rescanning...</source>
<translation>Rescaneando...</translation>
</message>
<message>
- <location line="-43"/>
+ <location line="-56"/>
<source>Done loading</source>
<translation>Carga completa</translation>
</message>
<message>
- <location line="+65"/>
+ <location line="+79"/>
<source>To use the %s option</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-60"/>
+ <location line="-71"/>
<source>Error</source>
<translation>Error</translation>
</message>
<message>
- <location line="-28"/>
+ <location line="-33"/>
<source>You must set rpcpassword=&lt;password&gt; in the configuration file:
%s
If the file does not exist, create it with owner-readable-only file permissions.</source>
diff --git a/src/qt/locale/bitcoin_et.ts b/src/qt/locale/bitcoin_et.ts
index b75e617c03..efe3cb500f 100644
--- a/src/qt/locale/bitcoin_et.ts
+++ b/src/qt/locale/bitcoin_et.ts
@@ -13,12 +13,7 @@
<translation type="unfinished"/>
</message>
<message>
- <location line="+41"/>
- <source>Copyright © 2009-2012 The Bitcoin developers</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+13"/>
+ <location line="+57"/>
<source>
This is experimental software.
@@ -27,6 +22,16 @@ Distributed under the MIT/X11 software license, see the accompanying file COPYIN
This product includes software developed by the OpenSSL Project for use in the OpenSSL Toolkit (http://www.openssl.org/) and cryptographic software written by Eric Young (eay@cryptsoft.com) and UPnP software written by Thomas Bernard.</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../aboutdialog.cpp" line="+17"/>
+ <source>Copyright</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>2009-%1 The Bitcoin developers</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>AddressBookPage</name>
@@ -101,17 +106,22 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation>&amp;Kustuta</translation>
</message>
<message>
- <location filename="../addressbookpage.cpp" line="+65"/>
+ <location filename="../addressbookpage.cpp" line="+66"/>
<source>Copy &amp;Label</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+2"/>
+ <location line="+1"/>
<source>&amp;Edit</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+250"/>
+ <location line="+1"/>
+ <source>Send &amp;Coins</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+263"/>
<source>Export Address Book Data</source>
<translation type="unfinished"/>
</message>
@@ -134,7 +144,7 @@ This product includes software developed by the OpenSSL Project for use in the O
<context>
<name>AddressTableModel</name>
<message>
- <location filename="../addresstablemodel.cpp" line="+142"/>
+ <location filename="../addresstablemodel.cpp" line="+144"/>
<source>Label</source>
<translation>Silt</translation>
</message>
@@ -293,17 +303,17 @@ This product includes software developed by the OpenSSL Project for use in the O
<context>
<name>BitcoinGUI</name>
<message>
- <location filename="../bitcoingui.cpp" line="+267"/>
+ <location filename="../bitcoingui.cpp" line="+231"/>
<source>Sign &amp;message...</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+254"/>
+ <location line="+299"/>
<source>Synchronizing with network...</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-322"/>
+ <location line="-367"/>
<source>&amp;Overview</source>
<translation>&amp;Ãœlevaade</translation>
</message>
@@ -323,32 +333,17 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation>Sirvi tehingute ajalugu</translation>
</message>
<message>
- <location line="+6"/>
- <source>&amp;Address Book</source>
- <translation>&amp;Aadressiraamat</translation>
- </message>
- <message>
- <location line="+1"/>
+ <location line="+7"/>
<source>Edit the list of stored addresses and labels</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-15"/>
- <source>&amp;Receive coins</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+1"/>
+ <location line="-14"/>
<source>Show the list of addresses for receiving payments</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-8"/>
- <source>&amp;Send coins</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+39"/>
+ <location line="+31"/>
<source>E&amp;xit</source>
<translation type="unfinished"/>
</message>
@@ -393,7 +388,7 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation type="unfinished"/>
</message>
<message>
- <location line="+259"/>
+ <location line="+304"/>
<source>Importing blocks from disk...</source>
<translation type="unfinished"/>
</message>
@@ -402,13 +397,8 @@ This product includes software developed by the OpenSSL Project for use in the O
<source>Reindexing blocks on disk...</source>
<translation type="unfinished"/>
</message>
- <message numerus="yes">
- <location line="+10"/>
- <source>~%n block(s) remaining</source>
- <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
- </message>
<message>
- <location line="-265"/>
+ <location line="-300"/>
<source>&amp;Export...</source>
<translation>&amp;Ekspordi...</translation>
</message>
@@ -453,18 +443,33 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation type="unfinished"/>
</message>
<message>
- <location line="-196"/>
- <location line="+538"/>
+ <location line="-162"/>
+ <location line="+540"/>
<source>Bitcoin</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-538"/>
+ <location line="-540"/>
<source>Wallet</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+176"/>
+ <location line="+99"/>
+ <source>&amp;Send</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+7"/>
+ <source>&amp;Receive</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+14"/>
+ <source>&amp;Addresses</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+22"/>
<source>&amp;About Bitcoin</source>
<translation type="unfinished"/>
</message>
@@ -525,97 +530,92 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation type="unfinished"/>
</message>
<message>
- <location line="+63"/>
+ <location line="+47"/>
<source>Bitcoin client</source>
<translation type="unfinished"/>
</message>
<message numerus="yes">
- <location line="+79"/>
+ <location line="+140"/>
<source>%n active connection(s) to Bitcoin network</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message>
- <location line="+45"/>
- <source>Processed %1 of %2 blocks of transaction history (%3% done).</source>
+ <location line="+39"/>
+ <source>Processed %1 of %2 (estimated) blocks of transaction history.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+7"/>
+ <location line="+4"/>
<source>Processed %1 blocks of transaction history.</source>
<translation type="unfinished"/>
</message>
+ <message numerus="yes">
+ <location line="+20"/>
+ <source>%n hour(s)</source>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
+ <message numerus="yes">
+ <location line="+4"/>
+ <source>%n day(s)</source>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
+ <message numerus="yes">
+ <location line="+4"/>
+ <source>%n week(s)</source>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
<message>
- <location line="+70"/>
- <source>Error</source>
+ <location line="+5"/>
+ <source>%1 behind</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+3"/>
- <source>Warning</source>
+ <location line="+14"/>
+ <source>Last received block was generated %1 ago.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+3"/>
- <source>Information</source>
+ <location line="+2"/>
+ <source>Transactions after this will not yet be visible.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+66"/>
- <source>This transaction is over the size limit. You can still send it for a fee of %1, which goes to the nodes that process your transaction and helps to support the network. Do you want to pay the fee?</source>
+ <location line="+21"/>
+ <source>Error</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+210"/>
- <source>Backup Successful</source>
+ <location line="+3"/>
+ <source>Warning</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+0"/>
- <source>The wallet data was successfully saved to the new location.</source>
+ <location line="+3"/>
+ <source>Information</source>
<translation type="unfinished"/>
</message>
- <message numerus="yes">
- <location line="-338"/>
- <source>%n second(s) ago</source>
- <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
- </message>
- <message numerus="yes">
- <location line="+4"/>
- <source>%n minute(s) ago</source>
- <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
- </message>
- <message numerus="yes">
- <location line="+4"/>
- <source>%n hour(s) ago</source>
- <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
- </message>
- <message numerus="yes">
- <location line="+4"/>
- <source>%n day(s) ago</source>
- <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
- </message>
<message>
- <location line="+6"/>
- <source>Up to date</source>
+ <location line="+68"/>
+ <source>This transaction is over the size limit. You can still send it for a fee of %1, which goes to the nodes that process your transaction and helps to support the network. Do you want to pay the fee?</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+7"/>
- <source>Catching up...</source>
+ <location line="-138"/>
+ <source>Up to date</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+10"/>
- <source>Last received block was generated %1.</source>
+ <location line="+32"/>
+ <source>Catching up...</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+97"/>
+ <location line="+110"/>
<source>Confirm transaction fee</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+23"/>
+ <location line="+8"/>
<source>Sent transaction</source>
<translation type="unfinished"/>
</message>
@@ -634,14 +634,14 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+99"/>
- <location line="+28"/>
+ <location line="+33"/>
+ <location line="+23"/>
<source>URI handling</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-28"/>
- <location line="+28"/>
+ <location line="-23"/>
+ <location line="+23"/>
<source>URI can not be parsed! This can be caused by an invalid Bitcoin address or malformed URI parameters.</source>
<translation type="unfinished"/>
</message>
@@ -656,27 +656,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+23"/>
- <source>Backup Wallet</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+0"/>
- <source>Wallet Data (*.dat)</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+3"/>
- <source>Backup Failed</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+0"/>
- <source>There was an error trying to save the wallet data to the new location.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../bitcoin.cpp" line="+109"/>
+ <location filename="../bitcoin.cpp" line="+108"/>
<source>A fatal error occurred. Bitcoin can no longer continue safely and will quit.</source>
<translation type="unfinished"/>
</message>
@@ -684,7 +664,7 @@ Address: %4
<context>
<name>ClientModel</name>
<message>
- <location filename="../clientmodel.cpp" line="+86"/>
+ <location filename="../clientmodel.cpp" line="+96"/>
<source>Network Alert</source>
<translation type="unfinished"/>
</message>
@@ -717,7 +697,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location filename="../editaddressdialog.cpp" line="+20"/>
+ <location filename="../editaddressdialog.cpp" line="+21"/>
<source>New receiving address</source>
<translation type="unfinished"/>
</message>
@@ -737,17 +717,17 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+60"/>
+ <location line="+76"/>
<source>The entered address &quot;%1&quot; is already in the address book.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+5"/>
+ <location line="-5"/>
<source>The entered address &quot;%1&quot; is not a valid Bitcoin address.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+5"/>
+ <location line="+10"/>
<source>Could not unlock wallet.</source>
<translation type="unfinished"/>
</message>
@@ -760,7 +740,7 @@ Address: %4
<context>
<name>GUIUtil::HelpMessageBox</name>
<message>
- <location filename="../guiutil.cpp" line="+419"/>
+ <location filename="../guiutil.cpp" line="+422"/>
<location line="+12"/>
<source>Bitcoin-Qt</source>
<translation type="unfinished"/>
@@ -974,7 +954,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location filename="../optionsdialog.cpp" line="+55"/>
+ <location filename="../optionsdialog.cpp" line="+53"/>
<source>default</source>
<translation type="unfinished"/>
</message>
@@ -1019,23 +999,18 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+51"/>
- <location line="+183"/>
+ <location line="+50"/>
+ <location line="+166"/>
<source>The displayed information may be out of date. Your wallet automatically synchronizes with the Bitcoin network after a connection is established, but this process has not completed yet.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-141"/>
+ <location line="-124"/>
<source>Balance:</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+58"/>
- <source>Number of transactions:</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="-29"/>
+ <location line="+29"/>
<source>Unconfirmed:</source>
<translation type="unfinished"/>
</message>
@@ -1045,7 +1020,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+124"/>
+ <location line="+107"/>
<source>Immature:</source>
<translation type="unfinished"/>
</message>
@@ -1060,7 +1035,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="-118"/>
+ <location line="-101"/>
<source>Your current balance</source>
<translation type="unfinished"/>
</message>
@@ -1070,11 +1045,6 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+20"/>
- <source>Total number of transactions in wallet</source>
- <translation type="unfinished"/>
- </message>
- <message>
<location filename="../overviewpage.cpp" line="+115"/>
<location line="+1"/>
<source>out of sync</source>
@@ -1082,6 +1052,14 @@ Address: %4
</message>
</context>
<context>
+ <name>PaymentServer</name>
+ <message>
+ <location filename="../paymentserver.cpp" line="+107"/>
+ <source>Cannot start bitcoin: click-to-pay handler</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>QRCodeDialog</name>
<message>
<location filename="../forms/qrcodedialog.ui" line="+14"/>
@@ -1420,7 +1398,7 @@ Address: %4
</message>
<message>
<location line="+60"/>
- <location filename="../sendcoinsentry.cpp" line="+25"/>
+ <location filename="../sendcoinsentry.cpp" line="+26"/>
<source>Enter a label for this address to add it to your address book</source>
<translation type="unfinished"/>
</message>
@@ -1656,7 +1634,7 @@ Address: %4
<context>
<name>TransactionDesc</name>
<message>
- <location filename="../transactiondesc.cpp" line="+19"/>
+ <location filename="../transactiondesc.cpp" line="+20"/>
<source>Open until %1</source>
<translation type="unfinished"/>
</message>
@@ -1843,7 +1821,7 @@ Address: %4
<context>
<name>TransactionTableModel</name>
<message>
- <location filename="../transactiontablemodel.cpp" line="+226"/>
+ <location filename="../transactiontablemodel.cpp" line="+225"/>
<source>Date</source>
<translation>Kuupäev</translation>
</message>
@@ -1961,7 +1939,7 @@ Address: %4
<context>
<name>TransactionView</name>
<message>
- <location filename="../transactionview.cpp" line="+55"/>
+ <location filename="../transactionview.cpp" line="+52"/>
<location line="+16"/>
<source>All</source>
<translation type="unfinished"/>
@@ -2048,6 +2026,11 @@ Address: %4
</message>
<message>
<location line="+1"/>
+ <source>Copy transaction ID</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Edit label</source>
<translation type="unfinished"/>
</message>
@@ -2057,7 +2040,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+142"/>
+ <location line="+139"/>
<source>Export Transaction Data</source>
<translation type="unfinished"/>
</message>
@@ -2112,7 +2095,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+95"/>
+ <location line="+100"/>
<source>Range:</source>
<translation type="unfinished"/>
</message>
@@ -2123,29 +2106,172 @@ Address: %4
</message>
</context>
<context>
+ <name>WalletView</name>
+ <message>
+ <location filename="../walletview.cpp" line="+95"/>
+ <source>&amp;Overview</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Show general overview of wallet</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>&amp;Send coins</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Send coins to a Bitcoin address</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>&amp;Receive coins</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Show the list of addresses for receiving payments</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>&amp;Transactions</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Browse transaction history</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>&amp;Address Book</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Edit the list of stored addresses and labels</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+12"/>
+ <source>&amp;Encrypt Wallet...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Encrypt the private keys that belong to your wallet</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>&amp;Backup Wallet...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Backup wallet to another location</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>&amp;Change Passphrase...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Change the passphrase used for wallet encryption</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Sign &amp;message...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Sign messages with your Bitcoin addresses to prove you own them</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>&amp;Verify message...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Verify messages to ensure they were signed with specified Bitcoin addresses</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>&amp;Export...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Export the data in the current tab to a file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+180"/>
+ <source>Backup Wallet</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>Wallet Data (*.dat)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Backup Failed</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>There was an error trying to save the wallet data to the new location.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>Backup Successful</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>The wallet data was successfully saved to the new location.</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>bitcoin-core</name>
<message>
- <location filename="../bitcoinstrings.cpp" line="+88"/>
+ <location filename="../bitcoinstrings.cpp" line="+96"/>
<source>Bitcoin version</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+82"/>
+ <location line="+98"/>
<source>Usage:</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-23"/>
+ <location line="-24"/>
<source>Send command to -server or bitcoind</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-21"/>
+ <location line="-22"/>
<source>List commands</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-11"/>
+ <location line="-10"/>
<source>Get help for a command</source>
<translation type="unfinished"/>
</message>
@@ -2170,12 +2296,12 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="-15"/>
+ <location line="-28"/>
<source>Don&apos;t generate coins</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+61"/>
+ <location line="+74"/>
<source>Specify data directory</source>
<translation type="unfinished"/>
</message>
@@ -2185,80 +2311,82 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="-26"/>
+ <location line="-27"/>
<source>Listen for connections on &lt;port&gt; (default: 8333 or testnet: 18333)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+4"/>
+ <location line="+5"/>
<source>Maintain at most &lt;n&gt; connections to peers (default: 125)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-34"/>
+ <location line="-49"/>
<source>Connect to a node to retrieve peer addresses, and disconnect</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+65"/>
+ <location line="+80"/>
<source>Specify your own public address</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+2"/>
+ <location line="+3"/>
<source>Threshold for disconnecting misbehaving peers (default: 100)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-114"/>
+ <location line="-132"/>
<source>Number of seconds to keep misbehaving peers from reconnecting (default: 86400)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-28"/>
+ <location line="-32"/>
<source>An error occurred while setting up the RPC port %u for listening on IPv4: %s</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+26"/>
+ <location line="+30"/>
<source>Listen for JSON-RPC connections on &lt;port&gt; (default: 8332 or testnet: 18332)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+34"/>
+ <location line="+36"/>
<source>Accept command line and JSON-RPC commands</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+62"/>
+ <location line="+77"/>
<source>Run in the background as a daemon and accept commands</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+31"/>
+ <location line="+32"/>
<source>Use the test network</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-92"/>
+ <location line="-108"/>
<source>Accept connections from outside (default: 1 if no -proxy or -connect)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-74"/>
+ <location line="-82"/>
<source>%s, you must set a rpcpassword in the configuration file:
- %s
+%s
It is recommended you use the following random password:
rpcuser=bitcoinrpc
rpcpassword=%s
(you do not need to remember this password)
The username and password MUST NOT be the same.
If the file does not exist, create it with owner-readable-only file permissions.
+It is also recommended to set alertnotify so you are notified of problems;
+for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.com
</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+15"/>
+ <location line="+17"/>
<source>An error occurred while setting up the RPC port %u for listening on IPv6, falling back to IPv4: %s</source>
<translation type="unfinished"/>
</message>
@@ -2274,11 +2402,6 @@ If the file does not exist, create it with owner-readable-only file permissions.
</message>
<message>
<location line="+3"/>
- <source>Corrupted block database detected. Please restart the client with -reindex.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+2"/>
<source>Error initializing database environment %s! To recover, BACKUP THAT DIRECTORY, then remove everything from it except for wallet.dat.</source>
<translation type="unfinished"/>
</message>
@@ -2293,12 +2416,27 @@ If the file does not exist, create it with owner-readable-only file permissions.
<translation type="unfinished"/>
</message>
<message>
+ <location line="+3"/>
+ <source>Execute command when a relevant alert is received (%s in cmd is replaced by message)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Execute command when a wallet transaction changes (%s in cmd is replaced by TxID)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location line="+11"/>
<source>Set maximum size of high-priority/low-fee transactions in bytes (default: 27000)</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+3"/>
+ <source>Set the number of script verification threads (1-16, 0=auto, default: 0)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
<source>This is a pre-release test build - use at your own risk - do not use for mining or merchant applications</source>
<translation type="unfinished"/>
</message>
@@ -2344,16 +2482,41 @@ If the file does not exist, create it with owner-readable-only file permissions.
</message>
<message>
<location line="+3"/>
+ <source>Corrupted block database detected</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Discover own IP address (default: 1 when listening and no -externalip)</source>
<translation type="unfinished"/>
</message>
<message>
+ <location line="+1"/>
+ <source>Do you want to rebuild the block database now?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location line="+3"/>
+ <source>Error initializing block database</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Error initializing wallet database environment %s!</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Error loading block database</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+5"/>
+ <location line="+4"/>
+ <source>Error opening block database</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
<source>Error: Disk space is low!</source>
<translation type="unfinished"/>
</message>
@@ -2369,26 +2532,96 @@ If the file does not exist, create it with owner-readable-only file permissions.
</message>
<message>
<location line="+2"/>
+ <source>Error: system error: </source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Failed to listen on any port. Use -listen=0 if you want this.</source>
<translation type="unfinished"/>
</message>
<message>
+ <location line="+1"/>
+ <source>Failed to read block info</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Failed to read block</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Failed to sync block index</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Failed to write block index</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Failed to write block info</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Failed to write block</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Failed to write file info</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Failed to write to coin database</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Failed to write transaction index</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Failed to write undo data</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location line="+2"/>
<source>Find peers using DNS lookup (default: 1 unless -connect)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+5"/>
- <source>How thorough the block verification is (0-4, default: 3)</source>
+ <location line="+3"/>
+ <source>How many blocks to check at startup (default: 288, 0 = all)</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+1"/>
- <source>Importing blocks from block database...</source>
+ <source>How thorough the block verification is (0-4, default: 3)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+24"/>
+ <source>Rebuild block chain index from current blk000??.dat files</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+37"/>
+ <source>Verifying blocks...</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+1"/>
+ <source>Verifying wallet...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-61"/>
<source>Imports blocks from external blk000??.dat file</source>
<translation type="unfinished"/>
</message>
@@ -2403,7 +2636,12 @@ If the file does not exist, create it with owner-readable-only file permissions.
<translation type="unfinished"/>
</message>
<message>
- <location line="+9"/>
+ <location line="+8"/>
+ <source>Maintain a full transaction index (default: 0)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
<source>Maximum per-connection receive buffer, &lt;n&gt;*1000 bytes (default: 5000)</source>
<translation type="unfinished"/>
</message>
@@ -2438,12 +2676,7 @@ If the file does not exist, create it with owner-readable-only file permissions.
<translation type="unfinished"/>
</message>
<message>
- <location line="+1"/>
- <source>Rebuild blockchain index from current blk000??.dat files</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+4"/>
+ <location line="+5"/>
<source>SSL options: (see the Bitcoin Wiki for SSL setup instructions)</source>
<translation type="unfinished"/>
</message>
@@ -2483,7 +2716,12 @@ If the file does not exist, create it with owner-readable-only file permissions.
<translation type="unfinished"/>
</message>
<message>
- <location line="+13"/>
+ <location line="+4"/>
+ <source>System error: </source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+10"/>
<source>Use UPnP to map the listening port (default: 0)</source>
<translation type="unfinished"/>
</message>
@@ -2514,36 +2752,41 @@ If the file does not exist, create it with owner-readable-only file permissions.
</message>
<message>
<location line="+1"/>
+ <source>You need to rebuild the databases using -reindex to change -txindex</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>wallet.dat corrupt, salvage failed</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-43"/>
+ <location line="-45"/>
<source>Password for JSON-RPC connections</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-53"/>
+ <location line="-68"/>
<source>Allow JSON-RPC connections from specified IP address</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+62"/>
+ <location line="+77"/>
<source>Send commands to node running on &lt;ip&gt; (default: 127.0.0.1)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-103"/>
+ <location line="-120"/>
<source>Execute command when the best block changes (%s in cmd is replaced by block hash)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+124"/>
+ <location line="+142"/>
<source>Upgrade wallet to latest format</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-15"/>
+ <location line="-16"/>
<source>Set key pool size to &lt;n&gt; (default: 100)</source>
<translation type="unfinished"/>
</message>
@@ -2553,17 +2796,12 @@ If the file does not exist, create it with owner-readable-only file permissions.
<translation type="unfinished"/>
</message>
<message>
- <location line="-26"/>
- <source>How many blocks to check at startup (default: 2500, 0 = all)</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+55"/>
+ <location line="+30"/>
<source>Use OpenSSL (https) for JSON-RPC connections</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-20"/>
+ <location line="-21"/>
<source>Server certificate file (default: server.cert)</source>
<translation type="unfinished"/>
</message>
@@ -2573,12 +2811,12 @@ If the file does not exist, create it with owner-readable-only file permissions.
<translation type="unfinished"/>
</message>
<message>
- <location line="-133"/>
+ <location line="-154"/>
<source>Acceptable ciphers (default: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+144"/>
+ <location line="+166"/>
<source>This help message</source>
<translation type="unfinished"/>
</message>
@@ -2588,7 +2826,7 @@ If the file does not exist, create it with owner-readable-only file permissions.
<translation type="unfinished"/>
</message>
<message>
- <location line="-70"/>
+ <location line="-86"/>
<source>Connect through socks proxy</source>
<translation type="unfinished"/>
</message>
@@ -2598,12 +2836,12 @@ If the file does not exist, create it with owner-readable-only file permissions.
<translation type="unfinished"/>
</message>
<message>
- <location line="+43"/>
+ <location line="+57"/>
<source>Loading addresses...</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-25"/>
+ <location line="-35"/>
<source>Error loading wallet.dat: Wallet corrupted</source>
<translation type="unfinished"/>
</message>
@@ -2613,32 +2851,22 @@ If the file does not exist, create it with owner-readable-only file permissions.
<translation type="unfinished"/>
</message>
<message>
- <location line="+73"/>
- <source>Verifying block database integrity...</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+1"/>
- <source>Verifying wallet integrity...</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+1"/>
+ <location line="+87"/>
<source>Wallet needed to be rewritten: restart Bitcoin to complete</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-77"/>
+ <location line="-89"/>
<source>Error loading wallet.dat</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+20"/>
+ <location line="+30"/>
<source>Invalid -proxy address: &apos;%s&apos;</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+46"/>
+ <location line="+48"/>
<source>Unknown network specified in -onlynet: &apos;%s&apos;</source>
<translation type="unfinished"/>
</message>
@@ -2648,7 +2876,7 @@ If the file does not exist, create it with owner-readable-only file permissions.
<translation type="unfinished"/>
</message>
<message>
- <location line="-75"/>
+ <location line="-91"/>
<source>Cannot resolve -bind address: &apos;%s&apos;</source>
<translation type="unfinished"/>
</message>
@@ -2658,17 +2886,17 @@ If the file does not exist, create it with owner-readable-only file permissions.
<translation type="unfinished"/>
</message>
<message>
- <location line="+31"/>
+ <location line="+45"/>
<source>Invalid amount for -paytxfee=&lt;amount&gt;: &apos;%s&apos;</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-15"/>
+ <location line="-24"/>
<source>Error: could not start node</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+16"/>
+ <location line="+25"/>
<source>Invalid amount</source>
<translation type="unfinished"/>
</message>
@@ -2683,7 +2911,7 @@ If the file does not exist, create it with owner-readable-only file permissions.
<translation type="unfinished"/>
</message>
<message>
- <location line="-45"/>
+ <location line="-59"/>
<source>Add a node to connect to and attempt to keep the connection open</source>
<translation type="unfinished"/>
</message>
@@ -2693,22 +2921,17 @@ If the file does not exist, create it with owner-readable-only file permissions.
<translation type="unfinished"/>
</message>
<message>
- <location line="+54"/>
- <source>Find peers using internet relay chat (default: 0)</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="-2"/>
+ <location line="+68"/>
<source>Fee per KB to add to transactions you send</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+19"/>
+ <location line="+17"/>
<source>Loading wallet...</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-40"/>
+ <location line="-54"/>
<source>Cannot downgrade wallet</source>
<translation type="unfinished"/>
</message>
@@ -2723,27 +2946,27 @@ If the file does not exist, create it with owner-readable-only file permissions.
<translation type="unfinished"/>
</message>
<message>
- <location line="+49"/>
+ <location line="+64"/>
<source>Rescanning...</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-43"/>
+ <location line="-56"/>
<source>Done loading</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+65"/>
+ <location line="+79"/>
<source>To use the %s option</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-60"/>
+ <location line="-71"/>
<source>Error</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-28"/>
+ <location line="-33"/>
<source>You must set rpcpassword=&lt;password&gt; in the configuration file:
%s
If the file does not exist, create it with owner-readable-only file permissions.</source>
diff --git a/src/qt/locale/bitcoin_eu_ES.ts b/src/qt/locale/bitcoin_eu_ES.ts
index fb13cff8c8..c5b647616b 100644
--- a/src/qt/locale/bitcoin_eu_ES.ts
+++ b/src/qt/locale/bitcoin_eu_ES.ts
@@ -5,20 +5,15 @@
<message>
<location filename="../forms/aboutdialog.ui" line="+14"/>
<source>About Bitcoin</source>
- <translation type="unfinished"/>
+ <translation>Bitcoin-i buruz</translation>
</message>
<message>
<location line="+39"/>
<source>&lt;b&gt;Bitcoin&lt;/b&gt; version</source>
- <translation>&lt;b&gt;Bitcoin&lt;/b&gt; Bertsio</translation>
+ <translation>&lt;b&gt;Bitcoin&lt;/b&gt; bertsioa</translation>
</message>
<message>
- <location line="+41"/>
- <source>Copyright © 2009-2012 The Bitcoin developers</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+13"/>
+ <location line="+57"/>
<source>
This is experimental software.
@@ -27,6 +22,16 @@ Distributed under the MIT/X11 software license, see the accompanying file COPYIN
This product includes software developed by the OpenSSL Project for use in the OpenSSL Toolkit (http://www.openssl.org/) and cryptographic software written by Eric Young (eay@cryptsoft.com) and UPnP software written by Thomas Bernard.</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../aboutdialog.cpp" line="+17"/>
+ <source>Copyright</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>2009-%1 The Bitcoin developers</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>AddressBookPage</name>
@@ -38,7 +43,7 @@ This product includes software developed by the OpenSSL Project for use in the O
<message>
<location line="+22"/>
<source>Double-click to edit address or label</source>
- <translation type="unfinished"/>
+ <translation>Klik bikoitza helbidea edo etiketa editatzeko</translation>
</message>
<message>
<location line="+27"/>
@@ -48,7 +53,7 @@ This product includes software developed by the OpenSSL Project for use in the O
<message>
<location line="+14"/>
<source>Copy the currently selected address to the system clipboard</source>
- <translation type="unfinished"/>
+ <translation>Kopiatu hautatutako helbidea sistemaren arbelera</translation>
</message>
<message>
<location line="-11"/>
@@ -101,42 +106,47 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation>&amp;Ezabatu</translation>
</message>
<message>
- <location filename="../addressbookpage.cpp" line="+65"/>
+ <location filename="../addressbookpage.cpp" line="+66"/>
<source>Copy &amp;Label</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+2"/>
+ <location line="+1"/>
<source>&amp;Edit</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+250"/>
- <source>Export Address Book Data</source>
+ <location line="+1"/>
+ <source>Send &amp;Coins</source>
<translation type="unfinished"/>
</message>
<message>
+ <location line="+263"/>
+ <source>Export Address Book Data</source>
+ <translation>Esportatu Helbide-liburuaren datuak</translation>
+ </message>
+ <message>
<location line="+1"/>
<source>Comma separated file (*.csv)</source>
- <translation type="unfinished"/>
+ <translation>Komaz bereizitako artxiboa (*.csv)</translation>
</message>
<message>
<location line="+13"/>
<source>Error exporting</source>
- <translation type="unfinished"/>
+ <translation>Errorea esportatzean</translation>
</message>
<message>
<location line="+0"/>
<source>Could not write to file %1.</source>
- <translation type="unfinished"/>
+ <translation>Ezin idatzi %1 artxiboan.</translation>
</message>
</context>
<context>
<name>AddressTableModel</name>
<message>
- <location filename="../addresstablemodel.cpp" line="+142"/>
+ <location filename="../addresstablemodel.cpp" line="+144"/>
<source>Label</source>
- <translation type="unfinished"/>
+ <translation>Etiketa</translation>
</message>
<message>
<location line="+0"/>
@@ -146,7 +156,7 @@ This product includes software developed by the OpenSSL Project for use in the O
<message>
<location line="+36"/>
<source>(no label)</source>
- <translation type="unfinished"/>
+ <translation>(etiketarik ez)</translation>
</message>
</context>
<context>
@@ -159,62 +169,62 @@ This product includes software developed by the OpenSSL Project for use in the O
<message>
<location line="+21"/>
<source>Enter passphrase</source>
- <translation type="unfinished"/>
+ <translation>Sartu pasahitza</translation>
</message>
<message>
<location line="+14"/>
<source>New passphrase</source>
- <translation type="unfinished"/>
+ <translation>Pasahitz berria</translation>
</message>
<message>
<location line="+14"/>
<source>Repeat new passphrase</source>
- <translation type="unfinished"/>
+ <translation>Errepikatu pasahitz berria</translation>
</message>
<message>
<location filename="../askpassphrasedialog.cpp" line="+33"/>
<source>Enter the new passphrase to the wallet.&lt;br/&gt;Please use a passphrase of &lt;b&gt;10 or more random characters&lt;/b&gt;, or &lt;b&gt;eight or more words&lt;/b&gt;.</source>
- <translation type="unfinished"/>
+ <translation>Sartu zorrorako pasahitz berria.&lt;br/&gt; Mesedez erabili &lt;b&gt;gutxienez ausazko 10 karaktere&lt;/b&gt;, edo &lt;b&gt;gutxienez zortzi hitz&lt;/b&gt; pasahitza osatzeko.</translation>
</message>
<message>
<location line="+1"/>
<source>Encrypt wallet</source>
- <translation type="unfinished"/>
+ <translation>Enkriptatu zorroa</translation>
</message>
<message>
<location line="+3"/>
<source>This operation needs your wallet passphrase to unlock the wallet.</source>
- <translation type="unfinished"/>
+ <translation>Eragiketa honek zorroaren pasahitza behar du zorroa desblokeatzeko.</translation>
</message>
<message>
<location line="+5"/>
<source>Unlock wallet</source>
- <translation type="unfinished"/>
+ <translation>Desblokeatu zorroa</translation>
</message>
<message>
<location line="+3"/>
<source>This operation needs your wallet passphrase to decrypt the wallet.</source>
- <translation type="unfinished"/>
+ <translation>Eragiketa honek zure zorroaren pasahitza behar du, zorroa desenkriptatzeko.</translation>
</message>
<message>
<location line="+5"/>
<source>Decrypt wallet</source>
- <translation type="unfinished"/>
+ <translation>Desenkriptatu zorroa</translation>
</message>
<message>
<location line="+3"/>
<source>Change passphrase</source>
- <translation type="unfinished"/>
+ <translation>Aldatu pasahitza</translation>
</message>
<message>
<location line="+1"/>
<source>Enter the old and new passphrase to the wallet.</source>
- <translation type="unfinished"/>
+ <translation>Sartu zorroaren pasahitz zaharra eta berria.</translation>
</message>
<message>
<location line="+46"/>
<source>Confirm wallet encryption</source>
- <translation type="unfinished"/>
+ <translation>Berretsi zorroaren enkriptazioa</translation>
</message>
<message>
<location line="+1"/>
@@ -241,7 +251,7 @@ This product includes software developed by the OpenSSL Project for use in the O
<location line="-130"/>
<location line="+58"/>
<source>Wallet encrypted</source>
- <translation type="unfinished"/>
+ <translation>Zorroa enkriptatuta</translation>
</message>
<message>
<location line="-56"/>
@@ -254,35 +264,35 @@ This product includes software developed by the OpenSSL Project for use in the O
<location line="+42"/>
<location line="+6"/>
<source>Wallet encryption failed</source>
- <translation type="unfinished"/>
+ <translation>Zorroaren enkriptazioak huts egin du</translation>
</message>
<message>
<location line="-54"/>
<source>Wallet encryption failed due to an internal error. Your wallet was not encrypted.</source>
- <translation type="unfinished"/>
+ <translation>Zorroaren enkriptazioak huts egin du barne-errore baten ondorioz. Zure zorroa ez da enkriptatu.</translation>
</message>
<message>
<location line="+7"/>
<location line="+48"/>
<source>The supplied passphrases do not match.</source>
- <translation type="unfinished"/>
+ <translation>Eman dituzun pasahitzak ez datoz bat.</translation>
</message>
<message>
<location line="-37"/>
<source>Wallet unlock failed</source>
- <translation type="unfinished"/>
+ <translation>Zorroaren desblokeoak huts egin du</translation>
</message>
<message>
<location line="+1"/>
<location line="+11"/>
<location line="+19"/>
<source>The passphrase entered for the wallet decryption was incorrect.</source>
- <translation type="unfinished"/>
+ <translation>Zorroa desenkriptatzeko sartutako pasahitza okerra da.</translation>
</message>
<message>
<location line="-20"/>
<source>Wallet decryption failed</source>
- <translation type="unfinished"/>
+ <translation>Zorroaren desenkriptazioak huts egin du</translation>
</message>
<message>
<location line="+14"/>
@@ -293,74 +303,59 @@ This product includes software developed by the OpenSSL Project for use in the O
<context>
<name>BitcoinGUI</name>
<message>
- <location filename="../bitcoingui.cpp" line="+267"/>
+ <location filename="../bitcoingui.cpp" line="+231"/>
<source>Sign &amp;message...</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+254"/>
+ <location line="+299"/>
<source>Synchronizing with network...</source>
- <translation type="unfinished"/>
+ <translation>Sarearekin sinkronizatzen...</translation>
</message>
<message>
- <location line="-322"/>
+ <location line="-367"/>
<source>&amp;Overview</source>
- <translation type="unfinished"/>
+ <translation>&amp;Gainbegiratu</translation>
</message>
<message>
<location line="+1"/>
<source>Show general overview of wallet</source>
- <translation type="unfinished"/>
+ <translation>Ikusi zorroaren begirada orokorra</translation>
</message>
<message>
<location line="+20"/>
<source>&amp;Transactions</source>
- <translation type="unfinished"/>
+ <translation>&amp;Transakzioak</translation>
</message>
<message>
<location line="+1"/>
<source>Browse transaction history</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+6"/>
- <source>&amp;Address Book</source>
- <translation type="unfinished"/>
+ <translation>Ikusi transakzioen historia</translation>
</message>
<message>
- <location line="+1"/>
+ <location line="+7"/>
<source>Edit the list of stored addresses and labels</source>
- <translation type="unfinished"/>
+ <translation>Editatu gordetako helbide eta etiketen zerrenda</translation>
</message>
<message>
- <location line="-15"/>
- <source>&amp;Receive coins</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+1"/>
+ <location line="-14"/>
<source>Show the list of addresses for receiving payments</source>
- <translation type="unfinished"/>
+ <translation>Erakutsi ordainketak jasotzeko helbideen zerrenda</translation>
</message>
<message>
- <location line="-8"/>
- <source>&amp;Send coins</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+39"/>
+ <location line="+31"/>
<source>E&amp;xit</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+1"/>
<source>Quit application</source>
- <translation type="unfinished"/>
+ <translation>Irten aplikaziotik</translation>
</message>
<message>
<location line="+4"/>
<source>Show information about Bitcoin</source>
- <translation type="unfinished"/>
+ <translation>Erakutsi Bitcoin-i buruzko informazioa</translation>
</message>
<message>
<location line="+2"/>
@@ -375,7 +370,7 @@ This product includes software developed by the OpenSSL Project for use in the O
<message>
<location line="+2"/>
<source>&amp;Options...</source>
- <translation type="unfinished"/>
+ <translation>&amp;Aukerak...</translation>
</message>
<message>
<location line="+5"/>
@@ -393,7 +388,7 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation type="unfinished"/>
</message>
<message>
- <location line="+259"/>
+ <location line="+304"/>
<source>Importing blocks from disk...</source>
<translation type="unfinished"/>
</message>
@@ -402,15 +397,10 @@ This product includes software developed by the OpenSSL Project for use in the O
<source>Reindexing blocks on disk...</source>
<translation type="unfinished"/>
</message>
- <message numerus="yes">
- <location line="+10"/>
- <source>~%n block(s) remaining</source>
- <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
- </message>
<message>
- <location line="-265"/>
+ <location line="-300"/>
<source>&amp;Export...</source>
- <translation type="unfinished"/>
+ <translation>&amp;Esportatu...</translation>
</message>
<message>
<location line="-65"/>
@@ -435,7 +425,7 @@ This product includes software developed by the OpenSSL Project for use in the O
<message>
<location line="+2"/>
<source>Change the passphrase used for wallet encryption</source>
- <translation type="unfinished"/>
+ <translation>Aldatu zorroa enkriptatzeko erabilitako pasahitza</translation>
</message>
<message>
<location line="+9"/>
@@ -453,18 +443,33 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation type="unfinished"/>
</message>
<message>
- <location line="-196"/>
- <location line="+538"/>
+ <location line="-162"/>
+ <location line="+540"/>
<source>Bitcoin</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-538"/>
+ <location line="-540"/>
<source>Wallet</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+176"/>
+ <location line="+99"/>
+ <source>&amp;Send</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+7"/>
+ <source>&amp;Receive</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+14"/>
+ <source>&amp;Addresses</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+22"/>
<source>&amp;About Bitcoin</source>
<translation type="unfinished"/>
</message>
@@ -496,133 +501,128 @@ This product includes software developed by the OpenSSL Project for use in the O
<message>
<location line="+31"/>
<source>&amp;File</source>
- <translation type="unfinished"/>
+ <translation>&amp;Artxiboa</translation>
</message>
<message>
<location line="+8"/>
<source>&amp;Settings</source>
- <translation type="unfinished"/>
+ <translation>&amp;Ezarpenak</translation>
</message>
<message>
<location line="+6"/>
<source>&amp;Help</source>
- <translation type="unfinished"/>
+ <translation>&amp;Laguntza</translation>
</message>
<message>
<location line="+9"/>
<source>Tabs toolbar</source>
- <translation type="unfinished"/>
+ <translation>Fitxen tresna-barra</translation>
</message>
<message>
<location line="+8"/>
<source>Actions toolbar</source>
- <translation type="unfinished"/>
+ <translation>Ekintzak tresna-barra</translation>
</message>
<message>
<location line="+13"/>
<location line="+10"/>
<source>[testnet]</source>
- <translation type="unfinished"/>
+ <translation>[testnet]</translation>
</message>
<message>
- <location line="+63"/>
+ <location line="+47"/>
<source>Bitcoin client</source>
<translation type="unfinished"/>
</message>
<message numerus="yes">
- <location line="+79"/>
+ <location line="+140"/>
<source>%n active connection(s) to Bitcoin network</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message>
- <location line="+45"/>
- <source>Processed %1 of %2 blocks of transaction history (%3% done).</source>
+ <location line="+39"/>
+ <source>Processed %1 of %2 (estimated) blocks of transaction history.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+7"/>
+ <location line="+4"/>
<source>Processed %1 blocks of transaction history.</source>
<translation type="unfinished"/>
</message>
+ <message numerus="yes">
+ <location line="+20"/>
+ <source>%n hour(s)</source>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
+ <message numerus="yes">
+ <location line="+4"/>
+ <source>%n day(s)</source>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
+ <message numerus="yes">
+ <location line="+4"/>
+ <source>%n week(s)</source>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
<message>
- <location line="+70"/>
- <source>Error</source>
+ <location line="+5"/>
+ <source>%1 behind</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+3"/>
- <source>Warning</source>
+ <location line="+14"/>
+ <source>Last received block was generated %1 ago.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+3"/>
- <source>Information</source>
+ <location line="+2"/>
+ <source>Transactions after this will not yet be visible.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+66"/>
- <source>This transaction is over the size limit. You can still send it for a fee of %1, which goes to the nodes that process your transaction and helps to support the network. Do you want to pay the fee?</source>
+ <location line="+21"/>
+ <source>Error</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+210"/>
- <source>Backup Successful</source>
+ <location line="+3"/>
+ <source>Warning</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+0"/>
- <source>The wallet data was successfully saved to the new location.</source>
+ <location line="+3"/>
+ <source>Information</source>
<translation type="unfinished"/>
</message>
- <message numerus="yes">
- <location line="-338"/>
- <source>%n second(s) ago</source>
- <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
- </message>
- <message numerus="yes">
- <location line="+4"/>
- <source>%n minute(s) ago</source>
- <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
- </message>
- <message numerus="yes">
- <location line="+4"/>
- <source>%n hour(s) ago</source>
- <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
- </message>
- <message numerus="yes">
- <location line="+4"/>
- <source>%n day(s) ago</source>
- <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
- </message>
<message>
- <location line="+6"/>
- <source>Up to date</source>
+ <location line="+68"/>
+ <source>This transaction is over the size limit. You can still send it for a fee of %1, which goes to the nodes that process your transaction and helps to support the network. Do you want to pay the fee?</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+7"/>
- <source>Catching up...</source>
- <translation type="unfinished"/>
+ <location line="-138"/>
+ <source>Up to date</source>
+ <translation>Egunean</translation>
</message>
<message>
- <location line="+10"/>
- <source>Last received block was generated %1.</source>
- <translation type="unfinished"/>
+ <location line="+32"/>
+ <source>Catching up...</source>
+ <translation>Eguneratzen...</translation>
</message>
<message>
- <location line="+97"/>
+ <location line="+110"/>
<source>Confirm transaction fee</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+23"/>
+ <location line="+8"/>
<source>Sent transaction</source>
- <translation type="unfinished"/>
+ <translation>Bidalitako transakzioa</translation>
</message>
<message>
<location line="+0"/>
<source>Incoming transaction</source>
- <translation type="unfinished"/>
+ <translation>Sarrerako transakzioa</translation>
</message>
<message>
<location line="+1"/>
@@ -634,49 +634,29 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+99"/>
- <location line="+28"/>
+ <location line="+33"/>
+ <location line="+23"/>
<source>URI handling</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-28"/>
- <location line="+28"/>
+ <location line="-23"/>
+ <location line="+23"/>
<source>URI can not be parsed! This can be caused by an invalid Bitcoin address or malformed URI parameters.</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+17"/>
<source>Wallet is &lt;b&gt;encrypted&lt;/b&gt; and currently &lt;b&gt;unlocked&lt;/b&gt;</source>
- <translation type="unfinished"/>
+ <translation>Zorroa &lt;b&gt;enkriptatuta&lt;/b&gt; eta &lt;b&gt;desblokeatuta&lt;/b&gt; dago une honetan</translation>
</message>
<message>
<location line="+8"/>
<source>Wallet is &lt;b&gt;encrypted&lt;/b&gt; and currently &lt;b&gt;locked&lt;/b&gt;</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+23"/>
- <source>Backup Wallet</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+0"/>
- <source>Wallet Data (*.dat)</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+3"/>
- <source>Backup Failed</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+0"/>
- <source>There was an error trying to save the wallet data to the new location.</source>
- <translation type="unfinished"/>
+ <translation>Zorroa &lt;b&gt;enkriptatuta&lt;/b&gt; eta &lt;b&gt;blokeatuta&lt;/b&gt; dago une honetan</translation>
</message>
<message>
- <location filename="../bitcoin.cpp" line="+109"/>
+ <location filename="../bitcoin.cpp" line="+108"/>
<source>A fatal error occurred. Bitcoin can no longer continue safely and will quit.</source>
<translation type="unfinished"/>
</message>
@@ -684,7 +664,7 @@ Address: %4
<context>
<name>ClientModel</name>
<message>
- <location filename="../clientmodel.cpp" line="+86"/>
+ <location filename="../clientmodel.cpp" line="+96"/>
<source>Network Alert</source>
<translation type="unfinished"/>
</message>
@@ -694,73 +674,73 @@ Address: %4
<message>
<location filename="../forms/editaddressdialog.ui" line="+14"/>
<source>Edit Address</source>
- <translation type="unfinished"/>
+ <translation>Editatu helbidea</translation>
</message>
<message>
<location line="+11"/>
<source>&amp;Label</source>
- <translation type="unfinished"/>
+ <translation>&amp;Etiketa</translation>
</message>
<message>
<location line="+10"/>
<source>The label associated with this address book entry</source>
- <translation type="unfinished"/>
+ <translation>Helbide-liburuko sarrera honekin lotutako etiketa</translation>
</message>
<message>
<location line="+7"/>
<source>&amp;Address</source>
- <translation type="unfinished"/>
+ <translation>&amp;Helbidea</translation>
</message>
<message>
<location line="+10"/>
<source>The address associated with this address book entry. This can only be modified for sending addresses.</source>
- <translation type="unfinished"/>
+ <translation>Helbide-liburuko sarrera honekin lotutako helbidea. Bidaltzeko helbideeta soilik alda daiteke.</translation>
</message>
<message>
- <location filename="../editaddressdialog.cpp" line="+20"/>
+ <location filename="../editaddressdialog.cpp" line="+21"/>
<source>New receiving address</source>
- <translation type="unfinished"/>
+ <translation>Jasotzeko helbide berria</translation>
</message>
<message>
<location line="+4"/>
<source>New sending address</source>
- <translation type="unfinished"/>
+ <translation>Bidaltzeko helbide berria</translation>
</message>
<message>
<location line="+3"/>
<source>Edit receiving address</source>
- <translation type="unfinished"/>
+ <translation>Editatu jasotzeko helbidea</translation>
</message>
<message>
<location line="+4"/>
<source>Edit sending address</source>
- <translation type="unfinished"/>
+ <translation>Editatu bidaltzeko helbidea</translation>
</message>
<message>
- <location line="+60"/>
+ <location line="+76"/>
<source>The entered address &quot;%1&quot; is already in the address book.</source>
- <translation type="unfinished"/>
+ <translation>Sartu berri den helbidea, &quot;%1&quot;, helbide-liburuan dago jadanik.</translation>
</message>
<message>
- <location line="+5"/>
+ <location line="-5"/>
<source>The entered address &quot;%1&quot; is not a valid Bitcoin address.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+5"/>
+ <location line="+10"/>
<source>Could not unlock wallet.</source>
- <translation type="unfinished"/>
+ <translation>Ezin desblokeatu zorroa.</translation>
</message>
<message>
<location line="+5"/>
<source>New key generation failed.</source>
- <translation type="unfinished"/>
+ <translation>Gako berriaren sorrerak huts egin du.</translation>
</message>
</context>
<context>
<name>GUIUtil::HelpMessageBox</name>
<message>
- <location filename="../guiutil.cpp" line="+419"/>
+ <location filename="../guiutil.cpp" line="+422"/>
<location line="+12"/>
<source>Bitcoin-Qt</source>
<translation type="unfinished"/>
@@ -806,7 +786,7 @@ Address: %4
<message>
<location filename="../forms/optionsdialog.ui" line="+14"/>
<source>Options</source>
- <translation type="unfinished"/>
+ <translation>Aukerak</translation>
</message>
<message>
<location line="+16"/>
@@ -974,7 +954,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location filename="../optionsdialog.cpp" line="+55"/>
+ <location filename="../optionsdialog.cpp" line="+53"/>
<source>default</source>
<translation type="unfinished"/>
</message>
@@ -1016,28 +996,23 @@ Address: %4
<message>
<location filename="../forms/overviewpage.ui" line="+14"/>
<source>Form</source>
- <translation type="unfinished"/>
+ <translation>Inprimakia</translation>
</message>
<message>
- <location line="+51"/>
- <location line="+183"/>
+ <location line="+50"/>
+ <location line="+166"/>
<source>The displayed information may be out of date. Your wallet automatically synchronizes with the Bitcoin network after a connection is established, but this process has not completed yet.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-141"/>
+ <location line="-124"/>
<source>Balance:</source>
- <translation type="unfinished"/>
+ <translation>Saldoa:</translation>
</message>
<message>
- <location line="+58"/>
- <source>Number of transactions:</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="-29"/>
+ <location line="+29"/>
<source>Unconfirmed:</source>
- <translation type="unfinished"/>
+ <translation>Konfirmatu gabe:</translation>
</message>
<message>
<location line="-78"/>
@@ -1045,7 +1020,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+124"/>
+ <location line="+107"/>
<source>Immature:</source>
<translation type="unfinished"/>
</message>
@@ -1057,22 +1032,17 @@ Address: %4
<message>
<location line="+46"/>
<source>&lt;b&gt;Recent transactions&lt;/b&gt;</source>
- <translation type="unfinished"/>
+ <translation>&lt;b&gt;Azken transakzioak&lt;/b&gt;</translation>
</message>
<message>
- <location line="-118"/>
+ <location line="-101"/>
<source>Your current balance</source>
- <translation type="unfinished"/>
+ <translation>Zure uneko saldoa</translation>
</message>
<message>
<location line="+29"/>
<source>Total of transactions that have yet to be confirmed, and do not yet count toward the current balance</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+20"/>
- <source>Total number of transactions in wallet</source>
- <translation type="unfinished"/>
+ <translation>Oraindik konfirmatu gabe daudenez, uneko saldoab kontatu gabe dagoen transakzio kopurua</translation>
</message>
<message>
<location filename="../overviewpage.cpp" line="+115"/>
@@ -1082,6 +1052,14 @@ Address: %4
</message>
</context>
<context>
+ <name>PaymentServer</name>
+ <message>
+ <location filename="../paymentserver.cpp" line="+107"/>
+ <source>Cannot start bitcoin: click-to-pay handler</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>QRCodeDialog</name>
<message>
<location filename="../forms/qrcodedialog.ui" line="+14"/>
@@ -1298,12 +1276,12 @@ Address: %4
<location line="+5"/>
<location line="+5"/>
<source>Send Coins</source>
- <translation type="unfinished"/>
+ <translation>Bidali txanponak</translation>
</message>
<message>
<location line="+50"/>
<source>Send to multiple recipients at once</source>
- <translation type="unfinished"/>
+ <translation>Bidali hainbat jasotzaileri batera</translation>
</message>
<message>
<location line="+3"/>
@@ -1323,17 +1301,17 @@ Address: %4
<message>
<location line="+22"/>
<source>Balance:</source>
- <translation type="unfinished"/>
+ <translation>Saldoa:</translation>
</message>
<message>
<location line="+10"/>
<source>123.456 BTC</source>
- <translation type="unfinished"/>
+ <translation>123.456 BTC</translation>
</message>
<message>
<location line="+31"/>
<source>Confirm the send action</source>
- <translation type="unfinished"/>
+ <translation>Berretsi bidaltzeko ekintza</translation>
</message>
<message>
<location line="+3"/>
@@ -1343,22 +1321,22 @@ Address: %4
<message>
<location filename="../sendcoinsdialog.cpp" line="-59"/>
<source>&lt;b&gt;%1&lt;/b&gt; to %2 (%3)</source>
- <translation type="unfinished"/>
+ <translation>&lt;b&gt;%1&lt;/b&gt; honi: %2 (%3)</translation>
</message>
<message>
<location line="+5"/>
<source>Confirm send coins</source>
- <translation type="unfinished"/>
+ <translation>Berretsi txanponak bidaltzea</translation>
</message>
<message>
<location line="+1"/>
<source>Are you sure you want to send %1?</source>
- <translation type="unfinished"/>
+ <translation>Ziur zaude %1 bidali nahi duzula?</translation>
</message>
<message>
<location line="+0"/>
<source> and </source>
- <translation type="unfinished"/>
+ <translation>eta</translation>
</message>
<message>
<location line="+23"/>
@@ -1368,7 +1346,7 @@ Address: %4
<message>
<location line="+5"/>
<source>The amount to pay must be larger than 0.</source>
- <translation type="unfinished"/>
+ <translation>Ordaintzeko kopurua 0 baino handiagoa izan behar du.</translation>
</message>
<message>
<location line="+5"/>
@@ -1401,17 +1379,17 @@ Address: %4
<message>
<location filename="../forms/sendcoinsentry.ui" line="+14"/>
<source>Form</source>
- <translation type="unfinished"/>
+ <translation>Inprimakia</translation>
</message>
<message>
<location line="+15"/>
<source>A&amp;mount:</source>
- <translation type="unfinished"/>
+ <translation>K&amp;opurua:</translation>
</message>
<message>
<location line="+13"/>
<source>Pay &amp;To:</source>
- <translation type="unfinished"/>
+ <translation>Ordaindu &amp;honi:</translation>
</message>
<message>
<location line="+34"/>
@@ -1420,14 +1398,14 @@ Address: %4
</message>
<message>
<location line="+60"/>
- <location filename="../sendcoinsentry.cpp" line="+25"/>
+ <location filename="../sendcoinsentry.cpp" line="+26"/>
<source>Enter a label for this address to add it to your address book</source>
- <translation type="unfinished"/>
+ <translation>Sartu etiketa bat helbide honetarako, eta gehitu zure helbide-liburuan</translation>
</message>
<message>
<location line="-78"/>
<source>&amp;Label:</source>
- <translation type="unfinished"/>
+ <translation>&amp;Etiketa:</translation>
</message>
<message>
<location line="+28"/>
@@ -1437,27 +1415,27 @@ Address: %4
<message>
<location line="+10"/>
<source>Alt+A</source>
- <translation type="unfinished"/>
+ <translation>Alt+A</translation>
</message>
<message>
<location line="+7"/>
<source>Paste address from clipboard</source>
- <translation type="unfinished"/>
+ <translation>Itsatsi helbidea arbeletik</translation>
</message>
<message>
<location line="+10"/>
<source>Alt+P</source>
- <translation type="unfinished"/>
+ <translation>Alt+P</translation>
</message>
<message>
<location line="+7"/>
<source>Remove this recipient</source>
- <translation type="unfinished"/>
+ <translation>Ezabatu jasotzaile hau</translation>
</message>
<message>
<location filename="../sendcoinsentry.cpp" line="+1"/>
<source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
- <translation type="unfinished"/>
+ <translation>Sartu Bitocin helbide bat (adb.: 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L) </translation>
</message>
</context>
<context>
@@ -1492,17 +1470,17 @@ Address: %4
<location line="-203"/>
<location line="+213"/>
<source>Alt+A</source>
- <translation type="unfinished"/>
+ <translation>Alt+A</translation>
</message>
<message>
<location line="-203"/>
<source>Paste address from clipboard</source>
- <translation type="unfinished"/>
+ <translation>Itsatsi helbidea arbeletik</translation>
</message>
<message>
<location line="+10"/>
<source>Alt+P</source>
- <translation type="unfinished"/>
+ <translation>Alt+P</translation>
</message>
<message>
<location line="+12"/>
@@ -1574,7 +1552,7 @@ Address: %4
<location filename="../signverifymessagedialog.cpp" line="+27"/>
<location line="+3"/>
<source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
- <translation type="unfinished"/>
+ <translation>Sartu Bitocin helbide bat (adb.: 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L) </translation>
</message>
<message>
<location line="-2"/>
@@ -1656,9 +1634,9 @@ Address: %4
<context>
<name>TransactionDesc</name>
<message>
- <location filename="../transactiondesc.cpp" line="+19"/>
+ <location filename="../transactiondesc.cpp" line="+20"/>
<source>Open until %1</source>
- <translation type="unfinished"/>
+ <translation>Zabalik %1 arte</translation>
</message>
<message>
<location line="+6"/>
@@ -1668,12 +1646,12 @@ Address: %4
<message>
<location line="+2"/>
<source>%1/unconfirmed</source>
- <translation type="unfinished"/>
+ <translation>%1/konfirmatu gabe</translation>
</message>
<message>
<location line="+2"/>
<source>%1 confirmations</source>
- <translation type="unfinished"/>
+ <translation>%1 konfirmazioak</translation>
</message>
<message>
<location line="+18"/>
@@ -1688,7 +1666,7 @@ Address: %4
<message>
<location line="+4"/>
<source>Date</source>
- <translation type="unfinished"/>
+ <translation>Data</translation>
</message>
<message>
<location line="+7"/>
@@ -1799,7 +1777,7 @@ Address: %4
<message>
<location line="+23"/>
<source>Amount</source>
- <translation type="unfinished"/>
+ <translation>Kopurua</translation>
</message>
<message>
<location line="+1"/>
@@ -1814,7 +1792,7 @@ Address: %4
<message>
<location line="-209"/>
<source>, has not been successfully broadcast yet</source>
- <translation type="unfinished"/>
+ <translation>, ez da arrakastaz emititu oraindik</translation>
</message>
<message numerus="yes">
<location line="-35"/>
@@ -1824,7 +1802,7 @@ Address: %4
<message>
<location line="+70"/>
<source>unknown</source>
- <translation type="unfinished"/>
+ <translation>ezezaguna</translation>
</message>
</context>
<context>
@@ -1832,25 +1810,25 @@ Address: %4
<message>
<location filename="../forms/transactiondescdialog.ui" line="+14"/>
<source>Transaction details</source>
- <translation type="unfinished"/>
+ <translation>Transakzioaren xehetasunak</translation>
</message>
<message>
<location line="+6"/>
<source>This pane shows a detailed description of the transaction</source>
- <translation type="unfinished"/>
+ <translation>Panel honek transakzioaren deskribapen xehea erakusten du</translation>
</message>
</context>
<context>
<name>TransactionTableModel</name>
<message>
- <location filename="../transactiontablemodel.cpp" line="+226"/>
+ <location filename="../transactiontablemodel.cpp" line="+225"/>
<source>Date</source>
- <translation type="unfinished"/>
+ <translation>Data</translation>
</message>
<message>
<location line="+0"/>
<source>Type</source>
- <translation type="unfinished"/>
+ <translation>Mota</translation>
</message>
<message>
<location line="+0"/>
@@ -1860,7 +1838,7 @@ Address: %4
<message>
<location line="+0"/>
<source>Amount</source>
- <translation type="unfinished"/>
+ <translation>Kopurua</translation>
</message>
<message numerus="yes">
<location line="+57"/>
@@ -1870,12 +1848,12 @@ Address: %4
<message>
<location line="+3"/>
<source>Open until %1</source>
- <translation type="unfinished"/>
+ <translation>Zabalik %1 arte</translation>
</message>
<message>
<location line="+3"/>
<source>Offline (%1 confirmations)</source>
- <translation type="unfinished"/>
+ <translation>Offline (%1 konfirmazio)</translation>
</message>
<message>
<location line="+3"/>
@@ -1885,7 +1863,7 @@ Address: %4
<message>
<location line="+3"/>
<source>Confirmed (%1 confirmations)</source>
- <translation type="unfinished"/>
+ <translation>Konfirmatuta (%1 konfirmazio)</translation>
</message>
<message numerus="yes">
<location line="+8"/>
@@ -1895,17 +1873,17 @@ Address: %4
<message>
<location line="+5"/>
<source>This block was not received by any other nodes and will probably not be accepted!</source>
- <translation type="unfinished"/>
+ <translation>Bloke hau ez du beste inongo nodorik jaso, eta seguruenik ez da onartuko!</translation>
</message>
<message>
<location line="+3"/>
<source>Generated but not accepted</source>
- <translation type="unfinished"/>
+ <translation>Sortua, baina ez onartua</translation>
</message>
<message>
<location line="+43"/>
<source>Received with</source>
- <translation type="unfinished"/>
+ <translation>Jasoa honekin: </translation>
</message>
<message>
<location line="+2"/>
@@ -1915,131 +1893,131 @@ Address: %4
<message>
<location line="+3"/>
<source>Sent to</source>
- <translation type="unfinished"/>
+ <translation>Honi bidalia: </translation>
</message>
<message>
<location line="+2"/>
<source>Payment to yourself</source>
- <translation type="unfinished"/>
+ <translation>Ordainketa zeure buruari</translation>
</message>
<message>
<location line="+2"/>
<source>Mined</source>
- <translation type="unfinished"/>
+ <translation>Bildua</translation>
</message>
<message>
<location line="+38"/>
<source>(n/a)</source>
- <translation type="unfinished"/>
+ <translation>(n/a)</translation>
</message>
<message>
<location line="+199"/>
<source>Transaction status. Hover over this field to show number of confirmations.</source>
- <translation type="unfinished"/>
+ <translation>Transakzioaren egoera. Pasatu sagua gainetik konfirmazio kopurua ikusteko.</translation>
</message>
<message>
<location line="+2"/>
<source>Date and time that the transaction was received.</source>
- <translation type="unfinished"/>
+ <translation>Transakzioa jasotako data eta ordua.</translation>
</message>
<message>
<location line="+2"/>
<source>Type of transaction.</source>
- <translation type="unfinished"/>
+ <translation>Transakzio mota.</translation>
</message>
<message>
<location line="+2"/>
<source>Destination address of transaction.</source>
- <translation type="unfinished"/>
+ <translation>Transakzioaren xede-helbidea.</translation>
</message>
<message>
<location line="+2"/>
<source>Amount removed from or added to balance.</source>
- <translation type="unfinished"/>
+ <translation>Saldoan kendu edo gehitutako kopurua.</translation>
</message>
</context>
<context>
<name>TransactionView</name>
<message>
- <location filename="../transactionview.cpp" line="+55"/>
+ <location filename="../transactionview.cpp" line="+52"/>
<location line="+16"/>
<source>All</source>
- <translation type="unfinished"/>
+ <translation>Denak</translation>
</message>
<message>
<location line="-15"/>
<source>Today</source>
- <translation type="unfinished"/>
+ <translation>Gaur</translation>
</message>
<message>
<location line="+1"/>
<source>This week</source>
- <translation type="unfinished"/>
+ <translation>Aste honetan</translation>
</message>
<message>
<location line="+1"/>
<source>This month</source>
- <translation type="unfinished"/>
+ <translation>Hil honetan</translation>
</message>
<message>
<location line="+1"/>
<source>Last month</source>
- <translation type="unfinished"/>
+ <translation>Azken hilean</translation>
</message>
<message>
<location line="+1"/>
<source>This year</source>
- <translation type="unfinished"/>
+ <translation>Aurten</translation>
</message>
<message>
<location line="+1"/>
<source>Range...</source>
- <translation type="unfinished"/>
+ <translation>Muga...</translation>
</message>
<message>
<location line="+11"/>
<source>Received with</source>
- <translation type="unfinished"/>
+ <translation>Jasota honekin: </translation>
</message>
<message>
<location line="+2"/>
<source>Sent to</source>
- <translation type="unfinished"/>
+ <translation>Hona bidalia: </translation>
</message>
<message>
<location line="+2"/>
<source>To yourself</source>
- <translation type="unfinished"/>
+ <translation>Zeure buruari</translation>
</message>
<message>
<location line="+1"/>
<source>Mined</source>
- <translation type="unfinished"/>
+ <translation>Bildua</translation>
</message>
<message>
<location line="+1"/>
<source>Other</source>
- <translation type="unfinished"/>
+ <translation>Beste</translation>
</message>
<message>
<location line="+7"/>
<source>Enter address or label to search</source>
- <translation type="unfinished"/>
+ <translation>Sartu bilatzeko helbide edo etiketa</translation>
</message>
<message>
<location line="+7"/>
<source>Min amount</source>
- <translation type="unfinished"/>
+ <translation>Kopuru minimoa</translation>
</message>
<message>
<location line="+34"/>
<source>Copy address</source>
- <translation type="unfinished"/>
+ <translation>Kopiatu helbidea</translation>
</message>
<message>
<location line="+1"/>
<source>Copy label</source>
- <translation type="unfinished"/>
+ <translation>Kopiatu etiketa</translation>
</message>
<message>
<location line="+1"/>
@@ -2048,6 +2026,11 @@ Address: %4
</message>
<message>
<location line="+1"/>
+ <source>Copy transaction ID</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Edit label</source>
<translation type="unfinished"/>
</message>
@@ -2057,14 +2040,14 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+142"/>
+ <location line="+139"/>
<source>Export Transaction Data</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+1"/>
<source>Comma separated file (*.csv)</source>
- <translation type="unfinished"/>
+ <translation>Komaz bereizitako artxiboa (*.csv)</translation>
</message>
<message>
<location line="+8"/>
@@ -2074,17 +2057,17 @@ Address: %4
<message>
<location line="+1"/>
<source>Date</source>
- <translation type="unfinished"/>
+ <translation>Data</translation>
</message>
<message>
<location line="+1"/>
<source>Type</source>
- <translation type="unfinished"/>
+ <translation>Mota</translation>
</message>
<message>
<location line="+1"/>
<source>Label</source>
- <translation type="unfinished"/>
+ <translation>Etiketa</translation>
</message>
<message>
<location line="+1"/>
@@ -2094,7 +2077,7 @@ Address: %4
<message>
<location line="+1"/>
<source>Amount</source>
- <translation type="unfinished"/>
+ <translation>Kopurua</translation>
</message>
<message>
<location line="+1"/>
@@ -2104,15 +2087,15 @@ Address: %4
<message>
<location line="+4"/>
<source>Error exporting</source>
- <translation type="unfinished"/>
+ <translation>Errorea esportatzean</translation>
</message>
<message>
<location line="+0"/>
<source>Could not write to file %1.</source>
- <translation type="unfinished"/>
+ <translation>Ezin idatzi %1 artxiboan.</translation>
</message>
<message>
- <location line="+95"/>
+ <location line="+100"/>
<source>Range:</source>
<translation type="unfinished"/>
</message>
@@ -2123,29 +2106,172 @@ Address: %4
</message>
</context>
<context>
+ <name>WalletView</name>
+ <message>
+ <location filename="../walletview.cpp" line="+95"/>
+ <source>&amp;Overview</source>
+ <translation>&amp;Gainbegiratu</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Show general overview of wallet</source>
+ <translation>Ikusi zorroaren begirada orokorra</translation>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>&amp;Send coins</source>
+ <translation>&amp;Bidali txanponak</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Send coins to a Bitcoin address</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>&amp;Receive coins</source>
+ <translation>&amp;Jaso txanponak</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Show the list of addresses for receiving payments</source>
+ <translation>Erakutsi ordainketak jasotzeko helbideen zerrenda</translation>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>&amp;Transactions</source>
+ <translation>&amp;Transakzioak</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Browse transaction history</source>
+ <translation>Ikusi transakzioen historia</translation>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>&amp;Address Book</source>
+ <translation>&amp;Helbide-liburua</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Edit the list of stored addresses and labels</source>
+ <translation>Editatu gordetako helbide eta etiketen zerrenda</translation>
+ </message>
+ <message>
+ <location line="+12"/>
+ <source>&amp;Encrypt Wallet...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Encrypt the private keys that belong to your wallet</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>&amp;Backup Wallet...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Backup wallet to another location</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>&amp;Change Passphrase...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Change the passphrase used for wallet encryption</source>
+ <translation>Aldatu zorroa enkriptatzeko erabilitako pasahitza</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Sign &amp;message...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Sign messages with your Bitcoin addresses to prove you own them</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>&amp;Verify message...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Verify messages to ensure they were signed with specified Bitcoin addresses</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>&amp;Export...</source>
+ <translation>&amp;Esportatu...</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Export the data in the current tab to a file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+180"/>
+ <source>Backup Wallet</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>Wallet Data (*.dat)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Backup Failed</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>There was an error trying to save the wallet data to the new location.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>Backup Successful</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>The wallet data was successfully saved to the new location.</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>bitcoin-core</name>
<message>
- <location filename="../bitcoinstrings.cpp" line="+88"/>
+ <location filename="../bitcoinstrings.cpp" line="+96"/>
<source>Bitcoin version</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+82"/>
+ <location line="+98"/>
<source>Usage:</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-23"/>
+ <location line="-24"/>
<source>Send command to -server or bitcoind</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-21"/>
+ <location line="-22"/>
<source>List commands</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-11"/>
+ <location line="-10"/>
<source>Get help for a command</source>
<translation type="unfinished"/>
</message>
@@ -2170,12 +2296,12 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="-15"/>
+ <location line="-28"/>
<source>Don&apos;t generate coins</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+61"/>
+ <location line="+74"/>
<source>Specify data directory</source>
<translation type="unfinished"/>
</message>
@@ -2185,80 +2311,82 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="-26"/>
+ <location line="-27"/>
<source>Listen for connections on &lt;port&gt; (default: 8333 or testnet: 18333)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+4"/>
+ <location line="+5"/>
<source>Maintain at most &lt;n&gt; connections to peers (default: 125)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-34"/>
+ <location line="-49"/>
<source>Connect to a node to retrieve peer addresses, and disconnect</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+65"/>
+ <location line="+80"/>
<source>Specify your own public address</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+2"/>
+ <location line="+3"/>
<source>Threshold for disconnecting misbehaving peers (default: 100)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-114"/>
+ <location line="-132"/>
<source>Number of seconds to keep misbehaving peers from reconnecting (default: 86400)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-28"/>
+ <location line="-32"/>
<source>An error occurred while setting up the RPC port %u for listening on IPv4: %s</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+26"/>
+ <location line="+30"/>
<source>Listen for JSON-RPC connections on &lt;port&gt; (default: 8332 or testnet: 18332)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+34"/>
+ <location line="+36"/>
<source>Accept command line and JSON-RPC commands</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+62"/>
+ <location line="+77"/>
<source>Run in the background as a daemon and accept commands</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+31"/>
+ <location line="+32"/>
<source>Use the test network</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-92"/>
+ <location line="-108"/>
<source>Accept connections from outside (default: 1 if no -proxy or -connect)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-74"/>
+ <location line="-82"/>
<source>%s, you must set a rpcpassword in the configuration file:
- %s
+%s
It is recommended you use the following random password:
rpcuser=bitcoinrpc
rpcpassword=%s
(you do not need to remember this password)
The username and password MUST NOT be the same.
If the file does not exist, create it with owner-readable-only file permissions.
+It is also recommended to set alertnotify so you are notified of problems;
+for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.com
</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+15"/>
+ <location line="+17"/>
<source>An error occurred while setting up the RPC port %u for listening on IPv6, falling back to IPv4: %s</source>
<translation type="unfinished"/>
</message>
@@ -2274,11 +2402,6 @@ If the file does not exist, create it with owner-readable-only file permissions.
</message>
<message>
<location line="+3"/>
- <source>Corrupted block database detected. Please restart the client with -reindex.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+2"/>
<source>Error initializing database environment %s! To recover, BACKUP THAT DIRECTORY, then remove everything from it except for wallet.dat.</source>
<translation type="unfinished"/>
</message>
@@ -2293,12 +2416,27 @@ If the file does not exist, create it with owner-readable-only file permissions.
<translation type="unfinished"/>
</message>
<message>
+ <location line="+3"/>
+ <source>Execute command when a relevant alert is received (%s in cmd is replaced by message)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Execute command when a wallet transaction changes (%s in cmd is replaced by TxID)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location line="+11"/>
<source>Set maximum size of high-priority/low-fee transactions in bytes (default: 27000)</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+3"/>
+ <source>Set the number of script verification threads (1-16, 0=auto, default: 0)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
<source>This is a pre-release test build - use at your own risk - do not use for mining or merchant applications</source>
<translation type="unfinished"/>
</message>
@@ -2344,16 +2482,41 @@ If the file does not exist, create it with owner-readable-only file permissions.
</message>
<message>
<location line="+3"/>
+ <source>Corrupted block database detected</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Discover own IP address (default: 1 when listening and no -externalip)</source>
<translation type="unfinished"/>
</message>
<message>
+ <location line="+1"/>
+ <source>Do you want to rebuild the block database now?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location line="+3"/>
+ <source>Error initializing block database</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Error initializing wallet database environment %s!</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Error loading block database</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+5"/>
+ <location line="+4"/>
+ <source>Error opening block database</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
<source>Error: Disk space is low!</source>
<translation type="unfinished"/>
</message>
@@ -2369,26 +2532,96 @@ If the file does not exist, create it with owner-readable-only file permissions.
</message>
<message>
<location line="+2"/>
+ <source>Error: system error: </source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Failed to listen on any port. Use -listen=0 if you want this.</source>
<translation type="unfinished"/>
</message>
<message>
+ <location line="+1"/>
+ <source>Failed to read block info</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Failed to read block</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Failed to sync block index</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Failed to write block index</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Failed to write block info</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Failed to write block</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Failed to write file info</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Failed to write to coin database</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Failed to write transaction index</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Failed to write undo data</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location line="+2"/>
<source>Find peers using DNS lookup (default: 1 unless -connect)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+5"/>
- <source>How thorough the block verification is (0-4, default: 3)</source>
+ <location line="+3"/>
+ <source>How many blocks to check at startup (default: 288, 0 = all)</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+1"/>
- <source>Importing blocks from block database...</source>
+ <source>How thorough the block verification is (0-4, default: 3)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+24"/>
+ <source>Rebuild block chain index from current blk000??.dat files</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+37"/>
+ <source>Verifying blocks...</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+1"/>
+ <source>Verifying wallet...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-61"/>
<source>Imports blocks from external blk000??.dat file</source>
<translation type="unfinished"/>
</message>
@@ -2403,7 +2636,12 @@ If the file does not exist, create it with owner-readable-only file permissions.
<translation type="unfinished"/>
</message>
<message>
- <location line="+9"/>
+ <location line="+8"/>
+ <source>Maintain a full transaction index (default: 0)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
<source>Maximum per-connection receive buffer, &lt;n&gt;*1000 bytes (default: 5000)</source>
<translation type="unfinished"/>
</message>
@@ -2438,12 +2676,7 @@ If the file does not exist, create it with owner-readable-only file permissions.
<translation type="unfinished"/>
</message>
<message>
- <location line="+1"/>
- <source>Rebuild blockchain index from current blk000??.dat files</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+4"/>
+ <location line="+5"/>
<source>SSL options: (see the Bitcoin Wiki for SSL setup instructions)</source>
<translation type="unfinished"/>
</message>
@@ -2483,7 +2716,12 @@ If the file does not exist, create it with owner-readable-only file permissions.
<translation type="unfinished"/>
</message>
<message>
- <location line="+13"/>
+ <location line="+4"/>
+ <source>System error: </source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+10"/>
<source>Use UPnP to map the listening port (default: 0)</source>
<translation type="unfinished"/>
</message>
@@ -2514,36 +2752,41 @@ If the file does not exist, create it with owner-readable-only file permissions.
</message>
<message>
<location line="+1"/>
+ <source>You need to rebuild the databases using -reindex to change -txindex</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>wallet.dat corrupt, salvage failed</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-43"/>
+ <location line="-45"/>
<source>Password for JSON-RPC connections</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-53"/>
+ <location line="-68"/>
<source>Allow JSON-RPC connections from specified IP address</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+62"/>
+ <location line="+77"/>
<source>Send commands to node running on &lt;ip&gt; (default: 127.0.0.1)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-103"/>
+ <location line="-120"/>
<source>Execute command when the best block changes (%s in cmd is replaced by block hash)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+124"/>
+ <location line="+142"/>
<source>Upgrade wallet to latest format</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-15"/>
+ <location line="-16"/>
<source>Set key pool size to &lt;n&gt; (default: 100)</source>
<translation type="unfinished"/>
</message>
@@ -2553,17 +2796,12 @@ If the file does not exist, create it with owner-readable-only file permissions.
<translation type="unfinished"/>
</message>
<message>
- <location line="-26"/>
- <source>How many blocks to check at startup (default: 2500, 0 = all)</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+55"/>
+ <location line="+30"/>
<source>Use OpenSSL (https) for JSON-RPC connections</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-20"/>
+ <location line="-21"/>
<source>Server certificate file (default: server.cert)</source>
<translation type="unfinished"/>
</message>
@@ -2573,12 +2811,12 @@ If the file does not exist, create it with owner-readable-only file permissions.
<translation type="unfinished"/>
</message>
<message>
- <location line="-133"/>
+ <location line="-154"/>
<source>Acceptable ciphers (default: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+144"/>
+ <location line="+166"/>
<source>This help message</source>
<translation type="unfinished"/>
</message>
@@ -2588,7 +2826,7 @@ If the file does not exist, create it with owner-readable-only file permissions.
<translation type="unfinished"/>
</message>
<message>
- <location line="-70"/>
+ <location line="-86"/>
<source>Connect through socks proxy</source>
<translation type="unfinished"/>
</message>
@@ -2598,12 +2836,12 @@ If the file does not exist, create it with owner-readable-only file permissions.
<translation type="unfinished"/>
</message>
<message>
- <location line="+43"/>
+ <location line="+57"/>
<source>Loading addresses...</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-25"/>
+ <location line="-35"/>
<source>Error loading wallet.dat: Wallet corrupted</source>
<translation type="unfinished"/>
</message>
@@ -2613,32 +2851,22 @@ If the file does not exist, create it with owner-readable-only file permissions.
<translation type="unfinished"/>
</message>
<message>
- <location line="+73"/>
- <source>Verifying block database integrity...</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+1"/>
- <source>Verifying wallet integrity...</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+1"/>
+ <location line="+87"/>
<source>Wallet needed to be rewritten: restart Bitcoin to complete</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-77"/>
+ <location line="-89"/>
<source>Error loading wallet.dat</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+20"/>
+ <location line="+30"/>
<source>Invalid -proxy address: &apos;%s&apos;</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+46"/>
+ <location line="+48"/>
<source>Unknown network specified in -onlynet: &apos;%s&apos;</source>
<translation type="unfinished"/>
</message>
@@ -2648,7 +2876,7 @@ If the file does not exist, create it with owner-readable-only file permissions.
<translation type="unfinished"/>
</message>
<message>
- <location line="-75"/>
+ <location line="-91"/>
<source>Cannot resolve -bind address: &apos;%s&apos;</source>
<translation type="unfinished"/>
</message>
@@ -2658,17 +2886,17 @@ If the file does not exist, create it with owner-readable-only file permissions.
<translation type="unfinished"/>
</message>
<message>
- <location line="+31"/>
+ <location line="+45"/>
<source>Invalid amount for -paytxfee=&lt;amount&gt;: &apos;%s&apos;</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-15"/>
+ <location line="-24"/>
<source>Error: could not start node</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+16"/>
+ <location line="+25"/>
<source>Invalid amount</source>
<translation type="unfinished"/>
</message>
@@ -2683,7 +2911,7 @@ If the file does not exist, create it with owner-readable-only file permissions.
<translation type="unfinished"/>
</message>
<message>
- <location line="-45"/>
+ <location line="-59"/>
<source>Add a node to connect to and attempt to keep the connection open</source>
<translation type="unfinished"/>
</message>
@@ -2693,22 +2921,17 @@ If the file does not exist, create it with owner-readable-only file permissions.
<translation type="unfinished"/>
</message>
<message>
- <location line="+54"/>
- <source>Find peers using internet relay chat (default: 0)</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="-2"/>
+ <location line="+68"/>
<source>Fee per KB to add to transactions you send</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+19"/>
+ <location line="+17"/>
<source>Loading wallet...</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-40"/>
+ <location line="-54"/>
<source>Cannot downgrade wallet</source>
<translation type="unfinished"/>
</message>
@@ -2723,27 +2946,27 @@ If the file does not exist, create it with owner-readable-only file permissions.
<translation type="unfinished"/>
</message>
<message>
- <location line="+49"/>
+ <location line="+64"/>
<source>Rescanning...</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-43"/>
+ <location line="-56"/>
<source>Done loading</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+65"/>
+ <location line="+79"/>
<source>To use the %s option</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-60"/>
+ <location line="-71"/>
<source>Error</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-28"/>
+ <location line="-33"/>
<source>You must set rpcpassword=&lt;password&gt; in the configuration file:
%s
If the file does not exist, create it with owner-readable-only file permissions.</source>
diff --git a/src/qt/locale/bitcoin_fa.ts b/src/qt/locale/bitcoin_fa.ts
index 441710a126..1984b0fd5f 100644
--- a/src/qt/locale/bitcoin_fa.ts
+++ b/src/qt/locale/bitcoin_fa.ts
@@ -13,12 +13,7 @@
<translation>نسخه Bitcoin</translation>
</message>
<message>
- <location line="+41"/>
- <source>Copyright © 2009-2012 The Bitcoin developers</source>
- <translation>حق مول٠© 2009-2012 توسعه دهندگان bitcoin</translation>
- </message>
- <message>
- <location line="+13"/>
+ <location line="+57"/>
<source>
This is experimental software.
@@ -27,6 +22,16 @@ Distributed under the MIT/X11 software license, see the accompanying file COPYIN
This product includes software developed by the OpenSSL Project for use in the OpenSSL Toolkit (http://www.openssl.org/) and cryptographic software written by Eric Young (eay@cryptsoft.com) and UPnP software written by Thomas Bernard.</source>
<translation>⎠⎠این نسخه نرم اÙزار آزمایشی است⎠⎠نرم اÙزار تحت لیسانس MIT/X11 منتشر شده است. به Ùایل coping یا آدرس http://www.opensource.org/licenses/mit-license.php. مراجعه شود⎠⎠این محصول شامل نرم اÙزاری است Ú©Ù‡ با OpenSSL برای استÙاده از OpenSSL Toolkit (http://www.openssl.org/) Ùˆ نرم اÙزار نوشته شده توسط اریک یانگ (eay@cryptsoft.com ) Ùˆ UPnP توسط توماس برنارد طراحی شده است.</translation>
</message>
+ <message>
+ <location filename="../aboutdialog.cpp" line="+17"/>
+ <source>Copyright</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>2009-%1 The Bitcoin developers</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>AddressBookPage</name>
@@ -101,17 +106,22 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation>حذÙ</translation>
</message>
<message>
- <location filename="../addressbookpage.cpp" line="+65"/>
+ <location filename="../addressbookpage.cpp" line="+66"/>
<source>Copy &amp;Label</source>
<translation>کپی و برچسب گذاری</translation>
</message>
<message>
- <location line="+2"/>
+ <location line="+1"/>
<source>&amp;Edit</source>
<translation>ویرایش</translation>
</message>
<message>
- <location line="+250"/>
+ <location line="+1"/>
+ <source>Send &amp;Coins</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+263"/>
<source>Export Address Book Data</source>
<translation>آدرس انتخاب شده در سیستم تخته رسم گیره دار کپی کنید</translation>
</message>
@@ -134,7 +144,7 @@ This product includes software developed by the OpenSSL Project for use in the O
<context>
<name>AddressTableModel</name>
<message>
- <location filename="../addresstablemodel.cpp" line="+142"/>
+ <location filename="../addresstablemodel.cpp" line="+144"/>
<source>Label</source>
<translation>بر چسب</translation>
</message>
@@ -294,17 +304,17 @@ This product includes software developed by the OpenSSL Project for use in the O
<context>
<name>BitcoinGUI</name>
<message>
- <location filename="../bitcoingui.cpp" line="+267"/>
+ <location filename="../bitcoingui.cpp" line="+231"/>
<source>Sign &amp;message...</source>
<translation>امضا و پیام</translation>
</message>
<message>
- <location line="+254"/>
+ <location line="+299"/>
<source>Synchronizing with network...</source>
<translation>همگام سازی با شبکه ...</translation>
</message>
<message>
- <location line="-322"/>
+ <location line="-367"/>
<source>&amp;Overview</source>
<translation>بررسی اجمالی</translation>
</message>
@@ -324,32 +334,17 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation>نمایش تاریخ معاملات</translation>
</message>
<message>
- <location line="+6"/>
- <source>&amp;Address Book</source>
- <translation>دÙتر آدرس</translation>
- </message>
- <message>
- <location line="+1"/>
+ <location line="+7"/>
<source>Edit the list of stored addresses and labels</source>
<translation>ویرایش لیست آدرسها و بر چسب های ذخیره ای</translation>
</message>
<message>
- <location line="-15"/>
- <source>&amp;Receive coins</source>
- <translation>در یاÙت سکه</translation>
- </message>
- <message>
- <location line="+1"/>
+ <location line="-14"/>
<source>Show the list of addresses for receiving payments</source>
<translation>نمایش لیست آدرس ها برای در یاÙت پر داخت ها</translation>
</message>
<message>
- <location line="-8"/>
- <source>&amp;Send coins</source>
- <translation>رسال سکه ها</translation>
- </message>
- <message>
- <location line="+39"/>
+ <location line="+31"/>
<source>E&amp;xit</source>
<translation>خروج</translation>
</message>
@@ -394,7 +389,7 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation>تغییر Passphrase</translation>
</message>
<message>
- <location line="+259"/>
+ <location line="+304"/>
<source>Importing blocks from disk...</source>
<translation type="unfinished"/>
</message>
@@ -403,14 +398,8 @@ This product includes software developed by the OpenSSL Project for use in the O
<source>Reindexing blocks on disk...</source>
<translation type="unfinished"/>
</message>
- <message numerus="yes">
- <location line="+10"/>
- <source>~%n block(s) remaining</source>
- <translation><numerusform>%n بلاک٠باقیمانده
-%n بلاک٠باقیمانده</numerusform></translation>
- </message>
<message>
- <location line="-265"/>
+ <location line="-300"/>
<source>&amp;Export...</source>
<translation>&amp;;صادرات</translation>
</message>
@@ -455,18 +444,33 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation>بازبینی پیام</translation>
</message>
<message>
- <location line="-196"/>
- <location line="+538"/>
+ <location line="-162"/>
+ <location line="+540"/>
<source>Bitcoin</source>
<translation>یت کویین </translation>
</message>
<message>
- <location line="-538"/>
+ <location line="-540"/>
<source>Wallet</source>
<translation>wallet</translation>
</message>
<message>
- <location line="+176"/>
+ <location line="+99"/>
+ <source>&amp;Send</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+7"/>
+ <source>&amp;Receive</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+14"/>
+ <source>&amp;Addresses</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+22"/>
<source>&amp;About Bitcoin</source>
<translation>در مورد bitcoin</translation>
</message>
@@ -527,97 +531,92 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation>آزمایش شبکه</translation>
</message>
<message>
- <location line="+63"/>
+ <location line="+47"/>
<source>Bitcoin client</source>
<translation>مشتری Bitcoin</translation>
</message>
<message numerus="yes">
- <location line="+79"/>
+ <location line="+140"/>
<source>%n active connection(s) to Bitcoin network</source>
<translation><numerusform>در صد ارتباطات Ùعال بیتکویین با شبکه %n</numerusform></translation>
</message>
<message>
- <location line="+45"/>
- <source>Processed %1 of %2 blocks of transaction history (%3% done).</source>
+ <location line="+39"/>
+ <source>Processed %1 of %2 (estimated) blocks of transaction history.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+7"/>
+ <location line="+4"/>
<source>Processed %1 blocks of transaction history.</source>
<translation type="unfinished"/>
</message>
+ <message numerus="yes">
+ <location line="+20"/>
+ <source>%n hour(s)</source>
+ <translation type="unfinished"><numerusform></numerusform></translation>
+ </message>
+ <message numerus="yes">
+ <location line="+4"/>
+ <source>%n day(s)</source>
+ <translation type="unfinished"><numerusform></numerusform></translation>
+ </message>
+ <message numerus="yes">
+ <location line="+4"/>
+ <source>%n week(s)</source>
+ <translation type="unfinished"><numerusform></numerusform></translation>
+ </message>
<message>
- <location line="+70"/>
- <source>Error</source>
+ <location line="+5"/>
+ <source>%1 behind</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+3"/>
- <source>Warning</source>
+ <location line="+14"/>
+ <source>Last received block was generated %1 ago.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+3"/>
- <source>Information</source>
+ <location line="+2"/>
+ <source>Transactions after this will not yet be visible.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+66"/>
- <source>This transaction is over the size limit. You can still send it for a fee of %1, which goes to the nodes that process your transaction and helps to support the network. Do you want to pay the fee?</source>
+ <location line="+21"/>
+ <source>Error</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+210"/>
- <source>Backup Successful</source>
+ <location line="+3"/>
+ <source>Warning</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+0"/>
- <source>The wallet data was successfully saved to the new location.</source>
+ <location line="+3"/>
+ <source>Information</source>
<translation type="unfinished"/>
</message>
- <message numerus="yes">
- <location line="-338"/>
- <source>%n second(s) ago</source>
- <translation><numerusform>%n بعد از چند دقیقه</numerusform></translation>
- </message>
- <message numerus="yes">
- <location line="+4"/>
- <source>%n minute(s) ago</source>
- <translation><numerusform>%n بعد از چند دقیقه </numerusform></translation>
- </message>
- <message numerus="yes">
- <location line="+4"/>
- <source>%n hour(s) ago</source>
- <translation><numerusform>%n بعد از چند دقیقه </numerusform></translation>
- </message>
- <message numerus="yes">
- <location line="+4"/>
- <source>%n day(s) ago</source>
- <translation><numerusform>%n بعد از چند روزز </numerusform></translation>
+ <message>
+ <location line="+68"/>
+ <source>This transaction is over the size limit. You can still send it for a fee of %1, which goes to the nodes that process your transaction and helps to support the network. Do you want to pay the fee?</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location line="+6"/>
+ <location line="-138"/>
<source>Up to date</source>
<translation>تا تاریخ</translation>
</message>
<message>
- <location line="+7"/>
+ <location line="+32"/>
<source>Catching up...</source>
<translation>ابتلا به بالا</translation>
</message>
<message>
- <location line="+10"/>
- <source>Last received block was generated %1.</source>
- <translation>خرین بلوک در یاÙت شده تولید شده بود %1 </translation>
- </message>
- <message>
- <location line="+97"/>
+ <location line="+110"/>
<source>Confirm transaction fee</source>
<translation>هزینه تراکنش را تایید کنید</translation>
</message>
<message>
- <location line="+23"/>
+ <location line="+8"/>
<source>Sent transaction</source>
<translation>معامله ارسال شده</translation>
</message>
@@ -639,14 +638,14 @@ Address: %4
آدرس %4</translation>
</message>
<message>
- <location line="+99"/>
- <location line="+28"/>
+ <location line="+33"/>
+ <location line="+23"/>
<source>URI handling</source>
<translation>مدیریت URI</translation>
</message>
<message>
- <location line="-28"/>
- <location line="+28"/>
+ <location line="-23"/>
+ <location line="+23"/>
<source>URI can not be parsed! This can be caused by an invalid Bitcoin address or malformed URI parameters.</source>
<translation>URI قابل تحلیل نیست. این خطا ممکن است به دلیل ادرس BITCOIN اشتباه یا پارامترهای اشتباه URI رخ داده باشد</translation>
</message>
@@ -661,27 +660,7 @@ Address: %4
<translation>زمایش شبکه</translation>
</message>
<message>
- <location line="+23"/>
- <source>Backup Wallet</source>
- <translation>نسخه پیشتیبان از wallet </translation>
- </message>
- <message>
- <location line="+0"/>
- <source>Wallet Data (*.dat)</source>
- <translation>داده wallet (*.DAT)</translation>
- </message>
- <message>
- <location line="+3"/>
- <source>Backup Failed</source>
- <translation>عملیات پیشتیبان گیری انجام نشد</translation>
- </message>
- <message>
- <location line="+0"/>
- <source>There was an error trying to save the wallet data to the new location.</source>
- <translation>در زمان انتقال داده wallet به محل جدید خطا روی داد</translation>
- </message>
- <message>
- <location filename="../bitcoin.cpp" line="+109"/>
+ <location filename="../bitcoin.cpp" line="+108"/>
<source>A fatal error occurred. Bitcoin can no longer continue safely and will quit.</source>
<translation>خطا روی داده است. Bitcoin نمی تواند بدون مشکل ادامه دهد و باید بسته شود</translation>
</message>
@@ -689,7 +668,7 @@ Address: %4
<context>
<name>ClientModel</name>
<message>
- <location filename="../clientmodel.cpp" line="+86"/>
+ <location filename="../clientmodel.cpp" line="+96"/>
<source>Network Alert</source>
<translation>پیام شبکه</translation>
</message>
@@ -722,7 +701,7 @@ Address: %4
<translation>آدرس با دÙتر آدرس ورودی مرتبط است. این Ùقط در مورد آدرسهای ارسال شده است</translation>
</message>
<message>
- <location filename="../editaddressdialog.cpp" line="+20"/>
+ <location filename="../editaddressdialog.cpp" line="+21"/>
<source>New receiving address</source>
<translation>آدرس در یاÙت نو</translation>
</message>
@@ -742,17 +721,17 @@ Address: %4
<translation>اصلاح آدرس ارسال</translation>
</message>
<message>
- <location line="+60"/>
+ <location line="+76"/>
<source>The entered address &quot;%1&quot; is already in the address book.</source>
<translation>%1آدرس وارد شده دیگر در دÙتر آدرس است</translation>
</message>
<message>
- <location line="+5"/>
+ <location line="-5"/>
<source>The entered address &quot;%1&quot; is not a valid Bitcoin address.</source>
<translation>آدرس وارد شده %1 یک ادرس صحیح bitcoin نیست</translation>
</message>
<message>
- <location line="+5"/>
+ <location line="+10"/>
<source>Could not unlock wallet.</source>
<translation>رمز گشایی پنجره امکان پذیر نیست</translation>
</message>
@@ -765,7 +744,7 @@ Address: %4
<context>
<name>GUIUtil::HelpMessageBox</name>
<message>
- <location filename="../guiutil.cpp" line="+419"/>
+ <location filename="../guiutil.cpp" line="+422"/>
<location line="+12"/>
<source>Bitcoin-Qt</source>
<translation>Bitcoin-Qt</translation>
@@ -979,7 +958,7 @@ Address: %4
<translation>انجام</translation>
</message>
<message>
- <location filename="../optionsdialog.cpp" line="+55"/>
+ <location filename="../optionsdialog.cpp" line="+53"/>
<source>default</source>
<translation>پیش Ùرض</translation>
</message>
@@ -1024,23 +1003,18 @@ Address: %4
<translation>تراز</translation>
</message>
<message>
- <location line="+51"/>
- <location line="+183"/>
+ <location line="+50"/>
+ <location line="+166"/>
<source>The displayed information may be out of date. Your wallet automatically synchronizes with the Bitcoin network after a connection is established, but this process has not completed yet.</source>
<translation>اطلاعات نمایش داده شده روزآمد نیستند.wallet شما به صورت خودکار با شبکه bitcoin بعد از برقراری اتصال روزآمد Ù…ÛŒ شود اما این Ùرایند هنوز کامل نشده است.</translation>
</message>
<message>
- <location line="-141"/>
+ <location line="-124"/>
<source>Balance:</source>
<translation>راز:</translation>
</message>
<message>
- <location line="+58"/>
- <source>Number of transactions:</source>
- <translation>تعداد معامله</translation>
- </message>
- <message>
- <location line="-29"/>
+ <location line="+29"/>
<source>Unconfirmed:</source>
<translation>تایید نشده</translation>
</message>
@@ -1050,7 +1024,7 @@ Address: %4
<translation>wallet</translation>
</message>
<message>
- <location line="+124"/>
+ <location line="+107"/>
<source>Immature:</source>
<translation>نابالغ</translation>
</message>
@@ -1065,7 +1039,7 @@ Address: %4
<translation>اخرین معاملات&amp;lt</translation>
</message>
<message>
- <location line="-118"/>
+ <location line="-101"/>
<source>Your current balance</source>
<translation>تزار جاری شما</translation>
</message>
@@ -1075,11 +1049,6 @@ Address: %4
<translation>تعداد معاملات Ú©Ù‡ تایید شده ولی هنوز در تزار جاری شما بر شمار نرÙته است</translation>
</message>
<message>
- <location line="+20"/>
- <source>Total number of transactions in wallet</source>
- <translation>تعداد معاملات در صندوق</translation>
- </message>
- <message>
<location filename="../overviewpage.cpp" line="+115"/>
<location line="+1"/>
<source>out of sync</source>
@@ -1087,6 +1056,14 @@ Address: %4
</message>
</context>
<context>
+ <name>PaymentServer</name>
+ <message>
+ <location filename="../paymentserver.cpp" line="+107"/>
+ <source>Cannot start bitcoin: click-to-pay handler</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>QRCodeDialog</name>
<message>
<location filename="../forms/qrcodedialog.ui" line="+14"/>
@@ -1425,7 +1402,7 @@ Address: %4
</message>
<message>
<location line="+60"/>
- <location filename="../sendcoinsentry.cpp" line="+25"/>
+ <location filename="../sendcoinsentry.cpp" line="+26"/>
<source>Enter a label for this address to add it to your address book</source>
<translation>برای آدرس بر پسب وارد کنید Ú©Ù‡ در دÙتر آدرس اضاÙÙ‡ شود</translation>
</message>
@@ -1661,7 +1638,7 @@ Address: %4
<context>
<name>TransactionDesc</name>
<message>
- <location filename="../transactiondesc.cpp" line="+19"/>
+ <location filename="../transactiondesc.cpp" line="+20"/>
<source>Open until %1</source>
<translation>باز کردن تا%1</translation>
</message>
@@ -1850,7 +1827,7 @@ Address: %4
<context>
<name>TransactionTableModel</name>
<message>
- <location filename="../transactiontablemodel.cpp" line="+226"/>
+ <location filename="../transactiontablemodel.cpp" line="+225"/>
<source>Date</source>
<translation>تاریخ</translation>
</message>
@@ -1969,7 +1946,7 @@ Address: %4
<context>
<name>TransactionView</name>
<message>
- <location filename="../transactionview.cpp" line="+55"/>
+ <location filename="../transactionview.cpp" line="+52"/>
<location line="+16"/>
<source>All</source>
<translation>همه</translation>
@@ -2056,6 +2033,11 @@ Address: %4
</message>
<message>
<location line="+1"/>
+ <source>Copy transaction ID</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Edit label</source>
<translation>اصلاح بر چسب</translation>
</message>
@@ -2065,7 +2047,7 @@ Address: %4
<translation>جزئیات تراکنش را نمایش بده</translation>
</message>
<message>
- <location line="+142"/>
+ <location line="+139"/>
<source>Export Transaction Data</source>
<translation>صادرات تاریخ معامله</translation>
</message>
@@ -2120,7 +2102,7 @@ Address: %4
<translation>تا Ùایل %1 نمی شود نوشت</translation>
</message>
<message>
- <location line="+95"/>
+ <location line="+100"/>
<source>Range:</source>
<translation>&gt;محدوده</translation>
</message>
@@ -2131,29 +2113,172 @@ Address: %4
</message>
</context>
<context>
+ <name>WalletView</name>
+ <message>
+ <location filename="../walletview.cpp" line="+95"/>
+ <source>&amp;Overview</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Show general overview of wallet</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>&amp;Send coins</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Send coins to a Bitcoin address</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>&amp;Receive coins</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Show the list of addresses for receiving payments</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>&amp;Transactions</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Browse transaction history</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>&amp;Address Book</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Edit the list of stored addresses and labels</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+12"/>
+ <source>&amp;Encrypt Wallet...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Encrypt the private keys that belong to your wallet</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>&amp;Backup Wallet...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Backup wallet to another location</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>&amp;Change Passphrase...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Change the passphrase used for wallet encryption</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Sign &amp;message...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Sign messages with your Bitcoin addresses to prove you own them</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>&amp;Verify message...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Verify messages to ensure they were signed with specified Bitcoin addresses</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>&amp;Export...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Export the data in the current tab to a file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+180"/>
+ <source>Backup Wallet</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>Wallet Data (*.dat)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Backup Failed</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>There was an error trying to save the wallet data to the new location.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>Backup Successful</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>The wallet data was successfully saved to the new location.</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>bitcoin-core</name>
<message>
- <location filename="../bitcoinstrings.cpp" line="+88"/>
+ <location filename="../bitcoinstrings.cpp" line="+96"/>
<source>Bitcoin version</source>
<translation>سخه بیتکویین</translation>
</message>
<message>
- <location line="+82"/>
+ <location line="+98"/>
<source>Usage:</source>
<translation>ستÙاده :</translation>
</message>
<message>
- <location line="-23"/>
+ <location line="-24"/>
<source>Send command to -server or bitcoind</source>
<translation>ارسال Ùرمان به سرور یا باتکویین</translation>
</message>
<message>
- <location line="-21"/>
+ <location line="-22"/>
<source>List commands</source>
<translation>لیست Ùومان ها</translation>
</message>
<message>
- <location line="-11"/>
+ <location line="-10"/>
<source>Get help for a command</source>
<translation>Ú©Ù…Ú© برای Ùرمان </translation>
</message>
@@ -2178,12 +2303,12 @@ Address: %4
<translation>سکه های تولید شده</translation>
</message>
<message>
- <location line="-15"/>
+ <location line="-28"/>
<source>Don&apos;t generate coins</source>
<translation>تولید سکه ها</translation>
</message>
<message>
- <location line="+61"/>
+ <location line="+74"/>
<source>Specify data directory</source>
<translation>دایرکتور اطلاعاتی خاص</translation>
</message>
@@ -2193,80 +2318,82 @@ Address: %4
<translation>سایز Ú©ÙŽØ´ بانک داده را بر حسب مگابایت تنظیم کنید (پیش Ùرض:25)</translation>
</message>
<message>
- <location line="-26"/>
+ <location line="-27"/>
<source>Listen for connections on &lt;port&gt; (default: 8333 or testnet: 18333)</source>
<translation>برای اتصالات به &lt;port&gt; (پیش‌Ùرض: 8333 یا تست‌نت: 18333) گوش کنید</translation>
</message>
<message>
- <location line="+4"/>
+ <location line="+5"/>
<source>Maintain at most &lt;n&gt; connections to peers (default: 125)</source>
<translation>حداکثر &lt;n&gt; اتصال با همکاران برقرار داشته باشید (پیش‌Ùرض: 125)</translation>
</message>
<message>
- <location line="-34"/>
+ <location line="-49"/>
<source>Connect to a node to retrieve peer addresses, and disconnect</source>
<translation>اتصال به گره برای دریاÙت آدرسهای قرینه Ùˆ قطع اتصال</translation>
</message>
<message>
- <location line="+65"/>
+ <location line="+80"/>
<source>Specify your own public address</source>
<translation>آدرس عمومی خود را ذکر کنید</translation>
</message>
<message>
- <location line="+2"/>
+ <location line="+3"/>
<source>Threshold for disconnecting misbehaving peers (default: 100)</source>
<translation>آستانه برای قطع ارتباط با همکاران بدرÙتار (پیش‌Ùرض: 100)</translation>
</message>
<message>
- <location line="-114"/>
+ <location line="-132"/>
<source>Number of seconds to keep misbehaving peers from reconnecting (default: 86400)</source>
<translation>مدت زمان به ثانیه برای جلوگیری از همکاران بدرÙتار برای اتصال دوباره (پیش‌Ùرض: 86400)</translation>
</message>
<message>
- <location line="-28"/>
+ <location line="-32"/>
<source>An error occurred while setting up the RPC port %u for listening on IPv4: %s</source>
<translation>در زمان تنظیم درگاه RPX %u در Ùهرست کردن %s اشکالی رخ داده است</translation>
</message>
<message>
- <location line="+26"/>
+ <location line="+30"/>
<source>Listen for JSON-RPC connections on &lt;port&gt; (default: 8332 or testnet: 18332)</source>
<translation>( 8332پیش Ùرض :) &amp;lt;poort&amp;gt; JSON-RPC شنوایی برای ارتباطات</translation>
</message>
<message>
- <location line="+34"/>
+ <location line="+36"/>
<source>Accept command line and JSON-RPC commands</source>
<translation>JSON-RPC قابل Ùرمانها Ùˆ</translation>
</message>
<message>
- <location line="+62"/>
+ <location line="+77"/>
<source>Run in the background as a daemon and accept commands</source>
<translation>اجرای در پس زمینه به عنوان شبح Ùˆ قبول Ùرمان ها</translation>
</message>
<message>
- <location line="+31"/>
+ <location line="+32"/>
<source>Use the test network</source>
<translation>استÙاده شبکه آزمایش</translation>
</message>
<message>
- <location line="-92"/>
+ <location line="-108"/>
<source>Accept connections from outside (default: 1 if no -proxy or -connect)</source>
<translation>پذیرش اتصالات از بیرون (پیش Ùرض:1 بدون پراکسی یا اتصال)</translation>
</message>
<message>
- <location line="-74"/>
+ <location line="-82"/>
<source>%s, you must set a rpcpassword in the configuration file:
- %s
+%s
It is recommended you use the following random password:
rpcuser=bitcoinrpc
rpcpassword=%s
(you do not need to remember this password)
The username and password MUST NOT be the same.
If the file does not exist, create it with owner-readable-only file permissions.
+It is also recommended to set alertnotify so you are notified of problems;
+for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.com
</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+15"/>
+ <location line="+17"/>
<source>An error occurred while setting up the RPC port %u for listening on IPv6, falling back to IPv4: %s</source>
<translation type="unfinished"/>
</message>
@@ -2282,11 +2409,6 @@ If the file does not exist, create it with owner-readable-only file permissions.
</message>
<message>
<location line="+3"/>
- <source>Corrupted block database detected. Please restart the client with -reindex.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+2"/>
<source>Error initializing database environment %s! To recover, BACKUP THAT DIRECTORY, then remove everything from it except for wallet.dat.</source>
<translation type="unfinished"/>
</message>
@@ -2301,12 +2423,27 @@ If the file does not exist, create it with owner-readable-only file permissions.
<translation type="unfinished"/>
</message>
<message>
+ <location line="+3"/>
+ <source>Execute command when a relevant alert is received (%s in cmd is replaced by message)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Execute command when a wallet transaction changes (%s in cmd is replaced by TxID)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location line="+11"/>
<source>Set maximum size of high-priority/low-fee transactions in bytes (default: 27000)</source>
<translation>حجم حداکثر تراکنشهای با/Ú©Ù… اهمیت را به بایت تنظیم کنید (پیش Ùرض:27000)</translation>
</message>
<message>
<location line="+3"/>
+ <source>Set the number of script verification threads (1-16, 0=auto, default: 0)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
<source>This is a pre-release test build - use at your own risk - do not use for mining or merchant applications</source>
<translation type="unfinished"/>
</message>
@@ -2352,16 +2489,41 @@ If the file does not exist, create it with owner-readable-only file permissions.
</message>
<message>
<location line="+3"/>
+ <source>Corrupted block database detected</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Discover own IP address (default: 1 when listening and no -externalip)</source>
<translation>آدرس Ø¢ÛŒ.Ù¾ÛŒ. خود را شناسایی کنید (پیش Ùرض:1 در زمان when listening Ùˆno -externalip)</translation>
</message>
<message>
+ <location line="+1"/>
+ <source>Do you want to rebuild the block database now?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location line="+3"/>
+ <source>Error initializing block database</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Error initializing wallet database environment %s!</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Error loading block database</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+5"/>
+ <location line="+4"/>
+ <source>Error opening block database</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
<source>Error: Disk space is low!</source>
<translation type="unfinished"/>
</message>
@@ -2377,26 +2539,96 @@ If the file does not exist, create it with owner-readable-only file permissions.
</message>
<message>
<location line="+2"/>
+ <source>Error: system error: </source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Failed to listen on any port. Use -listen=0 if you want this.</source>
<translation>شنیدن هر گونه درگاه انجام پذیر نیست. ازlisten=0 برای اینکار استÙاده کیند.</translation>
</message>
<message>
+ <location line="+1"/>
+ <source>Failed to read block info</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Failed to read block</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Failed to sync block index</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Failed to write block index</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Failed to write block info</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Failed to write block</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Failed to write file info</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Failed to write to coin database</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Failed to write transaction index</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Failed to write undo data</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location line="+2"/>
<source>Find peers using DNS lookup (default: 1 unless -connect)</source>
<translation>قرینه ها را برای جستجوی DNS بیاب (پیش Ùرض: 1 مگر در زمان اتصال)</translation>
</message>
<message>
- <location line="+5"/>
- <source>How thorough the block verification is (0-4, default: 3)</source>
+ <location line="+3"/>
+ <source>How many blocks to check at startup (default: 288, 0 = all)</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+1"/>
- <source>Importing blocks from block database...</source>
+ <source>How thorough the block verification is (0-4, default: 3)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+24"/>
+ <source>Rebuild block chain index from current blk000??.dat files</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+37"/>
+ <source>Verifying blocks...</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+1"/>
+ <source>Verifying wallet...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-61"/>
<source>Imports blocks from external blk000??.dat file</source>
<translation type="unfinished"/>
</message>
@@ -2411,7 +2643,12 @@ If the file does not exist, create it with owner-readable-only file permissions.
<translation>آدرس نرم اÙزار تور غلط است %s</translation>
</message>
<message>
- <location line="+9"/>
+ <location line="+8"/>
+ <source>Maintain a full transaction index (default: 0)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
<source>Maximum per-connection receive buffer, &lt;n&gt;*1000 bytes (default: 5000)</source>
<translation>حداکثر باÙر دریاÙت شده بر اساس اتصال &lt;n&gt;* 1000 بایت (پیش Ùرض:5000)</translation>
</message>
@@ -2446,12 +2683,7 @@ If the file does not exist, create it with owner-readable-only file permissions.
<translation>به خروجی اشکال‌زدایی برچسب زمان بزنید</translation>
</message>
<message>
- <location line="+1"/>
- <source>Rebuild blockchain index from current blk000??.dat files</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+4"/>
+ <location line="+5"/>
<source>SSL options: (see the Bitcoin Wiki for SSL setup instructions)</source>
<translation>گزینه ssl (به ویکیbitcoin برای راهنمای راه اندازی ssl مراجعه شود)</translation>
</message>
@@ -2491,7 +2723,12 @@ If the file does not exist, create it with owner-readable-only file permissions.
<translation>(میلی ثانیه )Ùاصله ارتباط خاص</translation>
</message>
<message>
- <location line="+13"/>
+ <location line="+4"/>
+ <source>System error: </source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+10"/>
<source>Use UPnP to map the listening port (default: 0)</source>
<translation>از UPnP برای شناسایی درگاه شنیداری استÙاده کنید (پیش Ùرض:0)</translation>
</message>
@@ -2522,36 +2759,41 @@ If the file does not exist, create it with owner-readable-only file permissions.
</message>
<message>
<location line="+1"/>
+ <source>You need to rebuild the databases using -reindex to change -txindex</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>wallet.dat corrupt, salvage failed</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-43"/>
+ <location line="-45"/>
<source>Password for JSON-RPC connections</source>
<translation>JSON-RPC عبارت عبور برای ارتباطات</translation>
</message>
<message>
- <location line="-53"/>
+ <location line="-68"/>
<source>Allow JSON-RPC connections from specified IP address</source>
<translation>از آدرس آی پی خاص JSON-RPC قبول ارتباطات</translation>
</message>
<message>
- <location line="+62"/>
+ <location line="+77"/>
<source>Send commands to node running on &lt;ip&gt; (default: 127.0.0.1)</source>
<translation>(127.0.0.1پیش Ùرض: ) &amp;lt;ip&amp;gt; دادن Ùرمانها برای استÙاده گره ها روی</translation>
</message>
<message>
- <location line="-103"/>
+ <location line="-120"/>
<source>Execute command when the best block changes (%s in cmd is replaced by block hash)</source>
<translation>زمانی که بهترین بلاک تغییر کرد، دستور را اجرا کن (%s در cmd با block hash جایگزین شده است)</translation>
</message>
<message>
- <location line="+124"/>
+ <location line="+142"/>
<source>Upgrade wallet to latest format</source>
<translation>wallet را به جدیدترین Ùرمت روزآمد کنید</translation>
</message>
<message>
- <location line="-15"/>
+ <location line="-16"/>
<source>Set key pool size to &lt;n&gt; (default: 100)</source>
<translation> (100پیش Ùرض:)&amp;lt;n&amp;gt; گذاشتن اندازه کلید روی </translation>
</message>
@@ -2561,17 +2803,12 @@ If the file does not exist, create it with owner-readable-only file permissions.
<translation>اسکان مجدد زنجیر بلوکها برای گم والت معامله</translation>
</message>
<message>
- <location line="-26"/>
- <source>How many blocks to check at startup (default: 2500, 0 = all)</source>
- <translation>چند بلاک برای بررسی در زمان startup (پیش Ùرض:2500 , 0=همه)</translation>
- </message>
- <message>
- <location line="+55"/>
+ <location line="+30"/>
<source>Use OpenSSL (https) for JSON-RPC connections</source>
<translation>JSON-RPCبرای ارتباطات استÙاده کنید OpenSSL (https)</translation>
</message>
<message>
- <location line="-20"/>
+ <location line="-21"/>
<source>Server certificate file (default: server.cert)</source>
<translation> (server.certپیش Ùرض: )گواهی نامه سرور</translation>
</message>
@@ -2581,12 +2818,12 @@ If the file does not exist, create it with owner-readable-only file permissions.
<translation>(server.pemپیش Ùرض: ) کلید خصوصی سرور</translation>
</message>
<message>
- <location line="-133"/>
+ <location line="-154"/>
<source>Acceptable ciphers (default: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH)</source>
<translation>رمز های قابل قبول( TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH)</translation>
</message>
<message>
- <location line="+144"/>
+ <location line="+166"/>
<source>This help message</source>
<translation>پیام کمکی</translation>
</message>
@@ -2596,7 +2833,7 @@ If the file does not exist, create it with owner-readable-only file permissions.
<translation>امکان اتصال به %s از این رایانه وجود ندارد ( bind returned error %d, %s)</translation>
</message>
<message>
- <location line="-70"/>
+ <location line="-86"/>
<source>Connect through socks proxy</source>
<translation>اتصال از طریق پراکسی ساکس</translation>
</message>
@@ -2606,12 +2843,12 @@ If the file does not exist, create it with owner-readable-only file permissions.
<translation>به DNS اجازه بده تا برای addnode ، seednode و اتصال جستجو کند</translation>
</message>
<message>
- <location line="+43"/>
+ <location line="+57"/>
<source>Loading addresses...</source>
<translation>بار گیری آدرس ها</translation>
</message>
<message>
- <location line="-25"/>
+ <location line="-35"/>
<source>Error loading wallet.dat: Wallet corrupted</source>
<translation>خطا در بارگیری wallet.dat: کی٠پول خراب شده است</translation>
</message>
@@ -2621,32 +2858,22 @@ If the file does not exist, create it with owner-readable-only file permissions.
<translation>خطا در بارگیری wallet.dat: کی٠پول به ویرایش جدیدتری از Biticon نیاز دارد</translation>
</message>
<message>
- <location line="+73"/>
- <source>Verifying block database integrity...</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+1"/>
- <source>Verifying wallet integrity...</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+1"/>
+ <location line="+87"/>
<source>Wallet needed to be rewritten: restart Bitcoin to complete</source>
<translation>سلام</translation>
</message>
<message>
- <location line="-77"/>
+ <location line="-89"/>
<source>Error loading wallet.dat</source>
<translation>خطا در بارگیری wallet.dat</translation>
</message>
<message>
- <location line="+20"/>
+ <location line="+30"/>
<source>Invalid -proxy address: &apos;%s&apos;</source>
<translation>آدرس پراکسی اشتباه %s</translation>
</message>
<message>
- <location line="+46"/>
+ <location line="+48"/>
<source>Unknown network specified in -onlynet: &apos;%s&apos;</source>
<translation>شبکه مشخص شده غیرقابل شناسایی در onlynet: &apos;%s&apos;</translation>
</message>
@@ -2656,7 +2883,7 @@ If the file does not exist, create it with owner-readable-only file permissions.
<translation>نسخه پراکسی ساکس غیرقابل شناسایی درخواست شده است: %i</translation>
</message>
<message>
- <location line="-75"/>
+ <location line="-91"/>
<source>Cannot resolve -bind address: &apos;%s&apos;</source>
<translation>آدرس قابل اتصال- شناسایی نیست %s</translation>
</message>
@@ -2666,17 +2893,17 @@ If the file does not exist, create it with owner-readable-only file permissions.
<translation>آدرس خارجی قابل اتصال- شناسایی نیست %s</translation>
</message>
<message>
- <location line="+31"/>
+ <location line="+45"/>
<source>Invalid amount for -paytxfee=&lt;amount&gt;: &apos;%s&apos;</source>
<translation>میزان وجه اشتباه برای paytxfee=&lt;میزان وجه&gt;: %s</translation>
</message>
<message>
- <location line="-15"/>
+ <location line="-24"/>
<source>Error: could not start node</source>
<translation>خطا: امکان شروع گره وجود ندارد</translation>
</message>
<message>
- <location line="+16"/>
+ <location line="+25"/>
<source>Invalid amount</source>
<translation>میزان وجه اشتباه</translation>
</message>
@@ -2691,7 +2918,7 @@ If the file does not exist, create it with owner-readable-only file permissions.
<translation>بار گیری شاخص بلوک</translation>
</message>
<message>
- <location line="-45"/>
+ <location line="-59"/>
<source>Add a node to connect to and attempt to keep the connection open</source>
<translation>به اتصال یک گره اضاÙÙ‡ کنید Ùˆ اتصال را باز نگاه دارید</translation>
</message>
@@ -2701,22 +2928,17 @@ If the file does not exist, create it with owner-readable-only file permissions.
<translation>اتصال به %s از این رایانه امکان پذیر نیست. Bitcoin احتمالا در حال اجراست.</translation>
</message>
<message>
- <location line="+54"/>
- <source>Find peers using internet relay chat (default: 0)</source>
- <translation>یاÙتنت قرینه با استÙاده از internet relay chat (پیش Ùرض:0)</translation>
- </message>
- <message>
- <location line="-2"/>
+ <location line="+68"/>
<source>Fee per KB to add to transactions you send</source>
<translation>پر داجت برای هر کیلو بیت برای اضاÙÙ‡ به معامله ارسال</translation>
</message>
<message>
- <location line="+19"/>
+ <location line="+17"/>
<source>Loading wallet...</source>
<translation>بار گیری والت</translation>
</message>
<message>
- <location line="-40"/>
+ <location line="-54"/>
<source>Cannot downgrade wallet</source>
<translation>امکان تنزل نسخه در wallet وجود ندارد</translation>
</message>
@@ -2731,27 +2953,27 @@ If the file does not exist, create it with owner-readable-only file permissions.
<translation>آدرس پیش Ùرض قابل ذخیره نیست</translation>
</message>
<message>
- <location line="+49"/>
+ <location line="+64"/>
<source>Rescanning...</source>
<translation>اسکان مجدد</translation>
</message>
<message>
- <location line="-43"/>
+ <location line="-56"/>
<source>Done loading</source>
<translation>بار گیری انجام شده است</translation>
</message>
<message>
- <location line="+65"/>
+ <location line="+79"/>
<source>To use the %s option</source>
<translation>برای استÙاده از %s از انتخابات</translation>
</message>
<message>
- <location line="-60"/>
+ <location line="-71"/>
<source>Error</source>
<translation>خطا</translation>
</message>
<message>
- <location line="-28"/>
+ <location line="-33"/>
<source>You must set rpcpassword=&lt;password&gt; in the configuration file:
%s
If the file does not exist, create it with owner-readable-only file permissions.</source>
diff --git a/src/qt/locale/bitcoin_fa_IR.ts b/src/qt/locale/bitcoin_fa_IR.ts
index 74e1445263..a3af1a01d7 100644
--- a/src/qt/locale/bitcoin_fa_IR.ts
+++ b/src/qt/locale/bitcoin_fa_IR.ts
@@ -13,12 +13,7 @@
<translation>&lt;b&gt;Bitcoin&lt;/b&gt; version</translation>
</message>
<message>
- <location line="+41"/>
- <source>Copyright © 2009-2012 The Bitcoin developers</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+13"/>
+ <location line="+57"/>
<source>
This is experimental software.
@@ -27,6 +22,16 @@ Distributed under the MIT/X11 software license, see the accompanying file COPYIN
This product includes software developed by the OpenSSL Project for use in the OpenSSL Toolkit (http://www.openssl.org/) and cryptographic software written by Eric Young (eay@cryptsoft.com) and UPnP software written by Thomas Bernard.</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../aboutdialog.cpp" line="+17"/>
+ <source>Copyright</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>2009-%1 The Bitcoin developers</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>AddressBookPage</name>
@@ -101,17 +106,22 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation>Ùˆ حذÙ</translation>
</message>
<message>
- <location filename="../addressbookpage.cpp" line="+65"/>
+ <location filename="../addressbookpage.cpp" line="+66"/>
<source>Copy &amp;Label</source>
<translation>کپی و برچسب</translation>
</message>
<message>
- <location line="+2"/>
+ <location line="+1"/>
<source>&amp;Edit</source>
<translation>و ویرایش</translation>
</message>
<message>
- <location line="+250"/>
+ <location line="+1"/>
+ <source>Send &amp;Coins</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+263"/>
<source>Export Address Book Data</source>
<translation>انتقال اطلاعات دÙترچه آدرس</translation>
</message>
@@ -134,7 +144,7 @@ This product includes software developed by the OpenSSL Project for use in the O
<context>
<name>AddressTableModel</name>
<message>
- <location filename="../addresstablemodel.cpp" line="+142"/>
+ <location filename="../addresstablemodel.cpp" line="+144"/>
<source>Label</source>
<translation>برچسب</translation>
</message>
@@ -293,17 +303,17 @@ This product includes software developed by the OpenSSL Project for use in the O
<context>
<name>BitcoinGUI</name>
<message>
- <location filename="../bitcoingui.cpp" line="+267"/>
+ <location filename="../bitcoingui.cpp" line="+231"/>
<source>Sign &amp;message...</source>
<translation>امضا و پیام</translation>
</message>
<message>
- <location line="+254"/>
+ <location line="+299"/>
<source>Synchronizing with network...</source>
<translation>به روز رسانی با شبکه...</translation>
</message>
<message>
- <location line="-322"/>
+ <location line="-367"/>
<source>&amp;Overview</source>
<translation>و بازبینی</translation>
</message>
@@ -323,32 +333,17 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation>تاریخچه تراکنش را باز کن</translation>
</message>
<message>
- <location line="+6"/>
- <source>&amp;Address Book</source>
- <translation>Ùˆ دÙترجه ادرس</translation>
- </message>
- <message>
- <location line="+1"/>
+ <location line="+7"/>
<source>Edit the list of stored addresses and labels</source>
<translation>Ùهرست آدرسها Ùˆ برچسبهای ذخیره شده را ویرایش Ú©Ù†</translation>
</message>
<message>
- <location line="-15"/>
- <source>&amp;Receive coins</source>
- <translation>Ùˆ دریاÙت سکه ها</translation>
- </message>
- <message>
- <location line="+1"/>
+ <location line="-14"/>
<source>Show the list of addresses for receiving payments</source>
<translation>Ùهرست آدرسها را برای دریاÙت وجه نشان بده</translation>
</message>
<message>
- <location line="-8"/>
- <source>&amp;Send coins</source>
- <translation>و ارسال سکه ها</translation>
- </message>
- <message>
- <location line="+39"/>
+ <location line="+31"/>
<source>E&amp;xit</source>
<translation>خروج</translation>
</message>
@@ -393,7 +388,7 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation>تغییر رمز/پَس ÙرÙیز</translation>
</message>
<message>
- <location line="+259"/>
+ <location line="+304"/>
<source>Importing blocks from disk...</source>
<translation type="unfinished"/>
</message>
@@ -402,14 +397,8 @@ This product includes software developed by the OpenSSL Project for use in the O
<source>Reindexing blocks on disk...</source>
<translation type="unfinished"/>
</message>
- <message numerus="yes">
- <location line="+10"/>
- <source>~%n block(s) remaining</source>
- <translation><numerusform>~%n بلاک باقی مانده است
-~%n بلاک باقی مانده است</numerusform></translation>
- </message>
<message>
- <location line="-265"/>
+ <location line="-300"/>
<source>&amp;Export...</source>
<translation>و صدور</translation>
</message>
@@ -454,18 +443,33 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation type="unfinished"/>
</message>
<message>
- <location line="-196"/>
- <location line="+538"/>
+ <location line="-162"/>
+ <location line="+540"/>
<source>Bitcoin</source>
<translation>bitcoin</translation>
</message>
<message>
- <location line="-538"/>
+ <location line="-540"/>
<source>Wallet</source>
<translation>کی٠پول</translation>
</message>
<message>
- <location line="+176"/>
+ <location line="+99"/>
+ <source>&amp;Send</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+7"/>
+ <source>&amp;Receive</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+14"/>
+ <source>&amp;Addresses</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+22"/>
<source>&amp;About Bitcoin</source>
<translation>&amp;در مورد بیتکویین</translation>
</message>
@@ -526,103 +530,93 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation>[testnet]</translation>
</message>
<message>
- <location line="+63"/>
+ <location line="+47"/>
<source>Bitcoin client</source>
<translation>مشتری bitcoin</translation>
</message>
<message numerus="yes">
- <location line="+79"/>
+ <location line="+140"/>
<source>%n active connection(s) to Bitcoin network</source>
<translation><numerusform>%n ارتباط Ùعال به شبکه Bitcoin
%n ارتباط Ùعال به شبکه Bitcoin</numerusform></translation>
</message>
<message>
- <location line="+45"/>
- <source>Processed %1 of %2 blocks of transaction history (%3% done).</source>
+ <location line="+39"/>
+ <source>Processed %1 of %2 (estimated) blocks of transaction history.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+7"/>
+ <location line="+4"/>
<source>Processed %1 blocks of transaction history.</source>
<translation type="unfinished"/>
</message>
+ <message numerus="yes">
+ <location line="+20"/>
+ <source>%n hour(s)</source>
+ <translation type="unfinished"><numerusform></numerusform></translation>
+ </message>
+ <message numerus="yes">
+ <location line="+4"/>
+ <source>%n day(s)</source>
+ <translation type="unfinished"><numerusform></numerusform></translation>
+ </message>
+ <message numerus="yes">
+ <location line="+4"/>
+ <source>%n week(s)</source>
+ <translation type="unfinished"><numerusform></numerusform></translation>
+ </message>
<message>
- <location line="+70"/>
- <source>Error</source>
+ <location line="+5"/>
+ <source>%1 behind</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+3"/>
- <source>Warning</source>
+ <location line="+14"/>
+ <source>Last received block was generated %1 ago.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+3"/>
- <source>Information</source>
+ <location line="+2"/>
+ <source>Transactions after this will not yet be visible.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+66"/>
- <source>This transaction is over the size limit. You can still send it for a fee of %1, which goes to the nodes that process your transaction and helps to support the network. Do you want to pay the fee?</source>
+ <location line="+21"/>
+ <source>Error</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+210"/>
- <source>Backup Successful</source>
+ <location line="+3"/>
+ <source>Warning</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+0"/>
- <source>The wallet data was successfully saved to the new location.</source>
+ <location line="+3"/>
+ <source>Information</source>
<translation type="unfinished"/>
</message>
- <message numerus="yes">
- <location line="-338"/>
- <source>%n second(s) ago</source>
- <translation><numerusform>%n ثانیه قبل
-%n ثانیه قبل</numerusform></translation>
- </message>
- <message numerus="yes">
- <location line="+4"/>
- <source>%n minute(s) ago</source>
- <translation><numerusform>%n دقیقه قبل
-%n دقیقه قبل</numerusform></translation>
- </message>
- <message numerus="yes">
- <location line="+4"/>
- <source>%n hour(s) ago</source>
- <translation><numerusform>%n ساعت قبل
-%n ساعت قبل</numerusform></translation>
- </message>
- <message numerus="yes">
- <location line="+4"/>
- <source>%n day(s) ago</source>
- <translation><numerusform>%n روز قبل
-%n روز قبل
-</numerusform></translation>
+ <message>
+ <location line="+68"/>
+ <source>This transaction is over the size limit. You can still send it for a fee of %1, which goes to the nodes that process your transaction and helps to support the network. Do you want to pay the fee?</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location line="+6"/>
+ <location line="-138"/>
<source>Up to date</source>
<translation>روزآمد</translation>
</message>
<message>
- <location line="+7"/>
+ <location line="+32"/>
<source>Catching up...</source>
<translation>در حال روزآمد سازی..</translation>
</message>
<message>
- <location line="+10"/>
- <source>Last received block was generated %1.</source>
- <translation>بلاک دریاÙت شده قبلی به میزان %1 تولید شده است</translation>
- </message>
- <message>
- <location line="+97"/>
+ <location line="+110"/>
<source>Confirm transaction fee</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+23"/>
+ <location line="+8"/>
<source>Sent transaction</source>
<translation>ارسال تراکنش</translation>
</message>
@@ -642,14 +636,14 @@ Address: %4
</translation>
</message>
<message>
- <location line="+99"/>
- <location line="+28"/>
+ <location line="+33"/>
+ <location line="+23"/>
<source>URI handling</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-28"/>
- <location line="+28"/>
+ <location line="-23"/>
+ <location line="+23"/>
<source>URI can not be parsed! This can be caused by an invalid Bitcoin address or malformed URI parameters.</source>
<translation type="unfinished"/>
</message>
@@ -664,28 +658,7 @@ Address: %4
<translation>wallet رمزگذاری شد Ùˆ در حال حاضر Ù‚ÙÙ„ است</translation>
</message>
<message>
- <location line="+23"/>
- <source>Backup Wallet</source>
- <translation>گرÙتن نسخه پیشتیبان از Wallet</translation>
- </message>
- <message>
- <location line="+0"/>
- <source>Wallet Data (*.dat)</source>
- <translation>داده های Wallet
-(*.dat)</translation>
- </message>
- <message>
- <location line="+3"/>
- <source>Backup Failed</source>
- <translation>عملیات گرÙتن نسخه پیشتیبان انجام نشد</translation>
- </message>
- <message>
- <location line="+0"/>
- <source>There was an error trying to save the wallet data to the new location.</source>
- <translation>در هنگام ذخیره داده های wallet به نسخه جدید خطایی ایجاد شده است</translation>
- </message>
- <message>
- <location filename="../bitcoin.cpp" line="+109"/>
+ <location filename="../bitcoin.cpp" line="+108"/>
<source>A fatal error occurred. Bitcoin can no longer continue safely and will quit.</source>
<translation type="unfinished"/>
</message>
@@ -693,7 +666,7 @@ Address: %4
<context>
<name>ClientModel</name>
<message>
- <location filename="../clientmodel.cpp" line="+86"/>
+ <location filename="../clientmodel.cpp" line="+96"/>
<source>Network Alert</source>
<translation>هشدار شبکه</translation>
</message>
@@ -726,7 +699,7 @@ Address: %4
<translation>برچسب مربوط به این دÙترچه آدرس Ùˆ تنها ب</translation>
</message>
<message>
- <location filename="../editaddressdialog.cpp" line="+20"/>
+ <location filename="../editaddressdialog.cpp" line="+21"/>
<source>New receiving address</source>
<translation>آدرس٠دریاÙت کننده جدید</translation>
</message>
@@ -746,17 +719,17 @@ Address: %4
<translation>ویرایش آدرس٠ارسال کننده</translation>
</message>
<message>
- <location line="+60"/>
+ <location line="+76"/>
<source>The entered address &quot;%1&quot; is already in the address book.</source>
<translation>آدرس وارد شده %1 قبلا به Ùهرست آدرسها اضاÙÙ‡ شده بوده است.</translation>
</message>
<message>
- <location line="+5"/>
+ <location line="-5"/>
<source>The entered address &quot;%1&quot; is not a valid Bitcoin address.</source>
<translation>آدرس وارد شده &quot;%1&quot; یک آدرس صحیح برای bitcoin نسشت</translation>
</message>
<message>
- <location line="+5"/>
+ <location line="+10"/>
<source>Could not unlock wallet.</source>
<translation>عدم توانیی برای Ù‚ÙÙ„ گشایی wallet</translation>
</message>
@@ -769,7 +742,7 @@ Address: %4
<context>
<name>GUIUtil::HelpMessageBox</name>
<message>
- <location filename="../guiutil.cpp" line="+419"/>
+ <location filename="../guiutil.cpp" line="+422"/>
<location line="+12"/>
<source>Bitcoin-Qt</source>
<translation type="unfinished"/>
@@ -983,7 +956,7 @@ Address: %4
<translation>Ùˆ به کار گرÙتن</translation>
</message>
<message>
- <location filename="../optionsdialog.cpp" line="+55"/>
+ <location filename="../optionsdialog.cpp" line="+53"/>
<source>default</source>
<translation>پیش Ùرض</translation>
</message>
@@ -1028,23 +1001,18 @@ Address: %4
<translation>Ùرم</translation>
</message>
<message>
- <location line="+51"/>
- <location line="+183"/>
+ <location line="+50"/>
+ <location line="+166"/>
<source>The displayed information may be out of date. Your wallet automatically synchronizes with the Bitcoin network after a connection is established, but this process has not completed yet.</source>
<translation>اطلاعات نمایش داده شده ممکن است روزآمد نباشد. wallet شما به صورت خودکار بعد از برقراری اتصال با شبکه bitcoin به روز Ù…ÛŒ شود اما این Ùرایند هنوز تکمیل نشده است.</translation>
</message>
<message>
- <location line="-141"/>
+ <location line="-124"/>
<source>Balance:</source>
<translation>مانده حساب:</translation>
</message>
<message>
- <location line="+58"/>
- <source>Number of transactions:</source>
- <translation>تعداد تراکنشها</translation>
- </message>
- <message>
- <location line="-29"/>
+ <location line="+29"/>
<source>Unconfirmed:</source>
<translation>تایید نشده</translation>
</message>
@@ -1054,7 +1022,7 @@ Address: %4
<translation>کی٠پول</translation>
</message>
<message>
- <location line="+124"/>
+ <location line="+107"/>
<source>Immature:</source>
<translation type="unfinished"/>
</message>
@@ -1069,7 +1037,7 @@ Address: %4
<translation>تراکنشهای اخیر</translation>
</message>
<message>
- <location line="-118"/>
+ <location line="-101"/>
<source>Your current balance</source>
<translation>مانده حساب جاری</translation>
</message>
@@ -1079,11 +1047,6 @@ Address: %4
<translation>تعداد تراکنشهایی که نیاز به تایید دارند و هنوز در مانده حساب جاری شما به حساب نیامده اند</translation>
</message>
<message>
- <location line="+20"/>
- <source>Total number of transactions in wallet</source>
- <translation>تعداد کل تراکنشهای wallet شما</translation>
- </message>
- <message>
<location filename="../overviewpage.cpp" line="+115"/>
<location line="+1"/>
<source>out of sync</source>
@@ -1091,6 +1054,14 @@ Address: %4
</message>
</context>
<context>
+ <name>PaymentServer</name>
+ <message>
+ <location filename="../paymentserver.cpp" line="+107"/>
+ <source>Cannot start bitcoin: click-to-pay handler</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>QRCodeDialog</name>
<message>
<location filename="../forms/qrcodedialog.ui" line="+14"/>
@@ -1430,7 +1401,7 @@ Address: %4
</message>
<message>
<location line="+60"/>
- <location filename="../sendcoinsentry.cpp" line="+25"/>
+ <location filename="../sendcoinsentry.cpp" line="+26"/>
<source>Enter a label for this address to add it to your address book</source>
<translation>یک برچسب برای این آدرس بنویسید تا به دÙترچه آدرسهای شما اضاÙÙ‡ شود</translation>
</message>
@@ -1666,7 +1637,7 @@ Address: %4
<context>
<name>TransactionDesc</name>
<message>
- <location filename="../transactiondesc.cpp" line="+19"/>
+ <location filename="../transactiondesc.cpp" line="+20"/>
<source>Open until %1</source>
<translation>باز کن تا %1</translation>
</message>
@@ -1853,7 +1824,7 @@ Address: %4
<context>
<name>TransactionTableModel</name>
<message>
- <location filename="../transactiontablemodel.cpp" line="+226"/>
+ <location filename="../transactiontablemodel.cpp" line="+225"/>
<source>Date</source>
<translation>تاریخ</translation>
</message>
@@ -1971,7 +1942,7 @@ Address: %4
<context>
<name>TransactionView</name>
<message>
- <location filename="../transactionview.cpp" line="+55"/>
+ <location filename="../transactionview.cpp" line="+52"/>
<location line="+16"/>
<source>All</source>
<translation>همه</translation>
@@ -2058,6 +2029,11 @@ Address: %4
</message>
<message>
<location line="+1"/>
+ <source>Copy transaction ID</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Edit label</source>
<translation>برچسب را ویرایش کنید</translation>
</message>
@@ -2067,7 +2043,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+142"/>
+ <location line="+139"/>
<source>Export Transaction Data</source>
<translation>داده های تراکنش را صادر کنید</translation>
</message>
@@ -2122,7 +2098,7 @@ Address: %4
<translation>قابل Ú©Ù¾ÛŒ به Ùایل نیست %1.</translation>
</message>
<message>
- <location line="+95"/>
+ <location line="+100"/>
<source>Range:</source>
<translation>دامنه:</translation>
</message>
@@ -2133,29 +2109,172 @@ Address: %4
</message>
</context>
<context>
+ <name>WalletView</name>
+ <message>
+ <location filename="../walletview.cpp" line="+95"/>
+ <source>&amp;Overview</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Show general overview of wallet</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>&amp;Send coins</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Send coins to a Bitcoin address</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>&amp;Receive coins</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Show the list of addresses for receiving payments</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>&amp;Transactions</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Browse transaction history</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>&amp;Address Book</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Edit the list of stored addresses and labels</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+12"/>
+ <source>&amp;Encrypt Wallet...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Encrypt the private keys that belong to your wallet</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>&amp;Backup Wallet...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Backup wallet to another location</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>&amp;Change Passphrase...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Change the passphrase used for wallet encryption</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Sign &amp;message...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Sign messages with your Bitcoin addresses to prove you own them</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>&amp;Verify message...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Verify messages to ensure they were signed with specified Bitcoin addresses</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>&amp;Export...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Export the data in the current tab to a file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+180"/>
+ <source>Backup Wallet</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>Wallet Data (*.dat)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Backup Failed</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>There was an error trying to save the wallet data to the new location.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>Backup Successful</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>The wallet data was successfully saved to the new location.</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>bitcoin-core</name>
<message>
- <location filename="../bitcoinstrings.cpp" line="+88"/>
+ <location filename="../bitcoinstrings.cpp" line="+96"/>
<source>Bitcoin version</source>
<translation>نسخه bitcoin</translation>
</message>
<message>
- <location line="+82"/>
+ <location line="+98"/>
<source>Usage:</source>
<translation>میزان استÙاده:</translation>
</message>
<message>
- <location line="-23"/>
+ <location line="-24"/>
<source>Send command to -server or bitcoind</source>
<translation>ارسال دستور به سرور یا bitcoined</translation>
</message>
<message>
- <location line="-21"/>
+ <location line="-22"/>
<source>List commands</source>
<translation>Ùهرست دستورها</translation>
</message>
<message>
- <location line="-11"/>
+ <location line="-10"/>
<source>Get help for a command</source>
<translation>درخواست کمک برای یک دستور</translation>
</message>
@@ -2180,12 +2299,12 @@ Address: %4
<translation>سکه ها را تولید کن</translation>
</message>
<message>
- <location line="-15"/>
+ <location line="-28"/>
<source>Don&apos;t generate coins</source>
<translation>سکه ها را تولید نکن</translation>
</message>
<message>
- <location line="+61"/>
+ <location line="+74"/>
<source>Specify data directory</source>
<translation>دایرکتوری داده را مشخص کن</translation>
</message>
@@ -2195,80 +2314,82 @@ Address: %4
<translation>حاÙظه بانک داده را به مگابایت تنظیم کنید (پیش Ùرض: 25)</translation>
</message>
<message>
- <location line="-26"/>
+ <location line="-27"/>
<source>Listen for connections on &lt;port&gt; (default: 8333 or testnet: 18333)</source>
<translation>ارتباطات را در &lt;PORT&gt; بشنوید (پیش Ùرض: 8333 or testnet: 18333)</translation>
</message>
<message>
- <location line="+4"/>
+ <location line="+5"/>
<source>Maintain at most &lt;n&gt; connections to peers (default: 125)</source>
<translation>نگهداری &lt;N&gt; ارتباطات برای قرینه سازی (پیش Ùرض:125)</translation>
</message>
<message>
- <location line="-34"/>
+ <location line="-49"/>
<source>Connect to a node to retrieve peer addresses, and disconnect</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+65"/>
+ <location line="+80"/>
<source>Specify your own public address</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+2"/>
+ <location line="+3"/>
<source>Threshold for disconnecting misbehaving peers (default: 100)</source>
<translation>آستانه قطع برای قرینه سازی اشتباه (پیش Ùرض:100)</translation>
</message>
<message>
- <location line="-114"/>
+ <location line="-132"/>
<source>Number of seconds to keep misbehaving peers from reconnecting (default: 86400)</source>
<translation>تعداد ثانیه ها برای اتصال دوباره قرینه های اشتباه (پیش Ùرض:86400)</translation>
</message>
<message>
- <location line="-28"/>
+ <location line="-32"/>
<source>An error occurred while setting up the RPC port %u for listening on IPv4: %s</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+26"/>
+ <location line="+30"/>
<source>Listen for JSON-RPC connections on &lt;port&gt; (default: 8332 or testnet: 18332)</source>
<translation>ارتباطات٠JSON-RPC را در &lt;port&gt; گوش کنید (پیش Ùرض:8332)</translation>
</message>
<message>
- <location line="+34"/>
+ <location line="+36"/>
<source>Accept command line and JSON-RPC commands</source>
<translation>command line و JSON-RPC commands را قبول کنید</translation>
</message>
<message>
- <location line="+62"/>
+ <location line="+77"/>
<source>Run in the background as a daemon and accept commands</source>
<translation>به عنوان daemon بک گراند را اجرا کنید و دستورات را قبول نمایید</translation>
</message>
<message>
- <location line="+31"/>
+ <location line="+32"/>
<source>Use the test network</source>
<translation>از تست٠شبکه استÙاده نمایید</translation>
</message>
<message>
- <location line="-92"/>
+ <location line="-108"/>
<source>Accept connections from outside (default: 1 if no -proxy or -connect)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-74"/>
+ <location line="-82"/>
<source>%s, you must set a rpcpassword in the configuration file:
- %s
+%s
It is recommended you use the following random password:
rpcuser=bitcoinrpc
rpcpassword=%s
(you do not need to remember this password)
The username and password MUST NOT be the same.
If the file does not exist, create it with owner-readable-only file permissions.
+It is also recommended to set alertnotify so you are notified of problems;
+for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.com
</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+15"/>
+ <location line="+17"/>
<source>An error occurred while setting up the RPC port %u for listening on IPv6, falling back to IPv4: %s</source>
<translation type="unfinished"/>
</message>
@@ -2284,11 +2405,6 @@ If the file does not exist, create it with owner-readable-only file permissions.
</message>
<message>
<location line="+3"/>
- <source>Corrupted block database detected. Please restart the client with -reindex.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+2"/>
<source>Error initializing database environment %s! To recover, BACKUP THAT DIRECTORY, then remove everything from it except for wallet.dat.</source>
<translation type="unfinished"/>
</message>
@@ -2303,12 +2419,27 @@ If the file does not exist, create it with owner-readable-only file permissions.
<translation type="unfinished"/>
</message>
<message>
+ <location line="+3"/>
+ <source>Execute command when a relevant alert is received (%s in cmd is replaced by message)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Execute command when a wallet transaction changes (%s in cmd is replaced by TxID)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location line="+11"/>
<source>Set maximum size of high-priority/low-fee transactions in bytes (default: 27000)</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+3"/>
+ <source>Set the number of script verification threads (1-16, 0=auto, default: 0)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
<source>This is a pre-release test build - use at your own risk - do not use for mining or merchant applications</source>
<translation type="unfinished"/>
</message>
@@ -2354,16 +2485,41 @@ If the file does not exist, create it with owner-readable-only file permissions.
</message>
<message>
<location line="+3"/>
+ <source>Corrupted block database detected</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Discover own IP address (default: 1 when listening and no -externalip)</source>
<translation type="unfinished"/>
</message>
<message>
+ <location line="+1"/>
+ <source>Do you want to rebuild the block database now?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location line="+3"/>
+ <source>Error initializing block database</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Error initializing wallet database environment %s!</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Error loading block database</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+5"/>
+ <location line="+4"/>
+ <source>Error opening block database</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
<source>Error: Disk space is low!</source>
<translation type="unfinished"/>
</message>
@@ -2379,26 +2535,96 @@ If the file does not exist, create it with owner-readable-only file permissions.
</message>
<message>
<location line="+2"/>
+ <source>Error: system error: </source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Failed to listen on any port. Use -listen=0 if you want this.</source>
<translation type="unfinished"/>
</message>
<message>
+ <location line="+1"/>
+ <source>Failed to read block info</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Failed to read block</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Failed to sync block index</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Failed to write block index</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Failed to write block info</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Failed to write block</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Failed to write file info</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Failed to write to coin database</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Failed to write transaction index</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Failed to write undo data</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location line="+2"/>
<source>Find peers using DNS lookup (default: 1 unless -connect)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+5"/>
- <source>How thorough the block verification is (0-4, default: 3)</source>
+ <location line="+3"/>
+ <source>How many blocks to check at startup (default: 288, 0 = all)</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+1"/>
- <source>Importing blocks from block database...</source>
+ <source>How thorough the block verification is (0-4, default: 3)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+24"/>
+ <source>Rebuild block chain index from current blk000??.dat files</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+37"/>
+ <source>Verifying blocks...</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+1"/>
+ <source>Verifying wallet...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-61"/>
<source>Imports blocks from external blk000??.dat file</source>
<translation type="unfinished"/>
</message>
@@ -2413,7 +2639,12 @@ If the file does not exist, create it with owner-readable-only file permissions.
<translation type="unfinished"/>
</message>
<message>
- <location line="+9"/>
+ <location line="+8"/>
+ <source>Maintain a full transaction index (default: 0)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
<source>Maximum per-connection receive buffer, &lt;n&gt;*1000 bytes (default: 5000)</source>
<translation type="unfinished"/>
</message>
@@ -2448,12 +2679,7 @@ If the file does not exist, create it with owner-readable-only file permissions.
<translation>برونداد اشکال زدایی با timestamp</translation>
</message>
<message>
- <location line="+1"/>
- <source>Rebuild blockchain index from current blk000??.dat files</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+4"/>
+ <location line="+5"/>
<source>SSL options: (see the Bitcoin Wiki for SSL setup instructions)</source>
<translation type="unfinished"/>
</message>
@@ -2493,7 +2719,12 @@ If the file does not exist, create it with owner-readable-only file permissions.
<translation>تعیین مدت زمان وقÙÙ‡ (time out) به هزارم ثانیه</translation>
</message>
<message>
- <location line="+13"/>
+ <location line="+4"/>
+ <source>System error: </source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+10"/>
<source>Use UPnP to map the listening port (default: 0)</source>
<translation type="unfinished"/>
</message>
@@ -2524,36 +2755,41 @@ If the file does not exist, create it with owner-readable-only file permissions.
</message>
<message>
<location line="+1"/>
+ <source>You need to rebuild the databases using -reindex to change -txindex</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>wallet.dat corrupt, salvage failed</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-43"/>
+ <location line="-45"/>
<source>Password for JSON-RPC connections</source>
<translation>رمز برای ارتباطات٠JSON-RPC</translation>
</message>
<message>
- <location line="-53"/>
+ <location line="-68"/>
<source>Allow JSON-RPC connections from specified IP address</source>
<translation>ارتباطات٠JSON-RPC را از آدرس آی.پی. مشخصی برقرار کنید.</translation>
</message>
<message>
- <location line="+62"/>
+ <location line="+77"/>
<source>Send commands to node running on &lt;ip&gt; (default: 127.0.0.1)</source>
<translation>دستورات را به گره اجرا شده در&lt;ip&gt; ارسال کنید (پیش Ùرض:127.0.0.1)</translation>
</message>
<message>
- <location line="-103"/>
+ <location line="-120"/>
<source>Execute command when the best block changes (%s in cmd is replaced by block hash)</source>
<translation>دستور را وقتی بهترین بلاک تغییر کرد اجرا کن (%s در دستور توسط block hash جایگزین شده است)</translation>
</message>
<message>
- <location line="+124"/>
+ <location line="+142"/>
<source>Upgrade wallet to latest format</source>
<translation>wallet را به جدیدترین نسخه روزآمد کنید</translation>
</message>
<message>
- <location line="-15"/>
+ <location line="-16"/>
<source>Set key pool size to &lt;n&gt; (default: 100)</source>
<translation>حجم key pool را به اندازه &lt;n&gt; تنظیم کنید (پیش Ùرض:100)</translation>
</message>
@@ -2563,17 +2799,12 @@ If the file does not exist, create it with owner-readable-only file permissions.
<translation>زنجیره بلاک را برای تراکنش جا اÙتاده در WALLET دوباره اسکن کنید</translation>
</message>
<message>
- <location line="-26"/>
- <source>How many blocks to check at startup (default: 2500, 0 = all)</source>
- <translation>چند بلاک در startup بررسی شوند (پیش Ùرض: 2500 Ùˆ 0= همه)</translation>
- </message>
- <message>
- <location line="+55"/>
+ <location line="+30"/>
<source>Use OpenSSL (https) for JSON-RPC connections</source>
<translation>برای ارتباطات٠JSON-RPC از OpenSSL (https) استÙاده کنید</translation>
</message>
<message>
- <location line="-20"/>
+ <location line="-21"/>
<source>Server certificate file (default: server.cert)</source>
<translation>Ùایل certificate سرور (پیش Ùرض server.cert)</translation>
</message>
@@ -2583,12 +2814,12 @@ If the file does not exist, create it with owner-readable-only file permissions.
<translation>رمز اختصاصی سرور (پیش Ùرض: server.pem)</translation>
</message>
<message>
- <location line="-133"/>
+ <location line="-154"/>
<source>Acceptable ciphers (default: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH)</source>
<translation>ciphers قابل قبول (پیش Ùرض: default: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH)</translation>
</message>
<message>
- <location line="+144"/>
+ <location line="+166"/>
<source>This help message</source>
<translation>این پیام راهنما</translation>
</message>
@@ -2598,7 +2829,7 @@ If the file does not exist, create it with owner-readable-only file permissions.
<translation type="unfinished"/>
</message>
<message>
- <location line="-70"/>
+ <location line="-86"/>
<source>Connect through socks proxy</source>
<translation type="unfinished"/>
</message>
@@ -2608,12 +2839,12 @@ If the file does not exist, create it with owner-readable-only file permissions.
<translation type="unfinished"/>
</message>
<message>
- <location line="+43"/>
+ <location line="+57"/>
<source>Loading addresses...</source>
<translation>لود شدن آدرسها..</translation>
</message>
<message>
- <location line="-25"/>
+ <location line="-35"/>
<source>Error loading wallet.dat: Wallet corrupted</source>
<translation>خطا در هنگام لود شدن wallet.dat: Wallet corrupted</translation>
</message>
@@ -2623,32 +2854,22 @@ If the file does not exist, create it with owner-readable-only file permissions.
<translation>خطا در هنگام لود شدن wallet.dat. به نسخه جدید Bitocin برای wallet نیاز است.</translation>
</message>
<message>
- <location line="+73"/>
- <source>Verifying block database integrity...</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+1"/>
- <source>Verifying wallet integrity...</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+1"/>
+ <location line="+87"/>
<source>Wallet needed to be rewritten: restart Bitcoin to complete</source>
<translation>wallet نیاز به بازنویسی دارد. Bitcoin را برای تکمیل عملیات دوباره اجرا کنید.</translation>
</message>
<message>
- <location line="-77"/>
+ <location line="-89"/>
<source>Error loading wallet.dat</source>
<translation>خطا در هنگام لود شدن wallet.dat</translation>
</message>
<message>
- <location line="+20"/>
+ <location line="+30"/>
<source>Invalid -proxy address: &apos;%s&apos;</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+46"/>
+ <location line="+48"/>
<source>Unknown network specified in -onlynet: &apos;%s&apos;</source>
<translation type="unfinished"/>
</message>
@@ -2658,7 +2879,7 @@ If the file does not exist, create it with owner-readable-only file permissions.
<translation type="unfinished"/>
</message>
<message>
- <location line="-75"/>
+ <location line="-91"/>
<source>Cannot resolve -bind address: &apos;%s&apos;</source>
<translation type="unfinished"/>
</message>
@@ -2668,17 +2889,17 @@ If the file does not exist, create it with owner-readable-only file permissions.
<translation type="unfinished"/>
</message>
<message>
- <location line="+31"/>
+ <location line="+45"/>
<source>Invalid amount for -paytxfee=&lt;amount&gt;: &apos;%s&apos;</source>
<translation>میزان اشتباه است for -paytxfee=&lt;amount&gt;: &apos;%s&apos;</translation>
</message>
<message>
- <location line="-15"/>
+ <location line="-24"/>
<source>Error: could not start node</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+16"/>
+ <location line="+25"/>
<source>Invalid amount</source>
<translation>میزان اشتباه است</translation>
</message>
@@ -2693,7 +2914,7 @@ If the file does not exist, create it with owner-readable-only file permissions.
<translation>لود شدن نمایه بلاکها..</translation>
</message>
<message>
- <location line="-45"/>
+ <location line="-59"/>
<source>Add a node to connect to and attempt to keep the connection open</source>
<translation>یک گره برای اتصال اضاÙÙ‡ کنید Ùˆ تلاش کنید تا اتصال را باز نگاه دارید</translation>
</message>
@@ -2703,22 +2924,17 @@ If the file does not exist, create it with owner-readable-only file permissions.
<translation type="unfinished"/>
</message>
<message>
- <location line="+54"/>
- <source>Find peers using internet relay chat (default: 0)</source>
- <translation>یاÙتن همتا/دوست با استÙاده از internet relay chat (پیش Ùرض:0)</translation>
- </message>
- <message>
- <location line="-2"/>
+ <location line="+68"/>
<source>Fee per KB to add to transactions you send</source>
<translation>هزینه بر اساس کیلو بایت برای اضاÙÙ‡ شدن به تراکنشی Ú©Ù‡ ارسال کرده اید</translation>
</message>
<message>
- <location line="+19"/>
+ <location line="+17"/>
<source>Loading wallet...</source>
<translation>wallet در حال لود شدن است...</translation>
</message>
<message>
- <location line="-40"/>
+ <location line="-54"/>
<source>Cannot downgrade wallet</source>
<translation>قابلیت برگشت به نسخه قبلی برای wallet امکان پذیر نیست</translation>
</message>
@@ -2733,27 +2949,27 @@ If the file does not exist, create it with owner-readable-only file permissions.
<translation>آدرس پیش Ùرض قابل ذخیره نیست</translation>
</message>
<message>
- <location line="+49"/>
+ <location line="+64"/>
<source>Rescanning...</source>
<translation>اسکن٠دوباره...</translation>
</message>
<message>
- <location line="-43"/>
+ <location line="-56"/>
<source>Done loading</source>
<translation>اتمام لود شدن</translation>
</message>
<message>
- <location line="+65"/>
+ <location line="+79"/>
<source>To use the %s option</source>
<translation>برای استÙاده از %s از اختیارات</translation>
</message>
<message>
- <location line="-60"/>
+ <location line="-71"/>
<source>Error</source>
<translation>خطا</translation>
</message>
<message>
- <location line="-28"/>
+ <location line="-33"/>
<source>You must set rpcpassword=&lt;password&gt; in the configuration file:
%s
If the file does not exist, create it with owner-readable-only file permissions.</source>
diff --git a/src/qt/locale/bitcoin_fi.ts b/src/qt/locale/bitcoin_fi.ts
index 0838c6da07..a7969e27a5 100644
--- a/src/qt/locale/bitcoin_fi.ts
+++ b/src/qt/locale/bitcoin_fi.ts
@@ -13,12 +13,7 @@
<translation>&lt;b&gt;Bitcoin&lt;/b&gt; versio</translation>
</message>
<message>
- <location line="+41"/>
- <source>Copyright © 2009-2012 The Bitcoin developers</source>
- <translation>Copyright © 2009-2012 Bitcoin kehittäjät</translation>
- </message>
- <message>
- <location line="+13"/>
+ <location line="+57"/>
<source>
This is experimental software.
@@ -33,6 +28,16 @@ Levitetään MIT/X11 ohjelmistolisenssin alaisuudessa. Tarkemmat tiedot löytyvÃ
Tämä ohjelma sisältää OpenSSL projektin OpenSSL työkalupakin (http://www.openssl.org/), Eric Youngin (eay@cryptsoft.com) kehittämän salausohjelmiston sekä Thomas Bernardin UPnP ohjelmiston.
</translation>
</message>
+ <message>
+ <location filename="../aboutdialog.cpp" line="+17"/>
+ <source>Copyright</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>2009-%1 The Bitcoin developers</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>AddressBookPage</name>
@@ -89,7 +94,7 @@ Tämä ohjelma sisältää OpenSSL projektin OpenSSL työkalupakin (http://www.o
<message>
<location line="+25"/>
<source>Delete the currently selected address from the list</source>
- <translation type="unfinished"/>
+ <translation>Poista valittu osoite listalta</translation>
</message>
<message>
<location line="-14"/>
@@ -107,17 +112,22 @@ Tämä ohjelma sisältää OpenSSL projektin OpenSSL työkalupakin (http://www.o
<translation>&amp;Poista</translation>
</message>
<message>
- <location filename="../addressbookpage.cpp" line="+65"/>
+ <location filename="../addressbookpage.cpp" line="+66"/>
<source>Copy &amp;Label</source>
<translation>Kopioi &amp;Nimi</translation>
</message>
<message>
- <location line="+2"/>
+ <location line="+1"/>
<source>&amp;Edit</source>
<translation>&amp;Muokkaa</translation>
</message>
<message>
- <location line="+250"/>
+ <location line="+1"/>
+ <source>Send &amp;Coins</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+263"/>
<source>Export Address Book Data</source>
<translation>Vie osoitekirja</translation>
</message>
@@ -140,7 +150,7 @@ Tämä ohjelma sisältää OpenSSL projektin OpenSSL työkalupakin (http://www.o
<context>
<name>AddressTableModel</name>
<message>
- <location filename="../addresstablemodel.cpp" line="+142"/>
+ <location filename="../addresstablemodel.cpp" line="+144"/>
<source>Label</source>
<translation>Nimi</translation>
</message>
@@ -299,17 +309,17 @@ Tämä ohjelma sisältää OpenSSL projektin OpenSSL työkalupakin (http://www.o
<context>
<name>BitcoinGUI</name>
<message>
- <location filename="../bitcoingui.cpp" line="+267"/>
+ <location filename="../bitcoingui.cpp" line="+231"/>
<source>Sign &amp;message...</source>
<translation>&amp;Allekirjoita viesti...</translation>
</message>
<message>
- <location line="+254"/>
+ <location line="+299"/>
<source>Synchronizing with network...</source>
<translation>Synkronoidaan verkon kanssa...</translation>
</message>
<message>
- <location line="-322"/>
+ <location line="-367"/>
<source>&amp;Overview</source>
<translation>&amp;Yleisnäkymä</translation>
</message>
@@ -329,32 +339,17 @@ Tämä ohjelma sisältää OpenSSL projektin OpenSSL työkalupakin (http://www.o
<translation>Selaa rahansiirtohistoriaa</translation>
</message>
<message>
- <location line="+6"/>
- <source>&amp;Address Book</source>
- <translation>&amp;Osoitekirja</translation>
- </message>
- <message>
- <location line="+1"/>
+ <location line="+7"/>
<source>Edit the list of stored addresses and labels</source>
<translation>Muokkaa tallennettujen nimien ja osoitteiden listaa</translation>
</message>
<message>
- <location line="-15"/>
- <source>&amp;Receive coins</source>
- <translation>&amp;Vastaanota Bitcoineja</translation>
- </message>
- <message>
- <location line="+1"/>
+ <location line="-14"/>
<source>Show the list of addresses for receiving payments</source>
<translation>Näytä Bitcoinien vastaanottamiseen käytetyt osoitteet</translation>
</message>
<message>
- <location line="-8"/>
- <source>&amp;Send coins</source>
- <translation>&amp;Lähetä Bitcoineja</translation>
- </message>
- <message>
- <location line="+39"/>
+ <location line="+31"/>
<source>E&amp;xit</source>
<translation>L&amp;opeta</translation>
</message>
@@ -399,22 +394,17 @@ Tämä ohjelma sisältää OpenSSL projektin OpenSSL työkalupakin (http://www.o
<translation>&amp;Vaihda Tunnuslause...</translation>
</message>
<message>
- <location line="+259"/>
+ <location line="+304"/>
<source>Importing blocks from disk...</source>
- <translation type="unfinished"/>
+ <translation>Tuodaan lohkoja levyltä</translation>
</message>
<message>
<location line="+3"/>
<source>Reindexing blocks on disk...</source>
- <translation type="unfinished"/>
- </message>
- <message numerus="yes">
- <location line="+10"/>
- <source>~%n block(s) remaining</source>
- <translation><numerusform>~%n lohko jäljellä</numerusform><numerusform>~%n lohkoja jäljellä</numerusform></translation>
+ <translation>Ladataan lohkoindeksiä...</translation>
</message>
<message>
- <location line="-265"/>
+ <location line="-300"/>
<source>&amp;Export...</source>
<translation>&amp;Vie...</translation>
</message>
@@ -459,18 +449,33 @@ Tämä ohjelma sisältää OpenSSL projektin OpenSSL työkalupakin (http://www.o
<translation>Varmista &amp;viesti...</translation>
</message>
<message>
- <location line="-196"/>
- <location line="+538"/>
+ <location line="-162"/>
+ <location line="+540"/>
<source>Bitcoin</source>
<translation>Bitcoin</translation>
</message>
<message>
- <location line="-538"/>
+ <location line="-540"/>
<source>Wallet</source>
<translation>Lompakko</translation>
</message>
<message>
- <location line="+176"/>
+ <location line="+99"/>
+ <source>&amp;Send</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+7"/>
+ <source>&amp;Receive</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+14"/>
+ <source>&amp;Addresses</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+22"/>
<source>&amp;About Bitcoin</source>
<translation>Tieto&amp;a Bitcoinista</translation>
</message>
@@ -482,7 +487,7 @@ Tämä ohjelma sisältää OpenSSL projektin OpenSSL työkalupakin (http://www.o
<message>
<location line="+1"/>
<source>Show or hide the main Window</source>
- <translation type="unfinished"/>
+ <translation>Näytä tai piillota Bitcoin-ikkuna</translation>
</message>
<message>
<location line="+2"/>
@@ -492,7 +497,7 @@ Tämä ohjelma sisältää OpenSSL projektin OpenSSL työkalupakin (http://www.o
<message>
<location line="+7"/>
<source>Sign messages with your Bitcoin addresses to prove you own them</source>
- <translation type="unfinished"/>
+ <translation>Allekirjoita viesti todistaaksesi, että omistat Bitcoin-osoitteen</translation>
</message>
<message>
<location line="+2"/>
@@ -531,97 +536,92 @@ Tämä ohjelma sisältää OpenSSL projektin OpenSSL työkalupakin (http://www.o
<translation>[testnet]</translation>
</message>
<message>
- <location line="+63"/>
+ <location line="+47"/>
<source>Bitcoin client</source>
<translation>Bitcoin-asiakas</translation>
</message>
<message numerus="yes">
- <location line="+79"/>
+ <location line="+140"/>
<source>%n active connection(s) to Bitcoin network</source>
<translation><numerusform>%n aktiivinen yhteys Bitcoin-verkkoon</numerusform><numerusform>%n aktiivista yhteyttä Bitcoin-verkkoon</numerusform></translation>
</message>
<message>
- <location line="+45"/>
- <source>Processed %1 of %2 blocks of transaction history (%3% done).</source>
+ <location line="+39"/>
+ <source>Processed %1 of %2 (estimated) blocks of transaction history.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+7"/>
+ <location line="+4"/>
<source>Processed %1 blocks of transaction history.</source>
<translation type="unfinished"/>
</message>
- <message>
- <location line="+70"/>
- <source>Error</source>
- <translation type="unfinished"/>
+ <message numerus="yes">
+ <location line="+20"/>
+ <source>%n hour(s)</source>
+ <translation><numerusform>%n tunti</numerusform><numerusform>%n tuntia</numerusform></translation>
</message>
- <message>
- <location line="+3"/>
- <source>Warning</source>
- <translation type="unfinished"/>
+ <message numerus="yes">
+ <location line="+4"/>
+ <source>%n day(s)</source>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
- <message>
- <location line="+3"/>
- <source>Information</source>
- <translation type="unfinished"/>
+ <message numerus="yes">
+ <location line="+4"/>
+ <source>%n week(s)</source>
+ <translation><numerusform>%n viikko</numerusform><numerusform>%n viikkoa</numerusform></translation>
</message>
<message>
- <location line="+66"/>
- <source>This transaction is over the size limit. You can still send it for a fee of %1, which goes to the nodes that process your transaction and helps to support the network. Do you want to pay the fee?</source>
+ <location line="+5"/>
+ <source>%1 behind</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+210"/>
- <source>Backup Successful</source>
- <translation type="unfinished"/>
+ <location line="+14"/>
+ <source>Last received block was generated %1 ago.</source>
+ <translation>Viimeisin vastaanotettu lohko tuotettu %1.</translation>
</message>
<message>
- <location line="+0"/>
- <source>The wallet data was successfully saved to the new location.</source>
+ <location line="+2"/>
+ <source>Transactions after this will not yet be visible.</source>
<translation type="unfinished"/>
</message>
- <message numerus="yes">
- <location line="-338"/>
- <source>%n second(s) ago</source>
- <translation><numerusform>%n sekunti sitten</numerusform><numerusform>%n sekuntia sitten</numerusform></translation>
+ <message>
+ <location line="+21"/>
+ <source>Error</source>
+ <translation>Virhe</translation>
</message>
- <message numerus="yes">
- <location line="+4"/>
- <source>%n minute(s) ago</source>
- <translation><numerusform>%n minuutti sitten</numerusform><numerusform>%n minuuttia sitten</numerusform></translation>
+ <message>
+ <location line="+3"/>
+ <source>Warning</source>
+ <translation>Varoitus</translation>
</message>
- <message numerus="yes">
- <location line="+4"/>
- <source>%n hour(s) ago</source>
- <translation><numerusform>%n tunti sitten</numerusform><numerusform>%n tuntia sitten</numerusform></translation>
+ <message>
+ <location line="+3"/>
+ <source>Information</source>
+ <translation>Tietoa</translation>
</message>
- <message numerus="yes">
- <location line="+4"/>
- <source>%n day(s) ago</source>
- <translation><numerusform>%n päivä sitten</numerusform><numerusform>%n päivää sitten</numerusform></translation>
+ <message>
+ <location line="+68"/>
+ <source>This transaction is over the size limit. You can still send it for a fee of %1, which goes to the nodes that process your transaction and helps to support the network. Do you want to pay the fee?</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location line="+6"/>
+ <location line="-138"/>
<source>Up to date</source>
<translation>Rahansiirtohistoria on ajan tasalla</translation>
</message>
<message>
- <location line="+7"/>
+ <location line="+32"/>
<source>Catching up...</source>
<translation>Kurotaan kiinni...</translation>
</message>
<message>
- <location line="+10"/>
- <source>Last received block was generated %1.</source>
- <translation>Viimeisin vastaanotettu lohko tuotettu %1.</translation>
- </message>
- <message>
- <location line="+97"/>
+ <location line="+110"/>
<source>Confirm transaction fee</source>
<translation>Vahvista maksukulu</translation>
</message>
<message>
- <location line="+23"/>
+ <location line="+8"/>
<source>Sent transaction</source>
<translation>Lähetetyt rahansiirrot</translation>
</message>
@@ -643,14 +643,14 @@ Tyyppi: %3
Osoite: %4</translation>
</message>
<message>
- <location line="+99"/>
- <location line="+28"/>
+ <location line="+33"/>
+ <location line="+23"/>
<source>URI handling</source>
<translation>URI käsittely</translation>
</message>
<message>
- <location line="-28"/>
- <location line="+28"/>
+ <location line="-23"/>
+ <location line="+23"/>
<source>URI can not be parsed! This can be caused by an invalid Bitcoin address or malformed URI parameters.</source>
<translation>URIa ei voitu jäsentää! Tämä voi johtua kelvottomasta Bitcoin-osoitteesta tai virheellisistä URI parametreista.</translation>
</message>
@@ -665,27 +665,7 @@ Osoite: %4</translation>
<translation>Lompakko on &lt;b&gt;salattu&lt;/b&gt; ja tällä hetkellä &lt;b&gt;lukittuna&lt;/b&gt;</translation>
</message>
<message>
- <location line="+23"/>
- <source>Backup Wallet</source>
- <translation>Varmuuskopioi lompakko</translation>
- </message>
- <message>
- <location line="+0"/>
- <source>Wallet Data (*.dat)</source>
- <translation>Lompakkodata (*.dat)</translation>
- </message>
- <message>
- <location line="+3"/>
- <source>Backup Failed</source>
- <translation>Varmuuskopio epäonnistui</translation>
- </message>
- <message>
- <location line="+0"/>
- <source>There was an error trying to save the wallet data to the new location.</source>
- <translation>Virhe tallennettaessa lompakkodataa uuteen sijaintiin.</translation>
- </message>
- <message>
- <location filename="../bitcoin.cpp" line="+109"/>
+ <location filename="../bitcoin.cpp" line="+108"/>
<source>A fatal error occurred. Bitcoin can no longer continue safely and will quit.</source>
<translation>Peruuttamaton virhe on tapahtunut. Bitcoin ei voi enää jatkaa turvallisesti ja sammutetaan.</translation>
</message>
@@ -693,7 +673,7 @@ Osoite: %4</translation>
<context>
<name>ClientModel</name>
<message>
- <location filename="../clientmodel.cpp" line="+86"/>
+ <location filename="../clientmodel.cpp" line="+96"/>
<source>Network Alert</source>
<translation>Verkkohälytys</translation>
</message>
@@ -726,7 +706,7 @@ Osoite: %4</translation>
<translation>Osoite, joka liittyy tämän osoitekirjan merkintään. Tätä voidaan muuttaa vain lähtevissä osoitteissa.</translation>
</message>
<message>
- <location filename="../editaddressdialog.cpp" line="+20"/>
+ <location filename="../editaddressdialog.cpp" line="+21"/>
<source>New receiving address</source>
<translation>Uusi vastaanottava osoite</translation>
</message>
@@ -746,17 +726,17 @@ Osoite: %4</translation>
<translation>Muokkaa lähtevää osoitetta</translation>
</message>
<message>
- <location line="+60"/>
+ <location line="+76"/>
<source>The entered address &quot;%1&quot; is already in the address book.</source>
<translation>Osoite &quot;%1&quot; on jo osoitekirjassa.</translation>
</message>
<message>
- <location line="+5"/>
+ <location line="-5"/>
<source>The entered address &quot;%1&quot; is not a valid Bitcoin address.</source>
<translation>Antamasi osoite &quot;%1&quot; ei ole validi Bitcoin-osoite.</translation>
</message>
<message>
- <location line="+5"/>
+ <location line="+10"/>
<source>Could not unlock wallet.</source>
<translation>Lompakkoa ei voitu avata.</translation>
</message>
@@ -769,7 +749,7 @@ Osoite: %4</translation>
<context>
<name>GUIUtil::HelpMessageBox</name>
<message>
- <location filename="../guiutil.cpp" line="+419"/>
+ <location filename="../guiutil.cpp" line="+422"/>
<location line="+12"/>
<source>Bitcoin-Qt</source>
<translation>Bitcoin-Qt</translation>
@@ -983,7 +963,7 @@ Osoite: %4</translation>
<translation>&amp;Hyväksy</translation>
</message>
<message>
- <location filename="../optionsdialog.cpp" line="+55"/>
+ <location filename="../optionsdialog.cpp" line="+53"/>
<source>default</source>
<translation>oletus</translation>
</message>
@@ -1028,23 +1008,18 @@ Osoite: %4</translation>
<translation>Lomake</translation>
</message>
<message>
- <location line="+51"/>
- <location line="+183"/>
+ <location line="+50"/>
+ <location line="+166"/>
<source>The displayed information may be out of date. Your wallet automatically synchronizes with the Bitcoin network after a connection is established, but this process has not completed yet.</source>
<translation>Näytetyt tiedot eivät välttämättä ole ajantasalla. Lompakkosi synkronoituu Bitcoin-verkon kanssa automaattisesti yhteyden muodostamisen jälkeen, mutta synkronointi on vielä meneillään.</translation>
</message>
<message>
- <location line="-141"/>
+ <location line="-124"/>
<source>Balance:</source>
<translation>Saldo:</translation>
</message>
<message>
- <location line="+58"/>
- <source>Number of transactions:</source>
- <translation>Rahansiirtojen lukumäärä:</translation>
- </message>
- <message>
- <location line="-29"/>
+ <location line="+29"/>
<source>Unconfirmed:</source>
<translation>Vahvistamatta:</translation>
</message>
@@ -1054,7 +1029,7 @@ Osoite: %4</translation>
<translation>Lompakko</translation>
</message>
<message>
- <location line="+124"/>
+ <location line="+107"/>
<source>Immature:</source>
<translation>Epäkypsää:</translation>
</message>
@@ -1069,7 +1044,7 @@ Osoite: %4</translation>
<translation>&lt;b&gt;Viimeisimmät rahansiirrot&lt;/b&gt;</translation>
</message>
<message>
- <location line="-118"/>
+ <location line="-101"/>
<source>Your current balance</source>
<translation>Tililläsi tällä hetkellä olevien Bitcoinien määrä</translation>
</message>
@@ -1079,11 +1054,6 @@ Osoite: %4</translation>
<translation>Niiden saapuvien rahansiirtojen määrä, joita Bitcoin-verkko ei vielä ole ehtinyt vahvistaa ja siten eivät vielä näy saldossa.</translation>
</message>
<message>
- <location line="+20"/>
- <source>Total number of transactions in wallet</source>
- <translation>Lompakolla tehtyjen rahansiirtojen yhteismäärä</translation>
- </message>
- <message>
<location filename="../overviewpage.cpp" line="+115"/>
<location line="+1"/>
<source>out of sync</source>
@@ -1091,6 +1061,14 @@ Osoite: %4</translation>
</message>
</context>
<context>
+ <name>PaymentServer</name>
+ <message>
+ <location filename="../paymentserver.cpp" line="+107"/>
+ <source>Cannot start bitcoin: click-to-pay handler</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>QRCodeDialog</name>
<message>
<location filename="../forms/qrcodedialog.ui" line="+14"/>
@@ -1429,7 +1407,7 @@ Osoite: %4</translation>
</message>
<message>
<location line="+60"/>
- <location filename="../sendcoinsentry.cpp" line="+25"/>
+ <location filename="../sendcoinsentry.cpp" line="+26"/>
<source>Enter a label for this address to add it to your address book</source>
<translation>Anna nimi tälle osoitteelle, jos haluat lisätä sen osoitekirjaan</translation>
</message>
@@ -1521,7 +1499,7 @@ Osoite: %4</translation>
<message>
<location line="+7"/>
<source>Signature</source>
- <translation type="unfinished"/>
+ <translation>Allekirjoitus</translation>
</message>
<message>
<location line="+27"/>
@@ -1665,7 +1643,7 @@ Osoite: %4</translation>
<context>
<name>TransactionDesc</name>
<message>
- <location filename="../transactiondesc.cpp" line="+19"/>
+ <location filename="../transactiondesc.cpp" line="+20"/>
<source>Open until %1</source>
<translation>Avoinna %1 asti</translation>
</message>
@@ -1852,7 +1830,7 @@ Osoite: %4</translation>
<context>
<name>TransactionTableModel</name>
<message>
- <location filename="../transactiontablemodel.cpp" line="+226"/>
+ <location filename="../transactiontablemodel.cpp" line="+225"/>
<source>Date</source>
<translation>Päivämäärä</translation>
</message>
@@ -1970,7 +1948,7 @@ Osoite: %4</translation>
<context>
<name>TransactionView</name>
<message>
- <location filename="../transactionview.cpp" line="+55"/>
+ <location filename="../transactionview.cpp" line="+52"/>
<location line="+16"/>
<source>All</source>
<translation>Kaikki</translation>
@@ -2057,6 +2035,11 @@ Osoite: %4</translation>
</message>
<message>
<location line="+1"/>
+ <source>Copy transaction ID</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Edit label</source>
<translation>Muokkaa nimeä</translation>
</message>
@@ -2066,7 +2049,7 @@ Osoite: %4</translation>
<translation>Näytä rahansiirron yksityiskohdat</translation>
</message>
<message>
- <location line="+142"/>
+ <location line="+139"/>
<source>Export Transaction Data</source>
<translation>Vie rahansiirron tiedot</translation>
</message>
@@ -2121,7 +2104,7 @@ Osoite: %4</translation>
<translation>Ei voida kirjoittaa tiedostoon %1.</translation>
</message>
<message>
- <location line="+95"/>
+ <location line="+100"/>
<source>Range:</source>
<translation>Alue:</translation>
</message>
@@ -2132,29 +2115,172 @@ Osoite: %4</translation>
</message>
</context>
<context>
+ <name>WalletView</name>
+ <message>
+ <location filename="../walletview.cpp" line="+95"/>
+ <source>&amp;Overview</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Show general overview of wallet</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>&amp;Send coins</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Send coins to a Bitcoin address</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>&amp;Receive coins</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Show the list of addresses for receiving payments</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>&amp;Transactions</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Browse transaction history</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>&amp;Address Book</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Edit the list of stored addresses and labels</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+12"/>
+ <source>&amp;Encrypt Wallet...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Encrypt the private keys that belong to your wallet</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>&amp;Backup Wallet...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Backup wallet to another location</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>&amp;Change Passphrase...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Change the passphrase used for wallet encryption</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Sign &amp;message...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Sign messages with your Bitcoin addresses to prove you own them</source>
+ <translation>Allekirjoita viesti todistaaksesi, että omistat Bitcoin-osoitteen</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>&amp;Verify message...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Verify messages to ensure they were signed with specified Bitcoin addresses</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>&amp;Export...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Export the data in the current tab to a file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+180"/>
+ <source>Backup Wallet</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>Wallet Data (*.dat)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Backup Failed</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>There was an error trying to save the wallet data to the new location.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>Backup Successful</source>
+ <translation>Varmuuskopio Onnistui</translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>The wallet data was successfully saved to the new location.</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>bitcoin-core</name>
<message>
- <location filename="../bitcoinstrings.cpp" line="+88"/>
+ <location filename="../bitcoinstrings.cpp" line="+96"/>
<source>Bitcoin version</source>
<translation>Bitcoinin versio</translation>
</message>
<message>
- <location line="+82"/>
+ <location line="+98"/>
<source>Usage:</source>
<translation>Käyttö:</translation>
</message>
<message>
- <location line="-23"/>
+ <location line="-24"/>
<source>Send command to -server or bitcoind</source>
<translation>Lähetä käsky palvelimelle tai bitcoind:lle</translation>
</message>
<message>
- <location line="-21"/>
+ <location line="-22"/>
<source>List commands</source>
<translation>Lista komennoista</translation>
</message>
<message>
- <location line="-11"/>
+ <location line="-10"/>
<source>Get help for a command</source>
<translation>Hanki apua käskyyn</translation>
</message>
@@ -2179,12 +2305,12 @@ Osoite: %4</translation>
<translation>Generoi kolikoita</translation>
</message>
<message>
- <location line="-15"/>
+ <location line="-28"/>
<source>Don&apos;t generate coins</source>
<translation>Älä generoi kolikoita</translation>
</message>
<message>
- <location line="+61"/>
+ <location line="+74"/>
<source>Specify data directory</source>
<translation>Määritä data-hakemisto</translation>
</message>
@@ -2194,80 +2320,82 @@ Osoite: %4</translation>
<translation>Aseta tietokannan välimuistin koko megatavuina (oletus: 25)</translation>
</message>
<message>
- <location line="-26"/>
+ <location line="-27"/>
<source>Listen for connections on &lt;port&gt; (default: 8333 or testnet: 18333)</source>
<translation>Kuuntele yhteyksiä portista &lt;port&gt; (oletus: 8333 tai testnet: 18333)</translation>
</message>
<message>
- <location line="+4"/>
+ <location line="+5"/>
<source>Maintain at most &lt;n&gt; connections to peers (default: 125)</source>
<translation>Pidä enintään &lt;n&gt; yhteyttä verkkoihin (oletus: 125)</translation>
</message>
<message>
- <location line="-34"/>
+ <location line="-49"/>
<source>Connect to a node to retrieve peer addresses, and disconnect</source>
<translation>Yhdistä noodiin hakeaksesi naapurien osoitteet ja katkaise yhteys</translation>
</message>
<message>
- <location line="+65"/>
+ <location line="+80"/>
<source>Specify your own public address</source>
<translation>Määritä julkinen osoitteesi</translation>
</message>
<message>
- <location line="+2"/>
+ <location line="+3"/>
<source>Threshold for disconnecting misbehaving peers (default: 100)</source>
<translation>Kynnysarvo aikakatkaisulle heikosti toimiville verkoille (oletus: 100)</translation>
</message>
<message>
- <location line="-114"/>
+ <location line="-132"/>
<source>Number of seconds to keep misbehaving peers from reconnecting (default: 86400)</source>
<translation>Sekuntien määrä, kuinka kauan uudelleenkytkeydytään verkkoihin (oletus: 86400)</translation>
</message>
<message>
- <location line="-28"/>
+ <location line="-32"/>
<source>An error occurred while setting up the RPC port %u for listening on IPv4: %s</source>
<translation>Virhe valmisteltaessa RPC-portin %u avaamista kuunneltavaksi: %s</translation>
</message>
<message>
- <location line="+26"/>
+ <location line="+30"/>
<source>Listen for JSON-RPC connections on &lt;port&gt; (default: 8332 or testnet: 18332)</source>
<translation>Kuuntele JSON-RPC -yhteyksiä portista &lt;port&gt; (oletus: 8332 or testnet: 18332)</translation>
</message>
<message>
- <location line="+34"/>
+ <location line="+36"/>
<source>Accept command line and JSON-RPC commands</source>
<translation>Hyväksy merkkipohjaiset- ja JSON-RPC-käskyt</translation>
</message>
<message>
- <location line="+62"/>
+ <location line="+77"/>
<source>Run in the background as a daemon and accept commands</source>
<translation>Aja taustalla daemonina ja hyväksy komennot</translation>
</message>
<message>
- <location line="+31"/>
+ <location line="+32"/>
<source>Use the test network</source>
<translation>Käytä test -verkkoa</translation>
</message>
<message>
- <location line="-92"/>
+ <location line="-108"/>
<source>Accept connections from outside (default: 1 if no -proxy or -connect)</source>
<translation>Hyväksy yhteyksiä ulkopuolelta (vakioasetus: 1 jos -proxy tai -connect ei määritelty)</translation>
</message>
<message>
- <location line="-74"/>
+ <location line="-82"/>
<source>%s, you must set a rpcpassword in the configuration file:
- %s
+%s
It is recommended you use the following random password:
rpcuser=bitcoinrpc
rpcpassword=%s
(you do not need to remember this password)
The username and password MUST NOT be the same.
If the file does not exist, create it with owner-readable-only file permissions.
+It is also recommended to set alertnotify so you are notified of problems;
+for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.com
</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+15"/>
+ <location line="+17"/>
<source>An error occurred while setting up the RPC port %u for listening on IPv6, falling back to IPv4: %s</source>
<translation type="unfinished"/>
</message>
@@ -2283,11 +2411,6 @@ If the file does not exist, create it with owner-readable-only file permissions.
</message>
<message>
<location line="+3"/>
- <source>Corrupted block database detected. Please restart the client with -reindex.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+2"/>
<source>Error initializing database environment %s! To recover, BACKUP THAT DIRECTORY, then remove everything from it except for wallet.dat.</source>
<translation type="unfinished"/>
</message>
@@ -2302,12 +2425,27 @@ If the file does not exist, create it with owner-readable-only file permissions.
<translation type="unfinished"/>
</message>
<message>
+ <location line="+3"/>
+ <source>Execute command when a relevant alert is received (%s in cmd is replaced by message)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Execute command when a wallet transaction changes (%s in cmd is replaced by TxID)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location line="+11"/>
<source>Set maximum size of high-priority/low-fee transactions in bytes (default: 27000)</source>
<translation>Aseta suurin korkean prioriteetin / matalan palkkion siirron koko tavuissa (vakioasetus: 27000)</translation>
</message>
<message>
<location line="+3"/>
+ <source>Set the number of script verification threads (1-16, 0=auto, default: 0)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
<source>This is a pre-release test build - use at your own risk - do not use for mining or merchant applications</source>
<translation type="unfinished"/>
</message>
@@ -2353,18 +2491,43 @@ If the file does not exist, create it with owner-readable-only file permissions.
</message>
<message>
<location line="+3"/>
+ <source>Corrupted block database detected</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Discover own IP address (default: 1 when listening and no -externalip)</source>
<translation>Hae oma IP osoite (vakioasetus: 1 kun kuuntelemassa ja ei -externalip)</translation>
</message>
<message>
+ <location line="+1"/>
+ <source>Do you want to rebuild the block database now?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location line="+3"/>
+ <source>Error initializing block database</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Error initializing wallet database environment %s!</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Error loading block database</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+5"/>
+ <location line="+4"/>
+ <source>Error opening block database</source>
+ <translation>Virhe avattaessa lohkoindeksiä</translation>
+ </message>
+ <message>
+ <location line="+2"/>
<source>Error: Disk space is low!</source>
- <translation type="unfinished"/>
+ <translation>Varoitus: Levytila on vähissä!</translation>
</message>
<message>
<location line="+1"/>
@@ -2378,33 +2541,103 @@ If the file does not exist, create it with owner-readable-only file permissions.
</message>
<message>
<location line="+2"/>
+ <source>Error: system error: </source>
+ <translation>Virhe: Järjestelmävirhe</translation>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Failed to listen on any port. Use -listen=0 if you want this.</source>
<translation>Ei onnistuttu kuuntelemaan missään portissa. Käytä -listen=0 jos haluat tätä.</translation>
</message>
<message>
+ <location line="+1"/>
+ <source>Failed to read block info</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Failed to read block</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Failed to sync block index</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Failed to write block index</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Failed to write block info</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Failed to write block</source>
+ <translation>Lohkon kirjoitus epäonnistui</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Failed to write file info</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Failed to write to coin database</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Failed to write transaction index</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Failed to write undo data</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location line="+2"/>
<source>Find peers using DNS lookup (default: 1 unless -connect)</source>
<translation>Hae naapureita DNS hauilla (vakioasetus: 1 paitsi jos -connect)</translation>
</message>
<message>
- <location line="+5"/>
- <source>How thorough the block verification is (0-4, default: 3)</source>
+ <location line="+3"/>
+ <source>How many blocks to check at startup (default: 288, 0 = all)</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+1"/>
- <source>Importing blocks from block database...</source>
+ <source>How thorough the block verification is (0-4, default: 3)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+24"/>
+ <source>Rebuild block chain index from current blk000??.dat files</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+37"/>
+ <source>Verifying blocks...</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+1"/>
- <source>Imports blocks from external blk000??.dat file</source>
+ <source>Verifying wallet...</source>
<translation type="unfinished"/>
</message>
<message>
+ <location line="-61"/>
+ <source>Imports blocks from external blk000??.dat file</source>
+ <translation>Tuodaan lohkoja ulkoisesta blk000??.dat tiedostosta</translation>
+ </message>
+ <message>
<location line="+1"/>
<source>Information</source>
- <translation type="unfinished"/>
+ <translation>Tietoa</translation>
</message>
<message>
<location line="+3"/>
@@ -2412,7 +2645,12 @@ If the file does not exist, create it with owner-readable-only file permissions.
<translation>Virheellinen -tor osoite &apos;%s&apos;</translation>
</message>
<message>
- <location line="+9"/>
+ <location line="+8"/>
+ <source>Maintain a full transaction index (default: 0)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
<source>Maximum per-connection receive buffer, &lt;n&gt;*1000 bytes (default: 5000)</source>
<translation>Suurin vastaanottopuskuri yksittäiselle yhteydelle, &lt;n&gt;*1000 tavua (vakioasetus: 5000)</translation>
</message>
@@ -2447,12 +2685,7 @@ If the file does not exist, create it with owner-readable-only file permissions.
<translation>Lisää debuggaustiedon tulostukseen aikaleima</translation>
</message>
<message>
- <location line="+1"/>
- <source>Rebuild blockchain index from current blk000??.dat files</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+4"/>
+ <location line="+5"/>
<source>SSL options: (see the Bitcoin Wiki for SSL setup instructions)</source>
<translation>SSL asetukset (katso Bitcoin Wikistä tarkemmat SSL ohjeet)</translation>
</message>
@@ -2492,7 +2725,12 @@ If the file does not exist, create it with owner-readable-only file permissions.
<translation>Määritä yhteyden aikakataisu millisekunneissa (vakioasetus: 5000)</translation>
</message>
<message>
- <location line="+13"/>
+ <location line="+4"/>
+ <source>System error: </source>
+ <translation>Järjestelmävirhe:</translation>
+ </message>
+ <message>
+ <location line="+10"/>
<source>Use UPnP to map the listening port (default: 0)</source>
<translation>Käytä UPnP:tä kuunneltavan portin avaamiseen (vakioasetus: 0)</translation>
</message>
@@ -2514,7 +2752,7 @@ If the file does not exist, create it with owner-readable-only file permissions.
<message>
<location line="+4"/>
<source>Warning</source>
- <translation type="unfinished"/>
+ <translation>Varoitus</translation>
</message>
<message>
<location line="+1"/>
@@ -2523,36 +2761,41 @@ If the file does not exist, create it with owner-readable-only file permissions.
</message>
<message>
<location line="+1"/>
+ <source>You need to rebuild the databases using -reindex to change -txindex</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>wallet.dat corrupt, salvage failed</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-43"/>
+ <location line="-45"/>
<source>Password for JSON-RPC connections</source>
<translation>Salasana JSON-RPC-yhteyksille</translation>
</message>
<message>
- <location line="-53"/>
+ <location line="-68"/>
<source>Allow JSON-RPC connections from specified IP address</source>
<translation>Salli JSON-RPC yhteydet tietystä ip-osoitteesta</translation>
</message>
<message>
- <location line="+62"/>
+ <location line="+77"/>
<source>Send commands to node running on &lt;ip&gt; (default: 127.0.0.1)</source>
<translation>Lähetä käskyjä solmuun osoitteessa &lt;ip&gt; (oletus: 127.0.0.1)</translation>
</message>
<message>
- <location line="-103"/>
+ <location line="-120"/>
<source>Execute command when the best block changes (%s in cmd is replaced by block hash)</source>
<translation>Suorita käsky kun paras lohko muuttuu (%s cmd on vaihdettu block hashin kanssa)</translation>
</message>
<message>
- <location line="+124"/>
+ <location line="+142"/>
<source>Upgrade wallet to latest format</source>
<translation>Päivitä lompakko uusimpaan formaattiin</translation>
</message>
<message>
- <location line="-15"/>
+ <location line="-16"/>
<source>Set key pool size to &lt;n&gt; (default: 100)</source>
<translation>Aseta avainpoolin koko arvoon &lt;n&gt; (oletus: 100)</translation>
</message>
@@ -2562,17 +2805,12 @@ If the file does not exist, create it with owner-readable-only file permissions.
<translation>Skannaa uudelleen lohkoketju lompakon puuttuvien rahasiirtojen vuoksi</translation>
</message>
<message>
- <location line="-26"/>
- <source>How many blocks to check at startup (default: 2500, 0 = all)</source>
- <translation>Kuinka monta lohkoa tarkistetaan käynnistettäessä (oletus: 2500, 0 = kaikki)</translation>
- </message>
- <message>
- <location line="+55"/>
+ <location line="+30"/>
<source>Use OpenSSL (https) for JSON-RPC connections</source>
<translation>Käytä OpenSSL:ää (https) JSON-RPC-yhteyksille</translation>
</message>
<message>
- <location line="-20"/>
+ <location line="-21"/>
<source>Server certificate file (default: server.cert)</source>
<translation>Palvelimen sertifikaatti-tiedosto (oletus: server.cert)</translation>
</message>
@@ -2582,13 +2820,13 @@ If the file does not exist, create it with owner-readable-only file permissions.
<translation>Palvelimen yksityisavain (oletus: server.pem)</translation>
</message>
<message>
- <location line="-133"/>
+ <location line="-154"/>
<source>Acceptable ciphers (default: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH)</source>
<translation>Hyväksyttävä salaus (oletus:
TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH)</translation>
</message>
<message>
- <location line="+144"/>
+ <location line="+166"/>
<source>This help message</source>
<translation>Tämä ohjeviesti</translation>
</message>
@@ -2598,7 +2836,7 @@ TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH)</translation>
<translation>Kytkeytyminen %s tällä tietokonella ei onnistu (kytkeytyminen palautti virheen %d, %s)</translation>
</message>
<message>
- <location line="-70"/>
+ <location line="-86"/>
<source>Connect through socks proxy</source>
<translation>Yhdistä socks proxyn läpi</translation>
</message>
@@ -2608,12 +2846,12 @@ TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH)</translation>
<translation>Salli DNS kyselyt -addnode, -seednode ja -connect yhteydessä</translation>
</message>
<message>
- <location line="+43"/>
+ <location line="+57"/>
<source>Loading addresses...</source>
<translation>Ladataan osoitteita...</translation>
</message>
<message>
- <location line="-25"/>
+ <location line="-35"/>
<source>Error loading wallet.dat: Wallet corrupted</source>
<translation>Virhe ladattaessa wallet.dat-tiedostoa: Lompakko vioittunut</translation>
</message>
@@ -2623,32 +2861,22 @@ TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH)</translation>
<translation>Virhe ladattaessa wallet.dat-tiedostoa: Tarvitset uudemman version Bitcoinista</translation>
</message>
<message>
- <location line="+73"/>
- <source>Verifying block database integrity...</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+1"/>
- <source>Verifying wallet integrity...</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+1"/>
+ <location line="+87"/>
<source>Wallet needed to be rewritten: restart Bitcoin to complete</source>
<translation>Lompakko tarvitsee uudelleenkirjoittaa: käynnistä Bitcoin uudelleen</translation>
</message>
<message>
- <location line="-77"/>
+ <location line="-89"/>
<source>Error loading wallet.dat</source>
<translation>Virhe ladattaessa wallet.dat-tiedostoa</translation>
</message>
<message>
- <location line="+20"/>
+ <location line="+30"/>
<source>Invalid -proxy address: &apos;%s&apos;</source>
<translation>Virheellinen proxy-osoite &apos;%s&apos;</translation>
</message>
<message>
- <location line="+46"/>
+ <location line="+48"/>
<source>Unknown network specified in -onlynet: &apos;%s&apos;</source>
<translation>Tuntematon verkko -onlynet parametrina: &apos;%s&apos;</translation>
</message>
@@ -2658,7 +2886,7 @@ TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH)</translation>
<translation>Tuntematon -socks proxy versio pyydetty: %i</translation>
</message>
<message>
- <location line="-75"/>
+ <location line="-91"/>
<source>Cannot resolve -bind address: &apos;%s&apos;</source>
<translation>-bind osoitteen &apos;%s&apos; selvittäminen epäonnistui</translation>
</message>
@@ -2668,17 +2896,17 @@ TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH)</translation>
<translation>-externalip osoitteen &apos;%s&apos; selvittäminen epäonnistui</translation>
</message>
<message>
- <location line="+31"/>
+ <location line="+45"/>
<source>Invalid amount for -paytxfee=&lt;amount&gt;: &apos;%s&apos;</source>
<translation>-paytxfee=&lt;amount&gt;: &apos;%s&apos; on virheellinen</translation>
</message>
<message>
- <location line="-15"/>
+ <location line="-24"/>
<source>Error: could not start node</source>
<translation>Virhe: ei pystytty käynnistämään noodia.</translation>
</message>
<message>
- <location line="+16"/>
+ <location line="+25"/>
<source>Invalid amount</source>
<translation>Virheellinen määrä</translation>
</message>
@@ -2693,7 +2921,7 @@ TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH)</translation>
<translation>Ladataan lohkoindeksiä...</translation>
</message>
<message>
- <location line="-45"/>
+ <location line="-59"/>
<source>Add a node to connect to and attempt to keep the connection open</source>
<translation>Linää solmu mihin liittyä pitääksesi yhteyden auki</translation>
</message>
@@ -2703,22 +2931,17 @@ TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH)</translation>
<translation>Kytkeytyminen %s ei onnistu tällä tietokoneella. Bitcoin on todennäköisesti jo ajamassa.</translation>
</message>
<message>
- <location line="+54"/>
- <source>Find peers using internet relay chat (default: 0)</source>
- <translation>Etsi solmuja käyttäen internet relay chatia (oletus: 0)</translation>
- </message>
- <message>
- <location line="-2"/>
+ <location line="+68"/>
<source>Fee per KB to add to transactions you send</source>
<translation>Rahansiirtopalkkio per KB lisätään lähettämääsi rahansiirtoon</translation>
</message>
<message>
- <location line="+19"/>
+ <location line="+17"/>
<source>Loading wallet...</source>
<translation>Ladataan lompakkoa...</translation>
</message>
<message>
- <location line="-40"/>
+ <location line="-54"/>
<source>Cannot downgrade wallet</source>
<translation>Et voi päivittää lompakkoasi vanhempaan versioon</translation>
</message>
@@ -2733,27 +2956,27 @@ TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH)</translation>
<translation>Oletusosoitetta ei voi kirjoittaa</translation>
</message>
<message>
- <location line="+49"/>
+ <location line="+64"/>
<source>Rescanning...</source>
<translation>Skannataan uudelleen...</translation>
</message>
<message>
- <location line="-43"/>
+ <location line="-56"/>
<source>Done loading</source>
<translation>Lataus on valmis</translation>
</message>
<message>
- <location line="+65"/>
+ <location line="+79"/>
<source>To use the %s option</source>
<translation>Käytä %s optiota</translation>
</message>
<message>
- <location line="-60"/>
+ <location line="-71"/>
<source>Error</source>
<translation>Virhe</translation>
</message>
<message>
- <location line="-28"/>
+ <location line="-33"/>
<source>You must set rpcpassword=&lt;password&gt; in the configuration file:
%s
If the file does not exist, create it with owner-readable-only file permissions.</source>
diff --git a/src/qt/locale/bitcoin_fr.ts b/src/qt/locale/bitcoin_fr.ts
index 0c02062a4f..62d37250a1 100644
--- a/src/qt/locale/bitcoin_fr.ts
+++ b/src/qt/locale/bitcoin_fr.ts
@@ -13,12 +13,7 @@
<translation>&lt;b&gt;Bitcoin&lt;/b&gt; version</translation>
</message>
<message>
- <location line="+41"/>
- <source>Copyright © 2009-2012 The Bitcoin developers</source>
- <translation>Copyright © 2009-2012, les développeurs Bitcoin</translation>
- </message>
- <message>
- <location line="+13"/>
+ <location line="+57"/>
<source>
This is experimental software.
@@ -32,6 +27,16 @@ This product includes software developed by the OpenSSL Project for use in the O
Ce produit comprend des fonctionnalités développées par le projet OpenSSL pour être utilisés dans la boîte à outils OpenSSL (http://www.openssl.org/), un logiciel cryptographique écrit par Eric Young (eay@cryptsoft.com), et des fonctionnalités développées pour le logiciel UPnP écrit par Thomas Bernard.</translation>
</message>
+ <message>
+ <location filename="../aboutdialog.cpp" line="+17"/>
+ <source>Copyright</source>
+ <translation>Droit d&apos;auteur</translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>2009-%1 The Bitcoin developers</source>
+ <translation>2009-%1 Développeurs de Bitcoin</translation>
+ </message>
</context>
<context>
<name>AddressBookPage</name>
@@ -106,17 +111,22 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation>&amp;Supprimer</translation>
</message>
<message>
- <location filename="../addressbookpage.cpp" line="+65"/>
+ <location filename="../addressbookpage.cpp" line="+66"/>
<source>Copy &amp;Label</source>
<translation>Copier l&apos;é&amp;tiquette</translation>
</message>
<message>
- <location line="+2"/>
+ <location line="+1"/>
<source>&amp;Edit</source>
<translation>&amp;Éditer</translation>
</message>
<message>
- <location line="+250"/>
+ <location line="+1"/>
+ <source>Send &amp;Coins</source>
+ <translation>Envoyer des Bit&amp;coins</translation>
+ </message>
+ <message>
+ <location line="+263"/>
<source>Export Address Book Data</source>
<translation>Exporter les données du carnet d&apos;adresses</translation>
</message>
@@ -139,7 +149,7 @@ This product includes software developed by the OpenSSL Project for use in the O
<context>
<name>AddressTableModel</name>
<message>
- <location filename="../addresstablemodel.cpp" line="+142"/>
+ <location filename="../addresstablemodel.cpp" line="+144"/>
<source>Label</source>
<translation>Étiquette</translation>
</message>
@@ -298,17 +308,17 @@ This product includes software developed by the OpenSSL Project for use in the O
<context>
<name>BitcoinGUI</name>
<message>
- <location filename="../bitcoingui.cpp" line="+267"/>
+ <location filename="../bitcoingui.cpp" line="+231"/>
<source>Sign &amp;message...</source>
<translation>Signer un &amp;message...</translation>
</message>
<message>
- <location line="+254"/>
+ <location line="+299"/>
<source>Synchronizing with network...</source>
<translation>Synchronisation avec le réseau…</translation>
</message>
<message>
- <location line="-322"/>
+ <location line="-367"/>
<source>&amp;Overview</source>
<translation>&amp;Vue d&apos;ensemble</translation>
</message>
@@ -328,32 +338,17 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation>Parcourir l&apos;historique des transactions</translation>
</message>
<message>
- <location line="+6"/>
- <source>&amp;Address Book</source>
- <translation>Carnet d’&amp;adresses</translation>
- </message>
- <message>
- <location line="+1"/>
+ <location line="+7"/>
<source>Edit the list of stored addresses and labels</source>
<translation>Éditer la liste des adresses et des étiquettes stockées</translation>
</message>
<message>
- <location line="-15"/>
- <source>&amp;Receive coins</source>
- <translation>&amp;Recevoir des pièces</translation>
- </message>
- <message>
- <location line="+1"/>
+ <location line="-14"/>
<source>Show the list of addresses for receiving payments</source>
<translation>Afficher la liste des adresses pour recevoir des paiements</translation>
</message>
<message>
- <location line="-8"/>
- <source>&amp;Send coins</source>
- <translation>&amp;Envoyer des pièces</translation>
- </message>
- <message>
- <location line="+39"/>
+ <location line="+31"/>
<source>E&amp;xit</source>
<translation>Q&amp;uitter</translation>
</message>
@@ -398,7 +393,7 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation>&amp;Modifier la phrase de passe...</translation>
</message>
<message>
- <location line="+259"/>
+ <location line="+304"/>
<source>Importing blocks from disk...</source>
<translation>Importation des blocs depuis le disque...</translation>
</message>
@@ -407,13 +402,8 @@ This product includes software developed by the OpenSSL Project for use in the O
<source>Reindexing blocks on disk...</source>
<translation>Réindexation des blocs sur le disque...</translation>
</message>
- <message numerus="yes">
- <location line="+10"/>
- <source>~%n block(s) remaining</source>
- <translation><numerusform>~%n bloc restant</numerusform><numerusform>~%n blocs restants</numerusform></translation>
- </message>
<message>
- <location line="-265"/>
+ <location line="-300"/>
<source>&amp;Export...</source>
<translation>&amp;Exporter…</translation>
</message>
@@ -458,18 +448,33 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation>&amp;Vérifier un message...</translation>
</message>
<message>
- <location line="-196"/>
- <location line="+538"/>
+ <location line="-162"/>
+ <location line="+540"/>
<source>Bitcoin</source>
<translation>Bitcoin</translation>
</message>
<message>
- <location line="-538"/>
+ <location line="-540"/>
<source>Wallet</source>
<translation>Porte-monnaie</translation>
</message>
<message>
- <location line="+176"/>
+ <location line="+99"/>
+ <source>&amp;Send</source>
+ <translation>&amp;Envoyer</translation>
+ </message>
+ <message>
+ <location line="+7"/>
+ <source>&amp;Receive</source>
+ <translation>&amp;Recevoir</translation>
+ </message>
+ <message>
+ <location line="+14"/>
+ <source>&amp;Addresses</source>
+ <translation>&amp;Adresses</translation>
+ </message>
+ <message>
+ <location line="+22"/>
<source>&amp;About Bitcoin</source>
<translation>À &amp;propos de Bitcoin</translation>
</message>
@@ -530,27 +535,57 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation>[testnet]</translation>
</message>
<message>
- <location line="+63"/>
+ <location line="+47"/>
<source>Bitcoin client</source>
<translation>Client Bitcoin</translation>
</message>
<message numerus="yes">
- <location line="+79"/>
+ <location line="+140"/>
<source>%n active connection(s) to Bitcoin network</source>
<translation><numerusform>%n connexion active avec le réseau Bitcoin</numerusform><numerusform>%n connexions actives avec le réseau Bitcoin</numerusform></translation>
</message>
<message>
- <location line="+45"/>
- <source>Processed %1 of %2 blocks of transaction history (%3% done).</source>
- <translation>%1 blocs sur %2 de l&apos;historique des transactions traités (%3% effectué).</translation>
+ <location line="+39"/>
+ <source>Processed %1 of %2 (estimated) blocks of transaction history.</source>
+ <translation>%1 blocs sur %2 (estimés) de l&apos;historique des transactions traités.</translation>
</message>
<message>
- <location line="+7"/>
+ <location line="+4"/>
<source>Processed %1 blocks of transaction history.</source>
<translation>%1 blocs de l&apos;historique des transactions traités.</translation>
</message>
+ <message numerus="yes">
+ <location line="+20"/>
+ <source>%n hour(s)</source>
+ <translation><numerusform>%n heure</numerusform><numerusform>%n heures</numerusform></translation>
+ </message>
+ <message numerus="yes">
+ <location line="+4"/>
+ <source>%n day(s)</source>
+ <translation><numerusform>%n jour</numerusform><numerusform>%n jours</numerusform></translation>
+ </message>
+ <message numerus="yes">
+ <location line="+4"/>
+ <source>%n week(s)</source>
+ <translation><numerusform>%n semaine</numerusform><numerusform>%n semaines</numerusform></translation>
+ </message>
<message>
- <location line="+70"/>
+ <location line="+5"/>
+ <source>%1 behind</source>
+ <translation>%1 en arrière</translation>
+ </message>
+ <message>
+ <location line="+14"/>
+ <source>Last received block was generated %1 ago.</source>
+ <translation>Le dernier bloc reçu avait été généré il y a %1.</translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Transactions after this will not yet be visible.</source>
+ <translation>Les transactions après cela ne seront pas encore visibles.</translation>
+ </message>
+ <message>
+ <location line="+21"/>
<source>Error</source>
<translation>Erreur</translation>
</message>
@@ -565,62 +600,27 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation>Information</translation>
</message>
<message>
- <location line="+66"/>
+ <location line="+68"/>
<source>This transaction is over the size limit. You can still send it for a fee of %1, which goes to the nodes that process your transaction and helps to support the network. Do you want to pay the fee?</source>
<translation>Cette transaction dépasse la limite de taille. Vous pouvez quand même l&apos;envoyer en vous acquittant de frais d&apos;un montant de %1 qui iront aux nœuds qui traiteront la transaction et aideront à soutenir le réseau. Voulez-vous payer les frais ?</translation>
</message>
<message>
- <location line="+210"/>
- <source>Backup Successful</source>
- <translation>Sauvegarde réussie</translation>
- </message>
- <message>
- <location line="+0"/>
- <source>The wallet data was successfully saved to the new location.</source>
- <translation>Les données de porte-monnaie ont été enregistrées avec succès sur le nouvel emplacement.</translation>
- </message>
- <message numerus="yes">
- <location line="-338"/>
- <source>%n second(s) ago</source>
- <translation><numerusform>il y a %n seconde</numerusform><numerusform>il y a %n secondes</numerusform></translation>
- </message>
- <message numerus="yes">
- <location line="+4"/>
- <source>%n minute(s) ago</source>
- <translation><numerusform>il y a %n minute</numerusform><numerusform>il y a %n minutes</numerusform></translation>
- </message>
- <message numerus="yes">
- <location line="+4"/>
- <source>%n hour(s) ago</source>
- <translation><numerusform>il y a %n heure</numerusform><numerusform>il y a %n heures</numerusform></translation>
- </message>
- <message numerus="yes">
- <location line="+4"/>
- <source>%n day(s) ago</source>
- <translation><numerusform>il y a %n jour</numerusform><numerusform>il y a %n jours</numerusform></translation>
- </message>
- <message>
- <location line="+6"/>
+ <location line="-138"/>
<source>Up to date</source>
<translation>À jour</translation>
</message>
<message>
- <location line="+7"/>
+ <location line="+32"/>
<source>Catching up...</source>
<translation>Rattrapage…</translation>
</message>
<message>
- <location line="+10"/>
- <source>Last received block was generated %1.</source>
- <translation>Le dernier bloc reçu a été généré %1.</translation>
- </message>
- <message>
- <location line="+97"/>
+ <location line="+110"/>
<source>Confirm transaction fee</source>
<translation>Confirmer les frais de transaction</translation>
</message>
<message>
- <location line="+23"/>
+ <location line="+8"/>
<source>Sent transaction</source>
<translation>Transaction envoyée</translation>
</message>
@@ -643,14 +643,14 @@ Adresse : %4
</translation>
</message>
<message>
- <location line="+99"/>
- <location line="+28"/>
+ <location line="+33"/>
+ <location line="+23"/>
<source>URI handling</source>
<translation>Gestion des URI</translation>
</message>
<message>
- <location line="-28"/>
- <location line="+28"/>
+ <location line="-23"/>
+ <location line="+23"/>
<source>URI can not be parsed! This can be caused by an invalid Bitcoin address or malformed URI parameters.</source>
<translation>L&apos;URI ne peut être analysé ! Cela peut être causé par une adresse Bitcoin invalide ou par des paramètres d&apos;URI malformés.</translation>
</message>
@@ -665,27 +665,7 @@ Adresse : %4
<translation>Le porte-monnaie est &lt;b&gt;chiffré&lt;/b&gt; et est actuellement &lt;b&gt;verrouillé&lt;/b&gt;</translation>
</message>
<message>
- <location line="+23"/>
- <source>Backup Wallet</source>
- <translation>Sauvegarder le porte-monnaie</translation>
- </message>
- <message>
- <location line="+0"/>
- <source>Wallet Data (*.dat)</source>
- <translation>Données de porte-monnaie (*.dat)</translation>
- </message>
- <message>
- <location line="+3"/>
- <source>Backup Failed</source>
- <translation>La sauvegarde a échoué</translation>
- </message>
- <message>
- <location line="+0"/>
- <source>There was an error trying to save the wallet data to the new location.</source>
- <translation>Une erreur est survenue lors de l&apos;enregistrement des données de porte-monnaie à un autre emplacement.</translation>
- </message>
- <message>
- <location filename="../bitcoin.cpp" line="+109"/>
+ <location filename="../bitcoin.cpp" line="+108"/>
<source>A fatal error occurred. Bitcoin can no longer continue safely and will quit.</source>
<translation>Une erreur fatale est survenue. Bitcoin ne peut plus continuer à fonctionner de façon sûre et va s&apos;arrêter.</translation>
</message>
@@ -693,7 +673,7 @@ Adresse : %4
<context>
<name>ClientModel</name>
<message>
- <location filename="../clientmodel.cpp" line="+86"/>
+ <location filename="../clientmodel.cpp" line="+96"/>
<source>Network Alert</source>
<translation>Alerte réseau</translation>
</message>
@@ -726,7 +706,7 @@ Adresse : %4
<translation>L’adresse associée avec cette entrée du carnet d&apos;adresses. Ne peut être modifiées que les adresses d’envoi.</translation>
</message>
<message>
- <location filename="../editaddressdialog.cpp" line="+20"/>
+ <location filename="../editaddressdialog.cpp" line="+21"/>
<source>New receiving address</source>
<translation>Nouvelle adresse de réception</translation>
</message>
@@ -746,17 +726,17 @@ Adresse : %4
<translation>Éditer l’adresse d&apos;envoi</translation>
</message>
<message>
- <location line="+60"/>
+ <location line="+76"/>
<source>The entered address &quot;%1&quot; is already in the address book.</source>
<translation>L’adresse fournie « %1 » est déjà présente dans le carnet d&apos;adresses.</translation>
</message>
<message>
- <location line="+5"/>
+ <location line="-5"/>
<source>The entered address &quot;%1&quot; is not a valid Bitcoin address.</source>
<translation>L&apos;adresse fournie « %1 » n&apos;est pas une adresse Bitcoin valide.</translation>
</message>
<message>
- <location line="+5"/>
+ <location line="+10"/>
<source>Could not unlock wallet.</source>
<translation>Impossible de déverrouiller le porte-monnaie.</translation>
</message>
@@ -769,7 +749,7 @@ Adresse : %4
<context>
<name>GUIUtil::HelpMessageBox</name>
<message>
- <location filename="../guiutil.cpp" line="+419"/>
+ <location filename="../guiutil.cpp" line="+422"/>
<location line="+12"/>
<source>Bitcoin-Qt</source>
<translation>Bitcoin-Qt</translation>
@@ -983,7 +963,7 @@ Adresse : %4
<translation>&amp;Appliquer</translation>
</message>
<message>
- <location filename="../optionsdialog.cpp" line="+55"/>
+ <location filename="../optionsdialog.cpp" line="+53"/>
<source>default</source>
<translation>par défaut</translation>
</message>
@@ -995,7 +975,7 @@ Adresse : %4
<message>
<location line="+1"/>
<source>Some settings may require a client restart to take effect.</source>
- <translation>Certains réglages peuvent nécessiter un redémarrage du client pour être pris en compte.</translation>
+ <translation>La prise en compte de certains réglages peut nécessiter un redémarrage du client.</translation>
</message>
<message>
<location line="+0"/>
@@ -1028,23 +1008,18 @@ Adresse : %4
<translation>Formulaire</translation>
</message>
<message>
- <location line="+51"/>
- <location line="+183"/>
+ <location line="+50"/>
+ <location line="+166"/>
<source>The displayed information may be out of date. Your wallet automatically synchronizes with the Bitcoin network after a connection is established, but this process has not completed yet.</source>
<translation>Les informations affichées peuvent être obsolètes. Votre porte-monnaie est automatiquement synchronisé avec le réseau Bitcoin lorsque la connexion s&apos;établit, or ce processus n&apos;est pas encore terminé.</translation>
</message>
<message>
- <location line="-141"/>
+ <location line="-124"/>
<source>Balance:</source>
<translation>Solde :</translation>
</message>
<message>
- <location line="+58"/>
- <source>Number of transactions:</source>
- <translation>Nombre de transactions :</translation>
- </message>
- <message>
- <location line="-29"/>
+ <location line="+29"/>
<source>Unconfirmed:</source>
<translation>Non confirmé :</translation>
</message>
@@ -1054,7 +1029,7 @@ Adresse : %4
<translation>Porte-monnaie</translation>
</message>
<message>
- <location line="+124"/>
+ <location line="+107"/>
<source>Immature:</source>
<translation>Immature :</translation>
</message>
@@ -1069,7 +1044,7 @@ Adresse : %4
<translation>&lt;b&gt;Transactions récentes&lt;/b&gt;</translation>
</message>
<message>
- <location line="-118"/>
+ <location line="-101"/>
<source>Your current balance</source>
<translation>Votre solde actuel</translation>
</message>
@@ -1079,11 +1054,6 @@ Adresse : %4
<translation>Total des transactions qui doivent encore être confirmées et qui ne sont pas prises en compte dans le solde actuel</translation>
</message>
<message>
- <location line="+20"/>
- <source>Total number of transactions in wallet</source>
- <translation>Nombre total de transactions dans le porte-monnaie</translation>
- </message>
- <message>
<location filename="../overviewpage.cpp" line="+115"/>
<location line="+1"/>
<source>out of sync</source>
@@ -1091,6 +1061,14 @@ Adresse : %4
</message>
</context>
<context>
+ <name>PaymentServer</name>
+ <message>
+ <location filename="../paymentserver.cpp" line="+107"/>
+ <source>Cannot start bitcoin: click-to-pay handler</source>
+ <translation>Impossible de démarrer bitcoin : gestionnaire de cliquer-pour-payer</translation>
+ </message>
+</context>
+<context>
<name>QRCodeDialog</name>
<message>
<location filename="../forms/qrcodedialog.ui" line="+14"/>
@@ -1429,7 +1407,7 @@ Adresse : %4
</message>
<message>
<location line="+60"/>
- <location filename="../sendcoinsentry.cpp" line="+25"/>
+ <location filename="../sendcoinsentry.cpp" line="+26"/>
<source>Enter a label for this address to add it to your address book</source>
<translation>Entrez une étiquette pour cette adresse afin de l’ajouter à votre carnet d’adresses</translation>
</message>
@@ -1479,7 +1457,7 @@ Adresse : %4
<message>
<location line="+13"/>
<source>&amp;Sign Message</source>
- <translation>&amp;Signer le message</translation>
+ <translation>&amp;Signer un message</translation>
</message>
<message>
<location line="+6"/>
@@ -1536,7 +1514,7 @@ Adresse : %4
<message>
<location line="+3"/>
<source>Sign &amp;Message</source>
- <translation>Signer un &amp;message</translation>
+ <translation>Signer le &amp;message</translation>
</message>
<message>
<location line="+14"/>
@@ -1552,7 +1530,7 @@ Adresse : %4
<message>
<location line="-87"/>
<source>&amp;Verify Message</source>
- <translation>&amp;Vérifier le message</translation>
+ <translation>&amp;Vérifier un message</translation>
</message>
<message>
<location line="+6"/>
@@ -1665,7 +1643,7 @@ Adresse : %4
<context>
<name>TransactionDesc</name>
<message>
- <location filename="../transactiondesc.cpp" line="+19"/>
+ <location filename="../transactiondesc.cpp" line="+20"/>
<source>Open until %1</source>
<translation>Ouvert jusqu&apos;à %1</translation>
</message>
@@ -1852,7 +1830,7 @@ Adresse : %4
<context>
<name>TransactionTableModel</name>
<message>
- <location filename="../transactiontablemodel.cpp" line="+226"/>
+ <location filename="../transactiontablemodel.cpp" line="+225"/>
<source>Date</source>
<translation>Date</translation>
</message>
@@ -1970,7 +1948,7 @@ Adresse : %4
<context>
<name>TransactionView</name>
<message>
- <location filename="../transactionview.cpp" line="+55"/>
+ <location filename="../transactionview.cpp" line="+52"/>
<location line="+16"/>
<source>All</source>
<translation>Toutes</translation>
@@ -2057,6 +2035,11 @@ Adresse : %4
</message>
<message>
<location line="+1"/>
+ <source>Copy transaction ID</source>
+ <translation>Copier l&apos;ID de la transaction</translation>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Edit label</source>
<translation>Éditer l’étiquette</translation>
</message>
@@ -2066,7 +2049,7 @@ Adresse : %4
<translation>Afficher les détails de la transaction</translation>
</message>
<message>
- <location line="+142"/>
+ <location line="+139"/>
<source>Export Transaction Data</source>
<translation>Exporter les données des transactions</translation>
</message>
@@ -2121,7 +2104,7 @@ Adresse : %4
<translation>Impossible d&apos;écrire dans le fichier %1.</translation>
</message>
<message>
- <location line="+95"/>
+ <location line="+100"/>
<source>Range:</source>
<translation>Intervalle :</translation>
</message>
@@ -2132,29 +2115,172 @@ Adresse : %4
</message>
</context>
<context>
+ <name>WalletView</name>
+ <message>
+ <location filename="../walletview.cpp" line="+95"/>
+ <source>&amp;Overview</source>
+ <translation>&amp;Vue d&apos;ensemble</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Show general overview of wallet</source>
+ <translation>Afficher une vue d&apos;ensemble du porte-monnaie</translation>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>&amp;Send coins</source>
+ <translation>&amp;Envoyer des pièces</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Send coins to a Bitcoin address</source>
+ <translation>Envoyer des pièces à une adresse Bitcoin</translation>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>&amp;Receive coins</source>
+ <translation>&amp;Recevoir des pièces</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Show the list of addresses for receiving payments</source>
+ <translation>Afficher la liste des adresses destinées à recevoir des paiements</translation>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>&amp;Transactions</source>
+ <translation>&amp;Transactions</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Browse transaction history</source>
+ <translation>Parcourir l&apos;historique des transactions</translation>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>&amp;Address Book</source>
+ <translation>C&amp;arnet d&apos;adresses</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Edit the list of stored addresses and labels</source>
+ <translation>Éditer la liste des adresses enregistrées et les étiquettes</translation>
+ </message>
+ <message>
+ <location line="+12"/>
+ <source>&amp;Encrypt Wallet...</source>
+ <translation>&amp;Chiffrer le porte-monnaie...</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Encrypt the private keys that belong to your wallet</source>
+ <translation>Chiffrer les clefs privées qui appartiennent à votre porte-monnaie</translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>&amp;Backup Wallet...</source>
+ <translation>&amp;Sauvegarder le porte-monnaie...</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Backup wallet to another location</source>
+ <translation>Sauvegarder le porte-monnaie à un autre endroit</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>&amp;Change Passphrase...</source>
+ <translation>&amp;Modifier la phrase de passe...</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Change the passphrase used for wallet encryption</source>
+ <translation>Modifier la phrase de passe utilisée pour le cryptage du porte-monnaie</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Sign &amp;message...</source>
+ <translation>Signer un &amp;message</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Sign messages with your Bitcoin addresses to prove you own them</source>
+ <translation>Signer des messages avec vos adresses Bitcoin pour prouver que vous les détenez</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>&amp;Verify message...</source>
+ <translation>&amp;Vérifier le message</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Verify messages to ensure they were signed with specified Bitcoin addresses</source>
+ <translation>Vérifier des messages pour vous assurer qu&apos;ils ont été signés par les adresses Bitcoin précisées</translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>&amp;Export...</source>
+ <translation>&amp;Exporter...</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Export the data in the current tab to a file</source>
+ <translation>Exporter les données de l&apos;onglet actuel vers un fichier</translation>
+ </message>
+ <message>
+ <location line="+180"/>
+ <source>Backup Wallet</source>
+ <translation>Sauvegarder le porte-monnaie</translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>Wallet Data (*.dat)</source>
+ <translation>Données de porte-monnaie (*.dat)</translation>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Backup Failed</source>
+ <translation>Échec de la sauvegarde</translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>There was an error trying to save the wallet data to the new location.</source>
+ <translation>Une erreur est survenue lors de l&apos;enregistrement des données de porte-monnaie à un nouvel endroit</translation>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>Backup Successful</source>
+ <translation>Sauvegarde réussie</translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>The wallet data was successfully saved to the new location.</source>
+ <translation>Les données de porte-monnaie ont été enregistrées avec succès sur le nouvel emplacement.</translation>
+ </message>
+</context>
+<context>
<name>bitcoin-core</name>
<message>
- <location filename="../bitcoinstrings.cpp" line="+88"/>
+ <location filename="../bitcoinstrings.cpp" line="+96"/>
<source>Bitcoin version</source>
<translation>Version de Bitcoin</translation>
</message>
<message>
- <location line="+82"/>
+ <location line="+98"/>
<source>Usage:</source>
<translation>Utilisation :</translation>
</message>
<message>
- <location line="-23"/>
+ <location line="-24"/>
<source>Send command to -server or bitcoind</source>
<translation>Envoyer une commande à -server ou à bitcoind</translation>
</message>
<message>
- <location line="-21"/>
+ <location line="-22"/>
<source>List commands</source>
<translation>Lister les commandes</translation>
</message>
<message>
- <location line="-11"/>
+ <location line="-10"/>
<source>Get help for a command</source>
<translation>Obtenir de l’aide pour une commande</translation>
</message>
@@ -2179,12 +2305,12 @@ Adresse : %4
<translation>Générer des pièces</translation>
</message>
<message>
- <location line="-15"/>
+ <location line="-28"/>
<source>Don&apos;t generate coins</source>
<translation>Ne pas générer de pièces</translation>
</message>
<message>
- <location line="+61"/>
+ <location line="+74"/>
<source>Specify data directory</source>
<translation>Spécifier le répertoire de données</translation>
</message>
@@ -2194,87 +2320,92 @@ Adresse : %4
<translation>Définir la taille du tampon en mégaoctets (par défaut : 25)</translation>
</message>
<message>
- <location line="-26"/>
+ <location line="-27"/>
<source>Listen for connections on &lt;port&gt; (default: 8333 or testnet: 18333)</source>
<translation>Écouter les connexions sur le &lt;port&gt; (par défaut : 8333 ou testnet : 18333)</translation>
</message>
<message>
- <location line="+4"/>
+ <location line="+5"/>
<source>Maintain at most &lt;n&gt; connections to peers (default: 125)</source>
<translation>Garder au plus &lt;n&gt; connexions avec les pairs (par défaut : 125)</translation>
</message>
<message>
- <location line="-34"/>
+ <location line="-49"/>
<source>Connect to a node to retrieve peer addresses, and disconnect</source>
<translation>Se connecter à un nœud pour obtenir des adresses de pairs puis se déconnecter</translation>
</message>
<message>
- <location line="+65"/>
+ <location line="+80"/>
<source>Specify your own public address</source>
<translation>Spécifier votre propre adresse publique</translation>
</message>
<message>
- <location line="+2"/>
+ <location line="+3"/>
<source>Threshold for disconnecting misbehaving peers (default: 100)</source>
<translation>Seuil de déconnexion des pairs de mauvaise qualité (par défaut : 100)</translation>
</message>
<message>
- <location line="-114"/>
+ <location line="-132"/>
<source>Number of seconds to keep misbehaving peers from reconnecting (default: 86400)</source>
<translation>Délai en secondes de refus de reconnexion aux pairs de mauvaise qualité (par défaut : 86400)</translation>
</message>
<message>
- <location line="-28"/>
+ <location line="-32"/>
<source>An error occurred while setting up the RPC port %u for listening on IPv4: %s</source>
<translation>Une erreur est survenue lors de la mise en place du port RPC %u pour écouter sur IPv4 : %s</translation>
</message>
<message>
- <location line="+26"/>
+ <location line="+30"/>
<source>Listen for JSON-RPC connections on &lt;port&gt; (default: 8332 or testnet: 18332)</source>
<translation>Écouter les connexions JSON-RPC sur le &lt;port&gt; (par défaut : 8332 ou tesnet : 18332)</translation>
</message>
<message>
- <location line="+34"/>
+ <location line="+36"/>
<source>Accept command line and JSON-RPC commands</source>
<translation>Accepter les commandes de JSON-RPC et de la ligne de commande</translation>
</message>
<message>
- <location line="+62"/>
+ <location line="+77"/>
<source>Run in the background as a daemon and accept commands</source>
<translation>Fonctionner en arrière-plan en tant que démon et accepter les commandes</translation>
</message>
<message>
- <location line="+31"/>
+ <location line="+32"/>
<source>Use the test network</source>
<translation>Utiliser le réseau de test</translation>
</message>
<message>
- <location line="-92"/>
+ <location line="-108"/>
<source>Accept connections from outside (default: 1 if no -proxy or -connect)</source>
<translation>Accepter les connexions entrantes (par défaut : 1 si -proxy ou -connect ne sont pas présents)</translation>
</message>
<message>
- <location line="-74"/>
+ <location line="-82"/>
<source>%s, you must set a rpcpassword in the configuration file:
- %s
+%s
It is recommended you use the following random password:
rpcuser=bitcoinrpc
rpcpassword=%s
(you do not need to remember this password)
The username and password MUST NOT be the same.
If the file does not exist, create it with owner-readable-only file permissions.
+It is also recommended to set alertnotify so you are notified of problems;
+for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.com
</source>
- <translation>%s, vous devez établir un mot de passe rpc dans le fichier de configuration :
- %s
-Il vous est recommandé d&apos;utiliser le mot de passe aléatoire suivant :
-rcpuser=bitcoinrpc
+ <translation>%s, vous devez définir un mot de passe rpc dans le fichier de configuration :
+%s
+Il vous est conseillé d&apos;utiliser le mot de passe aléatoire suivant :
+rpcuser=bitcoinrpc
rpcpassword=%s
-(vous n&apos;avez pas besoin de mémoriser ce mot de passe)
+(vous n&apos;avez pas besoin de retenir ce mot de passe)
Le nom d&apos;utilisateur et le mot de passe NE DOIVENT PAS être identiques.
-Si le fichier n&apos;existe pas, créez-le avec les droits de lecture accordés seulement au propriétaire.</translation>
+Si le fichier n&apos;existe pas, créez-le avec les droits de lecture accordés au propriétaire.
+Il est aussi conseillé de régler alertnotify pour être prévenu des problèmes ;
+par exemple : alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.com
+</translation>
</message>
<message>
- <location line="+15"/>
+ <location line="+17"/>
<source>An error occurred while setting up the RPC port %u for listening on IPv6, falling back to IPv4: %s</source>
<translation>Une erreur est survenue lors de la mise en place du port RPC %u pour écouter sur IPv6, retour à IPv4 : %s</translation>
</message>
@@ -2290,11 +2421,6 @@ Si le fichier n&apos;existe pas, créez-le avec les droits de lecture accordés
</message>
<message>
<location line="+3"/>
- <source>Corrupted block database detected. Please restart the client with -reindex.</source>
- <translation>Base de données de blocs corrompue détectée. Veuillez redémarrer le client avec -reindex.</translation>
- </message>
- <message>
- <location line="+2"/>
<source>Error initializing database environment %s! To recover, BACKUP THAT DIRECTORY, then remove everything from it except for wallet.dat.</source>
<translation>Une erreur est survenue lors de l&apos;initialisation de l&apos;environnement de base de données %s ! Pour récupérer, SAUVEGARDEZ CE RÉPERTOIRE, puis effacez-y tous les fichiers à l&apos;exception de wallet.dat.</translation>
</message>
@@ -2309,12 +2435,27 @@ Si le fichier n&apos;existe pas, créez-le avec les droits de lecture accordés
<translation>Erreur : cette transaction nécessite des frais de transaction d&apos;au moins %s en raison de son montant, de sa complexité ou parce que des fonds reçus récemment sont utilisés !</translation>
</message>
<message>
+ <location line="+3"/>
+ <source>Execute command when a relevant alert is received (%s in cmd is replaced by message)</source>
+ <translation>Exécuter une commande lorsqu&apos;une alerte correspondante est reçue (%s dans la commande sera remplacé par le message)</translation>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Execute command when a wallet transaction changes (%s in cmd is replaced by TxID)</source>
+ <translation>Exécuter la commande lorsqu&apos;une transaction de porte-monnaie change (%s dans la commande est remplacée par TxID)</translation>
+ </message>
+ <message>
<location line="+11"/>
<source>Set maximum size of high-priority/low-fee transactions in bytes (default: 27000)</source>
<translation>Définir la taille maximale en octets des transactions prioritaires/à frais modiques (par défaut : 27000)</translation>
</message>
<message>
<location line="+3"/>
+ <source>Set the number of script verification threads (1-16, 0=auto, default: 0)</source>
+ <translation>Définir le nombre de fils de vérification de script (1-16, 0=auto, par défaut : 0)</translation>
+ </message>
+ <message>
+ <location line="+2"/>
<source>This is a pre-release test build - use at your own risk - do not use for mining or merchant applications</source>
<translation>Ceci est une pré-version de test - utilisez à vos risques et périls - ne l&apos;utilisez pas pour miner ou pour des applications marchandes</translation>
</message>
@@ -2360,16 +2501,41 @@ Si le fichier n&apos;existe pas, créez-le avec les droits de lecture accordés
</message>
<message>
<location line="+3"/>
+ <source>Corrupted block database detected</source>
+ <translation>Base de données des blocs corrompue détectée</translation>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Discover own IP address (default: 1 when listening and no -externalip)</source>
<translation>Découvrir sa propre adresse IP (par défaut : 1 lors de l&apos;écoute et si -externalip n&apos;est pas présent)</translation>
</message>
<message>
+ <location line="+1"/>
+ <source>Do you want to rebuild the block database now?</source>
+ <translation>Voulez-vous reconstruire la base de données des blocs maintenant ?</translation>
+ </message>
+ <message>
<location line="+3"/>
+ <source>Error initializing block database</source>
+ <translation>Erreur lors de l&apos;initialisation de la base de données des blocs</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Error initializing wallet database environment %s!</source>
+ <translation>Erreur lors de l&apos;initialisation de l&apos;environnement de la base de données du porte-monnaie %s !</translation>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Error loading block database</source>
<translation>Erreur du chargement de la base de données des blocs</translation>
</message>
<message>
- <location line="+5"/>
+ <location line="+4"/>
+ <source>Error opening block database</source>
+ <translation>Erreur lors de l&apos;ouverture de la base de données</translation>
+ </message>
+ <message>
+ <location line="+2"/>
<source>Error: Disk space is low!</source>
<translation>Erreur : l&apos;espace disque est faible !</translation>
</message>
@@ -2385,26 +2551,96 @@ Si le fichier n&apos;existe pas, créez-le avec les droits de lecture accordés
</message>
<message>
<location line="+2"/>
+ <source>Error: system error: </source>
+ <translation>Erreur : erreur système :</translation>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Failed to listen on any port. Use -listen=0 if you want this.</source>
<translation>Échec de l&apos;écoute sur un port quelconque. Utilisez -listen=0 si vous voulez cela.</translation>
</message>
<message>
+ <location line="+1"/>
+ <source>Failed to read block info</source>
+ <translation>La lecture des informations de bloc a échoué</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Failed to read block</source>
+ <translation>La lecture du bloc a échoué</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Failed to sync block index</source>
+ <translation>La synchronisation de l&apos;index des blocs a échoué</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Failed to write block index</source>
+ <translation>L&apos;&apos;écriture de l&apos;index des blocs a échoué</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Failed to write block info</source>
+ <translation>L&apos;écriture des informations du bloc a échoué</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Failed to write block</source>
+ <translation>L&apos;écriture du bloc a échoué</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Failed to write file info</source>
+ <translation>L&apos;écriture des informations de fichier a échoué</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Failed to write to coin database</source>
+ <translation>L&apos;écriture dans la base de données des pièces a échoué</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Failed to write transaction index</source>
+ <translation>L&apos;écriture de l&apos;index des transactions a échoué</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Failed to write undo data</source>
+ <translation>L&apos;écriture des données d&apos;annulation a échoué</translation>
+ </message>
+ <message>
<location line="+2"/>
<source>Find peers using DNS lookup (default: 1 unless -connect)</source>
<translation>Trouver des pairs en utilisant la recherche DNS (par défaut : 1 sauf si -connect est utilisé)</translation>
</message>
<message>
- <location line="+5"/>
+ <location line="+3"/>
+ <source>How many blocks to check at startup (default: 288, 0 = all)</source>
+ <translation>Nombre de blocs à vérifier au démarrage (par défaut : 288, 0 = tout)</translation>
+ </message>
+ <message>
+ <location line="+1"/>
<source>How thorough the block verification is (0-4, default: 3)</source>
<translation>Niveau d&apos;approfondissement de la vérification des blocs (0-4, par défaut : 3)</translation>
</message>
<message>
- <location line="+1"/>
- <source>Importing blocks from block database...</source>
- <translation>Importation des blocs depuis la base de données...</translation>
+ <location line="+24"/>
+ <source>Rebuild block chain index from current blk000??.dat files</source>
+ <translation>Reconstruire l&apos;index de la chaîne des blocs à partir des fichiers blk000??.dat actuels</translation>
+ </message>
+ <message>
+ <location line="+37"/>
+ <source>Verifying blocks...</source>
+ <translation>Vérification des blocs...</translation>
</message>
<message>
<location line="+1"/>
+ <source>Verifying wallet...</source>
+ <translation>Vérification du porte-monnaie...</translation>
+ </message>
+ <message>
+ <location line="-61"/>
<source>Imports blocks from external blk000??.dat file</source>
<translation>Importe des blocs depuis un fichier blk000??.dat externe</translation>
</message>
@@ -2419,7 +2655,12 @@ Si le fichier n&apos;existe pas, créez-le avec les droits de lecture accordés
<translation>Adresse -tor invalide : « %s »</translation>
</message>
<message>
- <location line="+9"/>
+ <location line="+8"/>
+ <source>Maintain a full transaction index (default: 0)</source>
+ <translation>Maintenir un index complet des transactions (par défaut : 0)</translation>
+ </message>
+ <message>
+ <location line="+2"/>
<source>Maximum per-connection receive buffer, &lt;n&gt;*1000 bytes (default: 5000)</source>
<translation>Tampon maximal de réception par -connection, &lt;n&gt;*1000 octets (par défaut : 5000)</translation>
</message>
@@ -2454,12 +2695,7 @@ Si le fichier n&apos;existe pas, créez-le avec les droits de lecture accordés
<translation>Faire précéder les données de débogage par un horodatage</translation>
</message>
<message>
- <location line="+1"/>
- <source>Rebuild blockchain index from current blk000??.dat files</source>
- <translation>Reconstruire l&apos;index de la chaîne des blocs depuis les fichiers blk000??.dat actuels</translation>
- </message>
- <message>
- <location line="+4"/>
+ <location line="+5"/>
<source>SSL options: (see the Bitcoin Wiki for SSL setup instructions)</source>
<translation>Options SSL : (cf. le wiki de Bitcoin pour les instructions de configuration du SSL)</translation>
</message>
@@ -2499,7 +2735,12 @@ Si le fichier n&apos;existe pas, créez-le avec les droits de lecture accordés
<translation>Spécifier le délai d&apos;expiration de la connexion en millisecondes (par défaut : 5000)</translation>
</message>
<message>
- <location line="+13"/>
+ <location line="+4"/>
+ <source>System error: </source>
+ <translation>Erreur système :</translation>
+ </message>
+ <message>
+ <location line="+10"/>
<source>Use UPnP to map the listening port (default: 0)</source>
<translation>Utiliser l&apos;UPnP pour rediriger le port d&apos;écoute (par défaut : 0)</translation>
</message>
@@ -2530,36 +2771,41 @@ Si le fichier n&apos;existe pas, créez-le avec les droits de lecture accordés
</message>
<message>
<location line="+1"/>
+ <source>You need to rebuild the databases using -reindex to change -txindex</source>
+ <translation>Vous devez reconstruire les bases de données avec -reindex pour modifier -txindex</translation>
+ </message>
+ <message>
+ <location line="+1"/>
<source>wallet.dat corrupt, salvage failed</source>
<translation>wallet.dat corrompu, la récupération a échoué</translation>
</message>
<message>
- <location line="-43"/>
+ <location line="-45"/>
<source>Password for JSON-RPC connections</source>
<translation>Mot de passe pour les connexions JSON-RPC</translation>
</message>
<message>
- <location line="-53"/>
+ <location line="-68"/>
<source>Allow JSON-RPC connections from specified IP address</source>
<translation>Autoriser les connexions JSON-RPC depuis l&apos;adresse IP spécifiée</translation>
</message>
<message>
- <location line="+62"/>
+ <location line="+77"/>
<source>Send commands to node running on &lt;ip&gt; (default: 127.0.0.1)</source>
<translation>Envoyer des commandes au nœud fonctionnant à &lt;ip&gt; (par défaut : 127.0.0.1)</translation>
</message>
<message>
- <location line="-103"/>
+ <location line="-120"/>
<source>Execute command when the best block changes (%s in cmd is replaced by block hash)</source>
<translation>Exécuter la commande lorsque le meilleur bloc change (%s est remplacé par le hachage du bloc dans cmd)</translation>
</message>
<message>
- <location line="+124"/>
+ <location line="+142"/>
<source>Upgrade wallet to latest format</source>
<translation>Mettre à jour le format du porte-monnaie</translation>
</message>
<message>
- <location line="-15"/>
+ <location line="-16"/>
<source>Set key pool size to &lt;n&gt; (default: 100)</source>
<translation>Régler la taille de la plage de clefs sur &lt;n&gt; (par défaut : 100)</translation>
</message>
@@ -2569,17 +2815,12 @@ Si le fichier n&apos;existe pas, créez-le avec les droits de lecture accordés
<translation>Réanalyser la chaîne de blocs pour les transactions de porte-monnaie manquantes</translation>
</message>
<message>
- <location line="-26"/>
- <source>How many blocks to check at startup (default: 2500, 0 = all)</source>
- <translation>Nombre de blocs à tester au démarrage (par défaut : 2500, 0 = tous)</translation>
- </message>
- <message>
- <location line="+55"/>
+ <location line="+30"/>
<source>Use OpenSSL (https) for JSON-RPC connections</source>
<translation>Utiliser OpenSSL (https) pour les connexions JSON-RPC</translation>
</message>
<message>
- <location line="-20"/>
+ <location line="-21"/>
<source>Server certificate file (default: server.cert)</source>
<translation>Fichier de certificat serveur (par défaut : server.cert)</translation>
</message>
@@ -2589,12 +2830,12 @@ Si le fichier n&apos;existe pas, créez-le avec les droits de lecture accordés
<translation>Clef privée du serveur (par défaut : server.pem)</translation>
</message>
<message>
- <location line="-133"/>
+ <location line="-154"/>
<source>Acceptable ciphers (default: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH)</source>
<translation>Clefs de chiffrement acceptables (par défaut : TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH)</translation>
</message>
<message>
- <location line="+144"/>
+ <location line="+166"/>
<source>This help message</source>
<translation>Ce message d&apos;aide</translation>
</message>
@@ -2604,7 +2845,7 @@ Si le fichier n&apos;existe pas, créez-le avec les droits de lecture accordés
<translation>Impossible de se lier à %s sur cet ordinateur (bind a retourné l&apos;erreur %d, %s)</translation>
</message>
<message>
- <location line="-70"/>
+ <location line="-86"/>
<source>Connect through socks proxy</source>
<translation>Connexion via un proxy socks</translation>
</message>
@@ -2614,12 +2855,12 @@ Si le fichier n&apos;existe pas, créez-le avec les droits de lecture accordés
<translation>Autoriser les recherches DNS pour -addnode, -seednode et -connect</translation>
</message>
<message>
- <location line="+43"/>
+ <location line="+57"/>
<source>Loading addresses...</source>
<translation>Chargement des adresses…</translation>
</message>
<message>
- <location line="-25"/>
+ <location line="-35"/>
<source>Error loading wallet.dat: Wallet corrupted</source>
<translation>Erreur lors du chargement de wallet.dat : porte-monnaie corrompu</translation>
</message>
@@ -2629,32 +2870,22 @@ Si le fichier n&apos;existe pas, créez-le avec les droits de lecture accordés
<translation>Erreur lors du chargement de wallet.dat : le porte-monnaie nécessite une version plus récente de Bitcoin</translation>
</message>
<message>
- <location line="+73"/>
- <source>Verifying block database integrity...</source>
- <translation>Vérification de l&apos;intégrité de la base de données des blocs...</translation>
- </message>
- <message>
- <location line="+1"/>
- <source>Verifying wallet integrity...</source>
- <translation>Vérification de l&apos;intégrité du porte-monnaie...</translation>
- </message>
- <message>
- <location line="+1"/>
+ <location line="+87"/>
<source>Wallet needed to be rewritten: restart Bitcoin to complete</source>
<translation>Le porte-monnaie nécessitait une réécriture : veuillez redémarrer Bitcoin pour terminer l&apos;opération</translation>
</message>
<message>
- <location line="-77"/>
+ <location line="-89"/>
<source>Error loading wallet.dat</source>
<translation>Erreur lors du chargement de wallet.dat</translation>
</message>
<message>
- <location line="+20"/>
+ <location line="+30"/>
<source>Invalid -proxy address: &apos;%s&apos;</source>
<translation>Adresse -proxy invalide : « %s »</translation>
</message>
<message>
- <location line="+46"/>
+ <location line="+48"/>
<source>Unknown network specified in -onlynet: &apos;%s&apos;</source>
<translation>Réseau inconnu spécifié sur -onlynet : « %s »</translation>
</message>
@@ -2664,7 +2895,7 @@ Si le fichier n&apos;existe pas, créez-le avec les droits de lecture accordés
<translation>Version inconnue de proxy -socks demandée : %i</translation>
</message>
<message>
- <location line="-75"/>
+ <location line="-91"/>
<source>Cannot resolve -bind address: &apos;%s&apos;</source>
<translation>Impossible de résoudre l&apos;adresse -bind : « %s »</translation>
</message>
@@ -2674,17 +2905,17 @@ Si le fichier n&apos;existe pas, créez-le avec les droits de lecture accordés
<translation>Impossible de résoudre l&apos;adresse -externalip : « %s »</translation>
</message>
<message>
- <location line="+31"/>
+ <location line="+45"/>
<source>Invalid amount for -paytxfee=&lt;amount&gt;: &apos;%s&apos;</source>
<translation>Montant invalide pour -paytxfee=&lt;montant&gt; : « %s »</translation>
</message>
<message>
- <location line="-15"/>
+ <location line="-24"/>
<source>Error: could not start node</source>
<translation>Erreur : le nœud n&apos;a pu être démarré</translation>
</message>
<message>
- <location line="+16"/>
+ <location line="+25"/>
<source>Invalid amount</source>
<translation>Montant invalide</translation>
</message>
@@ -2699,7 +2930,7 @@ Si le fichier n&apos;existe pas, créez-le avec les droits de lecture accordés
<translation>Chargement de l’index des blocs…</translation>
</message>
<message>
- <location line="-45"/>
+ <location line="-59"/>
<source>Add a node to connect to and attempt to keep the connection open</source>
<translation>Ajouter un nœud auquel se connecter et tenter de garder la connexion ouverte</translation>
</message>
@@ -2709,22 +2940,17 @@ Si le fichier n&apos;existe pas, créez-le avec les droits de lecture accordés
<translation>Impossible de se lier à %s sur cet ordinateur. Bitcoin fonctionne probablement déjà.</translation>
</message>
<message>
- <location line="+54"/>
- <source>Find peers using internet relay chat (default: 0)</source>
- <translation>Trouver des pairs en utilisant Internet Relay Chat (par défaut : 0)</translation>
- </message>
- <message>
- <location line="-2"/>
+ <location line="+68"/>
<source>Fee per KB to add to transactions you send</source>
<translation>Frais par Ko à ajouter aux transactions que vous enverrez</translation>
</message>
<message>
- <location line="+19"/>
+ <location line="+17"/>
<source>Loading wallet...</source>
<translation>Chargement du porte-monnaie…</translation>
</message>
<message>
- <location line="-40"/>
+ <location line="-54"/>
<source>Cannot downgrade wallet</source>
<translation>Impossible de revenir à une version antérieure du porte-monnaie</translation>
</message>
@@ -2739,27 +2965,27 @@ Si le fichier n&apos;existe pas, créez-le avec les droits de lecture accordés
<translation>Impossible d&apos;écrire l&apos;adresse par défaut</translation>
</message>
<message>
- <location line="+49"/>
+ <location line="+64"/>
<source>Rescanning...</source>
<translation>Nouvelle analyse…</translation>
</message>
<message>
- <location line="-43"/>
+ <location line="-56"/>
<source>Done loading</source>
<translation>Chargement terminé</translation>
</message>
<message>
- <location line="+65"/>
+ <location line="+79"/>
<source>To use the %s option</source>
<translation>Pour utiliser l&apos;option %s</translation>
</message>
<message>
- <location line="-60"/>
+ <location line="-71"/>
<source>Error</source>
<translation>Erreur</translation>
</message>
<message>
- <location line="-28"/>
+ <location line="-33"/>
<source>You must set rpcpassword=&lt;password&gt; in the configuration file:
%s
If the file does not exist, create it with owner-readable-only file permissions.</source>
diff --git a/src/qt/locale/bitcoin_fr_CA.ts b/src/qt/locale/bitcoin_fr_CA.ts
index 6fde4d32fb..05071ac474 100644
--- a/src/qt/locale/bitcoin_fr_CA.ts
+++ b/src/qt/locale/bitcoin_fr_CA.ts
@@ -13,12 +13,7 @@
<translation>&lt;b&gt;Bitcoin&lt;/b&gt; version</translation>
</message>
<message>
- <location line="+41"/>
- <source>Copyright © 2009-2012 The Bitcoin developers</source>
- <translation>Copyright © 2009-2012 Développeurs de Bitcoin</translation>
- </message>
- <message>
- <location line="+13"/>
+ <location line="+57"/>
<source>
This is experimental software.
@@ -32,6 +27,16 @@ Distribué sous licence MIT/X11, voir le fichier COPYING ou http://www.opensourc
Ce produit comprend des logiciels développés par le projet OpenSSL pour être utilisés dans la boîte à outils OpenSSL (http://www.openssl.org/), un logiciel cryptographique écrit par Eric Young (eay@cryptsoft.com) et un logiciel UPnP écrit par Thomas Bernard.</translation>
</message>
+ <message>
+ <location filename="../aboutdialog.cpp" line="+17"/>
+ <source>Copyright</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>2009-%1 The Bitcoin developers</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>AddressBookPage</name>
@@ -106,17 +111,22 @@ Ce produit comprend des logiciels développés par le projet OpenSSL pour être
<translation>&amp;Supprimer</translation>
</message>
<message>
- <location filename="../addressbookpage.cpp" line="+65"/>
+ <location filename="../addressbookpage.cpp" line="+66"/>
<source>Copy &amp;Label</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+2"/>
+ <location line="+1"/>
<source>&amp;Edit</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+250"/>
+ <location line="+1"/>
+ <source>Send &amp;Coins</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+263"/>
<source>Export Address Book Data</source>
<translation>Exporter les données du carnet d&apos;adresses</translation>
</message>
@@ -139,7 +149,7 @@ Ce produit comprend des logiciels développés par le projet OpenSSL pour être
<context>
<name>AddressTableModel</name>
<message>
- <location filename="../addresstablemodel.cpp" line="+142"/>
+ <location filename="../addresstablemodel.cpp" line="+144"/>
<source>Label</source>
<translation type="unfinished"/>
</message>
@@ -298,17 +308,17 @@ Ce produit comprend des logiciels développés par le projet OpenSSL pour être
<context>
<name>BitcoinGUI</name>
<message>
- <location filename="../bitcoingui.cpp" line="+267"/>
+ <location filename="../bitcoingui.cpp" line="+231"/>
<source>Sign &amp;message...</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+254"/>
+ <location line="+299"/>
<source>Synchronizing with network...</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-322"/>
+ <location line="-367"/>
<source>&amp;Overview</source>
<translation type="unfinished"/>
</message>
@@ -328,32 +338,17 @@ Ce produit comprend des logiciels développés par le projet OpenSSL pour être
<translation type="unfinished"/>
</message>
<message>
- <location line="+6"/>
- <source>&amp;Address Book</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+1"/>
+ <location line="+7"/>
<source>Edit the list of stored addresses and labels</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-15"/>
- <source>&amp;Receive coins</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+1"/>
+ <location line="-14"/>
<source>Show the list of addresses for receiving payments</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-8"/>
- <source>&amp;Send coins</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+39"/>
+ <location line="+31"/>
<source>E&amp;xit</source>
<translation type="unfinished"/>
</message>
@@ -398,7 +393,7 @@ Ce produit comprend des logiciels développés par le projet OpenSSL pour être
<translation type="unfinished"/>
</message>
<message>
- <location line="+259"/>
+ <location line="+304"/>
<source>Importing blocks from disk...</source>
<translation type="unfinished"/>
</message>
@@ -407,13 +402,8 @@ Ce produit comprend des logiciels développés par le projet OpenSSL pour être
<source>Reindexing blocks on disk...</source>
<translation type="unfinished"/>
</message>
- <message numerus="yes">
- <location line="+10"/>
- <source>~%n block(s) remaining</source>
- <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
- </message>
<message>
- <location line="-265"/>
+ <location line="-300"/>
<source>&amp;Export...</source>
<translation type="unfinished"/>
</message>
@@ -458,18 +448,33 @@ Ce produit comprend des logiciels développés par le projet OpenSSL pour être
<translation type="unfinished"/>
</message>
<message>
- <location line="-196"/>
- <location line="+538"/>
+ <location line="-162"/>
+ <location line="+540"/>
<source>Bitcoin</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-538"/>
+ <location line="-540"/>
<source>Wallet</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+176"/>
+ <location line="+99"/>
+ <source>&amp;Send</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+7"/>
+ <source>&amp;Receive</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+14"/>
+ <source>&amp;Addresses</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+22"/>
<source>&amp;About Bitcoin</source>
<translation>&amp;A propos de Bitcoin</translation>
</message>
@@ -530,97 +535,92 @@ Ce produit comprend des logiciels développés par le projet OpenSSL pour être
<translation type="unfinished"/>
</message>
<message>
- <location line="+63"/>
+ <location line="+47"/>
<source>Bitcoin client</source>
<translation type="unfinished"/>
</message>
<message numerus="yes">
- <location line="+79"/>
+ <location line="+140"/>
<source>%n active connection(s) to Bitcoin network</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message>
- <location line="+45"/>
- <source>Processed %1 of %2 blocks of transaction history (%3% done).</source>
+ <location line="+39"/>
+ <source>Processed %1 of %2 (estimated) blocks of transaction history.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+7"/>
+ <location line="+4"/>
<source>Processed %1 blocks of transaction history.</source>
<translation type="unfinished"/>
</message>
+ <message numerus="yes">
+ <location line="+20"/>
+ <source>%n hour(s)</source>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
+ <message numerus="yes">
+ <location line="+4"/>
+ <source>%n day(s)</source>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
+ <message numerus="yes">
+ <location line="+4"/>
+ <source>%n week(s)</source>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
<message>
- <location line="+70"/>
- <source>Error</source>
+ <location line="+5"/>
+ <source>%1 behind</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+3"/>
- <source>Warning</source>
+ <location line="+14"/>
+ <source>Last received block was generated %1 ago.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+3"/>
- <source>Information</source>
+ <location line="+2"/>
+ <source>Transactions after this will not yet be visible.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+66"/>
- <source>This transaction is over the size limit. You can still send it for a fee of %1, which goes to the nodes that process your transaction and helps to support the network. Do you want to pay the fee?</source>
+ <location line="+21"/>
+ <source>Error</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+210"/>
- <source>Backup Successful</source>
+ <location line="+3"/>
+ <source>Warning</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+0"/>
- <source>The wallet data was successfully saved to the new location.</source>
+ <location line="+3"/>
+ <source>Information</source>
<translation type="unfinished"/>
</message>
- <message numerus="yes">
- <location line="-338"/>
- <source>%n second(s) ago</source>
- <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
- </message>
- <message numerus="yes">
- <location line="+4"/>
- <source>%n minute(s) ago</source>
- <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
- </message>
- <message numerus="yes">
- <location line="+4"/>
- <source>%n hour(s) ago</source>
- <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
- </message>
- <message numerus="yes">
- <location line="+4"/>
- <source>%n day(s) ago</source>
- <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
- </message>
<message>
- <location line="+6"/>
- <source>Up to date</source>
+ <location line="+68"/>
+ <source>This transaction is over the size limit. You can still send it for a fee of %1, which goes to the nodes that process your transaction and helps to support the network. Do you want to pay the fee?</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+7"/>
- <source>Catching up...</source>
+ <location line="-138"/>
+ <source>Up to date</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+10"/>
- <source>Last received block was generated %1.</source>
+ <location line="+32"/>
+ <source>Catching up...</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+97"/>
+ <location line="+110"/>
<source>Confirm transaction fee</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+23"/>
+ <location line="+8"/>
<source>Sent transaction</source>
<translation type="unfinished"/>
</message>
@@ -639,14 +639,14 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+99"/>
- <location line="+28"/>
+ <location line="+33"/>
+ <location line="+23"/>
<source>URI handling</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-28"/>
- <location line="+28"/>
+ <location line="-23"/>
+ <location line="+23"/>
<source>URI can not be parsed! This can be caused by an invalid Bitcoin address or malformed URI parameters.</source>
<translation type="unfinished"/>
</message>
@@ -661,27 +661,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+23"/>
- <source>Backup Wallet</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+0"/>
- <source>Wallet Data (*.dat)</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+3"/>
- <source>Backup Failed</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+0"/>
- <source>There was an error trying to save the wallet data to the new location.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../bitcoin.cpp" line="+109"/>
+ <location filename="../bitcoin.cpp" line="+108"/>
<source>A fatal error occurred. Bitcoin can no longer continue safely and will quit.</source>
<translation type="unfinished"/>
</message>
@@ -689,7 +669,7 @@ Address: %4
<context>
<name>ClientModel</name>
<message>
- <location filename="../clientmodel.cpp" line="+86"/>
+ <location filename="../clientmodel.cpp" line="+96"/>
<source>Network Alert</source>
<translation type="unfinished"/>
</message>
@@ -722,7 +702,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location filename="../editaddressdialog.cpp" line="+20"/>
+ <location filename="../editaddressdialog.cpp" line="+21"/>
<source>New receiving address</source>
<translation type="unfinished"/>
</message>
@@ -742,17 +722,17 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+60"/>
+ <location line="+76"/>
<source>The entered address &quot;%1&quot; is already in the address book.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+5"/>
+ <location line="-5"/>
<source>The entered address &quot;%1&quot; is not a valid Bitcoin address.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+5"/>
+ <location line="+10"/>
<source>Could not unlock wallet.</source>
<translation type="unfinished"/>
</message>
@@ -765,7 +745,7 @@ Address: %4
<context>
<name>GUIUtil::HelpMessageBox</name>
<message>
- <location filename="../guiutil.cpp" line="+419"/>
+ <location filename="../guiutil.cpp" line="+422"/>
<location line="+12"/>
<source>Bitcoin-Qt</source>
<translation type="unfinished"/>
@@ -979,7 +959,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location filename="../optionsdialog.cpp" line="+55"/>
+ <location filename="../optionsdialog.cpp" line="+53"/>
<source>default</source>
<translation type="unfinished"/>
</message>
@@ -1024,23 +1004,18 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+51"/>
- <location line="+183"/>
+ <location line="+50"/>
+ <location line="+166"/>
<source>The displayed information may be out of date. Your wallet automatically synchronizes with the Bitcoin network after a connection is established, but this process has not completed yet.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-141"/>
+ <location line="-124"/>
<source>Balance:</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+58"/>
- <source>Number of transactions:</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="-29"/>
+ <location line="+29"/>
<source>Unconfirmed:</source>
<translation type="unfinished"/>
</message>
@@ -1050,7 +1025,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+124"/>
+ <location line="+107"/>
<source>Immature:</source>
<translation type="unfinished"/>
</message>
@@ -1065,7 +1040,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="-118"/>
+ <location line="-101"/>
<source>Your current balance</source>
<translation type="unfinished"/>
</message>
@@ -1075,11 +1050,6 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+20"/>
- <source>Total number of transactions in wallet</source>
- <translation type="unfinished"/>
- </message>
- <message>
<location filename="../overviewpage.cpp" line="+115"/>
<location line="+1"/>
<source>out of sync</source>
@@ -1087,6 +1057,14 @@ Address: %4
</message>
</context>
<context>
+ <name>PaymentServer</name>
+ <message>
+ <location filename="../paymentserver.cpp" line="+107"/>
+ <source>Cannot start bitcoin: click-to-pay handler</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>QRCodeDialog</name>
<message>
<location filename="../forms/qrcodedialog.ui" line="+14"/>
@@ -1425,7 +1403,7 @@ Address: %4
</message>
<message>
<location line="+60"/>
- <location filename="../sendcoinsentry.cpp" line="+25"/>
+ <location filename="../sendcoinsentry.cpp" line="+26"/>
<source>Enter a label for this address to add it to your address book</source>
<translation type="unfinished"/>
</message>
@@ -1661,7 +1639,7 @@ Address: %4
<context>
<name>TransactionDesc</name>
<message>
- <location filename="../transactiondesc.cpp" line="+19"/>
+ <location filename="../transactiondesc.cpp" line="+20"/>
<source>Open until %1</source>
<translation type="unfinished"/>
</message>
@@ -1848,7 +1826,7 @@ Address: %4
<context>
<name>TransactionTableModel</name>
<message>
- <location filename="../transactiontablemodel.cpp" line="+226"/>
+ <location filename="../transactiontablemodel.cpp" line="+225"/>
<source>Date</source>
<translation type="unfinished"/>
</message>
@@ -1966,7 +1944,7 @@ Address: %4
<context>
<name>TransactionView</name>
<message>
- <location filename="../transactionview.cpp" line="+55"/>
+ <location filename="../transactionview.cpp" line="+52"/>
<location line="+16"/>
<source>All</source>
<translation type="unfinished"/>
@@ -2053,6 +2031,11 @@ Address: %4
</message>
<message>
<location line="+1"/>
+ <source>Copy transaction ID</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Edit label</source>
<translation type="unfinished"/>
</message>
@@ -2062,7 +2045,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+142"/>
+ <location line="+139"/>
<source>Export Transaction Data</source>
<translation type="unfinished"/>
</message>
@@ -2117,7 +2100,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+95"/>
+ <location line="+100"/>
<source>Range:</source>
<translation type="unfinished"/>
</message>
@@ -2128,29 +2111,172 @@ Address: %4
</message>
</context>
<context>
+ <name>WalletView</name>
+ <message>
+ <location filename="../walletview.cpp" line="+95"/>
+ <source>&amp;Overview</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Show general overview of wallet</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>&amp;Send coins</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Send coins to a Bitcoin address</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>&amp;Receive coins</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Show the list of addresses for receiving payments</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>&amp;Transactions</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Browse transaction history</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>&amp;Address Book</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Edit the list of stored addresses and labels</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+12"/>
+ <source>&amp;Encrypt Wallet...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Encrypt the private keys that belong to your wallet</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>&amp;Backup Wallet...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Backup wallet to another location</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>&amp;Change Passphrase...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Change the passphrase used for wallet encryption</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Sign &amp;message...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Sign messages with your Bitcoin addresses to prove you own them</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>&amp;Verify message...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Verify messages to ensure they were signed with specified Bitcoin addresses</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>&amp;Export...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Export the data in the current tab to a file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+180"/>
+ <source>Backup Wallet</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>Wallet Data (*.dat)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Backup Failed</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>There was an error trying to save the wallet data to the new location.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>Backup Successful</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>The wallet data was successfully saved to the new location.</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>bitcoin-core</name>
<message>
- <location filename="../bitcoinstrings.cpp" line="+88"/>
+ <location filename="../bitcoinstrings.cpp" line="+96"/>
<source>Bitcoin version</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+82"/>
+ <location line="+98"/>
<source>Usage:</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-23"/>
+ <location line="-24"/>
<source>Send command to -server or bitcoind</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-21"/>
+ <location line="-22"/>
<source>List commands</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-11"/>
+ <location line="-10"/>
<source>Get help for a command</source>
<translation type="unfinished"/>
</message>
@@ -2175,12 +2301,12 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="-15"/>
+ <location line="-28"/>
<source>Don&apos;t generate coins</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+61"/>
+ <location line="+74"/>
<source>Specify data directory</source>
<translation type="unfinished"/>
</message>
@@ -2190,80 +2316,82 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="-26"/>
+ <location line="-27"/>
<source>Listen for connections on &lt;port&gt; (default: 8333 or testnet: 18333)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+4"/>
+ <location line="+5"/>
<source>Maintain at most &lt;n&gt; connections to peers (default: 125)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-34"/>
+ <location line="-49"/>
<source>Connect to a node to retrieve peer addresses, and disconnect</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+65"/>
+ <location line="+80"/>
<source>Specify your own public address</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+2"/>
+ <location line="+3"/>
<source>Threshold for disconnecting misbehaving peers (default: 100)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-114"/>
+ <location line="-132"/>
<source>Number of seconds to keep misbehaving peers from reconnecting (default: 86400)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-28"/>
+ <location line="-32"/>
<source>An error occurred while setting up the RPC port %u for listening on IPv4: %s</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+26"/>
+ <location line="+30"/>
<source>Listen for JSON-RPC connections on &lt;port&gt; (default: 8332 or testnet: 18332)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+34"/>
+ <location line="+36"/>
<source>Accept command line and JSON-RPC commands</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+62"/>
+ <location line="+77"/>
<source>Run in the background as a daemon and accept commands</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+31"/>
+ <location line="+32"/>
<source>Use the test network</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-92"/>
+ <location line="-108"/>
<source>Accept connections from outside (default: 1 if no -proxy or -connect)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-74"/>
+ <location line="-82"/>
<source>%s, you must set a rpcpassword in the configuration file:
- %s
+%s
It is recommended you use the following random password:
rpcuser=bitcoinrpc
rpcpassword=%s
(you do not need to remember this password)
The username and password MUST NOT be the same.
If the file does not exist, create it with owner-readable-only file permissions.
+It is also recommended to set alertnotify so you are notified of problems;
+for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.com
</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+15"/>
+ <location line="+17"/>
<source>An error occurred while setting up the RPC port %u for listening on IPv6, falling back to IPv4: %s</source>
<translation type="unfinished"/>
</message>
@@ -2279,11 +2407,6 @@ If the file does not exist, create it with owner-readable-only file permissions.
</message>
<message>
<location line="+3"/>
- <source>Corrupted block database detected. Please restart the client with -reindex.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+2"/>
<source>Error initializing database environment %s! To recover, BACKUP THAT DIRECTORY, then remove everything from it except for wallet.dat.</source>
<translation type="unfinished"/>
</message>
@@ -2298,12 +2421,27 @@ If the file does not exist, create it with owner-readable-only file permissions.
<translation type="unfinished"/>
</message>
<message>
+ <location line="+3"/>
+ <source>Execute command when a relevant alert is received (%s in cmd is replaced by message)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Execute command when a wallet transaction changes (%s in cmd is replaced by TxID)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location line="+11"/>
<source>Set maximum size of high-priority/low-fee transactions in bytes (default: 27000)</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+3"/>
+ <source>Set the number of script verification threads (1-16, 0=auto, default: 0)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
<source>This is a pre-release test build - use at your own risk - do not use for mining or merchant applications</source>
<translation type="unfinished"/>
</message>
@@ -2349,16 +2487,41 @@ If the file does not exist, create it with owner-readable-only file permissions.
</message>
<message>
<location line="+3"/>
+ <source>Corrupted block database detected</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Discover own IP address (default: 1 when listening and no -externalip)</source>
<translation type="unfinished"/>
</message>
<message>
+ <location line="+1"/>
+ <source>Do you want to rebuild the block database now?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location line="+3"/>
+ <source>Error initializing block database</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Error initializing wallet database environment %s!</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Error loading block database</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+5"/>
+ <location line="+4"/>
+ <source>Error opening block database</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
<source>Error: Disk space is low!</source>
<translation type="unfinished"/>
</message>
@@ -2374,26 +2537,96 @@ If the file does not exist, create it with owner-readable-only file permissions.
</message>
<message>
<location line="+2"/>
+ <source>Error: system error: </source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Failed to listen on any port. Use -listen=0 if you want this.</source>
<translation type="unfinished"/>
</message>
<message>
+ <location line="+1"/>
+ <source>Failed to read block info</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Failed to read block</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Failed to sync block index</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Failed to write block index</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Failed to write block info</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Failed to write block</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Failed to write file info</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Failed to write to coin database</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Failed to write transaction index</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Failed to write undo data</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location line="+2"/>
<source>Find peers using DNS lookup (default: 1 unless -connect)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+5"/>
- <source>How thorough the block verification is (0-4, default: 3)</source>
+ <location line="+3"/>
+ <source>How many blocks to check at startup (default: 288, 0 = all)</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+1"/>
- <source>Importing blocks from block database...</source>
+ <source>How thorough the block verification is (0-4, default: 3)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+24"/>
+ <source>Rebuild block chain index from current blk000??.dat files</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+37"/>
+ <source>Verifying blocks...</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+1"/>
+ <source>Verifying wallet...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-61"/>
<source>Imports blocks from external blk000??.dat file</source>
<translation type="unfinished"/>
</message>
@@ -2408,7 +2641,12 @@ If the file does not exist, create it with owner-readable-only file permissions.
<translation type="unfinished"/>
</message>
<message>
- <location line="+9"/>
+ <location line="+8"/>
+ <source>Maintain a full transaction index (default: 0)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
<source>Maximum per-connection receive buffer, &lt;n&gt;*1000 bytes (default: 5000)</source>
<translation type="unfinished"/>
</message>
@@ -2443,12 +2681,7 @@ If the file does not exist, create it with owner-readable-only file permissions.
<translation type="unfinished"/>
</message>
<message>
- <location line="+1"/>
- <source>Rebuild blockchain index from current blk000??.dat files</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+4"/>
+ <location line="+5"/>
<source>SSL options: (see the Bitcoin Wiki for SSL setup instructions)</source>
<translation type="unfinished"/>
</message>
@@ -2488,7 +2721,12 @@ If the file does not exist, create it with owner-readable-only file permissions.
<translation type="unfinished"/>
</message>
<message>
- <location line="+13"/>
+ <location line="+4"/>
+ <source>System error: </source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+10"/>
<source>Use UPnP to map the listening port (default: 0)</source>
<translation type="unfinished"/>
</message>
@@ -2519,36 +2757,41 @@ If the file does not exist, create it with owner-readable-only file permissions.
</message>
<message>
<location line="+1"/>
+ <source>You need to rebuild the databases using -reindex to change -txindex</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>wallet.dat corrupt, salvage failed</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-43"/>
+ <location line="-45"/>
<source>Password for JSON-RPC connections</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-53"/>
+ <location line="-68"/>
<source>Allow JSON-RPC connections from specified IP address</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+62"/>
+ <location line="+77"/>
<source>Send commands to node running on &lt;ip&gt; (default: 127.0.0.1)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-103"/>
+ <location line="-120"/>
<source>Execute command when the best block changes (%s in cmd is replaced by block hash)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+124"/>
+ <location line="+142"/>
<source>Upgrade wallet to latest format</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-15"/>
+ <location line="-16"/>
<source>Set key pool size to &lt;n&gt; (default: 100)</source>
<translation type="unfinished"/>
</message>
@@ -2558,17 +2801,12 @@ If the file does not exist, create it with owner-readable-only file permissions.
<translation type="unfinished"/>
</message>
<message>
- <location line="-26"/>
- <source>How many blocks to check at startup (default: 2500, 0 = all)</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+55"/>
+ <location line="+30"/>
<source>Use OpenSSL (https) for JSON-RPC connections</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-20"/>
+ <location line="-21"/>
<source>Server certificate file (default: server.cert)</source>
<translation type="unfinished"/>
</message>
@@ -2578,12 +2816,12 @@ If the file does not exist, create it with owner-readable-only file permissions.
<translation type="unfinished"/>
</message>
<message>
- <location line="-133"/>
+ <location line="-154"/>
<source>Acceptable ciphers (default: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+144"/>
+ <location line="+166"/>
<source>This help message</source>
<translation type="unfinished"/>
</message>
@@ -2593,7 +2831,7 @@ If the file does not exist, create it with owner-readable-only file permissions.
<translation type="unfinished"/>
</message>
<message>
- <location line="-70"/>
+ <location line="-86"/>
<source>Connect through socks proxy</source>
<translation type="unfinished"/>
</message>
@@ -2603,12 +2841,12 @@ If the file does not exist, create it with owner-readable-only file permissions.
<translation type="unfinished"/>
</message>
<message>
- <location line="+43"/>
+ <location line="+57"/>
<source>Loading addresses...</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-25"/>
+ <location line="-35"/>
<source>Error loading wallet.dat: Wallet corrupted</source>
<translation type="unfinished"/>
</message>
@@ -2618,32 +2856,22 @@ If the file does not exist, create it with owner-readable-only file permissions.
<translation type="unfinished"/>
</message>
<message>
- <location line="+73"/>
- <source>Verifying block database integrity...</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+1"/>
- <source>Verifying wallet integrity...</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+1"/>
+ <location line="+87"/>
<source>Wallet needed to be rewritten: restart Bitcoin to complete</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-77"/>
+ <location line="-89"/>
<source>Error loading wallet.dat</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+20"/>
+ <location line="+30"/>
<source>Invalid -proxy address: &apos;%s&apos;</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+46"/>
+ <location line="+48"/>
<source>Unknown network specified in -onlynet: &apos;%s&apos;</source>
<translation type="unfinished"/>
</message>
@@ -2653,7 +2881,7 @@ If the file does not exist, create it with owner-readable-only file permissions.
<translation type="unfinished"/>
</message>
<message>
- <location line="-75"/>
+ <location line="-91"/>
<source>Cannot resolve -bind address: &apos;%s&apos;</source>
<translation type="unfinished"/>
</message>
@@ -2663,17 +2891,17 @@ If the file does not exist, create it with owner-readable-only file permissions.
<translation type="unfinished"/>
</message>
<message>
- <location line="+31"/>
+ <location line="+45"/>
<source>Invalid amount for -paytxfee=&lt;amount&gt;: &apos;%s&apos;</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-15"/>
+ <location line="-24"/>
<source>Error: could not start node</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+16"/>
+ <location line="+25"/>
<source>Invalid amount</source>
<translation type="unfinished"/>
</message>
@@ -2688,7 +2916,7 @@ If the file does not exist, create it with owner-readable-only file permissions.
<translation type="unfinished"/>
</message>
<message>
- <location line="-45"/>
+ <location line="-59"/>
<source>Add a node to connect to and attempt to keep the connection open</source>
<translation type="unfinished"/>
</message>
@@ -2698,22 +2926,17 @@ If the file does not exist, create it with owner-readable-only file permissions.
<translation type="unfinished"/>
</message>
<message>
- <location line="+54"/>
- <source>Find peers using internet relay chat (default: 0)</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="-2"/>
+ <location line="+68"/>
<source>Fee per KB to add to transactions you send</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+19"/>
+ <location line="+17"/>
<source>Loading wallet...</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-40"/>
+ <location line="-54"/>
<source>Cannot downgrade wallet</source>
<translation type="unfinished"/>
</message>
@@ -2728,27 +2951,27 @@ If the file does not exist, create it with owner-readable-only file permissions.
<translation type="unfinished"/>
</message>
<message>
- <location line="+49"/>
+ <location line="+64"/>
<source>Rescanning...</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-43"/>
+ <location line="-56"/>
<source>Done loading</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+65"/>
+ <location line="+79"/>
<source>To use the %s option</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-60"/>
+ <location line="-71"/>
<source>Error</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-28"/>
+ <location line="-33"/>
<source>You must set rpcpassword=&lt;password&gt; in the configuration file:
%s
If the file does not exist, create it with owner-readable-only file permissions.</source>
diff --git a/src/qt/locale/bitcoin_gu_IN.ts b/src/qt/locale/bitcoin_gu_IN.ts
index 1205c86c17..2e0a7b03b7 100644
--- a/src/qt/locale/bitcoin_gu_IN.ts
+++ b/src/qt/locale/bitcoin_gu_IN.ts
@@ -13,12 +13,7 @@
<translation type="unfinished"/>
</message>
<message>
- <location line="+41"/>
- <source>Copyright © 2009-2012 The Bitcoin developers</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+13"/>
+ <location line="+57"/>
<source>
This is experimental software.
@@ -27,6 +22,16 @@ Distributed under the MIT/X11 software license, see the accompanying file COPYIN
This product includes software developed by the OpenSSL Project for use in the OpenSSL Toolkit (http://www.openssl.org/) and cryptographic software written by Eric Young (eay@cryptsoft.com) and UPnP software written by Thomas Bernard.</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../aboutdialog.cpp" line="+17"/>
+ <source>Copyright</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>2009-%1 The Bitcoin developers</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>AddressBookPage</name>
@@ -101,17 +106,22 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation type="unfinished"/>
</message>
<message>
- <location filename="../addressbookpage.cpp" line="+65"/>
+ <location filename="../addressbookpage.cpp" line="+66"/>
<source>Copy &amp;Label</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+2"/>
+ <location line="+1"/>
<source>&amp;Edit</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+250"/>
+ <location line="+1"/>
+ <source>Send &amp;Coins</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+263"/>
<source>Export Address Book Data</source>
<translation type="unfinished"/>
</message>
@@ -134,7 +144,7 @@ This product includes software developed by the OpenSSL Project for use in the O
<context>
<name>AddressTableModel</name>
<message>
- <location filename="../addresstablemodel.cpp" line="+142"/>
+ <location filename="../addresstablemodel.cpp" line="+144"/>
<source>Label</source>
<translation type="unfinished"/>
</message>
@@ -293,17 +303,17 @@ This product includes software developed by the OpenSSL Project for use in the O
<context>
<name>BitcoinGUI</name>
<message>
- <location filename="../bitcoingui.cpp" line="+267"/>
+ <location filename="../bitcoingui.cpp" line="+231"/>
<source>Sign &amp;message...</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+254"/>
+ <location line="+299"/>
<source>Synchronizing with network...</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-322"/>
+ <location line="-367"/>
<source>&amp;Overview</source>
<translation type="unfinished"/>
</message>
@@ -323,32 +333,17 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation type="unfinished"/>
</message>
<message>
- <location line="+6"/>
- <source>&amp;Address Book</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+1"/>
+ <location line="+7"/>
<source>Edit the list of stored addresses and labels</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-15"/>
- <source>&amp;Receive coins</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+1"/>
+ <location line="-14"/>
<source>Show the list of addresses for receiving payments</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-8"/>
- <source>&amp;Send coins</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+39"/>
+ <location line="+31"/>
<source>E&amp;xit</source>
<translation type="unfinished"/>
</message>
@@ -393,7 +388,7 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation type="unfinished"/>
</message>
<message>
- <location line="+259"/>
+ <location line="+304"/>
<source>Importing blocks from disk...</source>
<translation type="unfinished"/>
</message>
@@ -402,13 +397,8 @@ This product includes software developed by the OpenSSL Project for use in the O
<source>Reindexing blocks on disk...</source>
<translation type="unfinished"/>
</message>
- <message numerus="yes">
- <location line="+10"/>
- <source>~%n block(s) remaining</source>
- <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
- </message>
<message>
- <location line="-265"/>
+ <location line="-300"/>
<source>&amp;Export...</source>
<translation type="unfinished"/>
</message>
@@ -453,18 +443,33 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation type="unfinished"/>
</message>
<message>
- <location line="-196"/>
- <location line="+538"/>
+ <location line="-162"/>
+ <location line="+540"/>
<source>Bitcoin</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-538"/>
+ <location line="-540"/>
<source>Wallet</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+176"/>
+ <location line="+99"/>
+ <source>&amp;Send</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+7"/>
+ <source>&amp;Receive</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+14"/>
+ <source>&amp;Addresses</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+22"/>
<source>&amp;About Bitcoin</source>
<translation type="unfinished"/>
</message>
@@ -525,97 +530,92 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation type="unfinished"/>
</message>
<message>
- <location line="+63"/>
+ <location line="+47"/>
<source>Bitcoin client</source>
<translation type="unfinished"/>
</message>
<message numerus="yes">
- <location line="+79"/>
+ <location line="+140"/>
<source>%n active connection(s) to Bitcoin network</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message>
- <location line="+45"/>
- <source>Processed %1 of %2 blocks of transaction history (%3% done).</source>
+ <location line="+39"/>
+ <source>Processed %1 of %2 (estimated) blocks of transaction history.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+7"/>
+ <location line="+4"/>
<source>Processed %1 blocks of transaction history.</source>
<translation type="unfinished"/>
</message>
+ <message numerus="yes">
+ <location line="+20"/>
+ <source>%n hour(s)</source>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
+ <message numerus="yes">
+ <location line="+4"/>
+ <source>%n day(s)</source>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
+ <message numerus="yes">
+ <location line="+4"/>
+ <source>%n week(s)</source>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
<message>
- <location line="+70"/>
- <source>Error</source>
+ <location line="+5"/>
+ <source>%1 behind</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+3"/>
- <source>Warning</source>
+ <location line="+14"/>
+ <source>Last received block was generated %1 ago.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+3"/>
- <source>Information</source>
+ <location line="+2"/>
+ <source>Transactions after this will not yet be visible.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+66"/>
- <source>This transaction is over the size limit. You can still send it for a fee of %1, which goes to the nodes that process your transaction and helps to support the network. Do you want to pay the fee?</source>
+ <location line="+21"/>
+ <source>Error</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+210"/>
- <source>Backup Successful</source>
+ <location line="+3"/>
+ <source>Warning</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+0"/>
- <source>The wallet data was successfully saved to the new location.</source>
+ <location line="+3"/>
+ <source>Information</source>
<translation type="unfinished"/>
</message>
- <message numerus="yes">
- <location line="-338"/>
- <source>%n second(s) ago</source>
- <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
- </message>
- <message numerus="yes">
- <location line="+4"/>
- <source>%n minute(s) ago</source>
- <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
- </message>
- <message numerus="yes">
- <location line="+4"/>
- <source>%n hour(s) ago</source>
- <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
- </message>
- <message numerus="yes">
- <location line="+4"/>
- <source>%n day(s) ago</source>
- <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
- </message>
<message>
- <location line="+6"/>
- <source>Up to date</source>
+ <location line="+68"/>
+ <source>This transaction is over the size limit. You can still send it for a fee of %1, which goes to the nodes that process your transaction and helps to support the network. Do you want to pay the fee?</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+7"/>
- <source>Catching up...</source>
+ <location line="-138"/>
+ <source>Up to date</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+10"/>
- <source>Last received block was generated %1.</source>
+ <location line="+32"/>
+ <source>Catching up...</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+97"/>
+ <location line="+110"/>
<source>Confirm transaction fee</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+23"/>
+ <location line="+8"/>
<source>Sent transaction</source>
<translation type="unfinished"/>
</message>
@@ -634,14 +634,14 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+99"/>
- <location line="+28"/>
+ <location line="+33"/>
+ <location line="+23"/>
<source>URI handling</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-28"/>
- <location line="+28"/>
+ <location line="-23"/>
+ <location line="+23"/>
<source>URI can not be parsed! This can be caused by an invalid Bitcoin address or malformed URI parameters.</source>
<translation type="unfinished"/>
</message>
@@ -656,27 +656,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+23"/>
- <source>Backup Wallet</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+0"/>
- <source>Wallet Data (*.dat)</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+3"/>
- <source>Backup Failed</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+0"/>
- <source>There was an error trying to save the wallet data to the new location.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../bitcoin.cpp" line="+109"/>
+ <location filename="../bitcoin.cpp" line="+108"/>
<source>A fatal error occurred. Bitcoin can no longer continue safely and will quit.</source>
<translation type="unfinished"/>
</message>
@@ -684,7 +664,7 @@ Address: %4
<context>
<name>ClientModel</name>
<message>
- <location filename="../clientmodel.cpp" line="+86"/>
+ <location filename="../clientmodel.cpp" line="+96"/>
<source>Network Alert</source>
<translation type="unfinished"/>
</message>
@@ -717,7 +697,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location filename="../editaddressdialog.cpp" line="+20"/>
+ <location filename="../editaddressdialog.cpp" line="+21"/>
<source>New receiving address</source>
<translation type="unfinished"/>
</message>
@@ -737,17 +717,17 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+60"/>
+ <location line="+76"/>
<source>The entered address &quot;%1&quot; is already in the address book.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+5"/>
+ <location line="-5"/>
<source>The entered address &quot;%1&quot; is not a valid Bitcoin address.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+5"/>
+ <location line="+10"/>
<source>Could not unlock wallet.</source>
<translation type="unfinished"/>
</message>
@@ -760,7 +740,7 @@ Address: %4
<context>
<name>GUIUtil::HelpMessageBox</name>
<message>
- <location filename="../guiutil.cpp" line="+419"/>
+ <location filename="../guiutil.cpp" line="+422"/>
<location line="+12"/>
<source>Bitcoin-Qt</source>
<translation type="unfinished"/>
@@ -974,7 +954,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location filename="../optionsdialog.cpp" line="+55"/>
+ <location filename="../optionsdialog.cpp" line="+53"/>
<source>default</source>
<translation type="unfinished"/>
</message>
@@ -1019,23 +999,18 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+51"/>
- <location line="+183"/>
+ <location line="+50"/>
+ <location line="+166"/>
<source>The displayed information may be out of date. Your wallet automatically synchronizes with the Bitcoin network after a connection is established, but this process has not completed yet.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-141"/>
+ <location line="-124"/>
<source>Balance:</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+58"/>
- <source>Number of transactions:</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="-29"/>
+ <location line="+29"/>
<source>Unconfirmed:</source>
<translation type="unfinished"/>
</message>
@@ -1045,7 +1020,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+124"/>
+ <location line="+107"/>
<source>Immature:</source>
<translation type="unfinished"/>
</message>
@@ -1060,7 +1035,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="-118"/>
+ <location line="-101"/>
<source>Your current balance</source>
<translation type="unfinished"/>
</message>
@@ -1070,11 +1045,6 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+20"/>
- <source>Total number of transactions in wallet</source>
- <translation type="unfinished"/>
- </message>
- <message>
<location filename="../overviewpage.cpp" line="+115"/>
<location line="+1"/>
<source>out of sync</source>
@@ -1082,6 +1052,14 @@ Address: %4
</message>
</context>
<context>
+ <name>PaymentServer</name>
+ <message>
+ <location filename="../paymentserver.cpp" line="+107"/>
+ <source>Cannot start bitcoin: click-to-pay handler</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>QRCodeDialog</name>
<message>
<location filename="../forms/qrcodedialog.ui" line="+14"/>
@@ -1420,7 +1398,7 @@ Address: %4
</message>
<message>
<location line="+60"/>
- <location filename="../sendcoinsentry.cpp" line="+25"/>
+ <location filename="../sendcoinsentry.cpp" line="+26"/>
<source>Enter a label for this address to add it to your address book</source>
<translation type="unfinished"/>
</message>
@@ -1656,7 +1634,7 @@ Address: %4
<context>
<name>TransactionDesc</name>
<message>
- <location filename="../transactiondesc.cpp" line="+19"/>
+ <location filename="../transactiondesc.cpp" line="+20"/>
<source>Open until %1</source>
<translation type="unfinished"/>
</message>
@@ -1843,7 +1821,7 @@ Address: %4
<context>
<name>TransactionTableModel</name>
<message>
- <location filename="../transactiontablemodel.cpp" line="+226"/>
+ <location filename="../transactiontablemodel.cpp" line="+225"/>
<source>Date</source>
<translation type="unfinished"/>
</message>
@@ -1961,7 +1939,7 @@ Address: %4
<context>
<name>TransactionView</name>
<message>
- <location filename="../transactionview.cpp" line="+55"/>
+ <location filename="../transactionview.cpp" line="+52"/>
<location line="+16"/>
<source>All</source>
<translation type="unfinished"/>
@@ -2048,6 +2026,11 @@ Address: %4
</message>
<message>
<location line="+1"/>
+ <source>Copy transaction ID</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Edit label</source>
<translation type="unfinished"/>
</message>
@@ -2057,7 +2040,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+142"/>
+ <location line="+139"/>
<source>Export Transaction Data</source>
<translation type="unfinished"/>
</message>
@@ -2112,7 +2095,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+95"/>
+ <location line="+100"/>
<source>Range:</source>
<translation type="unfinished"/>
</message>
@@ -2123,29 +2106,172 @@ Address: %4
</message>
</context>
<context>
+ <name>WalletView</name>
+ <message>
+ <location filename="../walletview.cpp" line="+95"/>
+ <source>&amp;Overview</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Show general overview of wallet</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>&amp;Send coins</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Send coins to a Bitcoin address</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>&amp;Receive coins</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Show the list of addresses for receiving payments</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>&amp;Transactions</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Browse transaction history</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>&amp;Address Book</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Edit the list of stored addresses and labels</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+12"/>
+ <source>&amp;Encrypt Wallet...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Encrypt the private keys that belong to your wallet</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>&amp;Backup Wallet...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Backup wallet to another location</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>&amp;Change Passphrase...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Change the passphrase used for wallet encryption</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Sign &amp;message...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Sign messages with your Bitcoin addresses to prove you own them</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>&amp;Verify message...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Verify messages to ensure they were signed with specified Bitcoin addresses</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>&amp;Export...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Export the data in the current tab to a file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+180"/>
+ <source>Backup Wallet</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>Wallet Data (*.dat)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Backup Failed</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>There was an error trying to save the wallet data to the new location.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>Backup Successful</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>The wallet data was successfully saved to the new location.</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>bitcoin-core</name>
<message>
- <location filename="../bitcoinstrings.cpp" line="+88"/>
+ <location filename="../bitcoinstrings.cpp" line="+96"/>
<source>Bitcoin version</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+82"/>
+ <location line="+98"/>
<source>Usage:</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-23"/>
+ <location line="-24"/>
<source>Send command to -server or bitcoind</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-21"/>
+ <location line="-22"/>
<source>List commands</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-11"/>
+ <location line="-10"/>
<source>Get help for a command</source>
<translation type="unfinished"/>
</message>
@@ -2170,12 +2296,12 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="-15"/>
+ <location line="-28"/>
<source>Don&apos;t generate coins</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+61"/>
+ <location line="+74"/>
<source>Specify data directory</source>
<translation type="unfinished"/>
</message>
@@ -2185,80 +2311,82 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="-26"/>
+ <location line="-27"/>
<source>Listen for connections on &lt;port&gt; (default: 8333 or testnet: 18333)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+4"/>
+ <location line="+5"/>
<source>Maintain at most &lt;n&gt; connections to peers (default: 125)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-34"/>
+ <location line="-49"/>
<source>Connect to a node to retrieve peer addresses, and disconnect</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+65"/>
+ <location line="+80"/>
<source>Specify your own public address</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+2"/>
+ <location line="+3"/>
<source>Threshold for disconnecting misbehaving peers (default: 100)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-114"/>
+ <location line="-132"/>
<source>Number of seconds to keep misbehaving peers from reconnecting (default: 86400)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-28"/>
+ <location line="-32"/>
<source>An error occurred while setting up the RPC port %u for listening on IPv4: %s</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+26"/>
+ <location line="+30"/>
<source>Listen for JSON-RPC connections on &lt;port&gt; (default: 8332 or testnet: 18332)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+34"/>
+ <location line="+36"/>
<source>Accept command line and JSON-RPC commands</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+62"/>
+ <location line="+77"/>
<source>Run in the background as a daemon and accept commands</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+31"/>
+ <location line="+32"/>
<source>Use the test network</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-92"/>
+ <location line="-108"/>
<source>Accept connections from outside (default: 1 if no -proxy or -connect)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-74"/>
+ <location line="-82"/>
<source>%s, you must set a rpcpassword in the configuration file:
- %s
+%s
It is recommended you use the following random password:
rpcuser=bitcoinrpc
rpcpassword=%s
(you do not need to remember this password)
The username and password MUST NOT be the same.
If the file does not exist, create it with owner-readable-only file permissions.
+It is also recommended to set alertnotify so you are notified of problems;
+for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.com
</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+15"/>
+ <location line="+17"/>
<source>An error occurred while setting up the RPC port %u for listening on IPv6, falling back to IPv4: %s</source>
<translation type="unfinished"/>
</message>
@@ -2274,11 +2402,6 @@ If the file does not exist, create it with owner-readable-only file permissions.
</message>
<message>
<location line="+3"/>
- <source>Corrupted block database detected. Please restart the client with -reindex.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+2"/>
<source>Error initializing database environment %s! To recover, BACKUP THAT DIRECTORY, then remove everything from it except for wallet.dat.</source>
<translation type="unfinished"/>
</message>
@@ -2293,12 +2416,27 @@ If the file does not exist, create it with owner-readable-only file permissions.
<translation type="unfinished"/>
</message>
<message>
+ <location line="+3"/>
+ <source>Execute command when a relevant alert is received (%s in cmd is replaced by message)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Execute command when a wallet transaction changes (%s in cmd is replaced by TxID)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location line="+11"/>
<source>Set maximum size of high-priority/low-fee transactions in bytes (default: 27000)</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+3"/>
+ <source>Set the number of script verification threads (1-16, 0=auto, default: 0)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
<source>This is a pre-release test build - use at your own risk - do not use for mining or merchant applications</source>
<translation type="unfinished"/>
</message>
@@ -2344,16 +2482,41 @@ If the file does not exist, create it with owner-readable-only file permissions.
</message>
<message>
<location line="+3"/>
+ <source>Corrupted block database detected</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Discover own IP address (default: 1 when listening and no -externalip)</source>
<translation type="unfinished"/>
</message>
<message>
+ <location line="+1"/>
+ <source>Do you want to rebuild the block database now?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location line="+3"/>
+ <source>Error initializing block database</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Error initializing wallet database environment %s!</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Error loading block database</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+5"/>
+ <location line="+4"/>
+ <source>Error opening block database</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
<source>Error: Disk space is low!</source>
<translation type="unfinished"/>
</message>
@@ -2369,26 +2532,96 @@ If the file does not exist, create it with owner-readable-only file permissions.
</message>
<message>
<location line="+2"/>
+ <source>Error: system error: </source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Failed to listen on any port. Use -listen=0 if you want this.</source>
<translation type="unfinished"/>
</message>
<message>
+ <location line="+1"/>
+ <source>Failed to read block info</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Failed to read block</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Failed to sync block index</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Failed to write block index</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Failed to write block info</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Failed to write block</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Failed to write file info</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Failed to write to coin database</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Failed to write transaction index</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Failed to write undo data</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location line="+2"/>
<source>Find peers using DNS lookup (default: 1 unless -connect)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+5"/>
- <source>How thorough the block verification is (0-4, default: 3)</source>
+ <location line="+3"/>
+ <source>How many blocks to check at startup (default: 288, 0 = all)</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+1"/>
- <source>Importing blocks from block database...</source>
+ <source>How thorough the block verification is (0-4, default: 3)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+24"/>
+ <source>Rebuild block chain index from current blk000??.dat files</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+37"/>
+ <source>Verifying blocks...</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+1"/>
+ <source>Verifying wallet...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-61"/>
<source>Imports blocks from external blk000??.dat file</source>
<translation type="unfinished"/>
</message>
@@ -2403,7 +2636,12 @@ If the file does not exist, create it with owner-readable-only file permissions.
<translation type="unfinished"/>
</message>
<message>
- <location line="+9"/>
+ <location line="+8"/>
+ <source>Maintain a full transaction index (default: 0)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
<source>Maximum per-connection receive buffer, &lt;n&gt;*1000 bytes (default: 5000)</source>
<translation type="unfinished"/>
</message>
@@ -2438,12 +2676,7 @@ If the file does not exist, create it with owner-readable-only file permissions.
<translation type="unfinished"/>
</message>
<message>
- <location line="+1"/>
- <source>Rebuild blockchain index from current blk000??.dat files</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+4"/>
+ <location line="+5"/>
<source>SSL options: (see the Bitcoin Wiki for SSL setup instructions)</source>
<translation type="unfinished"/>
</message>
@@ -2483,7 +2716,12 @@ If the file does not exist, create it with owner-readable-only file permissions.
<translation type="unfinished"/>
</message>
<message>
- <location line="+13"/>
+ <location line="+4"/>
+ <source>System error: </source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+10"/>
<source>Use UPnP to map the listening port (default: 0)</source>
<translation type="unfinished"/>
</message>
@@ -2514,36 +2752,41 @@ If the file does not exist, create it with owner-readable-only file permissions.
</message>
<message>
<location line="+1"/>
+ <source>You need to rebuild the databases using -reindex to change -txindex</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>wallet.dat corrupt, salvage failed</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-43"/>
+ <location line="-45"/>
<source>Password for JSON-RPC connections</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-53"/>
+ <location line="-68"/>
<source>Allow JSON-RPC connections from specified IP address</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+62"/>
+ <location line="+77"/>
<source>Send commands to node running on &lt;ip&gt; (default: 127.0.0.1)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-103"/>
+ <location line="-120"/>
<source>Execute command when the best block changes (%s in cmd is replaced by block hash)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+124"/>
+ <location line="+142"/>
<source>Upgrade wallet to latest format</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-15"/>
+ <location line="-16"/>
<source>Set key pool size to &lt;n&gt; (default: 100)</source>
<translation type="unfinished"/>
</message>
@@ -2553,17 +2796,12 @@ If the file does not exist, create it with owner-readable-only file permissions.
<translation type="unfinished"/>
</message>
<message>
- <location line="-26"/>
- <source>How many blocks to check at startup (default: 2500, 0 = all)</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+55"/>
+ <location line="+30"/>
<source>Use OpenSSL (https) for JSON-RPC connections</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-20"/>
+ <location line="-21"/>
<source>Server certificate file (default: server.cert)</source>
<translation type="unfinished"/>
</message>
@@ -2573,12 +2811,12 @@ If the file does not exist, create it with owner-readable-only file permissions.
<translation type="unfinished"/>
</message>
<message>
- <location line="-133"/>
+ <location line="-154"/>
<source>Acceptable ciphers (default: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+144"/>
+ <location line="+166"/>
<source>This help message</source>
<translation type="unfinished"/>
</message>
@@ -2588,7 +2826,7 @@ If the file does not exist, create it with owner-readable-only file permissions.
<translation type="unfinished"/>
</message>
<message>
- <location line="-70"/>
+ <location line="-86"/>
<source>Connect through socks proxy</source>
<translation type="unfinished"/>
</message>
@@ -2598,12 +2836,12 @@ If the file does not exist, create it with owner-readable-only file permissions.
<translation type="unfinished"/>
</message>
<message>
- <location line="+43"/>
+ <location line="+57"/>
<source>Loading addresses...</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-25"/>
+ <location line="-35"/>
<source>Error loading wallet.dat: Wallet corrupted</source>
<translation type="unfinished"/>
</message>
@@ -2613,32 +2851,22 @@ If the file does not exist, create it with owner-readable-only file permissions.
<translation type="unfinished"/>
</message>
<message>
- <location line="+73"/>
- <source>Verifying block database integrity...</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+1"/>
- <source>Verifying wallet integrity...</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+1"/>
+ <location line="+87"/>
<source>Wallet needed to be rewritten: restart Bitcoin to complete</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-77"/>
+ <location line="-89"/>
<source>Error loading wallet.dat</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+20"/>
+ <location line="+30"/>
<source>Invalid -proxy address: &apos;%s&apos;</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+46"/>
+ <location line="+48"/>
<source>Unknown network specified in -onlynet: &apos;%s&apos;</source>
<translation type="unfinished"/>
</message>
@@ -2648,7 +2876,7 @@ If the file does not exist, create it with owner-readable-only file permissions.
<translation type="unfinished"/>
</message>
<message>
- <location line="-75"/>
+ <location line="-91"/>
<source>Cannot resolve -bind address: &apos;%s&apos;</source>
<translation type="unfinished"/>
</message>
@@ -2658,17 +2886,17 @@ If the file does not exist, create it with owner-readable-only file permissions.
<translation type="unfinished"/>
</message>
<message>
- <location line="+31"/>
+ <location line="+45"/>
<source>Invalid amount for -paytxfee=&lt;amount&gt;: &apos;%s&apos;</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-15"/>
+ <location line="-24"/>
<source>Error: could not start node</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+16"/>
+ <location line="+25"/>
<source>Invalid amount</source>
<translation type="unfinished"/>
</message>
@@ -2683,7 +2911,7 @@ If the file does not exist, create it with owner-readable-only file permissions.
<translation type="unfinished"/>
</message>
<message>
- <location line="-45"/>
+ <location line="-59"/>
<source>Add a node to connect to and attempt to keep the connection open</source>
<translation type="unfinished"/>
</message>
@@ -2693,22 +2921,17 @@ If the file does not exist, create it with owner-readable-only file permissions.
<translation type="unfinished"/>
</message>
<message>
- <location line="+54"/>
- <source>Find peers using internet relay chat (default: 0)</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="-2"/>
+ <location line="+68"/>
<source>Fee per KB to add to transactions you send</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+19"/>
+ <location line="+17"/>
<source>Loading wallet...</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-40"/>
+ <location line="-54"/>
<source>Cannot downgrade wallet</source>
<translation type="unfinished"/>
</message>
@@ -2723,27 +2946,27 @@ If the file does not exist, create it with owner-readable-only file permissions.
<translation type="unfinished"/>
</message>
<message>
- <location line="+49"/>
+ <location line="+64"/>
<source>Rescanning...</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-43"/>
+ <location line="-56"/>
<source>Done loading</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+65"/>
+ <location line="+79"/>
<source>To use the %s option</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-60"/>
+ <location line="-71"/>
<source>Error</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-28"/>
+ <location line="-33"/>
<source>You must set rpcpassword=&lt;password&gt; in the configuration file:
%s
If the file does not exist, create it with owner-readable-only file permissions.</source>
diff --git a/src/qt/locale/bitcoin_he.ts b/src/qt/locale/bitcoin_he.ts
index 52d7dc782e..15991cb84f 100644
--- a/src/qt/locale/bitcoin_he.ts
+++ b/src/qt/locale/bitcoin_he.ts
@@ -13,12 +13,7 @@
<translation>גרסת &lt;b&gt;ביטקוין&lt;/b&gt;</translation>
</message>
<message>
- <location line="+41"/>
- <source>Copyright © 2009-2012 The Bitcoin developers</source>
- <translation>זכויות ×™×•×¦×¨×™× 2009-2012 שמורות למפתחי הביטקוין</translation>
- </message>
- <message>
- <location line="+13"/>
+ <location line="+57"/>
<source>
This is experimental software.
@@ -32,6 +27,16 @@ This product includes software developed by the OpenSSL Project for use in the O
המוצר ×”×–×” כולל תוכנה שפותחה ×¢&quot;×™ פרויקט OpenSSL לשימוש בתיבת ×”×›×œ×™× OpenSSL (http://www.openssl.org/) ותוכנה קריפטוגרפית שנכתבה ×¢&quot;×™ ×ריק ×™×× ×’ (eay@cryptsoft.com) ותוכנת UPnP שנכתבה ×¢&quot;×™ תומס ברנרד.</translation>
</message>
+ <message>
+ <location filename="../aboutdialog.cpp" line="+17"/>
+ <source>Copyright</source>
+ <translation>זכויות יוצרי×</translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>2009-%1 The Bitcoin developers</source>
+ <translation>2009-%1 מפתחי ביטקוין</translation>
+ </message>
</context>
<context>
<name>AddressBookPage</name>
@@ -103,20 +108,25 @@ This product includes software developed by the OpenSSL Project for use in the O
<message>
<location line="+14"/>
<source>&amp;Delete</source>
- <translation>&amp;מחיקה</translation>
+ <translation>מחק</translation>
</message>
<message>
- <location filename="../addressbookpage.cpp" line="+65"/>
+ <location filename="../addressbookpage.cpp" line="+66"/>
<source>Copy &amp;Label</source>
<translation>העתק תוית</translation>
</message>
<message>
- <location line="+2"/>
+ <location line="+1"/>
<source>&amp;Edit</source>
<translation>עריכה</translation>
</message>
<message>
- <location line="+250"/>
+ <location line="+1"/>
+ <source>Send &amp;Coins</source>
+ <translation>שלח מטבעות</translation>
+ </message>
+ <message>
+ <location line="+263"/>
<source>Export Address Book Data</source>
<translation>×™×¦×•× × ×ª×•× ×™ פנקס כתובות</translation>
</message>
@@ -139,7 +149,7 @@ This product includes software developed by the OpenSSL Project for use in the O
<context>
<name>AddressTableModel</name>
<message>
- <location filename="../addresstablemodel.cpp" line="+142"/>
+ <location filename="../addresstablemodel.cpp" line="+144"/>
<source>Label</source>
<translation>תוית</translation>
</message>
@@ -151,7 +161,7 @@ This product includes software developed by the OpenSSL Project for use in the O
<message>
<location line="+36"/>
<source>(no label)</source>
- <translation>(×œ×œ× ×›×ª×•×‘×ª)</translation>
+ <translation>(×œ×œ× ×ª×•×™×ª)</translation>
</message>
</context>
<context>
@@ -184,7 +194,7 @@ This product includes software developed by the OpenSSL Project for use in the O
<message>
<location line="+1"/>
<source>Encrypt wallet</source>
- <translation>הצפנת ×רנק</translation>
+ <translation>הצפן ×רנק</translation>
</message>
<message>
<location line="+3"/>
@@ -298,17 +308,17 @@ This product includes software developed by the OpenSSL Project for use in the O
<context>
<name>BitcoinGUI</name>
<message>
- <location filename="../bitcoingui.cpp" line="+267"/>
+ <location filename="../bitcoingui.cpp" line="+231"/>
<source>Sign &amp;message...</source>
<translation>×—×ª×•× ×¢×œ הודעה</translation>
</message>
<message>
- <location line="+254"/>
+ <location line="+299"/>
<source>Synchronizing with network...</source>
<translation>מסתנכרן ×¢× ×”×¨×©×ª...</translation>
</message>
<message>
- <location line="-322"/>
+ <location line="-367"/>
<source>&amp;Overview</source>
<translation>&amp;סקירה</translation>
</message>
@@ -328,32 +338,17 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation>דפדף בהיסטוריית הפעולות</translation>
</message>
<message>
- <location line="+6"/>
- <source>&amp;Address Book</source>
- <translation>פנקס &amp;כתובות</translation>
- </message>
- <message>
- <location line="+1"/>
+ <location line="+7"/>
<source>Edit the list of stored addresses and labels</source>
<translation>ערוך ×ת רשימת הכתובות והתויות</translation>
</message>
<message>
- <location line="-15"/>
- <source>&amp;Receive coins</source>
- <translation>&amp;קבלת מטבעות</translation>
- </message>
- <message>
- <location line="+1"/>
+ <location line="-14"/>
<source>Show the list of addresses for receiving payments</source>
<translation>הצג ×ת רשימת הכתובות לקבלת תשלומי×</translation>
</message>
<message>
- <location line="-8"/>
- <source>&amp;Send coins</source>
- <translation>&amp;שלח מטבעות</translation>
- </message>
- <message>
- <location line="+39"/>
+ <location line="+31"/>
<source>E&amp;xit</source>
<translation>×™&amp;צי××”</translation>
</message>
@@ -398,7 +393,7 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation>שנה סיסמ×</translation>
</message>
<message>
- <location line="+259"/>
+ <location line="+304"/>
<source>Importing blocks from disk...</source>
<translation>×ž×™×™×‘× ×‘×œ×•×§×™× ×ž×”×“×™×¡×§...</translation>
</message>
@@ -407,13 +402,8 @@ This product includes software developed by the OpenSSL Project for use in the O
<source>Reindexing blocks on disk...</source>
<translation>מחדש ×ת ×ינדקס ×”×‘×œ×•×§×™× ×‘×“×™×¡×§...</translation>
</message>
- <message numerus="yes">
- <location line="+10"/>
- <source>~%n block(s) remaining</source>
- <translation><numerusform>בלוק ×חד נותר</numerusform><numerusform>~%n ×‘×œ×•×§×™× × ×•×ª×¨×•</numerusform></translation>
- </message>
<message>
- <location line="-265"/>
+ <location line="-300"/>
<source>&amp;Export...</source>
<translation>×™&amp;×¦× ×œ×§×•×‘×¥</translation>
</message>
@@ -458,18 +448,33 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation>×מת הודעה...</translation>
</message>
<message>
- <location line="-196"/>
- <location line="+538"/>
+ <location line="-162"/>
+ <location line="+540"/>
<source>Bitcoin</source>
<translation>ביטקוין</translation>
</message>
<message>
- <location line="-538"/>
+ <location line="-540"/>
<source>Wallet</source>
<translation>×רנק</translation>
</message>
<message>
- <location line="+176"/>
+ <location line="+99"/>
+ <source>&amp;Send</source>
+ <translation>ושלח</translation>
+ </message>
+ <message>
+ <location line="+7"/>
+ <source>&amp;Receive</source>
+ <translation>וקבל</translation>
+ </message>
+ <message>
+ <location line="+14"/>
+ <source>&amp;Addresses</source>
+ <translation>וכתובות</translation>
+ </message>
+ <message>
+ <location line="+22"/>
<source>&amp;About Bitcoin</source>
<translation>×ודות ביטקוין</translation>
</message>
@@ -530,97 +535,92 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation>[רשת-בדיקה]</translation>
</message>
<message>
- <location line="+63"/>
+ <location line="+47"/>
<source>Bitcoin client</source>
<translation>תוכנת ביטקוין</translation>
</message>
<message numerus="yes">
- <location line="+79"/>
+ <location line="+140"/>
<source>%n active connection(s) to Bitcoin network</source>
<translation><numerusform>חיבור פעיל ×חד לרשת הביטקוין</numerusform><numerusform>%n ×—×™×‘×•×¨×™× ×¤×¢×™×œ×™× ×œ×¨×©×ª הביטקוין</numerusform></translation>
</message>
<message>
- <location line="+45"/>
- <source>Processed %1 of %2 blocks of transaction history (%3% done).</source>
- <translation>×”×•×©×œ× ×¢×™×‘×•×“ של %1 מתוך %2 ×‘×œ×•×§×™× ×©×œ היסטוריית פעולות (%3%).</translation>
+ <location line="+39"/>
+ <source>Processed %1 of %2 (estimated) blocks of transaction history.</source>
+ <translation>1% מתוך 2% (משוער) ×‘×œ×•×§×™× ×©×œ הסטוריית פעולת עובדו </translation>
</message>
<message>
- <location line="+7"/>
+ <location line="+4"/>
<source>Processed %1 blocks of transaction history.</source>
<translation>×”×•×©×œ× ×¢×™×‘×•×“ של %1 ×‘×œ×•×§×™× ×©×œ היסטוריית פעולות.</translation>
</message>
+ <message numerus="yes">
+ <location line="+20"/>
+ <source>%n hour(s)</source>
+ <translation><numerusform>%n שעה</numerusform><numerusform>%n שעות</numerusform></translation>
+ </message>
+ <message numerus="yes">
+ <location line="+4"/>
+ <source>%n day(s)</source>
+ <translation><numerusform>%n יו×</numerusform><numerusform>%n ימי×</numerusform></translation>
+ </message>
+ <message numerus="yes">
+ <location line="+4"/>
+ <source>%n week(s)</source>
+ <translation><numerusform>%n שבוע</numerusform><numerusform>%n שבועות</numerusform></translation>
+ </message>
<message>
- <location line="+70"/>
+ <location line="+5"/>
+ <source>%1 behind</source>
+ <translation>1% מ×חור</translation>
+ </message>
+ <message>
+ <location line="+14"/>
+ <source>Last received block was generated %1 ago.</source>
+ <translation>הבלוק ×”×חרון שהתקבל נוצר לפני %1</translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Transactions after this will not yet be visible.</source>
+ <translation>ל×חר ×–×ת פעולות נספות ×˜×¨× ×™×”×™×• גלויות</translation>
+ </message>
+ <message>
+ <location line="+21"/>
<source>Error</source>
- <translation type="unfinished"/>
+ <translation>שגי××”</translation>
</message>
<message>
<location line="+3"/>
<source>Warning</source>
- <translation type="unfinished"/>
+ <translation>×זהרה</translation>
</message>
<message>
<location line="+3"/>
<source>Information</source>
- <translation type="unfinished"/>
+ <translation>מידע</translation>
</message>
<message>
- <location line="+66"/>
+ <location line="+68"/>
<source>This transaction is over the size limit. You can still send it for a fee of %1, which goes to the nodes that process your transaction and helps to support the network. Do you want to pay the fee?</source>
<translation>פעולה זו חורגת מגבולות הגודל. עדיין ב×פשרותך לשלוח ×ותה תמורת עמלה של %1, המיועדת ×œ×¦×ž×ª×™× ×©×ž×¢×‘×“×™× ×ת הפעולה שלך ועוזרת לתמוך ברשת. ×”×× ×‘×¨×¦×•× ×š ×œ×©×œ× ×ת העמלה?</translation>
</message>
<message>
- <location line="+210"/>
- <source>Backup Successful</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+0"/>
- <source>The wallet data was successfully saved to the new location.</source>
- <translation type="unfinished"/>
- </message>
- <message numerus="yes">
- <location line="-338"/>
- <source>%n second(s) ago</source>
- <translation><numerusform>לפני שניה</numerusform><numerusform>לפני %n שניות</numerusform></translation>
- </message>
- <message numerus="yes">
- <location line="+4"/>
- <source>%n minute(s) ago</source>
- <translation><numerusform>לפני דקה</numerusform><numerusform>לפני %n דקות</numerusform></translation>
- </message>
- <message numerus="yes">
- <location line="+4"/>
- <source>%n hour(s) ago</source>
- <translation><numerusform>לפני שעה</numerusform><numerusform>לפני %n שעות</numerusform></translation>
- </message>
- <message numerus="yes">
- <location line="+4"/>
- <source>%n day(s) ago</source>
- <translation><numerusform>לפני יו×</numerusform><numerusform>לפני %n ימי×</numerusform></translation>
- </message>
- <message>
- <location line="+6"/>
+ <location line="-138"/>
<source>Up to date</source>
<translation>עדכני</translation>
</message>
<message>
- <location line="+7"/>
+ <location line="+32"/>
<source>Catching up...</source>
<translation>מתעדכן...</translation>
</message>
<message>
- <location line="+10"/>
- <source>Last received block was generated %1.</source>
- <translation>הבלוק ×”×חרון שהתקבל נוצר ב-%1.</translation>
- </message>
- <message>
- <location line="+97"/>
+ <location line="+110"/>
<source>Confirm transaction fee</source>
<translation>×שר עמלת פעולה</translation>
</message>
<message>
- <location line="+23"/>
+ <location line="+8"/>
<source>Sent transaction</source>
<translation>פעולה שנשלחה</translation>
</message>
@@ -642,14 +642,14 @@ Address: %4
כתובת: %4</translation>
</message>
<message>
- <location line="+99"/>
- <location line="+28"/>
+ <location line="+33"/>
+ <location line="+23"/>
<source>URI handling</source>
<translation>תפעול URI</translation>
</message>
<message>
- <location line="-28"/>
- <location line="+28"/>
+ <location line="-23"/>
+ <location line="+23"/>
<source>URI can not be parsed! This can be caused by an invalid Bitcoin address or malformed URI parameters.</source>
<translation>×œ× × ×™×ª×Ÿ לנתח URI! ×–×” יכול ×œ×”×™×’×¨× ×›×ª×•×¦××” מכתובת ביטקוין ×œ× ×ª×§×™× ×” ×ו פרמטרי URI חסרי צורה תקינה.</translation>
</message>
@@ -664,27 +664,7 @@ Address: %4
<translation>×”×רנק &lt;b&gt;מוצפן&lt;/b&gt; וכרגע &lt;b&gt;נעול&lt;/b&gt;</translation>
</message>
<message>
- <location line="+23"/>
- <source>Backup Wallet</source>
- <translation>גיבוי ×רנק</translation>
- </message>
- <message>
- <location line="+0"/>
- <source>Wallet Data (*.dat)</source>
- <translation>נתוני ×רנק (*.dat)</translation>
- </message>
- <message>
- <location line="+3"/>
- <source>Backup Failed</source>
- <translation>הגיבוי נכשל</translation>
- </message>
- <message>
- <location line="+0"/>
- <source>There was an error trying to save the wallet data to the new location.</source>
- <translation>היתה שגי××” בניסיון לשמור ×ת מידע ×”×רנק ×œ×ž×™×§×•× ×”×—×“×©.</translation>
- </message>
- <message>
- <location filename="../bitcoin.cpp" line="+109"/>
+ <location filename="../bitcoin.cpp" line="+108"/>
<source>A fatal error occurred. Bitcoin can no longer continue safely and will quit.</source>
<translation>שגי××” סופנית ×ירעה. ביטקוין ×ינו יכול להמשיך לפעול בבטחה ולכן ייסגר.</translation>
</message>
@@ -692,7 +672,7 @@ Address: %4
<context>
<name>ClientModel</name>
<message>
- <location filename="../clientmodel.cpp" line="+86"/>
+ <location filename="../clientmodel.cpp" line="+96"/>
<source>Network Alert</source>
<translation>×זעקת רשת</translation>
</message>
@@ -725,7 +705,7 @@ Address: %4
<translation>הכתובת המשויכת לרשומה זו בפנקס הכתובות. ניתן לשנות ×–×ת רק עבור כתובות לשליחה.</translation>
</message>
<message>
- <location filename="../editaddressdialog.cpp" line="+20"/>
+ <location filename="../editaddressdialog.cpp" line="+21"/>
<source>New receiving address</source>
<translation>כתובת חדשה לקבלה</translation>
</message>
@@ -745,17 +725,17 @@ Address: %4
<translation>ערוך כתובת לשליחה</translation>
</message>
<message>
- <location line="+60"/>
+ <location line="+76"/>
<source>The entered address &quot;%1&quot; is already in the address book.</source>
<translation>הכתובת שהכנסת &quot;%1&quot; כבר נמצ×ת בפנקס הכתובות.</translation>
</message>
<message>
- <location line="+5"/>
+ <location line="-5"/>
<source>The entered address &quot;%1&quot; is not a valid Bitcoin address.</source>
<translation>הכתובת שהוכנסה &quot;%1&quot; ××™× ×” כתובת ביטקוין תקינה.</translation>
</message>
<message>
- <location line="+5"/>
+ <location line="+10"/>
<source>Could not unlock wallet.</source>
<translation>פתיחת ×”×רנק נכשלה.</translation>
</message>
@@ -768,7 +748,7 @@ Address: %4
<context>
<name>GUIUtil::HelpMessageBox</name>
<message>
- <location filename="../guiutil.cpp" line="+419"/>
+ <location filename="../guiutil.cpp" line="+422"/>
<location line="+12"/>
<source>Bitcoin-Qt</source>
<translation>Bitcoin-Qt</translation>
@@ -844,12 +824,12 @@ Address: %4
<message>
<location line="+35"/>
<source>Reset all client options to default.</source>
- <translation type="unfinished"/>
+ <translation>×פס כל ×פשרויות התוכנה לברירת המחדל.</translation>
</message>
<message>
<location line="+3"/>
<source>&amp;Reset Options</source>
- <translation type="unfinished"/>
+ <translation>×יפוס ×פשרויות</translation>
</message>
<message>
<location line="+13"/>
@@ -982,24 +962,24 @@ Address: %4
<translation>יישו×</translation>
</message>
<message>
- <location filename="../optionsdialog.cpp" line="+55"/>
+ <location filename="../optionsdialog.cpp" line="+53"/>
<source>default</source>
<translation>ברירת מחדל</translation>
</message>
<message>
<location line="+130"/>
<source>Confirm options reset</source>
- <translation type="unfinished"/>
+ <translation>×שר ×ת ×יפוס ×”×פשרויות</translation>
</message>
<message>
<location line="+1"/>
<source>Some settings may require a client restart to take effect.</source>
- <translation type="unfinished"/>
+ <translation>כמה מההגדרות עשויות לדרוש ×תחול התוכנה כדי להיכנס לפועל.</translation>
</message>
<message>
<location line="+0"/>
<source>Do you want to proceed?</source>
- <translation type="unfinished"/>
+ <translation>×”×× ×‘×¨×¦×•× ×š להמשיך?</translation>
</message>
<message>
<location line="+42"/>
@@ -1027,23 +1007,18 @@ Address: %4
<translation>טופס</translation>
</message>
<message>
- <location line="+51"/>
- <location line="+183"/>
+ <location line="+50"/>
+ <location line="+166"/>
<source>The displayed information may be out of date. Your wallet automatically synchronizes with the Bitcoin network after a connection is established, but this process has not completed yet.</source>
<translation>המידע המוצג עשוי להיות מיושן. ×”×רנק שלך מסתנכרן ב×ופן ×וטומטי ×¢× ×¨×©×ª הביטקוין ל×חר כינון חיבור, ×ך התהליך ×˜×¨× ×”×¡×ª×™×™×.</translation>
</message>
<message>
- <location line="-141"/>
+ <location line="-124"/>
<source>Balance:</source>
<translation>יתרה:</translation>
</message>
<message>
- <location line="+58"/>
- <source>Number of transactions:</source>
- <translation>מספר פעולות:</translation>
- </message>
- <message>
- <location line="-29"/>
+ <location line="+29"/>
<source>Unconfirmed:</source>
<translation>ממתין ל×ישור:</translation>
</message>
@@ -1053,7 +1028,7 @@ Address: %4
<translation>×רנק</translation>
</message>
<message>
- <location line="+124"/>
+ <location line="+107"/>
<source>Immature:</source>
<translation>×œ× ×‘×©×œ:</translation>
</message>
@@ -1068,7 +1043,7 @@ Address: %4
<translation>&lt;b&gt;פעולות ×חרונות&lt;/b&gt;</translation>
</message>
<message>
- <location line="-118"/>
+ <location line="-101"/>
<source>Your current balance</source>
<translation>היתרה הנוכחית שלך</translation>
</message>
@@ -1078,11 +1053,6 @@ Address: %4
<translation>×”×¡×›×•× ×”×›×•×œ×œ של פעולות ×©×˜×¨× ×ושרו, ועוד ×ינן נספרות בחישוב היתרה הנוכחית</translation>
</message>
<message>
- <location line="+20"/>
- <source>Total number of transactions in wallet</source>
- <translation>המספר הכולל של פעולות ב×רנק</translation>
- </message>
- <message>
<location filename="../overviewpage.cpp" line="+115"/>
<location line="+1"/>
<source>out of sync</source>
@@ -1090,6 +1060,14 @@ Address: %4
</message>
</context>
<context>
+ <name>PaymentServer</name>
+ <message>
+ <location filename="../paymentserver.cpp" line="+107"/>
+ <source>Cannot start bitcoin: click-to-pay handler</source>
+ <translation>×œ× × ×™×ª×Ÿ להתחיל ×ת ביטקוין: מפעיל לחץ-×œ×ª×©×œ×•× </translation>
+ </message>
+</context>
+<context>
<name>QRCodeDialog</name>
<message>
<location filename="../forms/qrcodedialog.ui" line="+14"/>
@@ -1428,7 +1406,7 @@ Address: %4
</message>
<message>
<location line="+60"/>
- <location filename="../sendcoinsentry.cpp" line="+25"/>
+ <location filename="../sendcoinsentry.cpp" line="+26"/>
<source>Enter a label for this address to add it to your address book</source>
<translation>הכנס תוית לכתובת ×”×–×ת כדי להכניס לפנקס הכתובות</translation>
</message>
@@ -1520,7 +1498,7 @@ Address: %4
<message>
<location line="+7"/>
<source>Signature</source>
- <translation type="unfinished"/>
+ <translation>חתימה</translation>
</message>
<message>
<location line="+27"/>
@@ -1535,7 +1513,7 @@ Address: %4
<message>
<location line="+3"/>
<source>Sign &amp;Message</source>
- <translation type="unfinished"/>
+ <translation>×—×ª×•× ×¢×œ הודעה</translation>
</message>
<message>
<location line="+14"/>
@@ -1571,7 +1549,7 @@ Address: %4
<message>
<location line="+3"/>
<source>Verify &amp;Message</source>
- <translation type="unfinished"/>
+ <translation>×ימות הודעה</translation>
</message>
<message>
<location line="+14"/>
@@ -1664,7 +1642,7 @@ Address: %4
<context>
<name>TransactionDesc</name>
<message>
- <location filename="../transactiondesc.cpp" line="+19"/>
+ <location filename="../transactiondesc.cpp" line="+20"/>
<source>Open until %1</source>
<translation>פתוח עד %1</translation>
</message>
@@ -1827,7 +1805,7 @@ Address: %4
<message numerus="yes">
<location line="-35"/>
<source>Open for %n more block(s)</source>
- <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+ <translation><numerusform>פתח למשך בלוק %n יותר</numerusform><numerusform>פתח למשך %n ×‘×œ×•×§×™× × ×•×¡×¤×™×</numerusform></translation>
</message>
<message>
<location line="+70"/>
@@ -1851,7 +1829,7 @@ Address: %4
<context>
<name>TransactionTableModel</name>
<message>
- <location filename="../transactiontablemodel.cpp" line="+226"/>
+ <location filename="../transactiontablemodel.cpp" line="+225"/>
<source>Date</source>
<translation>ת×ריך</translation>
</message>
@@ -1873,7 +1851,7 @@ Address: %4
<message numerus="yes">
<location line="+57"/>
<source>Open for %n more block(s)</source>
- <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+ <translation><numerusform>פתח למשך בלוק %n יותר</numerusform><numerusform>פתח למשך %n ×‘×œ×•×§×™× × ×•×¡×¤×™×</numerusform></translation>
</message>
<message>
<location line="+3"/>
@@ -1969,7 +1947,7 @@ Address: %4
<context>
<name>TransactionView</name>
<message>
- <location filename="../transactionview.cpp" line="+55"/>
+ <location filename="../transactionview.cpp" line="+52"/>
<location line="+16"/>
<source>All</source>
<translation>הכל</translation>
@@ -2056,6 +2034,11 @@ Address: %4
</message>
<message>
<location line="+1"/>
+ <source>Copy transaction ID</source>
+ <translation>העתק מזהה פעולה</translation>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Edit label</source>
<translation>ערוך תוית</translation>
</message>
@@ -2065,7 +2048,7 @@ Address: %4
<translation>הצג פרטי פעולה</translation>
</message>
<message>
- <location line="+142"/>
+ <location line="+139"/>
<source>Export Transaction Data</source>
<translation>×™×¦×•× × ×ª×•× ×™ פעולות</translation>
</message>
@@ -2120,7 +2103,7 @@ Address: %4
<translation>×œ× ×ž×¡×•×’×œ לכתוב לקובץ %1.</translation>
</message>
<message>
- <location line="+95"/>
+ <location line="+100"/>
<source>Range:</source>
<translation>טווח:</translation>
</message>
@@ -2131,29 +2114,172 @@ Address: %4
</message>
</context>
<context>
+ <name>WalletView</name>
+ <message>
+ <location filename="../walletview.cpp" line="+95"/>
+ <source>&amp;Overview</source>
+ <translation>&amp;סקירה</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Show general overview of wallet</source>
+ <translation>הצג סקירה כללית של ×”×רנק</translation>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>&amp;Send coins</source>
+ <translation>ושלח מטבעות</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Send coins to a Bitcoin address</source>
+ <translation>שלח מטבעות לכתובת ביטקוין</translation>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>&amp;Receive coins</source>
+ <translation>&amp;קבל מטבעות</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Show the list of addresses for receiving payments</source>
+ <translation>הר××” ×ת רשימת הכתובות לקבלת תשלומי×</translation>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>&amp;Transactions</source>
+ <translation>&amp;פעולות</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Browse transaction history</source>
+ <translation>דפדף בהיסטוריית הפעולות</translation>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>&amp;Address Book</source>
+ <translation>פנקס כתובות</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Edit the list of stored addresses and labels</source>
+ <translation>ערוך ×ת הרשימה של הכתובות והתוויות</translation>
+ </message>
+ <message>
+ <location line="+12"/>
+ <source>&amp;Encrypt Wallet...</source>
+ <translation>&amp;הצפן ×רנק...</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Encrypt the private keys that belong to your wallet</source>
+ <translation>הצפן ×ת המפתחות ×”×¤×¨×˜×™×™× ×©×©×™×™×›×™× ×œ×רנק שלך</translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>&amp;Backup Wallet...</source>
+ <translation>&amp;גיבוי ×רנק</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Backup wallet to another location</source>
+ <translation>גיבוי ×”×רנק ×œ×ž×§×•× ×חר</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>&amp;Change Passphrase...</source>
+ <translation>&amp;שנה סיסמ×..</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Change the passphrase used for wallet encryption</source>
+ <translation>שנה ×ת ×”×¡×™×¡×ž× ×”×ž×©×ž×©×ª להצפנת ×”×רנק</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Sign &amp;message...</source>
+ <translation>×—×ª×•× &amp;הודעה...</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Sign messages with your Bitcoin addresses to prove you own them</source>
+ <translation>×—×ª×•× ×¢×œ הודעות ×¢× ×›×ª×•×‘×•×ª הביטקוין שלך כדי להוכיח שהן בבעלותך</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>&amp;Verify message...</source>
+ <translation>&amp;×•×•×“× ×”×•×“×¢×”...</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Verify messages to ensure they were signed with specified Bitcoin addresses</source>
+ <translation>×מת הודעות כדי להבטיח שהן נחתמו ×¢× ×›×ª×•×‘×ª ביטקוין מסוימות</translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>&amp;Export...</source>
+ <translation>&amp;ייצ×</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Export the data in the current tab to a file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+180"/>
+ <source>Backup Wallet</source>
+ <translation>גבה ×רנק</translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>Wallet Data (*.dat)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Backup Failed</source>
+ <translation>גיבוי נכשל</translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>There was an error trying to save the wallet data to the new location.</source>
+ <translation>הייתה שגי××” בנסיון לשמור ×ת המידע ×”×רנק ×œ×ž×™×§×•× ×”×—×“×©.</translation>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>Backup Successful</source>
+ <translation>גיבוי ×”×•×©×œ× ×‘×”×¦×œ×—×”</translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>The wallet data was successfully saved to the new location.</source>
+ <translation>נתוני ×”×רנק נשמרו בהצלחה ×‘×ž×§×•× ×”×—×“×©.</translation>
+ </message>
+</context>
+<context>
<name>bitcoin-core</name>
<message>
- <location filename="../bitcoinstrings.cpp" line="+88"/>
+ <location filename="../bitcoinstrings.cpp" line="+96"/>
<source>Bitcoin version</source>
<translation>גרסת ביטקוין</translation>
</message>
<message>
- <location line="+82"/>
+ <location line="+98"/>
<source>Usage:</source>
<translation>שימוש:</translation>
</message>
<message>
- <location line="-23"/>
+ <location line="-24"/>
<source>Send command to -server or bitcoind</source>
<translation>שלח פקודה ל -server ×ו bitcoind</translation>
</message>
<message>
- <location line="-21"/>
+ <location line="-22"/>
<source>List commands</source>
<translation>רשימת פקודות</translation>
</message>
<message>
- <location line="-11"/>
+ <location line="-10"/>
<source>Get help for a command</source>
<translation>קבל עזרה עבור פקודה</translation>
</message>
@@ -2178,12 +2304,12 @@ Address: %4
<translation>צור מטבעות</translation>
</message>
<message>
- <location line="-15"/>
+ <location line="-28"/>
<source>Don&apos;t generate coins</source>
<translation>×ל תייצר מטבעות</translation>
</message>
<message>
- <location line="+61"/>
+ <location line="+74"/>
<source>Specify data directory</source>
<translation>ציין תיקיית נתוני×</translation>
</message>
@@ -2193,75 +2319,77 @@ Address: %4
<translation>קבע ×ת גודל המטמון של מסד ×”× ×ª×•× ×™× ×‘×ž×’×”×‘×™×™×˜ (ברירת מחדל: 25)</translation>
</message>
<message>
- <location line="-26"/>
+ <location line="-27"/>
<source>Listen for connections on &lt;port&gt; (default: 8333 or testnet: 18333)</source>
<translation>×”×זן ×œ×—×™×‘×•×¨×™× ×‘&lt;פורט&gt; (ברירת מחדל: 8333 ×ו ברשת הבדיקה: 18333)</translation>
</message>
<message>
- <location line="+4"/>
+ <location line="+5"/>
<source>Maintain at most &lt;n&gt; connections to peers (default: 125)</source>
<translation>החזק לכל היותר &lt;n&gt; ×—×™×‘×•×¨×™× ×œ×¢×ž×™×ª×™× (ברירת מחדל: 125)</translation>
</message>
<message>
- <location line="-34"/>
+ <location line="-49"/>
<source>Connect to a node to retrieve peer addresses, and disconnect</source>
<translation>התחבר לצומת כדי לדלות כתובות עמיתי×, ו××– התנתק</translation>
</message>
<message>
- <location line="+65"/>
+ <location line="+80"/>
<source>Specify your own public address</source>
<translation>ציין ×ת הכתובת הפומבית שלך</translation>
</message>
<message>
- <location line="+2"/>
+ <location line="+3"/>
<source>Threshold for disconnecting misbehaving peers (default: 100)</source>
<translation>סף להתנתקות ×ž×¢×ž×™×ª×™× ×”× ×•×”×’×™× ×©×œ× ×›×”×œ×›×” (ברירת מחדל: 100)</translation>
</message>
<message>
- <location line="-114"/>
+ <location line="-132"/>
<source>Number of seconds to keep misbehaving peers from reconnecting (default: 86400)</source>
<translation>מספר שניות למנוע ×ž×¢×ž×™×ª×™× ×”× ×•×”×’×™× ×©×œ× ×›×”×œ×›×” מלהתחבר מחדש (ברירת מחדל: 86400)</translation>
</message>
<message>
- <location line="-28"/>
+ <location line="-32"/>
<source>An error occurred while setting up the RPC port %u for listening on IPv4: %s</source>
<translation>×ירעה שגי××” בעת הגדרת פורט RPC %u לה××–× ×” ב-IPv4: %s</translation>
</message>
<message>
- <location line="+26"/>
+ <location line="+30"/>
<source>Listen for JSON-RPC connections on &lt;port&gt; (default: 8332 or testnet: 18332)</source>
<translation>×”×זן לחיבורי JSON-RPC ב- &lt;port&gt; (ברירת מחדל: 8332 ×ו רשת בדיקה: 18332)</translation>
</message>
<message>
- <location line="+34"/>
+ <location line="+36"/>
<source>Accept command line and JSON-RPC commands</source>
<translation>קבל פקודות משורת הפקודה ו- JSON-RPC</translation>
</message>
<message>
- <location line="+62"/>
+ <location line="+77"/>
<source>Run in the background as a daemon and accept commands</source>
<translation>רוץ ברקע כדימון וקבל פקודות</translation>
</message>
<message>
- <location line="+31"/>
+ <location line="+32"/>
<source>Use the test network</source>
<translation>השתמש ברשת הבדיקה</translation>
</message>
<message>
- <location line="-92"/>
+ <location line="-108"/>
<source>Accept connections from outside (default: 1 if no -proxy or -connect)</source>
<translation>קבל ×—×™×‘×•×¨×™× ×ž×‘×—×•×¥ (ברירת מחדל: 1 ×œ×œ× -proxy ×ו -connect)</translation>
</message>
<message>
- <location line="-74"/>
+ <location line="-82"/>
<source>%s, you must set a rpcpassword in the configuration file:
- %s
+%s
It is recommended you use the following random password:
rpcuser=bitcoinrpc
rpcpassword=%s
(you do not need to remember this password)
The username and password MUST NOT be the same.
If the file does not exist, create it with owner-readable-only file permissions.
+It is also recommended to set alertnotify so you are notified of problems;
+for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.com
</source>
<translation>%s, עליך לקבוע סיסמת RPC בקובץ הקונפיגורציה:
%s
@@ -2270,10 +2398,13 @@ rpcuser=bitcoinrpc
rpcpassword=%s
(×ין צורך לזכור ×ת הסיסמה)
×סור ×©×©× ×”×ž×©×ª×ž×© ×•×”×¡×™×¡×ž× ×™×”×™×• ×–×”×™×.
-×× ×”×§×•×‘×¥ ×ינו קיי×, צור ×ותו ×¢× ×”×¨×©×ות קרי××” ×œ×‘×¢×œ×™× ×‘×œ×‘×“.</translation>
+×× ×”×§×•×‘×¥ ×ינו קיי×, צור ×ותו ×¢× ×”×¨×©×ות קרי××” ×œ×‘×¢×œ×™× ×‘×œ×‘×“.
+זה מומלץ לסמן alertnotify כדי לקבל דיווח על תקלות;
+למשל: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.com
+</translation>
</message>
<message>
- <location line="+15"/>
+ <location line="+17"/>
<source>An error occurred while setting up the RPC port %u for listening on IPv6, falling back to IPv4: %s</source>
<translation>×ירעה שגי××” בעת הגדרת פורט RPC %u לה××–× ×” ב-IPv6, נסוג ל-IPv4: %s</translation>
</message>
@@ -2289,11 +2420,6 @@ rpcpassword=%s
</message>
<message>
<location line="+3"/>
- <source>Corrupted block database detected. Please restart the client with -reindex.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+2"/>
<source>Error initializing database environment %s! To recover, BACKUP THAT DIRECTORY, then remove everything from it except for wallet.dat.</source>
<translation>שגי××” ב×תחול סביבת מסד ×”× ×ª×•× ×™× %s! בשביל להת×ושש, גבה ×ת התיקיה ×”×–×ת, ו××– הסר הכל מלבד wallet.dat.</translation>
</message>
@@ -2308,12 +2434,27 @@ rpcpassword=%s
<translation>שגי××”: הפעולה ×”×–×ת דורשת עמלת פעולה של לפחות %s עקב הכמות, המורכבות, ×ו השימוש ×‘×›×¡×¤×™× ×©×”×ª×§×‘×œ×• ל×חרונה!</translation>
</message>
<message>
+ <location line="+3"/>
+ <source>Execute command when a relevant alert is received (%s in cmd is replaced by message)</source>
+ <translation>בצע פעולה ×›×שר ההודעה הרלוונטית מתקבלת(%s בשורת הפקודה משתנה על-ידי ההודעה)</translation>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Execute command when a wallet transaction changes (%s in cmd is replaced by TxID)</source>
+ <translation>בצע פקודה ×›×שר פעולת ×רנק משתנה (%s ב cmd יוחלף ב TxID)</translation>
+ </message>
+ <message>
<location line="+11"/>
<source>Set maximum size of high-priority/low-fee transactions in bytes (default: 27000)</source>
<translation>קבע גודל מקסימלי עבור פעולות עדיפות גבוהה/עמלה נמוכה ×‘×‘×ª×™× (ברירת מחדל: 27000)</translation>
</message>
<message>
<location line="+3"/>
+ <source>Set the number of script verification threads (1-16, 0=auto, default: 0)</source>
+ <translation>קבע ×ת מספר תהליכוני ×ימות ×”×¡×§×¨×™×¤×˜×™× (1-16, 0 = ×וטומטי, ברירת מחדל: 0)</translation>
+ </message>
+ <message>
+ <location line="+2"/>
<source>This is a pre-release test build - use at your own risk - do not use for mining or merchant applications</source>
<translation>זוהי בניית ניסיון טרו×-שחרור - השימוש בה על ×חריותך - ×ין להשתמש לצורך כריה ×ו יישומי מסחר</translation>
</message>
@@ -2359,18 +2500,43 @@ rpcpassword=%s
</message>
<message>
<location line="+3"/>
+ <source>Corrupted block database detected</source>
+ <translation>התגלה מסד נתוני ×‘×œ×•×§×™× ×œ× ×ª×§×™×Ÿ</translation>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Discover own IP address (default: 1 when listening and no -externalip)</source>
<translation>גלה ×ת כתובת ×”-IP העצמית (ברירת מחדל: 1 כשמ××–×™× ×™× ×•×œ×œ× -externalip)</translation>
</message>
<message>
+ <location line="+1"/>
+ <source>Do you want to rebuild the block database now?</source>
+ <translation>×”×× ×ª×¨×¦×” כעט לבנות מחדש ×ת מסד נתוני הבלוקי×?</translation>
+ </message>
+ <message>
<location line="+3"/>
+ <source>Error initializing block database</source>
+ <translation>שגי××” ב×תחול מסד נתוני הבלוקי×</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Error initializing wallet database environment %s!</source>
+ <translation>שגי××” ב×תחול סביבת מסד נתוני ×”××¨× ×§×™× %s!</translation>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Error loading block database</source>
- <translation type="unfinished"/>
+ <translation>שגי××” בטעינת מסד נתוני הבלוקי×</translation>
</message>
<message>
- <location line="+5"/>
+ <location line="+4"/>
+ <source>Error opening block database</source>
+ <translation>שגי××” בטעינת מסד נתוני הבלוקי×</translation>
+ </message>
+ <message>
+ <location line="+2"/>
<source>Error: Disk space is low!</source>
- <translation type="unfinished"/>
+ <translation>שגי××”: מעט ×ž×§×•× ×¤× ×•×™ בדיסק!</translation>
</message>
<message>
<location line="+1"/>
@@ -2384,33 +2550,103 @@ rpcpassword=%s
</message>
<message>
<location line="+2"/>
+ <source>Error: system error: </source>
+ <translation>שגי××”: שגי×ת מערכת:</translation>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Failed to listen on any port. Use -listen=0 if you want this.</source>
<translation>×”××–× ×” נכשלה בכל פורט. השתמש ב- -listen=0 ×× ×‘×¨×¦×•× ×š בכך.</translation>
</message>
<message>
+ <location line="+1"/>
+ <source>Failed to read block info</source>
+ <translation>קרי×ת מידע ×”×‘×œ×•×§×™× × ×›×©×œ×”</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Failed to read block</source>
+ <translation>קרי×ת הבלוק נכשלה</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Failed to sync block index</source>
+ <translation>סנכרון ×ינדקס ×”×‘×œ×•×§×™× × ×›×©×œ</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Failed to write block index</source>
+ <translation>כתיבת ×ינדקס ×”×‘×œ×•×§×™× × ×›×©×œ</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Failed to write block info</source>
+ <translation>כתיבת מידע ×”×‘×œ×•×§×™× × ×›×©×œ</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Failed to write block</source>
+ <translation>כתיבת הבלוק נכשלה</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Failed to write file info</source>
+ <translation>כתיבת מידע ×”×§×‘×¦×™× × ×›×©×œ×”</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Failed to write to coin database</source>
+ <translation>כתיבת מסד נתוני המטבעות נכשלה</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Failed to write transaction index</source>
+ <translation>כתיבת ×ינדקס הפעולות נכשלה</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Failed to write undo data</source>
+ <translation>כתיבת נתוני ביטול נכשלה</translation>
+ </message>
+ <message>
<location line="+2"/>
<source>Find peers using DNS lookup (default: 1 unless -connect)</source>
<translation>×ž×¦× ×¢×ž×™×ª×™× ×¢&quot;×™ חיפוש DNS (ברירת מחדל: 1 ×œ×œ× -connect)</translation>
</message>
<message>
- <location line="+5"/>
- <source>How thorough the block verification is (0-4, default: 3)</source>
- <translation type="unfinished"/>
+ <location line="+3"/>
+ <source>How many blocks to check at startup (default: 288, 0 = all)</source>
+ <translation>מספר ×”×‘×œ×•×§×™× ×œ×‘×“×•×§ בעת ×תחול (ברירת מחדל: 288, 0 = כול×)</translation>
</message>
<message>
<location line="+1"/>
- <source>Importing blocks from block database...</source>
- <translation>×ž×™×™×‘× ×‘×œ×•×§×™× ×ž×ž×¡×“ נתוני הבלוקי×...</translation>
+ <source>How thorough the block verification is (0-4, default: 3)</source>
+ <translation>מידת היסודיות של ×ימות ×”×‘×œ×•×§×™× (0-4, ברירת מחדל: 3)</translation>
+ </message>
+ <message>
+ <location line="+24"/>
+ <source>Rebuild block chain index from current blk000??.dat files</source>
+ <translation>בנה מחדש ×ת ×ינדק שרשרת ×”×‘×œ×•×§×™× ×ž×§×‘×¦×™ ×”-blk000??.dat הנוכחיי×.</translation>
+ </message>
+ <message>
+ <location line="+37"/>
+ <source>Verifying blocks...</source>
+ <translation>מ×מת ×ת שלמות מסד הנתוני×...</translation>
</message>
<message>
<location line="+1"/>
+ <source>Verifying wallet...</source>
+ <translation>מ×מת ×ת יושרת ×”×רנק...</translation>
+ </message>
+ <message>
+ <location line="-61"/>
<source>Imports blocks from external blk000??.dat file</source>
- <translation type="unfinished"/>
+ <translation>×ž×™×™×‘× ×‘×œ×•×§×™× ×ž×§×•×‘×¦×™ blk000??.dat חיצוניי×</translation>
</message>
<message>
<location line="+1"/>
<source>Information</source>
- <translation type="unfinished"/>
+ <translation>מידע</translation>
</message>
<message>
<location line="+3"/>
@@ -2418,7 +2654,12 @@ rpcpassword=%s
<translation>כתובת ×œ× ×ª×§×™× ×” ל -tor: &apos;%s&apos;</translation>
</message>
<message>
- <location line="+9"/>
+ <location line="+8"/>
+ <source>Maintain a full transaction index (default: 0)</source>
+ <translation>תחזק ×ינדקס פעולות ×ž×œ× (ברירת מחדל: 0)</translation>
+ </message>
+ <message>
+ <location line="+2"/>
<source>Maximum per-connection receive buffer, &lt;n&gt;*1000 bytes (default: 5000)</source>
<translation>חוצץ קבלה מירבי לכל חיבור, &lt;n&gt;*1000 ×‘×ª×™× (ברירת מחדל: 5000)</translation>
</message>
@@ -2430,7 +2671,7 @@ rpcpassword=%s
<message>
<location line="+1"/>
<source>Only accept block chain matching built-in checkpoints (default: 1)</source>
- <translation type="unfinished"/>
+ <translation>קבל רק שרשרת ×‘×œ×•×§×™× ×”×ª×•×מת נקודות ביקורת מובנות (ברירת מחדל: 1)</translation>
</message>
<message>
<location line="+1"/>
@@ -2453,12 +2694,7 @@ rpcpassword=%s
<translation>הוסף חותמת זמן לפני פלט דיב××’</translation>
</message>
<message>
- <location line="+1"/>
- <source>Rebuild blockchain index from current blk000??.dat files</source>
- <translation>בנה מחדש ×ת ×ינדקס שרשרת ×”×‘×œ×•×§×™× ×ž×§×•×‘×¦×™ blk000??.dat הנוכחיי×</translation>
- </message>
- <message>
- <location line="+4"/>
+ <location line="+5"/>
<source>SSL options: (see the Bitcoin Wiki for SSL setup instructions)</source>
<translation>×פשרויות SSL: (ר××” ×ת הויקי של ביטקוין עבור הור×ות הגדרת SSL)</translation>
</message>
@@ -2498,7 +2734,12 @@ rpcpassword=%s
<translation>ציין הגבלת זמן לחיבור במילישניות (ברירת מחדל: 5000)</translation>
</message>
<message>
- <location line="+13"/>
+ <location line="+4"/>
+ <source>System error: </source>
+ <translation>שגי×ת מערכת:</translation>
+ </message>
+ <message>
+ <location line="+10"/>
<source>Use UPnP to map the listening port (default: 0)</source>
<translation>השתמש ב-UPnP כדי למפות ×ת הפורט לה××–× ×” (ברירת מחדל: 0)</translation>
</message>
@@ -2520,7 +2761,7 @@ rpcpassword=%s
<message>
<location line="+4"/>
<source>Warning</source>
- <translation type="unfinished"/>
+ <translation>×זהרה</translation>
</message>
<message>
<location line="+1"/>
@@ -2529,36 +2770,41 @@ rpcpassword=%s
</message>
<message>
<location line="+1"/>
+ <source>You need to rebuild the databases using -reindex to change -txindex</source>
+ <translation>עליך לבנות מחדש ×ת מסדי ×”× ×ª×•× ×™× ×ª×•×š שימוש ב- -reindex על מנת לשנות ×ת -txindex</translation>
+ </message>
+ <message>
+ <location line="+1"/>
<source>wallet.dat corrupt, salvage failed</source>
<translation>קובץ wallet.dat מושחת, החילוץ נכשל</translation>
</message>
<message>
- <location line="-43"/>
+ <location line="-45"/>
<source>Password for JSON-RPC connections</source>
<translation>סיסמה לחיבורי JSON-RPC</translation>
</message>
<message>
- <location line="-53"/>
+ <location line="-68"/>
<source>Allow JSON-RPC connections from specified IP address</source>
<translation>×פשר חיבורי JSON-RPC מכתובת ×”×ינטרנט המצוינת</translation>
</message>
<message>
- <location line="+62"/>
+ <location line="+77"/>
<source>Send commands to node running on &lt;ip&gt; (default: 127.0.0.1)</source>
<translation>שלח פקודות לצומת ב-&lt;ip&gt; (ברירת מחדל: 127.0.0.1)</translation>
</message>
<message>
- <location line="-103"/>
+ <location line="-120"/>
<source>Execute command when the best block changes (%s in cmd is replaced by block hash)</source>
<translation>בצע פקודה זו כשהבלוק הטוב ביותר משתנה (%s בפקודה יוחלף בגיבוב הבלוק)</translation>
</message>
<message>
- <location line="+124"/>
+ <location line="+142"/>
<source>Upgrade wallet to latest format</source>
<translation>שדרג ×ת ×”×רנק לפורמט העדכני</translation>
</message>
<message>
- <location line="-15"/>
+ <location line="-16"/>
<source>Set key pool size to &lt;n&gt; (default: 100)</source>
<translation>קבע ×ת גודל המ×גר ל -&lt;n&gt; (ברירת מחדל: 100)</translation>
</message>
@@ -2568,17 +2814,12 @@ rpcpassword=%s
<translation>סרוק מחדש ×ת שרשרת ×”×‘×œ×•×§×™× ×œ×ž×¦×™×ת פעולות חסרות ב×רנק</translation>
</message>
<message>
- <location line="-26"/>
- <source>How many blocks to check at startup (default: 2500, 0 = all)</source>
- <translation>מספר ×”×‘×œ×•×§×™× ×œ×‘×“×•×§ בעת ההפעלה (ברירת מחדל: 2500, 0=כול×)</translation>
- </message>
- <message>
- <location line="+55"/>
+ <location line="+30"/>
<source>Use OpenSSL (https) for JSON-RPC connections</source>
<translation>השתמש ב-OpenSSL (https( עבור חיבורי JSON-RPC</translation>
</message>
<message>
- <location line="-20"/>
+ <location line="-21"/>
<source>Server certificate file (default: server.cert)</source>
<translation>קובץ תעודת שרת (ברירת מחדל: server.cert)</translation>
</message>
@@ -2588,12 +2829,12 @@ rpcpassword=%s
<translation>מפתח פרטי של השרת (ברירת מחדל: server.pem)</translation>
</message>
<message>
- <location line="-133"/>
+ <location line="-154"/>
<source>Acceptable ciphers (default: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH)</source>
<translation>×¦×¤× ×™× ×§×‘×™×œ×™× (ברירת מחדל: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH)</translation>
</message>
<message>
- <location line="+144"/>
+ <location line="+166"/>
<source>This help message</source>
<translation>הודעת העזרה הזו</translation>
</message>
@@ -2603,7 +2844,7 @@ rpcpassword=%s
<translation>×œ× ×ž×¡×•×’×œ לקשור ל-%s במחשב ×–×” (הקשירה החזירה שגי××” %d, %s)</translation>
</message>
<message>
- <location line="-70"/>
+ <location line="-86"/>
<source>Connect through socks proxy</source>
<translation>התחבר דרך פרוקסי SOCKS</translation>
</message>
@@ -2613,12 +2854,12 @@ rpcpassword=%s
<translation>×פשר בדיקת DNS עבור -addnode, -seednode ו- -connect</translation>
</message>
<message>
- <location line="+43"/>
+ <location line="+57"/>
<source>Loading addresses...</source>
<translation>טוען כתובות...</translation>
</message>
<message>
- <location line="-25"/>
+ <location line="-35"/>
<source>Error loading wallet.dat: Wallet corrupted</source>
<translation>שגי××” בטעינת הקובץ wallet.dat: ×”×רנק מושחת</translation>
</message>
@@ -2628,32 +2869,22 @@ rpcpassword=%s
<translation>שגי××” בטעינת הקובץ wallet.dat: ×”×רנק דורש גרסה חדשה יותר של ביטקוין</translation>
</message>
<message>
- <location line="+73"/>
- <source>Verifying block database integrity...</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+1"/>
- <source>Verifying wallet integrity...</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+1"/>
+ <location line="+87"/>
<source>Wallet needed to be rewritten: restart Bitcoin to complete</source>
<translation>יש לכתוב מחדש ×ת ×”×רנק: ×תחל ×ת ביטקוין לסיו×</translation>
</message>
<message>
- <location line="-77"/>
+ <location line="-89"/>
<source>Error loading wallet.dat</source>
<translation>שגי××” בטעינת הקובץ wallet.dat</translation>
</message>
<message>
- <location line="+20"/>
+ <location line="+30"/>
<source>Invalid -proxy address: &apos;%s&apos;</source>
<translation>כתובת -proxy ×œ× ×ª×§×™× ×”: &apos;%s&apos;</translation>
</message>
<message>
- <location line="+46"/>
+ <location line="+48"/>
<source>Unknown network specified in -onlynet: &apos;%s&apos;</source>
<translation>רשת ×œ× ×™×“×•×¢×” צוינה ב- -onlynet: &apos;%s&apos;</translation>
</message>
@@ -2663,7 +2894,7 @@ rpcpassword=%s
<translation>התבקשה גרסת פרוקסי -socks ×œ× ×™×“×•×¢×”: %i</translation>
</message>
<message>
- <location line="-75"/>
+ <location line="-91"/>
<source>Cannot resolve -bind address: &apos;%s&apos;</source>
<translation>×œ× ×ž×¡×•×’×œ לפתור כתובת -bind: &apos;%s&apos;</translation>
</message>
@@ -2673,17 +2904,17 @@ rpcpassword=%s
<translation>×œ× ×ž×¡×•×’×œ לפתור כתובת -externalip: &apos;%s&apos;</translation>
</message>
<message>
- <location line="+31"/>
+ <location line="+45"/>
<source>Invalid amount for -paytxfee=&lt;amount&gt;: &apos;%s&apos;</source>
<translation>כמות ×œ× ×ª×§×™× ×” עבור -paytxfee=&lt;amount&gt;: &apos;%s&apos;</translation>
</message>
<message>
- <location line="-15"/>
+ <location line="-24"/>
<source>Error: could not start node</source>
<translation>שגי××”: ×œ× × ×™×ª×Ÿ להתחיל צומת</translation>
</message>
<message>
- <location line="+16"/>
+ <location line="+25"/>
<source>Invalid amount</source>
<translation>כמות ×œ× ×ª×§×™× ×”</translation>
</message>
@@ -2698,7 +2929,7 @@ rpcpassword=%s
<translation>טוען ×ת ×ינדקס הבלוקי×...</translation>
</message>
<message>
- <location line="-45"/>
+ <location line="-59"/>
<source>Add a node to connect to and attempt to keep the connection open</source>
<translation>הוסף צומת להתחברות ונסה לשמור ×ת החיבור פתוח</translation>
</message>
@@ -2708,22 +2939,17 @@ rpcpassword=%s
<translation>×œ× × ×™×ª×Ÿ לקשור ל-%s במחשב ×–×”. ביטקוין כנר××” עדיין רץ.</translation>
</message>
<message>
- <location line="+54"/>
- <source>Find peers using internet relay chat (default: 0)</source>
- <translation>×ž×¦× ×¢×ž×™×ª×™× ×ª×•×š שימוש ב-IRC (ברירת מחדל: 0)</translation>
- </message>
- <message>
- <location line="-2"/>
+ <location line="+68"/>
<source>Fee per KB to add to transactions you send</source>
<translation>עמלה להוסיף לפעולות ש×תה שולח עבור כל KB</translation>
</message>
<message>
- <location line="+19"/>
+ <location line="+17"/>
<source>Loading wallet...</source>
<translation>טוען ×רנק...</translation>
</message>
<message>
- <location line="-40"/>
+ <location line="-54"/>
<source>Cannot downgrade wallet</source>
<translation>×œ× ×™×›×•×œ להוריד דרגת ×”×רנק</translation>
</message>
@@ -2738,27 +2964,27 @@ rpcpassword=%s
<translation>×œ× ×™×›×•×œ לכתוב ×ת כתובת ברירת המחדל</translation>
</message>
<message>
- <location line="+49"/>
+ <location line="+64"/>
<source>Rescanning...</source>
<translation>סורק מחדש...</translation>
</message>
<message>
- <location line="-43"/>
+ <location line="-56"/>
<source>Done loading</source>
<translation>טעינה הושלמה</translation>
</message>
<message>
- <location line="+65"/>
+ <location line="+79"/>
<source>To use the %s option</source>
<translation>להשתמש ב×פשרות %s</translation>
</message>
<message>
- <location line="-60"/>
+ <location line="-71"/>
<source>Error</source>
<translation>שגי××”</translation>
</message>
<message>
- <location line="-28"/>
+ <location line="-33"/>
<source>You must set rpcpassword=&lt;password&gt; in the configuration file:
%s
If the file does not exist, create it with owner-readable-only file permissions.</source>
diff --git a/src/qt/locale/bitcoin_hi_IN.ts b/src/qt/locale/bitcoin_hi_IN.ts
index 304be77f3e..14c19506c2 100644
--- a/src/qt/locale/bitcoin_hi_IN.ts
+++ b/src/qt/locale/bitcoin_hi_IN.ts
@@ -13,12 +13,7 @@
<translation>बिटकोइन वरà¥à¤¸à¤¨</translation>
</message>
<message>
- <location line="+41"/>
- <source>Copyright © 2009-2012 The Bitcoin developers</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+13"/>
+ <location line="+57"/>
<source>
This is experimental software.
@@ -27,6 +22,16 @@ Distributed under the MIT/X11 software license, see the accompanying file COPYIN
This product includes software developed by the OpenSSL Project for use in the OpenSSL Toolkit (http://www.openssl.org/) and cryptographic software written by Eric Young (eay@cryptsoft.com) and UPnP software written by Thomas Bernard.</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../aboutdialog.cpp" line="+17"/>
+ <source>Copyright</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>2009-%1 The Bitcoin developers</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>AddressBookPage</name>
@@ -101,17 +106,22 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation type="unfinished"/>
</message>
<message>
- <location filename="../addressbookpage.cpp" line="+65"/>
+ <location filename="../addressbookpage.cpp" line="+66"/>
<source>Copy &amp;Label</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+2"/>
+ <location line="+1"/>
<source>&amp;Edit</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+250"/>
+ <location line="+1"/>
+ <source>Send &amp;Coins</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+263"/>
<source>Export Address Book Data</source>
<translation type="unfinished"/>
</message>
@@ -134,7 +144,7 @@ This product includes software developed by the OpenSSL Project for use in the O
<context>
<name>AddressTableModel</name>
<message>
- <location filename="../addresstablemodel.cpp" line="+142"/>
+ <location filename="../addresstablemodel.cpp" line="+144"/>
<source>Label</source>
<translation type="unfinished"/>
</message>
@@ -293,17 +303,17 @@ This product includes software developed by the OpenSSL Project for use in the O
<context>
<name>BitcoinGUI</name>
<message>
- <location filename="../bitcoingui.cpp" line="+267"/>
+ <location filename="../bitcoingui.cpp" line="+231"/>
<source>Sign &amp;message...</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+254"/>
+ <location line="+299"/>
<source>Synchronizing with network...</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-322"/>
+ <location line="-367"/>
<source>&amp;Overview</source>
<translation type="unfinished"/>
</message>
@@ -323,32 +333,17 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation type="unfinished"/>
</message>
<message>
- <location line="+6"/>
- <source>&amp;Address Book</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+1"/>
+ <location line="+7"/>
<source>Edit the list of stored addresses and labels</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-15"/>
- <source>&amp;Receive coins</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+1"/>
+ <location line="-14"/>
<source>Show the list of addresses for receiving payments</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-8"/>
- <source>&amp;Send coins</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+39"/>
+ <location line="+31"/>
<source>E&amp;xit</source>
<translation type="unfinished"/>
</message>
@@ -393,7 +388,7 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation type="unfinished"/>
</message>
<message>
- <location line="+259"/>
+ <location line="+304"/>
<source>Importing blocks from disk...</source>
<translation type="unfinished"/>
</message>
@@ -402,13 +397,8 @@ This product includes software developed by the OpenSSL Project for use in the O
<source>Reindexing blocks on disk...</source>
<translation type="unfinished"/>
</message>
- <message numerus="yes">
- <location line="+10"/>
- <source>~%n block(s) remaining</source>
- <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
- </message>
<message>
- <location line="-265"/>
+ <location line="-300"/>
<source>&amp;Export...</source>
<translation type="unfinished"/>
</message>
@@ -453,18 +443,33 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation type="unfinished"/>
</message>
<message>
- <location line="-196"/>
- <location line="+538"/>
+ <location line="-162"/>
+ <location line="+540"/>
<source>Bitcoin</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-538"/>
+ <location line="-540"/>
<source>Wallet</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+176"/>
+ <location line="+99"/>
+ <source>&amp;Send</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+7"/>
+ <source>&amp;Receive</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+14"/>
+ <source>&amp;Addresses</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+22"/>
<source>&amp;About Bitcoin</source>
<translation type="unfinished"/>
</message>
@@ -525,97 +530,92 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation type="unfinished"/>
</message>
<message>
- <location line="+63"/>
+ <location line="+47"/>
<source>Bitcoin client</source>
<translation type="unfinished"/>
</message>
<message numerus="yes">
- <location line="+79"/>
+ <location line="+140"/>
<source>%n active connection(s) to Bitcoin network</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message>
- <location line="+45"/>
- <source>Processed %1 of %2 blocks of transaction history (%3% done).</source>
+ <location line="+39"/>
+ <source>Processed %1 of %2 (estimated) blocks of transaction history.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+7"/>
+ <location line="+4"/>
<source>Processed %1 blocks of transaction history.</source>
<translation type="unfinished"/>
</message>
+ <message numerus="yes">
+ <location line="+20"/>
+ <source>%n hour(s)</source>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
+ <message numerus="yes">
+ <location line="+4"/>
+ <source>%n day(s)</source>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
+ <message numerus="yes">
+ <location line="+4"/>
+ <source>%n week(s)</source>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
<message>
- <location line="+70"/>
- <source>Error</source>
+ <location line="+5"/>
+ <source>%1 behind</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+3"/>
- <source>Warning</source>
+ <location line="+14"/>
+ <source>Last received block was generated %1 ago.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+3"/>
- <source>Information</source>
+ <location line="+2"/>
+ <source>Transactions after this will not yet be visible.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+66"/>
- <source>This transaction is over the size limit. You can still send it for a fee of %1, which goes to the nodes that process your transaction and helps to support the network. Do you want to pay the fee?</source>
+ <location line="+21"/>
+ <source>Error</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+210"/>
- <source>Backup Successful</source>
+ <location line="+3"/>
+ <source>Warning</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+0"/>
- <source>The wallet data was successfully saved to the new location.</source>
+ <location line="+3"/>
+ <source>Information</source>
<translation type="unfinished"/>
</message>
- <message numerus="yes">
- <location line="-338"/>
- <source>%n second(s) ago</source>
- <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
- </message>
- <message numerus="yes">
- <location line="+4"/>
- <source>%n minute(s) ago</source>
- <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
- </message>
- <message numerus="yes">
- <location line="+4"/>
- <source>%n hour(s) ago</source>
- <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
- </message>
- <message numerus="yes">
- <location line="+4"/>
- <source>%n day(s) ago</source>
- <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
- </message>
<message>
- <location line="+6"/>
- <source>Up to date</source>
+ <location line="+68"/>
+ <source>This transaction is over the size limit. You can still send it for a fee of %1, which goes to the nodes that process your transaction and helps to support the network. Do you want to pay the fee?</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+7"/>
- <source>Catching up...</source>
+ <location line="-138"/>
+ <source>Up to date</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+10"/>
- <source>Last received block was generated %1.</source>
+ <location line="+32"/>
+ <source>Catching up...</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+97"/>
+ <location line="+110"/>
<source>Confirm transaction fee</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+23"/>
+ <location line="+8"/>
<source>Sent transaction</source>
<translation type="unfinished"/>
</message>
@@ -634,14 +634,14 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+99"/>
- <location line="+28"/>
+ <location line="+33"/>
+ <location line="+23"/>
<source>URI handling</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-28"/>
- <location line="+28"/>
+ <location line="-23"/>
+ <location line="+23"/>
<source>URI can not be parsed! This can be caused by an invalid Bitcoin address or malformed URI parameters.</source>
<translation type="unfinished"/>
</message>
@@ -656,27 +656,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+23"/>
- <source>Backup Wallet</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+0"/>
- <source>Wallet Data (*.dat)</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+3"/>
- <source>Backup Failed</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+0"/>
- <source>There was an error trying to save the wallet data to the new location.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../bitcoin.cpp" line="+109"/>
+ <location filename="../bitcoin.cpp" line="+108"/>
<source>A fatal error occurred. Bitcoin can no longer continue safely and will quit.</source>
<translation type="unfinished"/>
</message>
@@ -684,7 +664,7 @@ Address: %4
<context>
<name>ClientModel</name>
<message>
- <location filename="../clientmodel.cpp" line="+86"/>
+ <location filename="../clientmodel.cpp" line="+96"/>
<source>Network Alert</source>
<translation type="unfinished"/>
</message>
@@ -717,7 +697,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location filename="../editaddressdialog.cpp" line="+20"/>
+ <location filename="../editaddressdialog.cpp" line="+21"/>
<source>New receiving address</source>
<translation type="unfinished"/>
</message>
@@ -737,17 +717,17 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+60"/>
+ <location line="+76"/>
<source>The entered address &quot;%1&quot; is already in the address book.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+5"/>
+ <location line="-5"/>
<source>The entered address &quot;%1&quot; is not a valid Bitcoin address.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+5"/>
+ <location line="+10"/>
<source>Could not unlock wallet.</source>
<translation type="unfinished"/>
</message>
@@ -760,7 +740,7 @@ Address: %4
<context>
<name>GUIUtil::HelpMessageBox</name>
<message>
- <location filename="../guiutil.cpp" line="+419"/>
+ <location filename="../guiutil.cpp" line="+422"/>
<location line="+12"/>
<source>Bitcoin-Qt</source>
<translation type="unfinished"/>
@@ -974,7 +954,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location filename="../optionsdialog.cpp" line="+55"/>
+ <location filename="../optionsdialog.cpp" line="+53"/>
<source>default</source>
<translation type="unfinished"/>
</message>
@@ -1019,23 +999,18 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+51"/>
- <location line="+183"/>
+ <location line="+50"/>
+ <location line="+166"/>
<source>The displayed information may be out of date. Your wallet automatically synchronizes with the Bitcoin network after a connection is established, but this process has not completed yet.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-141"/>
+ <location line="-124"/>
<source>Balance:</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+58"/>
- <source>Number of transactions:</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="-29"/>
+ <location line="+29"/>
<source>Unconfirmed:</source>
<translation type="unfinished"/>
</message>
@@ -1045,7 +1020,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+124"/>
+ <location line="+107"/>
<source>Immature:</source>
<translation type="unfinished"/>
</message>
@@ -1060,7 +1035,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="-118"/>
+ <location line="-101"/>
<source>Your current balance</source>
<translation type="unfinished"/>
</message>
@@ -1070,11 +1045,6 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+20"/>
- <source>Total number of transactions in wallet</source>
- <translation type="unfinished"/>
- </message>
- <message>
<location filename="../overviewpage.cpp" line="+115"/>
<location line="+1"/>
<source>out of sync</source>
@@ -1082,6 +1052,14 @@ Address: %4
</message>
</context>
<context>
+ <name>PaymentServer</name>
+ <message>
+ <location filename="../paymentserver.cpp" line="+107"/>
+ <source>Cannot start bitcoin: click-to-pay handler</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>QRCodeDialog</name>
<message>
<location filename="../forms/qrcodedialog.ui" line="+14"/>
@@ -1420,7 +1398,7 @@ Address: %4
</message>
<message>
<location line="+60"/>
- <location filename="../sendcoinsentry.cpp" line="+25"/>
+ <location filename="../sendcoinsentry.cpp" line="+26"/>
<source>Enter a label for this address to add it to your address book</source>
<translation type="unfinished"/>
</message>
@@ -1656,7 +1634,7 @@ Address: %4
<context>
<name>TransactionDesc</name>
<message>
- <location filename="../transactiondesc.cpp" line="+19"/>
+ <location filename="../transactiondesc.cpp" line="+20"/>
<source>Open until %1</source>
<translation type="unfinished"/>
</message>
@@ -1688,7 +1666,7 @@ Address: %4
<message>
<location line="+4"/>
<source>Date</source>
- <translation type="unfinished"/>
+ <translation>taareek</translation>
</message>
<message>
<location line="+7"/>
@@ -1843,9 +1821,9 @@ Address: %4
<context>
<name>TransactionTableModel</name>
<message>
- <location filename="../transactiontablemodel.cpp" line="+226"/>
+ <location filename="../transactiontablemodel.cpp" line="+225"/>
<source>Date</source>
- <translation type="unfinished"/>
+ <translation>taareek</translation>
</message>
<message>
<location line="+0"/>
@@ -1961,7 +1939,7 @@ Address: %4
<context>
<name>TransactionView</name>
<message>
- <location filename="../transactionview.cpp" line="+55"/>
+ <location filename="../transactionview.cpp" line="+52"/>
<location line="+16"/>
<source>All</source>
<translation type="unfinished"/>
@@ -2048,6 +2026,11 @@ Address: %4
</message>
<message>
<location line="+1"/>
+ <source>Copy transaction ID</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Edit label</source>
<translation type="unfinished"/>
</message>
@@ -2057,7 +2040,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+142"/>
+ <location line="+139"/>
<source>Export Transaction Data</source>
<translation type="unfinished"/>
</message>
@@ -2074,7 +2057,7 @@ Address: %4
<message>
<location line="+1"/>
<source>Date</source>
- <translation type="unfinished"/>
+ <translation>taareek</translation>
</message>
<message>
<location line="+1"/>
@@ -2112,7 +2095,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+95"/>
+ <location line="+100"/>
<source>Range:</source>
<translation type="unfinished"/>
</message>
@@ -2123,29 +2106,172 @@ Address: %4
</message>
</context>
<context>
+ <name>WalletView</name>
+ <message>
+ <location filename="../walletview.cpp" line="+95"/>
+ <source>&amp;Overview</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Show general overview of wallet</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>&amp;Send coins</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Send coins to a Bitcoin address</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>&amp;Receive coins</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Show the list of addresses for receiving payments</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>&amp;Transactions</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Browse transaction history</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>&amp;Address Book</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Edit the list of stored addresses and labels</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+12"/>
+ <source>&amp;Encrypt Wallet...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Encrypt the private keys that belong to your wallet</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>&amp;Backup Wallet...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Backup wallet to another location</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>&amp;Change Passphrase...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Change the passphrase used for wallet encryption</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Sign &amp;message...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Sign messages with your Bitcoin addresses to prove you own them</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>&amp;Verify message...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Verify messages to ensure they were signed with specified Bitcoin addresses</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>&amp;Export...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Export the data in the current tab to a file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+180"/>
+ <source>Backup Wallet</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>Wallet Data (*.dat)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Backup Failed</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>There was an error trying to save the wallet data to the new location.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>Backup Successful</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>The wallet data was successfully saved to the new location.</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>bitcoin-core</name>
<message>
- <location filename="../bitcoinstrings.cpp" line="+88"/>
+ <location filename="../bitcoinstrings.cpp" line="+96"/>
<source>Bitcoin version</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+82"/>
+ <location line="+98"/>
<source>Usage:</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-23"/>
+ <location line="-24"/>
<source>Send command to -server or bitcoind</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-21"/>
+ <location line="-22"/>
<source>List commands</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-11"/>
+ <location line="-10"/>
<source>Get help for a command</source>
<translation type="unfinished"/>
</message>
@@ -2170,12 +2296,12 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="-15"/>
+ <location line="-28"/>
<source>Don&apos;t generate coins</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+61"/>
+ <location line="+74"/>
<source>Specify data directory</source>
<translation type="unfinished"/>
</message>
@@ -2185,80 +2311,82 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="-26"/>
+ <location line="-27"/>
<source>Listen for connections on &lt;port&gt; (default: 8333 or testnet: 18333)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+4"/>
+ <location line="+5"/>
<source>Maintain at most &lt;n&gt; connections to peers (default: 125)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-34"/>
+ <location line="-49"/>
<source>Connect to a node to retrieve peer addresses, and disconnect</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+65"/>
+ <location line="+80"/>
<source>Specify your own public address</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+2"/>
+ <location line="+3"/>
<source>Threshold for disconnecting misbehaving peers (default: 100)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-114"/>
+ <location line="-132"/>
<source>Number of seconds to keep misbehaving peers from reconnecting (default: 86400)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-28"/>
+ <location line="-32"/>
<source>An error occurred while setting up the RPC port %u for listening on IPv4: %s</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+26"/>
+ <location line="+30"/>
<source>Listen for JSON-RPC connections on &lt;port&gt; (default: 8332 or testnet: 18332)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+34"/>
+ <location line="+36"/>
<source>Accept command line and JSON-RPC commands</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+62"/>
+ <location line="+77"/>
<source>Run in the background as a daemon and accept commands</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+31"/>
+ <location line="+32"/>
<source>Use the test network</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-92"/>
+ <location line="-108"/>
<source>Accept connections from outside (default: 1 if no -proxy or -connect)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-74"/>
+ <location line="-82"/>
<source>%s, you must set a rpcpassword in the configuration file:
- %s
+%s
It is recommended you use the following random password:
rpcuser=bitcoinrpc
rpcpassword=%s
(you do not need to remember this password)
The username and password MUST NOT be the same.
If the file does not exist, create it with owner-readable-only file permissions.
+It is also recommended to set alertnotify so you are notified of problems;
+for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.com
</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+15"/>
+ <location line="+17"/>
<source>An error occurred while setting up the RPC port %u for listening on IPv6, falling back to IPv4: %s</source>
<translation type="unfinished"/>
</message>
@@ -2274,11 +2402,6 @@ If the file does not exist, create it with owner-readable-only file permissions.
</message>
<message>
<location line="+3"/>
- <source>Corrupted block database detected. Please restart the client with -reindex.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+2"/>
<source>Error initializing database environment %s! To recover, BACKUP THAT DIRECTORY, then remove everything from it except for wallet.dat.</source>
<translation type="unfinished"/>
</message>
@@ -2293,12 +2416,27 @@ If the file does not exist, create it with owner-readable-only file permissions.
<translation type="unfinished"/>
</message>
<message>
+ <location line="+3"/>
+ <source>Execute command when a relevant alert is received (%s in cmd is replaced by message)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Execute command when a wallet transaction changes (%s in cmd is replaced by TxID)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location line="+11"/>
<source>Set maximum size of high-priority/low-fee transactions in bytes (default: 27000)</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+3"/>
+ <source>Set the number of script verification threads (1-16, 0=auto, default: 0)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
<source>This is a pre-release test build - use at your own risk - do not use for mining or merchant applications</source>
<translation type="unfinished"/>
</message>
@@ -2344,16 +2482,41 @@ If the file does not exist, create it with owner-readable-only file permissions.
</message>
<message>
<location line="+3"/>
+ <source>Corrupted block database detected</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Discover own IP address (default: 1 when listening and no -externalip)</source>
<translation type="unfinished"/>
</message>
<message>
+ <location line="+1"/>
+ <source>Do you want to rebuild the block database now?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location line="+3"/>
+ <source>Error initializing block database</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Error initializing wallet database environment %s!</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Error loading block database</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+5"/>
+ <location line="+4"/>
+ <source>Error opening block database</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
<source>Error: Disk space is low!</source>
<translation type="unfinished"/>
</message>
@@ -2369,26 +2532,96 @@ If the file does not exist, create it with owner-readable-only file permissions.
</message>
<message>
<location line="+2"/>
+ <source>Error: system error: </source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Failed to listen on any port. Use -listen=0 if you want this.</source>
<translation type="unfinished"/>
</message>
<message>
+ <location line="+1"/>
+ <source>Failed to read block info</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Failed to read block</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Failed to sync block index</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Failed to write block index</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Failed to write block info</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Failed to write block</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Failed to write file info</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Failed to write to coin database</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Failed to write transaction index</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Failed to write undo data</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location line="+2"/>
<source>Find peers using DNS lookup (default: 1 unless -connect)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+5"/>
- <source>How thorough the block verification is (0-4, default: 3)</source>
+ <location line="+3"/>
+ <source>How many blocks to check at startup (default: 288, 0 = all)</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+1"/>
- <source>Importing blocks from block database...</source>
+ <source>How thorough the block verification is (0-4, default: 3)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+24"/>
+ <source>Rebuild block chain index from current blk000??.dat files</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+37"/>
+ <source>Verifying blocks...</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+1"/>
+ <source>Verifying wallet...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-61"/>
<source>Imports blocks from external blk000??.dat file</source>
<translation type="unfinished"/>
</message>
@@ -2403,7 +2636,12 @@ If the file does not exist, create it with owner-readable-only file permissions.
<translation type="unfinished"/>
</message>
<message>
- <location line="+9"/>
+ <location line="+8"/>
+ <source>Maintain a full transaction index (default: 0)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
<source>Maximum per-connection receive buffer, &lt;n&gt;*1000 bytes (default: 5000)</source>
<translation type="unfinished"/>
</message>
@@ -2438,12 +2676,7 @@ If the file does not exist, create it with owner-readable-only file permissions.
<translation type="unfinished"/>
</message>
<message>
- <location line="+1"/>
- <source>Rebuild blockchain index from current blk000??.dat files</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+4"/>
+ <location line="+5"/>
<source>SSL options: (see the Bitcoin Wiki for SSL setup instructions)</source>
<translation type="unfinished"/>
</message>
@@ -2483,7 +2716,12 @@ If the file does not exist, create it with owner-readable-only file permissions.
<translation type="unfinished"/>
</message>
<message>
- <location line="+13"/>
+ <location line="+4"/>
+ <source>System error: </source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+10"/>
<source>Use UPnP to map the listening port (default: 0)</source>
<translation type="unfinished"/>
</message>
@@ -2514,36 +2752,41 @@ If the file does not exist, create it with owner-readable-only file permissions.
</message>
<message>
<location line="+1"/>
+ <source>You need to rebuild the databases using -reindex to change -txindex</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>wallet.dat corrupt, salvage failed</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-43"/>
+ <location line="-45"/>
<source>Password for JSON-RPC connections</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-53"/>
+ <location line="-68"/>
<source>Allow JSON-RPC connections from specified IP address</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+62"/>
+ <location line="+77"/>
<source>Send commands to node running on &lt;ip&gt; (default: 127.0.0.1)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-103"/>
+ <location line="-120"/>
<source>Execute command when the best block changes (%s in cmd is replaced by block hash)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+124"/>
+ <location line="+142"/>
<source>Upgrade wallet to latest format</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-15"/>
+ <location line="-16"/>
<source>Set key pool size to &lt;n&gt; (default: 100)</source>
<translation type="unfinished"/>
</message>
@@ -2553,17 +2796,12 @@ If the file does not exist, create it with owner-readable-only file permissions.
<translation type="unfinished"/>
</message>
<message>
- <location line="-26"/>
- <source>How many blocks to check at startup (default: 2500, 0 = all)</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+55"/>
+ <location line="+30"/>
<source>Use OpenSSL (https) for JSON-RPC connections</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-20"/>
+ <location line="-21"/>
<source>Server certificate file (default: server.cert)</source>
<translation type="unfinished"/>
</message>
@@ -2573,12 +2811,12 @@ If the file does not exist, create it with owner-readable-only file permissions.
<translation type="unfinished"/>
</message>
<message>
- <location line="-133"/>
+ <location line="-154"/>
<source>Acceptable ciphers (default: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+144"/>
+ <location line="+166"/>
<source>This help message</source>
<translation type="unfinished"/>
</message>
@@ -2588,7 +2826,7 @@ If the file does not exist, create it with owner-readable-only file permissions.
<translation type="unfinished"/>
</message>
<message>
- <location line="-70"/>
+ <location line="-86"/>
<source>Connect through socks proxy</source>
<translation type="unfinished"/>
</message>
@@ -2598,12 +2836,12 @@ If the file does not exist, create it with owner-readable-only file permissions.
<translation type="unfinished"/>
</message>
<message>
- <location line="+43"/>
+ <location line="+57"/>
<source>Loading addresses...</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-25"/>
+ <location line="-35"/>
<source>Error loading wallet.dat: Wallet corrupted</source>
<translation type="unfinished"/>
</message>
@@ -2613,32 +2851,22 @@ If the file does not exist, create it with owner-readable-only file permissions.
<translation type="unfinished"/>
</message>
<message>
- <location line="+73"/>
- <source>Verifying block database integrity...</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+1"/>
- <source>Verifying wallet integrity...</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+1"/>
+ <location line="+87"/>
<source>Wallet needed to be rewritten: restart Bitcoin to complete</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-77"/>
+ <location line="-89"/>
<source>Error loading wallet.dat</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+20"/>
+ <location line="+30"/>
<source>Invalid -proxy address: &apos;%s&apos;</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+46"/>
+ <location line="+48"/>
<source>Unknown network specified in -onlynet: &apos;%s&apos;</source>
<translation type="unfinished"/>
</message>
@@ -2648,7 +2876,7 @@ If the file does not exist, create it with owner-readable-only file permissions.
<translation type="unfinished"/>
</message>
<message>
- <location line="-75"/>
+ <location line="-91"/>
<source>Cannot resolve -bind address: &apos;%s&apos;</source>
<translation type="unfinished"/>
</message>
@@ -2658,17 +2886,17 @@ If the file does not exist, create it with owner-readable-only file permissions.
<translation type="unfinished"/>
</message>
<message>
- <location line="+31"/>
+ <location line="+45"/>
<source>Invalid amount for -paytxfee=&lt;amount&gt;: &apos;%s&apos;</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-15"/>
+ <location line="-24"/>
<source>Error: could not start node</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+16"/>
+ <location line="+25"/>
<source>Invalid amount</source>
<translation type="unfinished"/>
</message>
@@ -2683,7 +2911,7 @@ If the file does not exist, create it with owner-readable-only file permissions.
<translation type="unfinished"/>
</message>
<message>
- <location line="-45"/>
+ <location line="-59"/>
<source>Add a node to connect to and attempt to keep the connection open</source>
<translation type="unfinished"/>
</message>
@@ -2693,22 +2921,17 @@ If the file does not exist, create it with owner-readable-only file permissions.
<translation type="unfinished"/>
</message>
<message>
- <location line="+54"/>
- <source>Find peers using internet relay chat (default: 0)</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="-2"/>
+ <location line="+68"/>
<source>Fee per KB to add to transactions you send</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+19"/>
+ <location line="+17"/>
<source>Loading wallet...</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-40"/>
+ <location line="-54"/>
<source>Cannot downgrade wallet</source>
<translation type="unfinished"/>
</message>
@@ -2723,27 +2946,27 @@ If the file does not exist, create it with owner-readable-only file permissions.
<translation type="unfinished"/>
</message>
<message>
- <location line="+49"/>
+ <location line="+64"/>
<source>Rescanning...</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-43"/>
+ <location line="-56"/>
<source>Done loading</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+65"/>
+ <location line="+79"/>
<source>To use the %s option</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-60"/>
+ <location line="-71"/>
<source>Error</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-28"/>
+ <location line="-33"/>
<source>You must set rpcpassword=&lt;password&gt; in the configuration file:
%s
If the file does not exist, create it with owner-readable-only file permissions.</source>
diff --git a/src/qt/locale/bitcoin_hr.ts b/src/qt/locale/bitcoin_hr.ts
index f4b47ce9b9..392281e851 100644
--- a/src/qt/locale/bitcoin_hr.ts
+++ b/src/qt/locale/bitcoin_hr.ts
@@ -13,12 +13,7 @@
<translation>&lt;b&gt;Bitcoin&lt;/b&gt; verzija</translation>
</message>
<message>
- <location line="+41"/>
- <source>Copyright © 2009-2012 The Bitcoin developers</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+13"/>
+ <location line="+57"/>
<source>
This is experimental software.
@@ -27,6 +22,16 @@ Distributed under the MIT/X11 software license, see the accompanying file COPYIN
This product includes software developed by the OpenSSL Project for use in the OpenSSL Toolkit (http://www.openssl.org/) and cryptographic software written by Eric Young (eay@cryptsoft.com) and UPnP software written by Thomas Bernard.</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../aboutdialog.cpp" line="+17"/>
+ <source>Copyright</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>2009-%1 The Bitcoin developers</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>AddressBookPage</name>
@@ -101,17 +106,22 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation>&amp;Brisanje</translation>
</message>
<message>
- <location filename="../addressbookpage.cpp" line="+65"/>
+ <location filename="../addressbookpage.cpp" line="+66"/>
<source>Copy &amp;Label</source>
<translation>Kopirati &amp;oznaku</translation>
</message>
<message>
- <location line="+2"/>
+ <location line="+1"/>
<source>&amp;Edit</source>
<translation>&amp;Izmjeniti</translation>
</message>
<message>
- <location line="+250"/>
+ <location line="+1"/>
+ <source>Send &amp;Coins</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+263"/>
<source>Export Address Book Data</source>
<translation>Izvoz podataka adresara</translation>
</message>
@@ -134,7 +144,7 @@ This product includes software developed by the OpenSSL Project for use in the O
<context>
<name>AddressTableModel</name>
<message>
- <location filename="../addresstablemodel.cpp" line="+142"/>
+ <location filename="../addresstablemodel.cpp" line="+144"/>
<source>Label</source>
<translation>Oznaka</translation>
</message>
@@ -293,17 +303,17 @@ This product includes software developed by the OpenSSL Project for use in the O
<context>
<name>BitcoinGUI</name>
<message>
- <location filename="../bitcoingui.cpp" line="+267"/>
+ <location filename="../bitcoingui.cpp" line="+231"/>
<source>Sign &amp;message...</source>
<translation>&amp;Potpišite poruku...</translation>
</message>
<message>
- <location line="+254"/>
+ <location line="+299"/>
<source>Synchronizing with network...</source>
<translation>Usklađivanje s mrežom ...</translation>
</message>
<message>
- <location line="-322"/>
+ <location line="-367"/>
<source>&amp;Overview</source>
<translation>&amp;Pregled</translation>
</message>
@@ -323,32 +333,17 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation>Pretraži povijest transakcija</translation>
</message>
<message>
- <location line="+6"/>
- <source>&amp;Address Book</source>
- <translation>&amp;Adresar</translation>
- </message>
- <message>
- <location line="+1"/>
+ <location line="+7"/>
<source>Edit the list of stored addresses and labels</source>
<translation>Uređivanje popisa pohranjenih adresa i oznaka</translation>
</message>
<message>
- <location line="-15"/>
- <source>&amp;Receive coins</source>
- <translation>&amp;Primanje novca</translation>
- </message>
- <message>
- <location line="+1"/>
+ <location line="-14"/>
<source>Show the list of addresses for receiving payments</source>
<translation>Prikaži popis adresa za primanje isplate</translation>
</message>
<message>
- <location line="-8"/>
- <source>&amp;Send coins</source>
- <translation>&amp;Slanje novca</translation>
- </message>
- <message>
- <location line="+39"/>
+ <location line="+31"/>
<source>E&amp;xit</source>
<translation>&amp;Izlaz</translation>
</message>
@@ -393,7 +388,7 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation>&amp;Promijena lozinke...</translation>
</message>
<message>
- <location line="+259"/>
+ <location line="+304"/>
<source>Importing blocks from disk...</source>
<translation type="unfinished"/>
</message>
@@ -402,13 +397,8 @@ This product includes software developed by the OpenSSL Project for use in the O
<source>Reindexing blocks on disk...</source>
<translation type="unfinished"/>
</message>
- <message numerus="yes">
- <location line="+10"/>
- <source>~%n block(s) remaining</source>
- <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
- </message>
<message>
- <location line="-265"/>
+ <location line="-300"/>
<source>&amp;Export...</source>
<translation>&amp;Izvoz...</translation>
</message>
@@ -453,18 +443,33 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation type="unfinished"/>
</message>
<message>
- <location line="-196"/>
- <location line="+538"/>
+ <location line="-162"/>
+ <location line="+540"/>
<source>Bitcoin</source>
<translation>Bitcoin</translation>
</message>
<message>
- <location line="-538"/>
+ <location line="-540"/>
<source>Wallet</source>
<translation>NovÄanik</translation>
</message>
<message>
- <location line="+176"/>
+ <location line="+99"/>
+ <source>&amp;Send</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+7"/>
+ <source>&amp;Receive</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+14"/>
+ <source>&amp;Addresses</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+22"/>
<source>&amp;About Bitcoin</source>
<translation>&amp;O Bitcoinu</translation>
</message>
@@ -525,97 +530,92 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation>[testnet]</translation>
</message>
<message>
- <location line="+63"/>
+ <location line="+47"/>
<source>Bitcoin client</source>
- <translation type="unfinished"/>
+ <translation>Bitcoin klijent</translation>
</message>
<message numerus="yes">
- <location line="+79"/>
+ <location line="+140"/>
<source>%n active connection(s) to Bitcoin network</source>
<translation><numerusform>%n aktivna veza na Bitcoin mrežu</numerusform><numerusform>%n aktivne veze na Bitcoin mrežu</numerusform><numerusform>%n aktivnih veza na Bitcoin mrežu</numerusform></translation>
</message>
<message>
- <location line="+45"/>
- <source>Processed %1 of %2 blocks of transaction history (%3% done).</source>
+ <location line="+39"/>
+ <source>Processed %1 of %2 (estimated) blocks of transaction history.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+7"/>
+ <location line="+4"/>
<source>Processed %1 blocks of transaction history.</source>
<translation type="unfinished"/>
</message>
+ <message numerus="yes">
+ <location line="+20"/>
+ <source>%n hour(s)</source>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
+ <message numerus="yes">
+ <location line="+4"/>
+ <source>%n day(s)</source>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
+ <message numerus="yes">
+ <location line="+4"/>
+ <source>%n week(s)</source>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
<message>
- <location line="+70"/>
- <source>Error</source>
+ <location line="+5"/>
+ <source>%1 behind</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+3"/>
- <source>Warning</source>
+ <location line="+14"/>
+ <source>Last received block was generated %1 ago.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+3"/>
- <source>Information</source>
+ <location line="+2"/>
+ <source>Transactions after this will not yet be visible.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+66"/>
- <source>This transaction is over the size limit. You can still send it for a fee of %1, which goes to the nodes that process your transaction and helps to support the network. Do you want to pay the fee?</source>
- <translation type="unfinished"/>
+ <location line="+21"/>
+ <source>Error</source>
+ <translation>Greška</translation>
</message>
<message>
- <location line="+210"/>
- <source>Backup Successful</source>
+ <location line="+3"/>
+ <source>Warning</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+0"/>
- <source>The wallet data was successfully saved to the new location.</source>
+ <location line="+3"/>
+ <source>Information</source>
<translation type="unfinished"/>
</message>
- <message numerus="yes">
- <location line="-338"/>
- <source>%n second(s) ago</source>
- <translation><numerusform>prije %n sekunde</numerusform><numerusform>prije %n sekunde</numerusform><numerusform>prije %n sekundi</numerusform></translation>
- </message>
- <message numerus="yes">
- <location line="+4"/>
- <source>%n minute(s) ago</source>
- <translation><numerusform>prije %n minute</numerusform><numerusform>prije %n minute</numerusform><numerusform>prije %n minuta</numerusform></translation>
- </message>
- <message numerus="yes">
- <location line="+4"/>
- <source>%n hour(s) ago</source>
- <translation><numerusform>prije %n sata</numerusform><numerusform>prije %n sata</numerusform><numerusform>prije %n sati</numerusform></translation>
- </message>
- <message numerus="yes">
- <location line="+4"/>
- <source>%n day(s) ago</source>
- <translation><numerusform>prije %n dana</numerusform><numerusform>prije %n dana</numerusform><numerusform>prije %n dana</numerusform></translation>
+ <message>
+ <location line="+68"/>
+ <source>This transaction is over the size limit. You can still send it for a fee of %1, which goes to the nodes that process your transaction and helps to support the network. Do you want to pay the fee?</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location line="+6"/>
+ <location line="-138"/>
<source>Up to date</source>
<translation>Ažurno</translation>
</message>
<message>
- <location line="+7"/>
+ <location line="+32"/>
<source>Catching up...</source>
<translation>Ažuriranje...</translation>
</message>
<message>
- <location line="+10"/>
- <source>Last received block was generated %1.</source>
- <translation>Zadnji primljeni blok je generiran %1.</translation>
- </message>
- <message>
- <location line="+97"/>
+ <location line="+110"/>
<source>Confirm transaction fee</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+23"/>
+ <location line="+8"/>
<source>Sent transaction</source>
<translation>Poslana transakcija</translation>
</message>
@@ -638,14 +638,14 @@ Adresa:%4
</translation>
</message>
<message>
- <location line="+99"/>
- <location line="+28"/>
+ <location line="+33"/>
+ <location line="+23"/>
<source>URI handling</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-28"/>
- <location line="+28"/>
+ <location line="-23"/>
+ <location line="+23"/>
<source>URI can not be parsed! This can be caused by an invalid Bitcoin address or malformed URI parameters.</source>
<translation type="unfinished"/>
</message>
@@ -660,27 +660,7 @@ Adresa:%4
<translation>NovÄanik je &lt;b&gt;Å¡ifriran&lt;/b&gt; i trenutno &lt;b&gt;zakljuÄan&lt;/b&gt;</translation>
</message>
<message>
- <location line="+23"/>
- <source>Backup Wallet</source>
- <translation>Backup novÄanika</translation>
- </message>
- <message>
- <location line="+0"/>
- <source>Wallet Data (*.dat)</source>
- <translation>Podaci novÄanika (*.dat)</translation>
- </message>
- <message>
- <location line="+3"/>
- <source>Backup Failed</source>
- <translation>Backup nije uspio</translation>
- </message>
- <message>
- <location line="+0"/>
- <source>There was an error trying to save the wallet data to the new location.</source>
- <translation>DoÅ¡lo je do pogreÅ¡ke kod spremanja podataka novÄanika na novu lokaciju.</translation>
- </message>
- <message>
- <location filename="../bitcoin.cpp" line="+109"/>
+ <location filename="../bitcoin.cpp" line="+108"/>
<source>A fatal error occurred. Bitcoin can no longer continue safely and will quit.</source>
<translation type="unfinished"/>
</message>
@@ -688,7 +668,7 @@ Adresa:%4
<context>
<name>ClientModel</name>
<message>
- <location filename="../clientmodel.cpp" line="+86"/>
+ <location filename="../clientmodel.cpp" line="+96"/>
<source>Network Alert</source>
<translation type="unfinished"/>
</message>
@@ -721,7 +701,7 @@ Adresa:%4
<translation>Adresa ovog upisa u adresar. Može se mjenjati samo kod adresa za slanje.</translation>
</message>
<message>
- <location filename="../editaddressdialog.cpp" line="+20"/>
+ <location filename="../editaddressdialog.cpp" line="+21"/>
<source>New receiving address</source>
<translation>Nova adresa za primanje</translation>
</message>
@@ -741,17 +721,17 @@ Adresa:%4
<translation>Uredi adresu za slanje</translation>
</message>
<message>
- <location line="+60"/>
+ <location line="+76"/>
<source>The entered address &quot;%1&quot; is already in the address book.</source>
<translation>Upisana adresa &quot;%1&quot; je već u adresaru.</translation>
</message>
<message>
- <location line="+5"/>
+ <location line="-5"/>
<source>The entered address &quot;%1&quot; is not a valid Bitcoin address.</source>
<translation>Upisana adresa &quot;%1&quot; nije valjana bitcoin adresa.</translation>
</message>
<message>
- <location line="+5"/>
+ <location line="+10"/>
<source>Could not unlock wallet.</source>
<translation>Ne mogu otkljuÄati novÄanik.</translation>
</message>
@@ -764,7 +744,7 @@ Adresa:%4
<context>
<name>GUIUtil::HelpMessageBox</name>
<message>
- <location filename="../guiutil.cpp" line="+419"/>
+ <location filename="../guiutil.cpp" line="+422"/>
<location line="+12"/>
<source>Bitcoin-Qt</source>
<translation type="unfinished"/>
@@ -978,7 +958,7 @@ Adresa:%4
<translation type="unfinished"/>
</message>
<message>
- <location filename="../optionsdialog.cpp" line="+55"/>
+ <location filename="../optionsdialog.cpp" line="+53"/>
<source>default</source>
<translation type="unfinished"/>
</message>
@@ -1023,23 +1003,18 @@ Adresa:%4
<translation>Oblik</translation>
</message>
<message>
- <location line="+51"/>
- <location line="+183"/>
+ <location line="+50"/>
+ <location line="+166"/>
<source>The displayed information may be out of date. Your wallet automatically synchronizes with the Bitcoin network after a connection is established, but this process has not completed yet.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-141"/>
+ <location line="-124"/>
<source>Balance:</source>
<translation>Stanje:</translation>
</message>
<message>
- <location line="+58"/>
- <source>Number of transactions:</source>
- <translation>Broj transakcija:</translation>
- </message>
- <message>
- <location line="-29"/>
+ <location line="+29"/>
<source>Unconfirmed:</source>
<translation>Nepotvrđene:</translation>
</message>
@@ -1049,7 +1024,7 @@ Adresa:%4
<translation>NovÄanik</translation>
</message>
<message>
- <location line="+124"/>
+ <location line="+107"/>
<source>Immature:</source>
<translation type="unfinished"/>
</message>
@@ -1064,7 +1039,7 @@ Adresa:%4
<translation>&lt;b&gt;Nedavne transakcije&lt;/b&gt;</translation>
</message>
<message>
- <location line="-118"/>
+ <location line="-101"/>
<source>Your current balance</source>
<translation>VaÅ¡e trenutno stanje raÄuna</translation>
</message>
@@ -1074,11 +1049,6 @@ Adresa:%4
<translation>Ukupni iznos transakcija koje tek trebaju biti potvrÄ‘ene, i joÅ¡ uvijek nisu uraÄunate u trenutni saldo</translation>
</message>
<message>
- <location line="+20"/>
- <source>Total number of transactions in wallet</source>
- <translation>Ukupni broj tansakcija u novÄaniku</translation>
- </message>
- <message>
<location filename="../overviewpage.cpp" line="+115"/>
<location line="+1"/>
<source>out of sync</source>
@@ -1086,6 +1056,14 @@ Adresa:%4
</message>
</context>
<context>
+ <name>PaymentServer</name>
+ <message>
+ <location filename="../paymentserver.cpp" line="+107"/>
+ <source>Cannot start bitcoin: click-to-pay handler</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>QRCodeDialog</name>
<message>
<location filename="../forms/qrcodedialog.ui" line="+14"/>
@@ -1130,7 +1108,7 @@ Adresa:%4
<message>
<location line="+23"/>
<source>Resulting URI too long, try to reduce the text for label / message.</source>
- <translation type="unfinished"/>
+ <translation>Rezultirajući URI je predug, probajte umanjiti tekst za naslov / poruku.</translation>
</message>
<message>
<location line="+25"/>
@@ -1424,7 +1402,7 @@ Adresa:%4
</message>
<message>
<location line="+60"/>
- <location filename="../sendcoinsentry.cpp" line="+25"/>
+ <location filename="../sendcoinsentry.cpp" line="+26"/>
<source>Enter a label for this address to add it to your address book</source>
<translation>Unesite oznaku za ovu adresu kako bi ju dodali u vaš adresar</translation>
</message>
@@ -1660,7 +1638,7 @@ Adresa:%4
<context>
<name>TransactionDesc</name>
<message>
- <location filename="../transactiondesc.cpp" line="+19"/>
+ <location filename="../transactiondesc.cpp" line="+20"/>
<source>Open until %1</source>
<translation>Otvoren do %1</translation>
</message>
@@ -1847,7 +1825,7 @@ Adresa:%4
<context>
<name>TransactionTableModel</name>
<message>
- <location filename="../transactiontablemodel.cpp" line="+226"/>
+ <location filename="../transactiontablemodel.cpp" line="+225"/>
<source>Date</source>
<translation>Datum</translation>
</message>
@@ -1965,7 +1943,7 @@ Adresa:%4
<context>
<name>TransactionView</name>
<message>
- <location filename="../transactionview.cpp" line="+55"/>
+ <location filename="../transactionview.cpp" line="+52"/>
<location line="+16"/>
<source>All</source>
<translation>Sve</translation>
@@ -2052,6 +2030,11 @@ Adresa:%4
</message>
<message>
<location line="+1"/>
+ <source>Copy transaction ID</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Edit label</source>
<translation>Izmjeniti oznaku</translation>
</message>
@@ -2061,7 +2044,7 @@ Adresa:%4
<translation type="unfinished"/>
</message>
<message>
- <location line="+142"/>
+ <location line="+139"/>
<source>Export Transaction Data</source>
<translation>Izvoz podataka transakcija</translation>
</message>
@@ -2116,7 +2099,7 @@ Adresa:%4
<translation>Ne mogu pisati u datoteku %1.</translation>
</message>
<message>
- <location line="+95"/>
+ <location line="+100"/>
<source>Range:</source>
<translation>Raspon:</translation>
</message>
@@ -2127,29 +2110,172 @@ Adresa:%4
</message>
</context>
<context>
+ <name>WalletView</name>
+ <message>
+ <location filename="../walletview.cpp" line="+95"/>
+ <source>&amp;Overview</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Show general overview of wallet</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>&amp;Send coins</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Send coins to a Bitcoin address</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>&amp;Receive coins</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Show the list of addresses for receiving payments</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>&amp;Transactions</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Browse transaction history</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>&amp;Address Book</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Edit the list of stored addresses and labels</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+12"/>
+ <source>&amp;Encrypt Wallet...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Encrypt the private keys that belong to your wallet</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>&amp;Backup Wallet...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Backup wallet to another location</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>&amp;Change Passphrase...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Change the passphrase used for wallet encryption</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Sign &amp;message...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Sign messages with your Bitcoin addresses to prove you own them</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>&amp;Verify message...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Verify messages to ensure they were signed with specified Bitcoin addresses</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>&amp;Export...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Export the data in the current tab to a file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+180"/>
+ <source>Backup Wallet</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>Wallet Data (*.dat)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Backup Failed</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>There was an error trying to save the wallet data to the new location.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>Backup Successful</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>The wallet data was successfully saved to the new location.</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>bitcoin-core</name>
<message>
- <location filename="../bitcoinstrings.cpp" line="+88"/>
+ <location filename="../bitcoinstrings.cpp" line="+96"/>
<source>Bitcoin version</source>
<translation>Bitcoin verzija</translation>
</message>
<message>
- <location line="+82"/>
+ <location line="+98"/>
<source>Usage:</source>
<translation>Upotreba:</translation>
</message>
<message>
- <location line="-23"/>
+ <location line="-24"/>
<source>Send command to -server or bitcoind</source>
<translation>Pošalji komandu usluzi -server ili bitcoind</translation>
</message>
<message>
- <location line="-21"/>
+ <location line="-22"/>
<source>List commands</source>
<translation>Prikaži komande</translation>
</message>
<message>
- <location line="-11"/>
+ <location line="-10"/>
<source>Get help for a command</source>
<translation>Potraži pomoć za komandu</translation>
</message>
@@ -2174,95 +2300,97 @@ Adresa:%4
<translation>Generiraj novÄiće</translation>
</message>
<message>
- <location line="-15"/>
+ <location line="-28"/>
<source>Don&apos;t generate coins</source>
<translation>Ne generiraj novÄiće</translation>
</message>
<message>
- <location line="+61"/>
+ <location line="+74"/>
<source>Specify data directory</source>
<translation>Odredi direktorij za datoteke</translation>
</message>
<message>
<location line="-7"/>
<source>Set database cache size in megabytes (default: 25)</source>
- <translation type="unfinished"/>
+ <translation>Postavi cache za bazu podataka u MB (zadano:25)</translation>
</message>
<message>
- <location line="-26"/>
+ <location line="-27"/>
<source>Listen for connections on &lt;port&gt; (default: 8333 or testnet: 18333)</source>
<translation>Slušaj na &lt;port&gt;u (default: 8333 ili testnet: 18333)</translation>
</message>
<message>
- <location line="+4"/>
+ <location line="+5"/>
<source>Maintain at most &lt;n&gt; connections to peers (default: 125)</source>
<translation>Održavaj najviÅ¡e &lt;n&gt; veza sa Älanovima (default: 125)</translation>
</message>
<message>
- <location line="-34"/>
+ <location line="-49"/>
<source>Connect to a node to retrieve peer addresses, and disconnect</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+65"/>
+ <location line="+80"/>
<source>Specify your own public address</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+2"/>
+ <location line="+3"/>
<source>Threshold for disconnecting misbehaving peers (default: 100)</source>
<translation>Prag za odspajanje Älanova koji se Äudno ponaÅ¡aju (default: 100)</translation>
</message>
<message>
- <location line="-114"/>
+ <location line="-132"/>
<source>Number of seconds to keep misbehaving peers from reconnecting (default: 86400)</source>
<translation>Broj sekundi koliko se Älanovima koji se Äudno ponaÅ¡aju neće dopustiti da se opet spoje (default: 86400)</translation>
</message>
<message>
- <location line="-28"/>
+ <location line="-32"/>
<source>An error occurred while setting up the RPC port %u for listening on IPv4: %s</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+26"/>
+ <location line="+30"/>
<source>Listen for JSON-RPC connections on &lt;port&gt; (default: 8332 or testnet: 18332)</source>
<translation>Prihvaćaj JSON-RPC povezivanje na portu broj &lt;port&gt; (ugrađeni izbor: 8332 or testnet: 18332)</translation>
</message>
<message>
- <location line="+34"/>
+ <location line="+36"/>
<source>Accept command line and JSON-RPC commands</source>
<translation>Prihvati komande iz tekst moda i JSON-RPC</translation>
</message>
<message>
- <location line="+62"/>
+ <location line="+77"/>
<source>Run in the background as a daemon and accept commands</source>
<translation>Izvršavaj u pozadini kao uslužnik i prihvaćaj komande</translation>
</message>
<message>
- <location line="+31"/>
+ <location line="+32"/>
<source>Use the test network</source>
<translation>Koristi test mrežu</translation>
</message>
<message>
- <location line="-92"/>
+ <location line="-108"/>
<source>Accept connections from outside (default: 1 if no -proxy or -connect)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-74"/>
+ <location line="-82"/>
<source>%s, you must set a rpcpassword in the configuration file:
- %s
+%s
It is recommended you use the following random password:
rpcuser=bitcoinrpc
rpcpassword=%s
(you do not need to remember this password)
The username and password MUST NOT be the same.
If the file does not exist, create it with owner-readable-only file permissions.
+It is also recommended to set alertnotify so you are notified of problems;
+for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.com
</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+15"/>
+ <location line="+17"/>
<source>An error occurred while setting up the RPC port %u for listening on IPv6, falling back to IPv4: %s</source>
<translation type="unfinished"/>
</message>
@@ -2278,11 +2406,6 @@ If the file does not exist, create it with owner-readable-only file permissions.
</message>
<message>
<location line="+3"/>
- <source>Corrupted block database detected. Please restart the client with -reindex.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+2"/>
<source>Error initializing database environment %s! To recover, BACKUP THAT DIRECTORY, then remove everything from it except for wallet.dat.</source>
<translation type="unfinished"/>
</message>
@@ -2297,12 +2420,27 @@ If the file does not exist, create it with owner-readable-only file permissions.
<translation type="unfinished"/>
</message>
<message>
+ <location line="+3"/>
+ <source>Execute command when a relevant alert is received (%s in cmd is replaced by message)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Execute command when a wallet transaction changes (%s in cmd is replaced by TxID)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location line="+11"/>
<source>Set maximum size of high-priority/low-fee transactions in bytes (default: 27000)</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+3"/>
+ <source>Set the number of script verification threads (1-16, 0=auto, default: 0)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
<source>This is a pre-release test build - use at your own risk - do not use for mining or merchant applications</source>
<translation type="unfinished"/>
</message>
@@ -2348,16 +2486,41 @@ If the file does not exist, create it with owner-readable-only file permissions.
</message>
<message>
<location line="+3"/>
+ <source>Corrupted block database detected</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Discover own IP address (default: 1 when listening and no -externalip)</source>
<translation type="unfinished"/>
</message>
<message>
+ <location line="+1"/>
+ <source>Do you want to rebuild the block database now?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location line="+3"/>
+ <source>Error initializing block database</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Error initializing wallet database environment %s!</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Error loading block database</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+5"/>
+ <location line="+4"/>
+ <source>Error opening block database</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
<source>Error: Disk space is low!</source>
<translation type="unfinished"/>
</message>
@@ -2373,26 +2536,96 @@ If the file does not exist, create it with owner-readable-only file permissions.
</message>
<message>
<location line="+2"/>
+ <source>Error: system error: </source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Failed to listen on any port. Use -listen=0 if you want this.</source>
<translation type="unfinished"/>
</message>
<message>
+ <location line="+1"/>
+ <source>Failed to read block info</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Failed to read block</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Failed to sync block index</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Failed to write block index</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Failed to write block info</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Failed to write block</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Failed to write file info</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Failed to write to coin database</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Failed to write transaction index</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Failed to write undo data</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location line="+2"/>
<source>Find peers using DNS lookup (default: 1 unless -connect)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+5"/>
- <source>How thorough the block verification is (0-4, default: 3)</source>
+ <location line="+3"/>
+ <source>How many blocks to check at startup (default: 288, 0 = all)</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+1"/>
- <source>Importing blocks from block database...</source>
+ <source>How thorough the block verification is (0-4, default: 3)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+24"/>
+ <source>Rebuild block chain index from current blk000??.dat files</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+37"/>
+ <source>Verifying blocks...</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+1"/>
+ <source>Verifying wallet...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-61"/>
<source>Imports blocks from external blk000??.dat file</source>
<translation type="unfinished"/>
</message>
@@ -2407,7 +2640,12 @@ If the file does not exist, create it with owner-readable-only file permissions.
<translation>Nevaljala -tor adresa: &apos;%s&apos;</translation>
</message>
<message>
- <location line="+9"/>
+ <location line="+8"/>
+ <source>Maintain a full transaction index (default: 0)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
<source>Maximum per-connection receive buffer, &lt;n&gt;*1000 bytes (default: 5000)</source>
<translation type="unfinished"/>
</message>
@@ -2442,12 +2680,7 @@ If the file does not exist, create it with owner-readable-only file permissions.
<translation>Dodaj izlaz debuga na poÄetak sa vremenskom oznakom</translation>
</message>
<message>
- <location line="+1"/>
- <source>Rebuild blockchain index from current blk000??.dat files</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+4"/>
+ <location line="+5"/>
<source>SSL options: (see the Bitcoin Wiki for SSL setup instructions)</source>
<translation>SSL postavke: (za detalje o podešavanju SSL opcija vidi Bitcoin Wiki)</translation>
</message>
@@ -2487,7 +2720,12 @@ If the file does not exist, create it with owner-readable-only file permissions.
<translation>Odredi vremenski prozor za spajanje na mrežu u milisekundama (ugrađeni izbor: 5000)</translation>
</message>
<message>
- <location line="+13"/>
+ <location line="+4"/>
+ <source>System error: </source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+10"/>
<source>Use UPnP to map the listening port (default: 0)</source>
<translation>Pokušaj koristiti UPnP da otvoriš port za uslugu (default: 0)</translation>
</message>
@@ -2518,36 +2756,41 @@ If the file does not exist, create it with owner-readable-only file permissions.
</message>
<message>
<location line="+1"/>
+ <source>You need to rebuild the databases using -reindex to change -txindex</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>wallet.dat corrupt, salvage failed</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-43"/>
+ <location line="-45"/>
<source>Password for JSON-RPC connections</source>
<translation>Lozinka za JSON-RPC veze</translation>
</message>
<message>
- <location line="-53"/>
+ <location line="-68"/>
<source>Allow JSON-RPC connections from specified IP address</source>
<translation>Dozvoli JSON-RPC povezivanje s određene IP adrese</translation>
</message>
<message>
- <location line="+62"/>
+ <location line="+77"/>
<source>Send commands to node running on &lt;ip&gt; (default: 127.0.0.1)</source>
<translation>Pošalji komande nodu na adresi &lt;ip&gt; (ugrađeni izbor: 127.0.0.1)</translation>
</message>
<message>
- <location line="-103"/>
+ <location line="-120"/>
<source>Execute command when the best block changes (%s in cmd is replaced by block hash)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+124"/>
+ <location line="+142"/>
<source>Upgrade wallet to latest format</source>
- <translation type="unfinished"/>
+ <translation>Nadogradite novÄanik u posljednji format.</translation>
</message>
<message>
- <location line="-15"/>
+ <location line="-16"/>
<source>Set key pool size to &lt;n&gt; (default: 100)</source>
<translation>Podesi memorijski prostor za kljuÄeve na &lt;n&gt; (ugraÄ‘eni izbor: 100)</translation>
</message>
@@ -2557,17 +2800,12 @@ If the file does not exist, create it with owner-readable-only file permissions.
<translation>Ponovno pretraži lanac blokova za transakcije koje nedostaju</translation>
</message>
<message>
- <location line="-26"/>
- <source>How many blocks to check at startup (default: 2500, 0 = all)</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+55"/>
+ <location line="+30"/>
<source>Use OpenSSL (https) for JSON-RPC connections</source>
<translation>Koristi OpenSSL (https) za JSON-RPC povezivanje</translation>
</message>
<message>
- <location line="-20"/>
+ <location line="-21"/>
<source>Server certificate file (default: server.cert)</source>
<translation>Uslužnikov SSL certifikat (ugrađeni izbor: server.cert)</translation>
</message>
@@ -2577,12 +2815,12 @@ If the file does not exist, create it with owner-readable-only file permissions.
<translation>Uslužnikov privatni kljuÄ (ugraÄ‘eni izbor: server.pem)</translation>
</message>
<message>
- <location line="-133"/>
+ <location line="-154"/>
<source>Acceptable ciphers (default: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH)</source>
<translation>Prihvaljivi naÄini Å¡ifriranja (ugraÄ‘eni izbor: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH)</translation>
</message>
<message>
- <location line="+144"/>
+ <location line="+166"/>
<source>This help message</source>
<translation>Ova poruka za pomoć</translation>
</message>
@@ -2592,7 +2830,7 @@ If the file does not exist, create it with owner-readable-only file permissions.
<translation>Program ne može koristiti %s na ovom raÄunalu (bind returned error %d, %s)</translation>
</message>
<message>
- <location line="-70"/>
+ <location line="-86"/>
<source>Connect through socks proxy</source>
<translation>Poveži se kroz socks proxy</translation>
</message>
@@ -2602,12 +2840,12 @@ If the file does not exist, create it with owner-readable-only file permissions.
<translation>Dozvoli DNS upite za dodavanje nodova i povezivanje</translation>
</message>
<message>
- <location line="+43"/>
+ <location line="+57"/>
<source>Loading addresses...</source>
<translation>UÄitavanje adresa...</translation>
</message>
<message>
- <location line="-25"/>
+ <location line="-35"/>
<source>Error loading wallet.dat: Wallet corrupted</source>
<translation>GreÅ¡ka kod uÄitavanja wallet.dat: NovÄanik pokvaren</translation>
</message>
@@ -2617,32 +2855,22 @@ If the file does not exist, create it with owner-readable-only file permissions.
<translation>GreÅ¡ka kod uÄitavanja wallet.dat: NovÄanik zahtjeva noviju verziju Bitcoina</translation>
</message>
<message>
- <location line="+73"/>
- <source>Verifying block database integrity...</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+1"/>
- <source>Verifying wallet integrity...</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+1"/>
+ <location line="+87"/>
<source>Wallet needed to be rewritten: restart Bitcoin to complete</source>
<translation>NovÄanik je trebao prepravak: ponovo pokrenite Bitcoin</translation>
</message>
<message>
- <location line="-77"/>
+ <location line="-89"/>
<source>Error loading wallet.dat</source>
<translation>GreÅ¡ka kod uÄitavanja wallet.dat</translation>
</message>
<message>
- <location line="+20"/>
+ <location line="+30"/>
<source>Invalid -proxy address: &apos;%s&apos;</source>
<translation>Nevaljala -proxy adresa: &apos;%s&apos;</translation>
</message>
<message>
- <location line="+46"/>
+ <location line="+48"/>
<source>Unknown network specified in -onlynet: &apos;%s&apos;</source>
<translation type="unfinished"/>
</message>
@@ -2652,7 +2880,7 @@ If the file does not exist, create it with owner-readable-only file permissions.
<translation type="unfinished"/>
</message>
<message>
- <location line="-75"/>
+ <location line="-91"/>
<source>Cannot resolve -bind address: &apos;%s&apos;</source>
<translation type="unfinished"/>
</message>
@@ -2662,17 +2890,17 @@ If the file does not exist, create it with owner-readable-only file permissions.
<translation type="unfinished"/>
</message>
<message>
- <location line="+31"/>
+ <location line="+45"/>
<source>Invalid amount for -paytxfee=&lt;amount&gt;: &apos;%s&apos;</source>
<translation>Nevaljali iznos za opciju -paytxfee=&lt;amount&gt;: &apos;%s&apos;</translation>
</message>
<message>
- <location line="-15"/>
+ <location line="-24"/>
<source>Error: could not start node</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+16"/>
+ <location line="+25"/>
<source>Invalid amount</source>
<translation>Nevaljali iznos za opciju</translation>
</message>
@@ -2687,7 +2915,7 @@ If the file does not exist, create it with owner-readable-only file permissions.
<translation>UÄitavanje indeksa blokova...</translation>
</message>
<message>
- <location line="-45"/>
+ <location line="-59"/>
<source>Add a node to connect to and attempt to keep the connection open</source>
<translation>Unesite nod s kojim se želite spojiti and attempt to keep the connection open</translation>
</message>
@@ -2697,57 +2925,52 @@ If the file does not exist, create it with owner-readable-only file permissions.
<translation>Program ne može koristiti %s na ovom raÄunalu. Bitcoin program je vjerojatno već pokrenut.</translation>
</message>
<message>
- <location line="+54"/>
- <source>Find peers using internet relay chat (default: 0)</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="-2"/>
+ <location line="+68"/>
<source>Fee per KB to add to transactions you send</source>
<translation>Naknada posredniku po KB-u koja će biti dodana svakoj transakciji koju pošalješ</translation>
</message>
<message>
- <location line="+19"/>
+ <location line="+17"/>
<source>Loading wallet...</source>
<translation>UÄitavanje novÄanika...</translation>
</message>
<message>
- <location line="-40"/>
+ <location line="-54"/>
<source>Cannot downgrade wallet</source>
- <translation type="unfinished"/>
+ <translation>Nije moguće novÄanik vratiti na prijaÅ¡nju verziju.</translation>
</message>
<message>
<location line="+1"/>
<source>Cannot initialize keypool</source>
- <translation type="unfinished"/>
+ <translation>Keypool nije moguće inicijalizirati.</translation>
</message>
<message>
<location line="+3"/>
<source>Cannot write default address</source>
- <translation type="unfinished"/>
+ <translation>Nije moguće upisati zadanu adresu.</translation>
</message>
<message>
- <location line="+49"/>
+ <location line="+64"/>
<source>Rescanning...</source>
<translation>Rescaniranje</translation>
</message>
<message>
- <location line="-43"/>
+ <location line="-56"/>
<source>Done loading</source>
<translation>UÄitavanje gotovo</translation>
</message>
<message>
- <location line="+65"/>
+ <location line="+79"/>
<source>To use the %s option</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-60"/>
+ <location line="-71"/>
<source>Error</source>
- <translation type="unfinished"/>
+ <translation>Greška</translation>
</message>
<message>
- <location line="-28"/>
+ <location line="-33"/>
<source>You must set rpcpassword=&lt;password&gt; in the configuration file:
%s
If the file does not exist, create it with owner-readable-only file permissions.</source>
diff --git a/src/qt/locale/bitcoin_hu.ts b/src/qt/locale/bitcoin_hu.ts
index e91b5aadea..d75c82fa2f 100644
--- a/src/qt/locale/bitcoin_hu.ts
+++ b/src/qt/locale/bitcoin_hu.ts
@@ -13,12 +13,7 @@
<translation>&lt;b&gt;Bitcoin&lt;/b&gt; verzió</translation>
</message>
<message>
- <location line="+41"/>
- <source>Copyright © 2009-2012 The Bitcoin developers</source>
- <translation>Szerzői jog © 2009-2012 Bitcoin Developers</translation>
- </message>
- <message>
- <location line="+13"/>
+ <location line="+57"/>
<source>
This is experimental software.
@@ -31,6 +26,16 @@ MIT/X11 szoftverlicenc alatt kiadva, lásd a mellékelt fájlt COPYING vagy http
Ez a termék az OpenSSL Project által lett kifejlesztve az OpenSSL Toolkit (http://www.openssl.org/) és kriptográfiai szoftvertben való felhasználásra, írta Eric Young (eay@cryptsoft.com) és UPnP szoftver, írta Thomas Bernard.</translation>
</message>
+ <message>
+ <location filename="../aboutdialog.cpp" line="+17"/>
+ <source>Copyright</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>2009-%1 The Bitcoin developers</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>AddressBookPage</name>
@@ -72,7 +77,7 @@ Ez a termék az OpenSSL Project által lett kifejlesztve az OpenSSL Toolkit (htt
<message>
<location line="+11"/>
<source>Show &amp;QR Code</source>
- <translation type="unfinished"/>
+ <translation>&amp;QR kód mutatása</translation>
</message>
<message>
<location line="+11"/>
@@ -105,17 +110,22 @@ Ez a termék az OpenSSL Project által lett kifejlesztve az OpenSSL Toolkit (htt
<translation>&amp;Törlés</translation>
</message>
<message>
- <location filename="../addressbookpage.cpp" line="+65"/>
+ <location filename="../addressbookpage.cpp" line="+66"/>
<source>Copy &amp;Label</source>
<translation>Címke &amp;másolása</translation>
</message>
<message>
- <location line="+2"/>
+ <location line="+1"/>
<source>&amp;Edit</source>
+ <translation>Sz&amp;erkesztés</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Send &amp;Coins</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+250"/>
+ <location line="+263"/>
<source>Export Address Book Data</source>
<translation>Címjegyzék adatainak exportálása</translation>
</message>
@@ -138,7 +148,7 @@ Ez a termék az OpenSSL Project által lett kifejlesztve az OpenSSL Toolkit (htt
<context>
<name>AddressTableModel</name>
<message>
- <location filename="../addresstablemodel.cpp" line="+142"/>
+ <location filename="../addresstablemodel.cpp" line="+144"/>
<source>Label</source>
<translation>Címke</translation>
</message>
@@ -158,7 +168,7 @@ Ez a termék az OpenSSL Project által lett kifejlesztve az OpenSSL Toolkit (htt
<message>
<location filename="../forms/askpassphrasedialog.ui" line="+26"/>
<source>Passphrase Dialog</source>
- <translation type="unfinished"/>
+ <translation>Kulcsszó párbeszédablak</translation>
</message>
<message>
<location line="+21"/>
@@ -297,17 +307,17 @@ Ez a termék az OpenSSL Project által lett kifejlesztve az OpenSSL Toolkit (htt
<context>
<name>BitcoinGUI</name>
<message>
- <location filename="../bitcoingui.cpp" line="+267"/>
+ <location filename="../bitcoingui.cpp" line="+231"/>
<source>Sign &amp;message...</source>
- <translation type="unfinished"/>
+ <translation>Üzenet aláírása...</translation>
</message>
<message>
- <location line="+254"/>
+ <location line="+299"/>
<source>Synchronizing with network...</source>
<translation>Szinkronizálás a hálózattal...</translation>
</message>
<message>
- <location line="-322"/>
+ <location line="-367"/>
<source>&amp;Overview</source>
<translation>&amp;Ãttekintés</translation>
</message>
@@ -327,32 +337,17 @@ Ez a termék az OpenSSL Project által lett kifejlesztve az OpenSSL Toolkit (htt
<translation>Tranzakciótörténet megtekintése</translation>
</message>
<message>
- <location line="+6"/>
- <source>&amp;Address Book</source>
- <translation>Cím&amp;jegyzék</translation>
- </message>
- <message>
- <location line="+1"/>
+ <location line="+7"/>
<source>Edit the list of stored addresses and labels</source>
<translation>Tárolt címek és címkék listájának szerkesztése</translation>
</message>
<message>
- <location line="-15"/>
- <source>&amp;Receive coins</source>
- <translation>Érmék &amp;fogadása</translation>
- </message>
- <message>
- <location line="+1"/>
+ <location line="-14"/>
<source>Show the list of addresses for receiving payments</source>
<translation>Kiizetést fogadó címek listája</translation>
</message>
<message>
- <location line="-8"/>
- <source>&amp;Send coins</source>
- <translation>Érmék &amp;küldése</translation>
- </message>
- <message>
- <location line="+39"/>
+ <location line="+31"/>
<source>E&amp;xit</source>
<translation>&amp;Kilépés</translation>
</message>
@@ -389,7 +384,7 @@ Ez a termék az OpenSSL Project által lett kifejlesztve az OpenSSL Toolkit (htt
<message>
<location line="+3"/>
<source>&amp;Backup Wallet...</source>
- <translation type="unfinished"/>
+ <translation>&amp;Bisztonsági másolat készítése a Tárcáról</translation>
</message>
<message>
<location line="+2"/>
@@ -397,7 +392,7 @@ Ez a termék az OpenSSL Project által lett kifejlesztve az OpenSSL Toolkit (htt
<translation>Jelszó &amp;megváltoztatása...</translation>
</message>
<message>
- <location line="+259"/>
+ <location line="+304"/>
<source>Importing blocks from disk...</source>
<translation type="unfinished"/>
</message>
@@ -406,13 +401,8 @@ Ez a termék az OpenSSL Project által lett kifejlesztve az OpenSSL Toolkit (htt
<source>Reindexing blocks on disk...</source>
<translation type="unfinished"/>
</message>
- <message numerus="yes">
- <location line="+10"/>
- <source>~%n block(s) remaining</source>
- <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
- </message>
<message>
- <location line="-265"/>
+ <location line="-300"/>
<source>&amp;Export...</source>
<translation>&amp;Exportálás...</translation>
</message>
@@ -434,7 +424,7 @@ Ez a termék az OpenSSL Project által lett kifejlesztve az OpenSSL Toolkit (htt
<message>
<location line="-9"/>
<source>Backup wallet to another location</source>
- <translation type="unfinished"/>
+ <translation>Biztonsági másolat készítése a Tárcáról egy másik helyre</translation>
</message>
<message>
<location line="+2"/>
@@ -444,31 +434,46 @@ Ez a termék az OpenSSL Project által lett kifejlesztve az OpenSSL Toolkit (htt
<message>
<location line="+9"/>
<source>&amp;Debug window</source>
- <translation type="unfinished"/>
+ <translation>&amp;Debug ablak</translation>
</message>
<message>
<location line="+1"/>
<source>Open debugging and diagnostic console</source>
- <translation type="unfinished"/>
+ <translation>Hibakereső és diagnosztikai konzol megnyitása</translation>
</message>
<message>
<location line="-7"/>
<source>&amp;Verify message...</source>
- <translation type="unfinished"/>
+ <translation>Üzenet &amp;valódiságának ellenőrzése</translation>
</message>
<message>
- <location line="-196"/>
- <location line="+538"/>
+ <location line="-162"/>
+ <location line="+540"/>
<source>Bitcoin</source>
<translation>Bitcoin</translation>
</message>
<message>
- <location line="-538"/>
+ <location line="-540"/>
<source>Wallet</source>
<translation>Tárca</translation>
</message>
<message>
- <location line="+176"/>
+ <location line="+99"/>
+ <source>&amp;Send</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+7"/>
+ <source>&amp;Receive</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+14"/>
+ <source>&amp;Addresses</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+22"/>
<source>&amp;About Bitcoin</source>
<translation>&amp;A Bitcoinról</translation>
</message>
@@ -529,97 +534,92 @@ Ez a termék az OpenSSL Project által lett kifejlesztve az OpenSSL Toolkit (htt
<translation>[teszthálózat]</translation>
</message>
<message>
- <location line="+63"/>
+ <location line="+47"/>
<source>Bitcoin client</source>
- <translation type="unfinished"/>
+ <translation>Bitcoin kliens</translation>
</message>
<message numerus="yes">
- <location line="+79"/>
+ <location line="+140"/>
<source>%n active connection(s) to Bitcoin network</source>
<translation><numerusform>%n aktív kapcsolat a Bitcoin-hálózattal</numerusform><numerusform>%n aktív kapcsolat a Bitcoin-hálózattal</numerusform></translation>
</message>
<message>
- <location line="+45"/>
- <source>Processed %1 of %2 blocks of transaction history (%3% done).</source>
+ <location line="+39"/>
+ <source>Processed %1 of %2 (estimated) blocks of transaction history.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+7"/>
+ <location line="+4"/>
<source>Processed %1 blocks of transaction history.</source>
<translation type="unfinished"/>
</message>
+ <message numerus="yes">
+ <location line="+20"/>
+ <source>%n hour(s)</source>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
+ <message numerus="yes">
+ <location line="+4"/>
+ <source>%n day(s)</source>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
+ <message numerus="yes">
+ <location line="+4"/>
+ <source>%n week(s)</source>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
<message>
- <location line="+70"/>
- <source>Error</source>
+ <location line="+5"/>
+ <source>%1 behind</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+3"/>
- <source>Warning</source>
+ <location line="+14"/>
+ <source>Last received block was generated %1 ago.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+3"/>
- <source>Information</source>
+ <location line="+2"/>
+ <source>Transactions after this will not yet be visible.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+66"/>
- <source>This transaction is over the size limit. You can still send it for a fee of %1, which goes to the nodes that process your transaction and helps to support the network. Do you want to pay the fee?</source>
+ <location line="+21"/>
+ <source>Error</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+210"/>
- <source>Backup Successful</source>
+ <location line="+3"/>
+ <source>Warning</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+0"/>
- <source>The wallet data was successfully saved to the new location.</source>
+ <location line="+3"/>
+ <source>Information</source>
<translation type="unfinished"/>
</message>
- <message numerus="yes">
- <location line="-338"/>
- <source>%n second(s) ago</source>
- <translation><numerusform>%n másodperccel ezelőtt</numerusform><numerusform>%n másodperccel ezelőtt</numerusform></translation>
- </message>
- <message numerus="yes">
- <location line="+4"/>
- <source>%n minute(s) ago</source>
- <translation><numerusform>%n perccel ezelőtt</numerusform><numerusform>%n perccel ezelőtt</numerusform></translation>
- </message>
- <message numerus="yes">
- <location line="+4"/>
- <source>%n hour(s) ago</source>
- <translation><numerusform>%n órával ezelőtt</numerusform><numerusform>%n órával ezelőtt</numerusform></translation>
- </message>
- <message numerus="yes">
- <location line="+4"/>
- <source>%n day(s) ago</source>
- <translation><numerusform>%n nappal ezelőtt</numerusform><numerusform>%n nappal ezelőtt</numerusform></translation>
+ <message>
+ <location line="+68"/>
+ <source>This transaction is over the size limit. You can still send it for a fee of %1, which goes to the nodes that process your transaction and helps to support the network. Do you want to pay the fee?</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location line="+6"/>
+ <location line="-138"/>
<source>Up to date</source>
<translation>Naprakész</translation>
</message>
<message>
- <location line="+7"/>
+ <location line="+32"/>
<source>Catching up...</source>
<translation>Frissítés...</translation>
</message>
<message>
- <location line="+10"/>
- <source>Last received block was generated %1.</source>
- <translation>Az utolsóként kapott blokk generálva: %1.</translation>
- </message>
- <message>
- <location line="+97"/>
+ <location line="+110"/>
<source>Confirm transaction fee</source>
- <translation type="unfinished"/>
+ <translation>Tranzakciós díj jóváhagyása</translation>
</message>
<message>
- <location line="+23"/>
+ <location line="+8"/>
<source>Sent transaction</source>
<translation>Tranzakció elküldve.</translation>
</message>
@@ -642,14 +642,14 @@ Cím: %4
</translation>
</message>
<message>
- <location line="+99"/>
- <location line="+28"/>
+ <location line="+33"/>
+ <location line="+23"/>
<source>URI handling</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-28"/>
- <location line="+28"/>
+ <location line="-23"/>
+ <location line="+23"/>
<source>URI can not be parsed! This can be caused by an invalid Bitcoin address or malformed URI parameters.</source>
<translation type="unfinished"/>
</message>
@@ -664,27 +664,7 @@ Cím: %4
<translation>Tárca &lt;b&gt;kódolva&lt;/b&gt; és jelenleg &lt;b&gt;zárva&lt;/b&gt;.</translation>
</message>
<message>
- <location line="+23"/>
- <source>Backup Wallet</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+0"/>
- <source>Wallet Data (*.dat)</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+3"/>
- <source>Backup Failed</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+0"/>
- <source>There was an error trying to save the wallet data to the new location.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../bitcoin.cpp" line="+109"/>
+ <location filename="../bitcoin.cpp" line="+108"/>
<source>A fatal error occurred. Bitcoin can no longer continue safely and will quit.</source>
<translation type="unfinished"/>
</message>
@@ -692,7 +672,7 @@ Cím: %4
<context>
<name>ClientModel</name>
<message>
- <location filename="../clientmodel.cpp" line="+86"/>
+ <location filename="../clientmodel.cpp" line="+96"/>
<source>Network Alert</source>
<translation type="unfinished"/>
</message>
@@ -725,7 +705,7 @@ Cím: %4
<translation>Az ehhez a címjegyzék-bejegyzéshez tartozó cím. Ez csak a küldő címeknél módosítható.</translation>
</message>
<message>
- <location filename="../editaddressdialog.cpp" line="+20"/>
+ <location filename="../editaddressdialog.cpp" line="+21"/>
<source>New receiving address</source>
<translation>Új fogadó cím</translation>
</message>
@@ -745,17 +725,17 @@ Cím: %4
<translation>Küldő cím szerkesztése</translation>
</message>
<message>
- <location line="+60"/>
+ <location line="+76"/>
<source>The entered address &quot;%1&quot; is already in the address book.</source>
<translation>A megadott &quot;%1&quot; cím már szerepel a címjegyzékben.</translation>
</message>
<message>
- <location line="+5"/>
+ <location line="-5"/>
<source>The entered address &quot;%1&quot; is not a valid Bitcoin address.</source>
<translation>A megadott &quot;%1&quot; cím nem egy érvényes Bitcoin-cím.</translation>
</message>
<message>
- <location line="+5"/>
+ <location line="+10"/>
<source>Could not unlock wallet.</source>
<translation>Tárca feloldása sikertelen</translation>
</message>
@@ -768,7 +748,7 @@ Cím: %4
<context>
<name>GUIUtil::HelpMessageBox</name>
<message>
- <location filename="../guiutil.cpp" line="+419"/>
+ <location filename="../guiutil.cpp" line="+422"/>
<location line="+12"/>
<source>Bitcoin-Qt</source>
<translation type="unfinished"/>
@@ -983,7 +963,7 @@ Cím: %4
<translation type="unfinished"/>
</message>
<message>
- <location filename="../optionsdialog.cpp" line="+55"/>
+ <location filename="../optionsdialog.cpp" line="+53"/>
<source>default</source>
<translation type="unfinished"/>
</message>
@@ -1028,23 +1008,18 @@ Cím: %4
<translation>Å°rlap</translation>
</message>
<message>
- <location line="+51"/>
- <location line="+183"/>
+ <location line="+50"/>
+ <location line="+166"/>
<source>The displayed information may be out of date. Your wallet automatically synchronizes with the Bitcoin network after a connection is established, but this process has not completed yet.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-141"/>
+ <location line="-124"/>
<source>Balance:</source>
<translation>Egyenleg:</translation>
</message>
<message>
- <location line="+58"/>
- <source>Number of transactions:</source>
- <translation>Tranzakciók száma:</translation>
- </message>
- <message>
- <location line="-29"/>
+ <location line="+29"/>
<source>Unconfirmed:</source>
<translation>Megerősítetlen:</translation>
</message>
@@ -1054,7 +1029,7 @@ Cím: %4
<translation>Tárca</translation>
</message>
<message>
- <location line="+124"/>
+ <location line="+107"/>
<source>Immature:</source>
<translation type="unfinished"/>
</message>
@@ -1069,7 +1044,7 @@ Cím: %4
<translation>&lt;b&gt;Legutóbbi tranzakciók&lt;/b&gt;</translation>
</message>
<message>
- <location line="-118"/>
+ <location line="-101"/>
<source>Your current balance</source>
<translation>Aktuális egyenleged</translation>
</message>
@@ -1079,11 +1054,6 @@ Cím: %4
<translation>Még megerősítésre váró, a jelenlegi egyenlegbe be nem számított tranzakciók</translation>
</message>
<message>
- <location line="+20"/>
- <source>Total number of transactions in wallet</source>
- <translation>Tárca összes tranzakcióinak száma</translation>
- </message>
- <message>
<location filename="../overviewpage.cpp" line="+115"/>
<location line="+1"/>
<source>out of sync</source>
@@ -1091,16 +1061,24 @@ Cím: %4
</message>
</context>
<context>
+ <name>PaymentServer</name>
+ <message>
+ <location filename="../paymentserver.cpp" line="+107"/>
+ <source>Cannot start bitcoin: click-to-pay handler</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>QRCodeDialog</name>
<message>
<location filename="../forms/qrcodedialog.ui" line="+14"/>
<source>QR Code Dialog</source>
- <translation type="unfinished"/>
+ <translation>QR kód párbeszédablak</translation>
</message>
<message>
<location line="+59"/>
<source>Request Payment</source>
- <translation type="unfinished"/>
+ <translation>Fizetés kérése</translation>
</message>
<message>
<location line="+56"/>
@@ -1120,12 +1098,12 @@ Cím: %4
<message>
<location line="+71"/>
<source>&amp;Save As...</source>
- <translation type="unfinished"/>
+ <translation>Mentés má&amp;sként</translation>
</message>
<message>
<location filename="../qrcodedialog.cpp" line="+62"/>
<source>Error encoding URI into QR Code.</source>
- <translation type="unfinished"/>
+ <translation>Hiba lépett fel az URI QR kóddá alakításakor</translation>
</message>
<message>
<location line="+40"/>
@@ -1135,17 +1113,17 @@ Cím: %4
<message>
<location line="+23"/>
<source>Resulting URI too long, try to reduce the text for label / message.</source>
- <translation type="unfinished"/>
+ <translation>A keletkezett URI túl hosszú, próbálja meg csökkenteni a cimkeszöveg / üzenet méretét.</translation>
</message>
<message>
<location line="+25"/>
<source>Save QR Code</source>
- <translation type="unfinished"/>
+ <translation>QR kód mentése</translation>
</message>
<message>
<location line="+0"/>
<source>PNG Images (*.png)</source>
- <translation type="unfinished"/>
+ <translation>PNG Képfájlok (*.png)</translation>
</message>
</context>
<context>
@@ -1153,7 +1131,7 @@ Cím: %4
<message>
<location filename="../forms/rpcconsole.ui" line="+46"/>
<source>Client name</source>
- <translation type="unfinished"/>
+ <translation>Kliens néve</translation>
</message>
<message>
<location line="+10"/>
@@ -1167,17 +1145,17 @@ Cím: %4
<location line="+23"/>
<location filename="../rpcconsole.cpp" line="+344"/>
<source>N/A</source>
- <translation type="unfinished"/>
+ <translation>Nem elérhető</translation>
</message>
<message>
<location line="-217"/>
<source>Client version</source>
- <translation type="unfinished"/>
+ <translation>Kliens verzió</translation>
</message>
<message>
<location line="-45"/>
<source>&amp;Information</source>
- <translation type="unfinished"/>
+ <translation>&amp;Információ</translation>
</message>
<message>
<location line="+68"/>
@@ -1187,47 +1165,47 @@ Cím: %4
<message>
<location line="+49"/>
<source>Startup time</source>
- <translation type="unfinished"/>
+ <translation>Bekapcsolás ideje</translation>
</message>
<message>
<location line="+29"/>
<source>Network</source>
- <translation type="unfinished"/>
+ <translation>Hálózat</translation>
</message>
<message>
<location line="+7"/>
<source>Number of connections</source>
- <translation type="unfinished"/>
+ <translation>Kapcsolatok száma</translation>
</message>
<message>
<location line="+23"/>
<source>On testnet</source>
- <translation type="unfinished"/>
+ <translation>Teszthálózaton</translation>
</message>
<message>
<location line="+23"/>
<source>Block chain</source>
- <translation type="unfinished"/>
+ <translation>Blokklánc</translation>
</message>
<message>
<location line="+7"/>
<source>Current number of blocks</source>
- <translation type="unfinished"/>
+ <translation>Aktuális blokkok száma</translation>
</message>
<message>
<location line="+23"/>
<source>Estimated total blocks</source>
- <translation type="unfinished"/>
+ <translation>Becsült összes blokk</translation>
</message>
<message>
<location line="+23"/>
<source>Last block time</source>
- <translation type="unfinished"/>
+ <translation>Utolsó blokk ideje</translation>
</message>
<message>
<location line="+52"/>
<source>&amp;Open</source>
- <translation type="unfinished"/>
+ <translation>&amp;Megnyitás</translation>
</message>
<message>
<location line="+16"/>
@@ -1247,12 +1225,12 @@ Cím: %4
<message>
<location line="+24"/>
<source>&amp;Console</source>
- <translation type="unfinished"/>
+ <translation>&amp;Konzol</translation>
</message>
<message>
<location line="-260"/>
<source>Build date</source>
- <translation type="unfinished"/>
+ <translation>Fordítás dátuma</translation>
</message>
<message>
<location line="-104"/>
@@ -1277,7 +1255,7 @@ Cím: %4
<message>
<location line="+102"/>
<source>Clear console</source>
- <translation type="unfinished"/>
+ <translation>Konzol törlése</translation>
</message>
<message>
<location filename="../rpcconsole.cpp" line="-30"/>
@@ -1322,7 +1300,7 @@ Cím: %4
<message>
<location line="+20"/>
<source>Remove all transaction fields</source>
- <translation type="unfinished"/>
+ <translation>Az összes tranzakciós mező eltávolítása</translation>
</message>
<message>
<location line="+3"/>
@@ -1429,7 +1407,7 @@ Cím: %4
</message>
<message>
<location line="+60"/>
- <location filename="../sendcoinsentry.cpp" line="+25"/>
+ <location filename="../sendcoinsentry.cpp" line="+26"/>
<source>Enter a label for this address to add it to your address book</source>
<translation>Milyen címkével kerüljön be ez a cím a címtáradba?
</translation>
@@ -1666,7 +1644,7 @@ Cím: %4
<context>
<name>TransactionDesc</name>
<message>
- <location filename="../transactiondesc.cpp" line="+19"/>
+ <location filename="../transactiondesc.cpp" line="+20"/>
<source>Open until %1</source>
<translation>Megnyitva %1-ig</translation>
</message>
@@ -1853,7 +1831,7 @@ Cím: %4
<context>
<name>TransactionTableModel</name>
<message>
- <location filename="../transactiontablemodel.cpp" line="+226"/>
+ <location filename="../transactiontablemodel.cpp" line="+225"/>
<source>Date</source>
<translation>Dátum</translation>
</message>
@@ -1971,7 +1949,7 @@ Cím: %4
<context>
<name>TransactionView</name>
<message>
- <location filename="../transactionview.cpp" line="+55"/>
+ <location filename="../transactionview.cpp" line="+52"/>
<location line="+16"/>
<source>All</source>
<translation>Mind</translation>
@@ -2054,6 +2032,11 @@ Cím: %4
<message>
<location line="+1"/>
<source>Copy amount</source>
+ <translation>Összeg másolása</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy transaction ID</source>
<translation type="unfinished"/>
</message>
<message>
@@ -2064,10 +2047,10 @@ Cím: %4
<message>
<location line="+1"/>
<source>Show transaction details</source>
- <translation type="unfinished"/>
+ <translation>Tranzakciós részletek megjelenítése</translation>
</message>
<message>
- <location line="+142"/>
+ <location line="+139"/>
<source>Export Transaction Data</source>
<translation>Tranzakció adatainak exportálása</translation>
</message>
@@ -2122,7 +2105,7 @@ Cím: %4
<translation>%1 fájlba való kiírás sikertelen.</translation>
</message>
<message>
- <location line="+95"/>
+ <location line="+100"/>
<source>Range:</source>
<translation>Tartomány:</translation>
</message>
@@ -2133,31 +2116,174 @@ Cím: %4
</message>
</context>
<context>
+ <name>WalletView</name>
+ <message>
+ <location filename="../walletview.cpp" line="+95"/>
+ <source>&amp;Overview</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Show general overview of wallet</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>&amp;Send coins</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Send coins to a Bitcoin address</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>&amp;Receive coins</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Show the list of addresses for receiving payments</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>&amp;Transactions</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Browse transaction history</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>&amp;Address Book</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Edit the list of stored addresses and labels</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+12"/>
+ <source>&amp;Encrypt Wallet...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Encrypt the private keys that belong to your wallet</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>&amp;Backup Wallet...</source>
+ <translation>&amp;Bisztonsági másolat készítése a Tárcáról</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Backup wallet to another location</source>
+ <translation>Biztonsági másolat készítése a Tárcáról egy másik helyre</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>&amp;Change Passphrase...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Change the passphrase used for wallet encryption</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Sign &amp;message...</source>
+ <translation>Üzenet aláírása...</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Sign messages with your Bitcoin addresses to prove you own them</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>&amp;Verify message...</source>
+ <translation>Üzenet &amp;valódiságának ellenőrzése</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Verify messages to ensure they were signed with specified Bitcoin addresses</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>&amp;Export...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Export the data in the current tab to a file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+180"/>
+ <source>Backup Wallet</source>
+ <translation>Biztonsági másolat készítése a Tárcáról</translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>Wallet Data (*.dat)</source>
+ <translation>Tárca fájl (*.dat)</translation>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Backup Failed</source>
+ <translation>Biztonsági másolat készítése sikertelen</translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>There was an error trying to save the wallet data to the new location.</source>
+ <translation>Hiba lépett fel a Tárca másik helyre való mentése közben</translation>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>Backup Successful</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>The wallet data was successfully saved to the new location.</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>bitcoin-core</name>
<message>
- <location filename="../bitcoinstrings.cpp" line="+88"/>
+ <location filename="../bitcoinstrings.cpp" line="+96"/>
<source>Bitcoin version</source>
<translation>Bitcoin verzió</translation>
</message>
<message>
- <location line="+82"/>
+ <location line="+98"/>
<source>Usage:</source>
<translation>Használat:</translation>
</message>
<message>
- <location line="-23"/>
+ <location line="-24"/>
<source>Send command to -server or bitcoind</source>
<translation>Parancs küldése a -serverhez vagy a bitcoindhez
</translation>
</message>
<message>
- <location line="-21"/>
+ <location line="-22"/>
<source>List commands</source>
<translation>Parancsok kilistázása
</translation>
</message>
<message>
- <location line="-11"/>
+ <location line="-10"/>
<source>Get help for a command</source>
<translation>Segítség egy parancsról
</translation>
@@ -2187,13 +2313,13 @@ Cím: %4
</translation>
</message>
<message>
- <location line="-15"/>
+ <location line="-28"/>
<source>Don&apos;t generate coins</source>
<translation>Bitcoin-generálás leállítása
</translation>
</message>
<message>
- <location line="+61"/>
+ <location line="+74"/>
<source>Specify data directory</source>
<translation>Adatkönyvtár
</translation>
@@ -2201,86 +2327,88 @@ Cím: %4
<message>
<location line="-7"/>
<source>Set database cache size in megabytes (default: 25)</source>
- <translation type="unfinished"/>
+ <translation>Az adatbázis gyorsítótár mérete megabájtban (alapértelmezés: 25)</translation>
</message>
<message>
- <location line="-26"/>
+ <location line="-27"/>
<source>Listen for connections on &lt;port&gt; (default: 8333 or testnet: 18333)</source>
<translation>Csatlakozásokhoz figyelendő &lt;port&gt; (alapértelmezett: 8333 or testnet: 18333)</translation>
</message>
<message>
- <location line="+4"/>
+ <location line="+5"/>
<source>Maintain at most &lt;n&gt; connections to peers (default: 125)</source>
- <translation type="unfinished"/>
+ <translation>Maximálisan &lt;n&gt; számú kapcsolat fenntartása a peerekkel (alapértelmezés: 125)</translation>
</message>
<message>
- <location line="-34"/>
+ <location line="-49"/>
<source>Connect to a node to retrieve peer addresses, and disconnect</source>
- <translation type="unfinished"/>
+ <translation>Kapcsolódás egy csomóponthoz a peerek címeinek megszerzése miatt, majd szétkapcsolás</translation>
</message>
<message>
- <location line="+65"/>
+ <location line="+80"/>
<source>Specify your own public address</source>
- <translation type="unfinished"/>
+ <translation>Adja meg az Ön saját nyilvános címét</translation>
</message>
<message>
- <location line="+2"/>
+ <location line="+3"/>
<source>Threshold for disconnecting misbehaving peers (default: 100)</source>
- <translation type="unfinished"/>
+ <translation>Helytelenül viselkedő peerek leválasztási határértéke (alapértelmezés: 100)</translation>
</message>
<message>
- <location line="-114"/>
+ <location line="-132"/>
<source>Number of seconds to keep misbehaving peers from reconnecting (default: 86400)</source>
- <translation type="unfinished"/>
+ <translation>Helytelenül viselkedő peerek kizárási ideje másodpercben (alapértelmezés: 86400)</translation>
</message>
<message>
- <location line="-28"/>
+ <location line="-32"/>
<source>An error occurred while setting up the RPC port %u for listening on IPv4: %s</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+26"/>
+ <location line="+30"/>
<source>Listen for JSON-RPC connections on &lt;port&gt; (default: 8332 or testnet: 18332)</source>
<translation>JSON-RPC csatlakozásokhoz figyelendő &lt;port&gt; (alapértelmezett: 8332 or testnet: 18332)</translation>
</message>
<message>
- <location line="+34"/>
+ <location line="+36"/>
<source>Accept command line and JSON-RPC commands</source>
<translation>Parancssoros és JSON-RPC parancsok elfogadása
</translation>
</message>
<message>
- <location line="+62"/>
+ <location line="+77"/>
<source>Run in the background as a daemon and accept commands</source>
<translation>Háttérben futtatás daemonként és parancsok elfogadása
</translation>
</message>
<message>
- <location line="+31"/>
+ <location line="+32"/>
<source>Use the test network</source>
<translation>Teszthálózat használata
</translation>
</message>
<message>
- <location line="-92"/>
+ <location line="-108"/>
<source>Accept connections from outside (default: 1 if no -proxy or -connect)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-74"/>
+ <location line="-82"/>
<source>%s, you must set a rpcpassword in the configuration file:
- %s
+%s
It is recommended you use the following random password:
rpcuser=bitcoinrpc
rpcpassword=%s
(you do not need to remember this password)
The username and password MUST NOT be the same.
If the file does not exist, create it with owner-readable-only file permissions.
+It is also recommended to set alertnotify so you are notified of problems;
+for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.com
</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+15"/>
+ <location line="+17"/>
<source>An error occurred while setting up the RPC port %u for listening on IPv6, falling back to IPv4: %s</source>
<translation type="unfinished"/>
</message>
@@ -2296,11 +2424,6 @@ If the file does not exist, create it with owner-readable-only file permissions.
</message>
<message>
<location line="+3"/>
- <source>Corrupted block database detected. Please restart the client with -reindex.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+2"/>
<source>Error initializing database environment %s! To recover, BACKUP THAT DIRECTORY, then remove everything from it except for wallet.dat.</source>
<translation type="unfinished"/>
</message>
@@ -2315,12 +2438,27 @@ If the file does not exist, create it with owner-readable-only file permissions.
<translation type="unfinished"/>
</message>
<message>
+ <location line="+3"/>
+ <source>Execute command when a relevant alert is received (%s in cmd is replaced by message)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Execute command when a wallet transaction changes (%s in cmd is replaced by TxID)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location line="+11"/>
<source>Set maximum size of high-priority/low-fee transactions in bytes (default: 27000)</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+3"/>
+ <source>Set the number of script verification threads (1-16, 0=auto, default: 0)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
<source>This is a pre-release test build - use at your own risk - do not use for mining or merchant applications</source>
<translation type="unfinished"/>
</message>
@@ -2366,16 +2504,41 @@ If the file does not exist, create it with owner-readable-only file permissions.
</message>
<message>
<location line="+3"/>
+ <source>Corrupted block database detected</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Discover own IP address (default: 1 when listening and no -externalip)</source>
<translation type="unfinished"/>
</message>
<message>
+ <location line="+1"/>
+ <source>Do you want to rebuild the block database now?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location line="+3"/>
+ <source>Error initializing block database</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Error initializing wallet database environment %s!</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Error loading block database</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+5"/>
+ <location line="+4"/>
+ <source>Error opening block database</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
<source>Error: Disk space is low!</source>
<translation type="unfinished"/>
</message>
@@ -2391,26 +2554,96 @@ If the file does not exist, create it with owner-readable-only file permissions.
</message>
<message>
<location line="+2"/>
+ <source>Error: system error: </source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Failed to listen on any port. Use -listen=0 if you want this.</source>
<translation type="unfinished"/>
</message>
<message>
+ <location line="+1"/>
+ <source>Failed to read block info</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Failed to read block</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Failed to sync block index</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Failed to write block index</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Failed to write block info</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Failed to write block</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Failed to write file info</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Failed to write to coin database</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Failed to write transaction index</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Failed to write undo data</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location line="+2"/>
<source>Find peers using DNS lookup (default: 1 unless -connect)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+5"/>
- <source>How thorough the block verification is (0-4, default: 3)</source>
+ <location line="+3"/>
+ <source>How many blocks to check at startup (default: 288, 0 = all)</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+1"/>
- <source>Importing blocks from block database...</source>
+ <source>How thorough the block verification is (0-4, default: 3)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+24"/>
+ <source>Rebuild block chain index from current blk000??.dat files</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+37"/>
+ <source>Verifying blocks...</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+1"/>
+ <source>Verifying wallet...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-61"/>
<source>Imports blocks from external blk000??.dat file</source>
<translation type="unfinished"/>
</message>
@@ -2425,7 +2658,12 @@ If the file does not exist, create it with owner-readable-only file permissions.
<translation>Érvénytelen -tor cím: &apos;%s&apos;</translation>
</message>
<message>
- <location line="+9"/>
+ <location line="+8"/>
+ <source>Maintain a full transaction index (default: 0)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
<source>Maximum per-connection receive buffer, &lt;n&gt;*1000 bytes (default: 5000)</source>
<translation type="unfinished"/>
</message>
@@ -2437,7 +2675,7 @@ If the file does not exist, create it with owner-readable-only file permissions.
<message>
<location line="+1"/>
<source>Only accept block chain matching built-in checkpoints (default: 1)</source>
- <translation type="unfinished"/>
+ <translation>Csak blokklánccal egyező beépített ellenőrző pontok elfogadása (alapértelmezés: 1)</translation>
</message>
<message>
<location line="+1"/>
@@ -2457,15 +2695,10 @@ If the file does not exist, create it with owner-readable-only file permissions.
<message>
<location line="+2"/>
<source>Prepend debug output with timestamp</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+1"/>
- <source>Rebuild blockchain index from current blk000??.dat files</source>
- <translation type="unfinished"/>
+ <translation>Időbélyeges hibakeresési kimenet hozzáadása az elejéhez</translation>
</message>
<message>
- <location line="+4"/>
+ <location line="+5"/>
<source>SSL options: (see the Bitcoin Wiki for SSL setup instructions)</source>
<translation>SSL-opciók: (lásd a Bitcoin Wiki SSL-beállítási instrukcióit)</translation>
</message>
@@ -2477,12 +2710,12 @@ If the file does not exist, create it with owner-readable-only file permissions.
<message>
<location line="+3"/>
<source>Send trace/debug info to console instead of debug.log file</source>
- <translation type="unfinished"/>
+ <translation>trace/debug információ küldése a konzolra a debog.log fájl helyett</translation>
</message>
<message>
<location line="+1"/>
<source>Send trace/debug info to debugger</source>
- <translation type="unfinished"/>
+ <translation>trace/debug információ küldése a debuggerre</translation>
</message>
<message>
<location line="+5"/>
@@ -2505,7 +2738,12 @@ If the file does not exist, create it with owner-readable-only file permissions.
<translation>Csatlakozás időkerete milliszekundumban (alapértelmezett: 5000)</translation>
</message>
<message>
- <location line="+13"/>
+ <location line="+4"/>
+ <source>System error: </source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+10"/>
<source>Use UPnP to map the listening port (default: 0)</source>
<translation>UPnP-használat engedélyezése a figyelő port feltérképezésénél (default: 0)</translation>
</message>
@@ -2537,39 +2775,44 @@ If the file does not exist, create it with owner-readable-only file permissions.
</message>
<message>
<location line="+1"/>
+ <source>You need to rebuild the databases using -reindex to change -txindex</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>wallet.dat corrupt, salvage failed</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-43"/>
+ <location line="-45"/>
<source>Password for JSON-RPC connections</source>
<translation>Jelszó JSON-RPC csatlakozásokhoz
</translation>
</message>
<message>
- <location line="-53"/>
+ <location line="-68"/>
<source>Allow JSON-RPC connections from specified IP address</source>
<translation>JSON-RPC csatlakozások engedélyezése meghatározott IP-címről
</translation>
</message>
<message>
- <location line="+62"/>
+ <location line="+77"/>
<source>Send commands to node running on &lt;ip&gt; (default: 127.0.0.1)</source>
<translation>Parancsok küldése &lt;ip&gt; címen működő csomóponthoz (alapértelmezett: 127.0.0.1)
</translation>
</message>
<message>
- <location line="-103"/>
+ <location line="-120"/>
<source>Execute command when the best block changes (%s in cmd is replaced by block hash)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+124"/>
+ <location line="+142"/>
<source>Upgrade wallet to latest format</source>
- <translation type="unfinished"/>
+ <translation>A Tárca frissítése a legfrissebb formátumra</translation>
</message>
<message>
- <location line="-15"/>
+ <location line="-16"/>
<source>Set key pool size to &lt;n&gt; (default: 100)</source>
<translation>Kulcskarika mérete &lt;n&gt; (alapértelmezett: 100)
</translation>
@@ -2581,18 +2824,13 @@ If the file does not exist, create it with owner-readable-only file permissions.
</translation>
</message>
<message>
- <location line="-26"/>
- <source>How many blocks to check at startup (default: 2500, 0 = all)</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+55"/>
+ <location line="+30"/>
<source>Use OpenSSL (https) for JSON-RPC connections</source>
<translation>OpenSSL (https) használata JSON-RPC csatalkozásokhoz
</translation>
</message>
<message>
- <location line="-20"/>
+ <location line="-21"/>
<source>Server certificate file (default: server.cert)</source>
<translation>Szervertanúsítvány-fájl (alapértelmezett: server.cert)
</translation>
@@ -2604,13 +2842,13 @@ If the file does not exist, create it with owner-readable-only file permissions.
</translation>
</message>
<message>
- <location line="-133"/>
+ <location line="-154"/>
<source>Acceptable ciphers (default: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH)</source>
<translation>Elfogadható rejtjelkulcsok (alapértelmezett: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH )
</translation>
</message>
<message>
- <location line="+144"/>
+ <location line="+166"/>
<source>This help message</source>
<translation>Ez a súgó-üzenet
</translation>
@@ -2621,7 +2859,7 @@ If the file does not exist, create it with owner-readable-only file permissions.
<translation>A %s nem elérhető ezen a gépen (bind returned error %d, %s)</translation>
</message>
<message>
- <location line="-70"/>
+ <location line="-86"/>
<source>Connect through socks proxy</source>
<translation>Csatlakozás SOCKS proxyn keresztül</translation>
</message>
@@ -2631,12 +2869,12 @@ If the file does not exist, create it with owner-readable-only file permissions.
<translation>DNS-kikeresés engedélyezése az addnode-nál és a connect-nél</translation>
</message>
<message>
- <location line="+43"/>
+ <location line="+57"/>
<source>Loading addresses...</source>
<translation>Címek betöltése...</translation>
</message>
<message>
- <location line="-25"/>
+ <location line="-35"/>
<source>Error loading wallet.dat: Wallet corrupted</source>
<translation>Hiba a wallet.dat betöltése közben: meghibásodott tárca</translation>
</message>
@@ -2646,34 +2884,24 @@ If the file does not exist, create it with owner-readable-only file permissions.
<translation>Hiba a wallet.dat betöltése közben: ehhez a tárcához újabb verziójú Bitcoin-kliens szükséges</translation>
</message>
<message>
- <location line="+73"/>
- <source>Verifying block database integrity...</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+1"/>
- <source>Verifying wallet integrity...</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+1"/>
+ <location line="+87"/>
<source>Wallet needed to be rewritten: restart Bitcoin to complete</source>
- <translation type="unfinished"/>
+ <translation>A Tárca újraírása szükséges: Indítsa újra a teljesen a Bitcoin-t</translation>
</message>
<message>
- <location line="-77"/>
+ <location line="-89"/>
<source>Error loading wallet.dat</source>
<translation>Hiba az wallet.dat betöltése közben</translation>
</message>
<message>
- <location line="+20"/>
+ <location line="+30"/>
<source>Invalid -proxy address: &apos;%s&apos;</source>
<translation>Érvénytelen -proxy cím: &apos;%s&apos;</translation>
</message>
<message>
- <location line="+46"/>
+ <location line="+48"/>
<source>Unknown network specified in -onlynet: &apos;%s&apos;</source>
- <translation type="unfinished"/>
+ <translation>Ismeretlen hálózat lett megadva -onlynet: &apos;%s&apos;</translation>
</message>
<message>
<location line="-1"/>
@@ -2681,7 +2909,7 @@ If the file does not exist, create it with owner-readable-only file permissions.
<translation type="unfinished"/>
</message>
<message>
- <location line="-75"/>
+ <location line="-91"/>
<source>Cannot resolve -bind address: &apos;%s&apos;</source>
<translation type="unfinished"/>
</message>
@@ -2691,17 +2919,17 @@ If the file does not exist, create it with owner-readable-only file permissions.
<translation type="unfinished"/>
</message>
<message>
- <location line="+31"/>
+ <location line="+45"/>
<source>Invalid amount for -paytxfee=&lt;amount&gt;: &apos;%s&apos;</source>
<translation>Étvénytelen -paytxfee=&lt;összeg&gt; összeg: &apos;%s&apos;</translation>
</message>
<message>
- <location line="-15"/>
+ <location line="-24"/>
<source>Error: could not start node</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+16"/>
+ <location line="+25"/>
<source>Invalid amount</source>
<translation>Étvénytelen összeg</translation>
</message>
@@ -2716,7 +2944,7 @@ If the file does not exist, create it with owner-readable-only file permissions.
<translation>Blokkindex betöltése...</translation>
</message>
<message>
- <location line="-45"/>
+ <location line="-59"/>
<source>Add a node to connect to and attempt to keep the connection open</source>
<translation>Elérendő csomópont megadása and attempt to keep the connection open</translation>
</message>
@@ -2726,24 +2954,19 @@ If the file does not exist, create it with owner-readable-only file permissions.
<translation>A %s nem elérhető ezen a gépen. A Bitcoin valószínűleg fut már.</translation>
</message>
<message>
- <location line="+54"/>
- <source>Find peers using internet relay chat (default: 0)</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="-2"/>
+ <location line="+68"/>
<source>Fee per KB to add to transactions you send</source>
<translation>kB-onként felajánlandó díj az általad küldött tranzakciókhoz</translation>
</message>
<message>
- <location line="+19"/>
+ <location line="+17"/>
<source>Loading wallet...</source>
<translation>Tárca betöltése...</translation>
</message>
<message>
- <location line="-40"/>
+ <location line="-54"/>
<source>Cannot downgrade wallet</source>
- <translation type="unfinished"/>
+ <translation>Nem sikerült a Tárca visszaállítása a korábbi verzióra</translation>
</message>
<message>
<location line="+1"/>
@@ -2756,27 +2979,27 @@ If the file does not exist, create it with owner-readable-only file permissions.
<translation type="unfinished"/>
</message>
<message>
- <location line="+49"/>
+ <location line="+64"/>
<source>Rescanning...</source>
<translation>Újraszkennelés...</translation>
</message>
<message>
- <location line="-43"/>
+ <location line="-56"/>
<source>Done loading</source>
<translation>Betöltés befejezve.</translation>
</message>
<message>
- <location line="+65"/>
+ <location line="+79"/>
<source>To use the %s option</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-60"/>
+ <location line="-71"/>
<source>Error</source>
<translation>Hiba</translation>
</message>
<message>
- <location line="-28"/>
+ <location line="-33"/>
<source>You must set rpcpassword=&lt;password&gt; in the configuration file:
%s
If the file does not exist, create it with owner-readable-only file permissions.</source>
diff --git a/src/qt/locale/bitcoin_it.ts b/src/qt/locale/bitcoin_it.ts
index 868eb58b0f..860fd5ee32 100644
--- a/src/qt/locale/bitcoin_it.ts
+++ b/src/qt/locale/bitcoin_it.ts
@@ -13,12 +13,7 @@
<translation>Versione di &lt;b&gt;Bitcoin&lt;/b&gt;</translation>
</message>
<message>
- <location line="+41"/>
- <source>Copyright © 2009-2012 The Bitcoin developers</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+13"/>
+ <location line="+57"/>
<source>
This is experimental software.
@@ -32,6 +27,16 @@ Distribuito sotto la licenza software MIT/X11, vedi il file COPYING incluso oppu
Questo prodotto include software sviluppato dal progetto OpenSSL per l&apos;uso del Toolkit OpenSSL (http://www.openssl.org/), software crittografico scritto da Eric Young (eay@cryptsoft.com) e software UPnP scritto da Thomas Bernard.</translation>
</message>
+ <message>
+ <location filename="../aboutdialog.cpp" line="+17"/>
+ <source>Copyright</source>
+ <translation>Copyright</translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>2009-%1 The Bitcoin developers</source>
+ <translation>2009-%1 Gli sviluppatori di Bitcoin</translation>
+ </message>
</context>
<context>
<name>AddressBookPage</name>
@@ -88,12 +93,12 @@ Questo prodotto include software sviluppato dal progetto OpenSSL per l&apos;uso
<message>
<location line="+25"/>
<source>Delete the currently selected address from the list</source>
- <translation type="unfinished"/>
+ <translation>Cancella l&apos;indirizzo attualmente selezionato dalla lista</translation>
</message>
<message>
<location line="-14"/>
<source>Verify a message to ensure it was signed with a specified Bitcoin address</source>
- <translation type="unfinished"/>
+ <translation>Verifica un messaggio per accertarsi che sia firmato con un indirizzo Bitcoin specifico</translation>
</message>
<message>
<location line="+3"/>
@@ -106,17 +111,22 @@ Questo prodotto include software sviluppato dal progetto OpenSSL per l&apos;uso
<translation>&amp;Cancella</translation>
</message>
<message>
- <location filename="../addressbookpage.cpp" line="+65"/>
+ <location filename="../addressbookpage.cpp" line="+66"/>
<source>Copy &amp;Label</source>
<translation>Copia &amp;l&apos;etichetta</translation>
</message>
<message>
- <location line="+2"/>
+ <location line="+1"/>
<source>&amp;Edit</source>
<translation>&amp;Modifica</translation>
</message>
<message>
- <location line="+250"/>
+ <location line="+1"/>
+ <source>Send &amp;Coins</source>
+ <translation>Invia &amp;Bitcoin</translation>
+ </message>
+ <message>
+ <location line="+263"/>
<source>Export Address Book Data</source>
<translation>Esporta gli indirizzi della rubrica</translation>
</message>
@@ -139,7 +149,7 @@ Questo prodotto include software sviluppato dal progetto OpenSSL per l&apos;uso
<context>
<name>AddressTableModel</name>
<message>
- <location filename="../addresstablemodel.cpp" line="+142"/>
+ <location filename="../addresstablemodel.cpp" line="+144"/>
<source>Label</source>
<translation>Etichetta</translation>
</message>
@@ -234,7 +244,7 @@ Questo prodotto include software sviluppato dal progetto OpenSSL per l&apos;uso
<message>
<location line="+15"/>
<source>IMPORTANT: Any previous backups you have made of your wallet file should be replaced with the newly generated, encrypted wallet file. For security reasons, previous backups of the unencrypted wallet file will become useless as soon as you start using the new, encrypted wallet.</source>
- <translation type="unfinished"/>
+ <translation>IMPORTANTE: qualsiasi backup del portafoglio effettuato precedentemente dovrebbe essere sostituito con il file del portafoglio criptato appena generato. Per ragioni di sicurezza, i backup precedenti del file del portafoglio non criptato diventeranno inservibili non appena si inizi ad usare il nuovo portafoglio criptato.</translation>
</message>
<message>
<location line="+100"/>
@@ -298,17 +308,17 @@ Questo prodotto include software sviluppato dal progetto OpenSSL per l&apos;uso
<context>
<name>BitcoinGUI</name>
<message>
- <location filename="../bitcoingui.cpp" line="+267"/>
+ <location filename="../bitcoingui.cpp" line="+231"/>
<source>Sign &amp;message...</source>
<translation>Firma il &amp;messaggio...</translation>
</message>
<message>
- <location line="+254"/>
+ <location line="+299"/>
<source>Synchronizing with network...</source>
<translation>Sto sincronizzando con la rete...</translation>
</message>
<message>
- <location line="-322"/>
+ <location line="-367"/>
<source>&amp;Overview</source>
<translation>&amp;Sintesi</translation>
</message>
@@ -328,32 +338,17 @@ Questo prodotto include software sviluppato dal progetto OpenSSL per l&apos;uso
<translation>Cerca nelle transazioni</translation>
</message>
<message>
- <location line="+6"/>
- <source>&amp;Address Book</source>
- <translation>&amp;Rubrica</translation>
- </message>
- <message>
- <location line="+1"/>
+ <location line="+7"/>
<source>Edit the list of stored addresses and labels</source>
<translation>Modifica la lista degli indirizzi salvati e delle etichette</translation>
</message>
<message>
- <location line="-15"/>
- <source>&amp;Receive coins</source>
- <translation>&amp;Ricevi monete</translation>
- </message>
- <message>
- <location line="+1"/>
+ <location line="-14"/>
<source>Show the list of addresses for receiving payments</source>
<translation>Mostra la lista di indirizzi su cui ricevere pagamenti</translation>
</message>
<message>
- <location line="-8"/>
- <source>&amp;Send coins</source>
- <translation>&amp;Invia monete</translation>
- </message>
- <message>
- <location line="+39"/>
+ <location line="+31"/>
<source>E&amp;xit</source>
<translation>&amp;Esci</translation>
</message>
@@ -398,22 +393,17 @@ Questo prodotto include software sviluppato dal progetto OpenSSL per l&apos;uso
<translation>&amp;Cambia la passphrase...</translation>
</message>
<message>
- <location line="+259"/>
+ <location line="+304"/>
<source>Importing blocks from disk...</source>
<translation>Importa blocchi dal disco...</translation>
</message>
<message>
<location line="+3"/>
<source>Reindexing blocks on disk...</source>
- <translation type="unfinished"/>
- </message>
- <message numerus="yes">
- <location line="+10"/>
- <source>~%n block(s) remaining</source>
- <translation><numerusform>~%n blocco rimanente</numerusform><numerusform>~%n blocchi rimanenti</numerusform></translation>
+ <translation>Re-indicizzazione blocchi su disco...</translation>
</message>
<message>
- <location line="-265"/>
+ <location line="-300"/>
<source>&amp;Export...</source>
<translation>&amp;Esporta...</translation>
</message>
@@ -458,18 +448,33 @@ Questo prodotto include software sviluppato dal progetto OpenSSL per l&apos;uso
<translation>&amp;Verifica messaggio...</translation>
</message>
<message>
- <location line="-196"/>
- <location line="+538"/>
+ <location line="-162"/>
+ <location line="+540"/>
<source>Bitcoin</source>
<translation>Bitcoin</translation>
</message>
<message>
- <location line="-538"/>
+ <location line="-540"/>
<source>Wallet</source>
<translation>Portamonete</translation>
</message>
<message>
- <location line="+176"/>
+ <location line="+99"/>
+ <source>&amp;Send</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+7"/>
+ <source>&amp;Receive</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+14"/>
+ <source>&amp;Addresses</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+22"/>
<source>&amp;About Bitcoin</source>
<translation>&amp;Info su Bitcoin</translation>
</message>
@@ -486,17 +491,17 @@ Questo prodotto include software sviluppato dal progetto OpenSSL per l&apos;uso
<message>
<location line="+2"/>
<source>Encrypt the private keys that belong to your wallet</source>
- <translation type="unfinished"/>
+ <translation>Crittografa le chiavi private che appartengono al tuo portafoglio</translation>
</message>
<message>
<location line="+7"/>
<source>Sign messages with your Bitcoin addresses to prove you own them</source>
- <translation type="unfinished"/>
+ <translation>Firma i messaggi con il tuo indirizzo Bitcoin per dimostrare di possederli</translation>
</message>
<message>
<location line="+2"/>
<source>Verify messages to ensure they were signed with specified Bitcoin addresses</source>
- <translation type="unfinished"/>
+ <translation>Verifica i messaggi per accertarsi che siano stati firmati con gli indirizzi Bitcoin specificati</translation>
</message>
<message>
<location line="+31"/>
@@ -530,97 +535,92 @@ Questo prodotto include software sviluppato dal progetto OpenSSL per l&apos;uso
<translation>[testnet]</translation>
</message>
<message>
- <location line="+63"/>
+ <location line="+47"/>
<source>Bitcoin client</source>
<translation>Bitcoin client</translation>
</message>
<message numerus="yes">
- <location line="+79"/>
+ <location line="+140"/>
<source>%n active connection(s) to Bitcoin network</source>
<translation><numerusform>%n connessione attiva alla rete Bitcoin</numerusform><numerusform>%n connessioni attive alla rete Bitcoin</numerusform></translation>
</message>
<message>
- <location line="+45"/>
- <source>Processed %1 of %2 blocks of transaction history (%3% done).</source>
- <translation type="unfinished"/>
+ <location line="+39"/>
+ <source>Processed %1 of %2 (estimated) blocks of transaction history.</source>
+ <translation>Processati %1 di %2 (circa) blocchi della cronologia transazioni.</translation>
</message>
<message>
- <location line="+7"/>
+ <location line="+4"/>
<source>Processed %1 blocks of transaction history.</source>
+ <translation>Processati %1 blocchi della cronologia transazioni.</translation>
+ </message>
+ <message numerus="yes">
+ <location line="+20"/>
+ <source>%n hour(s)</source>
+ <translation><numerusform>%n ora</numerusform><numerusform>%n ore</numerusform></translation>
+ </message>
+ <message numerus="yes">
+ <location line="+4"/>
+ <source>%n day(s)</source>
+ <translation><numerusform>%n giorno</numerusform><numerusform>%n giorni</numerusform></translation>
+ </message>
+ <message numerus="yes">
+ <location line="+4"/>
+ <source>%n week(s)</source>
+ <translation><numerusform>%n settimana</numerusform><numerusform>%n settimane</numerusform></translation>
+ </message>
+ <message>
+ <location line="+5"/>
+ <source>%1 behind</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+70"/>
- <source>Error</source>
+ <location line="+14"/>
+ <source>Last received block was generated %1 ago.</source>
+ <translation>L&apos;ultimo blocco ricevuto è stato generato %1 fa.</translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Transactions after this will not yet be visible.</source>
<translation type="unfinished"/>
</message>
<message>
+ <location line="+21"/>
+ <source>Error</source>
+ <translation>Errore</translation>
+ </message>
+ <message>
<location line="+3"/>
<source>Warning</source>
- <translation type="unfinished"/>
+ <translation>Attenzione</translation>
</message>
<message>
<location line="+3"/>
<source>Information</source>
- <translation type="unfinished"/>
+ <translation>Informazione</translation>
</message>
<message>
- <location line="+66"/>
+ <location line="+68"/>
<source>This transaction is over the size limit. You can still send it for a fee of %1, which goes to the nodes that process your transaction and helps to support the network. Do you want to pay the fee?</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+210"/>
- <source>Backup Successful</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+0"/>
- <source>The wallet data was successfully saved to the new location.</source>
- <translation type="unfinished"/>
- </message>
- <message numerus="yes">
- <location line="-338"/>
- <source>%n second(s) ago</source>
- <translation><numerusform>%n secondo fa</numerusform><numerusform>%n secondi fa</numerusform></translation>
- </message>
- <message numerus="yes">
- <location line="+4"/>
- <source>%n minute(s) ago</source>
- <translation><numerusform>%n minuto fa</numerusform><numerusform>%n minuti fa</numerusform></translation>
- </message>
- <message numerus="yes">
- <location line="+4"/>
- <source>%n hour(s) ago</source>
- <translation><numerusform>%n ora fa</numerusform><numerusform>%n ore fa</numerusform></translation>
- </message>
- <message numerus="yes">
- <location line="+4"/>
- <source>%n day(s) ago</source>
- <translation><numerusform>%n giorno fa</numerusform><numerusform>%n giorni fa</numerusform></translation>
- </message>
- <message>
- <location line="+6"/>
+ <location line="-138"/>
<source>Up to date</source>
<translation>Aggiornato</translation>
</message>
<message>
- <location line="+7"/>
+ <location line="+32"/>
<source>Catching up...</source>
<translation>In aggiornamento...</translation>
</message>
<message>
- <location line="+10"/>
- <source>Last received block was generated %1.</source>
- <translation>L&apos;ultimo blocco ricevuto è stato generato %1</translation>
- </message>
- <message>
- <location line="+97"/>
+ <location line="+110"/>
<source>Confirm transaction fee</source>
<translation>Conferma compenso transazione</translation>
</message>
<message>
- <location line="+23"/>
+ <location line="+8"/>
<source>Sent transaction</source>
<translation>Transazione inviata</translation>
</message>
@@ -644,16 +644,16 @@ Indirizzo: %4
</translation>
</message>
<message>
- <location line="+99"/>
- <location line="+28"/>
+ <location line="+33"/>
+ <location line="+23"/>
<source>URI handling</source>
- <translation type="unfinished"/>
+ <translation>Gestione URI</translation>
</message>
<message>
- <location line="-28"/>
- <location line="+28"/>
+ <location line="-23"/>
+ <location line="+23"/>
<source>URI can not be parsed! This can be caused by an invalid Bitcoin address or malformed URI parameters.</source>
- <translation type="unfinished"/>
+ <translation>Impossibile interpretare l&apos;URI! Ciò può essere causato da un indirizzo Bitcoin invalido o da parametri URI non corretti.</translation>
</message>
<message>
<location line="+17"/>
@@ -666,35 +666,15 @@ Indirizzo: %4
<translation>Il portamonete è &lt;b&gt;cifrato&lt;/b&gt; e attualmente &lt;b&gt;bloccato&lt;/b&gt;</translation>
</message>
<message>
- <location line="+23"/>
- <source>Backup Wallet</source>
- <translation>Backup Portamonete</translation>
- </message>
- <message>
- <location line="+0"/>
- <source>Wallet Data (*.dat)</source>
- <translation>Dati Portamonete (*.dat)</translation>
- </message>
- <message>
- <location line="+3"/>
- <source>Backup Failed</source>
- <translation>Backup fallito</translation>
- </message>
- <message>
- <location line="+0"/>
- <source>There was an error trying to save the wallet data to the new location.</source>
- <translation>C&apos;è stato un errore tentanto di salvare i dati del portamonete in un&apos;altra locazione</translation>
- </message>
- <message>
- <location filename="../bitcoin.cpp" line="+109"/>
+ <location filename="../bitcoin.cpp" line="+108"/>
<source>A fatal error occurred. Bitcoin can no longer continue safely and will quit.</source>
- <translation type="unfinished"/>
+ <translation>Riscontrato un errore irreversibile. Bitcoin non può più continuare in sicurezza e verrà terminato.</translation>
</message>
</context>
<context>
<name>ClientModel</name>
<message>
- <location filename="../clientmodel.cpp" line="+86"/>
+ <location filename="../clientmodel.cpp" line="+96"/>
<source>Network Alert</source>
<translation>Avviso di rete</translation>
</message>
@@ -727,7 +707,7 @@ Indirizzo: %4
<translation>L&apos;indirizzo associato a questa voce della rubrica. Si può modificare solo negli indirizzi di spedizione.</translation>
</message>
<message>
- <location filename="../editaddressdialog.cpp" line="+20"/>
+ <location filename="../editaddressdialog.cpp" line="+21"/>
<source>New receiving address</source>
<translation>Nuovo indirizzo di ricezione</translation>
</message>
@@ -747,17 +727,17 @@ Indirizzo: %4
<translation>Modifica indirizzo d&apos;invio</translation>
</message>
<message>
- <location line="+60"/>
+ <location line="+76"/>
<source>The entered address &quot;%1&quot; is already in the address book.</source>
<translation>L&apos;indirizzo inserito &quot;%1&quot; è già in rubrica.</translation>
</message>
<message>
- <location line="+5"/>
+ <location line="-5"/>
<source>The entered address &quot;%1&quot; is not a valid Bitcoin address.</source>
<translation>L&apos;indirizzo inserito &quot;%1&quot; non è un indirizzo bitcoin valido.</translation>
</message>
<message>
- <location line="+5"/>
+ <location line="+10"/>
<source>Could not unlock wallet.</source>
<translation>Impossibile sbloccare il portamonete.</translation>
</message>
@@ -770,7 +750,7 @@ Indirizzo: %4
<context>
<name>GUIUtil::HelpMessageBox</name>
<message>
- <location filename="../guiutil.cpp" line="+419"/>
+ <location filename="../guiutil.cpp" line="+422"/>
<location line="+12"/>
<source>Bitcoin-Qt</source>
<translation>Bitcoin-Qt</translation>
@@ -847,12 +827,12 @@ Indirizzo: %4
<message>
<location line="+35"/>
<source>Reset all client options to default.</source>
- <translation type="unfinished"/>
+ <translation>Ripristina tutte le opzioni del client alle predefinite.</translation>
</message>
<message>
<location line="+3"/>
<source>&amp;Reset Options</source>
- <translation type="unfinished"/>
+ <translation>&amp;Ripristina Opzioni</translation>
</message>
<message>
<location line="+13"/>
@@ -907,12 +887,12 @@ Indirizzo: %4
<message>
<location line="+13"/>
<source>SOCKS version of the proxy (e.g. 5)</source>
- <translation type="unfinished"/>
+ <translation>Versione SOCKS del proxy (es. 5)</translation>
</message>
<message>
<location line="+36"/>
<source>&amp;Window</source>
- <translation type="unfinished"/>
+ <translation>&amp;Finestra</translation>
</message>
<message>
<location line="+6"/>
@@ -947,7 +927,7 @@ Indirizzo: %4
<message>
<location line="+13"/>
<source>The user interface language can be set here. This setting will take effect after restarting Bitcoin.</source>
- <translation type="unfinished"/>
+ <translation>La lingua dell&apos;interfaccia utente può essere impostata qui. L&apos;impostazione avrà effetto dopo il riavvio di Bitcoin.</translation>
</message>
<message>
<location line="+11"/>
@@ -962,7 +942,7 @@ Indirizzo: %4
<message>
<location line="+9"/>
<source>Whether to show Bitcoin addresses in the transaction list or not.</source>
- <translation type="unfinished"/>
+ <translation>Se mostrare l&apos;indirizzo Bitcoin nella transazione o meno.</translation>
</message>
<message>
<location line="+3"/>
@@ -985,24 +965,24 @@ Indirizzo: %4
<translation>&amp;Applica</translation>
</message>
<message>
- <location filename="../optionsdialog.cpp" line="+55"/>
+ <location filename="../optionsdialog.cpp" line="+53"/>
<source>default</source>
<translation>default</translation>
</message>
<message>
<location line="+130"/>
<source>Confirm options reset</source>
- <translation type="unfinished"/>
+ <translation>Conferma ripristino opzioni</translation>
</message>
<message>
<location line="+1"/>
<source>Some settings may require a client restart to take effect.</source>
- <translation type="unfinished"/>
+ <translation>Alcune modifiche necessitano del riavvio del programma per essere salvate.</translation>
</message>
<message>
<location line="+0"/>
<source>Do you want to proceed?</source>
- <translation type="unfinished"/>
+ <translation>Vuoi procedere?</translation>
</message>
<message>
<location line="+42"/>
@@ -1014,12 +994,12 @@ Indirizzo: %4
<location line="-9"/>
<location line="+9"/>
<source>This setting will take effect after restarting Bitcoin.</source>
- <translation type="unfinished"/>
+ <translation>L&apos;impostazione avrà effetto dopo il riavvio di Bitcoin.</translation>
</message>
<message>
<location line="+29"/>
<source>The supplied proxy address is invalid.</source>
- <translation type="unfinished"/>
+ <translation>L&apos;indirizzo proxy che hai fornito è invalido.</translation>
</message>
</context>
<context>
@@ -1030,23 +1010,18 @@ Indirizzo: %4
<translation>Modulo</translation>
</message>
<message>
- <location line="+51"/>
- <location line="+183"/>
+ <location line="+50"/>
+ <location line="+166"/>
<source>The displayed information may be out of date. Your wallet automatically synchronizes with the Bitcoin network after a connection is established, but this process has not completed yet.</source>
<translation>Le informazioni visualizzate sono datate. Il tuo partafogli verrà sincronizzato automaticamente con il network Bitcoin dopo che la connessione è stabilita, ma questo processo non può essere completato ora.</translation>
</message>
<message>
- <location line="-141"/>
+ <location line="-124"/>
<source>Balance:</source>
<translation>Saldo</translation>
</message>
<message>
- <location line="+58"/>
- <source>Number of transactions:</source>
- <translation>Numero di transazioni:</translation>
- </message>
- <message>
- <location line="-29"/>
+ <location line="+29"/>
<source>Unconfirmed:</source>
<translation>Non confermato:</translation>
</message>
@@ -1056,14 +1031,14 @@ Indirizzo: %4
<translation>Portamonete</translation>
</message>
<message>
- <location line="+124"/>
+ <location line="+107"/>
<source>Immature:</source>
- <translation type="unfinished"/>
+ <translation>Immaturo:</translation>
</message>
<message>
<location line="+13"/>
<source>Mined balance that has not yet matured</source>
- <translation type="unfinished"/>
+ <translation>Importo scavato che non è ancora maturato</translation>
</message>
<message>
<location line="+46"/>
@@ -1071,7 +1046,7 @@ Indirizzo: %4
<translation>&lt;b&gt;Transazioni recenti&lt;/b&gt;</translation>
</message>
<message>
- <location line="-118"/>
+ <location line="-101"/>
<source>Your current balance</source>
<translation>Saldo attuale</translation>
</message>
@@ -1081,11 +1056,6 @@ Indirizzo: %4
<translation>Totale delle transazioni in corso di conferma, che non sono ancora incluse nel saldo attuale</translation>
</message>
<message>
- <location line="+20"/>
- <source>Total number of transactions in wallet</source>
- <translation>Numero delle transazioni effettuate</translation>
- </message>
- <message>
<location filename="../overviewpage.cpp" line="+115"/>
<location line="+1"/>
<source>out of sync</source>
@@ -1093,6 +1063,14 @@ Indirizzo: %4
</message>
</context>
<context>
+ <name>PaymentServer</name>
+ <message>
+ <location filename="../paymentserver.cpp" line="+107"/>
+ <source>Cannot start bitcoin: click-to-pay handler</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>QRCodeDialog</name>
<message>
<location filename="../forms/qrcodedialog.ui" line="+14"/>
@@ -1132,7 +1110,7 @@ Indirizzo: %4
<message>
<location line="+40"/>
<source>The entered amount is invalid, please check.</source>
- <translation type="unfinished"/>
+ <translation>L&apos;importo specificato non è valido, prego verificare.</translation>
</message>
<message>
<location line="+23"/>
@@ -1184,7 +1162,7 @@ Indirizzo: %4
<message>
<location line="+68"/>
<source>Using OpenSSL version</source>
- <translation type="unfinished"/>
+ <translation>Versione OpenSSL in uso</translation>
</message>
<message>
<location line="+49"/>
@@ -1239,7 +1217,7 @@ Indirizzo: %4
<message>
<location line="+7"/>
<source>Show the Bitcoin-Qt help message to get a list with possible Bitcoin command-line options.</source>
- <translation type="unfinished"/>
+ <translation>Mostra il messaggio di aiuto di Bitcoin-QT per avere la lista di tutte le opzioni della riga di comando di Bitcoin.</translation>
</message>
<message>
<location line="+3"/>
@@ -1269,12 +1247,12 @@ Indirizzo: %4
<message>
<location line="+279"/>
<source>Debug log file</source>
- <translation type="unfinished"/>
+ <translation>File log del Debug</translation>
</message>
<message>
<location line="+7"/>
<source>Open the Bitcoin debug log file from the current data directory. This can take a few seconds for large log files.</source>
- <translation type="unfinished"/>
+ <translation>Apri il file di log del debug di Bitcoin dalla cartella attuale. Può richiedere alcuni secondi per file di log grandi.</translation>
</message>
<message>
<location line="+102"/>
@@ -1431,7 +1409,7 @@ Indirizzo: %4
</message>
<message>
<location line="+60"/>
- <location filename="../sendcoinsentry.cpp" line="+25"/>
+ <location filename="../sendcoinsentry.cpp" line="+26"/>
<source>Enter a label for this address to add it to your address book</source>
<translation>Inserisci un&apos;etichetta per questo indirizzo, per aggiungerlo nella rubrica</translation>
</message>
@@ -1523,12 +1501,12 @@ Indirizzo: %4
<message>
<location line="+7"/>
<source>Signature</source>
- <translation type="unfinished"/>
+ <translation>Firma</translation>
</message>
<message>
<location line="+27"/>
<source>Copy the current signature to the system clipboard</source>
- <translation type="unfinished"/>
+ <translation>Copia la firma corrente nella clipboard</translation>
</message>
<message>
<location line="+21"/>
@@ -1543,7 +1521,7 @@ Indirizzo: %4
<message>
<location line="+14"/>
<source>Reset all sign message fields</source>
- <translation type="unfinished"/>
+ <translation>Reimposta tutti i campi della firma</translation>
</message>
<message>
<location line="+3"/>
@@ -1569,7 +1547,7 @@ Indirizzo: %4
<message>
<location line="+40"/>
<source>Verify the message to ensure it was signed with the specified Bitcoin address</source>
- <translation type="unfinished"/>
+ <translation>Verifica il messaggio per assicurarsi che sia stato firmato con l&apos;indirizzo Bitcoin specificato</translation>
</message>
<message>
<location line="+3"/>
@@ -1579,7 +1557,7 @@ Indirizzo: %4
<message>
<location line="+14"/>
<source>Reset all verify message fields</source>
- <translation type="unfinished"/>
+ <translation>Reimposta tutti i campi della verifica messaggio</translation>
</message>
<message>
<location filename="../signverifymessagedialog.cpp" line="+27"/>
@@ -1595,7 +1573,7 @@ Indirizzo: %4
<message>
<location line="+3"/>
<source>Enter Bitcoin signature</source>
- <translation type="unfinished"/>
+ <translation>Inserisci firma Bitcoin</translation>
</message>
<message>
<location line="+82"/>
@@ -1615,17 +1593,17 @@ Indirizzo: %4
<location line="-81"/>
<location line="+81"/>
<source>The entered address does not refer to a key.</source>
- <translation type="unfinished"/>
+ <translation>L&apos;indirizzo bitcoin inserito non è associato a nessuna chiave.</translation>
</message>
<message>
<location line="-73"/>
<source>Wallet unlock was cancelled.</source>
- <translation type="unfinished"/>
+ <translation>Sblocco del portafoglio annullato.</translation>
</message>
<message>
<location line="+8"/>
<source>Private key for the entered address is not available.</source>
- <translation type="unfinished"/>
+ <translation>La chiave privata per l&apos;indirizzo inserito non è disponibile.</translation>
</message>
<message>
<location line="+12"/>
@@ -1667,14 +1645,14 @@ Indirizzo: %4
<context>
<name>TransactionDesc</name>
<message>
- <location filename="../transactiondesc.cpp" line="+19"/>
+ <location filename="../transactiondesc.cpp" line="+20"/>
<source>Open until %1</source>
<translation>Aperto fino a %1</translation>
</message>
<message>
<location line="+6"/>
<source>%1/offline</source>
- <translation type="unfinished"/>
+ <translation>%1/offline</translation>
</message>
<message>
<location line="+2"/>
@@ -1694,7 +1672,7 @@ Indirizzo: %4
<message numerus="yes">
<location line="+7"/>
<source>, broadcast through %n node(s)</source>
- <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+ <translation><numerusform>, trasmesso attraverso %n nodo</numerusform><numerusform>, trasmesso attraverso %n nodi</numerusform></translation>
</message>
<message>
<location line="+4"/>
@@ -1704,7 +1682,7 @@ Indirizzo: %4
<message>
<location line="+7"/>
<source>Source</source>
- <translation type="unfinished"/>
+ <translation>Sorgente</translation>
</message>
<message>
<location line="+0"/>
@@ -1722,13 +1700,13 @@ Indirizzo: %4
<location line="+22"/>
<location line="+58"/>
<source>To</source>
- <translation type="unfinished"/>
+ <translation>A</translation>
</message>
<message>
<location line="-77"/>
<location line="+2"/>
<source>own address</source>
- <translation type="unfinished"/>
+ <translation>proprio indirizzo</translation>
</message>
<message>
<location line="-2"/>
@@ -1747,7 +1725,7 @@ Indirizzo: %4
<message numerus="yes">
<location line="-102"/>
<source>matures in %n more block(s)</source>
- <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+ <translation><numerusform>matura in %n ulteriore blocco</numerusform><numerusform>matura in altri %n blocchi</numerusform></translation>
</message>
<message>
<location line="+2"/>
@@ -1805,7 +1783,7 @@ Indirizzo: %4
<message>
<location line="+3"/>
<source>Inputs</source>
- <translation type="unfinished"/>
+ <translation>Input</translation>
</message>
<message>
<location line="+23"/>
@@ -1854,7 +1832,7 @@ Indirizzo: %4
<context>
<name>TransactionTableModel</name>
<message>
- <location filename="../transactiontablemodel.cpp" line="+226"/>
+ <location filename="../transactiontablemodel.cpp" line="+225"/>
<source>Date</source>
<translation>Data</translation>
</message>
@@ -1972,7 +1950,7 @@ Indirizzo: %4
<context>
<name>TransactionView</name>
<message>
- <location filename="../transactionview.cpp" line="+55"/>
+ <location filename="../transactionview.cpp" line="+52"/>
<location line="+16"/>
<source>All</source>
<translation>Tutti</translation>
@@ -2059,6 +2037,11 @@ Indirizzo: %4
</message>
<message>
<location line="+1"/>
+ <source>Copy transaction ID</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Edit label</source>
<translation>Modifica l&apos;etichetta</translation>
</message>
@@ -2068,7 +2051,7 @@ Indirizzo: %4
<translation>Mostra i dettagli della transazione</translation>
</message>
<message>
- <location line="+142"/>
+ <location line="+139"/>
<source>Export Transaction Data</source>
<translation>Esporta i dati della transazione</translation>
</message>
@@ -2123,7 +2106,7 @@ Indirizzo: %4
<translation>Impossibile scrivere sul file %1.</translation>
</message>
<message>
- <location line="+95"/>
+ <location line="+100"/>
<source>Range:</source>
<translation>Intervallo:</translation>
</message>
@@ -2134,31 +2117,174 @@ Indirizzo: %4
</message>
</context>
<context>
+ <name>WalletView</name>
+ <message>
+ <location filename="../walletview.cpp" line="+95"/>
+ <source>&amp;Overview</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Show general overview of wallet</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>&amp;Send coins</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Send coins to a Bitcoin address</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>&amp;Receive coins</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Show the list of addresses for receiving payments</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>&amp;Transactions</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Browse transaction history</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>&amp;Address Book</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Edit the list of stored addresses and labels</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+12"/>
+ <source>&amp;Encrypt Wallet...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Encrypt the private keys that belong to your wallet</source>
+ <translation>Crittografa le chiavi private che appartengono al tuo portafoglio</translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>&amp;Backup Wallet...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Backup wallet to another location</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>&amp;Change Passphrase...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Change the passphrase used for wallet encryption</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Sign &amp;message...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Sign messages with your Bitcoin addresses to prove you own them</source>
+ <translation>Firma i messaggi con il tuo indirizzo Bitcoin per dimostrare di possederli</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>&amp;Verify message...</source>
+ <translation>&amp;Verifica messaggio...</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Verify messages to ensure they were signed with specified Bitcoin addresses</source>
+ <translation>Verifica i messaggi per accertarsi che siano stati firmati con gli indirizzi Bitcoin specificati</translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>&amp;Export...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Export the data in the current tab to a file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+180"/>
+ <source>Backup Wallet</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>Wallet Data (*.dat)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Backup Failed</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>There was an error trying to save the wallet data to the new location.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>Backup Successful</source>
+ <translation>Backup eseguito con successo</translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>The wallet data was successfully saved to the new location.</source>
+ <translation>Il portafoglio è stato correttamente salvato nella nuova cartella.</translation>
+ </message>
+</context>
+<context>
<name>bitcoin-core</name>
<message>
- <location filename="../bitcoinstrings.cpp" line="+88"/>
+ <location filename="../bitcoinstrings.cpp" line="+96"/>
<source>Bitcoin version</source>
<translation>Versione di Bitcoin</translation>
</message>
<message>
- <location line="+82"/>
+ <location line="+98"/>
<source>Usage:</source>
<translation>Utilizzo:</translation>
</message>
<message>
- <location line="-23"/>
+ <location line="-24"/>
<source>Send command to -server or bitcoind</source>
<translation>Manda il comando a -server o bitcoind
</translation>
</message>
<message>
- <location line="-21"/>
+ <location line="-22"/>
<source>List commands</source>
<translation>Lista comandi
</translation>
</message>
<message>
- <location line="-11"/>
+ <location line="-10"/>
<source>Get help for a command</source>
<translation>Aiuto su un comando
</translation>
@@ -2188,13 +2314,13 @@ Indirizzo: %4
</translation>
</message>
<message>
- <location line="-15"/>
+ <location line="-28"/>
<source>Don&apos;t generate coins</source>
<translation>Non generare Bitcoin
</translation>
</message>
<message>
- <location line="+61"/>
+ <location line="+74"/>
<source>Specify data directory</source>
<translation>Specifica la cartella dati
</translation>
@@ -2205,83 +2331,85 @@ Indirizzo: %4
<translation>Imposta la dimensione cache del database in megabyte (default: 25)</translation>
</message>
<message>
- <location line="-26"/>
+ <location line="-27"/>
<source>Listen for connections on &lt;port&gt; (default: 8333 or testnet: 18333)</source>
<translation>Ascolta le connessioni JSON-RPC su &lt;porta&gt; (default: 8333 o testnet: 18333)</translation>
</message>
<message>
- <location line="+4"/>
+ <location line="+5"/>
<source>Maintain at most &lt;n&gt; connections to peers (default: 125)</source>
<translation>Mantieni al massimo &lt;n&gt; connessioni ai peer (default: 125)</translation>
</message>
<message>
- <location line="-34"/>
+ <location line="-49"/>
<source>Connect to a node to retrieve peer addresses, and disconnect</source>
<translation>Connessione ad un nodo per ricevere l&apos;indirizzo del peer, e disconnessione</translation>
</message>
<message>
- <location line="+65"/>
+ <location line="+80"/>
<source>Specify your own public address</source>
<translation>Specifica il tuo indirizzo pubblico</translation>
</message>
<message>
- <location line="+2"/>
+ <location line="+3"/>
<source>Threshold for disconnecting misbehaving peers (default: 100)</source>
<translation>Soglia di disconnessione dei peer di cattiva qualità (default: 100)</translation>
</message>
<message>
- <location line="-114"/>
+ <location line="-132"/>
<source>Number of seconds to keep misbehaving peers from reconnecting (default: 86400)</source>
<translation>Numero di secondi di sospensione che i peer di cattiva qualità devono trascorrere prima di riconnettersi (default: 86400)</translation>
</message>
<message>
- <location line="-28"/>
+ <location line="-32"/>
<source>An error occurred while setting up the RPC port %u for listening on IPv4: %s</source>
- <translation type="unfinished"/>
+ <translation>Errore riscontrato durante l&apos;impostazione della porta RPC %u per l&apos;ascolto su IPv4: %s</translation>
</message>
<message>
- <location line="+26"/>
+ <location line="+30"/>
<source>Listen for JSON-RPC connections on &lt;port&gt; (default: 8332 or testnet: 18332)</source>
<translation>Attendi le connessioni JSON-RPC su &lt;porta&gt; (default: 8332 or testnet: 18332)</translation>
</message>
<message>
- <location line="+34"/>
+ <location line="+36"/>
<source>Accept command line and JSON-RPC commands</source>
<translation>Accetta da linea di comando e da comandi JSON-RPC
</translation>
</message>
<message>
- <location line="+62"/>
+ <location line="+77"/>
<source>Run in the background as a daemon and accept commands</source>
<translation>Esegui in background come demone e accetta i comandi
</translation>
</message>
<message>
- <location line="+31"/>
+ <location line="+32"/>
<source>Use the test network</source>
<translation>Utilizza la rete di prova
</translation>
</message>
<message>
- <location line="-92"/>
+ <location line="-108"/>
<source>Accept connections from outside (default: 1 if no -proxy or -connect)</source>
- <translation type="unfinished"/>
+ <translation>Accetta connessioni dall&apos;esterno (default: 1 se no -proxy o -connect)</translation>
</message>
<message>
- <location line="-74"/>
+ <location line="-82"/>
<source>%s, you must set a rpcpassword in the configuration file:
- %s
+%s
It is recommended you use the following random password:
rpcuser=bitcoinrpc
rpcpassword=%s
(you do not need to remember this password)
The username and password MUST NOT be the same.
If the file does not exist, create it with owner-readable-only file permissions.
+It is also recommended to set alertnotify so you are notified of problems;
+for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.com
</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+15"/>
+ <location line="+17"/>
<source>An error occurred while setting up the RPC port %u for listening on IPv6, falling back to IPv4: %s</source>
<translation type="unfinished"/>
</message>
@@ -2293,35 +2421,45 @@ If the file does not exist, create it with owner-readable-only file permissions.
<message>
<location line="+3"/>
<source>Cannot obtain a lock on data directory %s. Bitcoin is probably already running.</source>
- <translation type="unfinished"/>
+ <translation>Non è possibile ottenere i dati sulla cartella %s. Probabilmente Bitcoin è già in esecuzione.</translation>
</message>
<message>
<location line="+3"/>
- <source>Corrupted block database detected. Please restart the client with -reindex.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+2"/>
<source>Error initializing database environment %s! To recover, BACKUP THAT DIRECTORY, then remove everything from it except for wallet.dat.</source>
- <translation type="unfinished"/>
+ <translation>Errore nell&apos;inizializzazione dell&apos;ambiente del database %s! Per ripristinare, FAI UN BACKUP DI QUELLA CARTELLA, poi rimuovi tutto all&apos;interno eccetto wallet.dat.</translation>
</message>
<message>
<location line="+3"/>
<source>Error: The transaction was rejected! This might happen if some of the coins in your wallet were already spent, such as if you used a copy of wallet.dat and coins were spent in the copy but not marked as spent here.</source>
- <translation type="unfinished"/>
+ <translation>Errore: la transazione è stata rifiutata. Ciò accade se alcuni bitcoin nel portamonete sono stati già spesi, ad esempio se è stata usata una copia del file wallet.dat e i bitcoin sono stati spesi dalla copia ma non segnati come spesi qui.</translation>
</message>
<message>
<location line="+4"/>
<source>Error: This transaction requires a transaction fee of at least %s because of its amount, complexity, or use of recently received funds!</source>
+ <translation>Errore: questa transazione necessita di una commissione di almeno %s a causa del suo ammontare, della sua complessità, o dell&apos;uso di fondi recentemente ricevuti!</translation>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Execute command when a relevant alert is received (%s in cmd is replaced by message)</source>
<translation type="unfinished"/>
</message>
<message>
+ <location line="+3"/>
+ <source>Execute command when a wallet transaction changes (%s in cmd is replaced by TxID)</source>
+ <translation>Esegui comando quando una transazione del portafoglio cambia (%s in cmd è sostituito da TxID)</translation>
+ </message>
+ <message>
<location line="+11"/>
<source>Set maximum size of high-priority/low-fee transactions in bytes (default: 27000)</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+3"/>
+ <source>Set the number of script verification threads (1-16, 0=auto, default: 0)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
<source>This is a pre-release test build - use at your own risk - do not use for mining or merchant applications</source>
<translation type="unfinished"/>
</message>
@@ -2333,7 +2471,7 @@ If the file does not exist, create it with owner-readable-only file permissions.
<message>
<location line="+3"/>
<source>Warning: Displayed transactions may not be correct! You may need to upgrade, or other nodes may need to upgrade.</source>
- <translation type="unfinished"/>
+ <translation>Attenzione: le transazioni mostrate potrebbero essere sbagliate! Potresti aver bisogno di aggiornare, o altri nodi ne hanno bisogno.</translation>
</message>
<message>
<location line="+3"/>
@@ -2343,17 +2481,17 @@ If the file does not exist, create it with owner-readable-only file permissions.
<message>
<location line="+3"/>
<source>Warning: error reading wallet.dat! All keys read correctly, but transaction data or address book entries might be missing or incorrect.</source>
- <translation type="unfinished"/>
+ <translation>Attenzione: errore di lettura di wallet.dat! Tutte le chiave lette correttamente, ma i dati delle transazioni o le voci in rubrica potrebbero mancare o non essere corretti.</translation>
</message>
<message>
<location line="+3"/>
<source>Warning: wallet.dat corrupt, data salvaged! Original wallet.dat saved as wallet.{timestamp}.bak in %s; if your balance or transactions are incorrect you should restore from a backup.</source>
- <translation type="unfinished"/>
+ <translation>Attenzione: wallet.dat corrotto, dati salvati! Il wallet.dat originale salvato come wallet.{timestamp}.bak in %s; se il tuo bilancio o le transazioni non sono corrette dovresti ripristinare da un backup.</translation>
</message>
<message>
<location line="+14"/>
<source>Attempt to recover private keys from a corrupt wallet.dat</source>
- <translation type="unfinished"/>
+ <translation>Tenta di recuperare le chiavi private da un wallet.dat corrotto</translation>
</message>
<message>
<location line="+2"/>
@@ -2367,18 +2505,43 @@ If the file does not exist, create it with owner-readable-only file permissions.
</message>
<message>
<location line="+3"/>
+ <source>Corrupted block database detected</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Discover own IP address (default: 1 when listening and no -externalip)</source>
+ <translation>Scopri proprio indirizzo IP (default: 1 se in ascolto e no -externalip)</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Do you want to rebuild the block database now?</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+3"/>
+ <source>Error initializing block database</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Error initializing wallet database environment %s!</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Error loading block database</source>
+ <translation>Errore caricamento database blocchi</translation>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>Error opening block database</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+5"/>
+ <location line="+2"/>
<source>Error: Disk space is low!</source>
- <translation type="unfinished"/>
+ <translation>Errore: la spazio libero sul disco è poco!</translation>
</message>
<message>
<location line="+1"/>
@@ -2388,11 +2551,66 @@ If the file does not exist, create it with owner-readable-only file permissions.
<message>
<location line="+1"/>
<source>Error: Wallet locked, unable to create transaction!</source>
- <translation type="unfinished"/>
+ <translation>Errore: portafoglio bloccato, impossibile creare la transazione!</translation>
</message>
<message>
<location line="+2"/>
+ <source>Error: system error: </source>
+ <translation>Errore: errore di sistema:</translation>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Failed to listen on any port. Use -listen=0 if you want this.</source>
+ <translation>Impossibile mettersi in ascolto su una porta. Usa -listen=0 se vuoi usare questa opzione.</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Failed to read block info</source>
+ <translation>Lettura informazioni blocco fallita</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Failed to read block</source>
+ <translation>Lettura blocco fallita</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Failed to sync block index</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Failed to write block index</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Failed to write block info</source>
+ <translation>Scrittura informazioni blocco fallita</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Failed to write block</source>
+ <translation>Scrittura blocco fallita</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Failed to write file info</source>
+ <translation>Scrittura informazioni file fallita</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Failed to write to coin database</source>
+ <translation>Scrittura nel database dei bitcoin fallita</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Failed to write transaction index</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Failed to write undo data</source>
<translation type="unfinished"/>
</message>
<message>
@@ -2401,24 +2619,39 @@ If the file does not exist, create it with owner-readable-only file permissions.
<translation type="unfinished"/>
</message>
<message>
- <location line="+5"/>
+ <location line="+3"/>
+ <source>How many blocks to check at startup (default: 288, 0 = all)</source>
+ <translation>Quanti blocchi da controllare all&apos;avvio (predefinito: 288, 0 = tutti)</translation>
+ </message>
+ <message>
+ <location line="+1"/>
<source>How thorough the block verification is (0-4, default: 3)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+1"/>
- <source>Importing blocks from block database...</source>
- <translation>Importazione blocchi da database...</translation>
+ <location line="+24"/>
+ <source>Rebuild block chain index from current blk000??.dat files</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+37"/>
+ <source>Verifying blocks...</source>
+ <translation>Verifica blocchi...</translation>
</message>
<message>
<location line="+1"/>
+ <source>Verifying wallet...</source>
+ <translation>Verifica portafoglio...</translation>
+ </message>
+ <message>
+ <location line="-61"/>
<source>Imports blocks from external blk000??.dat file</source>
- <translation type="unfinished"/>
+ <translation>Importa blocchi da un file blk000??.dat esterno</translation>
</message>
<message>
<location line="+1"/>
<source>Information</source>
- <translation type="unfinished"/>
+ <translation>Informazione</translation>
</message>
<message>
<location line="+3"/>
@@ -2426,7 +2659,12 @@ If the file does not exist, create it with owner-readable-only file permissions.
<translation>Indirizzo -tor non valido: &apos;%s&apos;</translation>
</message>
<message>
- <location line="+9"/>
+ <location line="+8"/>
+ <source>Maintain a full transaction index (default: 0)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
<source>Maximum per-connection receive buffer, &lt;n&gt;*1000 bytes (default: 5000)</source>
<translation>Buffer di ricezione massimo per connessione, &lt;n&gt;*1000 byte (default: 5000)</translation>
</message>
@@ -2443,7 +2681,7 @@ If the file does not exist, create it with owner-readable-only file permissions.
<message>
<location line="+1"/>
<source>Only connect to nodes in network &lt;net&gt; (IPv4, IPv6 or Tor)</source>
- <translation type="unfinished"/>
+ <translation>Connetti solo a nodi nella rete &lt;net&gt; (IPv4, IPv6 o Tor)</translation>
</message>
<message>
<location line="+2"/>
@@ -2453,7 +2691,7 @@ If the file does not exist, create it with owner-readable-only file permissions.
<message>
<location line="+1"/>
<source>Output extra network debugging information</source>
- <translation type="unfinished"/>
+ <translation>Genera informazioni extra utili al debug della rete</translation>
</message>
<message>
<location line="+2"/>
@@ -2461,19 +2699,14 @@ If the file does not exist, create it with owner-readable-only file permissions.
<translation>Anteponi all&apos;output di debug una marca temporale</translation>
</message>
<message>
- <location line="+1"/>
- <source>Rebuild blockchain index from current blk000??.dat files</source>
- <translation>Ricrea l&apos;indice della catena dei blocchi dagli attuale file blk000??.dat</translation>
- </message>
- <message>
- <location line="+4"/>
+ <location line="+5"/>
<source>SSL options: (see the Bitcoin Wiki for SSL setup instructions)</source>
<translation>Opzioni SSL: (vedi il wiki di Bitcoin per le istruzioni di configurazione SSL)</translation>
</message>
<message>
<location line="+1"/>
<source>Select the version of socks proxy to use (4-5, default: 5)</source>
- <translation type="unfinished"/>
+ <translation>Selezionare la versione del proxy socks da usare (4-5, default: 5)</translation>
</message>
<message>
<location line="+3"/>
@@ -2488,12 +2721,12 @@ If the file does not exist, create it with owner-readable-only file permissions.
<message>
<location line="+5"/>
<source>Set maximum block size in bytes (default: 250000)</source>
- <translation type="unfinished"/>
+ <translation>Imposta dimensione massima del blocco in bytes (predefinito: 250000)</translation>
</message>
<message>
<location line="+1"/>
<source>Set minimum block size in bytes (default: 0)</source>
- <translation type="unfinished"/>
+ <translation>Imposta dimensione minima del blocco in bytes (predefinito: 0)</translation>
</message>
<message>
<location line="+1"/>
@@ -2506,7 +2739,12 @@ If the file does not exist, create it with owner-readable-only file permissions.
<translation>Specifica il timeout di connessione in millisecondi (default: 5000)</translation>
</message>
<message>
- <location line="+13"/>
+ <location line="+4"/>
+ <source>System error: </source>
+ <translation>Errore di sistema:</translation>
+ </message>
+ <message>
+ <location line="+10"/>
<source>Use UPnP to map the listening port (default: 0)</source>
<translation>UPnP-használat engedélyezése a figyelő port feltérképezésénél (default: 0)</translation>
</message>
@@ -2518,7 +2756,7 @@ If the file does not exist, create it with owner-readable-only file permissions.
<message>
<location line="+1"/>
<source>Use proxy to reach tor hidden services (default: same as -proxy)</source>
- <translation type="unfinished"/>
+ <translation>Usa un proxy per raggiungere servizi nascosti di tor (predefinito: uguale a -proxy)</translation>
</message>
<message>
<location line="+2"/>
@@ -2529,48 +2767,53 @@ If the file does not exist, create it with owner-readable-only file permissions.
<message>
<location line="+4"/>
<source>Warning</source>
- <translation type="unfinished"/>
+ <translation>Attenzione</translation>
</message>
<message>
<location line="+1"/>
<source>Warning: This version is obsolete, upgrade required!</source>
+ <translation>Attenzione: questa versione è obsoleta, aggiornamento necessario!</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>You need to rebuild the databases using -reindex to change -txindex</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+1"/>
<source>wallet.dat corrupt, salvage failed</source>
- <translation type="unfinished"/>
+ <translation>wallet.dat corrotto, salvataggio fallito</translation>
</message>
<message>
- <location line="-43"/>
+ <location line="-45"/>
<source>Password for JSON-RPC connections</source>
<translation>Password per connessioni JSON-RPC
</translation>
</message>
<message>
- <location line="-53"/>
+ <location line="-68"/>
<source>Allow JSON-RPC connections from specified IP address</source>
<translation>Consenti connessioni JSON-RPC dall&apos;indirizzo IP specificato
</translation>
</message>
<message>
- <location line="+62"/>
+ <location line="+77"/>
<source>Send commands to node running on &lt;ip&gt; (default: 127.0.0.1)</source>
<translation>Inviare comandi al nodo in esecuzione su &lt;ip&gt; (default: 127.0.0.1)
</translation>
</message>
<message>
- <location line="-103"/>
+ <location line="-120"/>
<source>Execute command when the best block changes (%s in cmd is replaced by block hash)</source>
<translation>Esegui il comando quando il miglior block cambia(%s nel cmd è sostituito dall&apos;hash del blocco)</translation>
</message>
<message>
- <location line="+124"/>
+ <location line="+142"/>
<source>Upgrade wallet to latest format</source>
<translation>Aggiorna il wallet all&apos;ultimo formato</translation>
</message>
<message>
- <location line="-15"/>
+ <location line="-16"/>
<source>Set key pool size to &lt;n&gt; (default: 100)</source>
<translation>Impostare la quantità di chiavi di riserva a &lt;n&gt; (default: 100)
</translation>
@@ -2582,18 +2825,13 @@ If the file does not exist, create it with owner-readable-only file permissions.
</translation>
</message>
<message>
- <location line="-26"/>
- <source>How many blocks to check at startup (default: 2500, 0 = all)</source>
- <translation>Quanti blocchi da controllare all&apos;avvio (default: 2500, 0 = tutti)</translation>
- </message>
- <message>
- <location line="+55"/>
+ <location line="+30"/>
<source>Use OpenSSL (https) for JSON-RPC connections</source>
<translation>Utilizzare OpenSSL (https) per le connessioni JSON-RPC
</translation>
</message>
<message>
- <location line="-20"/>
+ <location line="-21"/>
<source>Server certificate file (default: server.cert)</source>
<translation>File certificato del server (default: server.cert)
</translation>
@@ -2605,13 +2843,13 @@ If the file does not exist, create it with owner-readable-only file permissions.
</translation>
</message>
<message>
- <location line="-133"/>
+ <location line="-154"/>
<source>Acceptable ciphers (default: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH)</source>
<translation>Cifrari accettabili (default: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH)
</translation>
</message>
<message>
- <location line="+144"/>
+ <location line="+166"/>
<source>This help message</source>
<translation>Questo messaggio di aiuto
</translation>
@@ -2622,7 +2860,7 @@ If the file does not exist, create it with owner-readable-only file permissions.
<translation>Impossibile collegarsi alla %s su questo computer (bind returned error %d, %s)</translation>
</message>
<message>
- <location line="-70"/>
+ <location line="-86"/>
<source>Connect through socks proxy</source>
<translation>Connessione tramite socks proxy</translation>
</message>
@@ -2633,12 +2871,12 @@ If the file does not exist, create it with owner-readable-only file permissions.
</translation>
</message>
<message>
- <location line="+43"/>
+ <location line="+57"/>
<source>Loading addresses...</source>
<translation>Caricamento indirizzi...</translation>
</message>
<message>
- <location line="-25"/>
+ <location line="-35"/>
<source>Error loading wallet.dat: Wallet corrupted</source>
<translation>Errore caricamento wallet.dat: Wallet corrotto</translation>
</message>
@@ -2648,32 +2886,22 @@ If the file does not exist, create it with owner-readable-only file permissions.
<translation>Errore caricamento wallet.dat: il wallet richiede una versione nuova di Bitcoin</translation>
</message>
<message>
- <location line="+73"/>
- <source>Verifying block database integrity...</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+1"/>
- <source>Verifying wallet integrity...</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+1"/>
+ <location line="+87"/>
<source>Wallet needed to be rewritten: restart Bitcoin to complete</source>
<translation>Il portamonete deve essere riscritto: riavviare Bitcoin per completare</translation>
</message>
<message>
- <location line="-77"/>
+ <location line="-89"/>
<source>Error loading wallet.dat</source>
<translation>Errore caricamento wallet.dat</translation>
</message>
<message>
- <location line="+20"/>
+ <location line="+30"/>
<source>Invalid -proxy address: &apos;%s&apos;</source>
<translation>Indirizzo -proxy non valido: &apos;%s&apos;</translation>
</message>
<message>
- <location line="+46"/>
+ <location line="+48"/>
<source>Unknown network specified in -onlynet: &apos;%s&apos;</source>
<translation>Rete sconosciuta specificata in -onlynet: &apos;%s&apos;</translation>
</message>
@@ -2683,7 +2911,7 @@ If the file does not exist, create it with owner-readable-only file permissions.
<translation>Versione -socks proxy sconosciuta richiesta: %i</translation>
</message>
<message>
- <location line="-75"/>
+ <location line="-91"/>
<source>Cannot resolve -bind address: &apos;%s&apos;</source>
<translation>Impossibile risolvere -bind address: &apos;%s&apos;</translation>
</message>
@@ -2693,17 +2921,17 @@ If the file does not exist, create it with owner-readable-only file permissions.
<translation>Impossibile risolvere indirizzo -externalip: &apos;%s&apos;</translation>
</message>
<message>
- <location line="+31"/>
+ <location line="+45"/>
<source>Invalid amount for -paytxfee=&lt;amount&gt;: &apos;%s&apos;</source>
<translation>Importo non valido per -paytxfee=&lt;amount&gt;: &apos;%s&apos;</translation>
</message>
<message>
- <location line="-15"/>
+ <location line="-24"/>
<source>Error: could not start node</source>
<translation>Errore: impossibile inizializzare il nodo</translation>
</message>
<message>
- <location line="+16"/>
+ <location line="+25"/>
<source>Invalid amount</source>
<translation>Importo non valido</translation>
</message>
@@ -2718,7 +2946,7 @@ If the file does not exist, create it with owner-readable-only file permissions.
<translation>Caricamento dell&apos;indice del blocco...</translation>
</message>
<message>
- <location line="-45"/>
+ <location line="-59"/>
<source>Add a node to connect to and attempt to keep the connection open</source>
<translation>Elérendő csomópont megadása and attempt to keep the connection open</translation>
</message>
@@ -2728,22 +2956,17 @@ If the file does not exist, create it with owner-readable-only file permissions.
<translation>Impossibile collegarsi alla %s su questo computer. Probabilmente Bitcoin è già in esecuzione.</translation>
</message>
<message>
- <location line="+54"/>
- <source>Find peers using internet relay chat (default: 0)</source>
- <translation>Cerca peers usando la internet relay chat (default: 0)</translation>
- </message>
- <message>
- <location line="-2"/>
+ <location line="+68"/>
<source>Fee per KB to add to transactions you send</source>
<translation>Commissione per KB da aggiungere alle transazioni in uscita</translation>
</message>
<message>
- <location line="+19"/>
+ <location line="+17"/>
<source>Loading wallet...</source>
<translation>Caricamento portamonete...</translation>
</message>
<message>
- <location line="-40"/>
+ <location line="-54"/>
<source>Cannot downgrade wallet</source>
<translation>Non è possibile retrocedere il wallet</translation>
</message>
@@ -2758,27 +2981,27 @@ If the file does not exist, create it with owner-readable-only file permissions.
<translation>Non è possibile scrivere l&apos;indirizzo di default</translation>
</message>
<message>
- <location line="+49"/>
+ <location line="+64"/>
<source>Rescanning...</source>
<translation>Ripetere la scansione...</translation>
</message>
<message>
- <location line="-43"/>
+ <location line="-56"/>
<source>Done loading</source>
<translation>Caricamento completato</translation>
</message>
<message>
- <location line="+65"/>
+ <location line="+79"/>
<source>To use the %s option</source>
<translation>Per usare la opzione %s</translation>
</message>
<message>
- <location line="-60"/>
+ <location line="-71"/>
<source>Error</source>
<translation>Errore</translation>
</message>
<message>
- <location line="-28"/>
+ <location line="-33"/>
<source>You must set rpcpassword=&lt;password&gt; in the configuration file:
%s
If the file does not exist, create it with owner-readable-only file permissions.</source>
diff --git a/src/qt/locale/bitcoin_ja.ts b/src/qt/locale/bitcoin_ja.ts
index f586b2cec2..222bd87da9 100644
--- a/src/qt/locale/bitcoin_ja.ts
+++ b/src/qt/locale/bitcoin_ja.ts
@@ -5,20 +5,15 @@
<message>
<location filename="../forms/aboutdialog.ui" line="+14"/>
<source>About Bitcoin</source>
- <translation type="unfinished"/>
+ <translation>Bitcoinã«ã¤ã„ã¦</translation>
</message>
<message>
<location line="+39"/>
<source>&lt;b&gt;Bitcoin&lt;/b&gt; version</source>
- <translation>&lt;b&gt;Bitcoin&lt;/b&gt; Bertsio</translation>
+ <translation>&lt;b&gt;Bitcoin&lt;/b&gt; ãƒãƒ¼ã‚¸ãƒ§ãƒ³</translation>
</message>
<message>
- <location line="+41"/>
- <source>Copyright © 2009-2012 The Bitcoin developers</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+13"/>
+ <location line="+57"/>
<source>
This is experimental software.
@@ -27,28 +22,38 @@ Distributed under the MIT/X11 software license, see the accompanying file COPYIN
This product includes software developed by the OpenSSL Project for use in the OpenSSL Toolkit (http://www.openssl.org/) and cryptographic software written by Eric Young (eay@cryptsoft.com) and UPnP software written by Thomas Bernard.</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../aboutdialog.cpp" line="+17"/>
+ <source>Copyright</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>2009-%1 The Bitcoin developers</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>AddressBookPage</name>
<message>
<location filename="../forms/addressbookpage.ui" line="+14"/>
<source>Address Book</source>
- <translation>Helbide-liburua</translation>
+ <translation>アドレス帳</translation>
</message>
<message>
<location line="+22"/>
<source>Double-click to edit address or label</source>
- <translation type="unfinished"/>
+ <translation>アドレスã‹ãƒ¬ãƒ¼ãƒ™ãƒ«ã‚’編集ã™ã‚‹ã®ãŸã‚ã«ãƒ€ãƒ–ルクリックã—ã¦</translation>
</message>
<message>
<location line="+27"/>
<source>Create a new address</source>
- <translation>Sortu helbide berria</translation>
+ <translation>æ–°ã—ã„ã®ã‚¢ãƒ‰ãƒ¬ã‚¹ã‚’作る</translation>
</message>
<message>
<location line="+14"/>
<source>Copy the currently selected address to the system clipboard</source>
- <translation type="unfinished"/>
+ <translation>ç¾åœ¨é¸æŠžã•ã‚Œã¦ã„るアドレスをシステムã®ã‚¯ãƒªãƒƒãƒ—ボードã«ã‚³ãƒ”ーã™ã‚‹</translation>
</message>
<message>
<location line="-11"/>
@@ -98,55 +103,60 @@ This product includes software developed by the OpenSSL Project for use in the O
<message>
<location line="+14"/>
<source>&amp;Delete</source>
- <translation>&amp;Ezabatu</translation>
+ <translation>&amp;消ã™</translation>
</message>
<message>
- <location filename="../addressbookpage.cpp" line="+65"/>
+ <location filename="../addressbookpage.cpp" line="+66"/>
<source>Copy &amp;Label</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+2"/>
+ <location line="+1"/>
<source>&amp;Edit</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+250"/>
- <source>Export Address Book Data</source>
+ <location line="+1"/>
+ <source>Send &amp;Coins</source>
<translation type="unfinished"/>
</message>
<message>
+ <location line="+263"/>
+ <source>Export Address Book Data</source>
+ <translation>アドレス帳データーを輸出ã™ã‚‹</translation>
+ </message>
+ <message>
<location line="+1"/>
<source>Comma separated file (*.csv)</source>
- <translation type="unfinished"/>
+ <translation>テキスト CSV (*.csv)</translation>
</message>
<message>
<location line="+13"/>
<source>Error exporting</source>
- <translation type="unfinished"/>
+ <translation>エラー輸出</translation>
</message>
<message>
<location line="+0"/>
<source>Could not write to file %1.</source>
- <translation type="unfinished"/>
+ <translation>%1ã®ãƒ•ã‚¡ã‚¤ãƒ«ã«æ›¸ãè¾¼ã‚ã¾ã›ã‚“ã§ã—ãŸã€‚</translation>
</message>
</context>
<context>
<name>AddressTableModel</name>
<message>
- <location filename="../addresstablemodel.cpp" line="+142"/>
+ <location filename="../addresstablemodel.cpp" line="+144"/>
<source>Label</source>
- <translation type="unfinished"/>
+ <translation>レーベル</translation>
</message>
<message>
<location line="+0"/>
<source>Address</source>
- <translation>Helbidea</translation>
+ <translation>アドレス</translation>
</message>
<message>
<location line="+36"/>
<source>(no label)</source>
- <translation type="unfinished"/>
+ <translation>(レーベル無ã—)</translation>
</message>
</context>
<context>
@@ -159,62 +169,62 @@ This product includes software developed by the OpenSSL Project for use in the O
<message>
<location line="+21"/>
<source>Enter passphrase</source>
- <translation type="unfinished"/>
+ <translation>パスフレーズを入ã£ã¦</translation>
</message>
<message>
<location line="+14"/>
<source>New passphrase</source>
- <translation type="unfinished"/>
+ <translation>æ–°ã—ã„ã®ãƒ‘スフレーズ</translation>
</message>
<message>
<location line="+14"/>
<source>Repeat new passphrase</source>
- <translation type="unfinished"/>
+ <translation>æ–°ã—ã„ã®ãƒ‘スフレーズを繰り返ã—ã¦</translation>
</message>
<message>
<location filename="../askpassphrasedialog.cpp" line="+33"/>
<source>Enter the new passphrase to the wallet.&lt;br/&gt;Please use a passphrase of &lt;b&gt;10 or more random characters&lt;/b&gt;, or &lt;b&gt;eight or more words&lt;/b&gt;.</source>
- <translation type="unfinished"/>
+ <translation>財布ã®æ–°ã—ã„ã®ãƒ‘スフレーズを入ã£ã¦ã€‚&lt;br/&gt;&lt;b&gt;8個以上ã®ãƒ¯ãƒ¼ãƒ‰ã‹10個以上ã®ãƒ©ãƒ³ãƒ€ãƒ ãªæ–‡å­—&lt;/b&gt;を使ã£ã¦ãã ã•ã„。</translation>
</message>
<message>
<location line="+1"/>
<source>Encrypt wallet</source>
- <translation type="unfinished"/>
+ <translation>財布を暗å·åŒ–ã™ã‚‹</translation>
</message>
<message>
<location line="+3"/>
<source>This operation needs your wallet passphrase to unlock the wallet.</source>
- <translation type="unfinished"/>
+ <translation>ã“ã®å‹•ä½œã¯è²¡å¸ƒã®ã‚¢ãƒ³ãƒ­ãƒƒã‚¯ã™ã‚‹ã‚ˆã†ã«è²¡å¸ƒã®ãƒ‘スフレーズãŒå¿…è¦ã§ã™ã€‚</translation>
</message>
<message>
<location line="+5"/>
<source>Unlock wallet</source>
- <translation type="unfinished"/>
+ <translation>財布をアンロックã™ã‚‹</translation>
</message>
<message>
<location line="+3"/>
<source>This operation needs your wallet passphrase to decrypt the wallet.</source>
- <translation type="unfinished"/>
+ <translation>ã“ã®å‹•ä½œã¯è²¡å¸ƒã®è§£èª­ã™ã‚‹ã‚ˆã†ã«è²¡å¸ƒã®ãƒ‘スフレーズãŒå¿…è¦ã§ã™ã€‚</translation>
</message>
<message>
<location line="+5"/>
<source>Decrypt wallet</source>
- <translation type="unfinished"/>
+ <translation>財布を解読ã™ã‚‹</translation>
</message>
<message>
<location line="+3"/>
<source>Change passphrase</source>
- <translation type="unfinished"/>
+ <translation>パスフレーズを変ã‚ã‚Šã¾ã™</translation>
</message>
<message>
<location line="+1"/>
<source>Enter the old and new passphrase to the wallet.</source>
- <translation type="unfinished"/>
+ <translation>å‰ã¨æ–°ã—ã„ã®è²¡å¸ƒã®ãƒ‘スフレーズを入ã£ã¦ã€‚</translation>
</message>
<message>
<location line="+46"/>
<source>Confirm wallet encryption</source>
- <translation type="unfinished"/>
+ <translation>財布ã®æš—å·åŒ–を確èªã™ã‚‹</translation>
</message>
<message>
<location line="+1"/>
@@ -241,7 +251,7 @@ This product includes software developed by the OpenSSL Project for use in the O
<location line="-130"/>
<location line="+58"/>
<source>Wallet encrypted</source>
- <translation type="unfinished"/>
+ <translation>財布ã¯æš—å·åŒ–ã—ã¾ã—ãŸ</translation>
</message>
<message>
<location line="-56"/>
@@ -254,35 +264,35 @@ This product includes software developed by the OpenSSL Project for use in the O
<location line="+42"/>
<location line="+6"/>
<source>Wallet encryption failed</source>
- <translation type="unfinished"/>
+ <translation>財布ã®æš—å·åŒ–ã™ã‚‹ã®ã¯å¤±æ•—ã—ã¾ã—ãŸ</translation>
</message>
<message>
<location line="-54"/>
<source>Wallet encryption failed due to an internal error. Your wallet was not encrypted.</source>
- <translation type="unfinished"/>
+ <translation>内部エラーã§ã™ã‹ã‚‰è²¡å¸ƒã®æš—å·åŒ–ãŒå¤±æ•—ã—ã¾ã—ãŸã€‚財布ã¯æš—å·åŒ–ã—ã¾ã›ã‚“ã§ã—ãŸã€‚</translation>
</message>
<message>
<location line="+7"/>
<location line="+48"/>
<source>The supplied passphrases do not match.</source>
- <translation type="unfinished"/>
+ <translation>パスフレーズã¯åŒã˜ã§ã¯ã‚ã‚Šã¾ã›ã‚“。</translation>
</message>
<message>
<location line="-37"/>
<source>Wallet unlock failed</source>
- <translation type="unfinished"/>
+ <translation>財布ã®ã‚¢ãƒ³ãƒ­ãƒƒã‚¯ã¯å¤±æ•—ã—ã¾ã—ãŸ</translation>
</message>
<message>
<location line="+1"/>
<location line="+11"/>
<location line="+19"/>
<source>The passphrase entered for the wallet decryption was incorrect.</source>
- <translation type="unfinished"/>
+ <translation>財布ã®</translation>
</message>
<message>
<location line="-20"/>
<source>Wallet decryption failed</source>
- <translation type="unfinished"/>
+ <translation>財布ã®è§£èª­ã¯å¤±æ•—ã—ã¾ã—ãŸ</translation>
</message>
<message>
<location line="+14"/>
@@ -293,74 +303,59 @@ This product includes software developed by the OpenSSL Project for use in the O
<context>
<name>BitcoinGUI</name>
<message>
- <location filename="../bitcoingui.cpp" line="+267"/>
+ <location filename="../bitcoingui.cpp" line="+231"/>
<source>Sign &amp;message...</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+254"/>
+ <location line="+299"/>
<source>Synchronizing with network...</source>
- <translation type="unfinished"/>
+ <translation>ãƒãƒƒãƒˆãƒ¯ãƒ¼ã‚¯ã¨åŒæœŸåŒ–中。。。</translation>
</message>
<message>
- <location line="-322"/>
+ <location line="-367"/>
<source>&amp;Overview</source>
- <translation type="unfinished"/>
+ <translation>&amp;概観</translation>
</message>
<message>
<location line="+1"/>
<source>Show general overview of wallet</source>
- <translation type="unfinished"/>
+ <translation>財布ã®æ¦‚観を見ã›ã‚‹</translation>
</message>
<message>
<location line="+20"/>
<source>&amp;Transactions</source>
- <translation type="unfinished"/>
+ <translation>&amp;å–引</translation>
</message>
<message>
<location line="+1"/>
<source>Browse transaction history</source>
- <translation type="unfinished"/>
+ <translation>昔ã®å–引をブラウズã™ã‚‹</translation>
</message>
<message>
- <location line="+6"/>
- <source>&amp;Address Book</source>
- <translation>&amp;Helbide-liburua</translation>
- </message>
- <message>
- <location line="+1"/>
+ <location line="+7"/>
<source>Edit the list of stored addresses and labels</source>
- <translation type="unfinished"/>
+ <translation>アドレスã¨ãƒ¬ãƒ¼ãƒ™ãƒ«ã®ãƒªã‚¹ãƒˆã‚’編集ã™ã‚‹</translation>
</message>
<message>
- <location line="-15"/>
- <source>&amp;Receive coins</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+1"/>
+ <location line="-14"/>
<source>Show the list of addresses for receiving payments</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="-8"/>
- <source>&amp;Send coins</source>
- <translation type="unfinished"/>
+ <translation>支払ã„ã‚’å—ã‘å–ã‚‹ã®ã‚¢ãƒ‰ãƒ¬ã‚¹ã®ãƒªã‚¹ãƒˆã‚’見ã›ã‚‹</translation>
</message>
<message>
- <location line="+39"/>
+ <location line="+31"/>
<source>E&amp;xit</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+1"/>
<source>Quit application</source>
- <translation type="unfinished"/>
+ <translation>アプリを終了</translation>
</message>
<message>
<location line="+4"/>
<source>Show information about Bitcoin</source>
- <translation type="unfinished"/>
+ <translation>Bitcoinã®äº‹ã®æƒ…報を見ã›ã‚‹</translation>
</message>
<message>
<location line="+2"/>
@@ -375,7 +370,7 @@ This product includes software developed by the OpenSSL Project for use in the O
<message>
<location line="+2"/>
<source>&amp;Options...</source>
- <translation type="unfinished"/>
+ <translation>&amp;オプションズ</translation>
</message>
<message>
<location line="+5"/>
@@ -393,7 +388,7 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation type="unfinished"/>
</message>
<message>
- <location line="+259"/>
+ <location line="+304"/>
<source>Importing blocks from disk...</source>
<translation type="unfinished"/>
</message>
@@ -402,15 +397,10 @@ This product includes software developed by the OpenSSL Project for use in the O
<source>Reindexing blocks on disk...</source>
<translation type="unfinished"/>
</message>
- <message numerus="yes">
- <location line="+10"/>
- <source>~%n block(s) remaining</source>
- <translation type="unfinished"><numerusform></numerusform></translation>
- </message>
<message>
- <location line="-265"/>
+ <location line="-300"/>
<source>&amp;Export...</source>
- <translation type="unfinished"/>
+ <translation>&amp;輸出。。。</translation>
</message>
<message>
<location line="-65"/>
@@ -435,7 +425,7 @@ This product includes software developed by the OpenSSL Project for use in the O
<message>
<location line="+2"/>
<source>Change the passphrase used for wallet encryption</source>
- <translation type="unfinished"/>
+ <translation>財布ã®æš—å·åŒ–ã®ãŸã‚ã®ãƒ‘スフレーズを変ã‚ã‚‹</translation>
</message>
<message>
<location line="+9"/>
@@ -453,18 +443,33 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation type="unfinished"/>
</message>
<message>
- <location line="-196"/>
- <location line="+538"/>
+ <location line="-162"/>
+ <location line="+540"/>
<source>Bitcoin</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-538"/>
+ <location line="-540"/>
<source>Wallet</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+176"/>
+ <location line="+99"/>
+ <source>&amp;Send</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+7"/>
+ <source>&amp;Receive</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+14"/>
+ <source>&amp;Addresses</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+22"/>
<source>&amp;About Bitcoin</source>
<translation type="unfinished"/>
</message>
@@ -496,133 +501,128 @@ This product includes software developed by the OpenSSL Project for use in the O
<message>
<location line="+31"/>
<source>&amp;File</source>
- <translation type="unfinished"/>
+ <translation>&amp;ファイル</translation>
</message>
<message>
<location line="+8"/>
<source>&amp;Settings</source>
- <translation type="unfinished"/>
+ <translation>&amp;設定</translation>
</message>
<message>
<location line="+6"/>
<source>&amp;Help</source>
- <translation type="unfinished"/>
+ <translation>&amp;ヘルプ</translation>
</message>
<message>
<location line="+9"/>
<source>Tabs toolbar</source>
- <translation type="unfinished"/>
+ <translation>タブツールãƒãƒ¼</translation>
</message>
<message>
<location line="+8"/>
<source>Actions toolbar</source>
- <translation type="unfinished"/>
+ <translation>アクションツールãƒãƒ¼</translation>
</message>
<message>
<location line="+13"/>
<location line="+10"/>
<source>[testnet]</source>
- <translation type="unfinished"/>
+ <translation>[テストãƒãƒƒãƒˆ]</translation>
</message>
<message>
- <location line="+63"/>
+ <location line="+47"/>
<source>Bitcoin client</source>
<translation type="unfinished"/>
</message>
<message numerus="yes">
- <location line="+79"/>
+ <location line="+140"/>
<source>%n active connection(s) to Bitcoin network</source>
<translation type="unfinished"><numerusform></numerusform></translation>
</message>
<message>
- <location line="+45"/>
- <source>Processed %1 of %2 blocks of transaction history (%3% done).</source>
+ <location line="+39"/>
+ <source>Processed %1 of %2 (estimated) blocks of transaction history.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+7"/>
+ <location line="+4"/>
<source>Processed %1 blocks of transaction history.</source>
<translation type="unfinished"/>
</message>
+ <message numerus="yes">
+ <location line="+20"/>
+ <source>%n hour(s)</source>
+ <translation type="unfinished"><numerusform></numerusform></translation>
+ </message>
+ <message numerus="yes">
+ <location line="+4"/>
+ <source>%n day(s)</source>
+ <translation type="unfinished"><numerusform></numerusform></translation>
+ </message>
+ <message numerus="yes">
+ <location line="+4"/>
+ <source>%n week(s)</source>
+ <translation type="unfinished"><numerusform></numerusform></translation>
+ </message>
<message>
- <location line="+70"/>
- <source>Error</source>
+ <location line="+5"/>
+ <source>%1 behind</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+3"/>
- <source>Warning</source>
+ <location line="+14"/>
+ <source>Last received block was generated %1 ago.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+3"/>
- <source>Information</source>
+ <location line="+2"/>
+ <source>Transactions after this will not yet be visible.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+66"/>
- <source>This transaction is over the size limit. You can still send it for a fee of %1, which goes to the nodes that process your transaction and helps to support the network. Do you want to pay the fee?</source>
+ <location line="+21"/>
+ <source>Error</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+210"/>
- <source>Backup Successful</source>
+ <location line="+3"/>
+ <source>Warning</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+0"/>
- <source>The wallet data was successfully saved to the new location.</source>
+ <location line="+3"/>
+ <source>Information</source>
<translation type="unfinished"/>
</message>
- <message numerus="yes">
- <location line="-338"/>
- <source>%n second(s) ago</source>
- <translation type="unfinished"><numerusform></numerusform></translation>
- </message>
- <message numerus="yes">
- <location line="+4"/>
- <source>%n minute(s) ago</source>
- <translation type="unfinished"><numerusform></numerusform></translation>
- </message>
- <message numerus="yes">
- <location line="+4"/>
- <source>%n hour(s) ago</source>
- <translation type="unfinished"><numerusform></numerusform></translation>
- </message>
- <message numerus="yes">
- <location line="+4"/>
- <source>%n day(s) ago</source>
- <translation type="unfinished"><numerusform></numerusform></translation>
- </message>
<message>
- <location line="+6"/>
- <source>Up to date</source>
+ <location line="+68"/>
+ <source>This transaction is over the size limit. You can still send it for a fee of %1, which goes to the nodes that process your transaction and helps to support the network. Do you want to pay the fee?</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+7"/>
- <source>Catching up...</source>
- <translation type="unfinished"/>
+ <location line="-138"/>
+ <source>Up to date</source>
+ <translation>æ–°ã—ã„ã®ãƒãƒ¼ã‚¸ãƒ§ãƒ³ãŒç„¡ã—</translation>
</message>
<message>
- <location line="+10"/>
- <source>Last received block was generated %1.</source>
- <translation type="unfinished"/>
+ <location line="+32"/>
+ <source>Catching up...</source>
+ <translation>追ã„ã¤ã中。。。</translation>
</message>
<message>
- <location line="+97"/>
+ <location line="+110"/>
<source>Confirm transaction fee</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+23"/>
+ <location line="+8"/>
<source>Sent transaction</source>
- <translation type="unfinished"/>
+ <translation>é€ã£ãŸã®å–引</translation>
</message>
<message>
<location line="+0"/>
<source>Incoming transaction</source>
- <translation type="unfinished"/>
+ <translation>å…¥ã£ã¦ãã‚‹ã®å–引</translation>
</message>
<message>
<location line="+1"/>
@@ -634,49 +634,29 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+99"/>
- <location line="+28"/>
+ <location line="+33"/>
+ <location line="+23"/>
<source>URI handling</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-28"/>
- <location line="+28"/>
+ <location line="-23"/>
+ <location line="+23"/>
<source>URI can not be parsed! This can be caused by an invalid Bitcoin address or malformed URI parameters.</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+17"/>
<source>Wallet is &lt;b&gt;encrypted&lt;/b&gt; and currently &lt;b&gt;unlocked&lt;/b&gt;</source>
- <translation type="unfinished"/>
+ <translation>財布ã¯&lt;b&gt;æš—å·åŒ–ã¨ã‚¢ãƒ³ãƒ­ãƒƒã‚¯ã§ã™&lt;/b&gt;</translation>
</message>
<message>
<location line="+8"/>
<source>Wallet is &lt;b&gt;encrypted&lt;/b&gt; and currently &lt;b&gt;locked&lt;/b&gt;</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+23"/>
- <source>Backup Wallet</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+0"/>
- <source>Wallet Data (*.dat)</source>
- <translation type="unfinished"/>
+ <translation>財布ã¯&lt;b&gt;æš—å·åŒ–ã¨ãƒ­ãƒƒã‚¯ã§ã™&lt;/b&gt;</translation>
</message>
<message>
- <location line="+3"/>
- <source>Backup Failed</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+0"/>
- <source>There was an error trying to save the wallet data to the new location.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../bitcoin.cpp" line="+109"/>
+ <location filename="../bitcoin.cpp" line="+108"/>
<source>A fatal error occurred. Bitcoin can no longer continue safely and will quit.</source>
<translation type="unfinished"/>
</message>
@@ -684,7 +664,7 @@ Address: %4
<context>
<name>ClientModel</name>
<message>
- <location filename="../clientmodel.cpp" line="+86"/>
+ <location filename="../clientmodel.cpp" line="+96"/>
<source>Network Alert</source>
<translation type="unfinished"/>
</message>
@@ -694,73 +674,73 @@ Address: %4
<message>
<location filename="../forms/editaddressdialog.ui" line="+14"/>
<source>Edit Address</source>
- <translation type="unfinished"/>
+ <translation>アドレスを編集ã™ã‚‹</translation>
</message>
<message>
<location line="+11"/>
<source>&amp;Label</source>
- <translation type="unfinished"/>
+ <translation>&amp;レーベル</translation>
</message>
<message>
<location line="+10"/>
<source>The label associated with this address book entry</source>
- <translation type="unfinished"/>
+ <translation>ã“ã®ã‚¢ãƒ‰ãƒ¬ã‚¹å¸³ã®å…¥ã£ãŸäº‹ã¨é–¢ä¿‚ã®ãƒ¬ãƒ¼ãƒ™ãƒ«</translation>
</message>
<message>
<location line="+7"/>
<source>&amp;Address</source>
- <translation type="unfinished"/>
+ <translation>&amp;アドレス</translation>
</message>
<message>
<location line="+10"/>
<source>The address associated with this address book entry. This can only be modified for sending addresses.</source>
- <translation type="unfinished"/>
+ <translation>アドレス帳ã®å…¥ã£ãŸäº‹ã®é–¢ä¿‚ã®ã‚¢ãƒ‰ãƒ¬ã‚¹ã§ã™ã€‚ã“ã‚Œã¯é…れるã®ã‚¢ãƒ‰ãƒ¬ã‚¹ã®ãŸã‚ã ã‘ã«ç·¨é›†å‡ºæ¥ã¾ã™ã€‚</translation>
</message>
<message>
- <location filename="../editaddressdialog.cpp" line="+20"/>
+ <location filename="../editaddressdialog.cpp" line="+21"/>
<source>New receiving address</source>
- <translation type="unfinished"/>
+ <translation>æ–°ã—ã„ã®å—ã‘入れã®ã‚¢ãƒ‰ãƒ¬ã‚¹</translation>
</message>
<message>
<location line="+4"/>
<source>New sending address</source>
- <translation type="unfinished"/>
+ <translation>æ–°ã—ã„ã®é€ã‚‹ã®ã‚¢ãƒ‰ãƒ¬ã‚¹</translation>
</message>
<message>
<location line="+3"/>
<source>Edit receiving address</source>
- <translation type="unfinished"/>
+ <translation>å—ã‘入れã®ã‚¢ãƒ‰ãƒ¬ã‚¹ã‚’編集ã™ã‚‹</translation>
</message>
<message>
<location line="+4"/>
<source>Edit sending address</source>
- <translation type="unfinished"/>
+ <translation>é€ã‚‹ã®ã‚¢ãƒ‰ãƒ¬ã‚¹ã‚’編集ã™ã‚‹</translation>
</message>
<message>
- <location line="+60"/>
+ <location line="+76"/>
<source>The entered address &quot;%1&quot; is already in the address book.</source>
- <translation type="unfinished"/>
+ <translation>å…¥ã£ãŸã®ã‚¢ãƒ‰ãƒ¬ã‚¹ã€Œ%1ã€ã¯ã‚‚ã†ã‚¢ãƒ‰ãƒ¬ã‚¹å¸³ã«ã‚ã‚Šã¾ã™ã€‚</translation>
</message>
<message>
- <location line="+5"/>
+ <location line="-5"/>
<source>The entered address &quot;%1&quot; is not a valid Bitcoin address.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+5"/>
+ <location line="+10"/>
<source>Could not unlock wallet.</source>
- <translation type="unfinished"/>
+ <translation>財布をアンロックã™ã‚‹ã®ã¯å‡ºæ¥ã¾ã›ã‚“ã§ã—ãŸã€‚</translation>
</message>
<message>
<location line="+5"/>
<source>New key generation failed.</source>
- <translation type="unfinished"/>
+ <translation>æ–°ã—ã„ã®ã‚­ãƒ¼ã®ç”Ÿæˆã¯å¤±æ•—ã—ã¾ã—ãŸã€‚</translation>
</message>
</context>
<context>
<name>GUIUtil::HelpMessageBox</name>
<message>
- <location filename="../guiutil.cpp" line="+419"/>
+ <location filename="../guiutil.cpp" line="+422"/>
<location line="+12"/>
<source>Bitcoin-Qt</source>
<translation type="unfinished"/>
@@ -806,7 +786,7 @@ Address: %4
<message>
<location filename="../forms/optionsdialog.ui" line="+14"/>
<source>Options</source>
- <translation type="unfinished"/>
+ <translation>オプションズ</translation>
</message>
<message>
<location line="+16"/>
@@ -974,7 +954,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location filename="../optionsdialog.cpp" line="+55"/>
+ <location filename="../optionsdialog.cpp" line="+53"/>
<source>default</source>
<translation type="unfinished"/>
</message>
@@ -1016,28 +996,23 @@ Address: %4
<message>
<location filename="../forms/overviewpage.ui" line="+14"/>
<source>Form</source>
- <translation type="unfinished"/>
+ <translation>フォーム</translation>
</message>
<message>
- <location line="+51"/>
- <location line="+183"/>
+ <location line="+50"/>
+ <location line="+166"/>
<source>The displayed information may be out of date. Your wallet automatically synchronizes with the Bitcoin network after a connection is established, but this process has not completed yet.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-141"/>
+ <location line="-124"/>
<source>Balance:</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+58"/>
- <source>Number of transactions:</source>
- <translation type="unfinished"/>
+ <translation>残高:</translation>
</message>
<message>
- <location line="-29"/>
+ <location line="+29"/>
<source>Unconfirmed:</source>
- <translation type="unfinished"/>
+ <translation>未確èªï¼š</translation>
</message>
<message>
<location line="-78"/>
@@ -1045,7 +1020,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+124"/>
+ <location line="+107"/>
<source>Immature:</source>
<translation type="unfinished"/>
</message>
@@ -1057,12 +1032,12 @@ Address: %4
<message>
<location line="+46"/>
<source>&lt;b&gt;Recent transactions&lt;/b&gt;</source>
- <translation type="unfinished"/>
+ <translation>&lt;b&gt;最近ã®å–引&lt;/b&gt;</translation>
</message>
<message>
- <location line="-118"/>
+ <location line="-101"/>
<source>Your current balance</source>
- <translation type="unfinished"/>
+ <translation>今ã®æ®‹é«˜</translation>
</message>
<message>
<location line="+29"/>
@@ -1070,11 +1045,6 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+20"/>
- <source>Total number of transactions in wallet</source>
- <translation type="unfinished"/>
- </message>
- <message>
<location filename="../overviewpage.cpp" line="+115"/>
<location line="+1"/>
<source>out of sync</source>
@@ -1082,6 +1052,14 @@ Address: %4
</message>
</context>
<context>
+ <name>PaymentServer</name>
+ <message>
+ <location filename="../paymentserver.cpp" line="+107"/>
+ <source>Cannot start bitcoin: click-to-pay handler</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>QRCodeDialog</name>
<message>
<location filename="../forms/qrcodedialog.ui" line="+14"/>
@@ -1298,7 +1276,7 @@ Address: %4
<location line="+5"/>
<location line="+5"/>
<source>Send Coins</source>
- <translation type="unfinished"/>
+ <translation>コインをé€ã‚‹</translation>
</message>
<message>
<location line="+50"/>
@@ -1323,7 +1301,7 @@ Address: %4
<message>
<location line="+22"/>
<source>Balance:</source>
- <translation type="unfinished"/>
+ <translation>残高:</translation>
</message>
<message>
<location line="+10"/>
@@ -1401,7 +1379,7 @@ Address: %4
<message>
<location filename="../forms/sendcoinsentry.ui" line="+14"/>
<source>Form</source>
- <translation type="unfinished"/>
+ <translation>フォーム</translation>
</message>
<message>
<location line="+15"/>
@@ -1420,7 +1398,7 @@ Address: %4
</message>
<message>
<location line="+60"/>
- <location filename="../sendcoinsentry.cpp" line="+25"/>
+ <location filename="../sendcoinsentry.cpp" line="+26"/>
<source>Enter a label for this address to add it to your address book</source>
<translation type="unfinished"/>
</message>
@@ -1656,7 +1634,7 @@ Address: %4
<context>
<name>TransactionDesc</name>
<message>
- <location filename="../transactiondesc.cpp" line="+19"/>
+ <location filename="../transactiondesc.cpp" line="+20"/>
<source>Open until %1</source>
<translation type="unfinished"/>
</message>
@@ -1843,7 +1821,7 @@ Address: %4
<context>
<name>TransactionTableModel</name>
<message>
- <location filename="../transactiontablemodel.cpp" line="+226"/>
+ <location filename="../transactiontablemodel.cpp" line="+225"/>
<source>Date</source>
<translation type="unfinished"/>
</message>
@@ -1961,7 +1939,7 @@ Address: %4
<context>
<name>TransactionView</name>
<message>
- <location filename="../transactionview.cpp" line="+55"/>
+ <location filename="../transactionview.cpp" line="+52"/>
<location line="+16"/>
<source>All</source>
<translation type="unfinished"/>
@@ -2048,6 +2026,11 @@ Address: %4
</message>
<message>
<location line="+1"/>
+ <source>Copy transaction ID</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Edit label</source>
<translation type="unfinished"/>
</message>
@@ -2057,14 +2040,14 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+142"/>
+ <location line="+139"/>
<source>Export Transaction Data</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+1"/>
<source>Comma separated file (*.csv)</source>
- <translation type="unfinished"/>
+ <translation>テキスト CSV (*.csv)</translation>
</message>
<message>
<location line="+8"/>
@@ -2084,7 +2067,7 @@ Address: %4
<message>
<location line="+1"/>
<source>Label</source>
- <translation type="unfinished"/>
+ <translation>レーベル</translation>
</message>
<message>
<location line="+1"/>
@@ -2104,15 +2087,15 @@ Address: %4
<message>
<location line="+4"/>
<source>Error exporting</source>
- <translation type="unfinished"/>
+ <translation>エラー輸出</translation>
</message>
<message>
<location line="+0"/>
<source>Could not write to file %1.</source>
- <translation type="unfinished"/>
+ <translation>%1ã®ãƒ•ã‚¡ã‚¤ãƒ«ã«æ›¸ãè¾¼ã‚ã¾ã›ã‚“ã§ã—ãŸã€‚</translation>
</message>
<message>
- <location line="+95"/>
+ <location line="+100"/>
<source>Range:</source>
<translation type="unfinished"/>
</message>
@@ -2123,29 +2106,172 @@ Address: %4
</message>
</context>
<context>
+ <name>WalletView</name>
+ <message>
+ <location filename="../walletview.cpp" line="+95"/>
+ <source>&amp;Overview</source>
+ <translation>&amp;概観</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Show general overview of wallet</source>
+ <translation>財布ã®æ¦‚観を見ã›ã‚‹</translation>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>&amp;Send coins</source>
+ <translation>&amp;コインをé€ã‚‹</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Send coins to a Bitcoin address</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>&amp;Receive coins</source>
+ <translation>&amp;コインをもらã†</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Show the list of addresses for receiving payments</source>
+ <translation>支払ã„ã‚’å—ã‘å–ã‚‹ã®ã‚¢ãƒ‰ãƒ¬ã‚¹ã®ãƒªã‚¹ãƒˆã‚’見ã›ã‚‹</translation>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>&amp;Transactions</source>
+ <translation>&amp;å–引</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Browse transaction history</source>
+ <translation>昔ã®å–引をブラウズã™ã‚‹</translation>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>&amp;Address Book</source>
+ <translation>&amp;アドレス帳</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Edit the list of stored addresses and labels</source>
+ <translation>アドレスã¨ãƒ¬ãƒ¼ãƒ™ãƒ«ã®ãƒªã‚¹ãƒˆã‚’編集ã™ã‚‹</translation>
+ </message>
+ <message>
+ <location line="+12"/>
+ <source>&amp;Encrypt Wallet...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Encrypt the private keys that belong to your wallet</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>&amp;Backup Wallet...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Backup wallet to another location</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>&amp;Change Passphrase...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Change the passphrase used for wallet encryption</source>
+ <translation>財布ã®æš—å·åŒ–ã®ãŸã‚ã®ãƒ‘スフレーズを変ã‚ã‚‹</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Sign &amp;message...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Sign messages with your Bitcoin addresses to prove you own them</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>&amp;Verify message...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Verify messages to ensure they were signed with specified Bitcoin addresses</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>&amp;Export...</source>
+ <translation>&amp;輸出。。。</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Export the data in the current tab to a file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+180"/>
+ <source>Backup Wallet</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>Wallet Data (*.dat)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Backup Failed</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>There was an error trying to save the wallet data to the new location.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>Backup Successful</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>The wallet data was successfully saved to the new location.</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>bitcoin-core</name>
<message>
- <location filename="../bitcoinstrings.cpp" line="+88"/>
+ <location filename="../bitcoinstrings.cpp" line="+96"/>
<source>Bitcoin version</source>
<translation>Bitcoin Bertsio</translation>
</message>
<message>
- <location line="+82"/>
+ <location line="+98"/>
<source>Usage:</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-23"/>
+ <location line="-24"/>
<source>Send command to -server or bitcoind</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-21"/>
+ <location line="-22"/>
<source>List commands</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-11"/>
+ <location line="-10"/>
<source>Get help for a command</source>
<translation type="unfinished"/>
</message>
@@ -2170,12 +2296,12 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="-15"/>
+ <location line="-28"/>
<source>Don&apos;t generate coins</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+61"/>
+ <location line="+74"/>
<source>Specify data directory</source>
<translation type="unfinished"/>
</message>
@@ -2185,80 +2311,82 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="-26"/>
+ <location line="-27"/>
<source>Listen for connections on &lt;port&gt; (default: 8333 or testnet: 18333)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+4"/>
+ <location line="+5"/>
<source>Maintain at most &lt;n&gt; connections to peers (default: 125)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-34"/>
+ <location line="-49"/>
<source>Connect to a node to retrieve peer addresses, and disconnect</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+65"/>
+ <location line="+80"/>
<source>Specify your own public address</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+2"/>
+ <location line="+3"/>
<source>Threshold for disconnecting misbehaving peers (default: 100)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-114"/>
+ <location line="-132"/>
<source>Number of seconds to keep misbehaving peers from reconnecting (default: 86400)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-28"/>
+ <location line="-32"/>
<source>An error occurred while setting up the RPC port %u for listening on IPv4: %s</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+26"/>
+ <location line="+30"/>
<source>Listen for JSON-RPC connections on &lt;port&gt; (default: 8332 or testnet: 18332)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+34"/>
+ <location line="+36"/>
<source>Accept command line and JSON-RPC commands</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+62"/>
+ <location line="+77"/>
<source>Run in the background as a daemon and accept commands</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+31"/>
+ <location line="+32"/>
<source>Use the test network</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-92"/>
+ <location line="-108"/>
<source>Accept connections from outside (default: 1 if no -proxy or -connect)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-74"/>
+ <location line="-82"/>
<source>%s, you must set a rpcpassword in the configuration file:
- %s
+%s
It is recommended you use the following random password:
rpcuser=bitcoinrpc
rpcpassword=%s
(you do not need to remember this password)
The username and password MUST NOT be the same.
If the file does not exist, create it with owner-readable-only file permissions.
+It is also recommended to set alertnotify so you are notified of problems;
+for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.com
</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+15"/>
+ <location line="+17"/>
<source>An error occurred while setting up the RPC port %u for listening on IPv6, falling back to IPv4: %s</source>
<translation type="unfinished"/>
</message>
@@ -2274,11 +2402,6 @@ If the file does not exist, create it with owner-readable-only file permissions.
</message>
<message>
<location line="+3"/>
- <source>Corrupted block database detected. Please restart the client with -reindex.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+2"/>
<source>Error initializing database environment %s! To recover, BACKUP THAT DIRECTORY, then remove everything from it except for wallet.dat.</source>
<translation type="unfinished"/>
</message>
@@ -2293,12 +2416,27 @@ If the file does not exist, create it with owner-readable-only file permissions.
<translation type="unfinished"/>
</message>
<message>
+ <location line="+3"/>
+ <source>Execute command when a relevant alert is received (%s in cmd is replaced by message)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Execute command when a wallet transaction changes (%s in cmd is replaced by TxID)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location line="+11"/>
<source>Set maximum size of high-priority/low-fee transactions in bytes (default: 27000)</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+3"/>
+ <source>Set the number of script verification threads (1-16, 0=auto, default: 0)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
<source>This is a pre-release test build - use at your own risk - do not use for mining or merchant applications</source>
<translation type="unfinished"/>
</message>
@@ -2344,16 +2482,41 @@ If the file does not exist, create it with owner-readable-only file permissions.
</message>
<message>
<location line="+3"/>
+ <source>Corrupted block database detected</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Discover own IP address (default: 1 when listening and no -externalip)</source>
<translation type="unfinished"/>
</message>
<message>
+ <location line="+1"/>
+ <source>Do you want to rebuild the block database now?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location line="+3"/>
+ <source>Error initializing block database</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Error initializing wallet database environment %s!</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Error loading block database</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+5"/>
+ <location line="+4"/>
+ <source>Error opening block database</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
<source>Error: Disk space is low!</source>
<translation type="unfinished"/>
</message>
@@ -2369,26 +2532,96 @@ If the file does not exist, create it with owner-readable-only file permissions.
</message>
<message>
<location line="+2"/>
+ <source>Error: system error: </source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Failed to listen on any port. Use -listen=0 if you want this.</source>
<translation type="unfinished"/>
</message>
<message>
+ <location line="+1"/>
+ <source>Failed to read block info</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Failed to read block</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Failed to sync block index</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Failed to write block index</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Failed to write block info</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Failed to write block</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Failed to write file info</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Failed to write to coin database</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Failed to write transaction index</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Failed to write undo data</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location line="+2"/>
<source>Find peers using DNS lookup (default: 1 unless -connect)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+5"/>
- <source>How thorough the block verification is (0-4, default: 3)</source>
+ <location line="+3"/>
+ <source>How many blocks to check at startup (default: 288, 0 = all)</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+1"/>
- <source>Importing blocks from block database...</source>
+ <source>How thorough the block verification is (0-4, default: 3)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+24"/>
+ <source>Rebuild block chain index from current blk000??.dat files</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+37"/>
+ <source>Verifying blocks...</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+1"/>
+ <source>Verifying wallet...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-61"/>
<source>Imports blocks from external blk000??.dat file</source>
<translation type="unfinished"/>
</message>
@@ -2403,7 +2636,12 @@ If the file does not exist, create it with owner-readable-only file permissions.
<translation type="unfinished"/>
</message>
<message>
- <location line="+9"/>
+ <location line="+8"/>
+ <source>Maintain a full transaction index (default: 0)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
<source>Maximum per-connection receive buffer, &lt;n&gt;*1000 bytes (default: 5000)</source>
<translation type="unfinished"/>
</message>
@@ -2438,12 +2676,7 @@ If the file does not exist, create it with owner-readable-only file permissions.
<translation type="unfinished"/>
</message>
<message>
- <location line="+1"/>
- <source>Rebuild blockchain index from current blk000??.dat files</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+4"/>
+ <location line="+5"/>
<source>SSL options: (see the Bitcoin Wiki for SSL setup instructions)</source>
<translation type="unfinished"/>
</message>
@@ -2483,7 +2716,12 @@ If the file does not exist, create it with owner-readable-only file permissions.
<translation type="unfinished"/>
</message>
<message>
- <location line="+13"/>
+ <location line="+4"/>
+ <source>System error: </source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+10"/>
<source>Use UPnP to map the listening port (default: 0)</source>
<translation type="unfinished"/>
</message>
@@ -2514,36 +2752,41 @@ If the file does not exist, create it with owner-readable-only file permissions.
</message>
<message>
<location line="+1"/>
+ <source>You need to rebuild the databases using -reindex to change -txindex</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>wallet.dat corrupt, salvage failed</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-43"/>
+ <location line="-45"/>
<source>Password for JSON-RPC connections</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-53"/>
+ <location line="-68"/>
<source>Allow JSON-RPC connections from specified IP address</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+62"/>
+ <location line="+77"/>
<source>Send commands to node running on &lt;ip&gt; (default: 127.0.0.1)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-103"/>
+ <location line="-120"/>
<source>Execute command when the best block changes (%s in cmd is replaced by block hash)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+124"/>
+ <location line="+142"/>
<source>Upgrade wallet to latest format</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-15"/>
+ <location line="-16"/>
<source>Set key pool size to &lt;n&gt; (default: 100)</source>
<translation type="unfinished"/>
</message>
@@ -2553,17 +2796,12 @@ If the file does not exist, create it with owner-readable-only file permissions.
<translation type="unfinished"/>
</message>
<message>
- <location line="-26"/>
- <source>How many blocks to check at startup (default: 2500, 0 = all)</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+55"/>
+ <location line="+30"/>
<source>Use OpenSSL (https) for JSON-RPC connections</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-20"/>
+ <location line="-21"/>
<source>Server certificate file (default: server.cert)</source>
<translation type="unfinished"/>
</message>
@@ -2573,12 +2811,12 @@ If the file does not exist, create it with owner-readable-only file permissions.
<translation type="unfinished"/>
</message>
<message>
- <location line="-133"/>
+ <location line="-154"/>
<source>Acceptable ciphers (default: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+144"/>
+ <location line="+166"/>
<source>This help message</source>
<translation type="unfinished"/>
</message>
@@ -2588,7 +2826,7 @@ If the file does not exist, create it with owner-readable-only file permissions.
<translation type="unfinished"/>
</message>
<message>
- <location line="-70"/>
+ <location line="-86"/>
<source>Connect through socks proxy</source>
<translation type="unfinished"/>
</message>
@@ -2598,12 +2836,12 @@ If the file does not exist, create it with owner-readable-only file permissions.
<translation type="unfinished"/>
</message>
<message>
- <location line="+43"/>
+ <location line="+57"/>
<source>Loading addresses...</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-25"/>
+ <location line="-35"/>
<source>Error loading wallet.dat: Wallet corrupted</source>
<translation type="unfinished"/>
</message>
@@ -2613,32 +2851,22 @@ If the file does not exist, create it with owner-readable-only file permissions.
<translation type="unfinished"/>
</message>
<message>
- <location line="+73"/>
- <source>Verifying block database integrity...</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+1"/>
- <source>Verifying wallet integrity...</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+1"/>
+ <location line="+87"/>
<source>Wallet needed to be rewritten: restart Bitcoin to complete</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-77"/>
+ <location line="-89"/>
<source>Error loading wallet.dat</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+20"/>
+ <location line="+30"/>
<source>Invalid -proxy address: &apos;%s&apos;</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+46"/>
+ <location line="+48"/>
<source>Unknown network specified in -onlynet: &apos;%s&apos;</source>
<translation type="unfinished"/>
</message>
@@ -2648,7 +2876,7 @@ If the file does not exist, create it with owner-readable-only file permissions.
<translation type="unfinished"/>
</message>
<message>
- <location line="-75"/>
+ <location line="-91"/>
<source>Cannot resolve -bind address: &apos;%s&apos;</source>
<translation type="unfinished"/>
</message>
@@ -2658,17 +2886,17 @@ If the file does not exist, create it with owner-readable-only file permissions.
<translation type="unfinished"/>
</message>
<message>
- <location line="+31"/>
+ <location line="+45"/>
<source>Invalid amount for -paytxfee=&lt;amount&gt;: &apos;%s&apos;</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-15"/>
+ <location line="-24"/>
<source>Error: could not start node</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+16"/>
+ <location line="+25"/>
<source>Invalid amount</source>
<translation type="unfinished"/>
</message>
@@ -2683,7 +2911,7 @@ If the file does not exist, create it with owner-readable-only file permissions.
<translation type="unfinished"/>
</message>
<message>
- <location line="-45"/>
+ <location line="-59"/>
<source>Add a node to connect to and attempt to keep the connection open</source>
<translation type="unfinished"/>
</message>
@@ -2693,22 +2921,17 @@ If the file does not exist, create it with owner-readable-only file permissions.
<translation type="unfinished"/>
</message>
<message>
- <location line="+54"/>
- <source>Find peers using internet relay chat (default: 0)</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="-2"/>
+ <location line="+68"/>
<source>Fee per KB to add to transactions you send</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+19"/>
+ <location line="+17"/>
<source>Loading wallet...</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-40"/>
+ <location line="-54"/>
<source>Cannot downgrade wallet</source>
<translation type="unfinished"/>
</message>
@@ -2723,27 +2946,27 @@ If the file does not exist, create it with owner-readable-only file permissions.
<translation type="unfinished"/>
</message>
<message>
- <location line="+49"/>
+ <location line="+64"/>
<source>Rescanning...</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-43"/>
+ <location line="-56"/>
<source>Done loading</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+65"/>
+ <location line="+79"/>
<source>To use the %s option</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-60"/>
+ <location line="-71"/>
<source>Error</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-28"/>
+ <location line="-33"/>
<source>You must set rpcpassword=&lt;password&gt; in the configuration file:
%s
If the file does not exist, create it with owner-readable-only file permissions.</source>
diff --git a/src/qt/locale/bitcoin_la.ts b/src/qt/locale/bitcoin_la.ts
new file mode 100644
index 0000000000..fa2b04427e
--- /dev/null
+++ b/src/qt/locale/bitcoin_la.ts
@@ -0,0 +1,2996 @@
+<?xml version="1.0" ?><!DOCTYPE TS><TS language="la" version="2.0">
+<defaultcodec>UTF-8</defaultcodec>
+<context>
+ <name>AboutDialog</name>
+ <message>
+ <location filename="../forms/aboutdialog.ui" line="+14"/>
+ <source>About Bitcoin</source>
+ <translation>Informatio de Bitcoin</translation>
+ </message>
+ <message>
+ <location line="+39"/>
+ <source>&lt;b&gt;Bitcoin&lt;/b&gt; version</source>
+ <translation>&lt;b&gt;Bitcoin&lt;/b&gt; versio</translation>
+ </message>
+ <message>
+ <location line="+57"/>
+ <source>
+This is experimental software.
+
+Distributed under the MIT/X11 software license, see the accompanying file COPYING or http://www.opensource.org/licenses/mit-license.php.
+
+This product includes software developed by the OpenSSL Project for use in the OpenSSL Toolkit (http://www.openssl.org/) and cryptographic software written by Eric Young (eay@cryptsoft.com) and UPnP software written by Thomas Bernard.</source>
+ <translation>Hoc est experimentale programma.
+
+Distributum sub MIT/X11 licentia programmatum, vide comitantem plicam COPYING vel http://www.opensource.org/licenses/mit-license.php.
+
+Hoc productum continet programmata composita ab OpenSSL Project pro utendo in OpenSSL Toolkit (http://www.openssl.org/) et programmata cifrarum scripta ab Eric Young (eay@cryptsoft.com) et UPnP programmata scripta ab Thomas Bernard.</translation>
+ </message>
+ <message>
+ <location filename="../aboutdialog.cpp" line="+17"/>
+ <source>Copyright</source>
+ <translation>Copyright</translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>2009-%1 The Bitcoin developers</source>
+ <translation>2009-%1 Bitcoin curatores</translation>
+ </message>
+</context>
+<context>
+ <name>AddressBookPage</name>
+ <message>
+ <location filename="../forms/addressbookpage.ui" line="+14"/>
+ <source>Address Book</source>
+ <translation>Liber Inscriptionum</translation>
+ </message>
+ <message>
+ <location line="+22"/>
+ <source>Double-click to edit address or label</source>
+ <translation>Dupliciter-clicca ut inscriptionem vel titulum mutes</translation>
+ </message>
+ <message>
+ <location line="+27"/>
+ <source>Create a new address</source>
+ <translation>Crea novam inscriptionem</translation>
+ </message>
+ <message>
+ <location line="+14"/>
+ <source>Copy the currently selected address to the system clipboard</source>
+ <translation>Copia inscriptionem iam selectam in latibulum systematis</translation>
+ </message>
+ <message>
+ <location line="-11"/>
+ <source>&amp;New Address</source>
+ <translation>&amp;Nova Inscriptio</translation>
+ </message>
+ <message>
+ <location line="-46"/>
+ <source>These are your Bitcoin addresses for receiving payments. You may want to give a different one to each sender so you can keep track of who is paying you.</source>
+ <translation>Haec sunt inscriptiones Bitcoin tuae pro accipendo pensitationes. Cupias variam ad quemque mittentem dare ut melius scias quem tibi pensare.</translation>
+ </message>
+ <message>
+ <location line="+60"/>
+ <source>&amp;Copy Address</source>
+ <translation>&amp;Copia Inscriptionem</translation>
+ </message>
+ <message>
+ <location line="+11"/>
+ <source>Show &amp;QR Code</source>
+ <translation>Monstra codicem &amp;QR</translation>
+ </message>
+ <message>
+ <location line="+11"/>
+ <source>Sign a message to prove you own a Bitcoin address</source>
+ <translation>Signa nuntium ut demonstres inscriptionem Bitcoin a te possessam esse</translation>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Sign &amp;Message</source>
+ <translation>Signa &amp;Nuntium</translation>
+ </message>
+ <message>
+ <location line="+25"/>
+ <source>Delete the currently selected address from the list</source>
+ <translation>Dele active selectam inscriptionem ex enumeratione</translation>
+ </message>
+ <message>
+ <location line="-14"/>
+ <source>Verify a message to ensure it was signed with a specified Bitcoin address</source>
+ <translation>Verifica nuntium ut cures signatum esse cum specificata inscriptione Bitcoin</translation>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>&amp;Verify Message</source>
+ <translation>&amp;Verifica Nuntium</translation>
+ </message>
+ <message>
+ <location line="+14"/>
+ <source>&amp;Delete</source>
+ <translation>&amp;Dele</translation>
+ </message>
+ <message>
+ <location filename="../addressbookpage.cpp" line="+66"/>
+ <source>Copy &amp;Label</source>
+ <translation>Copia &amp;Titulum</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>&amp;Edit</source>
+ <translation>&amp;Muta</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Send &amp;Coins</source>
+ <translation>Mitte &amp;Nummos</translation>
+ </message>
+ <message>
+ <location line="+263"/>
+ <source>Export Address Book Data</source>
+ <translation>Exporta Data Libri Inscriptionum</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Comma separated file (*.csv)</source>
+ <translation>Comma Separata Plica (*.csv)</translation>
+ </message>
+ <message>
+ <location line="+13"/>
+ <source>Error exporting</source>
+ <translation>Error exportandi</translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>Could not write to file %1.</source>
+ <translation>Non potuisse scribere in plicam %1.</translation>
+ </message>
+</context>
+<context>
+ <name>AddressTableModel</name>
+ <message>
+ <location filename="../addresstablemodel.cpp" line="+144"/>
+ <source>Label</source>
+ <translation>Titulus</translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>Address</source>
+ <translation>Inscriptio</translation>
+ </message>
+ <message>
+ <location line="+36"/>
+ <source>(no label)</source>
+ <translation>(nullus titulus)</translation>
+ </message>
+</context>
+<context>
+ <name>AskPassphraseDialog</name>
+ <message>
+ <location filename="../forms/askpassphrasedialog.ui" line="+26"/>
+ <source>Passphrase Dialog</source>
+ <translation>Dialogus Tesserae</translation>
+ </message>
+ <message>
+ <location line="+21"/>
+ <source>Enter passphrase</source>
+ <translation>Insere tesseram</translation>
+ </message>
+ <message>
+ <location line="+14"/>
+ <source>New passphrase</source>
+ <translation>Nova tessera</translation>
+ </message>
+ <message>
+ <location line="+14"/>
+ <source>Repeat new passphrase</source>
+ <translation>Itera novam tesseram</translation>
+ </message>
+ <message>
+ <location filename="../askpassphrasedialog.cpp" line="+33"/>
+ <source>Enter the new passphrase to the wallet.&lt;br/&gt;Please use a passphrase of &lt;b&gt;10 or more random characters&lt;/b&gt;, or &lt;b&gt;eight or more words&lt;/b&gt;.</source>
+ <translation>Insero novam tesseram cassidili.&lt;br/&gt;Sodes tessera &lt;b&gt;10 pluriumve fortuitarum litterarum&lt;/b&gt; utere aut &lt;b&gt;octo pluriumve verborum&lt;/b&gt;.</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Encrypt wallet</source>
+ <translation>Cifra cassidile</translation>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>This operation needs your wallet passphrase to unlock the wallet.</source>
+ <translation>Huic operationi necesse est tessera cassidili tuo ut cassidile reseret.</translation>
+ </message>
+ <message>
+ <location line="+5"/>
+ <source>Unlock wallet</source>
+ <translation>Resera cassidile</translation>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>This operation needs your wallet passphrase to decrypt the wallet.</source>
+ <translation>Huic operationi necesse est tessera cassidili tuo ut cassidile decifret.</translation>
+ </message>
+ <message>
+ <location line="+5"/>
+ <source>Decrypt wallet</source>
+ <translation>Decifra cassidile</translation>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Change passphrase</source>
+ <translation>Muta tesseram</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Enter the old and new passphrase to the wallet.</source>
+ <translation>Insero veterem novamque tesseram cassidili.</translation>
+ </message>
+ <message>
+ <location line="+46"/>
+ <source>Confirm wallet encryption</source>
+ <translation>Confirma cifrationem cassidilis</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Warning: If you encrypt your wallet and lose your passphrase, you will &lt;b&gt;LOSE ALL OF YOUR BITCOINS&lt;/b&gt;!</source>
+ <translation>Monitio: Si cassidile tuum cifras et tesseram amittis, tu &lt;b&gt;AMITTES OMNES TUOS NUMMOS BITOS&lt;/b&gt;!</translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>Are you sure you wish to encrypt your wallet?</source>
+ <translation>Certusne es te velle tuum cassidile cifrare?</translation>
+ </message>
+ <message>
+ <location line="+15"/>
+ <source>IMPORTANT: Any previous backups you have made of your wallet file should be replaced with the newly generated, encrypted wallet file. For security reasons, previous backups of the unencrypted wallet file will become useless as soon as you start using the new, encrypted wallet.</source>
+ <translation>GRAVE: Oportet ulla prioria conservata quae fecisti de plica tui cassidilis reponi a nove generata cifrata plica cassidilis. Propter securitatem, prioria conservata de plica non cifrata cassidilis inutilia fiet simul atque incipis uti novo cifrato cassidili.</translation>
+ </message>
+ <message>
+ <location line="+100"/>
+ <location line="+24"/>
+ <source>Warning: The Caps Lock key is on!</source>
+ <translation>Monitio: Litterae ut capitales seratae sunt!</translation>
+ </message>
+ <message>
+ <location line="-130"/>
+ <location line="+58"/>
+ <source>Wallet encrypted</source>
+ <translation>Cassidile cifratum</translation>
+ </message>
+ <message>
+ <location line="-56"/>
+ <source>Bitcoin will close now to finish the encryption process. Remember that encrypting your wallet cannot fully protect your bitcoins from being stolen by malware infecting your computer.</source>
+ <translation>Bitcoin iam desinet ut finiat actionem cifrandi. Memento cassidile cifrare non posse cuncte curare ne tui nummi clepantur ab malis programatibus in tuo computatro.</translation>
+ </message>
+ <message>
+ <location line="+13"/>
+ <location line="+7"/>
+ <location line="+42"/>
+ <location line="+6"/>
+ <source>Wallet encryption failed</source>
+ <translation>Cassidile cifrare abortum est</translation>
+ </message>
+ <message>
+ <location line="-54"/>
+ <source>Wallet encryption failed due to an internal error. Your wallet was not encrypted.</source>
+ <translation>Cassidile cifrare abortum est propter internum errorem. Tuum cassidile cifratum non est.</translation>
+ </message>
+ <message>
+ <location line="+7"/>
+ <location line="+48"/>
+ <source>The supplied passphrases do not match.</source>
+ <translation>Tesserae datae non eaedem sunt.</translation>
+ </message>
+ <message>
+ <location line="-37"/>
+ <source>Wallet unlock failed</source>
+ <translation>Cassidile reserare abortum est.</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <location line="+11"/>
+ <location line="+19"/>
+ <source>The passphrase entered for the wallet decryption was incorrect.</source>
+ <translation>Tessera inserta pro cassidilis decifrando prava erat.</translation>
+ </message>
+ <message>
+ <location line="-20"/>
+ <source>Wallet decryption failed</source>
+ <translation>Cassidile decifrare abortum est.</translation>
+ </message>
+ <message>
+ <location line="+14"/>
+ <source>Wallet passphrase was successfully changed.</source>
+ <translation>Tessera cassidilis successa est in mutando.</translation>
+ </message>
+</context>
+<context>
+ <name>BitcoinGUI</name>
+ <message>
+ <location filename="../bitcoingui.cpp" line="+231"/>
+ <source>Sign &amp;message...</source>
+ <translation>Signa &amp;nuntium...</translation>
+ </message>
+ <message>
+ <location line="+299"/>
+ <source>Synchronizing with network...</source>
+ <translation>Synchronizans cum rete...</translation>
+ </message>
+ <message>
+ <location line="-367"/>
+ <source>&amp;Overview</source>
+ <translation>&amp;Summarium</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Show general overview of wallet</source>
+ <translation>Monstra generale summarium cassidilis</translation>
+ </message>
+ <message>
+ <location line="+20"/>
+ <source>&amp;Transactions</source>
+ <translation>&amp;Transactiones</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Browse transaction history</source>
+ <translation>Inspicio historiam transactionum</translation>
+ </message>
+ <message>
+ <location line="+7"/>
+ <source>Edit the list of stored addresses and labels</source>
+ <translation>Muta indicem salvatarum inscriptionum titulorumque</translation>
+ </message>
+ <message>
+ <location line="-14"/>
+ <source>Show the list of addresses for receiving payments</source>
+ <translation>Monstra indicem inscriptionum quibus pensitationes acceptandae</translation>
+ </message>
+ <message>
+ <location line="+31"/>
+ <source>E&amp;xit</source>
+ <translation>E&amp;xi</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Quit application</source>
+ <translation>Exi applicatione</translation>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>Show information about Bitcoin</source>
+ <translation>Monstra informationem de Bitcoin</translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>About &amp;Qt</source>
+ <translation>Informatio de &amp;Qt</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Show information about Qt</source>
+ <translation>Monstra informationem de Qt</translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>&amp;Options...</source>
+ <translation>&amp;Optiones</translation>
+ </message>
+ <message>
+ <location line="+5"/>
+ <source>&amp;Encrypt Wallet...</source>
+ <translation>&amp;Cifra Cassidile...</translation>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>&amp;Backup Wallet...</source>
+ <translation>&amp;Conserva Cassidile...</translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>&amp;Change Passphrase...</source>
+ <translation>&amp;Muta tesseram...</translation>
+ </message>
+ <message>
+ <location line="+304"/>
+ <source>Importing blocks from disk...</source>
+ <translation>Importans frusta ab disco...</translation>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Reindexing blocks on disk...</source>
+ <translation>Recreans indicem frustorum in disco...</translation>
+ </message>
+ <message>
+ <location line="-300"/>
+ <source>&amp;Export...</source>
+ <translation>&amp;Exporta...</translation>
+ </message>
+ <message>
+ <location line="-65"/>
+ <source>Send coins to a Bitcoin address</source>
+ <translation>Mitte nummos ad inscriptionem Bitcoin</translation>
+ </message>
+ <message>
+ <location line="+49"/>
+ <source>Modify configuration options for Bitcoin</source>
+ <translation>Muta configurationis optiones pro Bitcoin</translation>
+ </message>
+ <message>
+ <location line="+17"/>
+ <source>Export the data in the current tab to a file</source>
+ <translation>Exporta data in activa tabella ad plicam</translation>
+ </message>
+ <message>
+ <location line="-9"/>
+ <source>Backup wallet to another location</source>
+ <translation>Conserva cassidile in locum alium</translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Change the passphrase used for wallet encryption</source>
+ <translation>Muta tesseram utam pro cassidilis cifrando</translation>
+ </message>
+ <message>
+ <location line="+9"/>
+ <source>&amp;Debug window</source>
+ <translation>Fenestra &amp;Debug</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Open debugging and diagnostic console</source>
+ <translation>Aperi terminalem debug et diagnosticalem</translation>
+ </message>
+ <message>
+ <location line="-7"/>
+ <source>&amp;Verify message...</source>
+ <translation>&amp;Verifica nuntium...</translation>
+ </message>
+ <message>
+ <location line="-162"/>
+ <location line="+540"/>
+ <source>Bitcoin</source>
+ <translation>Bitcoin</translation>
+ </message>
+ <message>
+ <location line="-540"/>
+ <source>Wallet</source>
+ <translation>Cassidile</translation>
+ </message>
+ <message>
+ <location line="+99"/>
+ <source>&amp;Send</source>
+ <translation>&amp;Mitte</translation>
+ </message>
+ <message>
+ <location line="+7"/>
+ <source>&amp;Receive</source>
+ <translation>&amp;Accipe</translation>
+ </message>
+ <message>
+ <location line="+14"/>
+ <source>&amp;Addresses</source>
+ <translation>&amp;Inscriptiones</translation>
+ </message>
+ <message>
+ <location line="+22"/>
+ <source>&amp;About Bitcoin</source>
+ <translation>&amp;Informatio de Bitcoin</translation>
+ </message>
+ <message>
+ <location line="+9"/>
+ <source>&amp;Show / Hide</source>
+ <translation>&amp;Monstra/Occulta</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Show or hide the main Window</source>
+ <translation>Monstra vel occulta Fenestram principem</translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Encrypt the private keys that belong to your wallet</source>
+ <translation>Cifra claves privatas quae cassidili tui sunt</translation>
+ </message>
+ <message>
+ <location line="+7"/>
+ <source>Sign messages with your Bitcoin addresses to prove you own them</source>
+ <translation>Signa nuntios cum tuis inscriptionibus Bitcoin ut demonstres te eas possidere</translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Verify messages to ensure they were signed with specified Bitcoin addresses</source>
+ <translation>Verifica nuntios ut certus sis eos signatos esse cum specificatis inscriptionibus Bitcoin</translation>
+ </message>
+ <message>
+ <location line="+31"/>
+ <source>&amp;File</source>
+ <translation>&amp;Plica</translation>
+ </message>
+ <message>
+ <location line="+8"/>
+ <source>&amp;Settings</source>
+ <translation>&amp;Configuratio</translation>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>&amp;Help</source>
+ <translation>&amp;Auxilium</translation>
+ </message>
+ <message>
+ <location line="+9"/>
+ <source>Tabs toolbar</source>
+ <translation>Tabella instrumentorum &quot;Tabs&quot;</translation>
+ </message>
+ <message>
+ <location line="+8"/>
+ <source>Actions toolbar</source>
+ <translation>Tabella instrumentorum &quot;Actiones&quot;</translation>
+ </message>
+ <message>
+ <location line="+13"/>
+ <location line="+10"/>
+ <source>[testnet]</source>
+ <translation>[testnet]</translation>
+ </message>
+ <message>
+ <location line="+47"/>
+ <source>Bitcoin client</source>
+ <translation>Bitcoin cliens</translation>
+ </message>
+ <message numerus="yes">
+ <location line="+140"/>
+ <source>%n active connection(s) to Bitcoin network</source>
+ <translation><numerusform>%n activa conexio ad rete Bitcoin</numerusform><numerusform>%n activae conexiones ad rete Bitcoin</numerusform></translation>
+ </message>
+ <message>
+ <location line="+39"/>
+ <source>Processed %1 of %2 (estimated) blocks of transaction history.</source>
+ <translation>Perfecta %1 de %2 (aestimato) frusta historiae transactionum.</translation>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>Processed %1 blocks of transaction history.</source>
+ <translation>Processae %1 frusta historiae transactionum.</translation>
+ </message>
+ <message numerus="yes">
+ <location line="+20"/>
+ <source>%n hour(s)</source>
+ <translation><numerusform>%n hora</numerusform><numerusform>%n horae</numerusform></translation>
+ </message>
+ <message numerus="yes">
+ <location line="+4"/>
+ <source>%n day(s)</source>
+ <translation><numerusform>%n dies</numerusform><numerusform>%n dies</numerusform></translation>
+ </message>
+ <message numerus="yes">
+ <location line="+4"/>
+ <source>%n week(s)</source>
+ <translation><numerusform>%n hebdomas</numerusform><numerusform>%n hebdomades</numerusform></translation>
+ </message>
+ <message>
+ <location line="+5"/>
+ <source>%1 behind</source>
+ <translation>%1 post</translation>
+ </message>
+ <message>
+ <location line="+14"/>
+ <source>Last received block was generated %1 ago.</source>
+ <translation>Postremum acceptum frustum generatum est %1 abhinc.</translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Transactions after this will not yet be visible.</source>
+ <translation>Transactiones post hoc nondum visibiles erunt.</translation>
+ </message>
+ <message>
+ <location line="+21"/>
+ <source>Error</source>
+ <translation>Error</translation>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Warning</source>
+ <translation>Monitio</translation>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Information</source>
+ <translation>Informatio</translation>
+ </message>
+ <message>
+ <location line="+68"/>
+ <source>This transaction is over the size limit. You can still send it for a fee of %1, which goes to the nodes that process your transaction and helps to support the network. Do you want to pay the fee?</source>
+ <translation>Haec transactio maior est quam limen magnitudinis. Adhuc potes id mittere mercede %1, quae it nodis qui procedunt tuam transactionem et adiuvat sustinere rete. Visne mercedem solvere?</translation>
+ </message>
+ <message>
+ <location line="-138"/>
+ <source>Up to date</source>
+ <translation>Recentissimo</translation>
+ </message>
+ <message>
+ <location line="+32"/>
+ <source>Catching up...</source>
+ <translation>Persequens...</translation>
+ </message>
+ <message>
+ <location line="+110"/>
+ <source>Confirm transaction fee</source>
+ <translation>Confirma mercedem transactionis</translation>
+ </message>
+ <message>
+ <location line="+8"/>
+ <source>Sent transaction</source>
+ <translation>Transactio missa</translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>Incoming transaction</source>
+ <translation>Transactio incipiens</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Date: %1
+Amount: %2
+Type: %3
+Address: %4
+</source>
+ <translation>Dies: %1
+Quantitas: %2
+Typus: %3
+Inscriptio: %4
+</translation>
+ </message>
+ <message>
+ <location line="+33"/>
+ <location line="+23"/>
+ <source>URI handling</source>
+ <translation>Tractatio URI</translation>
+ </message>
+ <message>
+ <location line="-23"/>
+ <location line="+23"/>
+ <source>URI can not be parsed! This can be caused by an invalid Bitcoin address or malformed URI parameters.</source>
+ <translation>URI intellegi non posse! Huius causa possit inscriptionem Bitcoin non validam aut URI parametra maleformata.</translation>
+ </message>
+ <message>
+ <location line="+17"/>
+ <source>Wallet is &lt;b&gt;encrypted&lt;/b&gt; and currently &lt;b&gt;unlocked&lt;/b&gt;</source>
+ <translation>Cassidile &lt;b&gt;cifratum&lt;/b&gt; est et iam nunc &lt;b&gt;reseratum&lt;/b&gt;</translation>
+ </message>
+ <message>
+ <location line="+8"/>
+ <source>Wallet is &lt;b&gt;encrypted&lt;/b&gt; and currently &lt;b&gt;locked&lt;/b&gt;</source>
+ <translation>Cassidile &lt;b&gt;cifratum&lt;/b&gt; est et iam nunc &lt;b&gt;seratum&lt;/b&gt;</translation>
+ </message>
+ <message>
+ <location filename="../bitcoin.cpp" line="+108"/>
+ <source>A fatal error occurred. Bitcoin can no longer continue safely and will quit.</source>
+ <translation>Error fatalis accidit. Bitcoin nondum pergere tute potest, et exibit.</translation>
+ </message>
+</context>
+<context>
+ <name>ClientModel</name>
+ <message>
+ <location filename="../clientmodel.cpp" line="+96"/>
+ <source>Network Alert</source>
+ <translation>Monitio Retis</translation>
+ </message>
+</context>
+<context>
+ <name>EditAddressDialog</name>
+ <message>
+ <location filename="../forms/editaddressdialog.ui" line="+14"/>
+ <source>Edit Address</source>
+ <translation>Muta Inscriptionem</translation>
+ </message>
+ <message>
+ <location line="+11"/>
+ <source>&amp;Label</source>
+ <translation>&amp;Titulus</translation>
+ </message>
+ <message>
+ <location line="+10"/>
+ <source>The label associated with this address book entry</source>
+ <translation>Titulus associatus huic insertione libri inscriptionum</translation>
+ </message>
+ <message>
+ <location line="+7"/>
+ <source>&amp;Address</source>
+ <translation>&amp;Inscriptio</translation>
+ </message>
+ <message>
+ <location line="+10"/>
+ <source>The address associated with this address book entry. This can only be modified for sending addresses.</source>
+ <translation>Titulus associatus huic insertione libri inscriptionum. Haec tantum mutari potest pro inscriptionibus mittendi</translation>
+ </message>
+ <message>
+ <location filename="../editaddressdialog.cpp" line="+21"/>
+ <source>New receiving address</source>
+ <translation>Nova inscriptio accipiendi</translation>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>New sending address</source>
+ <translation>Nova inscriptio mittendi</translation>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Edit receiving address</source>
+ <translation>Muta inscriptionem accipiendi</translation>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>Edit sending address</source>
+ <translation>Muta inscriptionem mittendi</translation>
+ </message>
+ <message>
+ <location line="+76"/>
+ <source>The entered address &quot;%1&quot; is already in the address book.</source>
+ <translation>Inserta inscriptio &quot;%1&quot; iam in libro inscriptionum est.</translation>
+ </message>
+ <message>
+ <location line="-5"/>
+ <source>The entered address &quot;%1&quot; is not a valid Bitcoin address.</source>
+ <translation>Inscriptio inserta &quot;%1&quot; non valida inscriptio Bitcoin est.</translation>
+ </message>
+ <message>
+ <location line="+10"/>
+ <source>Could not unlock wallet.</source>
+ <translation>Non potuisse cassidile reserare</translation>
+ </message>
+ <message>
+ <location line="+5"/>
+ <source>New key generation failed.</source>
+ <translation>Generare novam clavem abortum est.</translation>
+ </message>
+</context>
+<context>
+ <name>GUIUtil::HelpMessageBox</name>
+ <message>
+ <location filename="../guiutil.cpp" line="+422"/>
+ <location line="+12"/>
+ <source>Bitcoin-Qt</source>
+ <translation>Bitcoin-Qt</translation>
+ </message>
+ <message>
+ <location line="-12"/>
+ <source>version</source>
+ <translation>versio</translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Usage:</source>
+ <translation>Usus:</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>command-line options</source>
+ <translation>Optiones mandati intiantis</translation>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>UI options</source>
+ <translation>UI optiones</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Set language, for example &quot;de_DE&quot; (default: system locale)</source>
+ <translation>Constitue linguam, exempli gratia &quot;de_DE&quot; (praedefinitum: lingua systematis)</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Start minimized</source>
+ <translation>Incipe minifactum ut icon</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Show splash screen on startup (default: 1)</source>
+ <translation>Monstra principem imaginem ad initium (praedefinitum: 1)</translation>
+ </message>
+</context>
+<context>
+ <name>OptionsDialog</name>
+ <message>
+ <location filename="../forms/optionsdialog.ui" line="+14"/>
+ <source>Options</source>
+ <translation>Optiones</translation>
+ </message>
+ <message>
+ <location line="+16"/>
+ <source>&amp;Main</source>
+ <translation>&amp;Princeps</translation>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>Optional transaction fee per kB that helps make sure your transactions are processed quickly. Most transactions are 1 kB. Fee 0.01 recommended.</source>
+ <translation>Optionalis merces transactionum singulis kB quae adiuvat curare ut tuae transactiones processae sit celeriter. Plurimi transactiones 1kB sunt. Merces 0.01 hortata.</translation>
+ </message>
+ <message>
+ <location line="+15"/>
+ <source>Pay transaction &amp;fee</source>
+ <translation>Solve &amp;mercedem transactionis</translation>
+ </message>
+ <message>
+ <location line="+31"/>
+ <source>Automatically start Bitcoin after logging in to the system.</source>
+ <translation>Pelle Bitcoin per se postquam in systema inire.</translation>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>&amp;Start Bitcoin on system login</source>
+ <translation>&amp;Pelle Bitcoin cum inire systema</translation>
+ </message>
+ <message>
+ <location line="+35"/>
+ <source>Reset all client options to default.</source>
+ <translation>Reconstitue omnes optiones clientis ad praedefinita.</translation>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>&amp;Reset Options</source>
+ <translation>&amp;Reconstitue Optiones</translation>
+ </message>
+ <message>
+ <location line="+13"/>
+ <source>&amp;Network</source>
+ <translation>&amp;Rete</translation>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>Automatically open the Bitcoin client port on the router. This only works when your router supports UPnP and it is enabled.</source>
+ <translation>Aperi per se portam clientis Bitcoin in itineratore. Hoc tantum effectivum est si itineratrum tuum supportat UPnP et id activum est.</translation>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Map port using &amp;UPnP</source>
+ <translation>Designa portam utendo &amp;UPnP</translation>
+ </message>
+ <message>
+ <location line="+7"/>
+ <source>Connect to the Bitcoin network through a SOCKS proxy (e.g. when connecting through Tor).</source>
+ <translation>Connecte ad rete Bitcoin per SOCKS vicarium (e.g. quando conectens per Tor).</translation>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>&amp;Connect through SOCKS proxy:</source>
+ <translation>&amp;Conecte per SOCKS vicarium:</translation>
+ </message>
+ <message>
+ <location line="+9"/>
+ <source>Proxy &amp;IP:</source>
+ <translation>&amp;IP vicarii:</translation>
+ </message>
+ <message>
+ <location line="+19"/>
+ <source>IP address of the proxy (e.g. 127.0.0.1)</source>
+ <translation>Inscriptio IP vicarii (e.g. 127.0.0.1)</translation>
+ </message>
+ <message>
+ <location line="+7"/>
+ <source>&amp;Port:</source>
+ <translation>&amp;Porta:</translation>
+ </message>
+ <message>
+ <location line="+19"/>
+ <source>Port of the proxy (e.g. 9050)</source>
+ <translation>Porta vicarii (e.g. 9050)</translation>
+ </message>
+ <message>
+ <location line="+7"/>
+ <source>SOCKS &amp;Version:</source>
+ <translation>SOCKS &amp;Versio:</translation>
+ </message>
+ <message>
+ <location line="+13"/>
+ <source>SOCKS version of the proxy (e.g. 5)</source>
+ <translation>SOCKS versio vicarii (e.g. 5)</translation>
+ </message>
+ <message>
+ <location line="+36"/>
+ <source>&amp;Window</source>
+ <translation>&amp;Fenestra</translation>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>Show only a tray icon after minimizing the window.</source>
+ <translation>Monstra tantum iconem in tabella systematis postquam fenestram minifactam est.</translation>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>&amp;Minimize to the tray instead of the taskbar</source>
+ <translation>&amp;Minifac in tabellam systematis potius quam applicationum</translation>
+ </message>
+ <message>
+ <location line="+7"/>
+ <source>Minimize instead of exit the application when the window is closed. When this option is enabled, the application will be closed only after selecting Quit in the menu.</source>
+ <translation>Minifac potius quam exire applicatione quando fenestra clausa sit. Si haec optio activa est, applicatio clausa erit tantum postquam selegeris Exi in menu.</translation>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>M&amp;inimize on close</source>
+ <translation>M&amp;inifac ad claudendum</translation>
+ </message>
+ <message>
+ <location line="+21"/>
+ <source>&amp;Display</source>
+ <translation>&amp;UI</translation>
+ </message>
+ <message>
+ <location line="+8"/>
+ <source>User Interface &amp;language:</source>
+ <translation>&amp;Lingua monstranda utenti:</translation>
+ </message>
+ <message>
+ <location line="+13"/>
+ <source>The user interface language can be set here. This setting will take effect after restarting Bitcoin.</source>
+ <translation>Lingua monstranda utenti hic constitui potest. Haec configuratio effectiva erit postquam Bitcoin iterum initiatum erit.</translation>
+ </message>
+ <message>
+ <location line="+11"/>
+ <source>&amp;Unit to show amounts in:</source>
+ <translation>&amp;Unita qua quantitates monstrare:</translation>
+ </message>
+ <message>
+ <location line="+13"/>
+ <source>Choose the default subdivision unit to show in the interface and when sending coins.</source>
+ <translation>Selige praedefinitam unitam subdivisionis monstrare in interfacie et quando nummos mittere</translation>
+ </message>
+ <message>
+ <location line="+9"/>
+ <source>Whether to show Bitcoin addresses in the transaction list or not.</source>
+ <translation>Num monstrare inscriptiones Bitcoin in enumeratione transactionum.</translation>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>&amp;Display addresses in transaction list</source>
+ <translation>&amp;Monstra inscriptiones in enumeratione transactionum</translation>
+ </message>
+ <message>
+ <location line="+71"/>
+ <source>&amp;OK</source>
+ <translation>&amp;OK</translation>
+ </message>
+ <message>
+ <location line="+7"/>
+ <source>&amp;Cancel</source>
+ <translation>&amp;Cancella</translation>
+ </message>
+ <message>
+ <location line="+10"/>
+ <source>&amp;Apply</source>
+ <translation>&amp;Applica</translation>
+ </message>
+ <message>
+ <location filename="../optionsdialog.cpp" line="+53"/>
+ <source>default</source>
+ <translation>praedefinitum</translation>
+ </message>
+ <message>
+ <location line="+130"/>
+ <source>Confirm options reset</source>
+ <translation>Confirma optionum reconstituere</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Some settings may require a client restart to take effect.</source>
+ <translation>Aliis configurationibus fortasse necesse est clientem iterum initiare ut effectivae sint.</translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>Do you want to proceed?</source>
+ <translation>Vis procedere?</translation>
+ </message>
+ <message>
+ <location line="+42"/>
+ <location line="+9"/>
+ <source>Warning</source>
+ <translation>Monitio</translation>
+ </message>
+ <message>
+ <location line="-9"/>
+ <location line="+9"/>
+ <source>This setting will take effect after restarting Bitcoin.</source>
+ <translation>Haec configuratio effectiva erit postquam Bitcoin iterum initiatum erit.</translation>
+ </message>
+ <message>
+ <location line="+29"/>
+ <source>The supplied proxy address is invalid.</source>
+ <translation>Inscriptio vicarii tradita non valida est.</translation>
+ </message>
+</context>
+<context>
+ <name>OverviewPage</name>
+ <message>
+ <location filename="../forms/overviewpage.ui" line="+14"/>
+ <source>Form</source>
+ <translation>Schema</translation>
+ </message>
+ <message>
+ <location line="+50"/>
+ <location line="+166"/>
+ <source>The displayed information may be out of date. Your wallet automatically synchronizes with the Bitcoin network after a connection is established, but this process has not completed yet.</source>
+ <translation>Monstrata informatio fortasse non recentissima est. Tuum cassidile per se synchronizat cum rete Bitcoin postquam conexio constabilita est, sed hoc actio nondum perfecta est.</translation>
+ </message>
+ <message>
+ <location line="-124"/>
+ <source>Balance:</source>
+ <translation>Pendendum:</translation>
+ </message>
+ <message>
+ <location line="+29"/>
+ <source>Unconfirmed:</source>
+ <translation>Non confirmata:</translation>
+ </message>
+ <message>
+ <location line="-78"/>
+ <source>Wallet</source>
+ <translation>Cassidile</translation>
+ </message>
+ <message>
+ <location line="+107"/>
+ <source>Immature:</source>
+ <translation>Immatura:</translation>
+ </message>
+ <message>
+ <location line="+13"/>
+ <source>Mined balance that has not yet matured</source>
+ <translation>Fossum pendendum quod nondum maturum est</translation>
+ </message>
+ <message>
+ <location line="+46"/>
+ <source>&lt;b&gt;Recent transactions&lt;/b&gt;</source>
+ <translation>&lt;b&gt;Recentes transactiones&lt;/b&gt;</translation>
+ </message>
+ <message>
+ <location line="-101"/>
+ <source>Your current balance</source>
+ <translation>Tuum pendendum iam nunc</translation>
+ </message>
+ <message>
+ <location line="+29"/>
+ <source>Total of transactions that have yet to be confirmed, and do not yet count toward the current balance</source>
+ <translation>Totali nummi transactionum quae adhuc confirmandae sunt, et nondum afficiunt pendendum</translation>
+ </message>
+ <message>
+ <location filename="../overviewpage.cpp" line="+115"/>
+ <location line="+1"/>
+ <source>out of sync</source>
+ <translation>non synchronizato</translation>
+ </message>
+</context>
+<context>
+ <name>PaymentServer</name>
+ <message>
+ <location filename="../paymentserver.cpp" line="+107"/>
+ <source>Cannot start bitcoin: click-to-pay handler</source>
+ <translation>Bitcoin incipere non potest: cliccare-ad-pensandum handler</translation>
+ </message>
+</context>
+<context>
+ <name>QRCodeDialog</name>
+ <message>
+ <location filename="../forms/qrcodedialog.ui" line="+14"/>
+ <source>QR Code Dialog</source>
+ <translation>Dialogus QR Codicis</translation>
+ </message>
+ <message>
+ <location line="+59"/>
+ <source>Request Payment</source>
+ <translation>Posce Pensitationem</translation>
+ </message>
+ <message>
+ <location line="+56"/>
+ <source>Amount:</source>
+ <translation>Quantitas:</translation>
+ </message>
+ <message>
+ <location line="-44"/>
+ <source>Label:</source>
+ <translation>Titulus:</translation>
+ </message>
+ <message>
+ <location line="+19"/>
+ <source>Message:</source>
+ <translation>Nuntius:</translation>
+ </message>
+ <message>
+ <location line="+71"/>
+ <source>&amp;Save As...</source>
+ <translation>&amp;Salva ut...</translation>
+ </message>
+ <message>
+ <location filename="../qrcodedialog.cpp" line="+62"/>
+ <source>Error encoding URI into QR Code.</source>
+ <translation>Error codificandi URI in codicem QR.</translation>
+ </message>
+ <message>
+ <location line="+40"/>
+ <source>The entered amount is invalid, please check.</source>
+ <translation>Inserta quantitas non est valida, sodes proba.</translation>
+ </message>
+ <message>
+ <location line="+23"/>
+ <source>Resulting URI too long, try to reduce the text for label / message.</source>
+ <translation>Resultato URI nimis longo, conare minuere verba pro titulo / nuntio.</translation>
+ </message>
+ <message>
+ <location line="+25"/>
+ <source>Save QR Code</source>
+ <translation>Salva codicem QR</translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>PNG Images (*.png)</source>
+ <translation>Imagines PNG (*.png)</translation>
+ </message>
+</context>
+<context>
+ <name>RPCConsole</name>
+ <message>
+ <location filename="../forms/rpcconsole.ui" line="+46"/>
+ <source>Client name</source>
+ <translation>Nomen clientis</translation>
+ </message>
+ <message>
+ <location line="+10"/>
+ <location line="+23"/>
+ <location line="+26"/>
+ <location line="+23"/>
+ <location line="+23"/>
+ <location line="+36"/>
+ <location line="+53"/>
+ <location line="+23"/>
+ <location line="+23"/>
+ <location filename="../rpcconsole.cpp" line="+344"/>
+ <source>N/A</source>
+ <translation>N/A</translation>
+ </message>
+ <message>
+ <location line="-217"/>
+ <source>Client version</source>
+ <translation>Versio clientis</translation>
+ </message>
+ <message>
+ <location line="-45"/>
+ <source>&amp;Information</source>
+ <translation>&amp;Informatio</translation>
+ </message>
+ <message>
+ <location line="+68"/>
+ <source>Using OpenSSL version</source>
+ <translation>Utens OpenSSL versione</translation>
+ </message>
+ <message>
+ <location line="+49"/>
+ <source>Startup time</source>
+ <translation>Tempus initiandi</translation>
+ </message>
+ <message>
+ <location line="+29"/>
+ <source>Network</source>
+ <translation>Rete</translation>
+ </message>
+ <message>
+ <location line="+7"/>
+ <source>Number of connections</source>
+ <translation>Numerus conexionum</translation>
+ </message>
+ <message>
+ <location line="+23"/>
+ <source>On testnet</source>
+ <translation>In testnet</translation>
+ </message>
+ <message>
+ <location line="+23"/>
+ <source>Block chain</source>
+ <translation>Catena frustorum</translation>
+ </message>
+ <message>
+ <location line="+7"/>
+ <source>Current number of blocks</source>
+ <translation>Numerus frustorum iam nunc</translation>
+ </message>
+ <message>
+ <location line="+23"/>
+ <source>Estimated total blocks</source>
+ <translation>Aestimatus totalis numerus frustorum</translation>
+ </message>
+ <message>
+ <location line="+23"/>
+ <source>Last block time</source>
+ <translation>Hora postremi frusti</translation>
+ </message>
+ <message>
+ <location line="+52"/>
+ <source>&amp;Open</source>
+ <translation>&amp;Aperi</translation>
+ </message>
+ <message>
+ <location line="+16"/>
+ <source>Command-line options</source>
+ <translation>Optiones mandati initiantis</translation>
+ </message>
+ <message>
+ <location line="+7"/>
+ <source>Show the Bitcoin-Qt help message to get a list with possible Bitcoin command-line options.</source>
+ <translation>Monstra nuntium auxilii Bitcoin-Qt ut videas enumerationem possibilium optionum Bitcoin mandati initiantis.</translation>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>&amp;Show</source>
+ <translation>&amp;Monstra</translation>
+ </message>
+ <message>
+ <location line="+24"/>
+ <source>&amp;Console</source>
+ <translation>&amp;Terminale</translation>
+ </message>
+ <message>
+ <location line="-260"/>
+ <source>Build date</source>
+ <translation>Dies aedificandi</translation>
+ </message>
+ <message>
+ <location line="-104"/>
+ <source>Bitcoin - Debug window</source>
+ <translation>Bitcoin - Fenestra debug</translation>
+ </message>
+ <message>
+ <location line="+25"/>
+ <source>Bitcoin Core</source>
+ <translation>Bitcoin Nucleus</translation>
+ </message>
+ <message>
+ <location line="+279"/>
+ <source>Debug log file</source>
+ <translation>Debug catalogi plica</translation>
+ </message>
+ <message>
+ <location line="+7"/>
+ <source>Open the Bitcoin debug log file from the current data directory. This can take a few seconds for large log files.</source>
+ <translation>Aperi plicam catalogi de Bitcoin debug ex activo indice datorum. Hoc possit pauca secunda pro plicis magnis catalogi.</translation>
+ </message>
+ <message>
+ <location line="+102"/>
+ <source>Clear console</source>
+ <translation>Vacuefac terminale</translation>
+ </message>
+ <message>
+ <location filename="../rpcconsole.cpp" line="-30"/>
+ <source>Welcome to the Bitcoin RPC console.</source>
+ <translation>Bene ventio in terminale RPC de Bitcoin.</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Use up and down arrows to navigate history, and &lt;b&gt;Ctrl-L&lt;/b&gt; to clear screen.</source>
+ <translation>Utere sagittis sursum deorsumque ut per historiam naviges, et &lt;b&gt;Ctrl+L&lt;/b&gt; ut scrinium vacuefacias.</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Type &lt;b&gt;help&lt;/b&gt; for an overview of available commands.</source>
+ <translation>Scribe &lt;b&gt;help&lt;/b&gt; pro summario possibilium mandatorum.</translation>
+ </message>
+</context>
+<context>
+ <name>SendCoinsDialog</name>
+ <message>
+ <location filename="../forms/sendcoinsdialog.ui" line="+14"/>
+ <location filename="../sendcoinsdialog.cpp" line="+124"/>
+ <location line="+5"/>
+ <location line="+5"/>
+ <location line="+5"/>
+ <location line="+6"/>
+ <location line="+5"/>
+ <location line="+5"/>
+ <source>Send Coins</source>
+ <translation>Mitte Nummos</translation>
+ </message>
+ <message>
+ <location line="+50"/>
+ <source>Send to multiple recipients at once</source>
+ <translation>Mitte pluribus accipientibus simul</translation>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Add &amp;Recipient</source>
+ <translation>Adde &amp;Accipientem</translation>
+ </message>
+ <message>
+ <location line="+20"/>
+ <source>Remove all transaction fields</source>
+ <translation>Remove omnes campos transactionis</translation>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Clear &amp;All</source>
+ <translation>Vacuefac &amp;Omnia</translation>
+ </message>
+ <message>
+ <location line="+22"/>
+ <source>Balance:</source>
+ <translation>Pendendum:</translation>
+ </message>
+ <message>
+ <location line="+10"/>
+ <source>123.456 BTC</source>
+ <translation>123.456 BTC</translation>
+ </message>
+ <message>
+ <location line="+31"/>
+ <source>Confirm the send action</source>
+ <translation>Confirma actionem mittendi</translation>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>S&amp;end</source>
+ <translation>&amp;Mitte</translation>
+ </message>
+ <message>
+ <location filename="../sendcoinsdialog.cpp" line="-59"/>
+ <source>&lt;b&gt;%1&lt;/b&gt; to %2 (%3)</source>
+ <translation>&lt;b&gt;%1&lt;/b&gt; ad %2 (%3)</translation>
+ </message>
+ <message>
+ <location line="+5"/>
+ <source>Confirm send coins</source>
+ <translation>Confirma mittendum nummorum</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Are you sure you want to send %1?</source>
+ <translation>Certus es te velle mittere %1?</translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source> and </source>
+ <translation>et</translation>
+ </message>
+ <message>
+ <location line="+23"/>
+ <source>The recipient address is not valid, please recheck.</source>
+ <translation>Inscriptio accipientis non est valida, sodes reproba.</translation>
+ </message>
+ <message>
+ <location line="+5"/>
+ <source>The amount to pay must be larger than 0.</source>
+ <translation>Oportet quantitatem ad pensandum maiorem quam 0 esse.</translation>
+ </message>
+ <message>
+ <location line="+5"/>
+ <source>The amount exceeds your balance.</source>
+ <translation>Quantitas est ultra quod habes.</translation>
+ </message>
+ <message>
+ <location line="+5"/>
+ <source>The total exceeds your balance when the %1 transaction fee is included.</source>
+ <translation>Quantitas est ultra quod habes cum merces transactionis %1 includitur.</translation>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>Duplicate address found, can only send to each address once per send operation.</source>
+ <translation>Geminata inscriptio inventa, tantum posse mittere ad quamque inscriptionem semel singulare operatione.</translation>
+ </message>
+ <message>
+ <location line="+5"/>
+ <source>Error: Transaction creation failed!</source>
+ <translation>Error: Creare transactionem abortum est!</translation>
+ </message>
+ <message>
+ <location line="+5"/>
+ <source>Error: The transaction was rejected. This might happen if some of the coins in your wallet were already spent, such as if you used a copy of wallet.dat and coins were spent in the copy but not marked as spent here.</source>
+ <translation>Error: transactio reiecta est. Hoc fiat si alii nummorum in tuo cassidili iam soluti sunt, ut si usus es exemplar de wallet.dat et nummi soluti sunt in exemplari sed non hic notati ut soluti.</translation>
+ </message>
+</context>
+<context>
+ <name>SendCoinsEntry</name>
+ <message>
+ <location filename="../forms/sendcoinsentry.ui" line="+14"/>
+ <source>Form</source>
+ <translation>Schema</translation>
+ </message>
+ <message>
+ <location line="+15"/>
+ <source>A&amp;mount:</source>
+ <translation>&amp;Quantitas:</translation>
+ </message>
+ <message>
+ <location line="+13"/>
+ <source>Pay &amp;To:</source>
+ <translation>Pensa &amp;Ad:</translation>
+ </message>
+ <message>
+ <location line="+34"/>
+ <source>The address to send the payment to (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
+ <translation>Inscriptio cui mittere pensitationem (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation>
+ </message>
+ <message>
+ <location line="+60"/>
+ <location filename="../sendcoinsentry.cpp" line="+26"/>
+ <source>Enter a label for this address to add it to your address book</source>
+ <translation>Insero titulum huic inscriptioni ut eam in tuum librum inscriptionum addas.</translation>
+ </message>
+ <message>
+ <location line="-78"/>
+ <source>&amp;Label:</source>
+ <translation>&amp;Titulus:</translation>
+ </message>
+ <message>
+ <location line="+28"/>
+ <source>Choose address from address book</source>
+ <translation>Selige inscriptionem ex libro inscriptionum</translation>
+ </message>
+ <message>
+ <location line="+10"/>
+ <source>Alt+A</source>
+ <translation>Alt+A</translation>
+ </message>
+ <message>
+ <location line="+7"/>
+ <source>Paste address from clipboard</source>
+ <translation>Conglutina inscriptionem ex latibulo</translation>
+ </message>
+ <message>
+ <location line="+10"/>
+ <source>Alt+P</source>
+ <translation>Alt+P</translation>
+ </message>
+ <message>
+ <location line="+7"/>
+ <source>Remove this recipient</source>
+ <translation>Remove hunc accipientem</translation>
+ </message>
+ <message>
+ <location filename="../sendcoinsentry.cpp" line="+1"/>
+ <source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
+ <translation>Insero inscriptionem Bitcoin (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation>
+ </message>
+</context>
+<context>
+ <name>SignVerifyMessageDialog</name>
+ <message>
+ <location filename="../forms/signverifymessagedialog.ui" line="+14"/>
+ <source>Signatures - Sign / Verify a Message</source>
+ <translation>Signationes - Signa / Verifica nuntium</translation>
+ </message>
+ <message>
+ <location line="+13"/>
+ <source>&amp;Sign Message</source>
+ <translation>&amp;Signa Nuntium</translation>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>You can sign messages with your addresses to prove you own them. Be careful not to sign anything vague, as phishing attacks may try to trick you into signing your identity over to them. Only sign fully-detailed statements you agree to.</source>
+ <translation>Potes nuntios signare inscriptionibus tuis ut demonstres te eas possidere. Cautus es non amibiguum signare, quia impetus phiscatorum conentur te fallere ut signes identitatem tuam ad eos. Solas signa sententias cuncte descriptas quibus convenis.</translation>
+ </message>
+ <message>
+ <location line="+18"/>
+ <source>The address to sign the message with (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
+ <translation>Inscriptio qua signare nuntium (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation>
+ </message>
+ <message>
+ <location line="+10"/>
+ <location line="+213"/>
+ <source>Choose an address from the address book</source>
+ <translation>Selige inscriptionem ex librum inscriptionum</translation>
+ </message>
+ <message>
+ <location line="-203"/>
+ <location line="+213"/>
+ <source>Alt+A</source>
+ <translation>Alt+A</translation>
+ </message>
+ <message>
+ <location line="-203"/>
+ <source>Paste address from clipboard</source>
+ <translation>Glutina inscriptionem ex latibulo</translation>
+ </message>
+ <message>
+ <location line="+10"/>
+ <source>Alt+P</source>
+ <translation>Alt+P</translation>
+ </message>
+ <message>
+ <location line="+12"/>
+ <source>Enter the message you want to sign here</source>
+ <translation>Insere hic nuntium quod vis signare</translation>
+ </message>
+ <message>
+ <location line="+7"/>
+ <source>Signature</source>
+ <translation>Signatio</translation>
+ </message>
+ <message>
+ <location line="+27"/>
+ <source>Copy the current signature to the system clipboard</source>
+ <translation>Copia signationem in latibulum systematis</translation>
+ </message>
+ <message>
+ <location line="+21"/>
+ <source>Sign the message to prove you own this Bitcoin address</source>
+ <translation>Signa nuntium ut demonstres hanc inscriptionem Bitcoin a te possessa esse</translation>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Sign &amp;Message</source>
+ <translation>Signa &amp;Nuntium</translation>
+ </message>
+ <message>
+ <location line="+14"/>
+ <source>Reset all sign message fields</source>
+ <translation>Reconstitue omnes campos signandi nuntii</translation>
+ </message>
+ <message>
+ <location line="+3"/>
+ <location line="+146"/>
+ <source>Clear &amp;All</source>
+ <translation>Vacuefac &amp;Omnia</translation>
+ </message>
+ <message>
+ <location line="-87"/>
+ <source>&amp;Verify Message</source>
+ <translation>&amp;Verifica Nuntium</translation>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>Enter the signing address, message (ensure you copy line breaks, spaces, tabs, etc. exactly) and signature below to verify the message. Be careful not to read more into the signature than what is in the signed message itself, to avoid being tricked by a man-in-the-middle attack.</source>
+ <translation>Insere inscriptionem signantem, nuntium (cura ut copias intermissiones linearum, spatia, tabs, et cetera exacte) et signationem infra ut nuntium verifices. Cautus esto ne magis legas in signationem quam in nuntio signato ipso est, ut vites falli ab impetu homo-in-medio.</translation>
+ </message>
+ <message>
+ <location line="+21"/>
+ <source>The address the message was signed with (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
+ <translation>Inscriptio qua nuntius signatus est (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation>
+ </message>
+ <message>
+ <location line="+40"/>
+ <source>Verify the message to ensure it was signed with the specified Bitcoin address</source>
+ <translation>Verifica nuntium ut cures signatum esse cum specifica inscriptione Bitcoin</translation>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Verify &amp;Message</source>
+ <translation>Verifica &amp;Nuntium</translation>
+ </message>
+ <message>
+ <location line="+14"/>
+ <source>Reset all verify message fields</source>
+ <translation>Reconstitue omnes campos verificandi nuntii</translation>
+ </message>
+ <message>
+ <location filename="../signverifymessagedialog.cpp" line="+27"/>
+ <location line="+3"/>
+ <source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
+ <translation>Insere inscriptionem Bitcoin (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation>
+ </message>
+ <message>
+ <location line="-2"/>
+ <source>Click &quot;Sign Message&quot; to generate signature</source>
+ <translation>Clicca &quot;Signa Nuntium&quot; ut signatio generetur</translation>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Enter Bitcoin signature</source>
+ <translation>Insere signationem Bitcoin</translation>
+ </message>
+ <message>
+ <location line="+82"/>
+ <location line="+81"/>
+ <source>The entered address is invalid.</source>
+ <translation>Inscriptio inserta non valida est.</translation>
+ </message>
+ <message>
+ <location line="-81"/>
+ <location line="+8"/>
+ <location line="+73"/>
+ <location line="+8"/>
+ <source>Please check the address and try again.</source>
+ <translation>Sodes inscriptionem proba et rursus conare.</translation>
+ </message>
+ <message>
+ <location line="-81"/>
+ <location line="+81"/>
+ <source>The entered address does not refer to a key.</source>
+ <translation>Inserta inscriptio clavem non refert.</translation>
+ </message>
+ <message>
+ <location line="-73"/>
+ <source>Wallet unlock was cancelled.</source>
+ <translation>Cassidilis reserare cancellatum est.</translation>
+ </message>
+ <message>
+ <location line="+8"/>
+ <source>Private key for the entered address is not available.</source>
+ <translation>Clavis privata absens est pro inserta inscriptione.</translation>
+ </message>
+ <message>
+ <location line="+12"/>
+ <source>Message signing failed.</source>
+ <translation>Nuntium signare abortum est.</translation>
+ </message>
+ <message>
+ <location line="+5"/>
+ <source>Message signed.</source>
+ <translation>Nuntius signatus.</translation>
+ </message>
+ <message>
+ <location line="+59"/>
+ <source>The signature could not be decoded.</source>
+ <translation>Signatio decodificari non potuit.</translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <location line="+13"/>
+ <source>Please check the signature and try again.</source>
+ <translation>Sodes signationem proba et rursus conare.</translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>The signature did not match the message digest.</source>
+ <translation>Signatio non convenit digesto nuntii</translation>
+ </message>
+ <message>
+ <location line="+7"/>
+ <source>Message verification failed.</source>
+ <translation>Nuntium verificare abortum est.</translation>
+ </message>
+ <message>
+ <location line="+5"/>
+ <source>Message verified.</source>
+ <translation>Nuntius verificatus.</translation>
+ </message>
+</context>
+<context>
+ <name>TransactionDesc</name>
+ <message>
+ <location filename="../transactiondesc.cpp" line="+20"/>
+ <source>Open until %1</source>
+ <translation>Apertum donec %1</translation>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>%1/offline</source>
+ <translation>%1/non conecto</translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>%1/unconfirmed</source>
+ <translation>%1/non confirmata</translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>%1 confirmations</source>
+ <translation>%1 confirmationes</translation>
+ </message>
+ <message>
+ <location line="+18"/>
+ <source>Status</source>
+ <translation>Status</translation>
+ </message>
+ <message numerus="yes">
+ <location line="+7"/>
+ <source>, broadcast through %n node(s)</source>
+ <translation><numerusform>, disseminatum per %n nodo</numerusform><numerusform>, disseminata per %n nodis</numerusform></translation>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>Date</source>
+ <translation>Dies</translation>
+ </message>
+ <message>
+ <location line="+7"/>
+ <source>Source</source>
+ <translation>Fons</translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>Generated</source>
+ <translation>Generatum</translation>
+ </message>
+ <message>
+ <location line="+5"/>
+ <location line="+17"/>
+ <source>From</source>
+ <translation>Ab</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <location line="+22"/>
+ <location line="+58"/>
+ <source>To</source>
+ <translation>Ad</translation>
+ </message>
+ <message>
+ <location line="-77"/>
+ <location line="+2"/>
+ <source>own address</source>
+ <translation>inscriptio propria</translation>
+ </message>
+ <message>
+ <location line="-2"/>
+ <source>label</source>
+ <translation>titulus</translation>
+ </message>
+ <message>
+ <location line="+37"/>
+ <location line="+12"/>
+ <location line="+45"/>
+ <location line="+17"/>
+ <location line="+30"/>
+ <source>Credit</source>
+ <translation>Creditum</translation>
+ </message>
+ <message numerus="yes">
+ <location line="-102"/>
+ <source>matures in %n more block(s)</source>
+ <translation><numerusform>maturum erit in %n plure frusto</numerusform><numerusform>maturum erit in %n pluribus frustis</numerusform></translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>not accepted</source>
+ <translation>non acceptum</translation>
+ </message>
+ <message>
+ <location line="+44"/>
+ <location line="+8"/>
+ <location line="+15"/>
+ <location line="+30"/>
+ <source>Debit</source>
+ <translation>Debitum</translation>
+ </message>
+ <message>
+ <location line="-39"/>
+ <source>Transaction fee</source>
+ <translation>Transactionis merces</translation>
+ </message>
+ <message>
+ <location line="+16"/>
+ <source>Net amount</source>
+ <translation>Cuncta quantitas</translation>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>Message</source>
+ <translation>Nuntius</translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Comment</source>
+ <translation>Annotatio</translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Transaction ID</source>
+ <translation>ID transactionis</translation>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Generated coins must mature 120 blocks before they can be spent. When you generated this block, it was broadcast to the network to be added to the block chain. If it fails to get into the chain, its state will change to &quot;not accepted&quot; and it won&apos;t be spendable. This may occasionally happen if another node generates a block within a few seconds of yours.</source>
+ <translation>Nummis generatis necesse est maturitas 120 frustorum antequam illi transmitti possunt. Cum hoc frustum generavisti, disseminatum est ad rete ut addatur ad catenam frustorum. Si aboritur inire catenam, status eius mutabit in &quot;non acceptum&quot; et non transmittabile erit. Hoc interdum accidat si alter nodus frustum generat paucis secundis ante vel post tuum.</translation>
+ </message>
+ <message>
+ <location line="+7"/>
+ <source>Debug information</source>
+ <translation>Informatio de debug</translation>
+ </message>
+ <message>
+ <location line="+8"/>
+ <source>Transaction</source>
+ <translation>Transactio</translation>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Inputs</source>
+ <translation>Lectenda</translation>
+ </message>
+ <message>
+ <location line="+23"/>
+ <source>Amount</source>
+ <translation>Quantitas</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>true</source>
+ <translation>verum</translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>false</source>
+ <translation>falsum</translation>
+ </message>
+ <message>
+ <location line="-209"/>
+ <source>, has not been successfully broadcast yet</source>
+ <translation>, nondum prospere disseminatum est</translation>
+ </message>
+ <message numerus="yes">
+ <location line="-35"/>
+ <source>Open for %n more block(s)</source>
+ <translation type="unfinished"><numerusform></numerusform><numerusform>Aperi pro %n pluribus frustis</numerusform></translation>
+ </message>
+ <message>
+ <location line="+70"/>
+ <source>unknown</source>
+ <translation>ignotum</translation>
+ </message>
+</context>
+<context>
+ <name>TransactionDescDialog</name>
+ <message>
+ <location filename="../forms/transactiondescdialog.ui" line="+14"/>
+ <source>Transaction details</source>
+ <translation>Particularia transactionis</translation>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>This pane shows a detailed description of the transaction</source>
+ <translation>Haec tabula monstrat descriptionem verbosam transactionis</translation>
+ </message>
+</context>
+<context>
+ <name>TransactionTableModel</name>
+ <message>
+ <location filename="../transactiontablemodel.cpp" line="+225"/>
+ <source>Date</source>
+ <translation>Dies</translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>Type</source>
+ <translation>Typus</translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>Address</source>
+ <translation>Inscriptio</translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>Amount</source>
+ <translation>Quantitas</translation>
+ </message>
+ <message numerus="yes">
+ <location line="+57"/>
+ <source>Open for %n more block(s)</source>
+ <translation><numerusform>Aperi pro %n plure frusto</numerusform><numerusform>Aperi pro %n pluribus frustis</numerusform></translation>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Open until %1</source>
+ <translation>Apertum donec %1</translation>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Offline (%1 confirmations)</source>
+ <translation>Non conectum (%1 confirmationes)</translation>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Unconfirmed (%1 of %2 confirmations)</source>
+ <translation>Non confirmatum (%1 de %2 confirmationibus)</translation>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Confirmed (%1 confirmations)</source>
+ <translation>Confirmatum (%1 confirmationes)</translation>
+ </message>
+ <message numerus="yes">
+ <location line="+8"/>
+ <source>Mined balance will be available when it matures in %n more block(s)</source>
+ <translation><numerusform>Fossum pendendum utibile erit quando id maturum est post %n plus frustum</numerusform><numerusform>Fossum pendendum utibile erit quando id maturum est post %n pluria frusta</numerusform></translation>
+ </message>
+ <message>
+ <location line="+5"/>
+ <source>This block was not received by any other nodes and will probably not be accepted!</source>
+ <translation>Hoc frustum non acceptum est ab ulla alia nodis et probabiliter non acceptum erit!</translation>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Generated but not accepted</source>
+ <translation>Generatum sed non acceptum</translation>
+ </message>
+ <message>
+ <location line="+43"/>
+ <source>Received with</source>
+ <translation>Acceptum cum</translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Received from</source>
+ <translation>Acceptum ab</translation>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Sent to</source>
+ <translation>Missum ad</translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Payment to yourself</source>
+ <translation>Pensitatio ad te ipsum</translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Mined</source>
+ <translation>Fossa</translation>
+ </message>
+ <message>
+ <location line="+38"/>
+ <source>(n/a)</source>
+ <translation>(n/a)</translation>
+ </message>
+ <message>
+ <location line="+199"/>
+ <source>Transaction status. Hover over this field to show number of confirmations.</source>
+ <translation>Status transactionis. Supervola cum mure ut monstretur numerus confirmationum.</translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Date and time that the transaction was received.</source>
+ <translation>Dies et tempus quando transactio accepta est.</translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Type of transaction.</source>
+ <translation>Typus transactionis.</translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Destination address of transaction.</source>
+ <translation>Inscriptio destinationis transactionis.</translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Amount removed from or added to balance.</source>
+ <translation>Quantitas remota ex pendendo aut addita ei.</translation>
+ </message>
+</context>
+<context>
+ <name>TransactionView</name>
+ <message>
+ <location filename="../transactionview.cpp" line="+52"/>
+ <location line="+16"/>
+ <source>All</source>
+ <translation>Omne</translation>
+ </message>
+ <message>
+ <location line="-15"/>
+ <source>Today</source>
+ <translation>Hodie</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>This week</source>
+ <translation>Hac hebdomade</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>This month</source>
+ <translation>Hoc mense</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Last month</source>
+ <translation>Postremo mense</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>This year</source>
+ <translation>Hoc anno</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Range...</source>
+ <translation>Intervallum...</translation>
+ </message>
+ <message>
+ <location line="+11"/>
+ <source>Received with</source>
+ <translation>Acceptum cum</translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Sent to</source>
+ <translation>Missum ad</translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>To yourself</source>
+ <translation>Ad te ipsum</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Mined</source>
+ <translation>Fossa</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Other</source>
+ <translation>Alia</translation>
+ </message>
+ <message>
+ <location line="+7"/>
+ <source>Enter address or label to search</source>
+ <translation>Insere inscriptionem vel titulum ut quaeras</translation>
+ </message>
+ <message>
+ <location line="+7"/>
+ <source>Min amount</source>
+ <translation>Quantitas minima</translation>
+ </message>
+ <message>
+ <location line="+34"/>
+ <source>Copy address</source>
+ <translation>Copia inscriptionem</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy label</source>
+ <translation>Copia titulum</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy amount</source>
+ <translation>Copia quantitatem</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy transaction ID</source>
+ <translation>Copia transactionis ID</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Edit label</source>
+ <translation>Muta titulum</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Show transaction details</source>
+ <translation>Monstra particularia transactionis</translation>
+ </message>
+ <message>
+ <location line="+139"/>
+ <source>Export Transaction Data</source>
+ <translation>Exporta Data Transactionum</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Comma separated file (*.csv)</source>
+ <translation>Comma Separata Plica (*.csv)</translation>
+ </message>
+ <message>
+ <location line="+8"/>
+ <source>Confirmed</source>
+ <translation>Confirmatum</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Date</source>
+ <translation>Dies</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Type</source>
+ <translation>Typus</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Label</source>
+ <translation>Titulus</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Address</source>
+ <translation>Inscriptio</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Amount</source>
+ <translation>Quantitas</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>ID</source>
+ <translation>ID</translation>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>Error exporting</source>
+ <translation>Error exportandi</translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>Could not write to file %1.</source>
+ <translation>Non potuisse scribere ad plicam %1.</translation>
+ </message>
+ <message>
+ <location line="+100"/>
+ <source>Range:</source>
+ <translation>Intervallum:</translation>
+ </message>
+ <message>
+ <location line="+8"/>
+ <source>to</source>
+ <translation>ad</translation>
+ </message>
+</context>
+<context>
+ <name>WalletView</name>
+ <message>
+ <location filename="../walletview.cpp" line="+95"/>
+ <source>&amp;Overview</source>
+ <translation>&amp;Summarium</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Show general overview of wallet</source>
+ <translation>Monstra generale summarium cassidilis</translation>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>&amp;Send coins</source>
+ <translation>&amp;Mitte nummos</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Send coins to a Bitcoin address</source>
+ <translation>Mitte nummos ad inscriptionem Bitcoin</translation>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>&amp;Receive coins</source>
+ <translation>&amp;Accipe nummos</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Show the list of addresses for receiving payments</source>
+ <translation>Monstra indicem inscriptionum quibus pensitationes acceptandae</translation>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>&amp;Transactions</source>
+ <translation>&amp;Transactiones</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Browse transaction history</source>
+ <translation>Inspicio historiam transactionum</translation>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>&amp;Address Book</source>
+ <translation>Liber &amp;Inscriptionum</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Edit the list of stored addresses and labels</source>
+ <translation>Muta indicem salvatarum inscriptionum titulorumque</translation>
+ </message>
+ <message>
+ <location line="+12"/>
+ <source>&amp;Encrypt Wallet...</source>
+ <translation>&amp;Cifra Cassidile...</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Encrypt the private keys that belong to your wallet</source>
+ <translation>Cifra claves privatas quae cassidili tui sunt</translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>&amp;Backup Wallet...</source>
+ <translation>&amp;Conserva Cassidile...</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Backup wallet to another location</source>
+ <translation>Conserva cassidile in locum alium</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>&amp;Change Passphrase...</source>
+ <translation>&amp;Muta tesseram...</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Change the passphrase used for wallet encryption</source>
+ <translation>Muta tesseram utam pro cassidilis cifrando</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Sign &amp;message...</source>
+ <translation>Signa &amp;nuntium...</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Sign messages with your Bitcoin addresses to prove you own them</source>
+ <translation>Signa nuntios cum tuis inscriptionibus Bitcoin ut demonstres te eas possidere</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>&amp;Verify message...</source>
+ <translation>&amp;Verifica nuntium...</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Verify messages to ensure they were signed with specified Bitcoin addresses</source>
+ <translation>Verifica nuntios ut certus sis eos signatos esse cum specificatis inscriptionibus Bitcoin</translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>&amp;Export...</source>
+ <translation>&amp;Exporta...</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Export the data in the current tab to a file</source>
+ <translation>Exporta data in activa tabella ad plicam</translation>
+ </message>
+ <message>
+ <location line="+180"/>
+ <source>Backup Wallet</source>
+ <translation>Conserva cassidile</translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>Wallet Data (*.dat)</source>
+ <translation>Data cassidilis (*.dat)</translation>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Backup Failed</source>
+ <translation>Conservare abortum est.</translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>There was an error trying to save the wallet data to the new location.</source>
+ <translation>Error erat conante salvare data cassidilis ad novum locum.</translation>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>Backup Successful</source>
+ <translation>Successum in conservando</translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>The wallet data was successfully saved to the new location.</source>
+ <translation>Successum in salvando data cassidilis in novum locum.</translation>
+ </message>
+</context>
+<context>
+ <name>bitcoin-core</name>
+ <message>
+ <location filename="../bitcoinstrings.cpp" line="+96"/>
+ <source>Bitcoin version</source>
+ <translation>Versio de Bitcoin</translation>
+ </message>
+ <message>
+ <location line="+98"/>
+ <source>Usage:</source>
+ <translation>Usus:</translation>
+ </message>
+ <message>
+ <location line="-24"/>
+ <source>Send command to -server or bitcoind</source>
+ <translation>Mitte mandatum ad -server vel bitcoind</translation>
+ </message>
+ <message>
+ <location line="-22"/>
+ <source>List commands</source>
+ <translation>Enumera mandata</translation>
+ </message>
+ <message>
+ <location line="-10"/>
+ <source>Get help for a command</source>
+ <translation>Accipe auxilium pro mandato</translation>
+ </message>
+ <message>
+ <location line="+21"/>
+ <source>Options:</source>
+ <translation>Optiones:</translation>
+ </message>
+ <message>
+ <location line="+22"/>
+ <source>Specify configuration file (default: bitcoin.conf)</source>
+ <translation>Specifica configurationis plicam (praedefinitum: bitcoin.conf)</translation>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Specify pid file (default: bitcoind.pid)</source>
+ <translation>Specifica pid plicam (praedefinitum: bitcoin.pid)</translation>
+ </message>
+ <message>
+ <location line="-47"/>
+ <source>Generate coins</source>
+ <translation>Genera nummos</translation>
+ </message>
+ <message>
+ <location line="-28"/>
+ <source>Don&apos;t generate coins</source>
+ <translation>Nolite nummos generare</translation>
+ </message>
+ <message>
+ <location line="+74"/>
+ <source>Specify data directory</source>
+ <translation>Specifica indicem datorum</translation>
+ </message>
+ <message>
+ <location line="-7"/>
+ <source>Set database cache size in megabytes (default: 25)</source>
+ <translation>Constitue magnitudinem databasis cache in megabytes (praedefinitum: 25)</translation>
+ </message>
+ <message>
+ <location line="-27"/>
+ <source>Listen for connections on &lt;port&gt; (default: 8333 or testnet: 18333)</source>
+ <translation>Ausculta pro conexionibus in &lt;porta&gt; (praedefinitum: 8333 vel testnet: 18333)</translation>
+ </message>
+ <message>
+ <location line="+5"/>
+ <source>Maintain at most &lt;n&gt; connections to peers (default: 125)</source>
+ <translation>Manutene non plures quam &lt;n&gt; conexiones ad paria (praedefinitum: 125)</translation>
+ </message>
+ <message>
+ <location line="-49"/>
+ <source>Connect to a node to retrieve peer addresses, and disconnect</source>
+ <translation>Conecta ad nodum acceptare inscriptiones parium, et disconecte</translation>
+ </message>
+ <message>
+ <location line="+80"/>
+ <source>Specify your own public address</source>
+ <translation>Specifica tuam propriam publicam inscriptionem</translation>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Threshold for disconnecting misbehaving peers (default: 100)</source>
+ <translation>Limen pro disconectendo paria improba (praedefinitum: 100)</translation>
+ </message>
+ <message>
+ <location line="-132"/>
+ <source>Number of seconds to keep misbehaving peers from reconnecting (default: 86400)</source>
+ <translation>Numerum secundorum prohibere ne paria improba reconectant (praedefinitum: 86400)</translation>
+ </message>
+ <message>
+ <location line="-32"/>
+ <source>An error occurred while setting up the RPC port %u for listening on IPv4: %s</source>
+ <translation>Error erat dum initians portam RPC %u pro auscultando in IPv4: %s</translation>
+ </message>
+ <message>
+ <location line="+30"/>
+ <source>Listen for JSON-RPC connections on &lt;port&gt; (default: 8332 or testnet: 18332)</source>
+ <translation>Ausculta pro conexionibus JSON-RPC in &lt;porta&gt; (praedefinitum: 8332 vel testnet: 18332)</translation>
+ </message>
+ <message>
+ <location line="+36"/>
+ <source>Accept command line and JSON-RPC commands</source>
+ <translation>Accipe terminalis et JSON-RPC mandata.</translation>
+ </message>
+ <message>
+ <location line="+77"/>
+ <source>Run in the background as a daemon and accept commands</source>
+ <translation>Operare infere sicut daemon et mandata accipe</translation>
+ </message>
+ <message>
+ <location line="+32"/>
+ <source>Use the test network</source>
+ <translation>Utere rete experimentale</translation>
+ </message>
+ <message>
+ <location line="-108"/>
+ <source>Accept connections from outside (default: 1 if no -proxy or -connect)</source>
+ <translation>Accipe conexiones externas (praedefinitum: 1 nisi -proxy neque -connect)</translation>
+ </message>
+ <message>
+ <location line="-82"/>
+ <source>%s, you must set a rpcpassword in the configuration file:
+%s
+It is recommended you use the following random password:
+rpcuser=bitcoinrpc
+rpcpassword=%s
+(you do not need to remember this password)
+The username and password MUST NOT be the same.
+If the file does not exist, create it with owner-readable-only file permissions.
+It is also recommended to set alertnotify so you are notified of problems;
+for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.com
+</source>
+ <translation>%s, necesse est te rpcpassword constituere in plica configurationis:
+%s
+Hortatur te hanc fortuitam tesseram uti:
+rpcuser=bitcoinrpc
+rpcpassword=%s
+(non est necesse te hanc tesseram meminisse)
+Nomen usoris et tessera eadem esse NON POSSUNT.
+Si plica non existit, eam crea cum permissionibus ut eius dominus tantum sinitur id legere.
+Quoque hortatur alertnotify constituere ut tu notificetur de problematibus;
+exempli gratia: alertnotify=echo %%s | mail -s &quot;Bitcoin Notificatio&quot; admin@foo.com
+</translation>
+ </message>
+ <message>
+ <location line="+17"/>
+ <source>An error occurred while setting up the RPC port %u for listening on IPv6, falling back to IPv4: %s</source>
+ <translation>Error erat dum initians portam RPC %u pro auscultando in IPv6, labens retrorsum ad IPv4: %s</translation>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Bind to given address and always listen on it. Use [host]:port notation for IPv6</source>
+ <translation>Conglutina ad inscriptionem datam et semper in eam ausculta. Utere [moderatrum]:porta notationem pro IPv6</translation>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Cannot obtain a lock on data directory %s. Bitcoin is probably already running.</source>
+ <translation>Non posse serare datorum indicem %s. Bitcoin probabiliter iam operatur.</translation>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Error initializing database environment %s! To recover, BACKUP THAT DIRECTORY, then remove everything from it except for wallet.dat.</source>
+ <translation>Error initiando systema databasi %s! Ut restituas, CONSERVA ILLUM INDICEM PLICARUM, tunc remove omnes ex illo praeter wallet.dat.</translation>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Error: The transaction was rejected! This might happen if some of the coins in your wallet were already spent, such as if you used a copy of wallet.dat and coins were spent in the copy but not marked as spent here.</source>
+ <translation>Error: Transactio eiecta est! Hoc possit accidere si alii nummorum in cassidili tuo iam soluti sint, ut si usus es exemplar de wallet.dat et nummi soluti sunt in exemplari sed non hic notati ut soluti.</translation>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>Error: This transaction requires a transaction fee of at least %s because of its amount, complexity, or use of recently received funds!</source>
+ <translation>Error: Huic transactioni necesse est merces saltem %s propter eius magnitudinem, complexitatem, vel usum recentum acceptorum nummorum!</translation>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Execute command when a relevant alert is received (%s in cmd is replaced by message)</source>
+ <translation>Facere mandatum quotiescumque notificatio affinis accipitur (%s in mandato mutatur in nuntium) </translation>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Execute command when a wallet transaction changes (%s in cmd is replaced by TxID)</source>
+ <translation>Facere mandatum quotiescumque cassidilis transactio mutet (%s in mandato sbstituitur ab TxID)</translation>
+ </message>
+ <message>
+ <location line="+11"/>
+ <source>Set maximum size of high-priority/low-fee transactions in bytes (default: 27000)</source>
+ <translation>Constitue magnitudinem maximam transactionum magnae-prioritatis/parvae-mercedis in octetis/bytes (praedefinitum: 27000)</translation>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Set the number of script verification threads (1-16, 0=auto, default: 0)</source>
+ <translation>Constitue numerum filorum verificationis scriptorum (1-16, 0=auto, praedefinitum: 0)</translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>This is a pre-release test build - use at your own risk - do not use for mining or merchant applications</source>
+ <translation>Hoc est prae-dimittum experimentala aedes - utere eo periculo tuo proprio - nolite utere fodendo vel applicationibus mercatoriis</translation>
+ </message>
+ <message>
+ <location line="+5"/>
+ <source>Warning: -paytxfee is set very high! This is the transaction fee you will pay if you send a transaction.</source>
+ <translation>Monitio: -paytxfee constitutum valde magnum! Hoc est merces transactionis solves si mittis transactionem.</translation>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Warning: Displayed transactions may not be correct! You may need to upgrade, or other nodes may need to upgrade.</source>
+ <translation>Monitio: Monstratae transactiones fortasse non recta sint! Forte oportet tibi progredere, an aliis nodis progredere.</translation>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Warning: Please check that your computer&apos;s date and time are correct! If your clock is wrong Bitcoin will not work properly.</source>
+ <translation>Monitio: Sodes cura ut dies tempusque computatri tui recti sunt! Si horologium tuum pravum est, Bitcoin non proprie fungetur.</translation>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Warning: error reading wallet.dat! All keys read correctly, but transaction data or address book entries might be missing or incorrect.</source>
+ <translation>Monitio: error legendo wallet.dat! Omnes claves recte lectae, sed data transactionum vel libri inscriptionum fortasse desint vel prava sint.</translation>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Warning: wallet.dat corrupt, data salvaged! Original wallet.dat saved as wallet.{timestamp}.bak in %s; if your balance or transactions are incorrect you should restore from a backup.</source>
+ <translation>Monitio: wallet.data corrupta, data salvata! Originalis wallet.dat salvata ut wallet.{timestamp}.bak in %s; si pendendum tuum vel transactiones pravae sunt, oportet ab conservato restituere.</translation>
+ </message>
+ <message>
+ <location line="+14"/>
+ <source>Attempt to recover private keys from a corrupt wallet.dat</source>
+ <translation>Conare recipere claves privatas de corrupto wallet.dat</translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Block creation options:</source>
+ <translation>Optiones creandi frustorum:</translation>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>Connect only to the specified node(s)</source>
+ <translation>Conecte sole ad nodos specificatos (vel nodum specificatum)</translation>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Corrupted block database detected</source>
+ <translation>Corruptum databasum frustorum invenitur</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Discover own IP address (default: 1 when listening and no -externalip)</source>
+ <translation>Discooperi propriam inscriptionem IP (praedefinitum: 1 quando auscultans et nullum -externalip)</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Do you want to rebuild the block database now?</source>
+ <translation>Visne reficere databasum frustorum iam?</translation>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Error initializing block database</source>
+ <translation>Error initiando databasem frustorum</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Error initializing wallet database environment %s!</source>
+ <translation>Error initiando systematem databasi cassidilis %s!</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Error loading block database</source>
+ <translation>Error legendo frustorum databasem</translation>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>Error opening block database</source>
+ <translation>Error aperiendo databasum frustorum</translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Error: Disk space is low!</source>
+ <translation>Error: Inopia spatii disci!</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Error: Transaction creation failed!</source>
+ <translation>Error: Creare transactionum abortum est!</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Error: Wallet locked, unable to create transaction!</source>
+ <translation>Error: Cassidile seratum, non posse transactionem creare!</translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Error: system error: </source>
+ <translation>Error: systematis error:</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Failed to listen on any port. Use -listen=0 if you want this.</source>
+ <translation>Non potuisse auscultare in ulla porta. Utere -listen=0 si hoc vis.</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Failed to read block info</source>
+ <translation>Non potuisse informationem frusti legere </translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Failed to read block</source>
+ <translation>Non potuisse frustum legere</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Failed to sync block index</source>
+ <translation>Synchronizare indicem frustorum abortum est</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Failed to write block index</source>
+ <translation>Scribere indicem frustorum abortum est</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Failed to write block info</source>
+ <translation>Scribere informationem abortum est</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Failed to write block</source>
+ <translation>Scribere frustum abortum est</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Failed to write file info</source>
+ <translation>Scribere informationem plicae abortum est</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Failed to write to coin database</source>
+ <translation>Scribere databasem nummorum abortum est</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Failed to write transaction index</source>
+ <translation>Scribere indicem transactionum abortum est</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Failed to write undo data</source>
+ <translation>Scribere data pro cancellando mutationes abortum est</translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Find peers using DNS lookup (default: 1 unless -connect)</source>
+ <translation>Inveni paria utendo DNS quaerendo (praedefinitum: 1 nisi -connect)</translation>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>How many blocks to check at startup (default: 288, 0 = all)</source>
+ <translation>Quot frusta proba ad initium (praedefinitum: 288, 0 = omnia)</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>How thorough the block verification is (0-4, default: 3)</source>
+ <translation>Quam perfecta frustorum verificatio est (0-4, praedefinitum: 3)</translation>
+ </message>
+ <message>
+ <location line="+24"/>
+ <source>Rebuild block chain index from current blk000??.dat files</source>
+ <translation>Restituere indicem catenae frustorum ex activis plicis blk000??.dat</translation>
+ </message>
+ <message>
+ <location line="+37"/>
+ <source>Verifying blocks...</source>
+ <translation>Verificante frusta...</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Verifying wallet...</source>
+ <translation>Verificante cassidilem...</translation>
+ </message>
+ <message>
+ <location line="-61"/>
+ <source>Imports blocks from external blk000??.dat file</source>
+ <translation>Importat frusta ab externa plica blk000??.dat</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Information</source>
+ <translation>Informatio</translation>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Invalid -tor address: &apos;%s&apos;</source>
+ <translation>Inscriptio -tor non valida: &apos;%s&apos;</translation>
+ </message>
+ <message>
+ <location line="+8"/>
+ <source>Maintain a full transaction index (default: 0)</source>
+ <translation>Manutene completam indicem transactionum (praedefinitum: 0)</translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Maximum per-connection receive buffer, &lt;n&gt;*1000 bytes (default: 5000)</source>
+ <translation>Maxima magnitudo memoriae pro datis accipendis singulis conexionibus, &lt;n&gt;*1000 octetis/bytes (praedefinitum: 5000)</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Maximum per-connection send buffer, &lt;n&gt;*1000 bytes (default: 1000)</source>
+ <translation>Maxima magnitudo memoriae pro datis mittendis singulis conexionibus, &lt;n&gt;*1000 octetis/bytes (praedefinitum: 1000)</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Only accept block chain matching built-in checkpoints (default: 1)</source>
+ <translation>Tantum accipe catenam frustorum convenientem internis lapidibus (praedefinitum: 1)</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Only connect to nodes in network &lt;net&gt; (IPv4, IPv6 or Tor)</source>
+ <translation>Tantum conecte ad nodos in rete &lt;net&gt; (IPv4, IPv6 aut Tor)</translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Output extra debugging information. Implies all other -debug* options</source>
+ <translation>Exscribe additiciam informationem pro debug. Implicat omnes alias optiones -debug*</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Output extra network debugging information</source>
+ <translation>Exscribe additiciam informationem pro retis debug.</translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Prepend debug output with timestamp</source>
+ <translation>Antepone pittacium temporis ante exscriptum de debug </translation>
+ </message>
+ <message>
+ <location line="+5"/>
+ <source>SSL options: (see the Bitcoin Wiki for SSL setup instructions)</source>
+ <translation>Optiones SSL: (vide vici de Bitcoin pro instructionibus SSL configurationis)</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Select the version of socks proxy to use (4-5, default: 5)</source>
+ <translation>Selige versionem socks vicarii utendam (4-5, praedefinitum: 5)</translation>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Send trace/debug info to console instead of debug.log file</source>
+ <translation>Mitte informationem vestigii/debug ad terminale potius quam plicam debug.log</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Send trace/debug info to debugger</source>
+ <translation>Mitte informationem vestigii/debug ad debugger</translation>
+ </message>
+ <message>
+ <location line="+5"/>
+ <source>Set maximum block size in bytes (default: 250000)</source>
+ <translation>Constitue maximam magnitudinem frusti in octetis/bytes (praedefinitum: 250000)</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Set minimum block size in bytes (default: 0)</source>
+ <translation>Constitue minimam magnitudinem frusti in octetis/bytes (praedefinitum: 0)</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Shrink debug.log file on client startup (default: 1 when no -debug)</source>
+ <translation>Diminue plicam debug.log ad initium clientis (praedefinitum: 1 nisi -debug)</translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Specify connection timeout in milliseconds (default: 5000)</source>
+ <translation>Specifica tempumfati conexionis in millisecundis (praedefinitum: 5000)</translation>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>System error: </source>
+ <translation>Systematis error:</translation>
+ </message>
+ <message>
+ <location line="+10"/>
+ <source>Use UPnP to map the listening port (default: 0)</source>
+ <translation>Utere UPnP designare portam auscultandi (praedefinitum: 0)</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Use UPnP to map the listening port (default: 1 when listening)</source>
+ <translation>Utere UPnP designare portam auscultandi (praedefinitum: 1 quando auscultans)</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Use proxy to reach tor hidden services (default: same as -proxy)</source>
+ <translation>Utere vicarium ut extendas ad tor servitia occulta (praedefinitum: idem ut -proxy)</translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Username for JSON-RPC connections</source>
+ <translation>Nomen utentis pro conexionibus JSON-RPC</translation>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>Warning</source>
+ <translation>Monitio</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Warning: This version is obsolete, upgrade required!</source>
+ <translation>Monitio: Haec versio obsoleta est, progressio postulata!</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>You need to rebuild the databases using -reindex to change -txindex</source>
+ <translation>Oportet recreare databases utendo -reindex ut mutes -txindex</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>wallet.dat corrupt, salvage failed</source>
+ <translation>wallet.dat corrupta, salvare abortum est</translation>
+ </message>
+ <message>
+ <location line="-45"/>
+ <source>Password for JSON-RPC connections</source>
+ <translation>Tessera pro conexionibus JSON-RPC</translation>
+ </message>
+ <message>
+ <location line="-68"/>
+ <source>Allow JSON-RPC connections from specified IP address</source>
+ <translation>Permitte conexionibus JSON-RPC ex inscriptione specificata</translation>
+ </message>
+ <message>
+ <location line="+77"/>
+ <source>Send commands to node running on &lt;ip&gt; (default: 127.0.0.1)</source>
+ <translation>Mitte mandata nodo operanti in &lt;ip&gt; (praedefinitum: 127.0.0.1)</translation>
+ </message>
+ <message>
+ <location line="-120"/>
+ <source>Execute command when the best block changes (%s in cmd is replaced by block hash)</source>
+ <translation>Pelle mandatum quando optissimum frustum mutat (%s in mandato substituitur ab hash frusti)</translation>
+ </message>
+ <message>
+ <location line="+142"/>
+ <source>Upgrade wallet to latest format</source>
+ <translation>Progredere cassidile ad formam recentissimam</translation>
+ </message>
+ <message>
+ <location line="-16"/>
+ <source>Set key pool size to &lt;n&gt; (default: 100)</source>
+ <translation>Constitue magnitudinem stagni clavium ad &lt;n&gt; (praedefinitum: 100)</translation>
+ </message>
+ <message>
+ <location line="-12"/>
+ <source>Rescan the block chain for missing wallet transactions</source>
+ <translation>Iterum perlege catenam frustorum propter absentes cassidilis transactiones</translation>
+ </message>
+ <message>
+ <location line="+30"/>
+ <source>Use OpenSSL (https) for JSON-RPC connections</source>
+ <translation>Utere OpenSSL (https) pro conexionibus JSON-RPC</translation>
+ </message>
+ <message>
+ <location line="-21"/>
+ <source>Server certificate file (default: server.cert)</source>
+ <translation>Plica certificationis daemonis moderantis (praedefinitum: server.cert)</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Server private key (default: server.pem)</source>
+ <translation>Clavis privata daemonis moderans (praedefinitum: server.pem)</translation>
+ </message>
+ <message>
+ <location line="-154"/>
+ <source>Acceptable ciphers (default: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH)</source>
+ <translation>Acceptabiles cifrae (praedefinitum: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH)</translation>
+ </message>
+ <message>
+ <location line="+166"/>
+ <source>This help message</source>
+ <translation>Hic nuntius auxilii</translation>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Unable to bind to %s on this computer (bind returned error %d, %s)</source>
+ <translation>Non posse conglutinare ad %s in hoc computatro (conglutinare redidit errorem %d, %s)</translation>
+ </message>
+ <message>
+ <location line="-86"/>
+ <source>Connect through socks proxy</source>
+ <translation>Conecte per socks vicarium</translation>
+ </message>
+ <message>
+ <location line="-11"/>
+ <source>Allow DNS lookups for -addnode, -seednode and -connect</source>
+ <translation>Permitte quaerenda DNS pro -addnode, -seednode, et -connect</translation>
+ </message>
+ <message>
+ <location line="+57"/>
+ <source>Loading addresses...</source>
+ <translation>Legens inscriptiones...</translation>
+ </message>
+ <message>
+ <location line="-35"/>
+ <source>Error loading wallet.dat: Wallet corrupted</source>
+ <translation>Error legendi wallet.dat: Cassidile corruptum</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Error loading wallet.dat: Wallet requires newer version of Bitcoin</source>
+ <translation>Error legendi wallet.dat: Cassidili necesse est recentior versio Bitcoin</translation>
+ </message>
+ <message>
+ <location line="+87"/>
+ <source>Wallet needed to be rewritten: restart Bitcoin to complete</source>
+ <translation>Cassidili necesse erat rescribi: Repelle Bitcoin ut compleas</translation>
+ </message>
+ <message>
+ <location line="-89"/>
+ <source>Error loading wallet.dat</source>
+ <translation>Error legendi wallet.dat</translation>
+ </message>
+ <message>
+ <location line="+30"/>
+ <source>Invalid -proxy address: &apos;%s&apos;</source>
+ <translation>Inscriptio -proxy non valida: &apos;%s&apos;</translation>
+ </message>
+ <message>
+ <location line="+48"/>
+ <source>Unknown network specified in -onlynet: &apos;%s&apos;</source>
+ <translation>Ignotum rete specificatum in -onlynet: &apos;%s&apos;</translation>
+ </message>
+ <message>
+ <location line="-1"/>
+ <source>Unknown -socks proxy version requested: %i</source>
+ <translation>Ignota -socks vicarii versio postulata: %i</translation>
+ </message>
+ <message>
+ <location line="-91"/>
+ <source>Cannot resolve -bind address: &apos;%s&apos;</source>
+ <translation>Non posse resolvere -bind inscriptonem: &apos;%s&apos;</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Cannot resolve -externalip address: &apos;%s&apos;</source>
+ <translation>Non posse resolvere -externalip inscriptionem: &apos;%s&apos;</translation>
+ </message>
+ <message>
+ <location line="+45"/>
+ <source>Invalid amount for -paytxfee=&lt;amount&gt;: &apos;%s&apos;</source>
+ <translation>Quantitas non valida pro -paytxfee=&lt;quantitas&gt;: &apos;%s&apos;</translation>
+ </message>
+ <message>
+ <location line="-24"/>
+ <source>Error: could not start node</source>
+ <translation>Error: non potuisse nodum initiare</translation>
+ </message>
+ <message>
+ <location line="+25"/>
+ <source>Invalid amount</source>
+ <translation>Quantitas non valida</translation>
+ </message>
+ <message>
+ <location line="-4"/>
+ <source>Insufficient funds</source>
+ <translation>Inopia nummorum</translation>
+ </message>
+ <message>
+ <location line="+8"/>
+ <source>Loading block index...</source>
+ <translation>Legens indicem frustorum...</translation>
+ </message>
+ <message>
+ <location line="-59"/>
+ <source>Add a node to connect to and attempt to keep the connection open</source>
+ <translation>Adice nodum cui conectere et conare sustinere conexionem apertam</translation>
+ </message>
+ <message>
+ <location line="-25"/>
+ <source>Unable to bind to %s on this computer. Bitcoin is probably already running.</source>
+ <translation>Non posse conglutinare ad %s in hoc cumputatro. Bitcoin probabiliter iam operatur.</translation>
+ </message>
+ <message>
+ <location line="+68"/>
+ <source>Fee per KB to add to transactions you send</source>
+ <translation>Merces per KB addere ad transactiones tu mittas</translation>
+ </message>
+ <message>
+ <location line="+17"/>
+ <source>Loading wallet...</source>
+ <translation>Legens cassidile...</translation>
+ </message>
+ <message>
+ <location line="-54"/>
+ <source>Cannot downgrade wallet</source>
+ <translation>Non posse cassidile regredi</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Cannot initialize keypool</source>
+ <translation>Non posse initiare stagnum clavium</translation>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Cannot write default address</source>
+ <translation>Non posse scribere praedefinitam inscriptionem</translation>
+ </message>
+ <message>
+ <location line="+64"/>
+ <source>Rescanning...</source>
+ <translation>Iterum perlegens...</translation>
+ </message>
+ <message>
+ <location line="-56"/>
+ <source>Done loading</source>
+ <translation>Completo lengendi</translation>
+ </message>
+ <message>
+ <location line="+79"/>
+ <source>To use the %s option</source>
+ <translation>Ut utaris optione %s</translation>
+ </message>
+ <message>
+ <location line="-71"/>
+ <source>Error</source>
+ <translation>Error</translation>
+ </message>
+ <message>
+ <location line="-33"/>
+ <source>You must set rpcpassword=&lt;password&gt; in the configuration file:
+%s
+If the file does not exist, create it with owner-readable-only file permissions.</source>
+ <translation>Necesse est te rpcpassword=&lt;tesseram&gt; constituere in plica configurationum:
+%s
+Si plica non existat, crea eam cum permissionibus ut solus eius dominus eam legere sinatur.</translation>
+ </message>
+</context>
+</TS> \ No newline at end of file
diff --git a/src/qt/locale/bitcoin_lt.ts b/src/qt/locale/bitcoin_lt.ts
index 7b0a4b46df..d6620f466c 100644
--- a/src/qt/locale/bitcoin_lt.ts
+++ b/src/qt/locale/bitcoin_lt.ts
@@ -13,12 +13,7 @@
<translation>&lt;b&gt;Bitcoin&lt;/b&gt; versija</translation>
</message>
<message>
- <location line="+41"/>
- <source>Copyright © 2009-2012 The Bitcoin developers</source>
- <translation>Copyright © 2009-2012 Bitcoin programuotojai</translation>
- </message>
- <message>
- <location line="+13"/>
+ <location line="+57"/>
<source>
This is experimental software.
@@ -31,6 +26,16 @@ Platinama pagal MIT/X11 licencijÄ…, kuriÄ… rasite faile COPYING arba http://www.
Šiame produkte yra OpenSSL projekto kuriamas OpenSSL Toolkit (http://www.openssl.org/), Eric Young parašyta kriptografinė programinė įranga bei Thomas Bernard sukurta UPnP programinė įranga.</translation>
</message>
+ <message>
+ <location filename="../aboutdialog.cpp" line="+17"/>
+ <source>Copyright</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>2009-%1 The Bitcoin developers</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>AddressBookPage</name>
@@ -105,17 +110,22 @@ Platinama pagal MIT/X11 licencijÄ…, kuriÄ… rasite faile COPYING arba http://www.
<translation>&amp;Trinti</translation>
</message>
<message>
- <location filename="../addressbookpage.cpp" line="+65"/>
+ <location filename="../addressbookpage.cpp" line="+66"/>
<source>Copy &amp;Label</source>
<translation>Kopijuoti ž&amp;ymę</translation>
</message>
<message>
- <location line="+2"/>
+ <location line="+1"/>
<source>&amp;Edit</source>
<translation>&amp;Keisti</translation>
</message>
<message>
- <location line="+250"/>
+ <location line="+1"/>
+ <source>Send &amp;Coins</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+263"/>
<source>Export Address Book Data</source>
<translation>Eksportuoti adresų knygelės duomenis</translation>
</message>
@@ -138,7 +148,7 @@ Platinama pagal MIT/X11 licencijÄ…, kuriÄ… rasite faile COPYING arba http://www.
<context>
<name>AddressTableModel</name>
<message>
- <location filename="../addresstablemodel.cpp" line="+142"/>
+ <location filename="../addresstablemodel.cpp" line="+144"/>
<source>Label</source>
<translation>Žymė</translation>
</message>
@@ -297,17 +307,17 @@ Platinama pagal MIT/X11 licencijÄ…, kuriÄ… rasite faile COPYING arba http://www.
<context>
<name>BitcoinGUI</name>
<message>
- <location filename="../bitcoingui.cpp" line="+267"/>
+ <location filename="../bitcoingui.cpp" line="+231"/>
<source>Sign &amp;message...</source>
<translation>Pasirašyti ži&amp;nutę...</translation>
</message>
<message>
- <location line="+254"/>
+ <location line="+299"/>
<source>Synchronizing with network...</source>
<translation>Sinchronizavimas su tinklu ...</translation>
</message>
<message>
- <location line="-322"/>
+ <location line="-367"/>
<source>&amp;Overview</source>
<translation>&amp;Apžvalga</translation>
</message>
@@ -327,32 +337,17 @@ Platinama pagal MIT/X11 licencijÄ…, kuriÄ… rasite faile COPYING arba http://www.
<translation>Apžvelgti sandorių istoriją</translation>
</message>
<message>
- <location line="+6"/>
- <source>&amp;Address Book</source>
- <translation>&amp;Adresų knygelė</translation>
- </message>
- <message>
- <location line="+1"/>
+ <location line="+7"/>
<source>Edit the list of stored addresses and labels</source>
<translation>Redaguoti išsaugotus adresus bei žymes</translation>
</message>
<message>
- <location line="-15"/>
- <source>&amp;Receive coins</source>
- <translation>&amp;Gauti monetas</translation>
- </message>
- <message>
- <location line="+1"/>
+ <location line="-14"/>
<source>Show the list of addresses for receiving payments</source>
<translation>Parodyti adresų sąraša mokėjimams gauti</translation>
</message>
<message>
- <location line="-8"/>
- <source>&amp;Send coins</source>
- <translation>&amp;Siųsti monetas</translation>
- </message>
- <message>
- <location line="+39"/>
+ <location line="+31"/>
<source>E&amp;xit</source>
<translation>&amp;IÅ¡eiti</translation>
</message>
@@ -397,7 +392,7 @@ Platinama pagal MIT/X11 licencijÄ…, kuriÄ… rasite faile COPYING arba http://www.
<translation>&amp;Keisti slaptafrazÄ™...</translation>
</message>
<message>
- <location line="+259"/>
+ <location line="+304"/>
<source>Importing blocks from disk...</source>
<translation type="unfinished"/>
</message>
@@ -406,13 +401,8 @@ Platinama pagal MIT/X11 licencijÄ…, kuriÄ… rasite faile COPYING arba http://www.
<source>Reindexing blocks on disk...</source>
<translation type="unfinished"/>
</message>
- <message numerus="yes">
- <location line="+10"/>
- <source>~%n block(s) remaining</source>
- <translation><numerusform>~liko %n blokas</numerusform><numerusform>~liko %n blokai</numerusform><numerusform>~liko %n blokų</numerusform></translation>
- </message>
<message>
- <location line="-265"/>
+ <location line="-300"/>
<source>&amp;Export...</source>
<translation>&amp;Eksportuoti...</translation>
</message>
@@ -457,18 +447,33 @@ Platinama pagal MIT/X11 licencijÄ…, kuriÄ… rasite faile COPYING arba http://www.
<translation>&amp;Tikrinti žinutę...</translation>
</message>
<message>
- <location line="-196"/>
- <location line="+538"/>
+ <location line="-162"/>
+ <location line="+540"/>
<source>Bitcoin</source>
<translation>Bitcoin</translation>
</message>
<message>
- <location line="-538"/>
+ <location line="-540"/>
<source>Wallet</source>
<translation>PiniginÄ—</translation>
</message>
<message>
- <location line="+176"/>
+ <location line="+99"/>
+ <source>&amp;Send</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+7"/>
+ <source>&amp;Receive</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+14"/>
+ <source>&amp;Addresses</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+22"/>
<source>&amp;About Bitcoin</source>
<translation>&amp;Apie Bitcoin</translation>
</message>
@@ -529,97 +534,92 @@ Platinama pagal MIT/X11 licencijÄ…, kuriÄ… rasite faile COPYING arba http://www.
<translation>[testavimotinklas]</translation>
</message>
<message>
- <location line="+63"/>
+ <location line="+47"/>
<source>Bitcoin client</source>
<translation>Bitcoin klientas</translation>
</message>
<message numerus="yes">
- <location line="+79"/>
+ <location line="+140"/>
<source>%n active connection(s) to Bitcoin network</source>
<translation><numerusform>%n Bitcoin tinklo aktyvus ryšys</numerusform><numerusform>%n Bitcoin tinklo aktyvūs ryšiai</numerusform><numerusform>%n Bitcoin tinklo aktyvūs ryšiai</numerusform></translation>
</message>
<message>
- <location line="+45"/>
- <source>Processed %1 of %2 blocks of transaction history (%3% done).</source>
+ <location line="+39"/>
+ <source>Processed %1 of %2 (estimated) blocks of transaction history.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+7"/>
+ <location line="+4"/>
<source>Processed %1 blocks of transaction history.</source>
<translation type="unfinished"/>
</message>
+ <message numerus="yes">
+ <location line="+20"/>
+ <source>%n hour(s)</source>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
+ <message numerus="yes">
+ <location line="+4"/>
+ <source>%n day(s)</source>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
+ <message numerus="yes">
+ <location line="+4"/>
+ <source>%n week(s)</source>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
<message>
- <location line="+70"/>
- <source>Error</source>
+ <location line="+5"/>
+ <source>%1 behind</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+3"/>
- <source>Warning</source>
+ <location line="+14"/>
+ <source>Last received block was generated %1 ago.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+3"/>
- <source>Information</source>
+ <location line="+2"/>
+ <source>Transactions after this will not yet be visible.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+66"/>
- <source>This transaction is over the size limit. You can still send it for a fee of %1, which goes to the nodes that process your transaction and helps to support the network. Do you want to pay the fee?</source>
+ <location line="+21"/>
+ <source>Error</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+210"/>
- <source>Backup Successful</source>
+ <location line="+3"/>
+ <source>Warning</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+0"/>
- <source>The wallet data was successfully saved to the new location.</source>
+ <location line="+3"/>
+ <source>Information</source>
<translation type="unfinished"/>
</message>
- <message numerus="yes">
- <location line="-338"/>
- <source>%n second(s) ago</source>
- <translation><numerusform>Prieš %n sekundę</numerusform><numerusform>Prieš %n sekundes</numerusform><numerusform>Prieš %n sekundžių</numerusform></translation>
- </message>
- <message numerus="yes">
- <location line="+4"/>
- <source>%n minute(s) ago</source>
- <translation><numerusform>PrieÅ¡ %n minutÄ™</numerusform><numerusform>PrieÅ¡ %n minutes</numerusform><numerusform>PrieÅ¡ %n minutÄių</numerusform></translation>
- </message>
- <message numerus="yes">
- <location line="+4"/>
- <source>%n hour(s) ago</source>
- <translation><numerusform>Prieš %n valandą</numerusform><numerusform>Prieš %n valandas</numerusform><numerusform>Prieš %n valandų</numerusform></translation>
- </message>
- <message numerus="yes">
- <location line="+4"/>
- <source>%n day(s) ago</source>
- <translation><numerusform>Prieš %n dieną</numerusform><numerusform>Prieš %n dienas</numerusform><numerusform>Prieš %n dienų</numerusform></translation>
+ <message>
+ <location line="+68"/>
+ <source>This transaction is over the size limit. You can still send it for a fee of %1, which goes to the nodes that process your transaction and helps to support the network. Do you want to pay the fee?</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location line="+6"/>
+ <location line="-138"/>
<source>Up to date</source>
<translation>Atnaujinta</translation>
</message>
<message>
- <location line="+7"/>
+ <location line="+32"/>
<source>Catching up...</source>
<translation>Vejamasi...</translation>
</message>
<message>
- <location line="+10"/>
- <source>Last received block was generated %1.</source>
- <translation>Paskutinis gautas blokas buvo sukurtas %1.</translation>
- </message>
- <message>
- <location line="+97"/>
+ <location line="+110"/>
<source>Confirm transaction fee</source>
<translation>Patvirtinti sandorio mokestį</translation>
</message>
<message>
- <location line="+23"/>
+ <location line="+8"/>
<source>Sent transaction</source>
<translation>Sandoris nusiųstas</translation>
</message>
@@ -641,14 +641,14 @@ Tipas: %3
Adresas: %4</translation>
</message>
<message>
- <location line="+99"/>
- <location line="+28"/>
+ <location line="+33"/>
+ <location line="+23"/>
<source>URI handling</source>
<translation>URI apdorojimas</translation>
</message>
<message>
- <location line="-28"/>
- <location line="+28"/>
+ <location line="-23"/>
+ <location line="+23"/>
<source>URI can not be parsed! This can be caused by an invalid Bitcoin address or malformed URI parameters.</source>
<translation type="unfinished"/>
</message>
@@ -663,27 +663,7 @@ Adresas: %4</translation>
<translation>Piniginė &lt;b&gt;užšifruota&lt;/b&gt; ir šiuo metu &lt;b&gt;užrakinta&lt;/b&gt;</translation>
</message>
<message>
- <location line="+23"/>
- <source>Backup Wallet</source>
- <translation>Backup piniginÄ™</translation>
- </message>
- <message>
- <location line="+0"/>
- <source>Wallet Data (*.dat)</source>
- <translation>PiniginÄ—s duomenys (*.dat)</translation>
- </message>
- <message>
- <location line="+3"/>
- <source>Backup Failed</source>
- <translation>Nepavyko padaryti atsarginÄ—s kopijos</translation>
- </message>
- <message>
- <location line="+0"/>
- <source>There was an error trying to save the wallet data to the new location.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../bitcoin.cpp" line="+109"/>
+ <location filename="../bitcoin.cpp" line="+108"/>
<source>A fatal error occurred. Bitcoin can no longer continue safely and will quit.</source>
<translation type="unfinished"/>
</message>
@@ -691,7 +671,7 @@ Adresas: %4</translation>
<context>
<name>ClientModel</name>
<message>
- <location filename="../clientmodel.cpp" line="+86"/>
+ <location filename="../clientmodel.cpp" line="+96"/>
<source>Network Alert</source>
<translation>Tinklo įspėjimas</translation>
</message>
@@ -724,7 +704,7 @@ Adresas: %4</translation>
<translation>Adresas yra susietas su Å¡ios adresų knygelÄ™s turiniu. Tai gali bÅ«ti keiÄiama tik siuntimo adresams.</translation>
</message>
<message>
- <location filename="../editaddressdialog.cpp" line="+20"/>
+ <location filename="../editaddressdialog.cpp" line="+21"/>
<source>New receiving address</source>
<translation>Naujas gavimo adresas</translation>
</message>
@@ -744,17 +724,17 @@ Adresas: %4</translation>
<translation>Keisti siuntimo adresÄ…</translation>
</message>
<message>
- <location line="+60"/>
+ <location line="+76"/>
<source>The entered address &quot;%1&quot; is already in the address book.</source>
<translation>Įvestas adresas „%1“ jau yra adresų knygelėje.</translation>
</message>
<message>
- <location line="+5"/>
+ <location line="-5"/>
<source>The entered address &quot;%1&quot; is not a valid Bitcoin address.</source>
<translation>Įvestas adresas „%1“ nėra galiojantis Bitcoin adresas.</translation>
</message>
<message>
- <location line="+5"/>
+ <location line="+10"/>
<source>Could not unlock wallet.</source>
<translation>Nepavyko atrakinti piniginÄ—s.</translation>
</message>
@@ -767,7 +747,7 @@ Adresas: %4</translation>
<context>
<name>GUIUtil::HelpMessageBox</name>
<message>
- <location filename="../guiutil.cpp" line="+419"/>
+ <location filename="../guiutil.cpp" line="+422"/>
<location line="+12"/>
<source>Bitcoin-Qt</source>
<translation>Bitcoin-Qt</translation>
@@ -981,7 +961,7 @@ Adresas: %4</translation>
<translation>&amp;Pritaikyti</translation>
</message>
<message>
- <location filename="../optionsdialog.cpp" line="+55"/>
+ <location filename="../optionsdialog.cpp" line="+53"/>
<source>default</source>
<translation>numatyta</translation>
</message>
@@ -1026,23 +1006,18 @@ Adresas: %4</translation>
<translation>Forma</translation>
</message>
<message>
- <location line="+51"/>
- <location line="+183"/>
+ <location line="+50"/>
+ <location line="+166"/>
<source>The displayed information may be out of date. Your wallet automatically synchronizes with the Bitcoin network after a connection is established, but this process has not completed yet.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-141"/>
+ <location line="-124"/>
<source>Balance:</source>
<translation>Balansas:</translation>
</message>
<message>
- <location line="+58"/>
- <source>Number of transactions:</source>
- <translation>Sandorių kiekis:</translation>
- </message>
- <message>
- <location line="-29"/>
+ <location line="+29"/>
<source>Unconfirmed:</source>
<translation>Nepatvirtinti:</translation>
</message>
@@ -1052,7 +1027,7 @@ Adresas: %4</translation>
<translation>PiniginÄ—</translation>
</message>
<message>
- <location line="+124"/>
+ <location line="+107"/>
<source>Immature:</source>
<translation>NepribrendÄ™:</translation>
</message>
@@ -1067,7 +1042,7 @@ Adresas: %4</translation>
<translation>&lt;b&gt;Naujausi sandoriai&lt;/b&gt;</translation>
</message>
<message>
- <location line="-118"/>
+ <location line="-101"/>
<source>Your current balance</source>
<translation>Jūsų einamasis balansas</translation>
</message>
@@ -1077,11 +1052,6 @@ Adresas: %4</translation>
<translation>IÅ¡ viso sandorių, įskaitant tuos kurie dar turi bÅ«ti patvirtinti, ir jie dar nÄ—ra įskaiÄiuotii į einamosios sÄ…skaitos balansÄ…</translation>
</message>
<message>
- <location line="+20"/>
- <source>Total number of transactions in wallet</source>
- <translation>Bandras sandorių kiekis piniginėje</translation>
- </message>
- <message>
<location filename="../overviewpage.cpp" line="+115"/>
<location line="+1"/>
<source>out of sync</source>
@@ -1089,6 +1059,14 @@ Adresas: %4</translation>
</message>
</context>
<context>
+ <name>PaymentServer</name>
+ <message>
+ <location filename="../paymentserver.cpp" line="+107"/>
+ <source>Cannot start bitcoin: click-to-pay handler</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>QRCodeDialog</name>
<message>
<location filename="../forms/qrcodedialog.ui" line="+14"/>
@@ -1427,7 +1405,7 @@ Adresas: %4</translation>
</message>
<message>
<location line="+60"/>
- <location filename="../sendcoinsentry.cpp" line="+25"/>
+ <location filename="../sendcoinsentry.cpp" line="+26"/>
<source>Enter a label for this address to add it to your address book</source>
<translation>Įveskite žymę šiam adresui kad galėtumėte įtraukti ją į adresų knygelę</translation>
</message>
@@ -1663,7 +1641,7 @@ Adresas: %4</translation>
<context>
<name>TransactionDesc</name>
<message>
- <location filename="../transactiondesc.cpp" line="+19"/>
+ <location filename="../transactiondesc.cpp" line="+20"/>
<source>Open until %1</source>
<translation>Atidaryta iki %1</translation>
</message>
@@ -1850,7 +1828,7 @@ Adresas: %4</translation>
<context>
<name>TransactionTableModel</name>
<message>
- <location filename="../transactiontablemodel.cpp" line="+226"/>
+ <location filename="../transactiontablemodel.cpp" line="+225"/>
<source>Date</source>
<translation>Data</translation>
</message>
@@ -1968,7 +1946,7 @@ Adresas: %4</translation>
<context>
<name>TransactionView</name>
<message>
- <location filename="../transactionview.cpp" line="+55"/>
+ <location filename="../transactionview.cpp" line="+52"/>
<location line="+16"/>
<source>All</source>
<translation>Visi</translation>
@@ -2055,6 +2033,11 @@ Adresas: %4</translation>
</message>
<message>
<location line="+1"/>
+ <source>Copy transaction ID</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Edit label</source>
<translation>Taisyti žymę</translation>
</message>
@@ -2064,7 +2047,7 @@ Adresas: %4</translation>
<translation>Rodyti sandÄ—rio detales</translation>
</message>
<message>
- <location line="+142"/>
+ <location line="+139"/>
<source>Export Transaction Data</source>
<translation>Sandorio duomenų eksportavimas</translation>
</message>
@@ -2119,7 +2102,7 @@ Adresas: %4</translation>
<translation>Neįmanoma įrašyti į failą %1.</translation>
</message>
<message>
- <location line="+95"/>
+ <location line="+100"/>
<source>Range:</source>
<translation>GrupÄ—:</translation>
</message>
@@ -2130,29 +2113,172 @@ Adresas: %4</translation>
</message>
</context>
<context>
+ <name>WalletView</name>
+ <message>
+ <location filename="../walletview.cpp" line="+95"/>
+ <source>&amp;Overview</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Show general overview of wallet</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>&amp;Send coins</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Send coins to a Bitcoin address</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>&amp;Receive coins</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Show the list of addresses for receiving payments</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>&amp;Transactions</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Browse transaction history</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>&amp;Address Book</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Edit the list of stored addresses and labels</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+12"/>
+ <source>&amp;Encrypt Wallet...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Encrypt the private keys that belong to your wallet</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>&amp;Backup Wallet...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Backup wallet to another location</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>&amp;Change Passphrase...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Change the passphrase used for wallet encryption</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Sign &amp;message...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Sign messages with your Bitcoin addresses to prove you own them</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>&amp;Verify message...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Verify messages to ensure they were signed with specified Bitcoin addresses</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>&amp;Export...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Export the data in the current tab to a file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+180"/>
+ <source>Backup Wallet</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>Wallet Data (*.dat)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Backup Failed</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>There was an error trying to save the wallet data to the new location.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>Backup Successful</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>The wallet data was successfully saved to the new location.</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>bitcoin-core</name>
<message>
- <location filename="../bitcoinstrings.cpp" line="+88"/>
+ <location filename="../bitcoinstrings.cpp" line="+96"/>
<source>Bitcoin version</source>
<translation>Bitcoin versija</translation>
</message>
<message>
- <location line="+82"/>
+ <location line="+98"/>
<source>Usage:</source>
<translation>Naudojimas:</translation>
</message>
<message>
- <location line="-23"/>
+ <location line="-24"/>
<source>Send command to -server or bitcoind</source>
<translation>Siųsti komandą serveriui arba bitcoind</translation>
</message>
<message>
- <location line="-21"/>
+ <location line="-22"/>
<source>List commands</source>
<translation>Komandų sąrašas</translation>
</message>
<message>
- <location line="-11"/>
+ <location line="-10"/>
<source>Get help for a command</source>
<translation>Suteikti pagalba komandai</translation>
</message>
@@ -2177,12 +2303,12 @@ Adresas: %4</translation>
<translation>Generuoti monetas</translation>
</message>
<message>
- <location line="-15"/>
+ <location line="-28"/>
<source>Don&apos;t generate coins</source>
<translation>Negeneruoti monetų</translation>
</message>
<message>
- <location line="+61"/>
+ <location line="+74"/>
<source>Specify data directory</source>
<translation>Nustatyti duomenų aplanką</translation>
</message>
@@ -2192,80 +2318,82 @@ Adresas: %4</translation>
<translation type="unfinished"/>
</message>
<message>
- <location line="-26"/>
+ <location line="-27"/>
<source>Listen for connections on &lt;port&gt; (default: 8333 or testnet: 18333)</source>
<translation>Sujungimo klausymas prijungÄiai &lt;port&gt; (pagal nutylÄ—jimÄ…: 8333 arba testnet: 18333)</translation>
</message>
<message>
- <location line="+4"/>
+ <location line="+5"/>
<source>Maintain at most &lt;n&gt; connections to peers (default: 125)</source>
<translation>Palaikyti ne daugiau &lt;n&gt; jungÄių kolegoms (pagal nutylÄ—jimÄ…: 125)</translation>
</message>
<message>
- <location line="-34"/>
+ <location line="-49"/>
<source>Connect to a node to retrieve peer addresses, and disconnect</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+65"/>
+ <location line="+80"/>
<source>Specify your own public address</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+2"/>
+ <location line="+3"/>
<source>Threshold for disconnecting misbehaving peers (default: 100)</source>
<translation>Atjungimo dėl netinkamo kolegų elgesio riba (pagal nutylėjimą: 100)</translation>
</message>
<message>
- <location line="-114"/>
+ <location line="-132"/>
<source>Number of seconds to keep misbehaving peers from reconnecting (default: 86400)</source>
<translation>Sekundžių kiekis eikiamas palaikyti ryšį dėl lygiarangių nestabilumo (pagal nutylėjimą: 86.400)</translation>
</message>
<message>
- <location line="-28"/>
+ <location line="-32"/>
<source>An error occurred while setting up the RPC port %u for listening on IPv4: %s</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+26"/>
+ <location line="+30"/>
<source>Listen for JSON-RPC connections on &lt;port&gt; (default: 8332 or testnet: 18332)</source>
<translation>Klausymas JSON-RPC sujungimui prijungÄiai &lt;port&gt; (pagal nutylÄ—jimÄ…: 8332 or testnet: 18332)</translation>
</message>
<message>
- <location line="+34"/>
+ <location line="+36"/>
<source>Accept command line and JSON-RPC commands</source>
<translation>Priimti komandinÄ™ eilutÄ™ ir JSON-RPC komandas</translation>
</message>
<message>
- <location line="+62"/>
+ <location line="+77"/>
<source>Run in the background as a daemon and accept commands</source>
<translation>Dirbti fone kaip šešėlyje ir priimti komandas</translation>
</message>
<message>
- <location line="+31"/>
+ <location line="+32"/>
<source>Use the test network</source>
<translation>Naudoti testavimo tinklÄ…</translation>
</message>
<message>
- <location line="-92"/>
+ <location line="-108"/>
<source>Accept connections from outside (default: 1 if no -proxy or -connect)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-74"/>
+ <location line="-82"/>
<source>%s, you must set a rpcpassword in the configuration file:
- %s
+%s
It is recommended you use the following random password:
rpcuser=bitcoinrpc
rpcpassword=%s
(you do not need to remember this password)
The username and password MUST NOT be the same.
If the file does not exist, create it with owner-readable-only file permissions.
+It is also recommended to set alertnotify so you are notified of problems;
+for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.com
</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+15"/>
+ <location line="+17"/>
<source>An error occurred while setting up the RPC port %u for listening on IPv6, falling back to IPv4: %s</source>
<translation type="unfinished"/>
</message>
@@ -2281,11 +2409,6 @@ If the file does not exist, create it with owner-readable-only file permissions.
</message>
<message>
<location line="+3"/>
- <source>Corrupted block database detected. Please restart the client with -reindex.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+2"/>
<source>Error initializing database environment %s! To recover, BACKUP THAT DIRECTORY, then remove everything from it except for wallet.dat.</source>
<translation type="unfinished"/>
</message>
@@ -2300,12 +2423,27 @@ If the file does not exist, create it with owner-readable-only file permissions.
<translation type="unfinished"/>
</message>
<message>
+ <location line="+3"/>
+ <source>Execute command when a relevant alert is received (%s in cmd is replaced by message)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Execute command when a wallet transaction changes (%s in cmd is replaced by TxID)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location line="+11"/>
<source>Set maximum size of high-priority/low-fee transactions in bytes (default: 27000)</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+3"/>
+ <source>Set the number of script verification threads (1-16, 0=auto, default: 0)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
<source>This is a pre-release test build - use at your own risk - do not use for mining or merchant applications</source>
<translation type="unfinished"/>
</message>
@@ -2351,16 +2489,41 @@ If the file does not exist, create it with owner-readable-only file permissions.
</message>
<message>
<location line="+3"/>
+ <source>Corrupted block database detected</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Discover own IP address (default: 1 when listening and no -externalip)</source>
<translation type="unfinished"/>
</message>
<message>
+ <location line="+1"/>
+ <source>Do you want to rebuild the block database now?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location line="+3"/>
+ <source>Error initializing block database</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Error initializing wallet database environment %s!</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Error loading block database</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+5"/>
+ <location line="+4"/>
+ <source>Error opening block database</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
<source>Error: Disk space is low!</source>
<translation type="unfinished"/>
</message>
@@ -2376,26 +2539,96 @@ If the file does not exist, create it with owner-readable-only file permissions.
</message>
<message>
<location line="+2"/>
+ <source>Error: system error: </source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Failed to listen on any port. Use -listen=0 if you want this.</source>
<translation type="unfinished"/>
</message>
<message>
+ <location line="+1"/>
+ <source>Failed to read block info</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Failed to read block</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Failed to sync block index</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Failed to write block index</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Failed to write block info</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Failed to write block</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Failed to write file info</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Failed to write to coin database</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Failed to write transaction index</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Failed to write undo data</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location line="+2"/>
<source>Find peers using DNS lookup (default: 1 unless -connect)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+5"/>
- <source>How thorough the block verification is (0-4, default: 3)</source>
+ <location line="+3"/>
+ <source>How many blocks to check at startup (default: 288, 0 = all)</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+1"/>
- <source>Importing blocks from block database...</source>
+ <source>How thorough the block verification is (0-4, default: 3)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+24"/>
+ <source>Rebuild block chain index from current blk000??.dat files</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+37"/>
+ <source>Verifying blocks...</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+1"/>
+ <source>Verifying wallet...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-61"/>
<source>Imports blocks from external blk000??.dat file</source>
<translation type="unfinished"/>
</message>
@@ -2410,7 +2643,12 @@ If the file does not exist, create it with owner-readable-only file permissions.
<translation>Neteisingas tor adresas: &apos;%s&apos;</translation>
</message>
<message>
- <location line="+9"/>
+ <location line="+8"/>
+ <source>Maintain a full transaction index (default: 0)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
<source>Maximum per-connection receive buffer, &lt;n&gt;*1000 bytes (default: 5000)</source>
<translation>Maksimalus buferis priėmimo sujungimui &lt;n&gt;*1000 bitų (pagal nutylėjimą: 5000)</translation>
</message>
@@ -2445,12 +2683,7 @@ If the file does not exist, create it with owner-readable-only file permissions.
<translation>Prideėti laiko žymę derinimo rezultatams</translation>
</message>
<message>
- <location line="+1"/>
- <source>Rebuild blockchain index from current blk000??.dat files</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+4"/>
+ <location line="+5"/>
<source>SSL options: (see the Bitcoin Wiki for SSL setup instructions)</source>
<translation>SSL opcijos (žr.e Bitcoin Wiki for SSL setup instructions)</translation>
</message>
@@ -2490,7 +2723,12 @@ If the file does not exist, create it with owner-readable-only file permissions.
<translation>Nustatyti sujungimo trukmÄ™ milisekundÄ—mis (pagal nutylÄ—jimÄ…: 5000)</translation>
</message>
<message>
- <location line="+13"/>
+ <location line="+4"/>
+ <source>System error: </source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+10"/>
<source>Use UPnP to map the listening port (default: 0)</source>
<translation>Bandymas naudoti UPnP struktūra klausymosi prievadui (default: 0)</translation>
</message>
@@ -2521,36 +2759,41 @@ If the file does not exist, create it with owner-readable-only file permissions.
</message>
<message>
<location line="+1"/>
+ <source>You need to rebuild the databases using -reindex to change -txindex</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>wallet.dat corrupt, salvage failed</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-43"/>
+ <location line="-45"/>
<source>Password for JSON-RPC connections</source>
<translation>Slaptažodis JSON-RPC sujungimams</translation>
</message>
<message>
- <location line="-53"/>
+ <location line="-68"/>
<source>Allow JSON-RPC connections from specified IP address</source>
<translation>Leisti JSON-RPC tik iš nurodytų IP adresų</translation>
</message>
<message>
- <location line="+62"/>
+ <location line="+77"/>
<source>Send commands to node running on &lt;ip&gt; (default: 127.0.0.1)</source>
<translation>Siųsti komandÄ… mazgui dirbanÄiam &lt;ip&gt; (pagal nutylÄ—jimÄ…: 127.0.0.1)</translation>
</message>
<message>
- <location line="-103"/>
+ <location line="-120"/>
<source>Execute command when the best block changes (%s in cmd is replaced by block hash)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+124"/>
+ <location line="+142"/>
<source>Upgrade wallet to latest format</source>
<translation>Atnaujinti piniginę į naujausią formatą</translation>
</message>
<message>
- <location line="-15"/>
+ <location line="-16"/>
<source>Set key pool size to &lt;n&gt; (default: 100)</source>
<translation>Nustatyti rakto apimties dydį &lt;n&gt; (pagal nutylėjimą: 100)</translation>
</message>
@@ -2560,17 +2803,12 @@ If the file does not exist, create it with owner-readable-only file permissions.
<translation>Ieškoti prarastų piniginės sandorių blokų grandinėje</translation>
</message>
<message>
- <location line="-26"/>
- <source>How many blocks to check at startup (default: 2500, 0 = all)</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+55"/>
+ <location line="+30"/>
<source>Use OpenSSL (https) for JSON-RPC connections</source>
<translation>Naudoti OpenSSL (https) jungimuisi JSON-RPC </translation>
</message>
<message>
- <location line="-20"/>
+ <location line="-21"/>
<source>Server certificate file (default: server.cert)</source>
<translation>Serverio sertifikato failas (pagal nutylÄ—jimÄ…: server.cert)</translation>
</message>
@@ -2580,12 +2818,12 @@ If the file does not exist, create it with owner-readable-only file permissions.
<translation>Serverio privatus raktas (pagal nutylÄ—jimÄ…: server.pem)</translation>
</message>
<message>
- <location line="-133"/>
+ <location line="-154"/>
<source>Acceptable ciphers (default: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH)</source>
<translation>Priimtini Å¡ifrai (pagal nutylÄ—jimÄ…: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH)</translation>
</message>
<message>
- <location line="+144"/>
+ <location line="+166"/>
<source>This help message</source>
<translation>Pagelbos žinutė</translation>
</message>
@@ -2595,7 +2833,7 @@ If the file does not exist, create it with owner-readable-only file permissions.
<translation>Nepavyko susieti Å¡iame kompiuteryje prievado %s (bind returned error %d, %s)</translation>
</message>
<message>
- <location line="-70"/>
+ <location line="-86"/>
<source>Connect through socks proxy</source>
<translation>Jungtis per socks tarpinį serverį</translation>
</message>
@@ -2605,12 +2843,12 @@ If the file does not exist, create it with owner-readable-only file permissions.
<translation>Leisti DNS paiešką sujungimui ir mazgo pridėjimui</translation>
</message>
<message>
- <location line="+43"/>
+ <location line="+57"/>
<source>Loading addresses...</source>
<translation>Užkraunami adresai...</translation>
</message>
<message>
- <location line="-25"/>
+ <location line="-35"/>
<source>Error loading wallet.dat: Wallet corrupted</source>
<translation> wallet.dat pakrovimo klaida, wallet.dat sugadintas</translation>
</message>
@@ -2620,32 +2858,22 @@ If the file does not exist, create it with owner-readable-only file permissions.
<translation> wallet.dat pakrovimo klaida, wallet.dat reikalauja naujasnÄ—s Bitcoin versijos</translation>
</message>
<message>
- <location line="+73"/>
- <source>Verifying block database integrity...</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+1"/>
- <source>Verifying wallet integrity...</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+1"/>
+ <location line="+87"/>
<source>Wallet needed to be rewritten: restart Bitcoin to complete</source>
<translation>Piniginė turi būti prrašyta: įvykdymui perkraukite Bitcoin</translation>
</message>
<message>
- <location line="-77"/>
+ <location line="-89"/>
<source>Error loading wallet.dat</source>
<translation> wallet.dat pakrovimo klaida</translation>
</message>
<message>
- <location line="+20"/>
+ <location line="+30"/>
<source>Invalid -proxy address: &apos;%s&apos;</source>
<translation>Neteisingas proxy adresas: &apos;%s&apos;</translation>
</message>
<message>
- <location line="+46"/>
+ <location line="+48"/>
<source>Unknown network specified in -onlynet: &apos;%s&apos;</source>
<translation type="unfinished"/>
</message>
@@ -2655,7 +2883,7 @@ If the file does not exist, create it with owner-readable-only file permissions.
<translation type="unfinished"/>
</message>
<message>
- <location line="-75"/>
+ <location line="-91"/>
<source>Cannot resolve -bind address: &apos;%s&apos;</source>
<translation type="unfinished"/>
</message>
@@ -2665,17 +2893,17 @@ If the file does not exist, create it with owner-readable-only file permissions.
<translation type="unfinished"/>
</message>
<message>
- <location line="+31"/>
+ <location line="+45"/>
<source>Invalid amount for -paytxfee=&lt;amount&gt;: &apos;%s&apos;</source>
<translation>Neteisinga suma -paytxfee=&lt;amount&gt;: &apos;%s&apos;</translation>
</message>
<message>
- <location line="-15"/>
+ <location line="-24"/>
<source>Error: could not start node</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+16"/>
+ <location line="+25"/>
<source>Invalid amount</source>
<translation>Neteisinga suma</translation>
</message>
@@ -2690,7 +2918,7 @@ If the file does not exist, create it with owner-readable-only file permissions.
<translation>Įkeliamas blokų indeksas...</translation>
</message>
<message>
- <location line="-45"/>
+ <location line="-59"/>
<source>Add a node to connect to and attempt to keep the connection open</source>
<translation>PridÄ—ti mazgÄ… prie sujungti su and attempt to keep the connection open</translation>
</message>
@@ -2700,22 +2928,17 @@ If the file does not exist, create it with owner-readable-only file permissions.
<translation>Nepavyko susieti Å¡iame kompiuteryje prievado %s. Bitcoin tikriausiai jau veikia.</translation>
</message>
<message>
- <location line="+54"/>
- <source>Find peers using internet relay chat (default: 0)</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="-2"/>
+ <location line="+68"/>
<source>Fee per KB to add to transactions you send</source>
<translation>Ä®traukti mokestį už kB siunÄiamiems sandoriams</translation>
</message>
<message>
- <location line="+19"/>
+ <location line="+17"/>
<source>Loading wallet...</source>
<translation>Užkraunama piniginė...</translation>
</message>
<message>
- <location line="-40"/>
+ <location line="-54"/>
<source>Cannot downgrade wallet</source>
<translation type="unfinished"/>
</message>
@@ -2730,27 +2953,27 @@ If the file does not exist, create it with owner-readable-only file permissions.
<translation type="unfinished"/>
</message>
<message>
- <location line="+49"/>
+ <location line="+64"/>
<source>Rescanning...</source>
<translation>Peržiūra</translation>
</message>
<message>
- <location line="-43"/>
+ <location line="-56"/>
<source>Done loading</source>
<translation>Įkėlimas baigtas</translation>
</message>
<message>
- <location line="+65"/>
+ <location line="+79"/>
<source>To use the %s option</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-60"/>
+ <location line="-71"/>
<source>Error</source>
<translation>Klaida</translation>
</message>
<message>
- <location line="-28"/>
+ <location line="-33"/>
<source>You must set rpcpassword=&lt;password&gt; in the configuration file:
%s
If the file does not exist, create it with owner-readable-only file permissions.</source>
diff --git a/src/qt/locale/bitcoin_lv_LV.ts b/src/qt/locale/bitcoin_lv_LV.ts
new file mode 100644
index 0000000000..cb3fa62265
--- /dev/null
+++ b/src/qt/locale/bitcoin_lv_LV.ts
@@ -0,0 +1,2982 @@
+<?xml version="1.0" ?><!DOCTYPE TS><TS language="lv_LV" version="2.0">
+<defaultcodec>UTF-8</defaultcodec>
+<context>
+ <name>AboutDialog</name>
+ <message>
+ <location filename="../forms/aboutdialog.ui" line="+14"/>
+ <source>About Bitcoin</source>
+ <translation>Par Bitcoin</translation>
+ </message>
+ <message>
+ <location line="+39"/>
+ <source>&lt;b&gt;Bitcoin&lt;/b&gt; version</source>
+ <translation>&lt;b&gt;Bitcoin&lt;/b&gt; versija</translation>
+ </message>
+ <message>
+ <location line="+57"/>
+ <source>
+This is experimental software.
+
+Distributed under the MIT/X11 software license, see the accompanying file COPYING or http://www.opensource.org/licenses/mit-license.php.
+
+This product includes software developed by the OpenSSL Project for use in the OpenSSL Toolkit (http://www.openssl.org/) and cryptographic software written by Eric Young (eay@cryptsoft.com) and UPnP software written by Thomas Bernard.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../aboutdialog.cpp" line="+17"/>
+ <source>Copyright</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>2009-%1 The Bitcoin developers</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
+ <name>AddressBookPage</name>
+ <message>
+ <location filename="../forms/addressbookpage.ui" line="+14"/>
+ <source>Address Book</source>
+ <translation>AdreÅ¡u grÄmata</translation>
+ </message>
+ <message>
+ <location line="+22"/>
+ <source>Double-click to edit address or label</source>
+ <translation>Adresi vai nosaukumu rediģē ar dubultklikšķi</translation>
+ </message>
+ <message>
+ <location line="+27"/>
+ <source>Create a new address</source>
+ <translation>Izveidot jaunu adresi</translation>
+ </message>
+ <message>
+ <location line="+14"/>
+ <source>Copy the currently selected address to the system clipboard</source>
+ <translation>Kopēt iezīmēto adresi uz starpliktuvi</translation>
+ </message>
+ <message>
+ <location line="-11"/>
+ <source>&amp;New Address</source>
+ <translation>&amp;Jauna adrese</translation>
+ </message>
+ <message>
+ <location line="-46"/>
+ <source>These are your Bitcoin addresses for receiving payments. You may want to give a different one to each sender so you can keep track of who is paying you.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+60"/>
+ <source>&amp;Copy Address</source>
+ <translation>&amp;Kopēt adresi</translation>
+ </message>
+ <message>
+ <location line="+11"/>
+ <source>Show &amp;QR Code</source>
+ <translation>ParÄdÄ«t &amp;QR kodu</translation>
+ </message>
+ <message>
+ <location line="+11"/>
+ <source>Sign a message to prove you own a Bitcoin address</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Sign &amp;Message</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+25"/>
+ <source>Delete the currently selected address from the list</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-14"/>
+ <source>Verify a message to ensure it was signed with a specified Bitcoin address</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>&amp;Verify Message</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+14"/>
+ <source>&amp;Delete</source>
+ <translation>&amp;Dzēst</translation>
+ </message>
+ <message>
+ <location filename="../addressbookpage.cpp" line="+66"/>
+ <source>Copy &amp;Label</source>
+ <translation>Kopēt &amp;Nosaukumu</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>&amp;Edit</source>
+ <translation>&amp;Rediģēt</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Send &amp;Coins</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+263"/>
+ <source>Export Address Book Data</source>
+ <translation>Eksportēt adreses</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Comma separated file (*.csv)</source>
+ <translation>Fails ar komatu kÄ atdalÄ«tÄju (*.csv)</translation>
+ </message>
+ <message>
+ <location line="+13"/>
+ <source>Error exporting</source>
+ <translation>Kļūda eksportējot</translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>Could not write to file %1.</source>
+ <translation>Nevar ierakstÄ«t failÄ %1.</translation>
+ </message>
+</context>
+<context>
+ <name>AddressTableModel</name>
+ <message>
+ <location filename="../addresstablemodel.cpp" line="+144"/>
+ <source>Label</source>
+ <translation>Nosaukums</translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>Address</source>
+ <translation>Adrese</translation>
+ </message>
+ <message>
+ <location line="+36"/>
+ <source>(no label)</source>
+ <translation>(bez nosaukuma)</translation>
+ </message>
+</context>
+<context>
+ <name>AskPassphraseDialog</name>
+ <message>
+ <location filename="../forms/askpassphrasedialog.ui" line="+26"/>
+ <source>Passphrase Dialog</source>
+ <translation>Paroles dialogs</translation>
+ </message>
+ <message>
+ <location line="+21"/>
+ <source>Enter passphrase</source>
+ <translation>Ierakstiet paroli</translation>
+ </message>
+ <message>
+ <location line="+14"/>
+ <source>New passphrase</source>
+ <translation>Jauna parole</translation>
+ </message>
+ <message>
+ <location line="+14"/>
+ <source>Repeat new passphrase</source>
+ <translation>JaunÄ parole vÄ“lreiz</translation>
+ </message>
+ <message>
+ <location filename="../askpassphrasedialog.cpp" line="+33"/>
+ <source>Enter the new passphrase to the wallet.&lt;br/&gt;Please use a passphrase of &lt;b&gt;10 or more random characters&lt;/b&gt;, or &lt;b&gt;eight or more words&lt;/b&gt;.</source>
+ <translation>Ierakstiet maciņa jauno paroli.&lt;br/&gt;LÅ«dzu izmantojiet &lt;b&gt;10 vai vairÄk nejauÅ¡i izvÄ“lÄ“tas zÄ«mes&lt;/b&gt;, vai &lt;b&gt;astoņus un vairÄk vÄrdus&lt;/b&gt;.</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Encrypt wallet</source>
+ <translation>Šifrēt maciņu</translation>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>This operation needs your wallet passphrase to unlock the wallet.</source>
+ <translation>Lai veikto Å¡o darbÄ«bu, maciņš jÄatslÄ“dz ar paroli.</translation>
+ </message>
+ <message>
+ <location line="+5"/>
+ <source>Unlock wallet</source>
+ <translation>Atslēgt maciņu</translation>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>This operation needs your wallet passphrase to decrypt the wallet.</source>
+ <translation>Å ai darbÄ«bai maciņš jÄatÅ¡ifrÄ“ ar maciņa paroli.</translation>
+ </message>
+ <message>
+ <location line="+5"/>
+ <source>Decrypt wallet</source>
+ <translation>Atšifrēt maciņu</translation>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Change passphrase</source>
+ <translation>Mainīt paroli</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Enter the old and new passphrase to the wallet.</source>
+ <translation>Ierakstiet maciņa veco un jauno paroli.</translation>
+ </message>
+ <message>
+ <location line="+46"/>
+ <source>Confirm wallet encryption</source>
+ <translation>ApstiprinÄt maciņa Å¡ifrÄ“Å¡anu</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Warning: If you encrypt your wallet and lose your passphrase, you will &lt;b&gt;LOSE ALL OF YOUR BITCOINS&lt;/b&gt;!</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>Are you sure you wish to encrypt your wallet?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+15"/>
+ <source>IMPORTANT: Any previous backups you have made of your wallet file should be replaced with the newly generated, encrypted wallet file. For security reasons, previous backups of the unencrypted wallet file will become useless as soon as you start using the new, encrypted wallet.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+100"/>
+ <location line="+24"/>
+ <source>Warning: The Caps Lock key is on!</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-130"/>
+ <location line="+58"/>
+ <source>Wallet encrypted</source>
+ <translation>Maciņš nošifrēts</translation>
+ </message>
+ <message>
+ <location line="-56"/>
+ <source>Bitcoin will close now to finish the encryption process. Remember that encrypting your wallet cannot fully protect your bitcoins from being stolen by malware infecting your computer.</source>
+ <translation>Bitcoin aizvÄ“rsies, lai pabeigtu Å¡ifrÄ“Å¡anu. Atcerieties, ka maciņa Å¡ifrÄ“Å¡ana nevar pilnÄ«bÄ novÄ“rst bitkoinu zÄdzÄ«bu, ko veic datorÄ ieviesuÅ¡Äs kaitÄ«gas programmas.</translation>
+ </message>
+ <message>
+ <location line="+13"/>
+ <location line="+7"/>
+ <location line="+42"/>
+ <location line="+6"/>
+ <source>Wallet encryption failed</source>
+ <translation>Maciņa Å¡ifrÄ“Å¡ana neizdevÄs</translation>
+ </message>
+ <message>
+ <location line="-54"/>
+ <source>Wallet encryption failed due to an internal error. Your wallet was not encrypted.</source>
+ <translation>Maciņa Å¡ifrÄ“Å¡ana neizdevÄs programmas kļūdas dēļ. JÅ«su maciņš netika Å¡ifrÄ“ts.</translation>
+ </message>
+ <message>
+ <location line="+7"/>
+ <location line="+48"/>
+ <source>The supplied passphrases do not match.</source>
+ <translation>IevadÄ«tÄs paroles nav vienÄdas.</translation>
+ </message>
+ <message>
+ <location line="-37"/>
+ <source>Wallet unlock failed</source>
+ <translation>Maciņu atÅ¡ifrÄ“t neizdevÄs</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <location line="+11"/>
+ <location line="+19"/>
+ <source>The passphrase entered for the wallet decryption was incorrect.</source>
+ <translation>Maciņa atÅ¡ifrÄ“Å¡anai ievadÄ«tÄ parole nav pareiza.</translation>
+ </message>
+ <message>
+ <location line="-20"/>
+ <source>Wallet decryption failed</source>
+ <translation>Maciņu neizdevÄs atÅ¡ifrÄ“t</translation>
+ </message>
+ <message>
+ <location line="+14"/>
+ <source>Wallet passphrase was successfully changed.</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
+ <name>BitcoinGUI</name>
+ <message>
+ <location filename="../bitcoingui.cpp" line="+231"/>
+ <source>Sign &amp;message...</source>
+ <translation>Parakstīt &amp;ziņojumu...</translation>
+ </message>
+ <message>
+ <location line="+299"/>
+ <source>Synchronizing with network...</source>
+ <translation>SinhronizÄcija ar tÄ«klu...</translation>
+ </message>
+ <message>
+ <location line="-367"/>
+ <source>&amp;Overview</source>
+ <translation>&amp;PÄrskats</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Show general overview of wallet</source>
+ <translation>RÄdÄ«t vispÄrÄ“ju maciņa pÄrskatu</translation>
+ </message>
+ <message>
+ <location line="+20"/>
+ <source>&amp;Transactions</source>
+ <translation>&amp;Transakcijas</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Browse transaction history</source>
+ <translation>Skatīt transakciju vēsturi</translation>
+ </message>
+ <message>
+ <location line="+7"/>
+ <source>Edit the list of stored addresses and labels</source>
+ <translation>Rediģēt saglabÄtÄs adreses un nosaukumus</translation>
+ </message>
+ <message>
+ <location line="-14"/>
+ <source>Show the list of addresses for receiving payments</source>
+ <translation>RÄdÄ«t maksÄjumu saņemÅ¡anas adreses</translation>
+ </message>
+ <message>
+ <location line="+31"/>
+ <source>E&amp;xit</source>
+ <translation>&amp;Iziet</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Quit application</source>
+ <translation>Aizvērt programmu</translation>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>Show information about Bitcoin</source>
+ <translation>ParÄdÄ«t informÄciju par Bitcoin</translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>About &amp;Qt</source>
+ <translation>Par &amp;Qt</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Show information about Qt</source>
+ <translation>ParÄdÄ«t informÄciju par Qt</translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>&amp;Options...</source>
+ <translation>&amp;Iespējas</translation>
+ </message>
+ <message>
+ <location line="+5"/>
+ <source>&amp;Encrypt Wallet...</source>
+ <translation>Š&amp;ifrēt maciņu...</translation>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>&amp;Backup Wallet...</source>
+ <translation>&amp;Izveidot maciņa rezerves kopiju</translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>&amp;Change Passphrase...</source>
+ <translation>&amp;Mainīt paroli</translation>
+ </message>
+ <message>
+ <location line="+304"/>
+ <source>Importing blocks from disk...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Reindexing blocks on disk...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-300"/>
+ <source>&amp;Export...</source>
+ <translation>&amp;Eksportēt...</translation>
+ </message>
+ <message>
+ <location line="-65"/>
+ <source>Send coins to a Bitcoin address</source>
+ <translation>Nosūtīt bitkoinus uz Bitcoin adresi</translation>
+ </message>
+ <message>
+ <location line="+49"/>
+ <source>Modify configuration options for Bitcoin</source>
+ <translation>MainÄ«t Bitcoin konfigurÄcijas uzstÄdÄ«jumus</translation>
+ </message>
+ <message>
+ <location line="+17"/>
+ <source>Export the data in the current tab to a file</source>
+ <translation>Datus no tekoÅ¡Ä ieliktņa eksportÄ“t uz failu</translation>
+ </message>
+ <message>
+ <location line="-9"/>
+ <source>Backup wallet to another location</source>
+ <translation>Izveidot maciņa rezerves kopiju citur</translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Change the passphrase used for wallet encryption</source>
+ <translation>Mainīt maciņa šifrēšanas paroli</translation>
+ </message>
+ <message>
+ <location line="+9"/>
+ <source>&amp;Debug window</source>
+ <translation>&amp;Debug logs</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Open debugging and diagnostic console</source>
+ <translation>Atvērt atkļūdošanas un diagnostikas konsoli</translation>
+ </message>
+ <message>
+ <location line="-7"/>
+ <source>&amp;Verify message...</source>
+ <translation>&amp;PÄrbaudÄ«t ziņojumu...</translation>
+ </message>
+ <message>
+ <location line="-162"/>
+ <location line="+540"/>
+ <source>Bitcoin</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-540"/>
+ <source>Wallet</source>
+ <translation>Maciņš</translation>
+ </message>
+ <message>
+ <location line="+99"/>
+ <source>&amp;Send</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+7"/>
+ <source>&amp;Receive</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+14"/>
+ <source>&amp;Addresses</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+22"/>
+ <source>&amp;About Bitcoin</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+9"/>
+ <source>&amp;Show / Hide</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Show or hide the main Window</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Encrypt the private keys that belong to your wallet</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+7"/>
+ <source>Sign messages with your Bitcoin addresses to prove you own them</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Verify messages to ensure they were signed with specified Bitcoin addresses</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+31"/>
+ <source>&amp;File</source>
+ <translation>&amp;Fails</translation>
+ </message>
+ <message>
+ <location line="+8"/>
+ <source>&amp;Settings</source>
+ <translation>&amp;UzstÄdÄ«jumi</translation>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>&amp;Help</source>
+ <translation>&amp;Palīdzība</translation>
+ </message>
+ <message>
+ <location line="+9"/>
+ <source>Tabs toolbar</source>
+ <translation>Ciļņu rīkjosla</translation>
+ </message>
+ <message>
+ <location line="+8"/>
+ <source>Actions toolbar</source>
+ <translation>Darbību rīkjosla</translation>
+ </message>
+ <message>
+ <location line="+13"/>
+ <location line="+10"/>
+ <source>[testnet]</source>
+ <translation>[testnet]</translation>
+ </message>
+ <message>
+ <location line="+47"/>
+ <source>Bitcoin client</source>
+ <translation>Bitcoin klients</translation>
+ </message>
+ <message numerus="yes">
+ <location line="+140"/>
+ <source>%n active connection(s) to Bitcoin network</source>
+ <translation><numerusform>%n aktīvu savienojumu ar Bitcoin tīklu</numerusform><numerusform>%n aktīvs savienojums ar Bitcoin tīklu</numerusform><numerusform>%n aktīvu savienojumu as Bitcoin tīklu</numerusform></translation>
+ </message>
+ <message>
+ <location line="+39"/>
+ <source>Processed %1 of %2 (estimated) blocks of transaction history.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>Processed %1 blocks of transaction history.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message numerus="yes">
+ <location line="+20"/>
+ <source>%n hour(s)</source>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
+ <message numerus="yes">
+ <location line="+4"/>
+ <source>%n day(s)</source>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
+ <message numerus="yes">
+ <location line="+4"/>
+ <source>%n week(s)</source>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
+ <message>
+ <location line="+5"/>
+ <source>%1 behind</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+14"/>
+ <source>Last received block was generated %1 ago.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Transactions after this will not yet be visible.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+21"/>
+ <source>Error</source>
+ <translation>Kļūda</translation>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Warning</source>
+ <translation>BrÄ«dinÄjums</translation>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Information</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+68"/>
+ <source>This transaction is over the size limit. You can still send it for a fee of %1, which goes to the nodes that process your transaction and helps to support the network. Do you want to pay the fee?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-138"/>
+ <source>Up to date</source>
+ <translation>Sinhronizēts</translation>
+ </message>
+ <message>
+ <location line="+32"/>
+ <source>Catching up...</source>
+ <translation>Sinhronizējos...</translation>
+ </message>
+ <message>
+ <location line="+110"/>
+ <source>Confirm transaction fee</source>
+ <translation>ApstiprinÄt transakcijas maksu</translation>
+ </message>
+ <message>
+ <location line="+8"/>
+ <source>Sent transaction</source>
+ <translation>Transakcija nosūtīta</translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>Incoming transaction</source>
+ <translation>IenÄkoÅ¡a transakcija</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Date: %1
+Amount: %2
+Type: %3
+Address: %4
+</source>
+ <translation>Datums: %1
+Daudzums: %2
+Tips: %3
+Adrese: %4
+</translation>
+ </message>
+ <message>
+ <location line="+33"/>
+ <location line="+23"/>
+ <source>URI handling</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-23"/>
+ <location line="+23"/>
+ <source>URI can not be parsed! This can be caused by an invalid Bitcoin address or malformed URI parameters.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+17"/>
+ <source>Wallet is &lt;b&gt;encrypted&lt;/b&gt; and currently &lt;b&gt;unlocked&lt;/b&gt;</source>
+ <translation>Maciņš ir &lt;b&gt;šifrēts&lt;/b&gt; un pašlaik &lt;b&gt;atslēgts&lt;/b&gt;</translation>
+ </message>
+ <message>
+ <location line="+8"/>
+ <source>Wallet is &lt;b&gt;encrypted&lt;/b&gt; and currently &lt;b&gt;locked&lt;/b&gt;</source>
+ <translation>Maciņš ir &lt;b&gt;šifrēts&lt;/b&gt; un pašlaik &lt;b&gt;slēgts&lt;/b&gt;</translation>
+ </message>
+ <message>
+ <location filename="../bitcoin.cpp" line="+108"/>
+ <source>A fatal error occurred. Bitcoin can no longer continue safely and will quit.</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
+ <name>ClientModel</name>
+ <message>
+ <location filename="../clientmodel.cpp" line="+96"/>
+ <source>Network Alert</source>
+ <translation>TÄ«kla brÄ«dinÄjums</translation>
+ </message>
+</context>
+<context>
+ <name>EditAddressDialog</name>
+ <message>
+ <location filename="../forms/editaddressdialog.ui" line="+14"/>
+ <source>Edit Address</source>
+ <translation>Mainīt adrese</translation>
+ </message>
+ <message>
+ <location line="+11"/>
+ <source>&amp;Label</source>
+ <translation>&amp;Nosaukums</translation>
+ </message>
+ <message>
+ <location line="+10"/>
+ <source>The label associated with this address book entry</source>
+ <translation>AdreÅ¡u grÄmatas ieraksta nosaukums</translation>
+ </message>
+ <message>
+ <location line="+7"/>
+ <source>&amp;Address</source>
+ <translation>&amp;Adrese</translation>
+ </message>
+ <message>
+ <location line="+10"/>
+ <source>The address associated with this address book entry. This can only be modified for sending addresses.</source>
+ <translation>Adrese adreÅ¡u grÄmatas ierakstÄ. To var mainÄ«t tikai nosÅ«tÄ«Å¡anas adresÄ“m.</translation>
+ </message>
+ <message>
+ <location filename="../editaddressdialog.cpp" line="+21"/>
+ <source>New receiving address</source>
+ <translation>Jauna saņemšanas adrese</translation>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>New sending address</source>
+ <translation>Jauna nosūtīšanas adrese</translation>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Edit receiving address</source>
+ <translation>Mainīt saņemšanas adresi</translation>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>Edit sending address</source>
+ <translation>Mainīt nosūtīšanas adresi</translation>
+ </message>
+ <message>
+ <location line="+76"/>
+ <source>The entered address &quot;%1&quot; is already in the address book.</source>
+ <translation>Nupat ierakstÄ«tÄ adrese &quot;%1&quot; jau atrodas adreÅ¡u grÄmatÄ.</translation>
+ </message>
+ <message>
+ <location line="-5"/>
+ <source>The entered address &quot;%1&quot; is not a valid Bitcoin address.</source>
+ <translation>IerakstÄ«tÄ adrese &quot;%1&quot; nav derÄ«ga Bitcoin adrese.</translation>
+ </message>
+ <message>
+ <location line="+10"/>
+ <source>Could not unlock wallet.</source>
+ <translation>Nav iespējams atslēgt maciņu.</translation>
+ </message>
+ <message>
+ <location line="+5"/>
+ <source>New key generation failed.</source>
+ <translation>NeizdevÄs Ä£enerÄ“t jaunu atslÄ“gu.</translation>
+ </message>
+</context>
+<context>
+ <name>GUIUtil::HelpMessageBox</name>
+ <message>
+ <location filename="../guiutil.cpp" line="+422"/>
+ <location line="+12"/>
+ <source>Bitcoin-Qt</source>
+ <translation>Bitcoin-Qt</translation>
+ </message>
+ <message>
+ <location line="-12"/>
+ <source>version</source>
+ <translation>versija</translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Usage:</source>
+ <translation>Lietojums:</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>command-line options</source>
+ <translation>komandrindas izvēles</translation>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>UI options</source>
+ <translation>LietotÄja interfeisa izvÄ“lnes</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Set language, for example &quot;de_DE&quot; (default: system locale)</source>
+ <translation>UzstÄdiet valodu, piemÄ“ram &quot;de_DE&quot; (pÄ“c noklusÄ“Å¡anas: sistÄ“mas lokÄle)</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Start minimized</source>
+ <translation>SÄkt minimizÄ“tu</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Show splash screen on startup (default: 1)</source>
+ <translation>UzsÄkot, parÄdÄ«t programmas informÄcijas logu (pÄ“c noklusÄ“Å¡anas: 1)</translation>
+ </message>
+</context>
+<context>
+ <name>OptionsDialog</name>
+ <message>
+ <location filename="../forms/optionsdialog.ui" line="+14"/>
+ <source>Options</source>
+ <translation>Iespējas</translation>
+ </message>
+ <message>
+ <location line="+16"/>
+ <source>&amp;Main</source>
+ <translation>&amp;Galvenais</translation>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>Optional transaction fee per kB that helps make sure your transactions are processed quickly. Most transactions are 1 kB. Fee 0.01 recommended.</source>
+ <translation>BrÄ«vprÄtÄ«ga maksa par transakcijas kB, kas nodroÅ¡ina Ätru transakciju apstrÄdi. Vairums transakciju aizņem 1 kB. IeteicamÄ maksa 0.01.</translation>
+ </message>
+ <message>
+ <location line="+15"/>
+ <source>Pay transaction &amp;fee</source>
+ <translation>&amp;MaksÄt par transakciju</translation>
+ </message>
+ <message>
+ <location line="+31"/>
+ <source>Automatically start Bitcoin after logging in to the system.</source>
+ <translation>AutomÄtiski sÄkt Bitcoin pÄ“c pieteikÅ¡anÄs sistÄ“mÄ.</translation>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>&amp;Start Bitcoin on system login</source>
+ <translation>&amp;SÄkt Bitcoin reizÄ“ ar sistÄ“mu</translation>
+ </message>
+ <message>
+ <location line="+35"/>
+ <source>Reset all client options to default.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>&amp;Reset Options</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+13"/>
+ <source>&amp;Network</source>
+ <translation>&amp;TÄ«kls</translation>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>Automatically open the Bitcoin client port on the router. This only works when your router supports UPnP and it is enabled.</source>
+ <translation>Uz rÅ«tera automÄtiski atvÄ“rt Bitcoin klienta portu. Tas strÄdÄ tikai tad, ja rÅ«teris atbalsta UPnP un tas ir ieslÄ“gts.</translation>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Map port using &amp;UPnP</source>
+ <translation>Kartēt portu, izmantojot &amp;UPnP</translation>
+ </message>
+ <message>
+ <location line="+7"/>
+ <source>Connect to the Bitcoin network through a SOCKS proxy (e.g. when connecting through Tor).</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>&amp;Connect through SOCKS proxy:</source>
+ <translation>&amp;Savienoties caur SOCKS proxy:</translation>
+ </message>
+ <message>
+ <location line="+9"/>
+ <source>Proxy &amp;IP:</source>
+ <translation>Proxy &amp;IP:</translation>
+ </message>
+ <message>
+ <location line="+19"/>
+ <source>IP address of the proxy (e.g. 127.0.0.1)</source>
+ <translation>proxy IP adrese (piem. 127.0.0.1)</translation>
+ </message>
+ <message>
+ <location line="+7"/>
+ <source>&amp;Port:</source>
+ <translation>&amp;Ports:</translation>
+ </message>
+ <message>
+ <location line="+19"/>
+ <source>Port of the proxy (e.g. 9050)</source>
+ <translation>Proxy ports (piem. 9050)</translation>
+ </message>
+ <message>
+ <location line="+7"/>
+ <source>SOCKS &amp;Version:</source>
+ <translation>SOCKS &amp;Versija:</translation>
+ </message>
+ <message>
+ <location line="+13"/>
+ <source>SOCKS version of the proxy (e.g. 5)</source>
+ <translation>proxy SOCKS versija (piem. 5)</translation>
+ </message>
+ <message>
+ <location line="+36"/>
+ <source>&amp;Window</source>
+ <translation>&amp;Logs</translation>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>Show only a tray icon after minimizing the window.</source>
+ <translation>PÄ“c loga minimizÄcijas rÄdÄ«t tikai ikonu sistÄ“mas teknÄ“.</translation>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>&amp;Minimize to the tray instead of the taskbar</source>
+ <translation>&amp;Minimizēt uz sistēmas tekni, nevis rīkjoslu</translation>
+ </message>
+ <message>
+ <location line="+7"/>
+ <source>Minimize instead of exit the application when the window is closed. When this option is enabled, the application will be closed only after selecting Quit in the menu.</source>
+ <translation>Logu aizverot, minimizēt, nevis beigt darbu. Kad šī izvēlne iespējota, programma aizvērsies tikai pēc Beigt komandas izvēlnē.</translation>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>M&amp;inimize on close</source>
+ <translation>M&amp;inimizēt aizverot</translation>
+ </message>
+ <message>
+ <location line="+21"/>
+ <source>&amp;Display</source>
+ <translation>&amp;Izskats</translation>
+ </message>
+ <message>
+ <location line="+8"/>
+ <source>User Interface &amp;language:</source>
+ <translation>LietotÄja interfeiss un &amp;valoda:</translation>
+ </message>
+ <message>
+ <location line="+13"/>
+ <source>The user interface language can be set here. This setting will take effect after restarting Bitcoin.</source>
+ <translation>Å eit var iestatÄ«t lietotÄja valodu. IestatÄ«jums aktivizÄ“sies pÄ“c Bitcoin pÄrstartÄ“Å¡anas.</translation>
+ </message>
+ <message>
+ <location line="+11"/>
+ <source>&amp;Unit to show amounts in:</source>
+ <translation>&amp;VienÄ«bas, kurÄs attÄ“lot daudzumus:</translation>
+ </message>
+ <message>
+ <location line="+13"/>
+ <source>Choose the default subdivision unit to show in the interface and when sending coins.</source>
+ <translation>IzvÄ“lÄ“ties dalÄ«juma vienÄ«bu pÄ“c noklusÄ“Å¡anas, ko izmantot interfeisÄ un nosÅ«tot bitkoinus.</translation>
+ </message>
+ <message>
+ <location line="+9"/>
+ <source>Whether to show Bitcoin addresses in the transaction list or not.</source>
+ <translation>RÄdÄ«t vai nÄ“ Bitcoin adreses transakciju sarakstÄ.</translation>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>&amp;Display addresses in transaction list</source>
+ <translation>&amp;AttÄ“lot adreses transakciju sarakstÄ</translation>
+ </message>
+ <message>
+ <location line="+71"/>
+ <source>&amp;OK</source>
+ <translation>&amp;OK</translation>
+ </message>
+ <message>
+ <location line="+7"/>
+ <source>&amp;Cancel</source>
+ <translation>&amp;Atcelt</translation>
+ </message>
+ <message>
+ <location line="+10"/>
+ <source>&amp;Apply</source>
+ <translation>&amp;Pielietot</translation>
+ </message>
+ <message>
+ <location filename="../optionsdialog.cpp" line="+53"/>
+ <source>default</source>
+ <translation>pēc noklusēšanas</translation>
+ </message>
+ <message>
+ <location line="+130"/>
+ <source>Confirm options reset</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Some settings may require a client restart to take effect.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>Do you want to proceed?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+42"/>
+ <location line="+9"/>
+ <source>Warning</source>
+ <translation>BrÄ«dinÄjums</translation>
+ </message>
+ <message>
+ <location line="-9"/>
+ <location line="+9"/>
+ <source>This setting will take effect after restarting Bitcoin.</source>
+ <translation>IestatÄ«jums aktivizÄ“sies pÄ“c Bitkoin pÄrstartÄ“Å¡anas.</translation>
+ </message>
+ <message>
+ <location line="+29"/>
+ <source>The supplied proxy address is invalid.</source>
+ <translation>NorÄdÄ«tÄ proxy adrese nav derÄ«ga.</translation>
+ </message>
+</context>
+<context>
+ <name>OverviewPage</name>
+ <message>
+ <location filename="../forms/overviewpage.ui" line="+14"/>
+ <source>Form</source>
+ <translation>Forma</translation>
+ </message>
+ <message>
+ <location line="+50"/>
+ <location line="+166"/>
+ <source>The displayed information may be out of date. Your wallet automatically synchronizes with the Bitcoin network after a connection is established, but this process has not completed yet.</source>
+ <translation>AttÄ“lotÄ informÄcija var bÅ«t novecojusi. JÅ«su maciņš pÄ“c savienojuma izveides automÄtiski sinhronizÄ“jas ar Bitcoin tÄ«klu, taÄu Å¡is process vÄ“l nav beidzies.</translation>
+ </message>
+ <message>
+ <location line="-124"/>
+ <source>Balance:</source>
+ <translation>Bilance:</translation>
+ </message>
+ <message>
+ <location line="+29"/>
+ <source>Unconfirmed:</source>
+ <translation>NeapstiprinÄtas:</translation>
+ </message>
+ <message>
+ <location line="-78"/>
+ <source>Wallet</source>
+ <translation>Maciņš</translation>
+ </message>
+ <message>
+ <location line="+107"/>
+ <source>Immature:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+13"/>
+ <source>Mined balance that has not yet matured</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+46"/>
+ <source>&lt;b&gt;Recent transactions&lt;/b&gt;</source>
+ <translation>&lt;b&gt;PÄ“dÄ“jÄs transakcijas&lt;/b&gt;</translation>
+ </message>
+ <message>
+ <location line="-101"/>
+ <source>Your current balance</source>
+ <translation>JÅ«su tekoÅ¡Ä bilance</translation>
+ </message>
+ <message>
+ <location line="+29"/>
+ <source>Total of transactions that have yet to be confirmed, and do not yet count toward the current balance</source>
+ <translation>KopÄ“jÄ apstiprinÄmo transakciju vÄ“rtÄ«ba, vÄ“l nav ieskaitÄ«ta kopÄ“jÄ bilancÄ“</translation>
+ </message>
+ <message>
+ <location filename="../overviewpage.cpp" line="+115"/>
+ <location line="+1"/>
+ <source>out of sync</source>
+ <translation>nav sinhronizēts</translation>
+ </message>
+</context>
+<context>
+ <name>PaymentServer</name>
+ <message>
+ <location filename="../paymentserver.cpp" line="+107"/>
+ <source>Cannot start bitcoin: click-to-pay handler</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
+ <name>QRCodeDialog</name>
+ <message>
+ <location filename="../forms/qrcodedialog.ui" line="+14"/>
+ <source>QR Code Dialog</source>
+ <translation>QR koda dialogs</translation>
+ </message>
+ <message>
+ <location line="+59"/>
+ <source>Request Payment</source>
+ <translation>PieprasÄ«t maksÄjumu</translation>
+ </message>
+ <message>
+ <location line="+56"/>
+ <source>Amount:</source>
+ <translation>Daudzums:</translation>
+ </message>
+ <message>
+ <location line="-44"/>
+ <source>Label:</source>
+ <translation>Nosaukums:</translation>
+ </message>
+ <message>
+ <location line="+19"/>
+ <source>Message:</source>
+ <translation>Ziņojums:</translation>
+ </message>
+ <message>
+ <location line="+71"/>
+ <source>&amp;Save As...</source>
+ <translation>&amp;SaglabÄt kÄ...</translation>
+ </message>
+ <message>
+ <location filename="../qrcodedialog.cpp" line="+62"/>
+ <source>Error encoding URI into QR Code.</source>
+ <translation>Kļūda kodÄ“jot URI QR kodÄ.</translation>
+ </message>
+ <message>
+ <location line="+40"/>
+ <source>The entered amount is invalid, please check.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+23"/>
+ <source>Resulting URI too long, try to reduce the text for label / message.</source>
+ <translation>RezultÄta URI pÄrÄk garÅ¡, mÄ“Ä£iniet saÄ«sinÄt nosaukumu vai ziņojumu. </translation>
+ </message>
+ <message>
+ <location line="+25"/>
+ <source>Save QR Code</source>
+ <translation>SaglabÄt QR kodu</translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>PNG Images (*.png)</source>
+ <translation>PNG attēli (*.png)</translation>
+ </message>
+</context>
+<context>
+ <name>RPCConsole</name>
+ <message>
+ <location filename="../forms/rpcconsole.ui" line="+46"/>
+ <source>Client name</source>
+ <translation>Klienta vÄrds</translation>
+ </message>
+ <message>
+ <location line="+10"/>
+ <location line="+23"/>
+ <location line="+26"/>
+ <location line="+23"/>
+ <location line="+23"/>
+ <location line="+36"/>
+ <location line="+53"/>
+ <location line="+23"/>
+ <location line="+23"/>
+ <location filename="../rpcconsole.cpp" line="+344"/>
+ <source>N/A</source>
+ <translation>N/A</translation>
+ </message>
+ <message>
+ <location line="-217"/>
+ <source>Client version</source>
+ <translation>Klienta versija</translation>
+ </message>
+ <message>
+ <location line="-45"/>
+ <source>&amp;Information</source>
+ <translation>&amp;InformÄcija</translation>
+ </message>
+ <message>
+ <location line="+68"/>
+ <source>Using OpenSSL version</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+49"/>
+ <source>Startup time</source>
+ <translation>SÄkuma laiks</translation>
+ </message>
+ <message>
+ <location line="+29"/>
+ <source>Network</source>
+ <translation>TÄ«kls</translation>
+ </message>
+ <message>
+ <location line="+7"/>
+ <source>Number of connections</source>
+ <translation>Savienojumu skaits</translation>
+ </message>
+ <message>
+ <location line="+23"/>
+ <source>On testnet</source>
+ <translation>Testa tÄ«klÄ</translation>
+ </message>
+ <message>
+ <location line="+23"/>
+ <source>Block chain</source>
+ <translation>Bloku virkne</translation>
+ </message>
+ <message>
+ <location line="+7"/>
+ <source>Current number of blocks</source>
+ <translation>Pašreizējais bloku skaits</translation>
+ </message>
+ <message>
+ <location line="+23"/>
+ <source>Estimated total blocks</source>
+ <translation>Bloku skaita novērtējums</translation>
+ </message>
+ <message>
+ <location line="+23"/>
+ <source>Last block time</source>
+ <translation>PÄ“dÄ“jÄ bloka laiks</translation>
+ </message>
+ <message>
+ <location line="+52"/>
+ <source>&amp;Open</source>
+ <translation>&amp;Atvērt</translation>
+ </message>
+ <message>
+ <location line="+16"/>
+ <source>Command-line options</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+7"/>
+ <source>Show the Bitcoin-Qt help message to get a list with possible Bitcoin command-line options.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>&amp;Show</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+24"/>
+ <source>&amp;Console</source>
+ <translation>&amp;Konsole</translation>
+ </message>
+ <message>
+ <location line="-260"/>
+ <source>Build date</source>
+ <translation>KompilÄcijas datums</translation>
+ </message>
+ <message>
+ <location line="-104"/>
+ <source>Bitcoin - Debug window</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+25"/>
+ <source>Bitcoin Core</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+279"/>
+ <source>Debug log file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+7"/>
+ <source>Open the Bitcoin debug log file from the current data directory. This can take a few seconds for large log files.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+102"/>
+ <source>Clear console</source>
+ <translation>Notīrīt konsoli</translation>
+ </message>
+ <message>
+ <location filename="../rpcconsole.cpp" line="-30"/>
+ <source>Welcome to the Bitcoin RPC console.</source>
+ <translation>Laipni lūgti Bitcoin RPC konsolē.</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Use up and down arrows to navigate history, and &lt;b&gt;Ctrl-L&lt;/b&gt; to clear screen.</source>
+ <translation>Izmantojiet bultiņas uz augÅ¡u un leju, lai pÄrvietotos pa vÄ“sturi, un &lt;b&gt;Ctrl-L&lt;/b&gt; ekrÄna notÄ«rÄ«Å¡anai.</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Type &lt;b&gt;help&lt;/b&gt; for an overview of available commands.</source>
+ <translation>Ierakstiet &lt;b&gt;help&lt;/b&gt; lai iegūtu pieejamo komandu sarakstu.</translation>
+ </message>
+</context>
+<context>
+ <name>SendCoinsDialog</name>
+ <message>
+ <location filename="../forms/sendcoinsdialog.ui" line="+14"/>
+ <location filename="../sendcoinsdialog.cpp" line="+124"/>
+ <location line="+5"/>
+ <location line="+5"/>
+ <location line="+5"/>
+ <location line="+6"/>
+ <location line="+5"/>
+ <location line="+5"/>
+ <source>Send Coins</source>
+ <translation>Sūtīt bitkoinus</translation>
+ </message>
+ <message>
+ <location line="+50"/>
+ <source>Send to multiple recipients at once</source>
+ <translation>SÅ«tÄ«t vairÄkiem saņēmÄ“jiem uzreiz</translation>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Add &amp;Recipient</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+20"/>
+ <source>Remove all transaction fields</source>
+ <translation>Dzēst visus transakcijas laukus</translation>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Clear &amp;All</source>
+ <translation>&amp;Notīrīt visu</translation>
+ </message>
+ <message>
+ <location line="+22"/>
+ <source>Balance:</source>
+ <translation>Bilance:</translation>
+ </message>
+ <message>
+ <location line="+10"/>
+ <source>123.456 BTC</source>
+ <translation>123,456 BTC</translation>
+ </message>
+ <message>
+ <location line="+31"/>
+ <source>Confirm the send action</source>
+ <translation>ApstiprinÄt nosÅ«tÄ«Å¡anu</translation>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>S&amp;end</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../sendcoinsdialog.cpp" line="-59"/>
+ <source>&lt;b&gt;%1&lt;/b&gt; to %2 (%3)</source>
+ <translation>&lt;b&gt;%1&lt;/b&gt; līdz %2 (%3)</translation>
+ </message>
+ <message>
+ <location line="+5"/>
+ <source>Confirm send coins</source>
+ <translation>ApstiprinÄt bitkoinu sÅ«tÄ«Å¡anu</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Are you sure you want to send %1?</source>
+ <translation>Vai tieÅ¡Äm vÄ“laties nosÅ«tÄ«t %1?</translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source> and </source>
+ <translation>un</translation>
+ </message>
+ <message>
+ <location line="+23"/>
+ <source>The recipient address is not valid, please recheck.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+5"/>
+ <source>The amount to pay must be larger than 0.</source>
+ <translation>NosÅ«tÄmajai summai jÄbÅ«t lielÄkai par 0.</translation>
+ </message>
+ <message>
+ <location line="+5"/>
+ <source>The amount exceeds your balance.</source>
+ <translation>Daudzums pÄrsniedz pieejamo.</translation>
+ </message>
+ <message>
+ <location line="+5"/>
+ <source>The total exceeds your balance when the %1 transaction fee is included.</source>
+ <translation>Kopsumma pÄrsniedz pieejamo, ja pieskaitÄ«ta %1 transakcijas maksa.</translation>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>Duplicate address found, can only send to each address once per send operation.</source>
+ <translation>Atrastas divas vienÄdas adreses, vienÄ nosÅ«tÄ«Å¡anas reizÄ“ uz katru adresi var sÅ«tÄ«t tikai vienreiz.</translation>
+ </message>
+ <message>
+ <location line="+5"/>
+ <source>Error: Transaction creation failed!</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+5"/>
+ <source>Error: The transaction was rejected. This might happen if some of the coins in your wallet were already spent, such as if you used a copy of wallet.dat and coins were spent in the copy but not marked as spent here.</source>
+ <translation>Kļūda: transakcija tika atteikta. TÄ var gadÄ«ties, ja kÄds no maciÅ†Ä esoÅ¡iem bitkoiniem jau iztÄ“rÄ“ts, piemÄ“ram, izmantojot wallet.dat kopiju, kurÄ nav atzÄ«mÄ“ti iztÄ“rÄ“tie bitkoini.</translation>
+ </message>
+</context>
+<context>
+ <name>SendCoinsEntry</name>
+ <message>
+ <location filename="../forms/sendcoinsentry.ui" line="+14"/>
+ <source>Form</source>
+ <translation>Forma</translation>
+ </message>
+ <message>
+ <location line="+15"/>
+ <source>A&amp;mount:</source>
+ <translation>Apjo&amp;ms</translation>
+ </message>
+ <message>
+ <location line="+13"/>
+ <source>Pay &amp;To:</source>
+ <translation>&amp;Saņēmējs:</translation>
+ </message>
+ <message>
+ <location line="+34"/>
+ <source>The address to send the payment to (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+60"/>
+ <location filename="../sendcoinsentry.cpp" line="+26"/>
+ <source>Enter a label for this address to add it to your address book</source>
+ <translation>Lai pievienotu adresi adreÅ¡u grÄmatai, tai jÄdod nosaukums</translation>
+ </message>
+ <message>
+ <location line="-78"/>
+ <source>&amp;Label:</source>
+ <translation>&amp;Nosaukums:</translation>
+ </message>
+ <message>
+ <location line="+28"/>
+ <source>Choose address from address book</source>
+ <translation>IzvÄ“lÄ“ties adresi no adreÅ¡u grÄmatas</translation>
+ </message>
+ <message>
+ <location line="+10"/>
+ <source>Alt+A</source>
+ <translation>Alt+A</translation>
+ </message>
+ <message>
+ <location line="+7"/>
+ <source>Paste address from clipboard</source>
+ <translation>ielīmēt adresi no starpliktuves</translation>
+ </message>
+ <message>
+ <location line="+10"/>
+ <source>Alt+P</source>
+ <translation>Alt+P</translation>
+ </message>
+ <message>
+ <location line="+7"/>
+ <source>Remove this recipient</source>
+ <translation>Dzēst šo saņēmēju</translation>
+ </message>
+ <message>
+ <location filename="../sendcoinsentry.cpp" line="+1"/>
+ <source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
+ <translation>Ierakstiet Bitcoin adresi (piem. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation>
+ </message>
+</context>
+<context>
+ <name>SignVerifyMessageDialog</name>
+ <message>
+ <location filename="../forms/signverifymessagedialog.ui" line="+14"/>
+ <source>Signatures - Sign / Verify a Message</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+13"/>
+ <source>&amp;Sign Message</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>You can sign messages with your addresses to prove you own them. Be careful not to sign anything vague, as phishing attacks may try to trick you into signing your identity over to them. Only sign fully-detailed statements you agree to.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+18"/>
+ <source>The address to sign the message with (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+10"/>
+ <location line="+213"/>
+ <source>Choose an address from the address book</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-203"/>
+ <location line="+213"/>
+ <source>Alt+A</source>
+ <translation>Alt+A</translation>
+ </message>
+ <message>
+ <location line="-203"/>
+ <source>Paste address from clipboard</source>
+ <translation>ielīmēt adresi no starpliktuves</translation>
+ </message>
+ <message>
+ <location line="+10"/>
+ <source>Alt+P</source>
+ <translation>Alt+P</translation>
+ </message>
+ <message>
+ <location line="+12"/>
+ <source>Enter the message you want to sign here</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+7"/>
+ <source>Signature</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+27"/>
+ <source>Copy the current signature to the system clipboard</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+21"/>
+ <source>Sign the message to prove you own this Bitcoin address</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Sign &amp;Message</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+14"/>
+ <source>Reset all sign message fields</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <location line="+146"/>
+ <source>Clear &amp;All</source>
+ <translation>&amp;Notīrīt visu</translation>
+ </message>
+ <message>
+ <location line="-87"/>
+ <source>&amp;Verify Message</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>Enter the signing address, message (ensure you copy line breaks, spaces, tabs, etc. exactly) and signature below to verify the message. Be careful not to read more into the signature than what is in the signed message itself, to avoid being tricked by a man-in-the-middle attack.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+21"/>
+ <source>The address the message was signed with (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+40"/>
+ <source>Verify the message to ensure it was signed with the specified Bitcoin address</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Verify &amp;Message</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+14"/>
+ <source>Reset all verify message fields</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../signverifymessagedialog.cpp" line="+27"/>
+ <location line="+3"/>
+ <source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
+ <translation>Ierakstiet Bitcoin adresi (piem. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation>
+ </message>
+ <message>
+ <location line="-2"/>
+ <source>Click &quot;Sign Message&quot; to generate signature</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Enter Bitcoin signature</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+82"/>
+ <location line="+81"/>
+ <source>The entered address is invalid.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-81"/>
+ <location line="+8"/>
+ <location line="+73"/>
+ <location line="+8"/>
+ <source>Please check the address and try again.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-81"/>
+ <location line="+81"/>
+ <source>The entered address does not refer to a key.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-73"/>
+ <source>Wallet unlock was cancelled.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+8"/>
+ <source>Private key for the entered address is not available.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+12"/>
+ <source>Message signing failed.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+5"/>
+ <source>Message signed.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+59"/>
+ <source>The signature could not be decoded.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+0"/>
+ <location line="+13"/>
+ <source>Please check the signature and try again.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>The signature did not match the message digest.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+7"/>
+ <source>Message verification failed.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+5"/>
+ <source>Message verified.</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
+ <name>TransactionDesc</name>
+ <message>
+ <location filename="../transactiondesc.cpp" line="+20"/>
+ <source>Open until %1</source>
+ <translation>Atvērts līdz %1</translation>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>%1/offline</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>%1/unconfirmed</source>
+ <translation>%1/neapstiprinÄtas</translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>%1 confirmations</source>
+ <translation>%1 apstiprinÄjumu</translation>
+ </message>
+ <message>
+ <location line="+18"/>
+ <source>Status</source>
+ <translation type="unfinished"/>
+ </message>
+ <message numerus="yes">
+ <location line="+7"/>
+ <source>, broadcast through %n node(s)</source>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>Date</source>
+ <translation>Datums</translation>
+ </message>
+ <message>
+ <location line="+7"/>
+ <source>Source</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>Generated</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+5"/>
+ <location line="+17"/>
+ <source>From</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <location line="+22"/>
+ <location line="+58"/>
+ <source>To</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-77"/>
+ <location line="+2"/>
+ <source>own address</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-2"/>
+ <source>label</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+37"/>
+ <location line="+12"/>
+ <location line="+45"/>
+ <location line="+17"/>
+ <location line="+30"/>
+ <source>Credit</source>
+ <translation type="unfinished"/>
+ </message>
+ <message numerus="yes">
+ <location line="-102"/>
+ <source>matures in %n more block(s)</source>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>not accepted</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+44"/>
+ <location line="+8"/>
+ <location line="+15"/>
+ <location line="+30"/>
+ <source>Debit</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-39"/>
+ <source>Transaction fee</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+16"/>
+ <source>Net amount</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>Message</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Comment</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Transaction ID</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Generated coins must mature 120 blocks before they can be spent. When you generated this block, it was broadcast to the network to be added to the block chain. If it fails to get into the chain, its state will change to &quot;not accepted&quot; and it won&apos;t be spendable. This may occasionally happen if another node generates a block within a few seconds of yours.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+7"/>
+ <source>Debug information</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+8"/>
+ <source>Transaction</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Inputs</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+23"/>
+ <source>Amount</source>
+ <translation>Daudzums</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>true</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>false</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-209"/>
+ <source>, has not been successfully broadcast yet</source>
+ <translation>, vēl nav veiksmīgi izziņots</translation>
+ </message>
+ <message numerus="yes">
+ <location line="-35"/>
+ <source>Open for %n more block(s)</source>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
+ <message>
+ <location line="+70"/>
+ <source>unknown</source>
+ <translation>nav zinÄms</translation>
+ </message>
+</context>
+<context>
+ <name>TransactionDescDialog</name>
+ <message>
+ <location filename="../forms/transactiondescdialog.ui" line="+14"/>
+ <source>Transaction details</source>
+ <translation>Transakcijas detaļas</translation>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>This pane shows a detailed description of the transaction</source>
+ <translation>Å is panelis parÄda transakcijas detaļas</translation>
+ </message>
+</context>
+<context>
+ <name>TransactionTableModel</name>
+ <message>
+ <location filename="../transactiontablemodel.cpp" line="+225"/>
+ <source>Date</source>
+ <translation>Datums</translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>Type</source>
+ <translation>Tips</translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>Address</source>
+ <translation>Adrese</translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>Amount</source>
+ <translation>Daudzums</translation>
+ </message>
+ <message numerus="yes">
+ <location line="+57"/>
+ <source>Open for %n more block(s)</source>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Open until %1</source>
+ <translation>Atvērts līdz %1</translation>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Offline (%1 confirmations)</source>
+ <translation>Nav pieslÄ“gts (%1 apstiprinÄjumu)</translation>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Unconfirmed (%1 of %2 confirmations)</source>
+ <translation>Nav apstiprinÄts (%1 no %2 apstiprinÄjumu)</translation>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Confirmed (%1 confirmations)</source>
+ <translation>ApstiprinÄts (%1 apstiprinÄjumu)</translation>
+ </message>
+ <message numerus="yes">
+ <location line="+8"/>
+ <source>Mined balance will be available when it matures in %n more block(s)</source>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
+ <message>
+ <location line="+5"/>
+ <source>This block was not received by any other nodes and will probably not be accepted!</source>
+ <translation>Neviens cits mezgls šo bloku nav saņēmis un droši vien netiks akceptēts!</translation>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Generated but not accepted</source>
+ <translation>Ä¢enerÄ“ts, taÄu nav akceptÄ“ts</translation>
+ </message>
+ <message>
+ <location line="+43"/>
+ <source>Received with</source>
+ <translation>Saņemts ar</translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Received from</source>
+ <translation>Saņemts no</translation>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Sent to</source>
+ <translation>Nosūtīts</translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Payment to yourself</source>
+ <translation>MaksÄjums sev</translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Mined</source>
+ <translation>Atrasts</translation>
+ </message>
+ <message>
+ <location line="+38"/>
+ <source>(n/a)</source>
+ <translation>(nav pieejams)</translation>
+ </message>
+ <message>
+ <location line="+199"/>
+ <source>Transaction status. Hover over this field to show number of confirmations.</source>
+ <translation>Transakcijas statuss. Turiet peli virs Å¡Ä« lauka, lai redzÄ“tu apstiprinÄjumu skaitu.</translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Date and time that the transaction was received.</source>
+ <translation>Transakcijas saņemšanas datums un laiks.</translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Type of transaction.</source>
+ <translation>Transakcijas tips.</translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Destination address of transaction.</source>
+ <translation>Transakcijas mērķa adrese.</translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Amount removed from or added to balance.</source>
+ <translation>Bilancei pievienotais vai atņemtais daudzums.</translation>
+ </message>
+</context>
+<context>
+ <name>TransactionView</name>
+ <message>
+ <location filename="../transactionview.cpp" line="+52"/>
+ <location line="+16"/>
+ <source>All</source>
+ <translation>Visi</translation>
+ </message>
+ <message>
+ <location line="-15"/>
+ <source>Today</source>
+ <translation>Å odien</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>This week</source>
+ <translation>Šonedēļ</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>This month</source>
+ <translation>Šomēnes</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Last month</source>
+ <translation>Pēdējais mēnesis</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>This year</source>
+ <translation>Å ogad</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Range...</source>
+ <translation>Diapazons...</translation>
+ </message>
+ <message>
+ <location line="+11"/>
+ <source>Received with</source>
+ <translation>Saņemts ar</translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Sent to</source>
+ <translation>Nosūtīts</translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>To yourself</source>
+ <translation>Sev</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Mined</source>
+ <translation>Atrasts</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Other</source>
+ <translation>Cits</translation>
+ </message>
+ <message>
+ <location line="+7"/>
+ <source>Enter address or label to search</source>
+ <translation>Ierakstiet meklējamo nosaukumu vai adresi</translation>
+ </message>
+ <message>
+ <location line="+7"/>
+ <source>Min amount</source>
+ <translation>MinimÄlais daudzums</translation>
+ </message>
+ <message>
+ <location line="+34"/>
+ <source>Copy address</source>
+ <translation>Kopēt adresi</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy label</source>
+ <translation>Kopēt nosaukumu</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy amount</source>
+ <translation>Kopēt daudzumu</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy transaction ID</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Edit label</source>
+ <translation>Mainīt nosaukumu</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Show transaction details</source>
+ <translation>RÄdÄ«t transakcijas detaļas</translation>
+ </message>
+ <message>
+ <location line="+139"/>
+ <source>Export Transaction Data</source>
+ <translation>Eksportēt transakcijas datus</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Comma separated file (*.csv)</source>
+ <translation>Fails ar komatu kÄ atdalÄ«tÄju (*.csv)</translation>
+ </message>
+ <message>
+ <location line="+8"/>
+ <source>Confirmed</source>
+ <translation>ApstiprinÄts</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Date</source>
+ <translation>Datums</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Type</source>
+ <translation>Tips</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Label</source>
+ <translation>Nosaukums</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Address</source>
+ <translation>Adrese</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Amount</source>
+ <translation>Daudzums</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>ID</source>
+ <translation>ID</translation>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>Error exporting</source>
+ <translation>Eksportēšanas kļūda</translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>Could not write to file %1.</source>
+ <translation>Nevar ierakstÄ«t failÄ %1.</translation>
+ </message>
+ <message>
+ <location line="+100"/>
+ <source>Range:</source>
+ <translation>Diapazons:</translation>
+ </message>
+ <message>
+ <location line="+8"/>
+ <source>to</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
+ <name>WalletView</name>
+ <message>
+ <location filename="../walletview.cpp" line="+95"/>
+ <source>&amp;Overview</source>
+ <translation>&amp;PÄrskats</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Show general overview of wallet</source>
+ <translation>RÄdÄ«t vispÄrÄ“ju maciņa pÄrskatu</translation>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>&amp;Send coins</source>
+ <translation>&amp;Sūtīt bitkoinus</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Send coins to a Bitcoin address</source>
+ <translation>Nosūtīt bitkoinus uz Bitcoin adresi</translation>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>&amp;Receive coins</source>
+ <translation>&amp;Saņemt bitkoinus</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Show the list of addresses for receiving payments</source>
+ <translation>RÄdÄ«t maksÄjumu saņemÅ¡anas adreses</translation>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>&amp;Transactions</source>
+ <translation>&amp;Transakcijas</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Browse transaction history</source>
+ <translation>Skatīt transakciju vēsturi</translation>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>&amp;Address Book</source>
+ <translation>&amp;AdreÅ¡u grÄmata</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Edit the list of stored addresses and labels</source>
+ <translation>Rediģēt saglabÄtÄs adreses un nosaukumus</translation>
+ </message>
+ <message>
+ <location line="+12"/>
+ <source>&amp;Encrypt Wallet...</source>
+ <translation>Š&amp;ifrēt maciņu...</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Encrypt the private keys that belong to your wallet</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>&amp;Backup Wallet...</source>
+ <translation>&amp;Izveidot maciņa rezerves kopiju</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Backup wallet to another location</source>
+ <translation>Izveidot maciņa rezerves kopiju citur</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>&amp;Change Passphrase...</source>
+ <translation>&amp;Mainīt paroli</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Change the passphrase used for wallet encryption</source>
+ <translation>Mainīt maciņa šifrēšanas paroli</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Sign &amp;message...</source>
+ <translation>Parakstīt &amp;ziņojumu...</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Sign messages with your Bitcoin addresses to prove you own them</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>&amp;Verify message...</source>
+ <translation>&amp;PÄrbaudÄ«t ziņojumu...</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Verify messages to ensure they were signed with specified Bitcoin addresses</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>&amp;Export...</source>
+ <translation>&amp;Eksportēt...</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Export the data in the current tab to a file</source>
+ <translation>Datus no tekoÅ¡Ä ieliktņa eksportÄ“t uz failu</translation>
+ </message>
+ <message>
+ <location line="+180"/>
+ <source>Backup Wallet</source>
+ <translation>Izveidot maciņa rezerves kopiju</translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>Wallet Data (*.dat)</source>
+ <translation>Maciņa dati (*.dat)</translation>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Backup Failed</source>
+ <translation>Rezerves kopÄ“Å¡ana neizdevÄs</translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>There was an error trying to save the wallet data to the new location.</source>
+ <translation>Kļūda, saglabÄjot maciņu jaunajÄ vietÄ.</translation>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>Backup Successful</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>The wallet data was successfully saved to the new location.</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
+ <name>bitcoin-core</name>
+ <message>
+ <location filename="../bitcoinstrings.cpp" line="+96"/>
+ <source>Bitcoin version</source>
+ <translation>Bitcoin versija</translation>
+ </message>
+ <message>
+ <location line="+98"/>
+ <source>Usage:</source>
+ <translation>Lietojums:</translation>
+ </message>
+ <message>
+ <location line="-24"/>
+ <source>Send command to -server or bitcoind</source>
+ <translation>Nosūtīt komantu uz -server vai bitcoind</translation>
+ </message>
+ <message>
+ <location line="-22"/>
+ <source>List commands</source>
+ <translation>Komandu saraksts</translation>
+ </message>
+ <message>
+ <location line="-10"/>
+ <source>Get help for a command</source>
+ <translation>Palīdzība par komandu</translation>
+ </message>
+ <message>
+ <location line="+21"/>
+ <source>Options:</source>
+ <translation>Iespējas:</translation>
+ </message>
+ <message>
+ <location line="+22"/>
+ <source>Specify configuration file (default: bitcoin.conf)</source>
+ <translation>NorÄdiet konfigurÄcijas failu (pÄ“c noklusÄ“Å¡anas: bitcoin.conf)</translation>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Specify pid file (default: bitcoind.pid)</source>
+ <translation>NorÄdiet pid failu (pÄ“c noklusÄ“Å¡anas: bitcoind.pid)</translation>
+ </message>
+ <message>
+ <location line="-47"/>
+ <source>Generate coins</source>
+ <translation>Bitkoinu ģenerēšana</translation>
+ </message>
+ <message>
+ <location line="-28"/>
+ <source>Don&apos;t generate coins</source>
+ <translation>Neģenerēt bitkoinus</translation>
+ </message>
+ <message>
+ <location line="+74"/>
+ <source>Specify data directory</source>
+ <translation>NorÄdiet datu direktoriju</translation>
+ </message>
+ <message>
+ <location line="-7"/>
+ <source>Set database cache size in megabytes (default: 25)</source>
+ <translation>UzstÄdiet datu bÄzes bufera izmÄ“ru megabaitos (pÄ“c noklusÄ“Å¡anas: 25)</translation>
+ </message>
+ <message>
+ <location line="-27"/>
+ <source>Listen for connections on &lt;port&gt; (default: 8333 or testnet: 18333)</source>
+ <translation>GaidÄ«t savienojumus portÄ &lt;port&gt; (pÄ“c noklusÄ“Å¡anas: 8333 vai testnet: 18333)</translation>
+ </message>
+ <message>
+ <location line="+5"/>
+ <source>Maintain at most &lt;n&gt; connections to peers (default: 125)</source>
+ <translation>Uzturēt līdz &lt;n&gt; savienojumiem ar citiem mezgliem(pēc noklusēšanas: 125)</translation>
+ </message>
+ <message>
+ <location line="-49"/>
+ <source>Connect to a node to retrieve peer addresses, and disconnect</source>
+ <translation>Pievienoties mezglam, lai iegūtu citu mezglu adreses, un atvienoties</translation>
+ </message>
+ <message>
+ <location line="+80"/>
+ <source>Specify your own public address</source>
+ <translation>NorÄdiet savu publisko adresi</translation>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Threshold for disconnecting misbehaving peers (default: 100)</source>
+ <translation>Slieksnis pÄrkÄpÄ“jmezglu atvienoÅ¡anai (pÄ“c noklusÄ“Å¡anas: 100)</translation>
+ </message>
+ <message>
+ <location line="-132"/>
+ <source>Number of seconds to keep misbehaving peers from reconnecting (default: 86400)</source>
+ <translation>Sekundes, cik ilgi atturÄ“t pÄrkÄpÄ“jmezglus no atkÄrtotas pievienoÅ¡anÄs (pÄ“c noklusÄ“Å¡anas: 86400)</translation>
+ </message>
+ <message>
+ <location line="-32"/>
+ <source>An error occurred while setting up the RPC port %u for listening on IPv4: %s</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+30"/>
+ <source>Listen for JSON-RPC connections on &lt;port&gt; (default: 8332 or testnet: 18332)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+36"/>
+ <source>Accept command line and JSON-RPC commands</source>
+ <translation>Pieņemt komandrindas un JSON-RPC komandas</translation>
+ </message>
+ <message>
+ <location line="+77"/>
+ <source>Run in the background as a daemon and accept commands</source>
+ <translation>DarbinÄt fonÄ kÄ servisu un pieņemt komandas</translation>
+ </message>
+ <message>
+ <location line="+32"/>
+ <source>Use the test network</source>
+ <translation>Izmantot testa tīklu</translation>
+ </message>
+ <message>
+ <location line="-108"/>
+ <source>Accept connections from outside (default: 1 if no -proxy or -connect)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-82"/>
+ <source>%s, you must set a rpcpassword in the configuration file:
+%s
+It is recommended you use the following random password:
+rpcuser=bitcoinrpc
+rpcpassword=%s
+(you do not need to remember this password)
+The username and password MUST NOT be the same.
+If the file does not exist, create it with owner-readable-only file permissions.
+It is also recommended to set alertnotify so you are notified of problems;
+for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.com
+</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+17"/>
+ <source>An error occurred while setting up the RPC port %u for listening on IPv6, falling back to IPv4: %s</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Bind to given address and always listen on it. Use [host]:port notation for IPv6</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Cannot obtain a lock on data directory %s. Bitcoin is probably already running.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Error initializing database environment %s! To recover, BACKUP THAT DIRECTORY, then remove everything from it except for wallet.dat.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Error: The transaction was rejected! This might happen if some of the coins in your wallet were already spent, such as if you used a copy of wallet.dat and coins were spent in the copy but not marked as spent here.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>Error: This transaction requires a transaction fee of at least %s because of its amount, complexity, or use of recently received funds!</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Execute command when a relevant alert is received (%s in cmd is replaced by message)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Execute command when a wallet transaction changes (%s in cmd is replaced by TxID)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+11"/>
+ <source>Set maximum size of high-priority/low-fee transactions in bytes (default: 27000)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Set the number of script verification threads (1-16, 0=auto, default: 0)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>This is a pre-release test build - use at your own risk - do not use for mining or merchant applications</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+5"/>
+ <source>Warning: -paytxfee is set very high! This is the transaction fee you will pay if you send a transaction.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Warning: Displayed transactions may not be correct! You may need to upgrade, or other nodes may need to upgrade.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Warning: Please check that your computer&apos;s date and time are correct! If your clock is wrong Bitcoin will not work properly.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Warning: error reading wallet.dat! All keys read correctly, but transaction data or address book entries might be missing or incorrect.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Warning: wallet.dat corrupt, data salvaged! Original wallet.dat saved as wallet.{timestamp}.bak in %s; if your balance or transactions are incorrect you should restore from a backup.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+14"/>
+ <source>Attempt to recover private keys from a corrupt wallet.dat</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Block creation options:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>Connect only to the specified node(s)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Corrupted block database detected</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Discover own IP address (default: 1 when listening and no -externalip)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Do you want to rebuild the block database now?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Error initializing block database</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Error initializing wallet database environment %s!</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Error loading block database</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>Error opening block database</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Error: Disk space is low!</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Error: Transaction creation failed!</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Error: Wallet locked, unable to create transaction!</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Error: system error: </source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Failed to listen on any port. Use -listen=0 if you want this.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Failed to read block info</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Failed to read block</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Failed to sync block index</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Failed to write block index</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Failed to write block info</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Failed to write block</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Failed to write file info</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Failed to write to coin database</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Failed to write transaction index</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Failed to write undo data</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Find peers using DNS lookup (default: 1 unless -connect)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>How many blocks to check at startup (default: 288, 0 = all)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>How thorough the block verification is (0-4, default: 3)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+24"/>
+ <source>Rebuild block chain index from current blk000??.dat files</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+37"/>
+ <source>Verifying blocks...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Verifying wallet...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-61"/>
+ <source>Imports blocks from external blk000??.dat file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Information</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Invalid -tor address: &apos;%s&apos;</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+8"/>
+ <source>Maintain a full transaction index (default: 0)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Maximum per-connection receive buffer, &lt;n&gt;*1000 bytes (default: 5000)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Maximum per-connection send buffer, &lt;n&gt;*1000 bytes (default: 1000)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Only accept block chain matching built-in checkpoints (default: 1)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Only connect to nodes in network &lt;net&gt; (IPv4, IPv6 or Tor)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Output extra debugging information. Implies all other -debug* options</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Output extra network debugging information</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Prepend debug output with timestamp</source>
+ <translation>Debug izvadei sÄkumÄ pievienot laika zÄ«mogu</translation>
+ </message>
+ <message>
+ <location line="+5"/>
+ <source>SSL options: (see the Bitcoin Wiki for SSL setup instructions)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Select the version of socks proxy to use (4-5, default: 5)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Send trace/debug info to console instead of debug.log file</source>
+ <translation>Debug/trace informÄciju izvadÄ«t konsolÄ“, nevis debug.log failÄ</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Send trace/debug info to debugger</source>
+ <translation>Debug/trace informÄciju izvadÄ«t debug programmai</translation>
+ </message>
+ <message>
+ <location line="+5"/>
+ <source>Set maximum block size in bytes (default: 250000)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Set minimum block size in bytes (default: 0)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Shrink debug.log file on client startup (default: 1 when no -debug)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Specify connection timeout in milliseconds (default: 5000)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>System error: </source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+10"/>
+ <source>Use UPnP to map the listening port (default: 0)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Use UPnP to map the listening port (default: 1 when listening)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Use proxy to reach tor hidden services (default: same as -proxy)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Username for JSON-RPC connections</source>
+ <translation>JSON-RPC savienojumu lietotÄjvÄrds</translation>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>Warning</source>
+ <translation>BrÄ«dinÄjums</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Warning: This version is obsolete, upgrade required!</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>You need to rebuild the databases using -reindex to change -txindex</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>wallet.dat corrupt, salvage failed</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-45"/>
+ <source>Password for JSON-RPC connections</source>
+ <translation>JSON-RPC savienojumu parole</translation>
+ </message>
+ <message>
+ <location line="-68"/>
+ <source>Allow JSON-RPC connections from specified IP address</source>
+ <translation>Atļaut JSON-RPC savienojumus no norÄdÄ«tÄs IP adreses</translation>
+ </message>
+ <message>
+ <location line="+77"/>
+ <source>Send commands to node running on &lt;ip&gt; (default: 127.0.0.1)</source>
+ <translation>Nosūtīt komandas mezglam, kas darbojas adresē &lt;ip&gt; (pēc noklusēšanas: 127.0.0.1)</translation>
+ </message>
+ <message>
+ <location line="-120"/>
+ <source>Execute command when the best block changes (%s in cmd is replaced by block hash)</source>
+ <translation>IzpildÄ«t komandu, kad labÄk atbilstoÅ¡ais bloks izmainÄs (%s cmd aizvieto ar bloka heÅ¡u)</translation>
+ </message>
+ <message>
+ <location line="+142"/>
+ <source>Upgrade wallet to latest format</source>
+ <translation>Atjaunot maciņa formÄtu uz jaunÄko</translation>
+ </message>
+ <message>
+ <location line="-16"/>
+ <source>Set key pool size to &lt;n&gt; (default: 100)</source>
+ <translation>UzstÄdÄ«t atslÄ“gu bufera izmÄ“ru uz &lt;n&gt; (pÄ“c noklusÄ“Å¡anas: 100)</translation>
+ </message>
+ <message>
+ <location line="-12"/>
+ <source>Rescan the block chain for missing wallet transactions</source>
+ <translation>AtkÄrtoti skanÄ“t bloku virkni, meklÄ“jot trÅ«kstoÅ¡Äs maciņa transakcijas</translation>
+ </message>
+ <message>
+ <location line="+30"/>
+ <source>Use OpenSSL (https) for JSON-RPC connections</source>
+ <translation>JSON-RPC savienojumiem izmantot OpenSSL (https)</translation>
+ </message>
+ <message>
+ <location line="-21"/>
+ <source>Server certificate file (default: server.cert)</source>
+ <translation>Servera sertifikÄta fails (pÄ“c noklusÄ“Å¡anas: server.cert)</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Server private key (default: server.pem)</source>
+ <translation>Servera privÄtÄ atslÄ“ga (pÄ“c noklusÄ“Å¡anas: server.pem)</translation>
+ </message>
+ <message>
+ <location line="-154"/>
+ <source>Acceptable ciphers (default: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH)</source>
+ <translation>Pieņemamie šifri (pēc noklusēšanas: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH)</translation>
+ </message>
+ <message>
+ <location line="+166"/>
+ <source>This help message</source>
+ <translation>Šis palīdzības paziņojums</translation>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Unable to bind to %s on this computer (bind returned error %d, %s)</source>
+ <translation>Nevar pievienoties pie %s Å¡ajÄ datorÄ (pievienoÅ¡anÄs atgrieza kļūdu %d, %s)</translation>
+ </message>
+ <message>
+ <location line="-86"/>
+ <source>Connect through socks proxy</source>
+ <translation>Savienoties caurs socks proxy</translation>
+ </message>
+ <message>
+ <location line="-11"/>
+ <source>Allow DNS lookups for -addnode, -seednode and -connect</source>
+ <translation>Atļaut DNS uzmeklēšanu priekš -addnode, -seednode un -connect</translation>
+ </message>
+ <message>
+ <location line="+57"/>
+ <source>Loading addresses...</source>
+ <translation>IelÄdÄ“ adreses...</translation>
+ </message>
+ <message>
+ <location line="-35"/>
+ <source>Error loading wallet.dat: Wallet corrupted</source>
+ <translation>Nevar ielÄdÄ“t wallet.dat: maciņš bojÄts</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Error loading wallet.dat: Wallet requires newer version of Bitcoin</source>
+ <translation>Nevar ielÄdÄ“t wallet.dat: maciņa atvÄ“rÅ¡anai nepiecieÅ¡ama jaunÄka Bitcoin versija</translation>
+ </message>
+ <message>
+ <location line="+87"/>
+ <source>Wallet needed to be rewritten: restart Bitcoin to complete</source>
+ <translation>Bija nepiecieÅ¡ams pÄrstartÄ“t maciņu: pabeigÅ¡anai pÄrstartÄ“jiet Bitcoin</translation>
+ </message>
+ <message>
+ <location line="-89"/>
+ <source>Error loading wallet.dat</source>
+ <translation>Kļūda ielÄdÄ“jot wallet.dat</translation>
+ </message>
+ <message>
+ <location line="+30"/>
+ <source>Invalid -proxy address: &apos;%s&apos;</source>
+ <translation>Nederīga -proxy adrese: &apos;%s&apos;</translation>
+ </message>
+ <message>
+ <location line="+48"/>
+ <source>Unknown network specified in -onlynet: &apos;%s&apos;</source>
+ <translation>-onlynet komandÄ norÄdÄ«ts nepazÄ«stams tÄ«kls: &apos;%s&apos;</translation>
+ </message>
+ <message>
+ <location line="-1"/>
+ <source>Unknown -socks proxy version requested: %i</source>
+ <translation>PieprasÄ«ta nezinÄma -socks proxy versija: %i</translation>
+ </message>
+ <message>
+ <location line="-91"/>
+ <source>Cannot resolve -bind address: &apos;%s&apos;</source>
+ <translation>Nevar uzmeklēt -bind adresi: &apos;%s&apos;</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Cannot resolve -externalip address: &apos;%s&apos;</source>
+ <translation>Nevar atrisinÄt -externalip adresi: &apos;%s&apos;</translation>
+ </message>
+ <message>
+ <location line="+45"/>
+ <source>Invalid amount for -paytxfee=&lt;amount&gt;: &apos;%s&apos;</source>
+ <translation>Nederīgs daudzums priekš -paytxfree=&lt;amount&gt;: &apos;%s&apos;</translation>
+ </message>
+ <message>
+ <location line="-24"/>
+ <source>Error: could not start node</source>
+ <translation>Kļūda: nevar iedarbinÄt mezglu</translation>
+ </message>
+ <message>
+ <location line="+25"/>
+ <source>Invalid amount</source>
+ <translation>Nederīgs daudzums</translation>
+ </message>
+ <message>
+ <location line="-4"/>
+ <source>Insufficient funds</source>
+ <translation>Nepietiek bitkoinu</translation>
+ </message>
+ <message>
+ <location line="+8"/>
+ <source>Loading block index...</source>
+ <translation>IelÄdÄ“ bloku indeksu...</translation>
+ </message>
+ <message>
+ <location line="-59"/>
+ <source>Add a node to connect to and attempt to keep the connection open</source>
+ <translation>Pievienot mezglu, kam pievienoties un turēt savienojumu atvērtu</translation>
+ </message>
+ <message>
+ <location line="-25"/>
+ <source>Unable to bind to %s on this computer. Bitcoin is probably already running.</source>
+ <translation>Nevar pievienoties %s uz šī datora. Bitcoin droši vien jau darbojas.</translation>
+ </message>
+ <message>
+ <location line="+68"/>
+ <source>Fee per KB to add to transactions you send</source>
+ <translation>Maksa par KB, ko pievienot nosÅ«tÄmajÄm transakcijÄm</translation>
+ </message>
+ <message>
+ <location line="+17"/>
+ <source>Loading wallet...</source>
+ <translation>IelÄdÄ“ maciņu...</translation>
+ </message>
+ <message>
+ <location line="-54"/>
+ <source>Cannot downgrade wallet</source>
+ <translation>Nevar maciņa formÄtu padarÄ«t vecÄku</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Cannot initialize keypool</source>
+ <translation>Nevar inicializēt atslēgu buferi</translation>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Cannot write default address</source>
+ <translation>Nevar ierakstīt adresi pēc noklusēšanas</translation>
+ </message>
+ <message>
+ <location line="+64"/>
+ <source>Rescanning...</source>
+ <translation>Skanēju no jauna...</translation>
+ </message>
+ <message>
+ <location line="-56"/>
+ <source>Done loading</source>
+ <translation>IelÄde pabeigta</translation>
+ </message>
+ <message>
+ <location line="+79"/>
+ <source>To use the %s option</source>
+ <translation>Izmantot opciju %s</translation>
+ </message>
+ <message>
+ <location line="-71"/>
+ <source>Error</source>
+ <translation>Kļūda</translation>
+ </message>
+ <message>
+ <location line="-33"/>
+ <source>You must set rpcpassword=&lt;password&gt; in the configuration file:
+%s
+If the file does not exist, create it with owner-readable-only file permissions.</source>
+ <translation>KonfigurÄcijas failÄ jÄuzstÄda rpcpassword=&lt;password&gt;:
+%s
+Ja fails neeksistē, izveidojiet to ar atļauju lasīšanai tikai īpašniekam.</translation>
+ </message>
+</context>
+</TS> \ No newline at end of file
diff --git a/src/qt/locale/bitcoin_nb.ts b/src/qt/locale/bitcoin_nb.ts
index 08cae8ce0e..445620598f 100644
--- a/src/qt/locale/bitcoin_nb.ts
+++ b/src/qt/locale/bitcoin_nb.ts
@@ -13,12 +13,7 @@
<translation>&lt;b&gt;Bitcoin&lt;/b&gt; versjon</translation>
</message>
<message>
- <location line="+41"/>
- <source>Copyright © 2009-2012 The Bitcoin developers</source>
- <translation>Copyright © 2009-2012 Bitcoin Utviklerne</translation>
- </message>
- <message>
- <location line="+13"/>
+ <location line="+57"/>
<source>
This is experimental software.
@@ -32,6 +27,16 @@ Distribuert under MIT/X11 programvarelisensen, se medfølgende fil COPYING eller
Dette produktet inneholder programvare utviklet av OpenSSL prosjektet for bruk i OpenSSL Toolkit (http://www.openssl.org/) og kryptografisk programvare skrevet av Eric Young (eay@cryptsoft.com) og UPnP programvare skrevet av Thomas Bernard.</translation>
</message>
+ <message>
+ <location filename="../aboutdialog.cpp" line="+17"/>
+ <source>Copyright</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>2009-%1 The Bitcoin developers</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>AddressBookPage</name>
@@ -106,17 +111,22 @@ Dette produktet inneholder programvare utviklet av OpenSSL prosjektet for bruk i
<translation>&amp;Slett</translation>
</message>
<message>
- <location filename="../addressbookpage.cpp" line="+65"/>
+ <location filename="../addressbookpage.cpp" line="+66"/>
<source>Copy &amp;Label</source>
<translation>Kopier &amp;Merkelapp</translation>
</message>
<message>
- <location line="+2"/>
+ <location line="+1"/>
<source>&amp;Edit</source>
<translation>&amp;Rediger</translation>
</message>
<message>
- <location line="+250"/>
+ <location line="+1"/>
+ <source>Send &amp;Coins</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+263"/>
<source>Export Address Book Data</source>
<translation>Eksporter adressebok</translation>
</message>
@@ -139,7 +149,7 @@ Dette produktet inneholder programvare utviklet av OpenSSL prosjektet for bruk i
<context>
<name>AddressTableModel</name>
<message>
- <location filename="../addresstablemodel.cpp" line="+142"/>
+ <location filename="../addresstablemodel.cpp" line="+144"/>
<source>Label</source>
<translation>Merkelapp</translation>
</message>
@@ -298,17 +308,17 @@ Dette produktet inneholder programvare utviklet av OpenSSL prosjektet for bruk i
<context>
<name>BitcoinGUI</name>
<message>
- <location filename="../bitcoingui.cpp" line="+267"/>
+ <location filename="../bitcoingui.cpp" line="+231"/>
<source>Sign &amp;message...</source>
<translation>Signer &amp;melding...</translation>
</message>
<message>
- <location line="+254"/>
+ <location line="+299"/>
<source>Synchronizing with network...</source>
<translation>Synkroniserer med nettverk...</translation>
</message>
<message>
- <location line="-322"/>
+ <location line="-367"/>
<source>&amp;Overview</source>
<translation>&amp;Oversikt</translation>
</message>
@@ -328,32 +338,17 @@ Dette produktet inneholder programvare utviklet av OpenSSL prosjektet for bruk i
<translation>Vis transaksjonshistorikk</translation>
</message>
<message>
- <location line="+6"/>
- <source>&amp;Address Book</source>
- <translation>&amp;Adressebok</translation>
- </message>
- <message>
- <location line="+1"/>
+ <location line="+7"/>
<source>Edit the list of stored addresses and labels</source>
<translation>Rediger listen over adresser og deres merkelapper</translation>
</message>
<message>
- <location line="-15"/>
- <source>&amp;Receive coins</source>
- <translation>&amp;Motta bitcoins</translation>
- </message>
- <message>
- <location line="+1"/>
+ <location line="-14"/>
<source>Show the list of addresses for receiving payments</source>
<translation>Vis listen over adresser for mottak av betalinger</translation>
</message>
<message>
- <location line="-8"/>
- <source>&amp;Send coins</source>
- <translation>&amp;Send bitcoins</translation>
- </message>
- <message>
- <location line="+39"/>
+ <location line="+31"/>
<source>E&amp;xit</source>
<translation>&amp;Avslutt</translation>
</message>
@@ -398,7 +393,7 @@ Dette produktet inneholder programvare utviklet av OpenSSL prosjektet for bruk i
<translation>&amp;Endre Adgangsfrase...</translation>
</message>
<message>
- <location line="+259"/>
+ <location line="+304"/>
<source>Importing blocks from disk...</source>
<translation type="unfinished"/>
</message>
@@ -407,13 +402,8 @@ Dette produktet inneholder programvare utviklet av OpenSSL prosjektet for bruk i
<source>Reindexing blocks on disk...</source>
<translation type="unfinished"/>
</message>
- <message numerus="yes">
- <location line="+10"/>
- <source>~%n block(s) remaining</source>
- <translation><numerusform>~%n blokk gjenstår</numerusform><numerusform>~%n blokker gjenstår</numerusform></translation>
- </message>
<message>
- <location line="-265"/>
+ <location line="-300"/>
<source>&amp;Export...</source>
<translation>&amp;Eksporter...</translation>
</message>
@@ -458,18 +448,33 @@ Dette produktet inneholder programvare utviklet av OpenSSL prosjektet for bruk i
<translation>&amp;Verifiser melding...</translation>
</message>
<message>
- <location line="-196"/>
- <location line="+538"/>
+ <location line="-162"/>
+ <location line="+540"/>
<source>Bitcoin</source>
<translation>Bitcoin</translation>
</message>
<message>
- <location line="-538"/>
+ <location line="-540"/>
<source>Wallet</source>
<translation>Lommebok</translation>
</message>
<message>
- <location line="+176"/>
+ <location line="+99"/>
+ <source>&amp;Send</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+7"/>
+ <source>&amp;Receive</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+14"/>
+ <source>&amp;Addresses</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+22"/>
<source>&amp;About Bitcoin</source>
<translation>&amp;Om Bitcoin</translation>
</message>
@@ -530,97 +535,92 @@ Dette produktet inneholder programvare utviklet av OpenSSL prosjektet for bruk i
<translation>[testnett]</translation>
</message>
<message>
- <location line="+63"/>
+ <location line="+47"/>
<source>Bitcoin client</source>
<translation>Bitcoinklient</translation>
</message>
<message numerus="yes">
- <location line="+79"/>
+ <location line="+140"/>
<source>%n active connection(s) to Bitcoin network</source>
<translation><numerusform>%n aktiv forbindelse til Bitcoin-nettverket</numerusform><numerusform>%n aktive forbindelser til Bitcoin-nettverket</numerusform></translation>
</message>
<message>
- <location line="+45"/>
- <source>Processed %1 of %2 blocks of transaction history (%3% done).</source>
+ <location line="+39"/>
+ <source>Processed %1 of %2 (estimated) blocks of transaction history.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+7"/>
+ <location line="+4"/>
<source>Processed %1 blocks of transaction history.</source>
<translation type="unfinished"/>
</message>
+ <message numerus="yes">
+ <location line="+20"/>
+ <source>%n hour(s)</source>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
+ <message numerus="yes">
+ <location line="+4"/>
+ <source>%n day(s)</source>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
+ <message numerus="yes">
+ <location line="+4"/>
+ <source>%n week(s)</source>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
<message>
- <location line="+70"/>
- <source>Error</source>
+ <location line="+5"/>
+ <source>%1 behind</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+3"/>
- <source>Warning</source>
+ <location line="+14"/>
+ <source>Last received block was generated %1 ago.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+3"/>
- <source>Information</source>
+ <location line="+2"/>
+ <source>Transactions after this will not yet be visible.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+66"/>
- <source>This transaction is over the size limit. You can still send it for a fee of %1, which goes to the nodes that process your transaction and helps to support the network. Do you want to pay the fee?</source>
+ <location line="+21"/>
+ <source>Error</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+210"/>
- <source>Backup Successful</source>
+ <location line="+3"/>
+ <source>Warning</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+0"/>
- <source>The wallet data was successfully saved to the new location.</source>
+ <location line="+3"/>
+ <source>Information</source>
<translation type="unfinished"/>
</message>
- <message numerus="yes">
- <location line="-338"/>
- <source>%n second(s) ago</source>
- <translation><numerusform>for %n sekund siden</numerusform><numerusform>for %n sekunder siden</numerusform></translation>
- </message>
- <message numerus="yes">
- <location line="+4"/>
- <source>%n minute(s) ago</source>
- <translation><numerusform>for %n minutt siden</numerusform><numerusform>for %n minutter siden</numerusform></translation>
- </message>
- <message numerus="yes">
- <location line="+4"/>
- <source>%n hour(s) ago</source>
- <translation><numerusform>for %n time siden</numerusform><numerusform>for %n timer siden</numerusform></translation>
- </message>
- <message numerus="yes">
- <location line="+4"/>
- <source>%n day(s) ago</source>
- <translation><numerusform>for %n dag siden</numerusform><numerusform>for %n dager siden</numerusform></translation>
+ <message>
+ <location line="+68"/>
+ <source>This transaction is over the size limit. You can still send it for a fee of %1, which goes to the nodes that process your transaction and helps to support the network. Do you want to pay the fee?</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location line="+6"/>
+ <location line="-138"/>
<source>Up to date</source>
<translation>Ajour</translation>
</message>
<message>
- <location line="+7"/>
+ <location line="+32"/>
<source>Catching up...</source>
<translation>Kommer ajour...</translation>
</message>
<message>
- <location line="+10"/>
- <source>Last received block was generated %1.</source>
- <translation>Siste mottatte blokk ble generert %1.</translation>
- </message>
- <message>
- <location line="+97"/>
+ <location line="+110"/>
<source>Confirm transaction fee</source>
<translation>Bekreft transaksjonsgebyr</translation>
</message>
<message>
- <location line="+23"/>
+ <location line="+8"/>
<source>Sent transaction</source>
<translation>Sendt transaksjon</translation>
</message>
@@ -643,14 +643,14 @@ Adresse: %4
</translation>
</message>
<message>
- <location line="+99"/>
- <location line="+28"/>
+ <location line="+33"/>
+ <location line="+23"/>
<source>URI handling</source>
<translation>URI håndtering</translation>
</message>
<message>
- <location line="-28"/>
- <location line="+28"/>
+ <location line="-23"/>
+ <location line="+23"/>
<source>URI can not be parsed! This can be caused by an invalid Bitcoin address or malformed URI parameters.</source>
<translation>URI kunne ikke tolkes! Dette kan forårsakes av en ugyldig Bitcoin-adresse eller feil i URI-parametere.</translation>
</message>
@@ -665,27 +665,7 @@ Adresse: %4
<translation>Lommeboken er &lt;b&gt;kryptert&lt;/b&gt; og for tiden &lt;b&gt;låst&lt;/b&gt;</translation>
</message>
<message>
- <location line="+23"/>
- <source>Backup Wallet</source>
- <translation>Sikkerhetskopiér Lommebok</translation>
- </message>
- <message>
- <location line="+0"/>
- <source>Wallet Data (*.dat)</source>
- <translation>Lommeboksdata (*.dat)</translation>
- </message>
- <message>
- <location line="+3"/>
- <source>Backup Failed</source>
- <translation>Sikkerhetskopiering feilet</translation>
- </message>
- <message>
- <location line="+0"/>
- <source>There was an error trying to save the wallet data to the new location.</source>
- <translation>En feil oppstod ved lagring av lommebok til nytt sted</translation>
- </message>
- <message>
- <location filename="../bitcoin.cpp" line="+109"/>
+ <location filename="../bitcoin.cpp" line="+108"/>
<source>A fatal error occurred. Bitcoin can no longer continue safely and will quit.</source>
<translation>En fatal feil har inntruffet. Det er ikke trygt å fortsette og Bitcoin må derfor avslutte.</translation>
</message>
@@ -693,7 +673,7 @@ Adresse: %4
<context>
<name>ClientModel</name>
<message>
- <location filename="../clientmodel.cpp" line="+86"/>
+ <location filename="../clientmodel.cpp" line="+96"/>
<source>Network Alert</source>
<translation>Nettverksvarsel</translation>
</message>
@@ -726,7 +706,7 @@ Adresse: %4
<translation>Adressen til denne oppføringen i adresseboken. Denne kan kun endres for utsendingsadresser.</translation>
</message>
<message>
- <location filename="../editaddressdialog.cpp" line="+20"/>
+ <location filename="../editaddressdialog.cpp" line="+21"/>
<source>New receiving address</source>
<translation>Ny mottaksadresse</translation>
</message>
@@ -746,17 +726,17 @@ Adresse: %4
<translation>Rediger utsendingsadresse</translation>
</message>
<message>
- <location line="+60"/>
+ <location line="+76"/>
<source>The entered address &quot;%1&quot; is already in the address book.</source>
<translation>Den oppgitte adressen &quot;%1&quot; er allerede i adresseboken.</translation>
</message>
<message>
- <location line="+5"/>
+ <location line="-5"/>
<source>The entered address &quot;%1&quot; is not a valid Bitcoin address.</source>
<translation>Den angitte adressed &quot;%1&quot; er ikke en gyldig Bitcoin-adresse.</translation>
</message>
<message>
- <location line="+5"/>
+ <location line="+10"/>
<source>Could not unlock wallet.</source>
<translation>Kunne ikke låse opp lommeboken.</translation>
</message>
@@ -769,7 +749,7 @@ Adresse: %4
<context>
<name>GUIUtil::HelpMessageBox</name>
<message>
- <location filename="../guiutil.cpp" line="+419"/>
+ <location filename="../guiutil.cpp" line="+422"/>
<location line="+12"/>
<source>Bitcoin-Qt</source>
<translation>Bitcoin-Qt</translation>
@@ -984,7 +964,7 @@ Adresse: %4
<translation>&amp;Bruk</translation>
</message>
<message>
- <location filename="../optionsdialog.cpp" line="+55"/>
+ <location filename="../optionsdialog.cpp" line="+53"/>
<source>default</source>
<translation>standardverdi</translation>
</message>
@@ -1029,23 +1009,18 @@ Adresse: %4
<translation>Skjema</translation>
</message>
<message>
- <location line="+51"/>
- <location line="+183"/>
+ <location line="+50"/>
+ <location line="+166"/>
<source>The displayed information may be out of date. Your wallet automatically synchronizes with the Bitcoin network after a connection is established, but this process has not completed yet.</source>
<translation>Informasjonen som vises kan være foreldet. Din lommebok synkroniseres automatisk med Bitcoin-nettverket etter at tilkobling er opprettet, men denne prosessen er ikke ferdig enda.</translation>
</message>
<message>
- <location line="-141"/>
+ <location line="-124"/>
<source>Balance:</source>
<translation>Saldo:</translation>
</message>
<message>
- <location line="+58"/>
- <source>Number of transactions:</source>
- <translation>Antall transaksjoner:</translation>
- </message>
- <message>
- <location line="-29"/>
+ <location line="+29"/>
<source>Unconfirmed:</source>
<translation>Ubekreftet</translation>
</message>
@@ -1055,7 +1030,7 @@ Adresse: %4
<translation>Lommebok</translation>
</message>
<message>
- <location line="+124"/>
+ <location line="+107"/>
<source>Immature:</source>
<translation>Umoden:</translation>
</message>
@@ -1070,7 +1045,7 @@ Adresse: %4
<translation>&lt;b&gt;Siste transaksjoner&lt;/b&gt;</translation>
</message>
<message>
- <location line="-118"/>
+ <location line="-101"/>
<source>Your current balance</source>
<translation>Din nåværende saldo</translation>
</message>
@@ -1080,11 +1055,6 @@ Adresse: %4
<translation>Totalt antall ubekreftede transaksjoner som ikke telles med i saldo enda</translation>
</message>
<message>
- <location line="+20"/>
- <source>Total number of transactions in wallet</source>
- <translation>Totalt antall transaksjoner i lommeboken</translation>
- </message>
- <message>
<location filename="../overviewpage.cpp" line="+115"/>
<location line="+1"/>
<source>out of sync</source>
@@ -1092,6 +1062,14 @@ Adresse: %4
</message>
</context>
<context>
+ <name>PaymentServer</name>
+ <message>
+ <location filename="../paymentserver.cpp" line="+107"/>
+ <source>Cannot start bitcoin: click-to-pay handler</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>QRCodeDialog</name>
<message>
<location filename="../forms/qrcodedialog.ui" line="+14"/>
@@ -1430,7 +1408,7 @@ Adresse: %4
</message>
<message>
<location line="+60"/>
- <location filename="../sendcoinsentry.cpp" line="+25"/>
+ <location filename="../sendcoinsentry.cpp" line="+26"/>
<source>Enter a label for this address to add it to your address book</source>
<translation>Skriv inn en merkelapp for denne adressen for å legge den til i din adressebok</translation>
</message>
@@ -1666,7 +1644,7 @@ Adresse: %4
<context>
<name>TransactionDesc</name>
<message>
- <location filename="../transactiondesc.cpp" line="+19"/>
+ <location filename="../transactiondesc.cpp" line="+20"/>
<source>Open until %1</source>
<translation>Ã…pen til %1</translation>
</message>
@@ -1853,7 +1831,7 @@ Adresse: %4
<context>
<name>TransactionTableModel</name>
<message>
- <location filename="../transactiontablemodel.cpp" line="+226"/>
+ <location filename="../transactiontablemodel.cpp" line="+225"/>
<source>Date</source>
<translation>Dato</translation>
</message>
@@ -1971,7 +1949,7 @@ Adresse: %4
<context>
<name>TransactionView</name>
<message>
- <location filename="../transactionview.cpp" line="+55"/>
+ <location filename="../transactionview.cpp" line="+52"/>
<location line="+16"/>
<source>All</source>
<translation>Alle</translation>
@@ -2058,6 +2036,11 @@ Adresse: %4
</message>
<message>
<location line="+1"/>
+ <source>Copy transaction ID</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Edit label</source>
<translation>Rediger merkelapp</translation>
</message>
@@ -2067,7 +2050,7 @@ Adresse: %4
<translation>Vis transaksjonsdetaljer</translation>
</message>
<message>
- <location line="+142"/>
+ <location line="+139"/>
<source>Export Transaction Data</source>
<translation>Eksporter transaksjonsdata</translation>
</message>
@@ -2122,7 +2105,7 @@ Adresse: %4
<translation>Kunne ikke skrive til filen %1.</translation>
</message>
<message>
- <location line="+95"/>
+ <location line="+100"/>
<source>Range:</source>
<translation>Intervall:</translation>
</message>
@@ -2133,29 +2116,172 @@ Adresse: %4
</message>
</context>
<context>
+ <name>WalletView</name>
+ <message>
+ <location filename="../walletview.cpp" line="+95"/>
+ <source>&amp;Overview</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Show general overview of wallet</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>&amp;Send coins</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Send coins to a Bitcoin address</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>&amp;Receive coins</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Show the list of addresses for receiving payments</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>&amp;Transactions</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Browse transaction history</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>&amp;Address Book</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Edit the list of stored addresses and labels</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+12"/>
+ <source>&amp;Encrypt Wallet...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Encrypt the private keys that belong to your wallet</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>&amp;Backup Wallet...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Backup wallet to another location</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>&amp;Change Passphrase...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Change the passphrase used for wallet encryption</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Sign &amp;message...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Sign messages with your Bitcoin addresses to prove you own them</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>&amp;Verify message...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Verify messages to ensure they were signed with specified Bitcoin addresses</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>&amp;Export...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Export the data in the current tab to a file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+180"/>
+ <source>Backup Wallet</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>Wallet Data (*.dat)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Backup Failed</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>There was an error trying to save the wallet data to the new location.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>Backup Successful</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>The wallet data was successfully saved to the new location.</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>bitcoin-core</name>
<message>
- <location filename="../bitcoinstrings.cpp" line="+88"/>
+ <location filename="../bitcoinstrings.cpp" line="+96"/>
<source>Bitcoin version</source>
<translation>Bitcoin versjon</translation>
</message>
<message>
- <location line="+82"/>
+ <location line="+98"/>
<source>Usage:</source>
<translation>Bruk:</translation>
</message>
<message>
- <location line="-23"/>
+ <location line="-24"/>
<source>Send command to -server or bitcoind</source>
<translation>Send kommando til -server eller bitcoind</translation>
</message>
<message>
- <location line="-21"/>
+ <location line="-22"/>
<source>List commands</source>
<translation>List opp kommandoer</translation>
</message>
<message>
- <location line="-11"/>
+ <location line="-10"/>
<source>Get help for a command</source>
<translation>Vis hjelpetekst for en kommando</translation>
</message>
@@ -2180,12 +2306,12 @@ Adresse: %4
<translation>Generér bitcoins</translation>
</message>
<message>
- <location line="-15"/>
+ <location line="-28"/>
<source>Don&apos;t generate coins</source>
<translation>Ikke generér bitcoins</translation>
</message>
<message>
- <location line="+61"/>
+ <location line="+74"/>
<source>Specify data directory</source>
<translation>Angi mappe for datafiler</translation>
</message>
@@ -2195,80 +2321,82 @@ Adresse: %4
<translation>Sett størrelse på mellomlager for database i megabytes (standardverdi: 25)</translation>
</message>
<message>
- <location line="-26"/>
+ <location line="-27"/>
<source>Listen for connections on &lt;port&gt; (default: 8333 or testnet: 18333)</source>
<translation>Lytt etter tilkoblinger på &lt;port&gt; (standardverdi: 8333 eller testnet: 18333)</translation>
</message>
<message>
- <location line="+4"/>
+ <location line="+5"/>
<source>Maintain at most &lt;n&gt; connections to peers (default: 125)</source>
<translation>Hold maks &lt;n&gt; koblinger åpne til andre noder (standardverdi: 125)</translation>
</message>
<message>
- <location line="-34"/>
+ <location line="-49"/>
<source>Connect to a node to retrieve peer addresses, and disconnect</source>
<translation>Koble til node for å hente adresser til andre noder, koble så fra igjen</translation>
</message>
<message>
- <location line="+65"/>
+ <location line="+80"/>
<source>Specify your own public address</source>
<translation>Angi din egen offentlige adresse</translation>
</message>
<message>
- <location line="+2"/>
+ <location line="+3"/>
<source>Threshold for disconnecting misbehaving peers (default: 100)</source>
<translation>Grenseverdi for å koble fra noder med dårlig oppførsel (standardverdi: 100)</translation>
</message>
<message>
- <location line="-114"/>
+ <location line="-132"/>
<source>Number of seconds to keep misbehaving peers from reconnecting (default: 86400)</source>
<translation>Antall sekunder noder med dårlig oppførsel hindres fra å koble til på nytt (standardverdi: 86400)</translation>
</message>
<message>
- <location line="-28"/>
+ <location line="-32"/>
<source>An error occurred while setting up the RPC port %u for listening on IPv4: %s</source>
<translation>En feil oppstod ved opprettelse av RPC port %u for lytting: %s</translation>
</message>
<message>
- <location line="+26"/>
+ <location line="+30"/>
<source>Listen for JSON-RPC connections on &lt;port&gt; (default: 8332 or testnet: 18332)</source>
<translation>Lytt etter JSON-RPC tilkoblinger på &lt;port&gt; (standardverdi: 8332 or testnet: 18332)</translation>
</message>
<message>
- <location line="+34"/>
+ <location line="+36"/>
<source>Accept command line and JSON-RPC commands</source>
<translation>Ta imot kommandolinje- og JSON-RPC-kommandoer</translation>
</message>
<message>
- <location line="+62"/>
+ <location line="+77"/>
<source>Run in the background as a daemon and accept commands</source>
<translation>Kjør i bakgrunnen som daemon og ta imot kommandoer</translation>
</message>
<message>
- <location line="+31"/>
+ <location line="+32"/>
<source>Use the test network</source>
<translation>Bruk testnettverket</translation>
</message>
<message>
- <location line="-92"/>
+ <location line="-108"/>
<source>Accept connections from outside (default: 1 if no -proxy or -connect)</source>
<translation>Ta imot tilkoblinger fra utsiden (standardverdi: 1 hvis uten -proxy eller -connect)</translation>
</message>
<message>
- <location line="-74"/>
+ <location line="-82"/>
<source>%s, you must set a rpcpassword in the configuration file:
- %s
+%s
It is recommended you use the following random password:
rpcuser=bitcoinrpc
rpcpassword=%s
(you do not need to remember this password)
The username and password MUST NOT be the same.
If the file does not exist, create it with owner-readable-only file permissions.
+It is also recommended to set alertnotify so you are notified of problems;
+for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.com
</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+15"/>
+ <location line="+17"/>
<source>An error occurred while setting up the RPC port %u for listening on IPv6, falling back to IPv4: %s</source>
<translation type="unfinished"/>
</message>
@@ -2284,11 +2412,6 @@ If the file does not exist, create it with owner-readable-only file permissions.
</message>
<message>
<location line="+3"/>
- <source>Corrupted block database detected. Please restart the client with -reindex.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+2"/>
<source>Error initializing database environment %s! To recover, BACKUP THAT DIRECTORY, then remove everything from it except for wallet.dat.</source>
<translation type="unfinished"/>
</message>
@@ -2303,12 +2426,27 @@ If the file does not exist, create it with owner-readable-only file permissions.
<translation type="unfinished"/>
</message>
<message>
+ <location line="+3"/>
+ <source>Execute command when a relevant alert is received (%s in cmd is replaced by message)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Execute command when a wallet transaction changes (%s in cmd is replaced by TxID)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location line="+11"/>
<source>Set maximum size of high-priority/low-fee transactions in bytes (default: 27000)</source>
<translation>Sett maks størrelse for transaksjoner med høy prioritet / lavt gebyr, i bytes (standardverdi: 27000)</translation>
</message>
<message>
<location line="+3"/>
+ <source>Set the number of script verification threads (1-16, 0=auto, default: 0)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
<source>This is a pre-release test build - use at your own risk - do not use for mining or merchant applications</source>
<translation type="unfinished"/>
</message>
@@ -2354,16 +2492,41 @@ If the file does not exist, create it with owner-readable-only file permissions.
</message>
<message>
<location line="+3"/>
+ <source>Corrupted block database detected</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Discover own IP address (default: 1 when listening and no -externalip)</source>
<translation>Oppdag egen IP-adresse (standardverdi: 1 ved lytting og uten -externalip)</translation>
</message>
<message>
+ <location line="+1"/>
+ <source>Do you want to rebuild the block database now?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location line="+3"/>
+ <source>Error initializing block database</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Error initializing wallet database environment %s!</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Error loading block database</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+5"/>
+ <location line="+4"/>
+ <source>Error opening block database</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
<source>Error: Disk space is low!</source>
<translation type="unfinished"/>
</message>
@@ -2379,26 +2542,96 @@ If the file does not exist, create it with owner-readable-only file permissions.
</message>
<message>
<location line="+2"/>
+ <source>Error: system error: </source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Failed to listen on any port. Use -listen=0 if you want this.</source>
<translation>Kunne ikke lytte på noen port. Bruk -listen=0 hvis det er dette du vil.</translation>
</message>
<message>
+ <location line="+1"/>
+ <source>Failed to read block info</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Failed to read block</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Failed to sync block index</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Failed to write block index</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Failed to write block info</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Failed to write block</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Failed to write file info</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Failed to write to coin database</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Failed to write transaction index</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Failed to write undo data</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location line="+2"/>
<source>Find peers using DNS lookup (default: 1 unless -connect)</source>
<translation>Finn andre noder gjennom DNS-oppslag (standardverdi: 1 med mindre -connect er oppgit)</translation>
</message>
<message>
- <location line="+5"/>
- <source>How thorough the block verification is (0-4, default: 3)</source>
+ <location line="+3"/>
+ <source>How many blocks to check at startup (default: 288, 0 = all)</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+1"/>
- <source>Importing blocks from block database...</source>
+ <source>How thorough the block verification is (0-4, default: 3)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+24"/>
+ <source>Rebuild block chain index from current blk000??.dat files</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+37"/>
+ <source>Verifying blocks...</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+1"/>
+ <source>Verifying wallet...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-61"/>
<source>Imports blocks from external blk000??.dat file</source>
<translation type="unfinished"/>
</message>
@@ -2413,7 +2646,12 @@ If the file does not exist, create it with owner-readable-only file permissions.
<translation>Ugyldig -tor adresse: &apos;%s&apos;</translation>
</message>
<message>
- <location line="+9"/>
+ <location line="+8"/>
+ <source>Maintain a full transaction index (default: 0)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
<source>Maximum per-connection receive buffer, &lt;n&gt;*1000 bytes (default: 5000)</source>
<translation>Maks mottaksbuffer per forbindelse, &lt;n&gt;*1000 bytes (standardverdi: 5000)</translation>
</message>
@@ -2448,12 +2686,7 @@ If the file does not exist, create it with owner-readable-only file permissions.
<translation>Sett tidsstempel på debugmeldinger</translation>
</message>
<message>
- <location line="+1"/>
- <source>Rebuild blockchain index from current blk000??.dat files</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+4"/>
+ <location line="+5"/>
<source>SSL options: (see the Bitcoin Wiki for SSL setup instructions)</source>
<translation>SSL valg: (se Bitcoin Wiki for instruksjoner for oppsett av SSL)</translation>
</message>
@@ -2493,7 +2726,12 @@ If the file does not exist, create it with owner-readable-only file permissions.
<translation>Angi tidsavbrudd for forbindelse i millisekunder (standardverdi: 5000)</translation>
</message>
<message>
- <location line="+13"/>
+ <location line="+4"/>
+ <source>System error: </source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+10"/>
<source>Use UPnP to map the listening port (default: 0)</source>
<translation>Bruk UPnP for lytteport (standardverdi: 0)</translation>
</message>
@@ -2524,36 +2762,41 @@ If the file does not exist, create it with owner-readable-only file permissions.
</message>
<message>
<location line="+1"/>
+ <source>You need to rebuild the databases using -reindex to change -txindex</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>wallet.dat corrupt, salvage failed</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-43"/>
+ <location line="-45"/>
<source>Password for JSON-RPC connections</source>
<translation>Passord for JSON-RPC forbindelser</translation>
</message>
<message>
- <location line="-53"/>
+ <location line="-68"/>
<source>Allow JSON-RPC connections from specified IP address</source>
<translation>Tillat JSON-RPC tilkoblinger fra angitt IP-adresse</translation>
</message>
<message>
- <location line="+62"/>
+ <location line="+77"/>
<source>Send commands to node running on &lt;ip&gt; (default: 127.0.0.1)</source>
<translation>Send kommandoer til node på &lt;ip&gt; (standardverdi: 127.0.0.1)</translation>
</message>
<message>
- <location line="-103"/>
+ <location line="-120"/>
<source>Execute command when the best block changes (%s in cmd is replaced by block hash)</source>
<translation>Eksekvér kommando når beste blokk endrer seg (%s i kommandoen erstattes med blokkens hash)</translation>
</message>
<message>
- <location line="+124"/>
+ <location line="+142"/>
<source>Upgrade wallet to latest format</source>
<translation>Oppgradér lommebok til nyeste format</translation>
</message>
<message>
- <location line="-15"/>
+ <location line="-16"/>
<source>Set key pool size to &lt;n&gt; (default: 100)</source>
<translation>Angi størrelse på nøkkel-lager til &lt;n&gt; (standardverdi: 100)</translation>
</message>
@@ -2563,17 +2806,12 @@ If the file does not exist, create it with owner-readable-only file permissions.
<translation>Se gjennom blokk-kjeden etter manglende lommeboktransaksjoner</translation>
</message>
<message>
- <location line="-26"/>
- <source>How many blocks to check at startup (default: 2500, 0 = all)</source>
- <translation>Hvor mange blokker som skal sjekkes ved oppstart (standardverdi: 2500, 0 = alle)</translation>
- </message>
- <message>
- <location line="+55"/>
+ <location line="+30"/>
<source>Use OpenSSL (https) for JSON-RPC connections</source>
<translation>Bruk OpenSSL (https) for JSON-RPC forbindelser</translation>
</message>
<message>
- <location line="-20"/>
+ <location line="-21"/>
<source>Server certificate file (default: server.cert)</source>
<translation>Servers sertifikat (standardverdi: server.cert)</translation>
</message>
@@ -2583,12 +2821,12 @@ If the file does not exist, create it with owner-readable-only file permissions.
<translation>Servers private nøkkel (standardverdi: server.pem)</translation>
</message>
<message>
- <location line="-133"/>
+ <location line="-154"/>
<source>Acceptable ciphers (default: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH)</source>
<translation>Akseptable krypteringsmetoder (standardverdi: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH)</translation>
</message>
<message>
- <location line="+144"/>
+ <location line="+166"/>
<source>This help message</source>
<translation>Denne hjelpemeldingen</translation>
</message>
@@ -2598,7 +2836,7 @@ If the file does not exist, create it with owner-readable-only file permissions.
<translation>Kan ikke binde til %s på denne datamaskinen (bind returnerte feil %d, %s)</translation>
</message>
<message>
- <location line="-70"/>
+ <location line="-86"/>
<source>Connect through socks proxy</source>
<translation>Koble til gjennom socks proxy</translation>
</message>
@@ -2608,12 +2846,12 @@ If the file does not exist, create it with owner-readable-only file permissions.
<translation>Tillat DNS oppslag for -addnode, -seednode og -connect</translation>
</message>
<message>
- <location line="+43"/>
+ <location line="+57"/>
<source>Loading addresses...</source>
<translation>Laster adresser...</translation>
</message>
<message>
- <location line="-25"/>
+ <location line="-35"/>
<source>Error loading wallet.dat: Wallet corrupted</source>
<translation>Feil ved lasting av wallet.dat: Lommeboken er skadet</translation>
</message>
@@ -2623,32 +2861,22 @@ If the file does not exist, create it with owner-readable-only file permissions.
<translation>Feil ved lasting av wallet.dat: Lommeboken krever en nyere versjon av Bitcoin</translation>
</message>
<message>
- <location line="+73"/>
- <source>Verifying block database integrity...</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+1"/>
- <source>Verifying wallet integrity...</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+1"/>
+ <location line="+87"/>
<source>Wallet needed to be rewritten: restart Bitcoin to complete</source>
<translation>Lommeboken måtte skrives om: start Bitcoin på nytt for å fullføre</translation>
</message>
<message>
- <location line="-77"/>
+ <location line="-89"/>
<source>Error loading wallet.dat</source>
<translation>Feil ved lasting av wallet.dat</translation>
</message>
<message>
- <location line="+20"/>
+ <location line="+30"/>
<source>Invalid -proxy address: &apos;%s&apos;</source>
<translation>Ugyldig -proxy adresse: &apos;%s&apos;</translation>
</message>
<message>
- <location line="+46"/>
+ <location line="+48"/>
<source>Unknown network specified in -onlynet: &apos;%s&apos;</source>
<translation>Ukjent nettverk angitt i -onlynet &apos;%s&apos;</translation>
</message>
@@ -2658,7 +2886,7 @@ If the file does not exist, create it with owner-readable-only file permissions.
<translation>Ukjent -socks proxy versjon angitt: %i</translation>
</message>
<message>
- <location line="-75"/>
+ <location line="-91"/>
<source>Cannot resolve -bind address: &apos;%s&apos;</source>
<translation>Kunne ikke slå opp -bind adresse: &apos;%s&apos;</translation>
</message>
@@ -2668,17 +2896,17 @@ If the file does not exist, create it with owner-readable-only file permissions.
<translation>Kunne ikke slå opp -externalip adresse: &apos;%s&apos;</translation>
</message>
<message>
- <location line="+31"/>
+ <location line="+45"/>
<source>Invalid amount for -paytxfee=&lt;amount&gt;: &apos;%s&apos;</source>
<translation>Ugyldig beløp for -paytxfee=&lt;beløp&gt;: &apos;%s&apos;</translation>
</message>
<message>
- <location line="-15"/>
+ <location line="-24"/>
<source>Error: could not start node</source>
<translation>Feil: kunne ikke starte node</translation>
</message>
<message>
- <location line="+16"/>
+ <location line="+25"/>
<source>Invalid amount</source>
<translation>Ugyldig beløp</translation>
</message>
@@ -2693,7 +2921,7 @@ If the file does not exist, create it with owner-readable-only file permissions.
<translation>Laster blokkindeks...</translation>
</message>
<message>
- <location line="-45"/>
+ <location line="-59"/>
<source>Add a node to connect to and attempt to keep the connection open</source>
<translation>Legg til node for tilkobling og hold forbindelsen åpen</translation>
</message>
@@ -2703,22 +2931,17 @@ If the file does not exist, create it with owner-readable-only file permissions.
<translation>Kan ikke binde til %s på denne datamaskinen. Sannsynligvis kjører Bitcoin allerede.</translation>
</message>
<message>
- <location line="+54"/>
- <source>Find peers using internet relay chat (default: 0)</source>
- <translation>Finn andre noder via internet relay chat (standardverdi: 0)</translation>
- </message>
- <message>
- <location line="-2"/>
+ <location line="+68"/>
<source>Fee per KB to add to transactions you send</source>
<translation>Gebyr per KB for transaksjoner du sender</translation>
</message>
<message>
- <location line="+19"/>
+ <location line="+17"/>
<source>Loading wallet...</source>
<translation>Laster lommebok...</translation>
</message>
<message>
- <location line="-40"/>
+ <location line="-54"/>
<source>Cannot downgrade wallet</source>
<translation>Kan ikke nedgradere lommebok</translation>
</message>
@@ -2733,27 +2956,27 @@ If the file does not exist, create it with owner-readable-only file permissions.
<translation>Kan ikke skrive standardadresse</translation>
</message>
<message>
- <location line="+49"/>
+ <location line="+64"/>
<source>Rescanning...</source>
<translation>Leser gjennom...</translation>
</message>
<message>
- <location line="-43"/>
+ <location line="-56"/>
<source>Done loading</source>
<translation>Ferdig med lasting</translation>
</message>
<message>
- <location line="+65"/>
+ <location line="+79"/>
<source>To use the %s option</source>
<translation>For å bruke %s opsjonen</translation>
</message>
<message>
- <location line="-60"/>
+ <location line="-71"/>
<source>Error</source>
<translation>Feil</translation>
</message>
<message>
- <location line="-28"/>
+ <location line="-33"/>
<source>You must set rpcpassword=&lt;password&gt; in the configuration file:
%s
If the file does not exist, create it with owner-readable-only file permissions.</source>
diff --git a/src/qt/locale/bitcoin_nl.ts b/src/qt/locale/bitcoin_nl.ts
index 26883a86ff..99c8820d01 100644
--- a/src/qt/locale/bitcoin_nl.ts
+++ b/src/qt/locale/bitcoin_nl.ts
@@ -5,8 +5,7 @@
<message>
<location filename="../forms/aboutdialog.ui" line="+14"/>
<source>About Bitcoin</source>
- <translation>Over Bitcoin
-</translation>
+ <translation>Over Bitcoin</translation>
</message>
<message>
<location line="+39"/>
@@ -14,12 +13,7 @@
<translation>&lt;b&gt;Bitcoin&lt;/b&gt; versie</translation>
</message>
<message>
- <location line="+41"/>
- <source>Copyright © 2009-2012 The Bitcoin developers</source>
- <translation>Copyright © 2009-2012 The Bitcoin Ontwikkelaars</translation>
- </message>
- <message>
- <location line="+13"/>
+ <location line="+57"/>
<source>
This is experimental software.
@@ -33,6 +27,16 @@ Gedistribueerd onder de MIT/X11 software licentie, zie het bijgevoegde bestand C
Dit product bevat software ontwikkeld door het OpenSSL Project voor gebruik in de OpenSSL Toolkit (http://www.openssl.org/) en cryptografische software gemaakt door Eric Young (eay@cryptsoft.com) en UPnP software geschreven door Thomas Bernard.</translation>
</message>
+ <message>
+ <location filename="../aboutdialog.cpp" line="+17"/>
+ <source>Copyright</source>
+ <translation>Auteursrecht</translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>2009-%1 The Bitcoin developers</source>
+ <translation>2009-%1 De Bitcoinontwikkelaars</translation>
+ </message>
</context>
<context>
<name>AddressBookPage</name>
@@ -107,17 +111,22 @@ Dit product bevat software ontwikkeld door het OpenSSL Project voor gebruik in d
<translation>&amp;Verwijder</translation>
</message>
<message>
- <location filename="../addressbookpage.cpp" line="+65"/>
+ <location filename="../addressbookpage.cpp" line="+66"/>
<source>Copy &amp;Label</source>
<translation>Kopiëer &amp;Label</translation>
</message>
<message>
- <location line="+2"/>
+ <location line="+1"/>
<source>&amp;Edit</source>
<translation>&amp;Bewerk</translation>
</message>
<message>
- <location line="+250"/>
+ <location line="+1"/>
+ <source>Send &amp;Coins</source>
+ <translation>Verstuur &amp;Coins</translation>
+ </message>
+ <message>
+ <location line="+263"/>
<source>Export Address Book Data</source>
<translation>Exporteer Gegevens van het Adresboek</translation>
</message>
@@ -140,7 +149,7 @@ Dit product bevat software ontwikkeld door het OpenSSL Project voor gebruik in d
<context>
<name>AddressTableModel</name>
<message>
- <location filename="../addresstablemodel.cpp" line="+142"/>
+ <location filename="../addresstablemodel.cpp" line="+144"/>
<source>Label</source>
<translation>Label</translation>
</message>
@@ -170,7 +179,7 @@ Dit product bevat software ontwikkeld door het OpenSSL Project voor gebruik in d
<message>
<location line="+14"/>
<source>New passphrase</source>
- <translation>Nieuwe wachtwoord</translation>
+ <translation>Nieuw wachtwoord</translation>
</message>
<message>
<location line="+14"/>
@@ -265,7 +274,7 @@ Dit product bevat software ontwikkeld door het OpenSSL Project voor gebruik in d
<message>
<location line="-54"/>
<source>Wallet encryption failed due to an internal error. Your wallet was not encrypted.</source>
- <translation>Portemonneeversleuteling mislukt door een interne fout, Uw portemonnee is niet versleuteld.</translation>
+ <translation>Portemonneeversleuteling mislukt door een interne fout. Uw portemonnee is niet versleuteld.</translation>
</message>
<message>
<location line="+7"/>
@@ -299,17 +308,17 @@ Dit product bevat software ontwikkeld door het OpenSSL Project voor gebruik in d
<context>
<name>BitcoinGUI</name>
<message>
- <location filename="../bitcoingui.cpp" line="+267"/>
+ <location filename="../bitcoingui.cpp" line="+231"/>
<source>Sign &amp;message...</source>
<translation>&amp;Onderteken bericht...</translation>
</message>
<message>
- <location line="+254"/>
+ <location line="+299"/>
<source>Synchronizing with network...</source>
<translation>Synchroniseren met netwerk...</translation>
</message>
<message>
- <location line="-322"/>
+ <location line="-367"/>
<source>&amp;Overview</source>
<translation>&amp;Overzicht</translation>
</message>
@@ -329,32 +338,17 @@ Dit product bevat software ontwikkeld door het OpenSSL Project voor gebruik in d
<translation>Blader door transactieverleden</translation>
</message>
<message>
- <location line="+6"/>
- <source>&amp;Address Book</source>
- <translation>&amp;Adresboek</translation>
- </message>
- <message>
- <location line="+1"/>
+ <location line="+7"/>
<source>Edit the list of stored addresses and labels</source>
<translation>Bewerk de lijst van opgeslagen adressen en labels</translation>
</message>
<message>
- <location line="-15"/>
- <source>&amp;Receive coins</source>
- <translation>&amp;Ontvang munten</translation>
- </message>
- <message>
- <location line="+1"/>
+ <location line="-14"/>
<source>Show the list of addresses for receiving payments</source>
<translation>Toon lijst van adressen om betalingen mee te ontvangen</translation>
</message>
<message>
- <location line="-8"/>
- <source>&amp;Send coins</source>
- <translation>&amp;Verstuur munten</translation>
- </message>
- <message>
- <location line="+39"/>
+ <location line="+31"/>
<source>E&amp;xit</source>
<translation>&amp;Afsluiten</translation>
</message>
@@ -399,7 +393,7 @@ Dit product bevat software ontwikkeld door het OpenSSL Project voor gebruik in d
<translation>&amp;Wijzig Wachtwoord</translation>
</message>
<message>
- <location line="+259"/>
+ <location line="+304"/>
<source>Importing blocks from disk...</source>
<translation>Blokken aan het importeren vanaf harde schijf...</translation>
</message>
@@ -408,13 +402,8 @@ Dit product bevat software ontwikkeld door het OpenSSL Project voor gebruik in d
<source>Reindexing blocks on disk...</source>
<translation>Bezig met herindexeren van blokken op harde schijf...</translation>
</message>
- <message numerus="yes">
- <location line="+10"/>
- <source>~%n block(s) remaining</source>
- <translation><numerusform>~%n blok resterend</numerusform><numerusform>~%n blokken resterend</numerusform></translation>
- </message>
<message>
- <location line="-265"/>
+ <location line="-300"/>
<source>&amp;Export...</source>
<translation>&amp;Exporteer...</translation>
</message>
@@ -441,7 +430,7 @@ Dit product bevat software ontwikkeld door het OpenSSL Project voor gebruik in d
<message>
<location line="+2"/>
<source>Change the passphrase used for wallet encryption</source>
- <translation>wijzig het wachtwoord voor uw portemonneversleuteling</translation>
+ <translation>Wijzig het wachtwoord voor uw portemonneversleuteling</translation>
</message>
<message>
<location line="+9"/>
@@ -459,18 +448,33 @@ Dit product bevat software ontwikkeld door het OpenSSL Project voor gebruik in d
<translation>&amp;Verifiëer bericht...</translation>
</message>
<message>
- <location line="-196"/>
- <location line="+538"/>
+ <location line="-162"/>
+ <location line="+540"/>
<source>Bitcoin</source>
<translation>Bitcoin</translation>
</message>
<message>
- <location line="-538"/>
+ <location line="-540"/>
<source>Wallet</source>
<translation>Portemonnee</translation>
</message>
<message>
- <location line="+176"/>
+ <location line="+99"/>
+ <source>&amp;Send</source>
+ <translation>&amp;Versturen</translation>
+ </message>
+ <message>
+ <location line="+7"/>
+ <source>&amp;Receive</source>
+ <translation>&amp;Ontvangen</translation>
+ </message>
+ <message>
+ <location line="+14"/>
+ <source>&amp;Addresses</source>
+ <translation>&amp;Addressen</translation>
+ </message>
+ <message>
+ <location line="+22"/>
<source>&amp;About Bitcoin</source>
<translation>&amp;Over Bitcoin</translation>
</message>
@@ -531,27 +535,57 @@ Dit product bevat software ontwikkeld door het OpenSSL Project voor gebruik in d
<translation>[testnetwerk]</translation>
</message>
<message>
- <location line="+63"/>
+ <location line="+47"/>
<source>Bitcoin client</source>
<translation>Bitcoin client</translation>
</message>
<message numerus="yes">
- <location line="+79"/>
+ <location line="+140"/>
<source>%n active connection(s) to Bitcoin network</source>
<translation><numerusform>%n actieve connectie naar Bitcoinnetwerk</numerusform><numerusform>%n actieve connecties naar Bitcoinnetwerk</numerusform></translation>
</message>
<message>
- <location line="+45"/>
- <source>Processed %1 of %2 blocks of transaction history (%3% done).</source>
- <translation>%1 van %2 blokken van transactiehistorie verwerkt (%3% klaar).</translation>
+ <location line="+39"/>
+ <source>Processed %1 of %2 (estimated) blocks of transaction history.</source>
+ <translation>%1 van %2 (geschat) blokken van de transactiehistorie verwerkt.</translation>
</message>
<message>
- <location line="+7"/>
+ <location line="+4"/>
<source>Processed %1 blocks of transaction history.</source>
<translation>%1 blokken van transactiehistorie verwerkt.</translation>
</message>
+ <message numerus="yes">
+ <location line="+20"/>
+ <source>%n hour(s)</source>
+ <translation><numerusform>%n uur</numerusform><numerusform>%n uur</numerusform></translation>
+ </message>
+ <message numerus="yes">
+ <location line="+4"/>
+ <source>%n day(s)</source>
+ <translation><numerusform>%n dag</numerusform><numerusform>%n dagen</numerusform></translation>
+ </message>
+ <message numerus="yes">
+ <location line="+4"/>
+ <source>%n week(s)</source>
+ <translation><numerusform>%n week</numerusform><numerusform>%n weken</numerusform></translation>
+ </message>
<message>
- <location line="+70"/>
+ <location line="+5"/>
+ <source>%1 behind</source>
+ <translation>%1 achter</translation>
+ </message>
+ <message>
+ <location line="+14"/>
+ <source>Last received block was generated %1 ago.</source>
+ <translation>Laatst ontvangen blok was %1 geleden gegenereerd.</translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Transactions after this will not yet be visible.</source>
+ <translation>Transacties hierna zullen nu nog niet zichtbaar zijn.</translation>
+ </message>
+ <message>
+ <location line="+21"/>
<source>Error</source>
<translation>Fout</translation>
</message>
@@ -566,62 +600,27 @@ Dit product bevat software ontwikkeld door het OpenSSL Project voor gebruik in d
<translation>Informatie</translation>
</message>
<message>
- <location line="+66"/>
+ <location line="+68"/>
<source>This transaction is over the size limit. You can still send it for a fee of %1, which goes to the nodes that process your transaction and helps to support the network. Do you want to pay the fee?</source>
<translation>Deze transactie overschrijdt de groottelimiet. Om de transactie alsnog te versturen kunt u transactiekosten betalen van %1. Deze transactiekosten gaan naar de nodes die uw transactie verwerken en het helpt op deze manier bij het ondersteunen van het Bitcoinnetwerk. Wilt u de transactiekosten betalen?</translation>
</message>
<message>
- <location line="+210"/>
- <source>Backup Successful</source>
- <translation>Backup Succesvol</translation>
- </message>
- <message>
- <location line="+0"/>
- <source>The wallet data was successfully saved to the new location.</source>
- <translation>De portemonneedata is succesvol opgeslagen op de nieuwe locatie.</translation>
- </message>
- <message numerus="yes">
- <location line="-338"/>
- <source>%n second(s) ago</source>
- <translation><numerusform>%n seconde geleden</numerusform><numerusform>%n seconden geleden</numerusform></translation>
- </message>
- <message numerus="yes">
- <location line="+4"/>
- <source>%n minute(s) ago</source>
- <translation><numerusform>%n minuut geleden</numerusform><numerusform>%n minuten geleden</numerusform></translation>
- </message>
- <message numerus="yes">
- <location line="+4"/>
- <source>%n hour(s) ago</source>
- <translation><numerusform>%n uur geleden</numerusform><numerusform>%n uur geleden</numerusform></translation>
- </message>
- <message numerus="yes">
- <location line="+4"/>
- <source>%n day(s) ago</source>
- <translation><numerusform>%n dag geleden</numerusform><numerusform>%n dagen geleden</numerusform></translation>
- </message>
- <message>
- <location line="+6"/>
+ <location line="-138"/>
<source>Up to date</source>
<translation>Bijgewerkt</translation>
</message>
<message>
- <location line="+7"/>
+ <location line="+32"/>
<source>Catching up...</source>
<translation>Aan het bijwerken...</translation>
</message>
<message>
- <location line="+10"/>
- <source>Last received block was generated %1.</source>
- <translation>Laatst ontvangen blok is %1 gegenereerd.</translation>
- </message>
- <message>
- <location line="+97"/>
+ <location line="+110"/>
<source>Confirm transaction fee</source>
<translation>Bevestig transactiekosten</translation>
</message>
<message>
- <location line="+23"/>
+ <location line="+8"/>
<source>Sent transaction</source>
<translation>Verzonden transactie</translation>
</message>
@@ -644,14 +643,14 @@ Adres: %4
</translation>
</message>
<message>
- <location line="+99"/>
- <location line="+28"/>
+ <location line="+33"/>
+ <location line="+23"/>
<source>URI handling</source>
<translation>URI-behandeling</translation>
</message>
<message>
- <location line="-28"/>
- <location line="+28"/>
+ <location line="-23"/>
+ <location line="+23"/>
<source>URI can not be parsed! This can be caused by an invalid Bitcoin address or malformed URI parameters.</source>
<translation>URI kan niet worden geïnterpreteerd. Dit kan komen door een ongeldig Bitcoinadres of misvormde URI-parameters.</translation>
</message>
@@ -666,27 +665,7 @@ Adres: %4
<translation>Portemonnee is &lt;b&gt;versleuteld&lt;/b&gt; en momenteel &lt;b&gt;gesloten&lt;/b&gt;</translation>
</message>
<message>
- <location line="+23"/>
- <source>Backup Wallet</source>
- <translation>Backup Portemonnee</translation>
- </message>
- <message>
- <location line="+0"/>
- <source>Wallet Data (*.dat)</source>
- <translation>Portemonnee-data (*.dat)</translation>
- </message>
- <message>
- <location line="+3"/>
- <source>Backup Failed</source>
- <translation>Backup Mislukt</translation>
- </message>
- <message>
- <location line="+0"/>
- <source>There was an error trying to save the wallet data to the new location.</source>
- <translation>Er is een fout opgetreden bij het wegschrijven van de portemonnee-data naar de nieuwe locatie.</translation>
- </message>
- <message>
- <location filename="../bitcoin.cpp" line="+109"/>
+ <location filename="../bitcoin.cpp" line="+108"/>
<source>A fatal error occurred. Bitcoin can no longer continue safely and will quit.</source>
<translation>Er is een fatale fout opgetreden. Bitcoin kan niet meer veilig doorgaan en zal nu afgesloten worden.</translation>
</message>
@@ -694,7 +673,7 @@ Adres: %4
<context>
<name>ClientModel</name>
<message>
- <location filename="../clientmodel.cpp" line="+86"/>
+ <location filename="../clientmodel.cpp" line="+96"/>
<source>Network Alert</source>
<translation>Netwerkwaarschuwing</translation>
</message>
@@ -727,7 +706,7 @@ Adres: %4
<translation>Het adres dat geassocieerd is met deze inschrijving in het adresboek. Dit kan alleen worden veranderd voor zend-adressen.</translation>
</message>
<message>
- <location filename="../editaddressdialog.cpp" line="+20"/>
+ <location filename="../editaddressdialog.cpp" line="+21"/>
<source>New receiving address</source>
<translation>Nieuw ontvangstadres</translation>
</message>
@@ -747,17 +726,17 @@ Adres: %4
<translation>Bewerk adres om naar te verzenden</translation>
</message>
<message>
- <location line="+60"/>
+ <location line="+76"/>
<source>The entered address &quot;%1&quot; is already in the address book.</source>
<translation>Het opgegeven adres &quot;%1&quot; bestaat al in uw adresboek.</translation>
</message>
<message>
- <location line="+5"/>
+ <location line="-5"/>
<source>The entered address &quot;%1&quot; is not a valid Bitcoin address.</source>
<translation>Het opgegeven adres &quot;%1&quot; is een ongeldig Bitcoinadres</translation>
</message>
<message>
- <location line="+5"/>
+ <location line="+10"/>
<source>Could not unlock wallet.</source>
<translation>Kon de portemonnee niet openen.</translation>
</message>
@@ -770,7 +749,7 @@ Adres: %4
<context>
<name>GUIUtil::HelpMessageBox</name>
<message>
- <location filename="../guiutil.cpp" line="+419"/>
+ <location filename="../guiutil.cpp" line="+422"/>
<location line="+12"/>
<source>Bitcoin-Qt</source>
<translation>Bitcoin-Qt</translation>
@@ -803,8 +782,7 @@ Adres: %4
<message>
<location line="+1"/>
<source>Start minimized</source>
- <translation>Geminimaliseerd starten
-</translation>
+ <translation>Geminimaliseerd starten</translation>
</message>
<message>
<location line="+1"/>
@@ -842,17 +820,17 @@ Adres: %4
<message>
<location line="+3"/>
<source>&amp;Start Bitcoin on system login</source>
- <translation>&amp;Start Bitcoin bij het inloggen in het systeem</translation>
+ <translation>Start &amp;Bitcoin bij het inloggen in het systeem</translation>
</message>
<message>
<location line="+35"/>
<source>Reset all client options to default.</source>
- <translation type="unfinished"/>
+ <translation>Reset alle clientopties naar de standaardinstellingen.</translation>
</message>
<message>
<location line="+3"/>
<source>&amp;Reset Options</source>
- <translation type="unfinished"/>
+ <translation>&amp;Reset Opties</translation>
</message>
<message>
<location line="+13"/>
@@ -932,7 +910,7 @@ Adres: %4
<message>
<location line="+3"/>
<source>M&amp;inimize on close</source>
- <translation>Minimaliseer bij &amp;sluiten van het venster</translation>
+ <translation>Minimaliseer bij sluiten van het &amp;venster</translation>
</message>
<message>
<location line="+21"/>
@@ -942,7 +920,7 @@ Adres: %4
<message>
<location line="+8"/>
<source>User Interface &amp;language:</source>
- <translation>&amp;Taal Gebruikersinterface:</translation>
+ <translation>Taal &amp;Gebruikersinterface:</translation>
</message>
<message>
<location line="+13"/>
@@ -967,7 +945,7 @@ Adres: %4
<message>
<location line="+3"/>
<source>&amp;Display addresses in transaction list</source>
- <translation>Toon &amp;adressen in de transactielijst</translation>
+ <translation>Toon a&amp;dressen in de transactielijst</translation>
</message>
<message>
<location line="+71"/>
@@ -977,7 +955,7 @@ Adres: %4
<message>
<location line="+7"/>
<source>&amp;Cancel</source>
- <translation>&amp;Annuleren</translation>
+ <translation>Ann&amp;uleren</translation>
</message>
<message>
<location line="+10"/>
@@ -985,24 +963,24 @@ Adres: %4
<translation>&amp;Toepassen</translation>
</message>
<message>
- <location filename="../optionsdialog.cpp" line="+55"/>
+ <location filename="../optionsdialog.cpp" line="+53"/>
<source>default</source>
<translation>standaard</translation>
</message>
<message>
<location line="+130"/>
<source>Confirm options reset</source>
- <translation type="unfinished"/>
+ <translation>Bevestig reset opties</translation>
</message>
<message>
<location line="+1"/>
<source>Some settings may require a client restart to take effect.</source>
- <translation type="unfinished"/>
+ <translation>Sommige instellingen vereisen het herstarten van de client voordat ze in werking treden.</translation>
</message>
<message>
<location line="+0"/>
<source>Do you want to proceed?</source>
- <translation type="unfinished"/>
+ <translation> Wilt u doorgaan?</translation>
</message>
<message>
<location line="+42"/>
@@ -1030,23 +1008,18 @@ Adres: %4
<translation>Vorm</translation>
</message>
<message>
- <location line="+51"/>
- <location line="+183"/>
+ <location line="+50"/>
+ <location line="+166"/>
<source>The displayed information may be out of date. Your wallet automatically synchronizes with the Bitcoin network after a connection is established, but this process has not completed yet.</source>
<translation>De weergegeven informatie kan verouderd zijn. Uw portemonnee synchroniseert automaticsh met het Bitcoinnetwerk nadat een verbinding is gelegd, maar dit proces is nog niet voltooid.</translation>
</message>
<message>
- <location line="-141"/>
+ <location line="-124"/>
<source>Balance:</source>
<translation>Saldo:</translation>
</message>
<message>
- <location line="+58"/>
- <source>Number of transactions:</source>
- <translation>Aantal transacties:</translation>
- </message>
- <message>
- <location line="-29"/>
+ <location line="+29"/>
<source>Unconfirmed:</source>
<translation>Onbevestigd:</translation>
</message>
@@ -1056,14 +1029,14 @@ Adres: %4
<translation>Portemonnee</translation>
</message>
<message>
- <location line="+124"/>
+ <location line="+107"/>
<source>Immature:</source>
<translation>Immatuur:</translation>
</message>
<message>
<location line="+13"/>
<source>Mined balance that has not yet matured</source>
- <translation>Ontgonnen saldo dat nog niet tot wasdom is gekomen</translation>
+ <translation>Gedolven saldo dat nog niet tot wasdom is gekomen</translation>
</message>
<message>
<location line="+46"/>
@@ -1071,7 +1044,7 @@ Adres: %4
<translation>&lt;b&gt;Recente transacties&lt;/b&gt;</translation>
</message>
<message>
- <location line="-118"/>
+ <location line="-101"/>
<source>Your current balance</source>
<translation>Uw huidige saldo</translation>
</message>
@@ -1081,11 +1054,6 @@ Adres: %4
<translation>Totaal van de transacties die nog moeten worden bevestigd en nog niet zijn meegeteld in uw huidige saldo </translation>
</message>
<message>
- <location line="+20"/>
- <source>Total number of transactions in wallet</source>
- <translation>Totaal aantal transacties in uw portemonnee</translation>
- </message>
- <message>
<location filename="../overviewpage.cpp" line="+115"/>
<location line="+1"/>
<source>out of sync</source>
@@ -1093,6 +1061,14 @@ Adres: %4
</message>
</context>
<context>
+ <name>PaymentServer</name>
+ <message>
+ <location filename="../paymentserver.cpp" line="+107"/>
+ <source>Cannot start bitcoin: click-to-pay handler</source>
+ <translation>Kan bitcoin niet starten: click-to-pay handler</translation>
+ </message>
+</context>
+<context>
<name>QRCodeDialog</name>
<message>
<location filename="../forms/qrcodedialog.ui" line="+14"/>
@@ -1431,7 +1407,7 @@ Adres: %4
</message>
<message>
<location line="+60"/>
- <location filename="../sendcoinsentry.cpp" line="+25"/>
+ <location filename="../sendcoinsentry.cpp" line="+26"/>
<source>Enter a label for this address to add it to your address book</source>
<translation>Vul een label in voor dit adres om het toe te voegen aan uw adresboek</translation>
</message>
@@ -1523,7 +1499,7 @@ Adres: %4
<message>
<location line="+7"/>
<source>Signature</source>
- <translation type="unfinished"/>
+ <translation>Handtekening</translation>
</message>
<message>
<location line="+27"/>
@@ -1667,7 +1643,7 @@ Adres: %4
<context>
<name>TransactionDesc</name>
<message>
- <location filename="../transactiondesc.cpp" line="+19"/>
+ <location filename="../transactiondesc.cpp" line="+20"/>
<source>Open until %1</source>
<translation>Openen totdat %1</translation>
</message>
@@ -1830,7 +1806,7 @@ Adres: %4
<message numerus="yes">
<location line="-35"/>
<source>Open for %n more block(s)</source>
- <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+ <translation><numerusform>Open voor nog %n blok</numerusform><numerusform>Open voor nog %n blokken</numerusform></translation>
</message>
<message>
<location line="+70"/>
@@ -1854,7 +1830,7 @@ Adres: %4
<context>
<name>TransactionTableModel</name>
<message>
- <location filename="../transactiontablemodel.cpp" line="+226"/>
+ <location filename="../transactiontablemodel.cpp" line="+225"/>
<source>Date</source>
<translation>Datum</translation>
</message>
@@ -1876,7 +1852,7 @@ Adres: %4
<message numerus="yes">
<location line="+57"/>
<source>Open for %n more block(s)</source>
- <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+ <translation><numerusform>Open voor nog %n blok</numerusform><numerusform>Open voor nog %n blokken</numerusform></translation>
</message>
<message>
<location line="+3"/>
@@ -1901,7 +1877,7 @@ Adres: %4
<message numerus="yes">
<location line="+8"/>
<source>Mined balance will be available when it matures in %n more block(s)</source>
- <translation><numerusform>Ontgonnen saldo zal beschikbaar komen als het tot wasdom komt na %n blok</numerusform><numerusform>Ontgonnen saldo zal beschikbaar komen als het tot wasdom komt na %n blokken</numerusform></translation>
+ <translation><numerusform>Gedolven saldo zal beschikbaar komen als het tot wasdom komt na %n blok</numerusform><numerusform>Gedolven saldo zal beschikbaar komen als het tot wasdom komt na %n blokken</numerusform></translation>
</message>
<message>
<location line="+5"/>
@@ -1936,7 +1912,7 @@ Adres: %4
<message>
<location line="+2"/>
<source>Mined</source>
- <translation>Ontgonnen</translation>
+ <translation>Gedolven</translation>
</message>
<message>
<location line="+38"/>
@@ -1961,7 +1937,7 @@ Adres: %4
<message>
<location line="+2"/>
<source>Destination address of transaction.</source>
- <translation>Ontvangend adres van transactie</translation>
+ <translation>Ontvangend adres van transactie.</translation>
</message>
<message>
<location line="+2"/>
@@ -1972,7 +1948,7 @@ Adres: %4
<context>
<name>TransactionView</name>
<message>
- <location filename="../transactionview.cpp" line="+55"/>
+ <location filename="../transactionview.cpp" line="+52"/>
<location line="+16"/>
<source>All</source>
<translation>Alles</translation>
@@ -2025,7 +2001,7 @@ Adres: %4
<message>
<location line="+1"/>
<source>Mined</source>
- <translation>Ontgonnen</translation>
+ <translation>Gedolven</translation>
</message>
<message>
<location line="+1"/>
@@ -2059,6 +2035,11 @@ Adres: %4
</message>
<message>
<location line="+1"/>
+ <source>Copy transaction ID</source>
+ <translation>Kopieer transactie-ID</translation>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Edit label</source>
<translation>Bewerk label</translation>
</message>
@@ -2068,7 +2049,7 @@ Adres: %4
<translation>Toon transactiedetails</translation>
</message>
<message>
- <location line="+142"/>
+ <location line="+139"/>
<source>Export Transaction Data</source>
<translation>Exporteer transactiegegevens</translation>
</message>
@@ -2123,7 +2104,7 @@ Adres: %4
<translation>Kon niet schrijven naar bestand %1.</translation>
</message>
<message>
- <location line="+95"/>
+ <location line="+100"/>
<source>Range:</source>
<translation>Bereik:</translation>
</message>
@@ -2134,51 +2115,190 @@ Adres: %4
</message>
</context>
<context>
+ <name>WalletView</name>
+ <message>
+ <location filename="../walletview.cpp" line="+95"/>
+ <source>&amp;Overview</source>
+ <translation>&amp;Overzicht</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Show general overview of wallet</source>
+ <translation>Algemeen overzicht van de portomonnee weergeven</translation>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>&amp;Send coins</source>
+ <translation>Coins &amp;versturen</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Send coins to a Bitcoin address</source>
+ <translation>Coins versturen naar een Bitcoin-adres</translation>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>&amp;Receive coins</source>
+ <translation>Coins &amp;ontvangen</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Show the list of addresses for receiving payments</source>
+ <translation>Lijst van ontvangst-adressen weergeven</translation>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>&amp;Transactions</source>
+ <translation>&amp;Transacties</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Browse transaction history</source>
+ <translation>Door transactiegeschiedenis bladeren</translation>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>&amp;Address Book</source>
+ <translation>&amp;Adresboek</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Edit the list of stored addresses and labels</source>
+ <translation>Lijst van opgeslagen adressen en labels bewerken</translation>
+ </message>
+ <message>
+ <location line="+12"/>
+ <source>&amp;Encrypt Wallet...</source>
+ <translation>Portomonnee &amp;versleutelen</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Encrypt the private keys that belong to your wallet</source>
+ <translation>Geheime sleutels die bij uw portomonnee horen versleutelt opslaan</translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>&amp;Backup Wallet...</source>
+ <translation>Portomonnee &amp;backuppen</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Backup wallet to another location</source>
+ <translation>Portomonnee naar een andere locatie backuppen</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>&amp;Change Passphrase...</source>
+ <translation>Wachtwoord &amp;wijzigen</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Change the passphrase used for wallet encryption</source>
+ <translation>Wijzig het wachtwoord voor uw portemonneversleuteling</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Sign &amp;message...</source>
+ <translation>&amp;Bericht ondertekenen</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Sign messages with your Bitcoin addresses to prove you own them</source>
+ <translation>Berichten ondertekenen met uw Bitcoin-adressen, om te bewijzen dat u deze bezit</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>&amp;Verify message...</source>
+ <translation>&amp;Bericht controleren...</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Verify messages to ensure they were signed with specified Bitcoin addresses</source>
+ <translation>Controleren of berichten getekend zijn met genoemde Bitcoin-adressen.</translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>&amp;Export...</source>
+ <translation>&amp;Exporteren...</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Export the data in the current tab to a file</source>
+ <translation>De data in het huidige tabblad exporteren naar een bestand</translation>
+ </message>
+ <message>
+ <location line="+180"/>
+ <source>Backup Wallet</source>
+ <translation>Portomonnee backuppen</translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>Wallet Data (*.dat)</source>
+ <translation>Portemonnee-data (*.dat)</translation>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Backup Failed</source>
+ <translation>Backup Mislukt</translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>There was an error trying to save the wallet data to the new location.</source>
+ <translation>Er is een fout opgetreden bij het wegschrijven van de portemonnee-data naar de nieuwe locatie.</translation>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>Backup Successful</source>
+ <translation>Backup Succesvol</translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>The wallet data was successfully saved to the new location.</source>
+ <translation>De portemonneedata is succesvol opgeslagen op de nieuwe locatie.</translation>
+ </message>
+</context>
+<context>
<name>bitcoin-core</name>
<message>
- <location filename="../bitcoinstrings.cpp" line="+88"/>
+ <location filename="../bitcoinstrings.cpp" line="+96"/>
<source>Bitcoin version</source>
<translation>Bitcoinversie</translation>
</message>
<message>
- <location line="+82"/>
+ <location line="+98"/>
<source>Usage:</source>
<translation>Gebruik:</translation>
</message>
<message>
- <location line="-23"/>
+ <location line="-24"/>
<source>Send command to -server or bitcoind</source>
- <translation>Stuur commando naar -server of bitcoind
-</translation>
+ <translation>Stuur commando naar -server of bitcoind</translation>
</message>
<message>
- <location line="-21"/>
+ <location line="-22"/>
<source>List commands</source>
- <translation>List van commando&apos;s
-</translation>
+ <translation>Lijst van commando&apos;s</translation>
</message>
<message>
- <location line="-11"/>
+ <location line="-10"/>
<source>Get help for a command</source>
- <translation>Toon hulp voor een commando
-</translation>
+ <translation>Toon hulp voor een commando</translation>
</message>
<message>
<location line="+21"/>
<source>Options:</source>
- <translation>Opties:
-</translation>
+ <translation>Opties:</translation>
</message>
<message>
<location line="+22"/>
<source>Specify configuration file (default: bitcoin.conf)</source>
- <translation>Specifieer configuratiebestand (standaard: bitcoin.conf)
+ <translation>Specificeer configuratiebestand (standaard: bitcoin.conf)
</translation>
</message>
<message>
<location line="+3"/>
<source>Specify pid file (default: bitcoind.pid)</source>
- <translation>Specifieer pid-bestand (standaard: bitcoind.pid)
+ <translation>Specificeer pid-bestand (standaard: bitcoind.pid)
</translation>
</message>
<message>
@@ -2188,16 +2308,15 @@ Adres: %4
</translation>
</message>
<message>
- <location line="-15"/>
+ <location line="-28"/>
<source>Don&apos;t generate coins</source>
<translation>Genereer geen munten
</translation>
</message>
<message>
- <location line="+61"/>
+ <location line="+74"/>
<source>Specify data directory</source>
- <translation>Stel datamap in
-</translation>
+ <translation>Stel datamap in</translation>
</message>
<message>
<location line="-7"/>
@@ -2205,89 +2324,90 @@ Adres: %4
<translation>Stel databankcachegrootte in in megabytes (standaard: 25)</translation>
</message>
<message>
- <location line="-26"/>
+ <location line="-27"/>
<source>Listen for connections on &lt;port&gt; (default: 8333 or testnet: 18333)</source>
<translation>Luister voor verbindingen op &lt;poort&gt; (standaard: 8333 of testnet: 18333)</translation>
</message>
<message>
- <location line="+4"/>
+ <location line="+5"/>
<source>Maintain at most &lt;n&gt; connections to peers (default: 125)</source>
<translation>Onderhoud maximaal &lt;n&gt; verbindingen naar peers (standaard: 125)</translation>
</message>
<message>
- <location line="-34"/>
+ <location line="-49"/>
<source>Connect to a node to retrieve peer addresses, and disconnect</source>
<translation>Verbind naar een node om adressen van anderen op te halen, en verbreek vervolgens de verbinding</translation>
</message>
<message>
- <location line="+65"/>
+ <location line="+80"/>
<source>Specify your own public address</source>
<translation>Specificeer uw eigen publieke adres</translation>
</message>
<message>
- <location line="+2"/>
+ <location line="+3"/>
<source>Threshold for disconnecting misbehaving peers (default: 100)</source>
<translation>Drempel om verbinding te verbreken naar zich misdragende peers (standaard: 100)</translation>
</message>
<message>
- <location line="-114"/>
+ <location line="-132"/>
<source>Number of seconds to keep misbehaving peers from reconnecting (default: 86400)</source>
<translation>Aantal seconden dat zich misdragende peers niet opnieuw mogen verbinden (standaard: 86400)</translation>
</message>
<message>
- <location line="-28"/>
+ <location line="-32"/>
<source>An error occurred while setting up the RPC port %u for listening on IPv4: %s</source>
<translation>Er is een fout opgetreden tijdens het instellen van de inkomende RPC-poort %u op IPv4: %s</translation>
</message>
<message>
- <location line="+26"/>
+ <location line="+30"/>
<source>Listen for JSON-RPC connections on &lt;port&gt; (default: 8332 or testnet: 18332)</source>
<translation>Wacht op JSON-RPC-connecties op poort &lt;port&gt; (standaard: 8332 of testnet: 18332)</translation>
</message>
<message>
- <location line="+34"/>
+ <location line="+36"/>
<source>Accept command line and JSON-RPC commands</source>
- <translation>Aanvaard commandoregel en JSON-RPC commando&apos;s
-</translation>
+ <translation>Aanvaard commandoregel- en JSON-RPC-commando&apos;s</translation>
</message>
<message>
- <location line="+62"/>
+ <location line="+77"/>
<source>Run in the background as a daemon and accept commands</source>
- <translation>Draai in de achtergrond als daemon en aanvaard commando&apos;s
-</translation>
+ <translation>Draai in de achtergrond als daemon en aanvaard commando&apos;s</translation>
</message>
<message>
- <location line="+31"/>
+ <location line="+32"/>
<source>Use the test network</source>
- <translation>Gebruik het testnetwerk
-</translation>
+ <translation>Gebruik het testnetwerk</translation>
</message>
<message>
- <location line="-92"/>
+ <location line="-108"/>
<source>Accept connections from outside (default: 1 if no -proxy or -connect)</source>
<translation>Accepteer verbindingen van buitenaf (standaard: 1 als geen -proxy of -connect is opgegeven)</translation>
</message>
<message>
- <location line="-74"/>
+ <location line="-82"/>
<source>%s, you must set a rpcpassword in the configuration file:
- %s
+%s
It is recommended you use the following random password:
rpcuser=bitcoinrpc
rpcpassword=%s
(you do not need to remember this password)
The username and password MUST NOT be the same.
If the file does not exist, create it with owner-readable-only file permissions.
+It is also recommended to set alertnotify so you are notified of problems;
+for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.com
</source>
- <translation>%s, u moet een rpcpassword instellen in het configuratiebestand: %s
-Het wordt aangeraden het volgende willekeurige wachtwoord te gebruiken:
+ <translation>%s, u moet een RPC-wachtwoord instellen in het configuratiebestand: %s
+U wordt aangeraden het volgende willekeurige wachtwoord te gebruiken:
rpcuser=bitcoinrpc
rpcpassword=%s
-(U hoeft het wachtwoord niet te onthouden)
-De gebruikersnaam en het wachtwoord mogen NIET OVEREENKOMEN.
-Als het bestand niet bestaat, maak het aan met een alleen-lezen-permissie.</translation>
+(u hoeft dit wachtwoord niet te onthouden)
+De gebruikersnaam en wachtwoord mogen niet hetzelfde zijn.
+Als het bestand niet bestaat, make hem dan aan met leesrechten voor enkel de eigenaar.
+Het is ook aan te bevelen &quot;alertnotify&quot; in te stellen zodat u op de hoogte gesteld wordt van problemen;
+for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.com</translation>
</message>
<message>
- <location line="+15"/>
+ <location line="+17"/>
<source>An error occurred while setting up the RPC port %u for listening on IPv6, falling back to IPv4: %s</source>
<translation>Er is een fout opgetreden tijdens het instellen van de inkomende RPC-poort %u op IPv6, terugval naar IPv4: %s</translation>
</message>
@@ -2303,11 +2423,6 @@ Als het bestand niet bestaat, maak het aan met een alleen-lezen-permissie.</tran
</message>
<message>
<location line="+3"/>
- <source>Corrupted block database detected. Please restart the client with -reindex.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+2"/>
<source>Error initializing database environment %s! To recover, BACKUP THAT DIRECTORY, then remove everything from it except for wallet.dat.</source>
<translation>Fout bij het initialiseren van database-omgeving %s! Om te herstellen, MAAK EEN BACKUP VAN DIE MAP, verwijder vervolgens alle bestanden in de map behalve wallet.dat.</translation>
</message>
@@ -2322,12 +2437,27 @@ Als het bestand niet bestaat, maak het aan met een alleen-lezen-permissie.</tran
<translation>Fout: Deze transactie vereist transactiekosten van tenminste %s, vanwege zijn grootte, complexiteit, of het gebruik van onlangs ontvangen munten!</translation>
</message>
<message>
+ <location line="+3"/>
+ <source>Execute command when a relevant alert is received (%s in cmd is replaced by message)</source>
+ <translation>Voer opdracht uit zodra een relevante melding ontvangen is (%s wordt in cmd vervangen door het bericht)</translation>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Execute command when a wallet transaction changes (%s in cmd is replaced by TxID)</source>
+ <translation>Voer opdracht uit zodra een portemonneetransactie verandert (%s in cmd wordt vervangen door TxID)</translation>
+ </message>
+ <message>
<location line="+11"/>
<source>Set maximum size of high-priority/low-fee transactions in bytes (default: 27000)</source>
<translation>Stel maximumgrootte in in bytes voor hoge-prioriteits-/lage-transactiekosten-transacties (standaard: 27000)</translation>
</message>
<message>
<location line="+3"/>
+ <source>Set the number of script verification threads (1-16, 0=auto, default: 0)</source>
+ <translation>Stel het aantal threads in voor scriptverificatie (1-16, 0=auto, standaard: 0)</translation>
+ </message>
+ <message>
+ <location line="+2"/>
<source>This is a pre-release test build - use at your own risk - do not use for mining or merchant applications</source>
<translation>Dit is een pre-release testversie - gebruik op eigen risico! Gebruik deze niet voor het ontginnen van munten of handelsapplicaties</translation>
</message>
@@ -2373,16 +2503,41 @@ Als het bestand niet bestaat, maak het aan met een alleen-lezen-permissie.</tran
</message>
<message>
<location line="+3"/>
+ <source>Corrupted block database detected</source>
+ <translation>Corrupte blokkendatabase gedetecteerd</translation>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Discover own IP address (default: 1 when listening and no -externalip)</source>
<translation>Ontdek eigen IP-adres (standaard: 1 als er wordt geluisterd en geen -externalip is opgegeven)</translation>
</message>
<message>
+ <location line="+1"/>
+ <source>Do you want to rebuild the block database now?</source>
+ <translation>Wilt u de blokkendatabase nu herbouwen?</translation>
+ </message>
+ <message>
<location line="+3"/>
+ <source>Error initializing block database</source>
+ <translation>Fout bij intialisatie blokkendatabase</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Error initializing wallet database environment %s!</source>
+ <translation>Probleem met initializeren van de database-omgeving %s!</translation>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Error loading block database</source>
- <translation type="unfinished"/>
+ <translation>Fout bij het laden van blokkendatabase</translation>
</message>
<message>
- <location line="+5"/>
+ <location line="+4"/>
+ <source>Error opening block database</source>
+ <translation>Fout bij openen blokkendatabase</translation>
+ </message>
+ <message>
+ <location line="+2"/>
<source>Error: Disk space is low!</source>
<translation>Fout: Weinig vrije diskruimte!</translation>
</message>
@@ -2398,26 +2553,96 @@ Als het bestand niet bestaat, maak het aan met een alleen-lezen-permissie.</tran
</message>
<message>
<location line="+2"/>
+ <source>Error: system error: </source>
+ <translation>Fout: Systeemfout:</translation>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Failed to listen on any port. Use -listen=0 if you want this.</source>
<translation>Mislukt om op welke poort dan ook te luisteren. Gebruik -listen=0 as u dit wilt.</translation>
</message>
<message>
+ <location line="+1"/>
+ <source>Failed to read block info</source>
+ <translation>Lezen van blokinformatie mislukt</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Failed to read block</source>
+ <translation>Lezen van blok mislukt</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Failed to sync block index</source>
+ <translation>Synchroniseren van blokindex mislukt</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Failed to write block index</source>
+ <translation>Schrijven van blokindex mislukt</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Failed to write block info</source>
+ <translation>Schrijven van blokinformatie mislukt</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Failed to write block</source>
+ <translation>Schrijven van blok mislukt</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Failed to write file info</source>
+ <translation>Schrijven van bestandsinformatie mislukt</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Failed to write to coin database</source>
+ <translation>Schrijven naar coindatabase mislukt</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Failed to write transaction index</source>
+ <translation>Schrijven van transactieindex mislukt</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Failed to write undo data</source>
+ <translation>Schrijven van undo-data mislukt</translation>
+ </message>
+ <message>
<location line="+2"/>
<source>Find peers using DNS lookup (default: 1 unless -connect)</source>
<translation>Vind andere nodes d.m.v. DNS-naslag (standaard: 1 tenzij -connect)</translation>
</message>
<message>
- <location line="+5"/>
- <source>How thorough the block verification is (0-4, default: 3)</source>
- <translation type="unfinished"/>
+ <location line="+3"/>
+ <source>How many blocks to check at startup (default: 288, 0 = all)</source>
+ <translation>Aantal te checken blokken bij het opstarten (standaard: 288, 0 = allemaal)</translation>
</message>
<message>
<location line="+1"/>
- <source>Importing blocks from block database...</source>
- <translation>Bezig met importeren van blokken uit blokkendatabase...</translation>
+ <source>How thorough the block verification is (0-4, default: 3)</source>
+ <translation>Hoe grondig de blokverificatie is (0-4, standaard: 3)</translation>
+ </message>
+ <message>
+ <location line="+24"/>
+ <source>Rebuild block chain index from current blk000??.dat files</source>
+ <translation>Blokkenketen opnieuw opbouwen van huidige blk000??.dat-bestanden</translation>
+ </message>
+ <message>
+ <location line="+37"/>
+ <source>Verifying blocks...</source>
+ <translation>Blokken aan het controleren...</translation>
</message>
<message>
<location line="+1"/>
+ <source>Verifying wallet...</source>
+ <translation>Portomonnee aan het controleren...</translation>
+ </message>
+ <message>
+ <location line="-61"/>
<source>Imports blocks from external blk000??.dat file</source>
<translation>Importeert blokken van extern blk000??.dat bestand</translation>
</message>
@@ -2432,7 +2657,12 @@ Als het bestand niet bestaat, maak het aan met een alleen-lezen-permissie.</tran
<translation>Ongeldig -tor adres: &apos;%s&apos;</translation>
</message>
<message>
- <location line="+9"/>
+ <location line="+8"/>
+ <source>Maintain a full transaction index (default: 0)</source>
+ <translation>Onderhoud een volledige transactieindex (standaard: 0)</translation>
+ </message>
+ <message>
+ <location line="+2"/>
<source>Maximum per-connection receive buffer, &lt;n&gt;*1000 bytes (default: 5000)</source>
<translation>Maximum per-connectie ontvangstbuffer, &lt;n&gt;*1000 bytes (standaard: 5000)</translation>
</message>
@@ -2467,12 +2697,7 @@ Als het bestand niet bestaat, maak het aan met een alleen-lezen-permissie.</tran
<translation>Voorzie de debuggingsuitvoer van een tijdsaanduiding</translation>
</message>
<message>
- <location line="+1"/>
- <source>Rebuild blockchain index from current blk000??.dat files</source>
- <translation>Herbouw blokkenketenindex uit huidige blk000??.dat bestanden</translation>
- </message>
- <message>
- <location line="+4"/>
+ <location line="+5"/>
<source>SSL options: (see the Bitcoin Wiki for SSL setup instructions)</source>
<translation>SSL-opties: (zie de Bitcoin wiki voor SSL-instructies)</translation>
</message>
@@ -2509,10 +2734,15 @@ Als het bestand niet bestaat, maak het aan met een alleen-lezen-permissie.</tran
<message>
<location line="+2"/>
<source>Specify connection timeout in milliseconds (default: 5000)</source>
- <translation>Specificeer de time-out tijd in milliseconden (standaard: 5000)</translation>
+ <translation>Specificeer de time-outtijd in milliseconden (standaard: 5000)</translation>
</message>
<message>
- <location line="+13"/>
+ <location line="+4"/>
+ <source>System error: </source>
+ <translation>Systeemfout:</translation>
+ </message>
+ <message>
+ <location line="+10"/>
<source>Use UPnP to map the listening port (default: 0)</source>
<translation>Gebruik UPnP om de luisterende poort te mappen (standaard: 0)</translation>
</message>
@@ -2529,8 +2759,7 @@ Als het bestand niet bestaat, maak het aan met een alleen-lezen-permissie.</tran
<message>
<location line="+2"/>
<source>Username for JSON-RPC connections</source>
- <translation>Gebruikersnaam voor JSON-RPC verbindingen
-</translation>
+ <translation>Gebruikersnaam voor JSON-RPC-verbindingen</translation>
</message>
<message>
<location line="+4"/>
@@ -2544,42 +2773,43 @@ Als het bestand niet bestaat, maak het aan met een alleen-lezen-permissie.</tran
</message>
<message>
<location line="+1"/>
+ <source>You need to rebuild the databases using -reindex to change -txindex</source>
+ <translation>U moet de databases herbouwen met behulp van -reindex om -txindex te kunnen veranderen</translation>
+ </message>
+ <message>
+ <location line="+1"/>
<source>wallet.dat corrupt, salvage failed</source>
<translation>wallet.dat corrupt, veiligstellen mislukt</translation>
</message>
<message>
- <location line="-43"/>
+ <location line="-45"/>
<source>Password for JSON-RPC connections</source>
- <translation>Wachtwoord voor JSON-RPC verbindingen
-</translation>
+ <translation>Wachtwoord voor JSON-RPC-verbindingen</translation>
</message>
<message>
- <location line="-53"/>
+ <location line="-68"/>
<source>Allow JSON-RPC connections from specified IP address</source>
- <translation>Sta JSON-RPC verbindingen van opgegeven IP adres toe
-</translation>
+ <translation>Sta JSON-RPC verbindingen van opgegeven IP-adres toe</translation>
</message>
<message>
- <location line="+62"/>
+ <location line="+77"/>
<source>Send commands to node running on &lt;ip&gt; (default: 127.0.0.1)</source>
- <translation>Verstuur commando&apos;s naar proces dat op &lt;ip&gt; draait (standaard: 127.0.0.1)
-</translation>
+ <translation>Verstuur commando&apos;s naar proces dat op &lt;ip&gt; draait (standaard: 127.0.0.1)</translation>
</message>
<message>
- <location line="-103"/>
+ <location line="-120"/>
<source>Execute command when the best block changes (%s in cmd is replaced by block hash)</source>
<translation>Voer commando uit zodra het beste blok verandert (%s in cmd wordt vervangen door blockhash)</translation>
</message>
<message>
- <location line="+124"/>
+ <location line="+142"/>
<source>Upgrade wallet to latest format</source>
<translation>Vernieuw portemonnee naar nieuwste versie</translation>
</message>
<message>
- <location line="-15"/>
+ <location line="-16"/>
<source>Set key pool size to &lt;n&gt; (default: 100)</source>
- <translation>Stel sleutelpoelgrootte in op &lt;n&gt; (standaard: 100)
-</translation>
+ <translation>Stel sleutelpoelgrootte in op &lt;n&gt; (standaard: 100)</translation>
</message>
<message>
<location line="-12"/>
@@ -2587,38 +2817,29 @@ Als het bestand niet bestaat, maak het aan met een alleen-lezen-permissie.</tran
<translation>Doorzoek de blokkenketen op ontbrekende portemonnee-transacties</translation>
</message>
<message>
- <location line="-26"/>
- <source>How many blocks to check at startup (default: 2500, 0 = all)</source>
- <translation>Het aantal blokken na te kijken bij opstarten (standaard: 2500, 0=alle)</translation>
- </message>
- <message>
- <location line="+55"/>
+ <location line="+30"/>
<source>Use OpenSSL (https) for JSON-RPC connections</source>
- <translation>Gebruik OpenSSL (https) voor JSON-RPC verbindingen
-</translation>
+ <translation>Gebruik OpenSSL (https) voor JSON-RPC-verbindingen</translation>
</message>
<message>
- <location line="-20"/>
+ <location line="-21"/>
<source>Server certificate file (default: server.cert)</source>
- <translation>Certificaat-bestand voor server (standaard: server.cert)
-</translation>
+ <translation>Certificaat-bestand voor server (standaard: server.cert)</translation>
</message>
<message>
<location line="+1"/>
<source>Server private key (default: server.pem)</source>
- <translation>Geheime sleutel voor server (standaard: server.pem)
-</translation>
+ <translation>Geheime sleutel voor server (standaard: server.pem)</translation>
</message>
<message>
- <location line="-133"/>
+ <location line="-154"/>
<source>Acceptable ciphers (default: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH)</source>
<translation>Aanvaardbare ciphers (standaard: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH)</translation>
</message>
<message>
- <location line="+144"/>
+ <location line="+166"/>
<source>This help message</source>
- <translation>Dit helpbericht
-</translation>
+ <translation>Dit helpbericht</translation>
</message>
<message>
<location line="+3"/>
@@ -2626,7 +2847,7 @@ Als het bestand niet bestaat, maak het aan met een alleen-lezen-permissie.</tran
<translation>Niet in staat om aan %s te binden op deze computer (bind gaf error %d, %s)</translation>
</message>
<message>
- <location line="-70"/>
+ <location line="-86"/>
<source>Connect through socks proxy</source>
<translation>Verbind via een socks-proxy</translation>
</message>
@@ -2636,12 +2857,12 @@ Als het bestand niet bestaat, maak het aan met een alleen-lezen-permissie.</tran
<translation>Sta DNS-naslag toe voor -addnode, -seednode en -connect</translation>
</message>
<message>
- <location line="+43"/>
+ <location line="+57"/>
<source>Loading addresses...</source>
<translation>Adressen aan het laden...</translation>
</message>
<message>
- <location line="-25"/>
+ <location line="-35"/>
<source>Error loading wallet.dat: Wallet corrupted</source>
<translation>Fout bij laden wallet.dat: Portemonnee corrupt</translation>
</message>
@@ -2651,32 +2872,22 @@ Als het bestand niet bestaat, maak het aan met een alleen-lezen-permissie.</tran
<translation>Fout bij laden wallet.dat: Portemonnee vereist een nieuwere versie van Bitcoin</translation>
</message>
<message>
- <location line="+73"/>
- <source>Verifying block database integrity...</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+1"/>
- <source>Verifying wallet integrity...</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+1"/>
+ <location line="+87"/>
<source>Wallet needed to be rewritten: restart Bitcoin to complete</source>
<translation>Portemonnee moest herschreven worden: Herstart Bitcoin om te voltooien</translation>
</message>
<message>
- <location line="-77"/>
+ <location line="-89"/>
<source>Error loading wallet.dat</source>
<translation>Fout bij laden wallet.dat</translation>
</message>
<message>
- <location line="+20"/>
+ <location line="+30"/>
<source>Invalid -proxy address: &apos;%s&apos;</source>
<translation>Ongeldig -proxy adres: &apos;%s&apos;</translation>
</message>
<message>
- <location line="+46"/>
+ <location line="+48"/>
<source>Unknown network specified in -onlynet: &apos;%s&apos;</source>
<translation>Onbekend netwerk gespecificeerd in -onlynet: &apos;%s&apos;</translation>
</message>
@@ -2686,7 +2897,7 @@ Als het bestand niet bestaat, maak het aan met een alleen-lezen-permissie.</tran
<translation>Onbekende -socks proxyversie aangegeven: %i</translation>
</message>
<message>
- <location line="-75"/>
+ <location line="-91"/>
<source>Cannot resolve -bind address: &apos;%s&apos;</source>
<translation>Kan -bind adres niet herleiden: &apos;%s&apos;</translation>
</message>
@@ -2696,19 +2907,19 @@ Als het bestand niet bestaat, maak het aan met een alleen-lezen-permissie.</tran
<translation>Kan -externlip adres niet herleiden: &apos;%s&apos;</translation>
</message>
<message>
- <location line="+31"/>
+ <location line="+45"/>
<source>Invalid amount for -paytxfee=&lt;amount&gt;: &apos;%s&apos;</source>
<translation>Ongeldig bedrag voor -paytxfee=&lt;bedrag&gt;: &apos;%s&apos;</translation>
</message>
<message>
- <location line="-15"/>
+ <location line="-24"/>
<source>Error: could not start node</source>
<translation>Fout: Kon node niet starten</translation>
</message>
<message>
- <location line="+16"/>
+ <location line="+25"/>
<source>Invalid amount</source>
- <translation>Ongeldig aantal</translation>
+ <translation>Ongeldig bedrag</translation>
</message>
<message>
<location line="-4"/>
@@ -2721,9 +2932,9 @@ Als het bestand niet bestaat, maak het aan met een alleen-lezen-permissie.</tran
<translation>Blokindex aan het laden...</translation>
</message>
<message>
- <location line="-45"/>
+ <location line="-59"/>
<source>Add a node to connect to and attempt to keep the connection open</source>
- <translation>Voeg een knooppunt om te verbinden toe en probeer de verbinding open te houden</translation>
+ <translation>Voeg een node om naar te verbinden toe en probeer de verbinding open te houden</translation>
</message>
<message>
<location line="-25"/>
@@ -2731,22 +2942,17 @@ Als het bestand niet bestaat, maak het aan met een alleen-lezen-permissie.</tran
<translation>Niet in staat om aan %s te binden op deze computer. Bitcoin draait vermoedelijk reeds.</translation>
</message>
<message>
- <location line="+54"/>
- <source>Find peers using internet relay chat (default: 0)</source>
- <translation>Vind anderen door middel van Internet Relay Chat (standaard: 0)</translation>
- </message>
- <message>
- <location line="-2"/>
+ <location line="+68"/>
<source>Fee per KB to add to transactions you send</source>
<translation>Kosten per KB om aan transacties toe te voegen die u verstuurt</translation>
</message>
<message>
- <location line="+19"/>
+ <location line="+17"/>
<source>Loading wallet...</source>
<translation>Portemonnee aan het laden...</translation>
</message>
<message>
- <location line="-40"/>
+ <location line="-54"/>
<source>Cannot downgrade wallet</source>
<translation>Kan portemonnee niet downgraden</translation>
</message>
@@ -2758,30 +2964,30 @@ Als het bestand niet bestaat, maak het aan met een alleen-lezen-permissie.</tran
<message>
<location line="+3"/>
<source>Cannot write default address</source>
- <translation>Kan standaard adres niet schrijven</translation>
+ <translation>Kan standaardadres niet schrijven</translation>
</message>
<message>
- <location line="+49"/>
+ <location line="+64"/>
<source>Rescanning...</source>
- <translation>Opnieuw aan het scannen ...</translation>
+ <translation>Blokkenketen aan het doorzoeken...</translation>
</message>
<message>
- <location line="-43"/>
+ <location line="-56"/>
<source>Done loading</source>
<translation>Klaar met laden</translation>
</message>
<message>
- <location line="+65"/>
+ <location line="+79"/>
<source>To use the %s option</source>
<translation>Om de %s optie te gebruiken</translation>
</message>
<message>
- <location line="-60"/>
+ <location line="-71"/>
<source>Error</source>
<translation>Fout</translation>
</message>
<message>
- <location line="-28"/>
+ <location line="-33"/>
<source>You must set rpcpassword=&lt;password&gt; in the configuration file:
%s
If the file does not exist, create it with owner-readable-only file permissions.</source>
diff --git a/src/qt/locale/bitcoin_pl.ts b/src/qt/locale/bitcoin_pl.ts
index 02c7c5984c..57e98222fc 100644
--- a/src/qt/locale/bitcoin_pl.ts
+++ b/src/qt/locale/bitcoin_pl.ts
@@ -13,12 +13,7 @@
<translation>Wersja &lt;b&gt;Bitcoin&lt;/b&gt;</translation>
</message>
<message>
- <location line="+41"/>
- <source>Copyright © 2009-2012 The Bitcoin developers</source>
- <translation>Copyright © 2009-2012 The Bitcoin developers</translation>
- </message>
- <message>
- <location line="+13"/>
+ <location line="+57"/>
<source>
This is experimental software.
@@ -32,6 +27,16 @@ Distributed under the MIT/X11 software license, see the accompanying file COPYIN
This product includes software developed by the OpenSSL Project for use in the OpenSSL Toolkit (http://www.openssl.org/) and cryptographic software written by Eric Young (eay@cryptsoft.com) and UPnP software written by Thomas Bernard.</translation>
</message>
+ <message>
+ <location filename="../aboutdialog.cpp" line="+17"/>
+ <source>Copyright</source>
+ <translation>Prawo autorskie</translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>2009-%1 The Bitcoin developers</source>
+ <translation>2009-%1 deweloperzy Bitcoin</translation>
+ </message>
</context>
<context>
<name>AddressBookPage</name>
@@ -88,7 +93,7 @@ This product includes software developed by the OpenSSL Project for use in the O
<message>
<location line="+25"/>
<source>Delete the currently selected address from the list</source>
- <translation type="unfinished"/>
+ <translation>Usuń zaznaczony adres z listy</translation>
</message>
<message>
<location line="-14"/>
@@ -106,17 +111,22 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation>&amp;Usuń</translation>
</message>
<message>
- <location filename="../addressbookpage.cpp" line="+65"/>
+ <location filename="../addressbookpage.cpp" line="+66"/>
<source>Copy &amp;Label</source>
<translation>Kopiuj &amp;EtykietÄ™</translation>
</message>
<message>
- <location line="+2"/>
+ <location line="+1"/>
<source>&amp;Edit</source>
<translation>&amp;Edytuj</translation>
</message>
<message>
- <location line="+250"/>
+ <location line="+1"/>
+ <source>Send &amp;Coins</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+263"/>
<source>Export Address Book Data</source>
<translation>Eksportuj książkę adresową</translation>
</message>
@@ -139,7 +149,7 @@ This product includes software developed by the OpenSSL Project for use in the O
<context>
<name>AddressTableModel</name>
<message>
- <location filename="../addresstablemodel.cpp" line="+142"/>
+ <location filename="../addresstablemodel.cpp" line="+144"/>
<source>Label</source>
<translation>Etykieta</translation>
</message>
@@ -298,17 +308,17 @@ This product includes software developed by the OpenSSL Project for use in the O
<context>
<name>BitcoinGUI</name>
<message>
- <location filename="../bitcoingui.cpp" line="+267"/>
+ <location filename="../bitcoingui.cpp" line="+231"/>
<source>Sign &amp;message...</source>
<translation>Podpisz wiado&amp;mość...</translation>
</message>
<message>
- <location line="+254"/>
+ <location line="+299"/>
<source>Synchronizing with network...</source>
<translation>Synchronizacja z sieciÄ…...</translation>
</message>
<message>
- <location line="-322"/>
+ <location line="-367"/>
<source>&amp;Overview</source>
<translation>P&amp;odsumowanie</translation>
</message>
@@ -328,32 +338,17 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation>PrzeglÄ…daj historiÄ™ transakcji</translation>
</message>
<message>
- <location line="+6"/>
- <source>&amp;Address Book</source>
- <translation>Książka &amp;adresowa</translation>
- </message>
- <message>
- <location line="+1"/>
+ <location line="+7"/>
<source>Edit the list of stored addresses and labels</source>
<translation>Edytuj listę zapisanych adresów i i etykiet</translation>
</message>
<message>
- <location line="-15"/>
- <source>&amp;Receive coins</source>
- <translation>Odbie&amp;rz monety</translation>
- </message>
- <message>
- <location line="+1"/>
+ <location line="-14"/>
<source>Show the list of addresses for receiving payments</source>
<translation>Pokaż listę adresów do otrzymywania płatności</translation>
</message>
<message>
- <location line="-8"/>
- <source>&amp;Send coins</source>
- <translation>Wy&amp;syłka monet</translation>
- </message>
- <message>
- <location line="+39"/>
+ <location line="+31"/>
<source>E&amp;xit</source>
<translation>&amp;Zakończ</translation>
</message>
@@ -398,22 +393,17 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation>&amp;Zmień hasło...</translation>
</message>
<message>
- <location line="+259"/>
+ <location line="+304"/>
<source>Importing blocks from disk...</source>
- <translation type="unfinished"/>
+ <translation>Importowanie bloków z dysku...</translation>
</message>
<message>
<location line="+3"/>
<source>Reindexing blocks on disk...</source>
- <translation type="unfinished"/>
- </message>
- <message numerus="yes">
- <location line="+10"/>
- <source>~%n block(s) remaining</source>
- <translation><numerusform>pozostał ~%n blok</numerusform><numerusform>pozostało ~%n bloki</numerusform><numerusform>pozostało ~%n bloków</numerusform></translation>
+ <translation>Ponowne indeksowanie bloków na dysku...</translation>
</message>
<message>
- <location line="-265"/>
+ <location line="-300"/>
<source>&amp;Export...</source>
<translation>&amp;Eksportuj...</translation>
</message>
@@ -458,18 +448,33 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation>&amp;Zweryfikuj wiadomość...</translation>
</message>
<message>
- <location line="-196"/>
- <location line="+538"/>
+ <location line="-162"/>
+ <location line="+540"/>
<source>Bitcoin</source>
<translation>Bitcoin</translation>
</message>
<message>
- <location line="-538"/>
+ <location line="-540"/>
<source>Wallet</source>
<translation>Portfel</translation>
</message>
<message>
- <location line="+176"/>
+ <location line="+99"/>
+ <source>&amp;Send</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+7"/>
+ <source>&amp;Receive</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+14"/>
+ <source>&amp;Addresses</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+22"/>
<source>&amp;About Bitcoin</source>
<translation>O Bitcoin</translation>
</message>
@@ -530,27 +535,57 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation>[testnet]</translation>
</message>
<message>
- <location line="+63"/>
+ <location line="+47"/>
<source>Bitcoin client</source>
<translation>Bitcoin klient</translation>
</message>
<message numerus="yes">
- <location line="+79"/>
+ <location line="+140"/>
<source>%n active connection(s) to Bitcoin network</source>
<translation><numerusform>%n aktywne połączenie do sieci Bitcoin</numerusform><numerusform>%n aktywne połączenia do sieci Bitcoin</numerusform><numerusform>%n aktywnych połączeń do sieci Bitcoin</numerusform></translation>
</message>
<message>
- <location line="+45"/>
- <source>Processed %1 of %2 blocks of transaction history (%3% done).</source>
+ <location line="+39"/>
+ <source>Processed %1 of %2 (estimated) blocks of transaction history.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+7"/>
+ <location line="+4"/>
<source>Processed %1 blocks of transaction history.</source>
<translation type="unfinished"/>
</message>
+ <message numerus="yes">
+ <location line="+20"/>
+ <source>%n hour(s)</source>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
+ <message numerus="yes">
+ <location line="+4"/>
+ <source>%n day(s)</source>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
+ <message numerus="yes">
+ <location line="+4"/>
+ <source>%n week(s)</source>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
+ <message>
+ <location line="+5"/>
+ <source>%1 behind</source>
+ <translation type="unfinished"/>
+ </message>
<message>
- <location line="+70"/>
+ <location line="+14"/>
+ <source>Last received block was generated %1 ago.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Transactions after this will not yet be visible.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+21"/>
<source>Error</source>
<translation>BÅ‚Ä…d</translation>
</message>
@@ -565,62 +600,27 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation>Informacja</translation>
</message>
<message>
- <location line="+66"/>
+ <location line="+68"/>
<source>This transaction is over the size limit. You can still send it for a fee of %1, which goes to the nodes that process your transaction and helps to support the network. Do you want to pay the fee?</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+210"/>
- <source>Backup Successful</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+0"/>
- <source>The wallet data was successfully saved to the new location.</source>
- <translation>Dane portfela zostały poprawnie zapisane w nowym miejscu.</translation>
- </message>
- <message numerus="yes">
- <location line="-338"/>
- <source>%n second(s) ago</source>
- <translation><numerusform>%n sekundÄ™ temu</numerusform><numerusform>%n sekundy temu</numerusform><numerusform>%n sekund temu</numerusform></translation>
- </message>
- <message numerus="yes">
- <location line="+4"/>
- <source>%n minute(s) ago</source>
- <translation><numerusform>%n minutÄ™ temu</numerusform><numerusform>%n minuty temu</numerusform><numerusform>%n minut temu</numerusform></translation>
- </message>
- <message numerus="yes">
- <location line="+4"/>
- <source>%n hour(s) ago</source>
- <translation><numerusform>%n godzinÄ™ temu</numerusform><numerusform>%n godziny temu</numerusform><numerusform>%n godzin temu</numerusform></translation>
- </message>
- <message numerus="yes">
- <location line="+4"/>
- <source>%n day(s) ago</source>
- <translation><numerusform>%n dzień temu</numerusform><numerusform>%n dni temu</numerusform><numerusform>%n dni temu</numerusform></translation>
- </message>
- <message>
- <location line="+6"/>
+ <location line="-138"/>
<source>Up to date</source>
<translation>Aktualny</translation>
</message>
<message>
- <location line="+7"/>
+ <location line="+32"/>
<source>Catching up...</source>
<translation>Åapanie bloków...</translation>
</message>
<message>
- <location line="+10"/>
- <source>Last received block was generated %1.</source>
- <translation>Ostatnio otrzymany blok został wygenerowany %1.</translation>
- </message>
- <message>
- <location line="+97"/>
+ <location line="+110"/>
<source>Confirm transaction fee</source>
<translation>Potwierdź prowizję transakcyjną</translation>
</message>
<message>
- <location line="+23"/>
+ <location line="+8"/>
<source>Sent transaction</source>
<translation>Transakcja wysłana</translation>
</message>
@@ -643,14 +643,14 @@ Adres: %4
</translation>
</message>
<message>
- <location line="+99"/>
- <location line="+28"/>
+ <location line="+33"/>
+ <location line="+23"/>
<source>URI handling</source>
<translation>Obsługa URI</translation>
</message>
<message>
- <location line="-28"/>
- <location line="+28"/>
+ <location line="-23"/>
+ <location line="+23"/>
<source>URI can not be parsed! This can be caused by an invalid Bitcoin address or malformed URI parameters.</source>
<translation>URI nie może zostać przetworzony! Prawdopodobnie błędny adres Bitcoin bądź nieprawidłowe parametry URI.</translation>
</message>
@@ -665,27 +665,7 @@ Adres: %4
<translation>Portfel jest &lt;b&gt;zaszyfrowany&lt;/b&gt; i obecnie &lt;b&gt;zablokowany&lt;/b&gt;</translation>
</message>
<message>
- <location line="+23"/>
- <source>Backup Wallet</source>
- <translation>Kopia Zapasowa Portfela</translation>
- </message>
- <message>
- <location line="+0"/>
- <source>Wallet Data (*.dat)</source>
- <translation>Dane Portfela (*.dat)</translation>
- </message>
- <message>
- <location line="+3"/>
- <source>Backup Failed</source>
- <translation>Kopia Zapasowa Nie Została Wykonana</translation>
- </message>
- <message>
- <location line="+0"/>
- <source>There was an error trying to save the wallet data to the new location.</source>
- <translation>Wystąpił błąd podczas próby zapisu portfela do nowej lokalizacji.</translation>
- </message>
- <message>
- <location filename="../bitcoin.cpp" line="+109"/>
+ <location filename="../bitcoin.cpp" line="+108"/>
<source>A fatal error occurred. Bitcoin can no longer continue safely and will quit.</source>
<translation>Błąd krytyczny. Bitcoin nie może kontynuować bezpiecznie więc zostanie zamknięty.</translation>
</message>
@@ -693,7 +673,7 @@ Adres: %4
<context>
<name>ClientModel</name>
<message>
- <location filename="../clientmodel.cpp" line="+86"/>
+ <location filename="../clientmodel.cpp" line="+96"/>
<source>Network Alert</source>
<translation>Sieć Alert</translation>
</message>
@@ -726,7 +706,7 @@ Adres: %4
<translation>Ten adres jest skojarzony z wpisem w książce adresowej. Może być zmodyfikowany jedynie dla adresów wysyłających.</translation>
</message>
<message>
- <location filename="../editaddressdialog.cpp" line="+20"/>
+ <location filename="../editaddressdialog.cpp" line="+21"/>
<source>New receiving address</source>
<translation>Nowy adres odbiorczy</translation>
</message>
@@ -746,17 +726,17 @@ Adres: %4
<translation>Edytuj adres wysyłania</translation>
</message>
<message>
- <location line="+60"/>
+ <location line="+76"/>
<source>The entered address &quot;%1&quot; is already in the address book.</source>
<translation>Wprowadzony adres &quot;%1&quot; już istnieje w książce adresowej.</translation>
</message>
<message>
- <location line="+5"/>
+ <location line="-5"/>
<source>The entered address &quot;%1&quot; is not a valid Bitcoin address.</source>
<translation>Wprowadzony adres &quot;%1&quot; nie jest poprawnym adresem Bitcoin.</translation>
</message>
<message>
- <location line="+5"/>
+ <location line="+10"/>
<source>Could not unlock wallet.</source>
<translation>Nie można było odblokować portfela.</translation>
</message>
@@ -769,7 +749,7 @@ Adres: %4
<context>
<name>GUIUtil::HelpMessageBox</name>
<message>
- <location filename="../guiutil.cpp" line="+419"/>
+ <location filename="../guiutil.cpp" line="+422"/>
<location line="+12"/>
<source>Bitcoin-Qt</source>
<translation>Bitcoin-Qt</translation>
@@ -830,7 +810,7 @@ Adres: %4
<message>
<location line="+15"/>
<source>Pay transaction &amp;fee</source>
- <translation>Płać prowizję za t&amp;ransakcje</translation>
+ <translation type="unfinished"/>
</message>
<message>
<location line="+31"/>
@@ -845,12 +825,12 @@ Adres: %4
<message>
<location line="+35"/>
<source>Reset all client options to default.</source>
- <translation type="unfinished"/>
+ <translation>Przywróć domyślne wszystkie ustawienia klienta.</translation>
</message>
<message>
<location line="+3"/>
<source>&amp;Reset Options</source>
- <translation type="unfinished"/>
+ <translation>Z&amp;resetuj Ustawienia</translation>
</message>
<message>
<location line="+13"/>
@@ -983,24 +963,24 @@ Adres: %4
<translation>Z&amp;astosuj</translation>
</message>
<message>
- <location filename="../optionsdialog.cpp" line="+55"/>
+ <location filename="../optionsdialog.cpp" line="+53"/>
<source>default</source>
<translation>domyślny</translation>
</message>
<message>
<location line="+130"/>
<source>Confirm options reset</source>
- <translation type="unfinished"/>
+ <translation>Potwierdź reset ustawień</translation>
</message>
<message>
<location line="+1"/>
<source>Some settings may require a client restart to take effect.</source>
- <translation type="unfinished"/>
+ <translation>Niektóre ustawienia mogą wymagać ponownego uruchomienia klienta, żeby zacząć działać.</translation>
</message>
<message>
<location line="+0"/>
<source>Do you want to proceed?</source>
- <translation type="unfinished"/>
+ <translation>Czy chcesz kontynuować?</translation>
</message>
<message>
<location line="+42"/>
@@ -1028,23 +1008,18 @@ Adres: %4
<translation>Formularz</translation>
</message>
<message>
- <location line="+51"/>
- <location line="+183"/>
+ <location line="+50"/>
+ <location line="+166"/>
<source>The displayed information may be out of date. Your wallet automatically synchronizes with the Bitcoin network after a connection is established, but this process has not completed yet.</source>
<translation>Wyświetlana informacja może być nieaktualna. Twój portfel synchronizuje się automatycznie z siecią bitcoin, zaraz po tym jak uzyskano połączenie, ale proces ten nie został jeszcze ukończony.</translation>
</message>
<message>
- <location line="-141"/>
+ <location line="-124"/>
<source>Balance:</source>
<translation>Saldo:</translation>
</message>
<message>
- <location line="+58"/>
- <source>Number of transactions:</source>
- <translation>Liczba transakcji:</translation>
- </message>
- <message>
- <location line="-29"/>
+ <location line="+29"/>
<source>Unconfirmed:</source>
<translation>Niepotwierdzony:</translation>
</message>
@@ -1054,7 +1029,7 @@ Adres: %4
<translation>Portfel</translation>
</message>
<message>
- <location line="+124"/>
+ <location line="+107"/>
<source>Immature:</source>
<translation>Niedojrzały: </translation>
</message>
@@ -1069,7 +1044,7 @@ Adres: %4
<translation>&lt;b&gt;Ostatnie transakcje&lt;/b&gt;</translation>
</message>
<message>
- <location line="-118"/>
+ <location line="-101"/>
<source>Your current balance</source>
<translation>Twoje obecne saldo</translation>
</message>
@@ -1079,11 +1054,6 @@ Adres: %4
<translation>Suma transakcji, które nie zostały jeszcze potwierdzone, i które nie zostały wliczone do twojego obecnego salda</translation>
</message>
<message>
- <location line="+20"/>
- <source>Total number of transactions in wallet</source>
- <translation>Całkowita liczba transakcji w portfelu</translation>
- </message>
- <message>
<location filename="../overviewpage.cpp" line="+115"/>
<location line="+1"/>
<source>out of sync</source>
@@ -1091,6 +1061,14 @@ Adres: %4
</message>
</context>
<context>
+ <name>PaymentServer</name>
+ <message>
+ <location filename="../paymentserver.cpp" line="+107"/>
+ <source>Cannot start bitcoin: click-to-pay handler</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>QRCodeDialog</name>
<message>
<location filename="../forms/qrcodedialog.ui" line="+14"/>
@@ -1262,7 +1240,7 @@ Adres: %4
<message>
<location line="+25"/>
<source>Bitcoin Core</source>
- <translation type="unfinished"/>
+ <translation>Rdzeń BitCoin</translation>
</message>
<message>
<location line="+279"/>
@@ -1420,7 +1398,7 @@ Adres: %4
<message>
<location line="+13"/>
<source>Pay &amp;To:</source>
- <translation>Płać &amp;Do:</translation>
+ <translation type="unfinished"/>
</message>
<message>
<location line="+34"/>
@@ -1429,7 +1407,7 @@ Adres: %4
</message>
<message>
<location line="+60"/>
- <location filename="../sendcoinsentry.cpp" line="+25"/>
+ <location filename="../sendcoinsentry.cpp" line="+26"/>
<source>Enter a label for this address to add it to your address book</source>
<translation>Wprowadź etykietę dla tego adresu by dodać go do książki adresowej</translation>
</message>
@@ -1536,7 +1514,7 @@ Adres: %4
<message>
<location line="+3"/>
<source>Sign &amp;Message</source>
- <translation type="unfinished"/>
+ <translation>Podpisz Wiado&amp;mość</translation>
</message>
<message>
<location line="+14"/>
@@ -1572,12 +1550,12 @@ Adres: %4
<message>
<location line="+3"/>
<source>Verify &amp;Message</source>
- <translation type="unfinished"/>
+ <translation>Zweryfikuj Wiado&amp;mość</translation>
</message>
<message>
<location line="+14"/>
<source>Reset all verify message fields</source>
- <translation type="unfinished"/>
+ <translation>Resetuje wszystkie pola weryfikacji wiadomości</translation>
</message>
<message>
<location filename="../signverifymessagedialog.cpp" line="+27"/>
@@ -1665,7 +1643,7 @@ Adres: %4
<context>
<name>TransactionDesc</name>
<message>
- <location filename="../transactiondesc.cpp" line="+19"/>
+ <location filename="../transactiondesc.cpp" line="+20"/>
<source>Open until %1</source>
<translation>Otwórz do %1</translation>
</message>
@@ -1852,7 +1830,7 @@ Adres: %4
<context>
<name>TransactionTableModel</name>
<message>
- <location filename="../transactiontablemodel.cpp" line="+226"/>
+ <location filename="../transactiontablemodel.cpp" line="+225"/>
<source>Date</source>
<translation>Data</translation>
</message>
@@ -1970,7 +1948,7 @@ Adres: %4
<context>
<name>TransactionView</name>
<message>
- <location filename="../transactionview.cpp" line="+55"/>
+ <location filename="../transactionview.cpp" line="+52"/>
<location line="+16"/>
<source>All</source>
<translation>Wszystko</translation>
@@ -2057,6 +2035,11 @@ Adres: %4
</message>
<message>
<location line="+1"/>
+ <source>Copy transaction ID</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Edit label</source>
<translation>Edytuj etykietÄ™</translation>
</message>
@@ -2066,7 +2049,7 @@ Adres: %4
<translation>Pokaż szczegóły transakcji</translation>
</message>
<message>
- <location line="+142"/>
+ <location line="+139"/>
<source>Export Transaction Data</source>
<translation>Eksportuj Dane Transakcyjne</translation>
</message>
@@ -2121,7 +2104,7 @@ Adres: %4
<translation>BÅ‚Ä…d zapisu do pliku %1.</translation>
</message>
<message>
- <location line="+95"/>
+ <location line="+100"/>
<source>Range:</source>
<translation>Zakres:</translation>
</message>
@@ -2132,29 +2115,172 @@ Adres: %4
</message>
</context>
<context>
+ <name>WalletView</name>
+ <message>
+ <location filename="../walletview.cpp" line="+95"/>
+ <source>&amp;Overview</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Show general overview of wallet</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>&amp;Send coins</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Send coins to a Bitcoin address</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>&amp;Receive coins</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Show the list of addresses for receiving payments</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>&amp;Transactions</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Browse transaction history</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>&amp;Address Book</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Edit the list of stored addresses and labels</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+12"/>
+ <source>&amp;Encrypt Wallet...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Encrypt the private keys that belong to your wallet</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>&amp;Backup Wallet...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Backup wallet to another location</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>&amp;Change Passphrase...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Change the passphrase used for wallet encryption</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Sign &amp;message...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Sign messages with your Bitcoin addresses to prove you own them</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>&amp;Verify message...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Verify messages to ensure they were signed with specified Bitcoin addresses</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>&amp;Export...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Export the data in the current tab to a file</source>
+ <translation>Eksportuj dane z aktywnej karty do pliku</translation>
+ </message>
+ <message>
+ <location line="+180"/>
+ <source>Backup Wallet</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>Wallet Data (*.dat)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Backup Failed</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>There was an error trying to save the wallet data to the new location.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>Backup Successful</source>
+ <translation>Wykonano KopiÄ™ ZapasowÄ…</translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>The wallet data was successfully saved to the new location.</source>
+ <translation>Dane portfela zostały poprawnie zapisane w nowym miejscu.</translation>
+ </message>
+</context>
+<context>
<name>bitcoin-core</name>
<message>
- <location filename="../bitcoinstrings.cpp" line="+88"/>
+ <location filename="../bitcoinstrings.cpp" line="+96"/>
<source>Bitcoin version</source>
<translation>Wersja Bitcoin</translation>
</message>
<message>
- <location line="+82"/>
+ <location line="+98"/>
<source>Usage:</source>
<translation>Użycie:</translation>
</message>
<message>
- <location line="-23"/>
+ <location line="-24"/>
<source>Send command to -server or bitcoind</source>
<translation>Wyślij polecenie do -server lub bitcoind</translation>
</message>
<message>
- <location line="-21"/>
+ <location line="-22"/>
<source>List commands</source>
<translation>Lista poleceń</translation>
</message>
<message>
- <location line="-11"/>
+ <location line="-10"/>
<source>Get help for a command</source>
<translation>Uzyskaj pomoc do polecenia</translation>
</message>
@@ -2179,12 +2305,12 @@ Adres: %4
<translation>Generuj monety</translation>
</message>
<message>
- <location line="-15"/>
+ <location line="-28"/>
<source>Don&apos;t generate coins</source>
<translation>Nie generuj monet</translation>
</message>
<message>
- <location line="+61"/>
+ <location line="+74"/>
<source>Specify data directory</source>
<translation>Wskaż folder danych</translation>
</message>
@@ -2194,80 +2320,82 @@ Adres: %4
<translation>Ustaw rozmiar w megabajtach cache-u bazy danych (domyślnie: 25)</translation>
</message>
<message>
- <location line="-26"/>
+ <location line="-27"/>
<source>Listen for connections on &lt;port&gt; (default: 8333 or testnet: 18333)</source>
<translation>Nasłuchuj połączeń na &lt;port&gt; (domyślnie: 8333 lub testnet: 18333)</translation>
</message>
<message>
- <location line="+4"/>
+ <location line="+5"/>
<source>Maintain at most &lt;n&gt; connections to peers (default: 125)</source>
<translation>Utrzymuj maksymalnie &lt;n&gt; połączeń z peerami (domyślnie: 125)</translation>
</message>
<message>
- <location line="-34"/>
+ <location line="-49"/>
<source>Connect to a node to retrieve peer addresses, and disconnect</source>
<translation>Podłącz się do węzła aby otrzymać adresy peerów i rozłącz</translation>
</message>
<message>
- <location line="+65"/>
+ <location line="+80"/>
<source>Specify your own public address</source>
<translation>Podaj swój publiczny adres</translation>
</message>
<message>
- <location line="+2"/>
+ <location line="+3"/>
<source>Threshold for disconnecting misbehaving peers (default: 100)</source>
<translation>Próg po którym nastąpi rozłączenie nietrzymających się zasad peerów (domyślnie: 100)</translation>
</message>
<message>
- <location line="-114"/>
+ <location line="-132"/>
<source>Number of seconds to keep misbehaving peers from reconnecting (default: 86400)</source>
<translation>Czas w sekundach, przez jaki nietrzymający się zasad peerzy nie będą mogli ponownie się podłączyć (domyślnie: 86400)</translation>
</message>
<message>
- <location line="-28"/>
+ <location line="-32"/>
<source>An error occurred while setting up the RPC port %u for listening on IPv4: %s</source>
<translation>Wystąpił błąd podczas ustawiania portu RPC %u w tryb nasłuchu: %s</translation>
</message>
<message>
- <location line="+26"/>
+ <location line="+30"/>
<source>Listen for JSON-RPC connections on &lt;port&gt; (default: 8332 or testnet: 18332)</source>
<translation>Nasłuchuj połączeń JSON-RPC na &lt;port&gt; (domyślnie: 8332 or testnet: 18332)</translation>
</message>
<message>
- <location line="+34"/>
+ <location line="+36"/>
<source>Accept command line and JSON-RPC commands</source>
<translation>Akceptuj linię poleceń oraz polecenia JSON-RPC</translation>
</message>
<message>
- <location line="+62"/>
+ <location line="+77"/>
<source>Run in the background as a daemon and accept commands</source>
<translation>Uruchom w tle jako daemon i przyjmuj polecenia</translation>
</message>
<message>
- <location line="+31"/>
+ <location line="+32"/>
<source>Use the test network</source>
<translation>Użyj sieci testowej</translation>
</message>
<message>
- <location line="-92"/>
+ <location line="-108"/>
<source>Accept connections from outside (default: 1 if no -proxy or -connect)</source>
<translation>Akceptuj połączenia z zewnątrz (domyślnie: 1 jeśli nie ustawiono -proxy lub -connect)</translation>
</message>
<message>
- <location line="-74"/>
+ <location line="-82"/>
<source>%s, you must set a rpcpassword in the configuration file:
- %s
+%s
It is recommended you use the following random password:
rpcuser=bitcoinrpc
rpcpassword=%s
(you do not need to remember this password)
The username and password MUST NOT be the same.
If the file does not exist, create it with owner-readable-only file permissions.
+It is also recommended to set alertnotify so you are notified of problems;
+for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.com
</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+15"/>
+ <location line="+17"/>
<source>An error occurred while setting up the RPC port %u for listening on IPv6, falling back to IPv4: %s</source>
<translation type="unfinished"/>
</message>
@@ -2283,11 +2411,6 @@ If the file does not exist, create it with owner-readable-only file permissions.
</message>
<message>
<location line="+3"/>
- <source>Corrupted block database detected. Please restart the client with -reindex.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+2"/>
<source>Error initializing database environment %s! To recover, BACKUP THAT DIRECTORY, then remove everything from it except for wallet.dat.</source>
<translation type="unfinished"/>
</message>
@@ -2302,12 +2425,27 @@ If the file does not exist, create it with owner-readable-only file permissions.
<translation type="unfinished"/>
</message>
<message>
+ <location line="+3"/>
+ <source>Execute command when a relevant alert is received (%s in cmd is replaced by message)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Execute command when a wallet transaction changes (%s in cmd is replaced by TxID)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location line="+11"/>
<source>Set maximum size of high-priority/low-fee transactions in bytes (default: 27000)</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+3"/>
+ <source>Set the number of script verification threads (1-16, 0=auto, default: 0)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
<source>This is a pre-release test build - use at your own risk - do not use for mining or merchant applications</source>
<translation type="unfinished"/>
</message>
@@ -2339,7 +2477,7 @@ If the file does not exist, create it with owner-readable-only file permissions.
<message>
<location line="+14"/>
<source>Attempt to recover private keys from a corrupt wallet.dat</source>
- <translation type="unfinished"/>
+ <translation>Próbuj odzyskać klucze prywatne z uszkodzonego wallet.dat</translation>
</message>
<message>
<location line="+2"/>
@@ -2353,51 +2491,146 @@ If the file does not exist, create it with owner-readable-only file permissions.
</message>
<message>
<location line="+3"/>
+ <source>Corrupted block database detected</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Discover own IP address (default: 1 when listening and no -externalip)</source>
<translation>Odkryj własny adres IP (domyślnie: 1 kiedy w trybie nasłuchu i brak -externalip )</translation>
</message>
<message>
+ <location line="+1"/>
+ <source>Do you want to rebuild the block database now?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location line="+3"/>
+ <source>Error initializing block database</source>
+ <translation>BÅ‚Ä…d inicjowania bloku bazy danych</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Error initializing wallet database environment %s!</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Error loading block database</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+5"/>
+ <location line="+4"/>
+ <source>Error opening block database</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
<source>Error: Disk space is low!</source>
<translation>Błąd: Mało miejsca na dysku!</translation>
</message>
<message>
<location line="+1"/>
<source>Error: Transaction creation failed!</source>
- <translation type="unfinished"/>
+ <translation>Błąd: Utworzenie transakcji nie powiodło się!</translation>
</message>
<message>
<location line="+1"/>
<source>Error: Wallet locked, unable to create transaction!</source>
- <translation type="unfinished"/>
+ <translation>Błąd: Zablokowany portfel, nie można utworzyć transakcji!</translation>
</message>
<message>
<location line="+2"/>
+ <source>Error: system error: </source>
+ <translation>Błąd: błąd systemu:</translation>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Failed to listen on any port. Use -listen=0 if you want this.</source>
<translation>Próba otwarcia jakiegokolwiek portu nie powiodła się. Użyj -listen=0 jeśli tego chcesz.</translation>
</message>
<message>
+ <location line="+1"/>
+ <source>Failed to read block info</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Failed to read block</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Failed to sync block index</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Failed to write block index</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Failed to write block info</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Failed to write block</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Failed to write file info</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Failed to write to coin database</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Failed to write transaction index</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Failed to write undo data</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location line="+2"/>
<source>Find peers using DNS lookup (default: 1 unless -connect)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+5"/>
+ <location line="+3"/>
+ <source>How many blocks to check at startup (default: 288, 0 = all)</source>
+ <translation>Ile bloków sprawdzić przy starcie (domyślnie: 288, 0 = wszystkie)</translation>
+ </message>
+ <message>
+ <location line="+1"/>
<source>How thorough the block verification is (0-4, default: 3)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+1"/>
- <source>Importing blocks from block database...</source>
+ <location line="+24"/>
+ <source>Rebuild block chain index from current blk000??.dat files</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+37"/>
+ <source>Verifying blocks...</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+1"/>
+ <source>Verifying wallet...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-61"/>
<source>Imports blocks from external blk000??.dat file</source>
<translation type="unfinished"/>
</message>
@@ -2412,7 +2645,12 @@ If the file does not exist, create it with owner-readable-only file permissions.
<translation>Nieprawidłowy adres -tor: &apos;%s&apos;</translation>
</message>
<message>
- <location line="+9"/>
+ <location line="+8"/>
+ <source>Maintain a full transaction index (default: 0)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
<source>Maximum per-connection receive buffer, &lt;n&gt;*1000 bytes (default: 5000)</source>
<translation>Maksymalny bufor odbioru na połączenie, &lt;n&gt;*1000 bajtów (domyślnie: 5000)</translation>
</message>
@@ -2447,12 +2685,7 @@ If the file does not exist, create it with owner-readable-only file permissions.
<translation>Poprzedź informacje debugowania znacznikiem czasowym</translation>
</message>
<message>
- <location line="+1"/>
- <source>Rebuild blockchain index from current blk000??.dat files</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+4"/>
+ <location line="+5"/>
<source>SSL options: (see the Bitcoin Wiki for SSL setup instructions)</source>
<translation>Opcje SSL: (odwiedź Bitcoin Wiki w celu uzyskania instrukcji)</translation>
</message>
@@ -2492,7 +2725,12 @@ If the file does not exist, create it with owner-readable-only file permissions.
<translation>Wskaż czas oczekiwania bezczynności połączenia w milisekundach (domyślnie: 5000)</translation>
</message>
<message>
- <location line="+13"/>
+ <location line="+4"/>
+ <source>System error: </source>
+ <translation>BÅ‚Ä…d systemu:</translation>
+ </message>
+ <message>
+ <location line="+10"/>
<source>Use UPnP to map the listening port (default: 0)</source>
<translation>Używaj UPnP do mapowania portu nasłuchu (domyślnie: 0)</translation>
</message>
@@ -2523,36 +2761,41 @@ If the file does not exist, create it with owner-readable-only file permissions.
</message>
<message>
<location line="+1"/>
+ <source>You need to rebuild the databases using -reindex to change -txindex</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>wallet.dat corrupt, salvage failed</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-43"/>
+ <location line="-45"/>
<source>Password for JSON-RPC connections</source>
<translation>Hasło do połączeń JSON-RPC</translation>
</message>
<message>
- <location line="-53"/>
+ <location line="-68"/>
<source>Allow JSON-RPC connections from specified IP address</source>
<translation>Przyjmuj połączenia JSON-RPC ze wskazanego adresu IP</translation>
</message>
<message>
- <location line="+62"/>
+ <location line="+77"/>
<source>Send commands to node running on &lt;ip&gt; (default: 127.0.0.1)</source>
<translation>Wysyłaj polecenia do węzła działającego na &lt;ip&gt; (domyślnie: 127.0.0.1)</translation>
</message>
<message>
- <location line="-103"/>
+ <location line="-120"/>
<source>Execute command when the best block changes (%s in cmd is replaced by block hash)</source>
<translation>Wykonaj polecenie kiedy najlepszy blok ulegnie zmianie (%s w komendzie zastanie zastÄ…pione przez hash bloku)</translation>
</message>
<message>
- <location line="+124"/>
+ <location line="+142"/>
<source>Upgrade wallet to latest format</source>
<translation>Zaktualizuj portfel do najnowszego formatu.</translation>
</message>
<message>
- <location line="-15"/>
+ <location line="-16"/>
<source>Set key pool size to &lt;n&gt; (default: 100)</source>
<translation>Ustaw rozmiar puli kluczy na &lt;n&gt; (domyślnie: 100)</translation>
</message>
@@ -2562,17 +2805,12 @@ If the file does not exist, create it with owner-readable-only file permissions.
<translation>Przeskanuj blok łańcuchów żeby znaleźć zaginione transakcje portfela</translation>
</message>
<message>
- <location line="-26"/>
- <source>How many blocks to check at startup (default: 2500, 0 = all)</source>
- <translation>Ile bloków sprawdzać przy uruchomieniu (domyślnie: 2500, 0 = wszystkie)</translation>
- </message>
- <message>
- <location line="+55"/>
+ <location line="+30"/>
<source>Use OpenSSL (https) for JSON-RPC connections</source>
<translation>Użyj OpenSSL (https) do połączeń JSON-RPC</translation>
</message>
<message>
- <location line="-20"/>
+ <location line="-21"/>
<source>Server certificate file (default: server.cert)</source>
<translation>Plik certyfikatu serwera (domyślnie: server.cert)</translation>
</message>
@@ -2582,12 +2820,12 @@ If the file does not exist, create it with owner-readable-only file permissions.
<translation>Klucz prywatny serwera (domyślnie: server.pem)</translation>
</message>
<message>
- <location line="-133"/>
+ <location line="-154"/>
<source>Acceptable ciphers (default: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH)</source>
<translation>Aceptowalne szyfry (domyślnie: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH)</translation>
</message>
<message>
- <location line="+144"/>
+ <location line="+166"/>
<source>This help message</source>
<translation>Ta wiadomość pomocy</translation>
</message>
@@ -2597,7 +2835,7 @@ If the file does not exist, create it with owner-readable-only file permissions.
<translation>Nie można przywiązać %s na tym komputerze (bind returned error %d, %s)</translation>
</message>
<message>
- <location line="-70"/>
+ <location line="-86"/>
<source>Connect through socks proxy</source>
<translation>ÅÄ…czy przez proxy socks</translation>
</message>
@@ -2607,12 +2845,12 @@ If the file does not exist, create it with owner-readable-only file permissions.
<translation>Zezwól -addnode, -seednode i -connect na łączenie się z serwerem DNS</translation>
</message>
<message>
- <location line="+43"/>
+ <location line="+57"/>
<source>Loading addresses...</source>
<translation>Wczytywanie adresów...</translation>
</message>
<message>
- <location line="-25"/>
+ <location line="-35"/>
<source>Error loading wallet.dat: Wallet corrupted</source>
<translation>BÅ‚Ä…d Å‚adowania wallet.dat: Uszkodzony portfel</translation>
</message>
@@ -2622,32 +2860,22 @@ If the file does not exist, create it with owner-readable-only file permissions.
<translation>BÅ‚Ä…d Å‚adowania wallet.dat: Portfel wymaga nowszej wersji Bitcoin</translation>
</message>
<message>
- <location line="+73"/>
- <source>Verifying block database integrity...</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+1"/>
- <source>Verifying wallet integrity...</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+1"/>
+ <location line="+87"/>
<source>Wallet needed to be rewritten: restart Bitcoin to complete</source>
<translation>Portfel wymaga przepisania: zrestartuj Bitcoina żeby ukończyć</translation>
</message>
<message>
- <location line="-77"/>
+ <location line="-89"/>
<source>Error loading wallet.dat</source>
<translation>BÅ‚Ä…d Å‚adowania wallet.dat</translation>
</message>
<message>
- <location line="+20"/>
+ <location line="+30"/>
<source>Invalid -proxy address: &apos;%s&apos;</source>
<translation>Nieprawidłowy adres -proxy: &apos;%s&apos;</translation>
</message>
<message>
- <location line="+46"/>
+ <location line="+48"/>
<source>Unknown network specified in -onlynet: &apos;%s&apos;</source>
<translation>Nieznana sieć w -onlynet: &apos;%s&apos;</translation>
</message>
@@ -2657,7 +2885,7 @@ If the file does not exist, create it with owner-readable-only file permissions.
<translation>Nieznana wersja proxy w -socks: %i</translation>
</message>
<message>
- <location line="-75"/>
+ <location line="-91"/>
<source>Cannot resolve -bind address: &apos;%s&apos;</source>
<translation>Nie można uzyskać adresu -bind: &apos;%s&apos;</translation>
</message>
@@ -2667,17 +2895,17 @@ If the file does not exist, create it with owner-readable-only file permissions.
<translation>Nie można uzyskać adresu -externalip: &apos;%s&apos;</translation>
</message>
<message>
- <location line="+31"/>
+ <location line="+45"/>
<source>Invalid amount for -paytxfee=&lt;amount&gt;: &apos;%s&apos;</source>
<translation>Nieprawidłowa kwota dla -paytxfee=&lt;amount&gt;: &apos;%s&apos;</translation>
</message>
<message>
- <location line="-15"/>
+ <location line="-24"/>
<source>Error: could not start node</source>
<translation>Błąd: nie można utworzyć węzła</translation>
</message>
<message>
- <location line="+16"/>
+ <location line="+25"/>
<source>Invalid amount</source>
<translation>Nieprawidłowa kwota</translation>
</message>
@@ -2692,7 +2920,7 @@ If the file does not exist, create it with owner-readable-only file permissions.
<translation>Åadowanie indeksu bloku...</translation>
</message>
<message>
- <location line="-45"/>
+ <location line="-59"/>
<source>Add a node to connect to and attempt to keep the connection open</source>
<translation>Dodaj węzeł do łączenia się and attempt to keep the connection open</translation>
</message>
@@ -2702,23 +2930,18 @@ If the file does not exist, create it with owner-readable-only file permissions.
<translation>Nie można przywiązać %s na tym komputerze. Bitcoin prawdopodobnie już działa.</translation>
</message>
<message>
- <location line="+54"/>
- <source>Find peers using internet relay chat (default: 0)</source>
- <translation>Znajdź peery używające IRC (domyślnie: 0)</translation>
- </message>
- <message>
- <location line="-2"/>
+ <location line="+68"/>
<source>Fee per KB to add to transactions you send</source>
<translation>
</translation>
</message>
<message>
- <location line="+19"/>
+ <location line="+17"/>
<source>Loading wallet...</source>
<translation>Wczytywanie portfela...</translation>
</message>
<message>
- <location line="-40"/>
+ <location line="-54"/>
<source>Cannot downgrade wallet</source>
<translation>Nie można dezaktualizować portfela</translation>
</message>
@@ -2733,27 +2956,27 @@ If the file does not exist, create it with owner-readable-only file permissions.
<translation>Nie można zapisać domyślnego adresu</translation>
</message>
<message>
- <location line="+49"/>
+ <location line="+64"/>
<source>Rescanning...</source>
<translation>Ponowne skanowanie...</translation>
</message>
<message>
- <location line="-43"/>
+ <location line="-56"/>
<source>Done loading</source>
<translation>Wczytywanie zakończone</translation>
</message>
<message>
- <location line="+65"/>
+ <location line="+79"/>
<source>To use the %s option</source>
<translation>Aby użyć opcji %s</translation>
</message>
<message>
- <location line="-60"/>
+ <location line="-71"/>
<source>Error</source>
<translation>BÅ‚Ä…d</translation>
</message>
<message>
- <location line="-28"/>
+ <location line="-33"/>
<source>You must set rpcpassword=&lt;password&gt; in the configuration file:
%s
If the file does not exist, create it with owner-readable-only file permissions.</source>
diff --git a/src/qt/locale/bitcoin_pt_BR.ts b/src/qt/locale/bitcoin_pt_BR.ts
index d13ce2c933..2f0ab98ec4 100644
--- a/src/qt/locale/bitcoin_pt_BR.ts
+++ b/src/qt/locale/bitcoin_pt_BR.ts
@@ -13,12 +13,7 @@
<translation>&lt;b&gt;Bitcoin&lt;/b&gt; versão</translation>
</message>
<message>
- <location line="+41"/>
- <source>Copyright © 2009-2012 The Bitcoin developers</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+13"/>
+ <location line="+57"/>
<source>
This is experimental software.
@@ -27,6 +22,16 @@ Distributed under the MIT/X11 software license, see the accompanying file COPYIN
This product includes software developed by the OpenSSL Project for use in the OpenSSL Toolkit (http://www.openssl.org/) and cryptographic software written by Eric Young (eay@cryptsoft.com) and UPnP software written by Thomas Bernard.</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../aboutdialog.cpp" line="+17"/>
+ <source>Copyright</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>2009-%1 The Bitcoin developers</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>AddressBookPage</name>
@@ -101,17 +106,22 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation>&amp;Excluir</translation>
</message>
<message>
- <location filename="../addressbookpage.cpp" line="+65"/>
+ <location filename="../addressbookpage.cpp" line="+66"/>
<source>Copy &amp;Label</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+2"/>
+ <location line="+1"/>
<source>&amp;Edit</source>
<translation>&amp;Editar</translation>
</message>
<message>
- <location line="+250"/>
+ <location line="+1"/>
+ <source>Send &amp;Coins</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+263"/>
<source>Export Address Book Data</source>
<translation>Exportação de dados do Catálogo de Endereços</translation>
</message>
@@ -134,7 +144,7 @@ This product includes software developed by the OpenSSL Project for use in the O
<context>
<name>AddressTableModel</name>
<message>
- <location filename="../addresstablemodel.cpp" line="+142"/>
+ <location filename="../addresstablemodel.cpp" line="+144"/>
<source>Label</source>
<translation>Rótulo</translation>
</message>
@@ -293,17 +303,17 @@ This product includes software developed by the OpenSSL Project for use in the O
<context>
<name>BitcoinGUI</name>
<message>
- <location filename="../bitcoingui.cpp" line="+267"/>
+ <location filename="../bitcoingui.cpp" line="+231"/>
<source>Sign &amp;message...</source>
<translation>&amp;Assinar Mensagem...</translation>
</message>
<message>
- <location line="+254"/>
+ <location line="+299"/>
<source>Synchronizing with network...</source>
<translation>Sincronizando com a rede...</translation>
</message>
<message>
- <location line="-322"/>
+ <location line="-367"/>
<source>&amp;Overview</source>
<translation>&amp;Visão geral</translation>
</message>
@@ -323,32 +333,17 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation>Navegar pelo histórico de transações</translation>
</message>
<message>
- <location line="+6"/>
- <source>&amp;Address Book</source>
- <translation>&amp;Catálogo de endereços</translation>
- </message>
- <message>
- <location line="+1"/>
+ <location line="+7"/>
<source>Edit the list of stored addresses and labels</source>
<translation>Editar a lista de endereços e rótulos</translation>
</message>
<message>
- <location line="-15"/>
- <source>&amp;Receive coins</source>
- <translation>&amp;Receber moedas</translation>
- </message>
- <message>
- <location line="+1"/>
+ <location line="-14"/>
<source>Show the list of addresses for receiving payments</source>
<translation>Mostrar a lista de endereços para receber pagamentos</translation>
</message>
<message>
- <location line="-8"/>
- <source>&amp;Send coins</source>
- <translation>&amp;Enviar moedas</translation>
- </message>
- <message>
- <location line="+39"/>
+ <location line="+31"/>
<source>E&amp;xit</source>
<translation type="unfinished"/>
</message>
@@ -393,7 +388,7 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation>&amp;Mudar frase de segurança...</translation>
</message>
<message>
- <location line="+259"/>
+ <location line="+304"/>
<source>Importing blocks from disk...</source>
<translation type="unfinished"/>
</message>
@@ -402,13 +397,8 @@ This product includes software developed by the OpenSSL Project for use in the O
<source>Reindexing blocks on disk...</source>
<translation type="unfinished"/>
</message>
- <message numerus="yes">
- <location line="+10"/>
- <source>~%n block(s) remaining</source>
- <translation><numerusform>~%n bloco restante</numerusform><numerusform>~%n blocos restantes</numerusform></translation>
- </message>
<message>
- <location line="-265"/>
+ <location line="-300"/>
<source>&amp;Export...</source>
<translation>&amp;Exportar...</translation>
</message>
@@ -453,18 +443,33 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation type="unfinished"/>
</message>
<message>
- <location line="-196"/>
- <location line="+538"/>
+ <location line="-162"/>
+ <location line="+540"/>
<source>Bitcoin</source>
<translation>Bitcoin</translation>
</message>
<message>
- <location line="-538"/>
+ <location line="-540"/>
<source>Wallet</source>
<translation>Carteira</translation>
</message>
<message>
- <location line="+176"/>
+ <location line="+99"/>
+ <source>&amp;Send</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+7"/>
+ <source>&amp;Receive</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+14"/>
+ <source>&amp;Addresses</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+22"/>
<source>&amp;About Bitcoin</source>
<translation>&amp;Sobre o Bitcoin</translation>
</message>
@@ -525,97 +530,92 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation>[testnet]</translation>
</message>
<message>
- <location line="+63"/>
+ <location line="+47"/>
<source>Bitcoin client</source>
<translation>Cliente Bitcoin</translation>
</message>
<message numerus="yes">
- <location line="+79"/>
+ <location line="+140"/>
<source>%n active connection(s) to Bitcoin network</source>
<translation><numerusform>%n conexão ativa na rede Bitcoin</numerusform><numerusform>%n conexões ativas na rede Bitcoin</numerusform></translation>
</message>
<message>
- <location line="+45"/>
- <source>Processed %1 of %2 blocks of transaction history (%3% done).</source>
+ <location line="+39"/>
+ <source>Processed %1 of %2 (estimated) blocks of transaction history.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+7"/>
+ <location line="+4"/>
<source>Processed %1 blocks of transaction history.</source>
<translation type="unfinished"/>
</message>
+ <message numerus="yes">
+ <location line="+20"/>
+ <source>%n hour(s)</source>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
+ <message numerus="yes">
+ <location line="+4"/>
+ <source>%n day(s)</source>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
+ <message numerus="yes">
+ <location line="+4"/>
+ <source>%n week(s)</source>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
<message>
- <location line="+70"/>
- <source>Error</source>
+ <location line="+5"/>
+ <source>%1 behind</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+3"/>
- <source>Warning</source>
+ <location line="+14"/>
+ <source>Last received block was generated %1 ago.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+3"/>
- <source>Information</source>
+ <location line="+2"/>
+ <source>Transactions after this will not yet be visible.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+66"/>
- <source>This transaction is over the size limit. You can still send it for a fee of %1, which goes to the nodes that process your transaction and helps to support the network. Do you want to pay the fee?</source>
+ <location line="+21"/>
+ <source>Error</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+210"/>
- <source>Backup Successful</source>
+ <location line="+3"/>
+ <source>Warning</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+0"/>
- <source>The wallet data was successfully saved to the new location.</source>
+ <location line="+3"/>
+ <source>Information</source>
<translation type="unfinished"/>
</message>
- <message numerus="yes">
- <location line="-338"/>
- <source>%n second(s) ago</source>
- <translation><numerusform>%n segundo atrás</numerusform><numerusform>%n segundos atrás</numerusform></translation>
- </message>
- <message numerus="yes">
- <location line="+4"/>
- <source>%n minute(s) ago</source>
- <translation><numerusform>%n minutos atrás</numerusform><numerusform>%n minutos atrás</numerusform></translation>
- </message>
- <message numerus="yes">
- <location line="+4"/>
- <source>%n hour(s) ago</source>
- <translation><numerusform>%n hora atrás</numerusform><numerusform>%n horas atrás</numerusform></translation>
- </message>
- <message numerus="yes">
- <location line="+4"/>
- <source>%n day(s) ago</source>
- <translation><numerusform>%n dia atrás</numerusform><numerusform>%n dias atrás</numerusform></translation>
+ <message>
+ <location line="+68"/>
+ <source>This transaction is over the size limit. You can still send it for a fee of %1, which goes to the nodes that process your transaction and helps to support the network. Do you want to pay the fee?</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location line="+6"/>
+ <location line="-138"/>
<source>Up to date</source>
<translation>Atualizado</translation>
</message>
<message>
- <location line="+7"/>
+ <location line="+32"/>
<source>Catching up...</source>
<translation>Recuperando o atraso ...</translation>
</message>
<message>
- <location line="+10"/>
- <source>Last received block was generated %1.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+97"/>
+ <location line="+110"/>
<source>Confirm transaction fee</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+23"/>
+ <location line="+8"/>
<source>Sent transaction</source>
<translation type="unfinished"/>
</message>
@@ -637,14 +637,14 @@ Tipo: %3
Endereço: %4</translation>
</message>
<message>
- <location line="+99"/>
- <location line="+28"/>
+ <location line="+33"/>
+ <location line="+23"/>
<source>URI handling</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-28"/>
- <location line="+28"/>
+ <location line="-23"/>
+ <location line="+23"/>
<source>URI can not be parsed! This can be caused by an invalid Bitcoin address or malformed URI parameters.</source>
<translation type="unfinished"/>
</message>
@@ -659,27 +659,7 @@ Endereço: %4</translation>
<translation type="unfinished"/>
</message>
<message>
- <location line="+23"/>
- <source>Backup Wallet</source>
- <translation>Fazer cópia de segurança da Carteira</translation>
- </message>
- <message>
- <location line="+0"/>
- <source>Wallet Data (*.dat)</source>
- <translation>Dados da Carteira (*.dat)</translation>
- </message>
- <message>
- <location line="+3"/>
- <source>Backup Failed</source>
- <translation>Cópia de segurança Falhou</translation>
- </message>
- <message>
- <location line="+0"/>
- <source>There was an error trying to save the wallet data to the new location.</source>
- <translation>Houve um erro ao tentar salvar os dados da carteira para uma nova localização.</translation>
- </message>
- <message>
- <location filename="../bitcoin.cpp" line="+109"/>
+ <location filename="../bitcoin.cpp" line="+108"/>
<source>A fatal error occurred. Bitcoin can no longer continue safely and will quit.</source>
<translation type="unfinished"/>
</message>
@@ -687,7 +667,7 @@ Endereço: %4</translation>
<context>
<name>ClientModel</name>
<message>
- <location filename="../clientmodel.cpp" line="+86"/>
+ <location filename="../clientmodel.cpp" line="+96"/>
<source>Network Alert</source>
<translation type="unfinished"/>
</message>
@@ -720,7 +700,7 @@ Endereço: %4</translation>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../editaddressdialog.cpp" line="+20"/>
+ <location filename="../editaddressdialog.cpp" line="+21"/>
<source>New receiving address</source>
<translation type="unfinished"/>
</message>
@@ -740,17 +720,17 @@ Endereço: %4</translation>
<translation type="unfinished"/>
</message>
<message>
- <location line="+60"/>
+ <location line="+76"/>
<source>The entered address &quot;%1&quot; is already in the address book.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+5"/>
+ <location line="-5"/>
<source>The entered address &quot;%1&quot; is not a valid Bitcoin address.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+5"/>
+ <location line="+10"/>
<source>Could not unlock wallet.</source>
<translation type="unfinished"/>
</message>
@@ -763,7 +743,7 @@ Endereço: %4</translation>
<context>
<name>GUIUtil::HelpMessageBox</name>
<message>
- <location filename="../guiutil.cpp" line="+419"/>
+ <location filename="../guiutil.cpp" line="+422"/>
<location line="+12"/>
<source>Bitcoin-Qt</source>
<translation type="unfinished"/>
@@ -977,7 +957,7 @@ Endereço: %4</translation>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../optionsdialog.cpp" line="+55"/>
+ <location filename="../optionsdialog.cpp" line="+53"/>
<source>default</source>
<translation type="unfinished"/>
</message>
@@ -1022,23 +1002,18 @@ Endereço: %4</translation>
<translation type="unfinished"/>
</message>
<message>
- <location line="+51"/>
- <location line="+183"/>
+ <location line="+50"/>
+ <location line="+166"/>
<source>The displayed information may be out of date. Your wallet automatically synchronizes with the Bitcoin network after a connection is established, but this process has not completed yet.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-141"/>
+ <location line="-124"/>
<source>Balance:</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+58"/>
- <source>Number of transactions:</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="-29"/>
+ <location line="+29"/>
<source>Unconfirmed:</source>
<translation type="unfinished"/>
</message>
@@ -1048,7 +1023,7 @@ Endereço: %4</translation>
<translation>Carteira</translation>
</message>
<message>
- <location line="+124"/>
+ <location line="+107"/>
<source>Immature:</source>
<translation type="unfinished"/>
</message>
@@ -1063,7 +1038,7 @@ Endereço: %4</translation>
<translation type="unfinished"/>
</message>
<message>
- <location line="-118"/>
+ <location line="-101"/>
<source>Your current balance</source>
<translation type="unfinished"/>
</message>
@@ -1073,11 +1048,6 @@ Endereço: %4</translation>
<translation type="unfinished"/>
</message>
<message>
- <location line="+20"/>
- <source>Total number of transactions in wallet</source>
- <translation type="unfinished"/>
- </message>
- <message>
<location filename="../overviewpage.cpp" line="+115"/>
<location line="+1"/>
<source>out of sync</source>
@@ -1085,6 +1055,14 @@ Endereço: %4</translation>
</message>
</context>
<context>
+ <name>PaymentServer</name>
+ <message>
+ <location filename="../paymentserver.cpp" line="+107"/>
+ <source>Cannot start bitcoin: click-to-pay handler</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>QRCodeDialog</name>
<message>
<location filename="../forms/qrcodedialog.ui" line="+14"/>
@@ -1423,7 +1401,7 @@ Endereço: %4</translation>
</message>
<message>
<location line="+60"/>
- <location filename="../sendcoinsentry.cpp" line="+25"/>
+ <location filename="../sendcoinsentry.cpp" line="+26"/>
<source>Enter a label for this address to add it to your address book</source>
<translation type="unfinished"/>
</message>
@@ -1659,7 +1637,7 @@ Endereço: %4</translation>
<context>
<name>TransactionDesc</name>
<message>
- <location filename="../transactiondesc.cpp" line="+19"/>
+ <location filename="../transactiondesc.cpp" line="+20"/>
<source>Open until %1</source>
<translation type="unfinished"/>
</message>
@@ -1846,7 +1824,7 @@ Endereço: %4</translation>
<context>
<name>TransactionTableModel</name>
<message>
- <location filename="../transactiontablemodel.cpp" line="+226"/>
+ <location filename="../transactiontablemodel.cpp" line="+225"/>
<source>Date</source>
<translation type="unfinished"/>
</message>
@@ -1964,7 +1942,7 @@ Endereço: %4</translation>
<context>
<name>TransactionView</name>
<message>
- <location filename="../transactionview.cpp" line="+55"/>
+ <location filename="../transactionview.cpp" line="+52"/>
<location line="+16"/>
<source>All</source>
<translation type="unfinished"/>
@@ -2051,6 +2029,11 @@ Endereço: %4</translation>
</message>
<message>
<location line="+1"/>
+ <source>Copy transaction ID</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Edit label</source>
<translation type="unfinished"/>
</message>
@@ -2060,7 +2043,7 @@ Endereço: %4</translation>
<translation type="unfinished"/>
</message>
<message>
- <location line="+142"/>
+ <location line="+139"/>
<source>Export Transaction Data</source>
<translation type="unfinished"/>
</message>
@@ -2115,7 +2098,7 @@ Endereço: %4</translation>
<translation type="unfinished"/>
</message>
<message>
- <location line="+95"/>
+ <location line="+100"/>
<source>Range:</source>
<translation type="unfinished"/>
</message>
@@ -2126,29 +2109,172 @@ Endereço: %4</translation>
</message>
</context>
<context>
+ <name>WalletView</name>
+ <message>
+ <location filename="../walletview.cpp" line="+95"/>
+ <source>&amp;Overview</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Show general overview of wallet</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>&amp;Send coins</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Send coins to a Bitcoin address</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>&amp;Receive coins</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Show the list of addresses for receiving payments</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>&amp;Transactions</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Browse transaction history</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>&amp;Address Book</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Edit the list of stored addresses and labels</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+12"/>
+ <source>&amp;Encrypt Wallet...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Encrypt the private keys that belong to your wallet</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>&amp;Backup Wallet...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Backup wallet to another location</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>&amp;Change Passphrase...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Change the passphrase used for wallet encryption</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Sign &amp;message...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Sign messages with your Bitcoin addresses to prove you own them</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>&amp;Verify message...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Verify messages to ensure they were signed with specified Bitcoin addresses</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>&amp;Export...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Export the data in the current tab to a file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+180"/>
+ <source>Backup Wallet</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>Wallet Data (*.dat)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Backup Failed</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>There was an error trying to save the wallet data to the new location.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>Backup Successful</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>The wallet data was successfully saved to the new location.</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>bitcoin-core</name>
<message>
- <location filename="../bitcoinstrings.cpp" line="+88"/>
+ <location filename="../bitcoinstrings.cpp" line="+96"/>
<source>Bitcoin version</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+82"/>
+ <location line="+98"/>
<source>Usage:</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-23"/>
+ <location line="-24"/>
<source>Send command to -server or bitcoind</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-21"/>
+ <location line="-22"/>
<source>List commands</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-11"/>
+ <location line="-10"/>
<source>Get help for a command</source>
<translation type="unfinished"/>
</message>
@@ -2173,12 +2299,12 @@ Endereço: %4</translation>
<translation type="unfinished"/>
</message>
<message>
- <location line="-15"/>
+ <location line="-28"/>
<source>Don&apos;t generate coins</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+61"/>
+ <location line="+74"/>
<source>Specify data directory</source>
<translation type="unfinished"/>
</message>
@@ -2188,80 +2314,82 @@ Endereço: %4</translation>
<translation>Definir o tamanho do cache do banco de dados em megabytes (padrão: 25)</translation>
</message>
<message>
- <location line="-26"/>
+ <location line="-27"/>
<source>Listen for connections on &lt;port&gt; (default: 8333 or testnet: 18333)</source>
<translation>Procurar por conexões em &lt;port&gt; (padrão: 8333 ou testnet:18333)</translation>
</message>
<message>
- <location line="+4"/>
+ <location line="+5"/>
<source>Maintain at most &lt;n&gt; connections to peers (default: 125)</source>
<translation>Manter no máximo &lt;n&gt; conexões aos peers (padrão: 125)</translation>
</message>
<message>
- <location line="-34"/>
+ <location line="-49"/>
<source>Connect to a node to retrieve peer addresses, and disconnect</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+65"/>
+ <location line="+80"/>
<source>Specify your own public address</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+2"/>
+ <location line="+3"/>
<source>Threshold for disconnecting misbehaving peers (default: 100)</source>
<translation>Limite para desconectar peers mal comportados (padrão: 100)</translation>
</message>
<message>
- <location line="-114"/>
+ <location line="-132"/>
<source>Number of seconds to keep misbehaving peers from reconnecting (default: 86400)</source>
<translation>Número de segundos para impedir que peers mal comportados reconectem (padrão: 86400)</translation>
</message>
<message>
- <location line="-28"/>
+ <location line="-32"/>
<source>An error occurred while setting up the RPC port %u for listening on IPv4: %s</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+26"/>
+ <location line="+30"/>
<source>Listen for JSON-RPC connections on &lt;port&gt; (default: 8332 or testnet: 18332)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+34"/>
+ <location line="+36"/>
<source>Accept command line and JSON-RPC commands</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+62"/>
+ <location line="+77"/>
<source>Run in the background as a daemon and accept commands</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+31"/>
+ <location line="+32"/>
<source>Use the test network</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-92"/>
+ <location line="-108"/>
<source>Accept connections from outside (default: 1 if no -proxy or -connect)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-74"/>
+ <location line="-82"/>
<source>%s, you must set a rpcpassword in the configuration file:
- %s
+%s
It is recommended you use the following random password:
rpcuser=bitcoinrpc
rpcpassword=%s
(you do not need to remember this password)
The username and password MUST NOT be the same.
If the file does not exist, create it with owner-readable-only file permissions.
+It is also recommended to set alertnotify so you are notified of problems;
+for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.com
</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+15"/>
+ <location line="+17"/>
<source>An error occurred while setting up the RPC port %u for listening on IPv6, falling back to IPv4: %s</source>
<translation type="unfinished"/>
</message>
@@ -2277,11 +2405,6 @@ If the file does not exist, create it with owner-readable-only file permissions.
</message>
<message>
<location line="+3"/>
- <source>Corrupted block database detected. Please restart the client with -reindex.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+2"/>
<source>Error initializing database environment %s! To recover, BACKUP THAT DIRECTORY, then remove everything from it except for wallet.dat.</source>
<translation type="unfinished"/>
</message>
@@ -2296,12 +2419,27 @@ If the file does not exist, create it with owner-readable-only file permissions.
<translation type="unfinished"/>
</message>
<message>
+ <location line="+3"/>
+ <source>Execute command when a relevant alert is received (%s in cmd is replaced by message)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Execute command when a wallet transaction changes (%s in cmd is replaced by TxID)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location line="+11"/>
<source>Set maximum size of high-priority/low-fee transactions in bytes (default: 27000)</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+3"/>
+ <source>Set the number of script verification threads (1-16, 0=auto, default: 0)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
<source>This is a pre-release test build - use at your own risk - do not use for mining or merchant applications</source>
<translation type="unfinished"/>
</message>
@@ -2347,16 +2485,41 @@ If the file does not exist, create it with owner-readable-only file permissions.
</message>
<message>
<location line="+3"/>
+ <source>Corrupted block database detected</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Discover own IP address (default: 1 when listening and no -externalip)</source>
<translation type="unfinished"/>
</message>
<message>
+ <location line="+1"/>
+ <source>Do you want to rebuild the block database now?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location line="+3"/>
+ <source>Error initializing block database</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Error initializing wallet database environment %s!</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Error loading block database</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+5"/>
+ <location line="+4"/>
+ <source>Error opening block database</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
<source>Error: Disk space is low!</source>
<translation type="unfinished"/>
</message>
@@ -2372,26 +2535,96 @@ If the file does not exist, create it with owner-readable-only file permissions.
</message>
<message>
<location line="+2"/>
+ <source>Error: system error: </source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Failed to listen on any port. Use -listen=0 if you want this.</source>
<translation type="unfinished"/>
</message>
<message>
+ <location line="+1"/>
+ <source>Failed to read block info</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Failed to read block</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Failed to sync block index</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Failed to write block index</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Failed to write block info</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Failed to write block</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Failed to write file info</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Failed to write to coin database</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Failed to write transaction index</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Failed to write undo data</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location line="+2"/>
<source>Find peers using DNS lookup (default: 1 unless -connect)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+5"/>
- <source>How thorough the block verification is (0-4, default: 3)</source>
+ <location line="+3"/>
+ <source>How many blocks to check at startup (default: 288, 0 = all)</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+1"/>
- <source>Importing blocks from block database...</source>
+ <source>How thorough the block verification is (0-4, default: 3)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+24"/>
+ <source>Rebuild block chain index from current blk000??.dat files</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+37"/>
+ <source>Verifying blocks...</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+1"/>
+ <source>Verifying wallet...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-61"/>
<source>Imports blocks from external blk000??.dat file</source>
<translation type="unfinished"/>
</message>
@@ -2406,7 +2639,12 @@ If the file does not exist, create it with owner-readable-only file permissions.
<translation type="unfinished"/>
</message>
<message>
- <location line="+9"/>
+ <location line="+8"/>
+ <source>Maintain a full transaction index (default: 0)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
<source>Maximum per-connection receive buffer, &lt;n&gt;*1000 bytes (default: 5000)</source>
<translation type="unfinished"/>
</message>
@@ -2441,12 +2679,7 @@ If the file does not exist, create it with owner-readable-only file permissions.
<translation>Pré anexar a saída de debug com estampa de tempo</translation>
</message>
<message>
- <location line="+1"/>
- <source>Rebuild blockchain index from current blk000??.dat files</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+4"/>
+ <location line="+5"/>
<source>SSL options: (see the Bitcoin Wiki for SSL setup instructions)</source>
<translation type="unfinished"/>
</message>
@@ -2486,7 +2719,12 @@ If the file does not exist, create it with owner-readable-only file permissions.
<translation type="unfinished"/>
</message>
<message>
- <location line="+13"/>
+ <location line="+4"/>
+ <source>System error: </source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+10"/>
<source>Use UPnP to map the listening port (default: 0)</source>
<translation type="unfinished"/>
</message>
@@ -2517,36 +2755,41 @@ If the file does not exist, create it with owner-readable-only file permissions.
</message>
<message>
<location line="+1"/>
+ <source>You need to rebuild the databases using -reindex to change -txindex</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>wallet.dat corrupt, salvage failed</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-43"/>
+ <location line="-45"/>
<source>Password for JSON-RPC connections</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-53"/>
+ <location line="-68"/>
<source>Allow JSON-RPC connections from specified IP address</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+62"/>
+ <location line="+77"/>
<source>Send commands to node running on &lt;ip&gt; (default: 127.0.0.1)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-103"/>
+ <location line="-120"/>
<source>Execute command when the best block changes (%s in cmd is replaced by block hash)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+124"/>
+ <location line="+142"/>
<source>Upgrade wallet to latest format</source>
<translation>Atualizar carteira para o formato mais recente</translation>
</message>
<message>
- <location line="-15"/>
+ <location line="-16"/>
<source>Set key pool size to &lt;n&gt; (default: 100)</source>
<translation type="unfinished"/>
</message>
@@ -2556,17 +2799,12 @@ If the file does not exist, create it with owner-readable-only file permissions.
<translation type="unfinished"/>
</message>
<message>
- <location line="-26"/>
- <source>How many blocks to check at startup (default: 2500, 0 = all)</source>
- <translation>Quantos blocos verificar ao iniciar (padrão: 2500, 0 = todos)</translation>
- </message>
- <message>
- <location line="+55"/>
+ <location line="+30"/>
<source>Use OpenSSL (https) for JSON-RPC connections</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-20"/>
+ <location line="-21"/>
<source>Server certificate file (default: server.cert)</source>
<translation type="unfinished"/>
</message>
@@ -2576,12 +2814,12 @@ If the file does not exist, create it with owner-readable-only file permissions.
<translation type="unfinished"/>
</message>
<message>
- <location line="-133"/>
+ <location line="-154"/>
<source>Acceptable ciphers (default: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+144"/>
+ <location line="+166"/>
<source>This help message</source>
<translation type="unfinished"/>
</message>
@@ -2591,7 +2829,7 @@ If the file does not exist, create it with owner-readable-only file permissions.
<translation type="unfinished"/>
</message>
<message>
- <location line="-70"/>
+ <location line="-86"/>
<source>Connect through socks proxy</source>
<translation type="unfinished"/>
</message>
@@ -2601,12 +2839,12 @@ If the file does not exist, create it with owner-readable-only file permissions.
<translation type="unfinished"/>
</message>
<message>
- <location line="+43"/>
+ <location line="+57"/>
<source>Loading addresses...</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-25"/>
+ <location line="-35"/>
<source>Error loading wallet.dat: Wallet corrupted</source>
<translation>Erro ao carregar wallet.dat: Carteira corrompida</translation>
</message>
@@ -2616,32 +2854,22 @@ If the file does not exist, create it with owner-readable-only file permissions.
<translation>Erro ao carregar wallet.dat: Carteira requer uma versão mais nova do Bitcoin</translation>
</message>
<message>
- <location line="+73"/>
- <source>Verifying block database integrity...</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+1"/>
- <source>Verifying wallet integrity...</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+1"/>
+ <location line="+87"/>
<source>Wallet needed to be rewritten: restart Bitcoin to complete</source>
<translation>A Carteira precisou ser reescrita: reinicie o Bitcoin para completar</translation>
</message>
<message>
- <location line="-77"/>
+ <location line="-89"/>
<source>Error loading wallet.dat</source>
<translation>Erro ao carregar wallet.dat</translation>
</message>
<message>
- <location line="+20"/>
+ <location line="+30"/>
<source>Invalid -proxy address: &apos;%s&apos;</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+46"/>
+ <location line="+48"/>
<source>Unknown network specified in -onlynet: &apos;%s&apos;</source>
<translation type="unfinished"/>
</message>
@@ -2651,7 +2879,7 @@ If the file does not exist, create it with owner-readable-only file permissions.
<translation type="unfinished"/>
</message>
<message>
- <location line="-75"/>
+ <location line="-91"/>
<source>Cannot resolve -bind address: &apos;%s&apos;</source>
<translation type="unfinished"/>
</message>
@@ -2661,17 +2889,17 @@ If the file does not exist, create it with owner-readable-only file permissions.
<translation type="unfinished"/>
</message>
<message>
- <location line="+31"/>
+ <location line="+45"/>
<source>Invalid amount for -paytxfee=&lt;amount&gt;: &apos;%s&apos;</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-15"/>
+ <location line="-24"/>
<source>Error: could not start node</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+16"/>
+ <location line="+25"/>
<source>Invalid amount</source>
<translation type="unfinished"/>
</message>
@@ -2686,7 +2914,7 @@ If the file does not exist, create it with owner-readable-only file permissions.
<translation type="unfinished"/>
</message>
<message>
- <location line="-45"/>
+ <location line="-59"/>
<source>Add a node to connect to and attempt to keep the connection open</source>
<translation type="unfinished"/>
</message>
@@ -2696,22 +2924,17 @@ If the file does not exist, create it with owner-readable-only file permissions.
<translation type="unfinished"/>
</message>
<message>
- <location line="+54"/>
- <source>Find peers using internet relay chat (default: 0)</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="-2"/>
+ <location line="+68"/>
<source>Fee per KB to add to transactions you send</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+19"/>
+ <location line="+17"/>
<source>Loading wallet...</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-40"/>
+ <location line="-54"/>
<source>Cannot downgrade wallet</source>
<translation type="unfinished"/>
</message>
@@ -2726,27 +2949,27 @@ If the file does not exist, create it with owner-readable-only file permissions.
<translation type="unfinished"/>
</message>
<message>
- <location line="+49"/>
+ <location line="+64"/>
<source>Rescanning...</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-43"/>
+ <location line="-56"/>
<source>Done loading</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+65"/>
+ <location line="+79"/>
<source>To use the %s option</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-60"/>
+ <location line="-71"/>
<source>Error</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-28"/>
+ <location line="-33"/>
<source>You must set rpcpassword=&lt;password&gt; in the configuration file:
%s
If the file does not exist, create it with owner-readable-only file permissions.</source>
diff --git a/src/qt/locale/bitcoin_pt_PT.ts b/src/qt/locale/bitcoin_pt_PT.ts
index 72f5b4a064..bd917affb8 100644
--- a/src/qt/locale/bitcoin_pt_PT.ts
+++ b/src/qt/locale/bitcoin_pt_PT.ts
@@ -13,12 +13,7 @@
<translation>&lt;b&gt;Bitcoin&lt;/b&gt; versão</translation>
</message>
<message>
- <location line="+41"/>
- <source>Copyright © 2009-2012 The Bitcoin developers</source>
- <translation>Copyright © 2009-2012 Os Programadores Bitcoin</translation>
- </message>
- <message>
- <location line="+13"/>
+ <location line="+57"/>
<source>
This is experimental software.
@@ -32,6 +27,16 @@ Distribuído sob uma licença de software MIT/X11, por favor verifique o ficheir
Este produto inclui software desenvolvido pelo Projecto OpenSSL para uso no OpenSSL Toolkit (http://www.openssl.org/), software criptográfico escrito por Eric Young (eay@cryptsoft.com) e software UPnP escrito por Thomas Bernard.</translation>
</message>
+ <message>
+ <location filename="../aboutdialog.cpp" line="+17"/>
+ <source>Copyright</source>
+ <translation>Copyright</translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>2009-%1 The Bitcoin developers</source>
+ <translation>2009-%1 Os programadores Bitcoin</translation>
+ </message>
</context>
<context>
<name>AddressBookPage</name>
@@ -106,17 +111,22 @@ Este produto inclui software desenvolvido pelo Projecto OpenSSL para uso no Open
<translation>E&amp;liminar</translation>
</message>
<message>
- <location filename="../addressbookpage.cpp" line="+65"/>
+ <location filename="../addressbookpage.cpp" line="+66"/>
<source>Copy &amp;Label</source>
<translation>Copiar &amp;Rótulo</translation>
</message>
<message>
- <location line="+2"/>
+ <location line="+1"/>
<source>&amp;Edit</source>
<translation>&amp;Editar</translation>
</message>
<message>
- <location line="+250"/>
+ <location line="+1"/>
+ <source>Send &amp;Coins</source>
+ <translation>Enviar &amp;Moedas</translation>
+ </message>
+ <message>
+ <location line="+263"/>
<source>Export Address Book Data</source>
<translation>Exportar dados do Livro de Endereços</translation>
</message>
@@ -139,7 +149,7 @@ Este produto inclui software desenvolvido pelo Projecto OpenSSL para uso no Open
<context>
<name>AddressTableModel</name>
<message>
- <location filename="../addresstablemodel.cpp" line="+142"/>
+ <location filename="../addresstablemodel.cpp" line="+144"/>
<source>Label</source>
<translation>Rótulo</translation>
</message>
@@ -298,17 +308,17 @@ Este produto inclui software desenvolvido pelo Projecto OpenSSL para uso no Open
<context>
<name>BitcoinGUI</name>
<message>
- <location filename="../bitcoingui.cpp" line="+267"/>
+ <location filename="../bitcoingui.cpp" line="+231"/>
<source>Sign &amp;message...</source>
<translation>Assinar &amp;mensagem...</translation>
</message>
<message>
- <location line="+254"/>
+ <location line="+299"/>
<source>Synchronizing with network...</source>
<translation>Sincronizando com a rede...</translation>
</message>
<message>
- <location line="-322"/>
+ <location line="-367"/>
<source>&amp;Overview</source>
<translation>Visã&amp;o geral</translation>
</message>
@@ -328,32 +338,17 @@ Este produto inclui software desenvolvido pelo Projecto OpenSSL para uso no Open
<translation>Navegar pelo histórico de transações</translation>
</message>
<message>
- <location line="+6"/>
- <source>&amp;Address Book</source>
- <translation>L&amp;ivro de endereços</translation>
- </message>
- <message>
- <location line="+1"/>
+ <location line="+7"/>
<source>Edit the list of stored addresses and labels</source>
<translation>Editar a lista de endereços e rótulos</translation>
</message>
<message>
- <location line="-15"/>
- <source>&amp;Receive coins</source>
- <translation>&amp;Receber moedas</translation>
- </message>
- <message>
- <location line="+1"/>
+ <location line="-14"/>
<source>Show the list of addresses for receiving payments</source>
<translation>Mostrar a lista de endereços para receber pagamentos</translation>
</message>
<message>
- <location line="-8"/>
- <source>&amp;Send coins</source>
- <translation>&amp;Enviar moedas</translation>
- </message>
- <message>
- <location line="+39"/>
+ <location line="+31"/>
<source>E&amp;xit</source>
<translation>Fec&amp;har</translation>
</message>
@@ -398,7 +393,7 @@ Este produto inclui software desenvolvido pelo Projecto OpenSSL para uso no Open
<translation>Mudar &amp;Palavra-passe...</translation>
</message>
<message>
- <location line="+259"/>
+ <location line="+304"/>
<source>Importing blocks from disk...</source>
<translation>Importando blocos do disco...</translation>
</message>
@@ -407,13 +402,8 @@ Este produto inclui software desenvolvido pelo Projecto OpenSSL para uso no Open
<source>Reindexing blocks on disk...</source>
<translation>Reindexando blocos no disco...</translation>
</message>
- <message numerus="yes">
- <location line="+10"/>
- <source>~%n block(s) remaining</source>
- <translation><numerusform>~%n bloco restante</numerusform><numerusform>~%n blocos restantes</numerusform></translation>
- </message>
<message>
- <location line="-265"/>
+ <location line="-300"/>
<source>&amp;Export...</source>
<translation>&amp;Exportar...</translation>
</message>
@@ -458,18 +448,33 @@ Este produto inclui software desenvolvido pelo Projecto OpenSSL para uso no Open
<translation>&amp;Verificar mensagem...</translation>
</message>
<message>
- <location line="-196"/>
- <location line="+538"/>
+ <location line="-162"/>
+ <location line="+540"/>
<source>Bitcoin</source>
<translation>Bitcoin</translation>
</message>
<message>
- <location line="-538"/>
+ <location line="-540"/>
<source>Wallet</source>
<translation>Carteira</translation>
</message>
<message>
- <location line="+176"/>
+ <location line="+99"/>
+ <source>&amp;Send</source>
+ <translation>&amp;Enviar</translation>
+ </message>
+ <message>
+ <location line="+7"/>
+ <source>&amp;Receive</source>
+ <translation>&amp;Receber</translation>
+ </message>
+ <message>
+ <location line="+14"/>
+ <source>&amp;Addresses</source>
+ <translation>E&amp;ndereços</translation>
+ </message>
+ <message>
+ <location line="+22"/>
<source>&amp;About Bitcoin</source>
<translation>&amp;Sobre o Bitcoin</translation>
</message>
@@ -530,27 +535,57 @@ Este produto inclui software desenvolvido pelo Projecto OpenSSL para uso no Open
<translation>[rede de testes]</translation>
</message>
<message>
- <location line="+63"/>
+ <location line="+47"/>
<source>Bitcoin client</source>
<translation>Cliente Bitcoin</translation>
</message>
<message numerus="yes">
- <location line="+79"/>
+ <location line="+140"/>
<source>%n active connection(s) to Bitcoin network</source>
<translation><numerusform>%n ligação ativa à rede Bitcoin</numerusform><numerusform>%n ligações ativas à rede Bitcoin</numerusform></translation>
</message>
<message>
- <location line="+45"/>
- <source>Processed %1 of %2 blocks of transaction history (%3% done).</source>
- <translation>Processados %1 de %2 blocos do histórico de transações (%3% completo).</translation>
+ <location line="+39"/>
+ <source>Processed %1 of %2 (estimated) blocks of transaction history.</source>
+ <translation>Processados %1 dos %2 blocos (estimados) do histórico de transacções.</translation>
</message>
<message>
- <location line="+7"/>
+ <location line="+4"/>
<source>Processed %1 blocks of transaction history.</source>
<translation>Processados %1 blocos do histórico de transações.</translation>
</message>
+ <message numerus="yes">
+ <location line="+20"/>
+ <source>%n hour(s)</source>
+ <translation><numerusform>%n hora</numerusform><numerusform>%n horas</numerusform></translation>
+ </message>
+ <message numerus="yes">
+ <location line="+4"/>
+ <source>%n day(s)</source>
+ <translation><numerusform>%n dia</numerusform><numerusform>%n dias</numerusform></translation>
+ </message>
+ <message numerus="yes">
+ <location line="+4"/>
+ <source>%n week(s)</source>
+ <translation><numerusform>%n semana</numerusform><numerusform>%n semanas</numerusform></translation>
+ </message>
<message>
- <location line="+70"/>
+ <location line="+5"/>
+ <source>%1 behind</source>
+ <translation>%1 em atraso</translation>
+ </message>
+ <message>
+ <location line="+14"/>
+ <source>Last received block was generated %1 ago.</source>
+ <translation>Último bloco recebido foi gerado há %1 atrás.</translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Transactions after this will not yet be visible.</source>
+ <translation>Transações posteriores poderão não ser imediatamente visíveis.</translation>
+ </message>
+ <message>
+ <location line="+21"/>
<source>Error</source>
<translation>Erro</translation>
</message>
@@ -565,62 +600,27 @@ Este produto inclui software desenvolvido pelo Projecto OpenSSL para uso no Open
<translation>Informação</translation>
</message>
<message>
- <location line="+66"/>
+ <location line="+68"/>
<source>This transaction is over the size limit. You can still send it for a fee of %1, which goes to the nodes that process your transaction and helps to support the network. Do you want to pay the fee?</source>
<translation>Esta transação tem um tamanho superior ao limite máximo. Poderá enviá-la pagando uma taxa de %1, que será entregue ao nó que processar a sua transação e ajudará a suportar a rede. Deseja pagar a taxa?</translation>
</message>
<message>
- <location line="+210"/>
- <source>Backup Successful</source>
- <translation>Cópia de Segurança Bem Sucedida</translation>
- </message>
- <message>
- <location line="+0"/>
- <source>The wallet data was successfully saved to the new location.</source>
- <translation>Os dados da carteira foram salvos com sucesso numa nova localização.</translation>
- </message>
- <message numerus="yes">
- <location line="-338"/>
- <source>%n second(s) ago</source>
- <translation><numerusform>%n segundo</numerusform><numerusform>%n segundos</numerusform></translation>
- </message>
- <message numerus="yes">
- <location line="+4"/>
- <source>%n minute(s) ago</source>
- <translation><numerusform>%n minutos</numerusform><numerusform>%n minutos</numerusform></translation>
- </message>
- <message numerus="yes">
- <location line="+4"/>
- <source>%n hour(s) ago</source>
- <translation><numerusform>%n hora</numerusform><numerusform>%n horas</numerusform></translation>
- </message>
- <message numerus="yes">
- <location line="+4"/>
- <source>%n day(s) ago</source>
- <translation><numerusform>%n dia</numerusform><numerusform>%n dias</numerusform></translation>
- </message>
- <message>
- <location line="+6"/>
+ <location line="-138"/>
<source>Up to date</source>
<translation>Atualizado</translation>
</message>
<message>
- <location line="+7"/>
+ <location line="+32"/>
<source>Catching up...</source>
<translation>Recuperando...</translation>
</message>
<message>
- <location line="+10"/>
- <source>Last received block was generated %1.</source>
- <translation>Último bloco recebido foi gerado há %1.</translation>
- </message>
- <message>
- <location line="+97"/>
+ <location line="+110"/>
<source>Confirm transaction fee</source>
<translation>Confirme a taxa de transação</translation>
</message>
<message>
- <location line="+23"/>
+ <location line="+8"/>
<source>Sent transaction</source>
<translation>Transação enviada</translation>
</message>
@@ -643,14 +643,14 @@ Endereço: %4
</translation>
</message>
<message>
- <location line="+99"/>
- <location line="+28"/>
+ <location line="+33"/>
+ <location line="+23"/>
<source>URI handling</source>
<translation>Manuseamento URI</translation>
</message>
<message>
- <location line="-28"/>
- <location line="+28"/>
+ <location line="-23"/>
+ <location line="+23"/>
<source>URI can not be parsed! This can be caused by an invalid Bitcoin address or malformed URI parameters.</source>
<translation>URI não foi lido correctamente! Isto pode ser causado por um endereço Bitcoin inválido ou por parâmetros URI malformados.</translation>
</message>
@@ -665,27 +665,7 @@ Endereço: %4
<translation>A carteira está &lt;b&gt;encriptada&lt;/b&gt; e atualmente &lt;b&gt;bloqueada&lt;/b&gt;</translation>
</message>
<message>
- <location line="+23"/>
- <source>Backup Wallet</source>
- <translation>Cópia de Segurança da Carteira</translation>
- </message>
- <message>
- <location line="+0"/>
- <source>Wallet Data (*.dat)</source>
- <translation>Dados da Carteira (*.dat)</translation>
- </message>
- <message>
- <location line="+3"/>
- <source>Backup Failed</source>
- <translation>Cópia de Segurança Falhada</translation>
- </message>
- <message>
- <location line="+0"/>
- <source>There was an error trying to save the wallet data to the new location.</source>
- <translation>Ocorreu um erro ao tentar guardar os dados da carteira na nova localização.</translation>
- </message>
- <message>
- <location filename="../bitcoin.cpp" line="+109"/>
+ <location filename="../bitcoin.cpp" line="+108"/>
<source>A fatal error occurred. Bitcoin can no longer continue safely and will quit.</source>
<translation>Ocorreu um erro fatal. O Bitcoin não pode continuar com segurança e irá fechar.</translation>
</message>
@@ -693,7 +673,7 @@ Endereço: %4
<context>
<name>ClientModel</name>
<message>
- <location filename="../clientmodel.cpp" line="+86"/>
+ <location filename="../clientmodel.cpp" line="+96"/>
<source>Network Alert</source>
<translation>Alerta da Rede</translation>
</message>
@@ -726,7 +706,7 @@ Endereço: %4
<translation>O endereço associado com esta entrada do livro de endereços. Apenas poderá ser modificado para endereços de saída.</translation>
</message>
<message>
- <location filename="../editaddressdialog.cpp" line="+20"/>
+ <location filename="../editaddressdialog.cpp" line="+21"/>
<source>New receiving address</source>
<translation>Novo endereço de entrada</translation>
</message>
@@ -746,17 +726,17 @@ Endereço: %4
<translation>Editar endereço de saída</translation>
</message>
<message>
- <location line="+60"/>
+ <location line="+76"/>
<source>The entered address &quot;%1&quot; is already in the address book.</source>
<translation>O endereço introduzido &quot;%1&quot; já se encontra no livro de endereços.</translation>
</message>
<message>
- <location line="+5"/>
+ <location line="-5"/>
<source>The entered address &quot;%1&quot; is not a valid Bitcoin address.</source>
<translation>O endereço introduzido &quot;%1&quot; não é um endereço bitcoin válido.</translation>
</message>
<message>
- <location line="+5"/>
+ <location line="+10"/>
<source>Could not unlock wallet.</source>
<translation>Impossível desbloquear carteira.</translation>
</message>
@@ -769,7 +749,7 @@ Endereço: %4
<context>
<name>GUIUtil::HelpMessageBox</name>
<message>
- <location filename="../guiutil.cpp" line="+419"/>
+ <location filename="../guiutil.cpp" line="+422"/>
<location line="+12"/>
<source>Bitcoin-Qt</source>
<translation>Bitcoin-Qt</translation>
@@ -845,12 +825,12 @@ Endereço: %4
<message>
<location line="+35"/>
<source>Reset all client options to default.</source>
- <translation type="unfinished"/>
+ <translation>Repôr todas as opções.</translation>
</message>
<message>
<location line="+3"/>
<source>&amp;Reset Options</source>
- <translation type="unfinished"/>
+ <translation>&amp;Repôr Opções</translation>
</message>
<message>
<location line="+13"/>
@@ -983,24 +963,24 @@ Endereço: %4
<translation>&amp;Aplicar</translation>
</message>
<message>
- <location filename="../optionsdialog.cpp" line="+55"/>
+ <location filename="../optionsdialog.cpp" line="+53"/>
<source>default</source>
<translation>padrão</translation>
</message>
<message>
<location line="+130"/>
<source>Confirm options reset</source>
- <translation type="unfinished"/>
+ <translation>Confirme a reposição de opções</translation>
</message>
<message>
<location line="+1"/>
<source>Some settings may require a client restart to take effect.</source>
- <translation type="unfinished"/>
+ <translation>Algumas opções requerem o reinício do programa para funcionar.</translation>
</message>
<message>
<location line="+0"/>
<source>Do you want to proceed?</source>
- <translation type="unfinished"/>
+ <translation>Deseja proceder?</translation>
</message>
<message>
<location line="+42"/>
@@ -1028,23 +1008,18 @@ Endereço: %4
<translation>Formulário</translation>
</message>
<message>
- <location line="+51"/>
- <location line="+183"/>
+ <location line="+50"/>
+ <location line="+166"/>
<source>The displayed information may be out of date. Your wallet automatically synchronizes with the Bitcoin network after a connection is established, but this process has not completed yet.</source>
<translation>A informação mostrada poderá estar desatualizada. A sua carteira sincroniza automaticamente com a rede Bitcoin depois de estabelecer ligação, mas este processo ainda não está completo.</translation>
</message>
<message>
- <location line="-141"/>
+ <location line="-124"/>
<source>Balance:</source>
<translation>Saldo:</translation>
</message>
<message>
- <location line="+58"/>
- <source>Number of transactions:</source>
- <translation>Número de transações:</translation>
- </message>
- <message>
- <location line="-29"/>
+ <location line="+29"/>
<source>Unconfirmed:</source>
<translation>Não confirmado:</translation>
</message>
@@ -1054,7 +1029,7 @@ Endereço: %4
<translation>Carteira</translation>
</message>
<message>
- <location line="+124"/>
+ <location line="+107"/>
<source>Immature:</source>
<translation>Imaturo:</translation>
</message>
@@ -1069,7 +1044,7 @@ Endereço: %4
<translation>&lt;b&gt;Transações recentes&lt;/b&gt;</translation>
</message>
<message>
- <location line="-118"/>
+ <location line="-101"/>
<source>Your current balance</source>
<translation>O seu saldo atual</translation>
</message>
@@ -1079,11 +1054,6 @@ Endereço: %4
<translation>Total de transações ainda não confirmadas, e que não estão contabilizadas ainda no seu saldo actual</translation>
</message>
<message>
- <location line="+20"/>
- <source>Total number of transactions in wallet</source>
- <translation>Número total de transações na carteira</translation>
- </message>
- <message>
<location filename="../overviewpage.cpp" line="+115"/>
<location line="+1"/>
<source>out of sync</source>
@@ -1091,6 +1061,14 @@ Endereço: %4
</message>
</context>
<context>
+ <name>PaymentServer</name>
+ <message>
+ <location filename="../paymentserver.cpp" line="+107"/>
+ <source>Cannot start bitcoin: click-to-pay handler</source>
+ <translation>Impossível começar o modo clicar-para-pagar com bitcoin:</translation>
+ </message>
+</context>
+<context>
<name>QRCodeDialog</name>
<message>
<location filename="../forms/qrcodedialog.ui" line="+14"/>
@@ -1429,7 +1407,7 @@ Endereço: %4
</message>
<message>
<location line="+60"/>
- <location filename="../sendcoinsentry.cpp" line="+25"/>
+ <location filename="../sendcoinsentry.cpp" line="+26"/>
<source>Enter a label for this address to add it to your address book</source>
<translation>Escreva um rótulo para este endereço para o adicionar ao seu livro de endereços</translation>
</message>
@@ -1521,7 +1499,7 @@ Endereço: %4
<message>
<location line="+7"/>
<source>Signature</source>
- <translation type="unfinished"/>
+ <translation>Assinatura</translation>
</message>
<message>
<location line="+27"/>
@@ -1665,7 +1643,7 @@ Endereço: %4
<context>
<name>TransactionDesc</name>
<message>
- <location filename="../transactiondesc.cpp" line="+19"/>
+ <location filename="../transactiondesc.cpp" line="+20"/>
<source>Open until %1</source>
<translation>Aberto até %1</translation>
</message>
@@ -1828,7 +1806,7 @@ Endereço: %4
<message numerus="yes">
<location line="-35"/>
<source>Open for %n more block(s)</source>
- <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+ <translation><numerusform>Aberta por mais %n bloco</numerusform><numerusform>Aberta por mais %n blocos</numerusform></translation>
</message>
<message>
<location line="+70"/>
@@ -1852,7 +1830,7 @@ Endereço: %4
<context>
<name>TransactionTableModel</name>
<message>
- <location filename="../transactiontablemodel.cpp" line="+226"/>
+ <location filename="../transactiontablemodel.cpp" line="+225"/>
<source>Date</source>
<translation>Data</translation>
</message>
@@ -1874,7 +1852,7 @@ Endereço: %4
<message numerus="yes">
<location line="+57"/>
<source>Open for %n more block(s)</source>
- <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+ <translation><numerusform>Aberta por mais %n bloco</numerusform><numerusform>Aberta por mais %n blocos</numerusform></translation>
</message>
<message>
<location line="+3"/>
@@ -1970,7 +1948,7 @@ Endereço: %4
<context>
<name>TransactionView</name>
<message>
- <location filename="../transactionview.cpp" line="+55"/>
+ <location filename="../transactionview.cpp" line="+52"/>
<location line="+16"/>
<source>All</source>
<translation>Todas</translation>
@@ -2057,6 +2035,11 @@ Endereço: %4
</message>
<message>
<location line="+1"/>
+ <source>Copy transaction ID</source>
+ <translation>Copiar ID da Transação</translation>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Edit label</source>
<translation>Editar rótulo</translation>
</message>
@@ -2066,7 +2049,7 @@ Endereço: %4
<translation>Mostrar detalhes da transação</translation>
</message>
<message>
- <location line="+142"/>
+ <location line="+139"/>
<source>Export Transaction Data</source>
<translation>Exportar Dados das Transações</translation>
</message>
@@ -2121,7 +2104,7 @@ Endereço: %4
<translation>Impossível escrever para o ficheiro %1.</translation>
</message>
<message>
- <location line="+95"/>
+ <location line="+100"/>
<source>Range:</source>
<translation>Período:</translation>
</message>
@@ -2132,29 +2115,172 @@ Endereço: %4
</message>
</context>
<context>
+ <name>WalletView</name>
+ <message>
+ <location filename="../walletview.cpp" line="+95"/>
+ <source>&amp;Overview</source>
+ <translation>Vista &amp;geral</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Show general overview of wallet</source>
+ <translation>Mostrar vista geral da carteira</translation>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>&amp;Send coins</source>
+ <translation>&amp;Enviar moedas</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Send coins to a Bitcoin address</source>
+ <translation>Enviar moedas para um endereço bitcoin</translation>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>&amp;Receive coins</source>
+ <translation>&amp;Receber moedas</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Show the list of addresses for receiving payments</source>
+ <translation>Mostrar a lista de endereços para receber pagamentos</translation>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>&amp;Transactions</source>
+ <translation>&amp;Transações</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Browse transaction history</source>
+ <translation>Navegar pelo histórico de transações</translation>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>&amp;Address Book</source>
+ <translation>L&amp;ivro de endereços</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Edit the list of stored addresses and labels</source>
+ <translation>Editar a lista de endereços e rótulos</translation>
+ </message>
+ <message>
+ <location line="+12"/>
+ <source>&amp;Encrypt Wallet...</source>
+ <translation>&amp;Encriptar Carteira...</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Encrypt the private keys that belong to your wallet</source>
+ <translation>Encripte as chaves privadas que pertencem à sua carteira</translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>&amp;Backup Wallet...</source>
+ <translation>&amp;Guardar Carteira...</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Backup wallet to another location</source>
+ <translation>Fazer cópia de segurança da carteira para outra localização</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>&amp;Change Passphrase...</source>
+ <translation>&amp;Mudar Palavra-passe...</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Change the passphrase used for wallet encryption</source>
+ <translation>Mude a frase de segurança utilizada na criptografia da carteira</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Sign &amp;message...</source>
+ <translation>Assinar &amp;mensagem...</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Sign messages with your Bitcoin addresses to prove you own them</source>
+ <translation>Assine mensagens com os seus endereços Bitcoin para provar que os controla</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>&amp;Verify message...</source>
+ <translation>&amp;Verificar mensagem...</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Verify messages to ensure they were signed with specified Bitcoin addresses</source>
+ <translation>Verifique mensagens para assegurar que foram assinadas com o endereço Bitcoin especificado</translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>&amp;Export...</source>
+ <translation>&amp;Exportar...</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Export the data in the current tab to a file</source>
+ <translation>Exportar os dados no separador actual para um ficheiro</translation>
+ </message>
+ <message>
+ <location line="+180"/>
+ <source>Backup Wallet</source>
+ <translation>Cópia de Segurança da Carteira</translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>Wallet Data (*.dat)</source>
+ <translation>Dados da Carteira (*.dat)</translation>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Backup Failed</source>
+ <translation>Cópia de Segurança Falhou</translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>There was an error trying to save the wallet data to the new location.</source>
+ <translation>Ocorreu um erro ao tentar guardar os dados da carteira na nova localização.</translation>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>Backup Successful</source>
+ <translation>Cópia de Segurança Bem Sucedida</translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>The wallet data was successfully saved to the new location.</source>
+ <translation>Os dados da carteira foram salvos com sucesso numa nova localização.</translation>
+ </message>
+</context>
+<context>
<name>bitcoin-core</name>
<message>
- <location filename="../bitcoinstrings.cpp" line="+88"/>
+ <location filename="../bitcoinstrings.cpp" line="+96"/>
<source>Bitcoin version</source>
<translation>Versão Bitcoin</translation>
</message>
<message>
- <location line="+82"/>
+ <location line="+98"/>
<source>Usage:</source>
<translation>Utilização:</translation>
</message>
<message>
- <location line="-23"/>
+ <location line="-24"/>
<source>Send command to -server or bitcoind</source>
<translation>Enviar comando para -server ou bitcoind</translation>
</message>
<message>
- <location line="-21"/>
+ <location line="-22"/>
<source>List commands</source>
<translation>Listar comandos</translation>
</message>
<message>
- <location line="-11"/>
+ <location line="-10"/>
<source>Get help for a command</source>
<translation>Obter ajuda para um comando</translation>
</message>
@@ -2179,12 +2305,12 @@ Endereço: %4
<translation>Gerar moedas</translation>
</message>
<message>
- <location line="-15"/>
+ <location line="-28"/>
<source>Don&apos;t generate coins</source>
<translation>Não gerar moedas</translation>
</message>
<message>
- <location line="+61"/>
+ <location line="+74"/>
<source>Specify data directory</source>
<translation>Especificar pasta de dados</translation>
</message>
@@ -2194,87 +2320,92 @@ Endereço: %4
<translation>Definir o tamanho da cache de base de dados em megabytes (por defeito: 25)</translation>
</message>
<message>
- <location line="-26"/>
+ <location line="-27"/>
<source>Listen for connections on &lt;port&gt; (default: 8333 or testnet: 18333)</source>
<translation>Escute por ligações em &lt;port&gt; (por defeito: 8333 ou testnet: 18333)</translation>
</message>
<message>
- <location line="+4"/>
+ <location line="+5"/>
<source>Maintain at most &lt;n&gt; connections to peers (default: 125)</source>
<translation>Manter no máximo &lt;n&gt; ligações a outros nós da rede (por defeito: 125)</translation>
</message>
<message>
- <location line="-34"/>
+ <location line="-49"/>
<source>Connect to a node to retrieve peer addresses, and disconnect</source>
<translation>Ligar a um nó para recuperar endereços de pares, e desligar</translation>
</message>
<message>
- <location line="+65"/>
+ <location line="+80"/>
<source>Specify your own public address</source>
<translation>Especifique o seu endereço público</translation>
</message>
<message>
- <location line="+2"/>
+ <location line="+3"/>
<source>Threshold for disconnecting misbehaving peers (default: 100)</source>
<translation>Tolerância para desligar nós mal-formados (por defeito: 100)</translation>
</message>
<message>
- <location line="-114"/>
+ <location line="-132"/>
<source>Number of seconds to keep misbehaving peers from reconnecting (default: 86400)</source>
<translation>Número de segundos a impedir que nós mal-formados se liguem de novo (por defeito: 86400)</translation>
</message>
<message>
- <location line="-28"/>
+ <location line="-32"/>
<source>An error occurred while setting up the RPC port %u for listening on IPv4: %s</source>
<translation>Ocorreu um erro ao definir a porta %u do serviço RPC a escutar em IPv4: %s</translation>
</message>
<message>
- <location line="+26"/>
+ <location line="+30"/>
<source>Listen for JSON-RPC connections on &lt;port&gt; (default: 8332 or testnet: 18332)</source>
<translation>Escutar por ligações JSON-RPC em &lt;port&gt; (por defeito: 8332 ou rede de testes: 18332)</translation>
</message>
<message>
- <location line="+34"/>
+ <location line="+36"/>
<source>Accept command line and JSON-RPC commands</source>
<translation>Aceitar comandos da consola e JSON-RPC</translation>
</message>
<message>
- <location line="+62"/>
+ <location line="+77"/>
<source>Run in the background as a daemon and accept commands</source>
<translation>Correr o processo como um daemon e aceitar comandos</translation>
</message>
<message>
- <location line="+31"/>
+ <location line="+32"/>
<source>Use the test network</source>
<translation>Utilizar a rede de testes - testnet</translation>
</message>
<message>
- <location line="-92"/>
+ <location line="-108"/>
<source>Accept connections from outside (default: 1 if no -proxy or -connect)</source>
<translation>Aceitar ligações externas (padrão: 1 sem -proxy ou -connect)</translation>
</message>
<message>
- <location line="-74"/>
+ <location line="-82"/>
<source>%s, you must set a rpcpassword in the configuration file:
- %s
+%s
It is recommended you use the following random password:
rpcuser=bitcoinrpc
rpcpassword=%s
(you do not need to remember this password)
The username and password MUST NOT be the same.
If the file does not exist, create it with owner-readable-only file permissions.
+It is also recommended to set alertnotify so you are notified of problems;
+for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.com
</source>
- <translation>%s, deverá definir uma palavra-passe de RPC no ficheiro de configuração :
+ <translation>%s, deverá definir rpcpassword no ficheiro de configuração :
%s
É recomendado que use a seguinte palavra-passe aleatória:
rpcuser=bitcoinrpc
rpcpassword=%s
(não precisa recordar esta palavra-passe)
O nome de utilizador e password NÃO DEVEM ser iguais.
-Se o ficheiro não existir, crie-o com permissões de leitura apenas para o dono.</translation>
+Se o ficheiro não existir, crie-o com permissões de leitura apenas para o dono.
+Também é recomendado definir alertnotify para que seja alertado sobre problemas;
+por exemplo: alertnotify=echo %%s | mail -s &quot;Alerta Bitcoin&quot; admin@foo.com
+</translation>
</message>
<message>
- <location line="+15"/>
+ <location line="+17"/>
<source>An error occurred while setting up the RPC port %u for listening on IPv6, falling back to IPv4: %s</source>
<translation>Ocorreu um erro ao definir a porta %u do serviço RPC a escutar em IPv6, a usar IPv4: %s</translation>
</message>
@@ -2290,11 +2421,6 @@ Se o ficheiro não existir, crie-o com permissões de leitura apenas para o dono
</message>
<message>
<location line="+3"/>
- <source>Corrupted block database detected. Please restart the client with -reindex.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+2"/>
<source>Error initializing database environment %s! To recover, BACKUP THAT DIRECTORY, then remove everything from it except for wallet.dat.</source>
<translation>Erro ao inicializar o ambiente de recuperação de base de dados %s! Para recuperar, COPIE A PASTA PARA OUTRO LOCAL, e então remova tudo de dentro dela excepto o ficheiro wallet.dat.</translation>
</message>
@@ -2309,12 +2435,27 @@ Se o ficheiro não existir, crie-o com permissões de leitura apenas para o dono
<translation>Erro: Esta transação requer uma taxa de transação mínima de %s devido á sua quantia, complexidade, ou uso de fundos recebidos recentemente! </translation>
</message>
<message>
+ <location line="+3"/>
+ <source>Execute command when a relevant alert is received (%s in cmd is replaced by message)</source>
+ <translation>Executar comando quando um alerta relevante for recebido (no comando, %s é substituído pela mensagem)</translation>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Execute command when a wallet transaction changes (%s in cmd is replaced by TxID)</source>
+ <translation>Executar comando quando uma das transações na carteira mudar (no comando, %s é substituído pelo ID da Transação)</translation>
+ </message>
+ <message>
<location line="+11"/>
<source>Set maximum size of high-priority/low-fee transactions in bytes (default: 27000)</source>
<translation>Definir tamanho máximo de transações de alta-/baixa-prioridade em bytes (por defeito: 27000)</translation>
</message>
<message>
<location line="+3"/>
+ <source>Set the number of script verification threads (1-16, 0=auto, default: 0)</source>
+ <translation>Defina o número de processos de verificação (1-16, 0=auto, por defeito: 0)</translation>
+ </message>
+ <message>
+ <location line="+2"/>
<source>This is a pre-release test build - use at your own risk - do not use for mining or merchant applications</source>
<translation>Esta é uma versão de pré-lançamento - use à sua responsabilidade - não usar para minar ou aplicações comerciais</translation>
</message>
@@ -2351,7 +2492,7 @@ Se o ficheiro não existir, crie-o com permissões de leitura apenas para o dono
<message>
<location line="+2"/>
<source>Block creation options:</source>
- <translation>Opções de criação de Bloco:</translation>
+ <translation>Opções de criação de bloco:</translation>
</message>
<message>
<location line="+6"/>
@@ -2360,16 +2501,41 @@ Se o ficheiro não existir, crie-o com permissões de leitura apenas para o dono
</message>
<message>
<location line="+3"/>
+ <source>Corrupted block database detected</source>
+ <translation>Cadeia de blocos corrompida detectada</translation>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Discover own IP address (default: 1 when listening and no -externalip)</source>
<translation>Descobrir endereço IP próprio (padrão: 1 ao escutar e sem -externalip)</translation>
</message>
<message>
+ <location line="+1"/>
+ <source>Do you want to rebuild the block database now?</source>
+ <translation>Deseja reconstruir agora a cadeia de blocos?</translation>
+ </message>
+ <message>
<location line="+3"/>
+ <source>Error initializing block database</source>
+ <translation>Erro ao inicializar a cadeia de blocos</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Error initializing wallet database environment %s!</source>
+ <translation>Erro ao inicializar o ambiente de base de dados da carteira %s!</translation>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Error loading block database</source>
- <translation type="unfinished"/>
+ <translation>Erro ao carregar cadeia de blocos</translation>
</message>
<message>
- <location line="+5"/>
+ <location line="+4"/>
+ <source>Error opening block database</source>
+ <translation>Erro ao abrir a cadeia de blocos</translation>
+ </message>
+ <message>
+ <location line="+2"/>
<source>Error: Disk space is low!</source>
<translation>Erro: Pouco espaço em disco!</translation>
</message>
@@ -2385,26 +2551,96 @@ Se o ficheiro não existir, crie-o com permissões de leitura apenas para o dono
</message>
<message>
<location line="+2"/>
+ <source>Error: system error: </source>
+ <translation>Erro: erro do sistema:</translation>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Failed to listen on any port. Use -listen=0 if you want this.</source>
<translation>Falhou a escutar em qualquer porta. Use -listen=0 se quer isto.</translation>
</message>
<message>
+ <location line="+1"/>
+ <source>Failed to read block info</source>
+ <translation>Falha ao ler info do bloco</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Failed to read block</source>
+ <translation>Falha ao ler bloco</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Failed to sync block index</source>
+ <translation>Falha ao sincronizar índice do bloco</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Failed to write block index</source>
+ <translation>Falha ao escrever índice do bloco</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Failed to write block info</source>
+ <translation>Falha ao escrever info do bloco</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Failed to write block</source>
+ <translation>Falha ao escrever o bloco</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Failed to write file info</source>
+ <translation>Falha ao escrever info do ficheiro</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Failed to write to coin database</source>
+ <translation>Falha ao escrever na base de dados de moedas</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Failed to write transaction index</source>
+ <translation>Falha ao escrever índice de transações</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Failed to write undo data</source>
+ <translation>Falha ao escrever histórico de modificações</translation>
+ </message>
+ <message>
<location line="+2"/>
<source>Find peers using DNS lookup (default: 1 unless -connect)</source>
<translation>Encontrar pares usando procura DNS (por defeito: 1 excepto -connect)</translation>
</message>
<message>
- <location line="+5"/>
- <source>How thorough the block verification is (0-4, default: 3)</source>
- <translation type="unfinished"/>
+ <location line="+3"/>
+ <source>How many blocks to check at startup (default: 288, 0 = all)</source>
+ <translation>Quantos blocos verificar ao começar (por defeito: 288, 0 = todos)</translation>
</message>
<message>
<location line="+1"/>
- <source>Importing blocks from block database...</source>
- <translation>Importando blocos da base de dados de blocos...</translation>
+ <source>How thorough the block verification is (0-4, default: 3)</source>
+ <translation>Qual a minúcia na verificação de blocos (0-4, por defeito: 3)</translation>
+ </message>
+ <message>
+ <location line="+24"/>
+ <source>Rebuild block chain index from current blk000??.dat files</source>
+ <translation>Reconstruir a cadeia de blocos dos ficheiros blk000??.dat actuais</translation>
+ </message>
+ <message>
+ <location line="+37"/>
+ <source>Verifying blocks...</source>
+ <translation>Verificando blocos...</translation>
</message>
<message>
<location line="+1"/>
+ <source>Verifying wallet...</source>
+ <translation>Verificando a carteira...</translation>
+ </message>
+ <message>
+ <location line="-61"/>
<source>Imports blocks from external blk000??.dat file</source>
<translation>Importar blocos de um ficheiro blk000??.dat externo</translation>
</message>
@@ -2419,7 +2655,12 @@ Se o ficheiro não existir, crie-o com permissões de leitura apenas para o dono
<translation>Endereço -tor inválido: &apos;%s&apos;</translation>
</message>
<message>
- <location line="+9"/>
+ <location line="+8"/>
+ <source>Maintain a full transaction index (default: 0)</source>
+ <translation>Manter índice de transações completo (por defeito: 0)</translation>
+ </message>
+ <message>
+ <location line="+2"/>
<source>Maximum per-connection receive buffer, &lt;n&gt;*1000 bytes (default: 5000)</source>
<translation>Armazenamento intermédio de recepção por ligação, &lt;n&gt;*1000 bytes (por defeito: 5000)</translation>
</message>
@@ -2454,12 +2695,7 @@ Se o ficheiro não existir, crie-o com permissões de leitura apenas para o dono
<translation>Preceder informação de depuração com selo temporal</translation>
</message>
<message>
- <location line="+1"/>
- <source>Rebuild blockchain index from current blk000??.dat files</source>
- <translation>Reconstruir a cadeia de blocos dos ficheiros blk000??.dat actuais</translation>
- </message>
- <message>
- <location line="+4"/>
+ <location line="+5"/>
<source>SSL options: (see the Bitcoin Wiki for SSL setup instructions)</source>
<translation>Opções SSL: (ver a Wiki Bitcoin para instruções de configuração SSL)</translation>
</message>
@@ -2499,7 +2735,12 @@ Se o ficheiro não existir, crie-o com permissões de leitura apenas para o dono
<translation>Especificar tempo de espera da ligação em millisegundos (por defeito: 5000)</translation>
</message>
<message>
- <location line="+13"/>
+ <location line="+4"/>
+ <source>System error: </source>
+ <translation>Erro de sistema:</translation>
+ </message>
+ <message>
+ <location line="+10"/>
<source>Use UPnP to map the listening port (default: 0)</source>
<translation>Usar UPnP para mapear a porta de escuta (padrão: 0)</translation>
</message>
@@ -2530,36 +2771,41 @@ Se o ficheiro não existir, crie-o com permissões de leitura apenas para o dono
</message>
<message>
<location line="+1"/>
+ <source>You need to rebuild the databases using -reindex to change -txindex</source>
+ <translation>Necessita reconstruir as bases de dados usando -reindex para mudar -txindex</translation>
+ </message>
+ <message>
+ <location line="+1"/>
<source>wallet.dat corrupt, salvage failed</source>
- <translation>carteira corrupta, salvamento falhou</translation>
+ <translation>wallet.dat corrupta, recuperação falhou</translation>
</message>
<message>
- <location line="-43"/>
+ <location line="-45"/>
<source>Password for JSON-RPC connections</source>
<translation>Palavra-passe para ligações JSON-RPC</translation>
</message>
<message>
- <location line="-53"/>
+ <location line="-68"/>
<source>Allow JSON-RPC connections from specified IP address</source>
<translation>Permitir ligações JSON-RPC do endereço IP especificado</translation>
</message>
<message>
- <location line="+62"/>
+ <location line="+77"/>
<source>Send commands to node running on &lt;ip&gt; (default: 127.0.0.1)</source>
<translation>Enviar comandos para o nó a correr em &lt;ip&gt; (por defeito: 127.0.0.1)</translation>
</message>
<message>
- <location line="-103"/>
+ <location line="-120"/>
<source>Execute command when the best block changes (%s in cmd is replaced by block hash)</source>
- <translation>Executar comando quando mudar o melhor bloco (na consola, %s é substituído pela hash do bloco)</translation>
+ <translation>Executar comando quando mudar o melhor bloco (no comando, %s é substituído pela hash do bloco)</translation>
</message>
<message>
- <location line="+124"/>
+ <location line="+142"/>
<source>Upgrade wallet to latest format</source>
<translation>Atualize a carteira para o formato mais recente</translation>
</message>
<message>
- <location line="-15"/>
+ <location line="-16"/>
<source>Set key pool size to &lt;n&gt; (default: 100)</source>
<translation>Definir o tamanho da memória de chaves para &lt;n&gt; (por defeito: 100)</translation>
</message>
@@ -2569,17 +2815,12 @@ Se o ficheiro não existir, crie-o com permissões de leitura apenas para o dono
<translation>Reexaminar a cadeia de blocos para transações em falta na carteira</translation>
</message>
<message>
- <location line="-26"/>
- <source>How many blocks to check at startup (default: 2500, 0 = all)</source>
- <translation>Verificar quantos blocos ao iniciar (por defeito: 2500, 0 = todos)</translation>
- </message>
- <message>
- <location line="+55"/>
+ <location line="+30"/>
<source>Use OpenSSL (https) for JSON-RPC connections</source>
<translation>Usar OpenSSL (https) para ligações JSON-RPC</translation>
</message>
<message>
- <location line="-20"/>
+ <location line="-21"/>
<source>Server certificate file (default: server.cert)</source>
<translation>Ficheiro de certificado do servidor (por defeito: server.cert)</translation>
</message>
@@ -2589,12 +2830,12 @@ Se o ficheiro não existir, crie-o com permissões de leitura apenas para o dono
<translation>Chave privada do servidor (por defeito: server.pem)</translation>
</message>
<message>
- <location line="-133"/>
+ <location line="-154"/>
<source>Acceptable ciphers (default: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH)</source>
<translation>Cifras aceitáveis (por defeito: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH)</translation>
</message>
<message>
- <location line="+144"/>
+ <location line="+166"/>
<source>This help message</source>
<translation>Esta mensagem de ajuda</translation>
</message>
@@ -2604,7 +2845,7 @@ Se o ficheiro não existir, crie-o com permissões de leitura apenas para o dono
<translation>Incapaz de vincular a %s neste computador (vínculo retornou erro %d, %s)</translation>
</message>
<message>
- <location line="-70"/>
+ <location line="-86"/>
<source>Connect through socks proxy</source>
<translation>Ligar através de um proxy socks</translation>
</message>
@@ -2614,12 +2855,12 @@ Se o ficheiro não existir, crie-o com permissões de leitura apenas para o dono
<translation>Permitir procuras DNS para -addnode, -seednode e -connect</translation>
</message>
<message>
- <location line="+43"/>
+ <location line="+57"/>
<source>Loading addresses...</source>
<translation>Carregar endereços...</translation>
</message>
<message>
- <location line="-25"/>
+ <location line="-35"/>
<source>Error loading wallet.dat: Wallet corrupted</source>
<translation>Erro ao carregar wallet.dat: Carteira danificada</translation>
</message>
@@ -2629,32 +2870,22 @@ Se o ficheiro não existir, crie-o com permissões de leitura apenas para o dono
<translation>Erro ao carregar wallet.dat: A Carteira requer uma versão mais recente do Bitcoin</translation>
</message>
<message>
- <location line="+73"/>
- <source>Verifying block database integrity...</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+1"/>
- <source>Verifying wallet integrity...</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+1"/>
+ <location line="+87"/>
<source>Wallet needed to be rewritten: restart Bitcoin to complete</source>
<translation>A Carteira precisou ser reescrita: reinicie o Bitcoin para completar</translation>
</message>
<message>
- <location line="-77"/>
+ <location line="-89"/>
<source>Error loading wallet.dat</source>
<translation>Erro ao carregar wallet.dat</translation>
</message>
<message>
- <location line="+20"/>
+ <location line="+30"/>
<source>Invalid -proxy address: &apos;%s&apos;</source>
<translation>Endereço -proxy inválido: &apos;%s&apos;</translation>
</message>
<message>
- <location line="+46"/>
+ <location line="+48"/>
<source>Unknown network specified in -onlynet: &apos;%s&apos;</source>
<translation>Rede desconhecida especificada em -onlynet: &apos;%s&apos;</translation>
</message>
@@ -2664,7 +2895,7 @@ Se o ficheiro não existir, crie-o com permissões de leitura apenas para o dono
<translation>Versão desconhecida de proxy -socks requisitada: %i</translation>
</message>
<message>
- <location line="-75"/>
+ <location line="-91"/>
<source>Cannot resolve -bind address: &apos;%s&apos;</source>
<translation>Não conseguiu resolver endereço -bind: &apos;%s&apos;</translation>
</message>
@@ -2674,17 +2905,17 @@ Se o ficheiro não existir, crie-o com permissões de leitura apenas para o dono
<translation>Não conseguiu resolver endereço -externalip: &apos;%s&apos;</translation>
</message>
<message>
- <location line="+31"/>
+ <location line="+45"/>
<source>Invalid amount for -paytxfee=&lt;amount&gt;: &apos;%s&apos;</source>
<translation>Quantia inválida para -paytxfee=&lt;amount&gt;: &apos;%s&apos;</translation>
</message>
<message>
- <location line="-15"/>
+ <location line="-24"/>
<source>Error: could not start node</source>
<translation>Erro: não iniciou o nó</translation>
</message>
<message>
- <location line="+16"/>
+ <location line="+25"/>
<source>Invalid amount</source>
<translation>Quantia inválida</translation>
</message>
@@ -2699,7 +2930,7 @@ Se o ficheiro não existir, crie-o com permissões de leitura apenas para o dono
<translation>Carregar índice de blocos...</translation>
</message>
<message>
- <location line="-45"/>
+ <location line="-59"/>
<source>Add a node to connect to and attempt to keep the connection open</source>
<translation>Adicione um nó ao qual se ligar e tentar manter a ligação aberta</translation>
</message>
@@ -2709,22 +2940,17 @@ Se o ficheiro não existir, crie-o com permissões de leitura apenas para o dono
<translation>Incapaz de vincular à porta %s neste computador. Provavelmente o Bitcoin já está a funcionar.</translation>
</message>
<message>
- <location line="+54"/>
- <source>Find peers using internet relay chat (default: 0)</source>
- <translation>Encontrar pares usando IRC (por defeito: 0)</translation>
- </message>
- <message>
- <location line="-2"/>
+ <location line="+68"/>
<source>Fee per KB to add to transactions you send</source>
<translation>Taxa por KB a adicionar a transações enviadas</translation>
</message>
<message>
- <location line="+19"/>
+ <location line="+17"/>
<source>Loading wallet...</source>
<translation>Carregar carteira...</translation>
</message>
<message>
- <location line="-40"/>
+ <location line="-54"/>
<source>Cannot downgrade wallet</source>
<translation>Impossível mudar a carteira para uma versão anterior</translation>
</message>
@@ -2739,27 +2965,27 @@ Se o ficheiro não existir, crie-o com permissões de leitura apenas para o dono
<translation>Impossível escrever endereço por defeito</translation>
</message>
<message>
- <location line="+49"/>
+ <location line="+64"/>
<source>Rescanning...</source>
<translation>Reexaminando...</translation>
</message>
<message>
- <location line="-43"/>
+ <location line="-56"/>
<source>Done loading</source>
<translation>Carregamento completo</translation>
</message>
<message>
- <location line="+65"/>
+ <location line="+79"/>
<source>To use the %s option</source>
<translation>Para usar a opção %s</translation>
</message>
<message>
- <location line="-60"/>
+ <location line="-71"/>
<source>Error</source>
<translation>Erro</translation>
</message>
<message>
- <location line="-28"/>
+ <location line="-33"/>
<source>You must set rpcpassword=&lt;password&gt; in the configuration file:
%s
If the file does not exist, create it with owner-readable-only file permissions.</source>
diff --git a/src/qt/locale/bitcoin_ro_RO.ts b/src/qt/locale/bitcoin_ro_RO.ts
index 3a9239e786..a4b6fd414e 100644
--- a/src/qt/locale/bitcoin_ro_RO.ts
+++ b/src/qt/locale/bitcoin_ro_RO.ts
@@ -13,12 +13,7 @@
<translation>&lt;b&gt;Bitcoin&lt;/b&gt; versiunea</translation>
</message>
<message>
- <location line="+41"/>
- <source>Copyright © 2009-2012 The Bitcoin developers</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+13"/>
+ <location line="+57"/>
<source>
This is experimental software.
@@ -27,6 +22,16 @@ Distributed under the MIT/X11 software license, see the accompanying file COPYIN
This product includes software developed by the OpenSSL Project for use in the OpenSSL Toolkit (http://www.openssl.org/) and cryptographic software written by Eric Young (eay@cryptsoft.com) and UPnP software written by Thomas Bernard.</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../aboutdialog.cpp" line="+17"/>
+ <source>Copyright</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>2009-%1 The Bitcoin developers</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>AddressBookPage</name>
@@ -68,32 +73,32 @@ This product includes software developed by the OpenSSL Project for use in the O
<message>
<location line="+11"/>
<source>Show &amp;QR Code</source>
- <translation type="unfinished"/>
+ <translation>Arata codul QR</translation>
</message>
<message>
<location line="+11"/>
<source>Sign a message to prove you own a Bitcoin address</source>
- <translation type="unfinished"/>
+ <translation>Semneaza mesajul pentru a dovedi ca detii aceasta adresa Bitocin</translation>
</message>
<message>
<location line="+3"/>
<source>Sign &amp;Message</source>
- <translation type="unfinished"/>
+ <translation>Semneaza mesajul</translation>
</message>
<message>
<location line="+25"/>
<source>Delete the currently selected address from the list</source>
- <translation type="unfinished"/>
+ <translation>Sterge adresele curent selectate din lista</translation>
</message>
<message>
<location line="-14"/>
<source>Verify a message to ensure it was signed with a specified Bitcoin address</source>
- <translation type="unfinished"/>
+ <translation>Verifica mesajul pentru a te asigura ca a fost insemnat cu o adresa bitcoin specifica</translation>
</message>
<message>
<location line="+3"/>
<source>&amp;Verify Message</source>
- <translation type="unfinished"/>
+ <translation> Verifica mesajele</translation>
</message>
<message>
<location line="+14"/>
@@ -101,17 +106,22 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation>&amp;Șterge</translation>
</message>
<message>
- <location filename="../addressbookpage.cpp" line="+65"/>
+ <location filename="../addressbookpage.cpp" line="+66"/>
<source>Copy &amp;Label</source>
<translation>Copiază &amp;eticheta</translation>
</message>
<message>
- <location line="+2"/>
+ <location line="+1"/>
<source>&amp;Edit</source>
<translation>&amp;Editează</translation>
</message>
<message>
- <location line="+250"/>
+ <location line="+1"/>
+ <source>Send &amp;Coins</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+263"/>
<source>Export Address Book Data</source>
<translation>Exportă Lista de adrese</translation>
</message>
@@ -134,7 +144,7 @@ This product includes software developed by the OpenSSL Project for use in the O
<context>
<name>AddressTableModel</name>
<message>
- <location filename="../addresstablemodel.cpp" line="+142"/>
+ <location filename="../addresstablemodel.cpp" line="+144"/>
<source>Label</source>
<translation>Etichetă</translation>
</message>
@@ -235,7 +245,7 @@ This product includes software developed by the OpenSSL Project for use in the O
<location line="+100"/>
<location line="+24"/>
<source>Warning: The Caps Lock key is on!</source>
- <translation type="unfinished"/>
+ <translation>Atentie! Caps Lock este pornit</translation>
</message>
<message>
<location line="-130"/>
@@ -246,7 +256,7 @@ This product includes software developed by the OpenSSL Project for use in the O
<message>
<location line="-56"/>
<source>Bitcoin will close now to finish the encryption process. Remember that encrypting your wallet cannot fully protect your bitcoins from being stolen by malware infecting your computer.</source>
- <translation type="unfinished"/>
+ <translation>Bitcoin se va închide acum pentru a termina procesul de criptare. Amintiți-vă că criptarea portofelului dumneavoastră nu poate proteja în totalitate bitcoins dvs. de a fi furate de intentii rele.</translation>
</message>
<message>
<location line="+13"/>
@@ -293,17 +303,17 @@ This product includes software developed by the OpenSSL Project for use in the O
<context>
<name>BitcoinGUI</name>
<message>
- <location filename="../bitcoingui.cpp" line="+267"/>
+ <location filename="../bitcoingui.cpp" line="+231"/>
<source>Sign &amp;message...</source>
- <translation type="unfinished"/>
+ <translation>Semneaza &amp;mesaj...</translation>
</message>
<message>
- <location line="+254"/>
+ <location line="+299"/>
<source>Synchronizing with network...</source>
<translation>Se sincronizează cu reţeaua...</translation>
</message>
<message>
- <location line="-322"/>
+ <location line="-367"/>
<source>&amp;Overview</source>
<translation>&amp;Detalii</translation>
</message>
@@ -323,34 +333,19 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation>Istoricul tranzacţiilor</translation>
</message>
<message>
- <location line="+6"/>
- <source>&amp;Address Book</source>
- <translation>&amp;Lista de adrese</translation>
- </message>
- <message>
- <location line="+1"/>
+ <location line="+7"/>
<source>Edit the list of stored addresses and labels</source>
<translation>Editaţi lista de adrese şi etichete.</translation>
</message>
<message>
- <location line="-15"/>
- <source>&amp;Receive coins</source>
- <translation>&amp;Primiţi Bitcoin</translation>
- </message>
- <message>
- <location line="+1"/>
+ <location line="-14"/>
<source>Show the list of addresses for receiving payments</source>
<translation>Lista de adrese pentru recepţionarea plăţilor</translation>
</message>
<message>
- <location line="-8"/>
- <source>&amp;Send coins</source>
- <translation>&amp;Trimiteţi Bitcoin</translation>
- </message>
- <message>
- <location line="+39"/>
+ <location line="+31"/>
<source>E&amp;xit</source>
- <translation type="unfinished"/>
+ <translation>Ieșire</translation>
</message>
<message>
<location line="+1"/>
@@ -393,22 +388,17 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation>&amp;Schimbă parola...</translation>
</message>
<message>
- <location line="+259"/>
+ <location line="+304"/>
<source>Importing blocks from disk...</source>
- <translation type="unfinished"/>
+ <translation>Importare blocks de pe disk...</translation>
</message>
<message>
<location line="+3"/>
<source>Reindexing blocks on disk...</source>
<translation type="unfinished"/>
</message>
- <message numerus="yes">
- <location line="+10"/>
- <source>~%n block(s) remaining</source>
- <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
- </message>
<message>
- <location line="-265"/>
+ <location line="-300"/>
<source>&amp;Export...</source>
<translation>&amp;Exportă...</translation>
</message>
@@ -425,12 +415,12 @@ This product includes software developed by the OpenSSL Project for use in the O
<message>
<location line="+17"/>
<source>Export the data in the current tab to a file</source>
- <translation type="unfinished"/>
+ <translation>Exporta datele din tab-ul curent catre un fiesier</translation>
</message>
<message>
<location line="-9"/>
<source>Backup wallet to another location</source>
- <translation type="unfinished"/>
+ <translation>Creaza copie de rezerva a portofelului intr-o locatie diferita</translation>
</message>
<message>
<location line="+2"/>
@@ -440,38 +430,53 @@ This product includes software developed by the OpenSSL Project for use in the O
<message>
<location line="+9"/>
<source>&amp;Debug window</source>
- <translation type="unfinished"/>
+ <translation>&amp; Fereastra debug</translation>
</message>
<message>
<location line="+1"/>
<source>Open debugging and diagnostic console</source>
- <translation type="unfinished"/>
+ <translation>Deschide consola de debug si diagnosticare</translation>
</message>
<message>
<location line="-7"/>
<source>&amp;Verify message...</source>
- <translation type="unfinished"/>
+ <translation>Verifica mesajul</translation>
</message>
<message>
- <location line="-196"/>
- <location line="+538"/>
+ <location line="-162"/>
+ <location line="+540"/>
<source>Bitcoin</source>
<translation>Bitcoin</translation>
</message>
<message>
- <location line="-538"/>
+ <location line="-540"/>
<source>Wallet</source>
<translation>Portofelul</translation>
</message>
<message>
- <location line="+176"/>
+ <location line="+99"/>
+ <source>&amp;Send</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+7"/>
+ <source>&amp;Receive</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+14"/>
+ <source>&amp;Addresses</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+22"/>
<source>&amp;About Bitcoin</source>
<translation>&amp;Despre Bitcoin</translation>
</message>
<message>
<location line="+9"/>
<source>&amp;Show / Hide</source>
- <translation type="unfinished"/>
+ <translation>Arata/Ascunde</translation>
</message>
<message>
<location line="+1"/>
@@ -525,97 +530,92 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation>[testnet]</translation>
</message>
<message>
- <location line="+63"/>
+ <location line="+47"/>
<source>Bitcoin client</source>
- <translation type="unfinished"/>
+ <translation>Client Bitcoin</translation>
</message>
<message numerus="yes">
- <location line="+79"/>
+ <location line="+140"/>
<source>%n active connection(s) to Bitcoin network</source>
<translation><numerusform>%n active connections to Bitcoin network</numerusform><numerusform>%n active connections to Bitcoin network</numerusform><numerusform>%n active connections to Bitcoin network</numerusform></translation>
</message>
<message>
- <location line="+45"/>
- <source>Processed %1 of %2 blocks of transaction history (%3% done).</source>
+ <location line="+39"/>
+ <source>Processed %1 of %2 (estimated) blocks of transaction history.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+7"/>
+ <location line="+4"/>
<source>Processed %1 blocks of transaction history.</source>
<translation type="unfinished"/>
</message>
+ <message numerus="yes">
+ <location line="+20"/>
+ <source>%n hour(s)</source>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
+ <message numerus="yes">
+ <location line="+4"/>
+ <source>%n day(s)</source>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
+ <message numerus="yes">
+ <location line="+4"/>
+ <source>%n week(s)</source>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
<message>
- <location line="+70"/>
- <source>Error</source>
+ <location line="+5"/>
+ <source>%1 behind</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+3"/>
- <source>Warning</source>
+ <location line="+14"/>
+ <source>Last received block was generated %1 ago.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+3"/>
- <source>Information</source>
+ <location line="+2"/>
+ <source>Transactions after this will not yet be visible.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+66"/>
- <source>This transaction is over the size limit. You can still send it for a fee of %1, which goes to the nodes that process your transaction and helps to support the network. Do you want to pay the fee?</source>
+ <location line="+21"/>
+ <source>Error</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+210"/>
- <source>Backup Successful</source>
+ <location line="+3"/>
+ <source>Warning</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+0"/>
- <source>The wallet data was successfully saved to the new location.</source>
+ <location line="+3"/>
+ <source>Information</source>
<translation type="unfinished"/>
</message>
- <message numerus="yes">
- <location line="-338"/>
- <source>%n second(s) ago</source>
- <translation><numerusform>%n seconds ago</numerusform><numerusform>%n seconds ago</numerusform><numerusform>%n seconds ago</numerusform></translation>
- </message>
- <message numerus="yes">
- <location line="+4"/>
- <source>%n minute(s) ago</source>
- <translation><numerusform>Acum %n minut</numerusform><numerusform>Acum %n minute</numerusform><numerusform>Acum %n minute</numerusform></translation>
- </message>
- <message numerus="yes">
- <location line="+4"/>
- <source>%n hour(s) ago</source>
- <translation><numerusform>Acum %n oră</numerusform><numerusform>Acum %n ore</numerusform><numerusform>Acum %n ore</numerusform></translation>
- </message>
- <message numerus="yes">
- <location line="+4"/>
- <source>%n day(s) ago</source>
- <translation><numerusform>Acum %n zi</numerusform><numerusform>Acum %n zile</numerusform><numerusform>Acum %n zile</numerusform></translation>
+ <message>
+ <location line="+68"/>
+ <source>This transaction is over the size limit. You can still send it for a fee of %1, which goes to the nodes that process your transaction and helps to support the network. Do you want to pay the fee?</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location line="+6"/>
+ <location line="-138"/>
<source>Up to date</source>
<translation>Actualizat</translation>
</message>
<message>
- <location line="+7"/>
+ <location line="+32"/>
<source>Catching up...</source>
<translation>Se actualizează...</translation>
</message>
<message>
- <location line="+10"/>
- <source>Last received block was generated %1.</source>
- <translation>Ultimul bloc primit a fost generat %1.</translation>
- </message>
- <message>
- <location line="+97"/>
+ <location line="+110"/>
<source>Confirm transaction fee</source>
- <translation type="unfinished"/>
+ <translation>Confirma taxa tranzactiei</translation>
</message>
<message>
- <location line="+23"/>
+ <location line="+8"/>
<source>Sent transaction</source>
<translation>Tranzacţie expediată</translation>
</message>
@@ -631,17 +631,17 @@ Amount: %2
Type: %3
Address: %4
</source>
- <translation type="unfinished"/>
+ <translation>Data: %1⎠Suma: %2⎠Tipul: %3⎠Addresa: %4âŽ</translation>
</message>
<message>
- <location line="+99"/>
- <location line="+28"/>
+ <location line="+33"/>
+ <location line="+23"/>
<source>URI handling</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-28"/>
- <location line="+28"/>
+ <location line="-23"/>
+ <location line="+23"/>
<source>URI can not be parsed! This can be caused by an invalid Bitcoin address or malformed URI parameters.</source>
<translation type="unfinished"/>
</message>
@@ -656,27 +656,7 @@ Address: %4
<translation>Portofelul electronic este &lt;b&gt;criptat&lt;/b&gt; iar in momentul de faţă este &lt;b&gt;blocat&lt;/b&gt;</translation>
</message>
<message>
- <location line="+23"/>
- <source>Backup Wallet</source>
- <translation>Backup portofelul electronic</translation>
- </message>
- <message>
- <location line="+0"/>
- <source>Wallet Data (*.dat)</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+3"/>
- <source>Backup Failed</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+0"/>
- <source>There was an error trying to save the wallet data to the new location.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../bitcoin.cpp" line="+109"/>
+ <location filename="../bitcoin.cpp" line="+108"/>
<source>A fatal error occurred. Bitcoin can no longer continue safely and will quit.</source>
<translation type="unfinished"/>
</message>
@@ -684,9 +664,9 @@ Address: %4
<context>
<name>ClientModel</name>
<message>
- <location filename="../clientmodel.cpp" line="+86"/>
+ <location filename="../clientmodel.cpp" line="+96"/>
<source>Network Alert</source>
- <translation type="unfinished"/>
+ <translation>Alerta retea</translation>
</message>
</context>
<context>
@@ -717,7 +697,7 @@ Address: %4
<translation>Adresa asociată cu această înregistrare în Lista de adrese. Aceasta poate fi modificată doar pentru expediere.</translation>
</message>
<message>
- <location filename="../editaddressdialog.cpp" line="+20"/>
+ <location filename="../editaddressdialog.cpp" line="+21"/>
<source>New receiving address</source>
<translation>Noua adresă de primire</translation>
</message>
@@ -737,17 +717,17 @@ Address: %4
<translation>Editează adresa de trimitere</translation>
</message>
<message>
- <location line="+60"/>
+ <location line="+76"/>
<source>The entered address &quot;%1&quot; is already in the address book.</source>
<translation>Adresa introdusă &quot;%1&quot; se află deja în Lista de adrese.</translation>
</message>
<message>
- <location line="+5"/>
+ <location line="-5"/>
<source>The entered address &quot;%1&quot; is not a valid Bitcoin address.</source>
<translation>Adresa introdusă &quot;%1&quot; nu este o adresă bitcoin valabilă.</translation>
</message>
<message>
- <location line="+5"/>
+ <location line="+10"/>
<source>Could not unlock wallet.</source>
<translation>Portofelul electronic nu a putut fi deblocat .</translation>
</message>
@@ -760,10 +740,10 @@ Address: %4
<context>
<name>GUIUtil::HelpMessageBox</name>
<message>
- <location filename="../guiutil.cpp" line="+419"/>
+ <location filename="../guiutil.cpp" line="+422"/>
<location line="+12"/>
<source>Bitcoin-Qt</source>
- <translation type="unfinished"/>
+ <translation>Bitcoin-Qt</translation>
</message>
<message>
<location line="-12"/>
@@ -788,17 +768,17 @@ Address: %4
<message>
<location line="+1"/>
<source>Set language, for example &quot;de_DE&quot; (default: system locale)</source>
- <translation type="unfinished"/>
+ <translation>Seteaza limba, de exemplu: &quot;de_DE&quot; (initialt: system locale)</translation>
</message>
<message>
<location line="+1"/>
<source>Start minimized</source>
- <translation type="unfinished"/>
+ <translation>Incepe miniaturizare</translation>
</message>
<message>
<location line="+1"/>
<source>Show splash screen on startup (default: 1)</source>
- <translation type="unfinished"/>
+ <translation>Afișează pe ecran splash la pornire (implicit: 1)</translation>
</message>
</context>
<context>
@@ -816,7 +796,7 @@ Address: %4
<message>
<location line="+6"/>
<source>Optional transaction fee per kB that helps make sure your transactions are processed quickly. Most transactions are 1 kB. Fee 0.01 recommended.</source>
- <translation type="unfinished"/>
+ <translation>Taxa de tranzacție opțional pe kB, care vă ajută sa va asigurati că tranzacțiile sunt procesate rapid. Cele mai multe tranzacții sunt de la 1 kB. Taxa de 0.01 recomandat.</translation>
</message>
<message>
<location line="+15"/>
@@ -846,7 +826,7 @@ Address: %4
<message>
<location line="+13"/>
<source>&amp;Network</source>
- <translation type="unfinished"/>
+ <translation>&amp;Retea</translation>
</message>
<message>
<location line="+6"/>
@@ -871,7 +851,7 @@ Address: %4
<message>
<location line="+9"/>
<source>Proxy &amp;IP:</source>
- <translation type="unfinished"/>
+ <translation>Proxy &amp;IP:</translation>
</message>
<message>
<location line="+19"/>
@@ -881,7 +861,7 @@ Address: %4
<message>
<location line="+7"/>
<source>&amp;Port:</source>
- <translation type="unfinished"/>
+ <translation>&amp;Port:</translation>
</message>
<message>
<location line="+19"/>
@@ -891,17 +871,17 @@ Address: %4
<message>
<location line="+7"/>
<source>SOCKS &amp;Version:</source>
- <translation type="unfinished"/>
+ <translation>SOCKS &amp;Versiune:</translation>
</message>
<message>
<location line="+13"/>
<source>SOCKS version of the proxy (e.g. 5)</source>
- <translation type="unfinished"/>
+ <translation>Versiunea SOCKS a proxiului (ex. 5)</translation>
</message>
<message>
<location line="+36"/>
<source>&amp;Window</source>
- <translation type="unfinished"/>
+ <translation>&amp;Fereastra</translation>
</message>
<message>
<location line="+6"/>
@@ -931,12 +911,12 @@ Address: %4
<message>
<location line="+8"/>
<source>User Interface &amp;language:</source>
- <translation type="unfinished"/>
+ <translation>Interfata &amp; limba userului</translation>
</message>
<message>
<location line="+13"/>
<source>The user interface language can be set here. This setting will take effect after restarting Bitcoin.</source>
- <translation type="unfinished"/>
+ <translation>Limba interfeței utilizatorului poate fi setat aici. Această setare va avea efect după repornirea Bitcoin.</translation>
</message>
<message>
<location line="+11"/>
@@ -951,7 +931,7 @@ Address: %4
<message>
<location line="+9"/>
<source>Whether to show Bitcoin addresses in the transaction list or not.</source>
- <translation type="unfinished"/>
+ <translation>Vezi dacă adresele Bitcoin sunt în lista de tranzacție sau nu</translation>
</message>
<message>
<location line="+3"/>
@@ -961,22 +941,22 @@ Address: %4
<message>
<location line="+71"/>
<source>&amp;OK</source>
- <translation type="unfinished"/>
+ <translation>&amp; OK</translation>
</message>
<message>
<location line="+7"/>
<source>&amp;Cancel</source>
- <translation type="unfinished"/>
+ <translation>&amp; Renunta</translation>
</message>
<message>
<location line="+10"/>
<source>&amp;Apply</source>
- <translation type="unfinished"/>
+ <translation>Aplica</translation>
</message>
<message>
- <location filename="../optionsdialog.cpp" line="+55"/>
+ <location filename="../optionsdialog.cpp" line="+53"/>
<source>default</source>
- <translation type="unfinished"/>
+ <translation>Initial</translation>
</message>
<message>
<location line="+130"/>
@@ -997,7 +977,7 @@ Address: %4
<location line="+42"/>
<location line="+9"/>
<source>Warning</source>
- <translation type="unfinished"/>
+ <translation>Atentie!</translation>
</message>
<message>
<location line="-9"/>
@@ -1008,7 +988,7 @@ Address: %4
<message>
<location line="+29"/>
<source>The supplied proxy address is invalid.</source>
- <translation type="unfinished"/>
+ <translation>Adresa bitcoin pe care a-ti specificat-o este invalida</translation>
</message>
</context>
<context>
@@ -1019,23 +999,18 @@ Address: %4
<translation>Form</translation>
</message>
<message>
- <location line="+51"/>
- <location line="+183"/>
+ <location line="+50"/>
+ <location line="+166"/>
<source>The displayed information may be out of date. Your wallet automatically synchronizes with the Bitcoin network after a connection is established, but this process has not completed yet.</source>
- <translation type="unfinished"/>
+ <translation>Informațiile afișate pot fi expirate. Portofelul tău se sincronizează automat cu rețeaua Bitcoin după ce o conexiune este stabilita, dar acest proces nu a fost finalizat încă.</translation>
</message>
<message>
- <location line="-141"/>
+ <location line="-124"/>
<source>Balance:</source>
<translation>Balanţă:</translation>
</message>
<message>
- <location line="+58"/>
- <source>Number of transactions:</source>
- <translation>Număr total de tranzacţii:</translation>
- </message>
- <message>
- <location line="-29"/>
+ <location line="+29"/>
<source>Unconfirmed:</source>
<translation>Neconfirmat:</translation>
</message>
@@ -1045,14 +1020,14 @@ Address: %4
<translation>Portofelul</translation>
</message>
<message>
- <location line="+124"/>
+ <location line="+107"/>
<source>Immature:</source>
- <translation type="unfinished"/>
+ <translation>Nematurizat:</translation>
</message>
<message>
<location line="+13"/>
<source>Mined balance that has not yet matured</source>
- <translation type="unfinished"/>
+ <translation>Balanta minata care nu s-a maturizat inca</translation>
</message>
<message>
<location line="+46"/>
@@ -1060,7 +1035,7 @@ Address: %4
<translation>&lt;b&gt;Ultimele tranzacţii&lt;/b&gt;</translation>
</message>
<message>
- <location line="-118"/>
+ <location line="-101"/>
<source>Your current balance</source>
<translation>Soldul contul</translation>
</message>
@@ -1070,14 +1045,17 @@ Address: %4
<translation>Totalul tranzacţiilor care aşteaptă să fie confirmate şi care nu sunt încă luate în calcul la afişarea soldului contului.</translation>
</message>
<message>
- <location line="+20"/>
- <source>Total number of transactions in wallet</source>
- <translation>Numărul total de tranzacţii din portofelul electronic</translation>
- </message>
- <message>
<location filename="../overviewpage.cpp" line="+115"/>
<location line="+1"/>
<source>out of sync</source>
+ <translation>Nu este sincronizat</translation>
+ </message>
+</context>
+<context>
+ <name>PaymentServer</name>
+ <message>
+ <location filename="../paymentserver.cpp" line="+107"/>
+ <source>Cannot start bitcoin: click-to-pay handler</source>
<translation type="unfinished"/>
</message>
</context>
@@ -1086,12 +1064,12 @@ Address: %4
<message>
<location filename="../forms/qrcodedialog.ui" line="+14"/>
<source>QR Code Dialog</source>
- <translation type="unfinished"/>
+ <translation>Dialogul codului QR</translation>
</message>
<message>
<location line="+59"/>
<source>Request Payment</source>
- <translation type="unfinished"/>
+ <translation>Cerere de plata</translation>
</message>
<message>
<location line="+56"/>
@@ -1111,17 +1089,17 @@ Address: %4
<message>
<location line="+71"/>
<source>&amp;Save As...</source>
- <translation type="unfinished"/>
+ <translation>Salvare ca...</translation>
</message>
<message>
<location filename="../qrcodedialog.cpp" line="+62"/>
<source>Error encoding URI into QR Code.</source>
- <translation type="unfinished"/>
+ <translation>Eroare la incercarea codarii URl-ului in cod QR</translation>
</message>
<message>
<location line="+40"/>
<source>The entered amount is invalid, please check.</source>
- <translation type="unfinished"/>
+ <translation>Suma introdusa nu este valida, verifica suma.</translation>
</message>
<message>
<location line="+23"/>
@@ -1131,12 +1109,12 @@ Address: %4
<message>
<location line="+25"/>
<source>Save QR Code</source>
- <translation type="unfinished"/>
+ <translation>Salveaza codul QR</translation>
</message>
<message>
<location line="+0"/>
<source>PNG Images (*.png)</source>
- <translation type="unfinished"/>
+ <translation>Imagini de tip PNG (*.png)</translation>
</message>
</context>
<context>
@@ -1144,7 +1122,7 @@ Address: %4
<message>
<location filename="../forms/rpcconsole.ui" line="+46"/>
<source>Client name</source>
- <translation type="unfinished"/>
+ <translation>Numaele clientului</translation>
</message>
<message>
<location line="+10"/>
@@ -1158,67 +1136,67 @@ Address: %4
<location line="+23"/>
<location filename="../rpcconsole.cpp" line="+344"/>
<source>N/A</source>
- <translation type="unfinished"/>
+ <translation>N/A</translation>
</message>
<message>
<location line="-217"/>
<source>Client version</source>
- <translation type="unfinished"/>
+ <translation>Versiunea clientului</translation>
</message>
<message>
<location line="-45"/>
<source>&amp;Information</source>
- <translation type="unfinished"/>
+ <translation>&amp; Informatie</translation>
</message>
<message>
<location line="+68"/>
<source>Using OpenSSL version</source>
- <translation type="unfinished"/>
+ <translation>Foloseste versiunea OpenSSL</translation>
</message>
<message>
<location line="+49"/>
<source>Startup time</source>
- <translation type="unfinished"/>
+ <translation>Data pornirii</translation>
</message>
<message>
<location line="+29"/>
<source>Network</source>
- <translation type="unfinished"/>
+ <translation>Retea</translation>
</message>
<message>
<location line="+7"/>
<source>Number of connections</source>
- <translation type="unfinished"/>
+ <translation>Numarul de conexiuni</translation>
</message>
<message>
<location line="+23"/>
<source>On testnet</source>
- <translation type="unfinished"/>
+ <translation>Pe testnet</translation>
</message>
<message>
<location line="+23"/>
<source>Block chain</source>
- <translation type="unfinished"/>
+ <translation>Lant bloc</translation>
</message>
<message>
<location line="+7"/>
<source>Current number of blocks</source>
- <translation type="unfinished"/>
+ <translation>Numarul curent de blockuri</translation>
</message>
<message>
<location line="+23"/>
<source>Estimated total blocks</source>
- <translation type="unfinished"/>
+ <translation>Estimarea totala a blocks</translation>
</message>
<message>
<location line="+23"/>
<source>Last block time</source>
- <translation type="unfinished"/>
+ <translation>Ultimul block a fost gasit la:</translation>
</message>
<message>
<location line="+52"/>
<source>&amp;Open</source>
- <translation type="unfinished"/>
+ <translation>&amp;Deschide</translation>
</message>
<message>
<location line="+16"/>
@@ -1228,62 +1206,62 @@ Address: %4
<message>
<location line="+7"/>
<source>Show the Bitcoin-Qt help message to get a list with possible Bitcoin command-line options.</source>
- <translation type="unfinished"/>
+ <translation>Arata mesajul de ajutor Bitcoin-QT pentru a obtine o lista cu posibilele optiuni ale comenzilor Bitcoin</translation>
</message>
<message>
<location line="+3"/>
<source>&amp;Show</source>
- <translation type="unfinished"/>
+ <translation>&amp; Arata</translation>
</message>
<message>
<location line="+24"/>
<source>&amp;Console</source>
- <translation type="unfinished"/>
+ <translation>&amp;Consola</translation>
</message>
<message>
<location line="-260"/>
<source>Build date</source>
- <translation type="unfinished"/>
+ <translation>Construit la data:</translation>
</message>
<message>
<location line="-104"/>
<source>Bitcoin - Debug window</source>
- <translation type="unfinished"/>
+ <translation>Bitcoin-Fereastra pentru debug</translation>
</message>
<message>
<location line="+25"/>
<source>Bitcoin Core</source>
- <translation type="unfinished"/>
+ <translation>Bitcoin Core</translation>
</message>
<message>
<location line="+279"/>
<source>Debug log file</source>
- <translation type="unfinished"/>
+ <translation>Loguri debug</translation>
</message>
<message>
<location line="+7"/>
<source>Open the Bitcoin debug log file from the current data directory. This can take a few seconds for large log files.</source>
- <translation type="unfinished"/>
+ <translation>Deschide logurile debug din directorul curent. Aceasta poate dura cateva secunde pentru fisierele mai mari</translation>
</message>
<message>
<location line="+102"/>
<source>Clear console</source>
- <translation type="unfinished"/>
+ <translation>Curata consola</translation>
</message>
<message>
<location filename="../rpcconsole.cpp" line="-30"/>
<source>Welcome to the Bitcoin RPC console.</source>
- <translation type="unfinished"/>
+ <translation>Bun venit la consola bitcoin RPC</translation>
</message>
<message>
<location line="+1"/>
<source>Use up and down arrows to navigate history, and &lt;b&gt;Ctrl-L&lt;/b&gt; to clear screen.</source>
- <translation type="unfinished"/>
+ <translation>Foloseste sagetile sus si jos pentru a naviga in istoric si &lt;b&gt;Ctrl-L&lt;/b&gt; pentru a curata.</translation>
</message>
<message>
<location line="+1"/>
<source>Type &lt;b&gt;help&lt;/b&gt; for an overview of available commands.</source>
- <translation type="unfinished"/>
+ <translation>Scrie &lt;b&gt;help&lt;/b&gt; pentru a vedea comenzile disponibile</translation>
</message>
</context>
<context>
@@ -1313,7 +1291,7 @@ Address: %4
<message>
<location line="+20"/>
<source>Remove all transaction fields</source>
- <translation type="unfinished"/>
+ <translation>Sterge toate spatiile de tranzactie</translation>
</message>
<message>
<location line="+3"/>
@@ -1420,7 +1398,7 @@ Address: %4
</message>
<message>
<location line="+60"/>
- <location filename="../sendcoinsentry.cpp" line="+25"/>
+ <location filename="../sendcoinsentry.cpp" line="+26"/>
<source>Enter a label for this address to add it to your address book</source>
<translation>Adaugă o etichetă acestei adrese pentru a o trece în Lista de adrese</translation>
</message>
@@ -1465,12 +1443,12 @@ Address: %4
<message>
<location filename="../forms/signverifymessagedialog.ui" line="+14"/>
<source>Signatures - Sign / Verify a Message</source>
- <translation type="unfinished"/>
+ <translation>Semnatura- Semneaza/verifica un mesaj</translation>
</message>
<message>
<location line="+13"/>
<source>&amp;Sign Message</source>
- <translation type="unfinished"/>
+ <translation>Semneaza Mesajul</translation>
</message>
<message>
<location line="+6"/>
@@ -1507,7 +1485,7 @@ Address: %4
<message>
<location line="+12"/>
<source>Enter the message you want to sign here</source>
- <translation type="unfinished"/>
+ <translation>Introduce mesajul pe care vrei sa il semnezi, aici.</translation>
</message>
<message>
<location line="+7"/>
@@ -1517,12 +1495,12 @@ Address: %4
<message>
<location line="+27"/>
<source>Copy the current signature to the system clipboard</source>
- <translation type="unfinished"/>
+ <translation>Copiaza semnatura curenta in clipboard-ul sistemului</translation>
</message>
<message>
<location line="+21"/>
<source>Sign the message to prove you own this Bitcoin address</source>
- <translation type="unfinished"/>
+ <translation>Semneaza mesajul pentru a dovedi ca detii acesta adresa Bitcoin</translation>
</message>
<message>
<location line="+3"/>
@@ -1532,7 +1510,7 @@ Address: %4
<message>
<location line="+14"/>
<source>Reset all sign message fields</source>
- <translation type="unfinished"/>
+ <translation>Reseteaza toate spatiile mesajelor semnate.</translation>
</message>
<message>
<location line="+3"/>
@@ -1543,7 +1521,7 @@ Address: %4
<message>
<location line="-87"/>
<source>&amp;Verify Message</source>
- <translation type="unfinished"/>
+ <translation>Verifica mesajul</translation>
</message>
<message>
<location line="+6"/>
@@ -1558,7 +1536,7 @@ Address: %4
<message>
<location line="+40"/>
<source>Verify the message to ensure it was signed with the specified Bitcoin address</source>
- <translation type="unfinished"/>
+ <translation>Verifica mesajul pentru a fi sigur ca a fost semnat cu adresa Bitcoin specifica</translation>
</message>
<message>
<location line="+3"/>
@@ -1568,7 +1546,7 @@ Address: %4
<message>
<location line="+14"/>
<source>Reset all verify message fields</source>
- <translation type="unfinished"/>
+ <translation>Reseteaza toate spatiile mesajelor semnate.</translation>
</message>
<message>
<location filename="../signverifymessagedialog.cpp" line="+27"/>
@@ -1579,18 +1557,18 @@ Address: %4
<message>
<location line="-2"/>
<source>Click &quot;Sign Message&quot; to generate signature</source>
- <translation type="unfinished"/>
+ <translation>Click &quot;Semneaza msajul&quot; pentru a genera semnatura</translation>
</message>
<message>
<location line="+3"/>
<source>Enter Bitcoin signature</source>
- <translation type="unfinished"/>
+ <translation>Introduce semnatura bitocin</translation>
</message>
<message>
<location line="+82"/>
<location line="+81"/>
<source>The entered address is invalid.</source>
- <translation type="unfinished"/>
+ <translation>Adresa introdusa nu este valida</translation>
</message>
<message>
<location line="-81"/>
@@ -1598,65 +1576,65 @@ Address: %4
<location line="+73"/>
<location line="+8"/>
<source>Please check the address and try again.</source>
- <translation type="unfinished"/>
+ <translation>Te rugam verifica adresa si introduce-o din nou</translation>
</message>
<message>
<location line="-81"/>
<location line="+81"/>
<source>The entered address does not refer to a key.</source>
- <translation type="unfinished"/>
+ <translation>Adresa introdusa nu se refera la o cheie.</translation>
</message>
<message>
<location line="-73"/>
<source>Wallet unlock was cancelled.</source>
- <translation type="unfinished"/>
+ <translation>Blocarea portofelului a fost intrerupta</translation>
</message>
<message>
<location line="+8"/>
<source>Private key for the entered address is not available.</source>
- <translation type="unfinished"/>
+ <translation>Cheia privata pentru adresa introdusa nu este valida.</translation>
</message>
<message>
<location line="+12"/>
<source>Message signing failed.</source>
- <translation type="unfinished"/>
+ <translation>Semnarea mesajului a esuat</translation>
</message>
<message>
<location line="+5"/>
<source>Message signed.</source>
- <translation type="unfinished"/>
+ <translation>Mesaj Semnat!</translation>
</message>
<message>
<location line="+59"/>
<source>The signature could not be decoded.</source>
- <translation type="unfinished"/>
+ <translation>Aceasta semnatura nu a putut fi decodata</translation>
</message>
<message>
<location line="+0"/>
<location line="+13"/>
<source>Please check the signature and try again.</source>
- <translation type="unfinished"/>
+ <translation>Verifica semnatura si incearca din nou</translation>
</message>
<message>
<location line="+0"/>
<source>The signature did not match the message digest.</source>
- <translation type="unfinished"/>
+ <translation>Semnatura nu seamana!</translation>
</message>
<message>
<location line="+7"/>
<source>Message verification failed.</source>
- <translation type="unfinished"/>
+ <translation>Verificarea mesajului a esuat</translation>
</message>
<message>
<location line="+5"/>
<source>Message verified.</source>
- <translation type="unfinished"/>
+ <translation>Mesaj verificat</translation>
</message>
</context>
<context>
<name>TransactionDesc</name>
<message>
- <location filename="../transactiondesc.cpp" line="+19"/>
+ <location filename="../transactiondesc.cpp" line="+20"/>
<source>Open until %1</source>
<translation>Deschis până la %1</translation>
</message>
@@ -1693,7 +1671,7 @@ Address: %4
<message>
<location line="+7"/>
<source>Source</source>
- <translation type="unfinished"/>
+ <translation>Sursa</translation>
</message>
<message>
<location line="+0"/>
@@ -1717,7 +1695,7 @@ Address: %4
<location line="-77"/>
<location line="+2"/>
<source>own address</source>
- <translation type="unfinished"/>
+ <translation>Adresa posedata</translation>
</message>
<message>
<location line="-2"/>
@@ -1774,7 +1752,7 @@ Address: %4
<message>
<location line="+2"/>
<source>Transaction ID</source>
- <translation type="unfinished"/>
+ <translation>ID-ul tranzactiei</translation>
</message>
<message>
<location line="+3"/>
@@ -1784,7 +1762,7 @@ Address: %4
<message>
<location line="+7"/>
<source>Debug information</source>
- <translation type="unfinished"/>
+ <translation>Informatii pentru debug</translation>
</message>
<message>
<location line="+8"/>
@@ -1794,7 +1772,7 @@ Address: %4
<message>
<location line="+3"/>
<source>Inputs</source>
- <translation type="unfinished"/>
+ <translation>Intrari</translation>
</message>
<message>
<location line="+23"/>
@@ -1804,12 +1782,12 @@ Address: %4
<message>
<location line="+1"/>
<source>true</source>
- <translation type="unfinished"/>
+ <translation>Adevarat!</translation>
</message>
<message>
<location line="+0"/>
<source>false</source>
- <translation type="unfinished"/>
+ <translation>Fals!</translation>
</message>
<message>
<location line="-209"/>
@@ -1843,7 +1821,7 @@ Address: %4
<context>
<name>TransactionTableModel</name>
<message>
- <location filename="../transactiontablemodel.cpp" line="+226"/>
+ <location filename="../transactiontablemodel.cpp" line="+225"/>
<source>Date</source>
<translation>Data</translation>
</message>
@@ -1910,7 +1888,7 @@ Address: %4
<message>
<location line="+2"/>
<source>Received from</source>
- <translation type="unfinished"/>
+ <translation>Primit de la:</translation>
</message>
<message>
<location line="+3"/>
@@ -1961,7 +1939,7 @@ Address: %4
<context>
<name>TransactionView</name>
<message>
- <location filename="../transactionview.cpp" line="+55"/>
+ <location filename="../transactionview.cpp" line="+52"/>
<location line="+16"/>
<source>All</source>
<translation>Toate</translation>
@@ -2048,16 +2026,21 @@ Address: %4
</message>
<message>
<location line="+1"/>
+ <source>Copy transaction ID</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Edit label</source>
<translation>Editează eticheta</translation>
</message>
<message>
<location line="+1"/>
<source>Show transaction details</source>
- <translation type="unfinished"/>
+ <translation>Arata detaliile tranzactiei</translation>
</message>
<message>
- <location line="+142"/>
+ <location line="+139"/>
<source>Export Transaction Data</source>
<translation>Exportă tranzacţiile</translation>
</message>
@@ -2112,7 +2095,7 @@ Address: %4
<translation>Fisierul %1 nu a putut fi accesat pentru scriere.</translation>
</message>
<message>
- <location line="+95"/>
+ <location line="+100"/>
<source>Range:</source>
<translation>Interval:</translation>
</message>
@@ -2123,29 +2106,172 @@ Address: %4
</message>
</context>
<context>
+ <name>WalletView</name>
+ <message>
+ <location filename="../walletview.cpp" line="+95"/>
+ <source>&amp;Overview</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Show general overview of wallet</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>&amp;Send coins</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Send coins to a Bitcoin address</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>&amp;Receive coins</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Show the list of addresses for receiving payments</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>&amp;Transactions</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Browse transaction history</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>&amp;Address Book</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Edit the list of stored addresses and labels</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+12"/>
+ <source>&amp;Encrypt Wallet...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Encrypt the private keys that belong to your wallet</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>&amp;Backup Wallet...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Backup wallet to another location</source>
+ <translation>Creaza copie de rezerva a portofelului intr-o locatie diferita</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>&amp;Change Passphrase...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Change the passphrase used for wallet encryption</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Sign &amp;message...</source>
+ <translation>Semneaza &amp;mesaj...</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Sign messages with your Bitcoin addresses to prove you own them</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>&amp;Verify message...</source>
+ <translation>Verifica mesajul</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Verify messages to ensure they were signed with specified Bitcoin addresses</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>&amp;Export...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Export the data in the current tab to a file</source>
+ <translation>Exporta datele din tab-ul curent catre un fiesier</translation>
+ </message>
+ <message>
+ <location line="+180"/>
+ <source>Backup Wallet</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>Wallet Data (*.dat)</source>
+ <translation>Date portofel (*.dat)</translation>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Backup Failed</source>
+ <translation>Copia de rezerva a esuat</translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>There was an error trying to save the wallet data to the new location.</source>
+ <translation>A apărut o eroare la încercarea de a salva datele din portofel intr-o noua locație.</translation>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>Backup Successful</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>The wallet data was successfully saved to the new location.</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>bitcoin-core</name>
<message>
- <location filename="../bitcoinstrings.cpp" line="+88"/>
+ <location filename="../bitcoinstrings.cpp" line="+96"/>
<source>Bitcoin version</source>
<translation>versiunea Bitcoin</translation>
</message>
<message>
- <location line="+82"/>
+ <location line="+98"/>
<source>Usage:</source>
<translation>Uz:</translation>
</message>
<message>
- <location line="-23"/>
+ <location line="-24"/>
<source>Send command to -server or bitcoind</source>
<translation>Trimite comanda la -server sau bitcoind</translation>
</message>
<message>
- <location line="-21"/>
+ <location line="-22"/>
<source>List commands</source>
<translation>Listă de comenzi</translation>
</message>
<message>
- <location line="-11"/>
+ <location line="-10"/>
<source>Get help for a command</source>
<translation>Ajutor pentru o comandă</translation>
</message>
@@ -2157,7 +2283,7 @@ Address: %4
<message>
<location line="+22"/>
<source>Specify configuration file (default: bitcoin.conf)</source>
- <translation type="unfinished"/>
+ <translation>Specifica-ți configurația fisierului (in mod normal: bitcoin.conf)</translation>
</message>
<message>
<location line="+3"/>
@@ -2167,98 +2293,101 @@ Address: %4
<message>
<location line="-47"/>
<source>Generate coins</source>
- <translation type="unfinished"/>
+ <translation>Generare monede</translation>
</message>
<message>
- <location line="-15"/>
+ <location line="-28"/>
<source>Don&apos;t generate coins</source>
- <translation type="unfinished"/>
+ <translation>Nu genera monede!</translation>
</message>
<message>
- <location line="+61"/>
+ <location line="+74"/>
<source>Specify data directory</source>
- <translation type="unfinished"/>
+ <translation>Specifica datele directorului</translation>
</message>
<message>
<location line="-7"/>
<source>Set database cache size in megabytes (default: 25)</source>
- <translation type="unfinished"/>
+ <translation>Seteaza marimea cache a bazei de date in MB (initial: 25)</translation>
</message>
<message>
- <location line="-26"/>
+ <location line="-27"/>
<source>Listen for connections on &lt;port&gt; (default: 8333 or testnet: 18333)</source>
- <translation type="unfinished"/>
+ <translation>Lista a conectiunile in &lt;port&gt; (initial: 8333 sau testnet: 18333)</translation>
</message>
<message>
- <location line="+4"/>
+ <location line="+5"/>
<source>Maintain at most &lt;n&gt; connections to peers (default: 125)</source>
- <translation type="unfinished"/>
+ <translation>Se menține la cele mai multe conexiuni &lt;n&gt; cu colegii (implicit: 125)</translation>
</message>
<message>
- <location line="-34"/>
+ <location line="-49"/>
<source>Connect to a node to retrieve peer addresses, and disconnect</source>
- <translation type="unfinished"/>
+ <translation>Conecteaza-te la nod pentru a optine adresa peer, si deconecteaza-te</translation>
</message>
<message>
- <location line="+65"/>
+ <location line="+80"/>
<source>Specify your own public address</source>
- <translation type="unfinished"/>
+ <translation>Specifica adresa ta publica</translation>
</message>
<message>
- <location line="+2"/>
+ <location line="+3"/>
<source>Threshold for disconnecting misbehaving peers (default: 100)</source>
- <translation type="unfinished"/>
+ <translation>Prag pentru deconectarea colegii funcționează corect (implicit: 100)</translation>
</message>
<message>
- <location line="-114"/>
+ <location line="-132"/>
<source>Number of seconds to keep misbehaving peers from reconnecting (default: 86400)</source>
- <translation type="unfinished"/>
+ <translation>Numărul de secunde pentru a păstra colegii funcționează corect la reconectare (implicit: 86400)</translation>
</message>
<message>
- <location line="-28"/>
+ <location line="-32"/>
<source>An error occurred while setting up the RPC port %u for listening on IPv4: %s</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+26"/>
+ <location line="+30"/>
<source>Listen for JSON-RPC connections on &lt;port&gt; (default: 8332 or testnet: 18332)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+34"/>
+ <location line="+36"/>
<source>Accept command line and JSON-RPC commands</source>
- <translation type="unfinished"/>
+ <translation>Se accepta command line si comenzi JSON-RPC</translation>
</message>
<message>
- <location line="+62"/>
+ <location line="+77"/>
<source>Run in the background as a daemon and accept commands</source>
- <translation type="unfinished"/>
+ <translation>Ruleaza în background ca un demon și accepta comenzi.</translation>
</message>
<message>
- <location line="+31"/>
+ <location line="+32"/>
<source>Use the test network</source>
- <translation type="unfinished"/>
+ <translation>Utilizeaza test de retea</translation>
</message>
<message>
- <location line="-92"/>
+ <location line="-108"/>
<source>Accept connections from outside (default: 1 if no -proxy or -connect)</source>
- <translation type="unfinished"/>
+ <translation>Accepta conexiuni de la straini (initial: 1 if no -proxy or -connect)
+</translation>
</message>
<message>
- <location line="-74"/>
+ <location line="-82"/>
<source>%s, you must set a rpcpassword in the configuration file:
- %s
+%s
It is recommended you use the following random password:
rpcuser=bitcoinrpc
rpcpassword=%s
(you do not need to remember this password)
The username and password MUST NOT be the same.
If the file does not exist, create it with owner-readable-only file permissions.
+It is also recommended to set alertnotify so you are notified of problems;
+for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.com
</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+15"/>
+ <location line="+17"/>
<source>An error occurred while setting up the RPC port %u for listening on IPv6, falling back to IPv4: %s</source>
<translation type="unfinished"/>
</message>
@@ -2274,11 +2403,6 @@ If the file does not exist, create it with owner-readable-only file permissions.
</message>
<message>
<location line="+3"/>
- <source>Corrupted block database detected. Please restart the client with -reindex.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+2"/>
<source>Error initializing database environment %s! To recover, BACKUP THAT DIRECTORY, then remove everything from it except for wallet.dat.</source>
<translation type="unfinished"/>
</message>
@@ -2293,12 +2417,27 @@ If the file does not exist, create it with owner-readable-only file permissions.
<translation type="unfinished"/>
</message>
<message>
+ <location line="+3"/>
+ <source>Execute command when a relevant alert is received (%s in cmd is replaced by message)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Execute command when a wallet transaction changes (%s in cmd is replaced by TxID)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location line="+11"/>
<source>Set maximum size of high-priority/low-fee transactions in bytes (default: 27000)</source>
- <translation type="unfinished"/>
+ <translation>Seteaza marimea maxima a tranzactie mare/mica in bytes (initial:27000)</translation>
</message>
<message>
<location line="+3"/>
+ <source>Set the number of script verification threads (1-16, 0=auto, default: 0)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
<source>This is a pre-release test build - use at your own risk - do not use for mining or merchant applications</source>
<translation type="unfinished"/>
</message>
@@ -2335,25 +2474,50 @@ If the file does not exist, create it with owner-readable-only file permissions.
<message>
<location line="+2"/>
<source>Block creation options:</source>
- <translation type="unfinished"/>
+ <translation>Optiuni creare block</translation>
</message>
<message>
<location line="+6"/>
<source>Connect only to the specified node(s)</source>
- <translation type="unfinished"/>
+ <translation>Conecteaza-te doar la nod(urile) specifice</translation>
</message>
<message>
<location line="+3"/>
+ <source>Corrupted block database detected</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Discover own IP address (default: 1 when listening and no -externalip)</source>
+ <translation>Descopera propria ta adresa IP (intial: 1)</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Do you want to rebuild the block database now?</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+3"/>
+ <source>Error initializing block database</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Error initializing wallet database environment %s!</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Error loading block database</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+5"/>
+ <location line="+4"/>
+ <source>Error opening block database</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
<source>Error: Disk space is low!</source>
<translation type="unfinished"/>
</message>
@@ -2369,26 +2533,96 @@ If the file does not exist, create it with owner-readable-only file permissions.
</message>
<message>
<location line="+2"/>
+ <source>Error: system error: </source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Failed to listen on any port. Use -listen=0 if you want this.</source>
<translation type="unfinished"/>
</message>
<message>
+ <location line="+1"/>
+ <source>Failed to read block info</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Failed to read block</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Failed to sync block index</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Failed to write block index</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Failed to write block info</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Failed to write block</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Failed to write file info</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Failed to write to coin database</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Failed to write transaction index</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Failed to write undo data</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location line="+2"/>
<source>Find peers using DNS lookup (default: 1 unless -connect)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+5"/>
- <source>How thorough the block verification is (0-4, default: 3)</source>
+ <location line="+3"/>
+ <source>How many blocks to check at startup (default: 288, 0 = all)</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+1"/>
- <source>Importing blocks from block database...</source>
+ <source>How thorough the block verification is (0-4, default: 3)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+24"/>
+ <source>Rebuild block chain index from current blk000??.dat files</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+37"/>
+ <source>Verifying blocks...</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+1"/>
+ <source>Verifying wallet...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-61"/>
<source>Imports blocks from external blk000??.dat file</source>
<translation type="unfinished"/>
</message>
@@ -2403,7 +2637,12 @@ If the file does not exist, create it with owner-readable-only file permissions.
<translation type="unfinished"/>
</message>
<message>
- <location line="+9"/>
+ <location line="+8"/>
+ <source>Maintain a full transaction index (default: 0)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
<source>Maximum per-connection receive buffer, &lt;n&gt;*1000 bytes (default: 5000)</source>
<translation type="unfinished"/>
</message>
@@ -2435,32 +2674,27 @@ If the file does not exist, create it with owner-readable-only file permissions.
<message>
<location line="+2"/>
<source>Prepend debug output with timestamp</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+1"/>
- <source>Rebuild blockchain index from current blk000??.dat files</source>
- <translation type="unfinished"/>
+ <translation>Copie de ieșire de depanare cu timestamp</translation>
</message>
<message>
- <location line="+4"/>
+ <location line="+5"/>
<source>SSL options: (see the Bitcoin Wiki for SSL setup instructions)</source>
- <translation type="unfinished"/>
+ <translation>Optiuni SSl (vezi Bitcoin wiki pentru intructiunile de instalare)</translation>
</message>
<message>
<location line="+1"/>
<source>Select the version of socks proxy to use (4-5, default: 5)</source>
- <translation type="unfinished"/>
+ <translation>Selecteaza versiunea socks-ului pe care vrei sa il folosesti (4-5, initial: 5)</translation>
</message>
<message>
<location line="+3"/>
<source>Send trace/debug info to console instead of debug.log file</source>
- <translation type="unfinished"/>
+ <translation>Trimite urmări / debug info la consola loc de debug.log fișier</translation>
</message>
<message>
<location line="+1"/>
<source>Send trace/debug info to debugger</source>
- <translation type="unfinished"/>
+ <translation>Trimite urmări / debug info la depanatorul</translation>
</message>
<message>
<location line="+5"/>
@@ -2483,14 +2717,19 @@ If the file does not exist, create it with owner-readable-only file permissions.
<translation type="unfinished"/>
</message>
<message>
- <location line="+13"/>
- <source>Use UPnP to map the listening port (default: 0)</source>
+ <location line="+4"/>
+ <source>System error: </source>
<translation type="unfinished"/>
</message>
<message>
+ <location line="+10"/>
+ <source>Use UPnP to map the listening port (default: 0)</source>
+ <translation>Foloseste UPnP pentru a vedea porturile (initial: 0)</translation>
+ </message>
+ <message>
<location line="+1"/>
<source>Use UPnP to map the listening port (default: 1 when listening)</source>
- <translation type="unfinished"/>
+ <translation>Foloseste UPnP pentru a vedea porturile (initial: 1 cand listezi)</translation>
</message>
<message>
<location line="+1"/>
@@ -2500,7 +2739,7 @@ If the file does not exist, create it with owner-readable-only file permissions.
<message>
<location line="+2"/>
<source>Username for JSON-RPC connections</source>
- <translation type="unfinished"/>
+ <translation>Username pentru conectiunile JSON-RPC</translation>
</message>
<message>
<location line="+4"/>
@@ -2514,163 +2753,155 @@ If the file does not exist, create it with owner-readable-only file permissions.
</message>
<message>
<location line="+1"/>
+ <source>You need to rebuild the databases using -reindex to change -txindex</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>wallet.dat corrupt, salvage failed</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-43"/>
+ <location line="-45"/>
<source>Password for JSON-RPC connections</source>
- <translation type="unfinished"/>
+ <translation>Parola pentru conectiunile JSON-RPC</translation>
</message>
<message>
- <location line="-53"/>
+ <location line="-68"/>
<source>Allow JSON-RPC connections from specified IP address</source>
- <translation type="unfinished"/>
+ <translation>Permiteti conectiunile JSON-RPC de la o adresa IP specifica.</translation>
</message>
<message>
- <location line="+62"/>
+ <location line="+77"/>
<source>Send commands to node running on &lt;ip&gt; (default: 127.0.0.1)</source>
- <translation type="unfinished"/>
+ <translation>Trimite comenzi la nod, ruland pe ip-ul (initial: 127.0.0.1)</translation>
</message>
<message>
- <location line="-103"/>
+ <location line="-120"/>
<source>Execute command when the best block changes (%s in cmd is replaced by block hash)</source>
- <translation type="unfinished"/>
+ <translation>Executa comanda cand cel mai bun block se schimba (%s in cmd se inlocuieste cu block hash)</translation>
</message>
<message>
- <location line="+124"/>
+ <location line="+142"/>
<source>Upgrade wallet to latest format</source>
- <translation type="unfinished"/>
+ <translation>Actualizeaza portofelul la ultimul format</translation>
</message>
<message>
- <location line="-15"/>
+ <location line="-16"/>
<source>Set key pool size to &lt;n&gt; (default: 100)</source>
- <translation type="unfinished"/>
+ <translation>Setarea marimii cheii bezinului la &lt;n&gt;(initial 100)</translation>
</message>
<message>
<location line="-12"/>
<source>Rescan the block chain for missing wallet transactions</source>
- <translation type="unfinished"/>
+ <translation>Rescanare lanțul de bloc pentru tranzacțiile portofel lipsă</translation>
</message>
<message>
- <location line="-26"/>
- <source>How many blocks to check at startup (default: 2500, 0 = all)</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+55"/>
+ <location line="+30"/>
<source>Use OpenSSL (https) for JSON-RPC connections</source>
- <translation type="unfinished"/>
+ <translation>Foloseste Open SSL(https) pentru coneciunile JSON-RPC</translation>
</message>
<message>
- <location line="-20"/>
+ <location line="-21"/>
<source>Server certificate file (default: server.cert)</source>
- <translation type="unfinished"/>
+ <translation>Certificatul serverulu (initial: server.cert)</translation>
</message>
<message>
<location line="+1"/>
<source>Server private key (default: server.pem)</source>
- <translation type="unfinished"/>
+ <translation>Cheia privata a serverului ( initial: server.pem)</translation>
</message>
<message>
- <location line="-133"/>
+ <location line="-154"/>
<source>Acceptable ciphers (default: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH)</source>
- <translation type="unfinished"/>
+ <translation>Accepta cifruri (initial: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH)</translation>
</message>
<message>
- <location line="+144"/>
+ <location line="+166"/>
<source>This help message</source>
- <translation type="unfinished"/>
+ <translation>Acest mesaj de ajutor.</translation>
</message>
<message>
<location line="+3"/>
<source>Unable to bind to %s on this computer (bind returned error %d, %s)</source>
- <translation type="unfinished"/>
+ <translation>Nu se poate lega %s cu acest calculator (retunare eroare legatura %d, %s)
+
+</translation>
</message>
<message>
- <location line="-70"/>
+ <location line="-86"/>
<source>Connect through socks proxy</source>
<translation>Conectează prin proxy SOCKS</translation>
</message>
<message>
<location line="-11"/>
<source>Allow DNS lookups for -addnode, -seednode and -connect</source>
- <translation type="unfinished"/>
+ <translation>Permite DNS-ului sa se uite dupa -addnode, -seednode si -connect</translation>
</message>
<message>
- <location line="+43"/>
+ <location line="+57"/>
<source>Loading addresses...</source>
<translation>ÃŽncarc adrese...</translation>
</message>
<message>
- <location line="-25"/>
+ <location line="-35"/>
<source>Error loading wallet.dat: Wallet corrupted</source>
- <translation type="unfinished"/>
+ <translation>Eroare incarcand wallet.dat: Portofel corupt</translation>
</message>
<message>
<location line="+1"/>
<source>Error loading wallet.dat: Wallet requires newer version of Bitcoin</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+73"/>
- <source>Verifying block database integrity...</source>
- <translation type="unfinished"/>
+ <translation>Eroare incarcare wallet.dat: Portofelul are nevoie de o versiune Bitcoin mai noua</translation>
</message>
<message>
- <location line="+1"/>
- <source>Verifying wallet integrity...</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+1"/>
+ <location line="+87"/>
<source>Wallet needed to be rewritten: restart Bitcoin to complete</source>
- <translation type="unfinished"/>
+ <translation>Portofelul trebuie rescris: restarteaza aplicatia bitcoin pentru a face asta.</translation>
</message>
<message>
- <location line="-77"/>
+ <location line="-89"/>
<source>Error loading wallet.dat</source>
- <translation type="unfinished"/>
+ <translation>Eroare incarcand wallet.dat</translation>
</message>
<message>
- <location line="+20"/>
+ <location line="+30"/>
<source>Invalid -proxy address: &apos;%s&apos;</source>
- <translation type="unfinished"/>
+ <translation>Adresa proxy invalida: &apos;%s&apos;</translation>
</message>
<message>
- <location line="+46"/>
+ <location line="+48"/>
<source>Unknown network specified in -onlynet: &apos;%s&apos;</source>
- <translation type="unfinished"/>
+ <translation>Retea specificata necunoscuta -onlynet: &apos;%s&apos;</translation>
</message>
<message>
<location line="-1"/>
<source>Unknown -socks proxy version requested: %i</source>
- <translation type="unfinished"/>
+ <translation>Necunoscut -socks proxy version requested: %i</translation>
</message>
<message>
- <location line="-75"/>
+ <location line="-91"/>
<source>Cannot resolve -bind address: &apos;%s&apos;</source>
- <translation type="unfinished"/>
+ <translation>Nu se poate rezolca -bind address: &apos;%s&apos;</translation>
</message>
<message>
<location line="+1"/>
<source>Cannot resolve -externalip address: &apos;%s&apos;</source>
- <translation type="unfinished"/>
+ <translation>Nu se poate rezolva -externalip address: &apos;%s&apos;</translation>
</message>
<message>
- <location line="+31"/>
+ <location line="+45"/>
<source>Invalid amount for -paytxfee=&lt;amount&gt;: &apos;%s&apos;</source>
- <translation type="unfinished"/>
+ <translation>Suma invalida pentru -paytxfee=&lt;amount&gt;: &apos;%s&apos;</translation>
</message>
<message>
- <location line="-15"/>
+ <location line="-24"/>
<source>Error: could not start node</source>
- <translation type="unfinished"/>
+ <translation>Eroare: nod-ul nu a putut fi pornit</translation>
</message>
<message>
- <location line="+16"/>
+ <location line="+25"/>
<source>Invalid amount</source>
- <translation type="unfinished"/>
+ <translation>Suma invalida</translation>
</message>
<message>
<location line="-4"/>
@@ -2683,67 +2914,64 @@ If the file does not exist, create it with owner-readable-only file permissions.
<translation>ÃŽncarc indice bloc...</translation>
</message>
<message>
- <location line="-45"/>
+ <location line="-59"/>
<source>Add a node to connect to and attempt to keep the connection open</source>
- <translation type="unfinished"/>
+ <translation>Add a node to connect to and attempt to keep the connection open
+details suggestions history
+</translation>
</message>
<message>
<location line="-25"/>
<source>Unable to bind to %s on this computer. Bitcoin is probably already running.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+54"/>
- <source>Find peers using internet relay chat (default: 0)</source>
- <translation type="unfinished"/>
+ <translation>Imposibilitatea de a lega la% s pe acest computer. Bitcoin este, probabil, deja în execuție.</translation>
</message>
<message>
- <location line="-2"/>
+ <location line="+68"/>
<source>Fee per KB to add to transactions you send</source>
- <translation type="unfinished"/>
+ <translation>Taxa pe kb pentru a adauga tranzactii trimise</translation>
</message>
<message>
- <location line="+19"/>
+ <location line="+17"/>
<source>Loading wallet...</source>
<translation>ÃŽncarc portofel...</translation>
</message>
<message>
- <location line="-40"/>
+ <location line="-54"/>
<source>Cannot downgrade wallet</source>
- <translation type="unfinished"/>
+ <translation>Nu se poate face downgrade la portofel</translation>
</message>
<message>
<location line="+1"/>
<source>Cannot initialize keypool</source>
- <translation type="unfinished"/>
+ <translation>Nu se poate initializa keypool</translation>
</message>
<message>
<location line="+3"/>
<source>Cannot write default address</source>
- <translation type="unfinished"/>
+ <translation>Nu se poate scrie adresa initiala</translation>
</message>
<message>
- <location line="+49"/>
+ <location line="+64"/>
<source>Rescanning...</source>
<translation>Rescanez...</translation>
</message>
<message>
- <location line="-43"/>
+ <location line="-56"/>
<source>Done loading</source>
<translation>Încărcare terminată</translation>
</message>
<message>
- <location line="+65"/>
+ <location line="+79"/>
<source>To use the %s option</source>
- <translation type="unfinished"/>
+ <translation>Pentru a folosii optiunea %s</translation>
</message>
<message>
- <location line="-60"/>
+ <location line="-71"/>
<source>Error</source>
<translation>Eroare</translation>
</message>
<message>
- <location line="-28"/>
+ <location line="-33"/>
<source>You must set rpcpassword=&lt;password&gt; in the configuration file:
%s
If the file does not exist, create it with owner-readable-only file permissions.</source>
diff --git a/src/qt/locale/bitcoin_ru.ts b/src/qt/locale/bitcoin_ru.ts
index bd60aba0bb..239071ce52 100644
--- a/src/qt/locale/bitcoin_ru.ts
+++ b/src/qt/locale/bitcoin_ru.ts
@@ -13,12 +13,7 @@
<translation>&lt;b&gt;Bitcoin&lt;/b&gt; верÑиÑ</translation>
</message>
<message>
- <location line="+41"/>
- <source>Copyright © 2009-2012 The Bitcoin developers</source>
- <translation>Ð’Ñе права защищены © 2009-2012 Разработчики Bitcoin</translation>
- </message>
- <message>
- <location line="+13"/>
+ <location line="+57"/>
<source>
This is experimental software.
@@ -32,6 +27,16 @@ This product includes software developed by the OpenSSL Project for use in the O
Этот продукт включает ПО, разработанное OpenSSL Project Ð´Ð»Ñ Ð¸ÑÐ¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ð½Ð¸Ñ Ð² OpenSSL Toolkit (http://www.openssl.org/) и криптографичеÑкое ПО, напиÑанное Eric Young (eay@cryptsoft.com) и ПО Ð´Ð»Ñ Ñ€Ð°Ð±Ð¾Ñ‚Ñ‹ Ñ UPnP, напиÑанное Thomas Bernard.</translation>
</message>
+ <message>
+ <location filename="../aboutdialog.cpp" line="+17"/>
+ <source>Copyright</source>
+ <translation>Ð’Ñе права защищены</translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>2009-%1 The Bitcoin developers</source>
+ <translation>2009-%1 разработчики Bitcoin</translation>
+ </message>
</context>
<context>
<name>AddressBookPage</name>
@@ -43,7 +48,7 @@ This product includes software developed by the OpenSSL Project for use in the O
<message>
<location line="+22"/>
<source>Double-click to edit address or label</source>
- <translation>Ð”Ð»Ñ Ñ‚Ð¾Ð³Ð¾, чтобы изменить Ð°Ð´Ñ€ÐµÑ Ð¸Ð»Ð¸ метку давжды кликните по изменÑемому объекту</translation>
+ <translation>Ð”Ð»Ñ Ñ‚Ð¾Ð³Ð¾, чтобы изменить Ð°Ð´Ñ€ÐµÑ Ð¸Ð»Ð¸ метку, дважды кликните по изменÑемому объекту</translation>
</message>
<message>
<location line="+27"/>
@@ -106,17 +111,22 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation>&amp;Удалить</translation>
</message>
<message>
- <location filename="../addressbookpage.cpp" line="+65"/>
+ <location filename="../addressbookpage.cpp" line="+66"/>
<source>Copy &amp;Label</source>
<translation>Копировать &amp;метку</translation>
</message>
<message>
- <location line="+2"/>
+ <location line="+1"/>
<source>&amp;Edit</source>
<translation>&amp;Правка</translation>
</message>
<message>
- <location line="+250"/>
+ <location line="+1"/>
+ <source>Send &amp;Coins</source>
+ <translation>&amp;Отправить монеты</translation>
+ </message>
+ <message>
+ <location line="+263"/>
<source>Export Address Book Data</source>
<translation>ЭкÑпортировать адреÑную книгу</translation>
</message>
@@ -139,7 +149,7 @@ This product includes software developed by the OpenSSL Project for use in the O
<context>
<name>AddressTableModel</name>
<message>
- <location filename="../addresstablemodel.cpp" line="+142"/>
+ <location filename="../addresstablemodel.cpp" line="+144"/>
<source>Label</source>
<translation>Метка</translation>
</message>
@@ -298,17 +308,17 @@ This product includes software developed by the OpenSSL Project for use in the O
<context>
<name>BitcoinGUI</name>
<message>
- <location filename="../bitcoingui.cpp" line="+267"/>
+ <location filename="../bitcoingui.cpp" line="+231"/>
<source>Sign &amp;message...</source>
- <translation>&amp;ПодпиÑать Ñообщение</translation>
+ <translation>&amp;ПодпиÑать Ñообщение...</translation>
</message>
<message>
- <location line="+254"/>
+ <location line="+299"/>
<source>Synchronizing with network...</source>
<translation>Ð¡Ð¸Ð½Ñ…Ñ€Ð¾Ð½Ð¸Ð·Ð°Ñ†Ð¸Ñ Ñ Ñетью...</translation>
</message>
<message>
- <location line="-322"/>
+ <location line="-367"/>
<source>&amp;Overview</source>
<translation>О&amp;бзор</translation>
</message>
@@ -328,32 +338,17 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation>Показать иÑторию транзакций</translation>
</message>
<message>
- <location line="+6"/>
- <source>&amp;Address Book</source>
- <translation>&amp;ÐдреÑÐ½Ð°Ñ ÐºÐ½Ð¸Ð³Ð°</translation>
- </message>
- <message>
- <location line="+1"/>
+ <location line="+7"/>
<source>Edit the list of stored addresses and labels</source>
<translation>Изменить ÑпиÑок Ñохранённых адреÑов и меток к ним</translation>
</message>
<message>
- <location line="-15"/>
- <source>&amp;Receive coins</source>
- <translation>&amp;Получение монет</translation>
- </message>
- <message>
- <location line="+1"/>
+ <location line="-14"/>
<source>Show the list of addresses for receiving payments</source>
<translation>Показать ÑпиÑок адреÑов Ð´Ð»Ñ Ð¿Ð¾Ð»ÑƒÑ‡ÐµÐ½Ð¸Ñ Ð¿Ð»Ð°Ñ‚ÐµÐ¶ÐµÐ¹</translation>
</message>
<message>
- <location line="-8"/>
- <source>&amp;Send coins</source>
- <translation>Отп&amp;равка монет</translation>
- </message>
- <message>
- <location line="+39"/>
+ <location line="+31"/>
<source>E&amp;xit</source>
<translation>В&amp;ыход</translation>
</message>
@@ -385,20 +380,20 @@ This product includes software developed by the OpenSSL Project for use in the O
<message>
<location line="+5"/>
<source>&amp;Encrypt Wallet...</source>
- <translation>&amp;Зашифровать бумажник</translation>
+ <translation>&amp;Зашифровать бумажник...</translation>
</message>
<message>
<location line="+3"/>
<source>&amp;Backup Wallet...</source>
- <translation>&amp;Сделать резервную копию бумажника</translation>
+ <translation>&amp;Сделать резервную копию бумажника...</translation>
</message>
<message>
<location line="+2"/>
<source>&amp;Change Passphrase...</source>
- <translation>&amp;Изменить пароль</translation>
+ <translation>&amp;Изменить пароль...</translation>
</message>
<message>
- <location line="+259"/>
+ <location line="+304"/>
<source>Importing blocks from disk...</source>
<translation>ИмпортируютÑÑ Ð±Ð»Ð¾ÐºÐ¸ Ñ Ð´Ð¸Ñка...</translation>
</message>
@@ -407,13 +402,8 @@ This product includes software developed by the OpenSSL Project for use in the O
<source>Reindexing blocks on disk...</source>
<translation>Идёт переиндекÑÐ°Ñ†Ð¸Ñ Ð±Ð»Ð¾ÐºÐ¾Ð² на диÑке...</translation>
</message>
- <message numerus="yes">
- <location line="+10"/>
- <source>~%n block(s) remaining</source>
- <translation><numerusform>оÑталÑÑ ~%n блок</numerusform><numerusform>оÑталоÑÑŒ ~%n блоков</numerusform><numerusform>оÑталоÑÑŒ ~%n блоков</numerusform></translation>
- </message>
<message>
- <location line="-265"/>
+ <location line="-300"/>
<source>&amp;Export...</source>
<translation>&amp;ЭкÑпорт...</translation>
</message>
@@ -458,18 +448,33 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation>&amp;Проверить Ñообщение...</translation>
</message>
<message>
- <location line="-196"/>
- <location line="+538"/>
+ <location line="-162"/>
+ <location line="+540"/>
<source>Bitcoin</source>
<translation>Биткоин</translation>
</message>
<message>
- <location line="-538"/>
+ <location line="-540"/>
<source>Wallet</source>
<translation>Бумажник</translation>
</message>
<message>
- <location line="+176"/>
+ <location line="+99"/>
+ <source>&amp;Send</source>
+ <translation>&amp;Отправить</translation>
+ </message>
+ <message>
+ <location line="+7"/>
+ <source>&amp;Receive</source>
+ <translation>&amp;Получить</translation>
+ </message>
+ <message>
+ <location line="+14"/>
+ <source>&amp;Addresses</source>
+ <translation>&amp;ÐдреÑа</translation>
+ </message>
+ <message>
+ <location line="+22"/>
<source>&amp;About Bitcoin</source>
<translation>&amp;О Bitcoin</translation>
</message>
@@ -530,27 +535,57 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation>[теÑÑ‚Ð¾Ð²Ð°Ñ Ñеть]</translation>
</message>
<message>
- <location line="+63"/>
+ <location line="+47"/>
<source>Bitcoin client</source>
<translation>Bitcoin клиент</translation>
</message>
<message numerus="yes">
- <location line="+79"/>
+ <location line="+140"/>
<source>%n active connection(s) to Bitcoin network</source>
<translation><numerusform>%n активное Ñоединение Ñ Ñетью</numerusform><numerusform>%n активных Ñоединений Ñ Ñетью</numerusform><numerusform>%n активных Ñоединений Ñ Ñетью</numerusform></translation>
</message>
<message>
- <location line="+45"/>
- <source>Processed %1 of %2 blocks of transaction history (%3% done).</source>
- <translation>Обработано %1 из %2 блоков иÑтории транзакций (%3% выполнено).</translation>
+ <location line="+39"/>
+ <source>Processed %1 of %2 (estimated) blocks of transaction history.</source>
+ <translation>Обработано %1 из %2 (примерно) блоков иÑтории транзакций.</translation>
</message>
<message>
- <location line="+7"/>
+ <location line="+4"/>
<source>Processed %1 blocks of transaction history.</source>
<translation>Обработано %1 блоков иÑтории транзакций.</translation>
</message>
+ <message numerus="yes">
+ <location line="+20"/>
+ <source>%n hour(s)</source>
+ <translation><numerusform>%n чаÑ</numerusform><numerusform>%n чаÑа</numerusform><numerusform>%n чаÑов</numerusform></translation>
+ </message>
+ <message numerus="yes">
+ <location line="+4"/>
+ <source>%n day(s)</source>
+ <translation><numerusform>%n день</numerusform><numerusform>%n днÑ</numerusform><numerusform>%n дней</numerusform></translation>
+ </message>
+ <message numerus="yes">
+ <location line="+4"/>
+ <source>%n week(s)</source>
+ <translation><numerusform>%n неделÑ</numerusform><numerusform>%n недели</numerusform><numerusform>%n недель</numerusform></translation>
+ </message>
<message>
- <location line="+70"/>
+ <location line="+5"/>
+ <source>%1 behind</source>
+ <translation>%1 позади</translation>
+ </message>
+ <message>
+ <location line="+14"/>
+ <source>Last received block was generated %1 ago.</source>
+ <translation>ПоÑледний полученный блок был Ñгенерирован %1 назад.</translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Transactions after this will not yet be visible.</source>
+ <translation>Транзакции поÑле Ñтой пока не будут видны.</translation>
+ </message>
+ <message>
+ <location line="+21"/>
<source>Error</source>
<translation>Ошибка</translation>
</message>
@@ -565,62 +600,27 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation>ИнформациÑ</translation>
</message>
<message>
- <location line="+66"/>
+ <location line="+68"/>
<source>This transaction is over the size limit. You can still send it for a fee of %1, which goes to the nodes that process your transaction and helps to support the network. Do you want to pay the fee?</source>
<translation>Ð¢Ñ€Ð°Ð½Ð·Ð°ÐºÑ†Ð¸Ñ Ð¿Ñ€ÐµÐ²Ñ‹ÑˆÐ°ÐµÑ‚ макÑимальный размер. Ð’Ñ‹ можете провеÑти её, заплатив комиÑÑию %1, ÐºÐ¾Ñ‚Ð¾Ñ€Ð°Ñ Ð´Ð¾ÑтанетÑÑ ÑƒÐ·Ð»Ð°Ð¼, обрабатывающим Ñту транзакцию, и поможет работе Ñети. Ð’Ñ‹ дейÑтвительно хотите заплатить комиÑÑию?</translation>
</message>
<message>
- <location line="+210"/>
- <source>Backup Successful</source>
- <translation>Резервное копирование уÑпешно завершено</translation>
- </message>
- <message>
- <location line="+0"/>
- <source>The wallet data was successfully saved to the new location.</source>
- <translation>Данные бумажника уÑпешно Ñохранены в новое меÑтоположение</translation>
- </message>
- <message numerus="yes">
- <location line="-338"/>
- <source>%n second(s) ago</source>
- <translation><numerusform>%n Ñекунду назад</numerusform><numerusform>%n Ñекунды назад</numerusform><numerusform>%n Ñекунд назад</numerusform></translation>
- </message>
- <message numerus="yes">
- <location line="+4"/>
- <source>%n minute(s) ago</source>
- <translation><numerusform>%n минуту назад</numerusform><numerusform>%n минуты назад</numerusform><numerusform>%n минут назад</numerusform></translation>
- </message>
- <message numerus="yes">
- <location line="+4"/>
- <source>%n hour(s) ago</source>
- <translation><numerusform>%n Ñ‡Ð°Ñ Ð½Ð°Ð·Ð°Ð´</numerusform><numerusform>%n чаÑа назад</numerusform><numerusform>%n чаÑов назад</numerusform></translation>
- </message>
- <message numerus="yes">
- <location line="+4"/>
- <source>%n day(s) ago</source>
- <translation><numerusform>%n день назад</numerusform><numerusform>%n Ð´Ð½Ñ Ð½Ð°Ð·Ð°Ð´</numerusform><numerusform>%n дней назад</numerusform></translation>
- </message>
- <message>
- <location line="+6"/>
+ <location line="-138"/>
<source>Up to date</source>
- <translation>Синхронизированно</translation>
+ <translation>Синхронизировано</translation>
</message>
<message>
- <location line="+7"/>
+ <location line="+32"/>
<source>Catching up...</source>
<translation>СинхронизируетÑÑ...</translation>
</message>
<message>
- <location line="+10"/>
- <source>Last received block was generated %1.</source>
- <translation>ПоÑледний полученный блок был Ñгенерирован %1.</translation>
- </message>
- <message>
- <location line="+97"/>
+ <location line="+110"/>
<source>Confirm transaction fee</source>
<translation>Подтвердите комиÑÑию</translation>
</message>
<message>
- <location line="+23"/>
+ <location line="+8"/>
<source>Sent transaction</source>
<translation>ИÑходÑÑ‰Ð°Ñ Ñ‚Ñ€Ð°Ð½Ð·Ð°ÐºÑ†Ð¸Ñ</translation>
</message>
@@ -643,14 +643,14 @@ Address: %4
</translation>
</message>
<message>
- <location line="+99"/>
- <location line="+28"/>
+ <location line="+33"/>
+ <location line="+23"/>
<source>URI handling</source>
<translation>Обработка URI</translation>
</message>
<message>
- <location line="-28"/>
- <location line="+28"/>
+ <location line="-23"/>
+ <location line="+23"/>
<source>URI can not be parsed! This can be caused by an invalid Bitcoin address or malformed URI parameters.</source>
<translation>Ðе удалоÑÑŒ обработать URI! Это может быть ÑвÑзано Ñ Ð½ÐµÐ²ÐµÑ€Ð½Ñ‹Ð¼ адреÑом Bitcoin или неправильными параметрами URI.</translation>
</message>
@@ -665,27 +665,7 @@ Address: %4
<translation>Бумажник &lt;b&gt;зашифрован&lt;/b&gt; и в наÑтоÑщее Ð²Ñ€ÐµÐ¼Ñ &lt;b&gt;заблокирован&lt;/b&gt;</translation>
</message>
<message>
- <location line="+23"/>
- <source>Backup Wallet</source>
- <translation>Сделать резервную копию бумажника</translation>
- </message>
- <message>
- <location line="+0"/>
- <source>Wallet Data (*.dat)</source>
- <translation>Данные бумажника (*.dat)</translation>
- </message>
- <message>
- <location line="+3"/>
- <source>Backup Failed</source>
- <translation>Резервное копирование не удалоÑÑŒ</translation>
- </message>
- <message>
- <location line="+0"/>
- <source>There was an error trying to save the wallet data to the new location.</source>
- <translation>При попытке ÑÐ¾Ñ…Ñ€Ð°Ð½ÐµÐ½Ð¸Ñ Ð´Ð°Ð½Ð½Ñ‹Ñ… бумажника в новое меÑто произошла ошибка.</translation>
- </message>
- <message>
- <location filename="../bitcoin.cpp" line="+109"/>
+ <location filename="../bitcoin.cpp" line="+108"/>
<source>A fatal error occurred. Bitcoin can no longer continue safely and will quit.</source>
<translation>Произошла неиÑÐ¿Ñ€Ð°Ð²Ð¸Ð¼Ð°Ñ Ð¾ÑˆÐ¸Ð±ÐºÐ°. Bitcoin не может безопаÑно продолжать работу и будет закрыт.</translation>
</message>
@@ -693,7 +673,7 @@ Address: %4
<context>
<name>ClientModel</name>
<message>
- <location filename="../clientmodel.cpp" line="+86"/>
+ <location filename="../clientmodel.cpp" line="+96"/>
<source>Network Alert</source>
<translation>Ð¡ÐµÑ‚ÐµÐ²Ð°Ñ Ð¢Ñ€ÐµÐ²Ð¾Ð³Ð°</translation>
</message>
@@ -726,7 +706,7 @@ Address: %4
<translation>ÐдреÑ, ÑвÑзанный Ñ Ð´Ð°Ð½Ð½Ð¾Ð¹ запиÑью.</translation>
</message>
<message>
- <location filename="../editaddressdialog.cpp" line="+20"/>
+ <location filename="../editaddressdialog.cpp" line="+21"/>
<source>New receiving address</source>
<translation>Ðовый Ð°Ð´Ñ€ÐµÑ Ð´Ð»Ñ Ð¿Ð¾Ð»ÑƒÑ‡ÐµÐ½Ð¸Ñ</translation>
</message>
@@ -746,17 +726,17 @@ Address: %4
<translation>Изменение адреÑа Ð´Ð»Ñ Ð¾Ñ‚Ð¿Ñ€Ð°Ð²ÐºÐ¸</translation>
</message>
<message>
- <location line="+60"/>
+ <location line="+76"/>
<source>The entered address &quot;%1&quot; is already in the address book.</source>
<translation>Введённый Ð°Ð´Ñ€ÐµÑ Â«%1» уже находитÑÑ Ð² адреÑной книге.</translation>
</message>
<message>
- <location line="+5"/>
+ <location line="-5"/>
<source>The entered address &quot;%1&quot; is not a valid Bitcoin address.</source>
<translation>Введённый Ð°Ð´Ñ€ÐµÑ &quot;%1&quot; не ÑвлÑетÑÑ Ð¿Ñ€Ð°Ð²Ð¸Ð»ÑŒÐ½Ñ‹Ð¼ Bitcoin-адреÑом.</translation>
</message>
<message>
- <location line="+5"/>
+ <location line="+10"/>
<source>Could not unlock wallet.</source>
<translation>Ðе удаетÑÑ Ñ€Ð°Ð·Ð±Ð»Ð¾ÐºÐ¸Ñ€Ð¾Ð²Ð°Ñ‚ÑŒ бумажник.</translation>
</message>
@@ -769,7 +749,7 @@ Address: %4
<context>
<name>GUIUtil::HelpMessageBox</name>
<message>
- <location filename="../guiutil.cpp" line="+419"/>
+ <location filename="../guiutil.cpp" line="+422"/>
<location line="+12"/>
<source>Bitcoin-Qt</source>
<translation>Bitcoin-Qt</translation>
@@ -825,7 +805,7 @@ Address: %4
<message>
<location line="+6"/>
<source>Optional transaction fee per kB that helps make sure your transactions are processed quickly. Most transactions are 1 kB. Fee 0.01 recommended.</source>
- <translation>ÐžÐ¿Ñ†Ð¸Ð¾Ð½Ð°Ð»ÑŒÐ½Ð°Ñ ÐºÐ¾Ð¼Ð¸ÑÑÐ¸Ñ Ð·Ð° каждый КБ транзакции, ÐºÐ¾Ñ‚Ð¾Ñ€Ð°Ñ Ð¿Ð¾Ð·Ð²Ð¾Ð»Ñет быть уверенным, что Ваша Ñ‚Ñ€Ð°Ð½Ð·Ð°ÐºÑ†Ð¸Ñ Ð±ÑƒÐ´ÐµÑ‚ обработана быÑтро. БольшинÑтво транзакций занимают 1КБ. РекомендуетÑÑ ÐºÐ¾Ð¼Ð¸ÑÑÐ¸Ñ 0.01.</translation>
+ <translation>ÐеобÑÐ·Ð°Ñ‚ÐµÐ»ÑŒÐ½Ð°Ñ ÐºÐ¾Ð¼Ð¸ÑÑÐ¸Ñ Ð·Ð° каждый КБ транзакции, ÐºÐ¾Ñ‚Ð¾Ñ€Ð°Ñ Ð¿Ð¾Ð·Ð²Ð¾Ð»Ñет быть уверенным, что Ваша Ñ‚Ñ€Ð°Ð½Ð·Ð°ÐºÑ†Ð¸Ñ Ð±ÑƒÐ´ÐµÑ‚ обработана быÑтро. БольшинÑтво транзакций занимают 1КБ. РекомендуетÑÑ ÐºÐ¾Ð¼Ð¸ÑÑÐ¸Ñ 0.01.</translation>
</message>
<message>
<location line="+15"/>
@@ -983,7 +963,7 @@ Address: %4
<translation>&amp;Применить</translation>
</message>
<message>
- <location filename="../optionsdialog.cpp" line="+55"/>
+ <location filename="../optionsdialog.cpp" line="+53"/>
<source>default</source>
<translation>по умолчанию</translation>
</message>
@@ -1028,23 +1008,18 @@ Address: %4
<translation>Форма</translation>
</message>
<message>
- <location line="+51"/>
- <location line="+183"/>
+ <location line="+50"/>
+ <location line="+166"/>
<source>The displayed information may be out of date. Your wallet automatically synchronizes with the Bitcoin network after a connection is established, but this process has not completed yet.</source>
<translation>ÐžÑ‚Ð¾Ð±Ñ€Ð°Ð¶Ð°ÐµÐ¼Ð°Ñ Ð¸Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ñ Ð¼Ð¾Ð¶ÐµÑ‚ быть уÑтаревшей. Ваш бумажник автоматичеÑки ÑинхронизируетÑÑ Ñ Ñетью Bitcoin поÑле подключениÑ, но Ñтот процеÑÑ Ð¿Ð¾ÐºÐ° не завершён.</translation>
</message>
<message>
- <location line="-141"/>
+ <location line="-124"/>
<source>Balance:</source>
<translation>БаланÑ:</translation>
</message>
<message>
- <location line="+58"/>
- <source>Number of transactions:</source>
- <translation>КоличеÑтво транзакций:</translation>
- </message>
- <message>
- <location line="-29"/>
+ <location line="+29"/>
<source>Unconfirmed:</source>
<translation>Ðе подтверждено:</translation>
</message>
@@ -1054,7 +1029,7 @@ Address: %4
<translation>Бумажник</translation>
</message>
<message>
- <location line="+124"/>
+ <location line="+107"/>
<source>Immature:</source>
<translation>Ðезрелые:</translation>
</message>
@@ -1069,7 +1044,7 @@ Address: %4
<translation>&lt;b&gt;ПоÑледние транзакции&lt;/b&gt;</translation>
</message>
<message>
- <location line="-118"/>
+ <location line="-101"/>
<source>Your current balance</source>
<translation>Ваш текущий баланÑ</translation>
</message>
@@ -1079,11 +1054,6 @@ Address: %4
<translation>ÐžÐ±Ñ‰Ð°Ñ Ñумма вÑех транзакций, которые до Ñих пор не подтверждены, и до Ñих пор не учитываютÑÑ Ð² текущем баланÑе</translation>
</message>
<message>
- <location line="+20"/>
- <source>Total number of transactions in wallet</source>
- <translation>Общее количеÑтво транзакций в Вашем бумажнике</translation>
- </message>
- <message>
<location filename="../overviewpage.cpp" line="+115"/>
<location line="+1"/>
<source>out of sync</source>
@@ -1091,6 +1061,14 @@ Address: %4
</message>
</context>
<context>
+ <name>PaymentServer</name>
+ <message>
+ <location filename="../paymentserver.cpp" line="+107"/>
+ <source>Cannot start bitcoin: click-to-pay handler</source>
+ <translation>Ðе удаётÑÑ Ð·Ð°Ð¿ÑƒÑтить bitcoin: обработчик click-to-pay</translation>
+ </message>
+</context>
+<context>
<name>QRCodeDialog</name>
<message>
<location filename="../forms/qrcodedialog.ui" line="+14"/>
@@ -1429,7 +1407,7 @@ Address: %4
</message>
<message>
<location line="+60"/>
- <location filename="../sendcoinsentry.cpp" line="+25"/>
+ <location filename="../sendcoinsentry.cpp" line="+26"/>
<source>Enter a label for this address to add it to your address book</source>
<translation>Введите метку Ð´Ð»Ñ Ð´Ð°Ð½Ð½Ð¾Ð³Ð¾ адреÑа (Ð´Ð»Ñ Ð´Ð¾Ð±Ð°Ð²Ð»ÐµÐ½Ð¸Ñ Ð² адреÑную книгу)</translation>
</message>
@@ -1665,7 +1643,7 @@ Address: %4
<context>
<name>TransactionDesc</name>
<message>
- <location filename="../transactiondesc.cpp" line="+19"/>
+ <location filename="../transactiondesc.cpp" line="+20"/>
<source>Open until %1</source>
<translation>Открыто до %1</translation>
</message>
@@ -1852,7 +1830,7 @@ Address: %4
<context>
<name>TransactionTableModel</name>
<message>
- <location filename="../transactiontablemodel.cpp" line="+226"/>
+ <location filename="../transactiontablemodel.cpp" line="+225"/>
<source>Date</source>
<translation>Дата</translation>
</message>
@@ -1970,7 +1948,7 @@ Address: %4
<context>
<name>TransactionView</name>
<message>
- <location filename="../transactionview.cpp" line="+55"/>
+ <location filename="../transactionview.cpp" line="+52"/>
<location line="+16"/>
<source>All</source>
<translation>Ð’Ñе</translation>
@@ -2057,6 +2035,11 @@ Address: %4
</message>
<message>
<location line="+1"/>
+ <source>Copy transaction ID</source>
+ <translation>Скопировать ID транзакции</translation>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Edit label</source>
<translation>Изменить метку</translation>
</message>
@@ -2066,7 +2049,7 @@ Address: %4
<translation>Показать подробноÑти транзакции</translation>
</message>
<message>
- <location line="+142"/>
+ <location line="+139"/>
<source>Export Transaction Data</source>
<translation>ЭкÑпортировать данные транзакций</translation>
</message>
@@ -2121,7 +2104,7 @@ Address: %4
<translation>Ðевозможно запиÑать в файл %1.</translation>
</message>
<message>
- <location line="+95"/>
+ <location line="+100"/>
<source>Range:</source>
<translation>Промежуток от:</translation>
</message>
@@ -2132,30 +2115,173 @@ Address: %4
</message>
</context>
<context>
+ <name>WalletView</name>
+ <message>
+ <location filename="../walletview.cpp" line="+95"/>
+ <source>&amp;Overview</source>
+ <translation>О&amp;бзор</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Show general overview of wallet</source>
+ <translation>Показать дейÑÑ‚Ð²Ð¸Ñ Ñ Ð±ÑƒÐ¼Ð°Ð¶Ð½Ð¸ÐºÐ¾Ð¼</translation>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>&amp;Send coins</source>
+ <translation>&amp;Отправить монеты</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Send coins to a Bitcoin address</source>
+ <translation>Отправить монеты на Ð°Ð´Ñ€ÐµÑ Bitcoin</translation>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>&amp;Receive coins</source>
+ <translation>&amp;Получить монеты</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Show the list of addresses for receiving payments</source>
+ <translation>Показать ÑпиÑок адреÑов Ð´Ð»Ñ Ð¿Ð¾Ð»ÑƒÑ‡ÐµÐ½Ð¸Ñ Ð¿Ð»Ð°Ñ‚ÐµÐ¶ÐµÐ¹</translation>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>&amp;Transactions</source>
+ <translation>&amp;Транзакции</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Browse transaction history</source>
+ <translation>ПроÑмотр иÑтории транзакций</translation>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>&amp;Address Book</source>
+ <translation>&amp;ÐдреÑÐ½Ð°Ñ ÐºÐ½Ð¸Ð³Ð°</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Edit the list of stored addresses and labels</source>
+ <translation>Изменить ÑпиÑок Ñохранённых адреÑов и меток</translation>
+ </message>
+ <message>
+ <location line="+12"/>
+ <source>&amp;Encrypt Wallet...</source>
+ <translation>&amp;Зашифровать бумажник...</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Encrypt the private keys that belong to your wallet</source>
+ <translation>Зашифровать приватные ключи, принадлежащие вашему бумажнику</translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>&amp;Backup Wallet...</source>
+ <translation>&amp;Ð ÐµÐ·ÐµÑ€Ð²Ð½Ð°Ñ ÐºÐ¾Ð¿Ð¸Ñ Ð±ÑƒÐ¼Ð°Ð¶Ð½Ð¸ÐºÐ°...</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Backup wallet to another location</source>
+ <translation>Сделать резервную копию бумажника в другом меÑте</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>&amp;Change Passphrase...</source>
+ <translation>&amp;Изменить пароль...</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Change the passphrase used for wallet encryption</source>
+ <translation>Изменить пароль ÑˆÐ¸Ñ„Ñ€Ð¾Ð²Ð°Ð½Ð¸Ñ Ð±ÑƒÐ¼Ð°Ð¶Ð½Ð¸ÐºÐ°</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Sign &amp;message...</source>
+ <translation>&amp;ПодпиÑать Ñообщение...</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Sign messages with your Bitcoin addresses to prove you own them</source>
+ <translation>ПодпиÑать ÑÐ¾Ð¾Ð±Ñ‰ÐµÐ½Ð¸Ñ Ð²Ð°ÑˆÐ¸Ð¼Ð¸ адреÑами Bitcoin, чтобы доказать, что вы ими владеете</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>&amp;Verify message...</source>
+ <translation>&amp;Проверить Ñообщение...</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Verify messages to ensure they were signed with specified Bitcoin addresses</source>
+ <translation>Проверить ÑообщениÑ, чтобы удоÑтоверитьÑÑ, что они были подпиÑаны определёнными адреÑами Bitcoin</translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>&amp;Export...</source>
+ <translation>&amp;ЭкÑпорт...</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Export the data in the current tab to a file</source>
+ <translation>ЭкÑпортировать данные текущей вкладки в файл</translation>
+ </message>
+ <message>
+ <location line="+180"/>
+ <source>Backup Wallet</source>
+ <translation>Сделать резервную копию бумажника</translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>Wallet Data (*.dat)</source>
+ <translation>Данные бумажника (*.dat)</translation>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Backup Failed</source>
+ <translation>Резервное копирование не удалоÑÑŒ</translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>There was an error trying to save the wallet data to the new location.</source>
+ <translation>При попытке ÑÐ¾Ñ…Ñ€Ð°Ð½ÐµÐ½Ð¸Ñ Ð´Ð°Ð½Ð½Ñ‹Ñ… бумажника в новое меÑто произошла ошибка.</translation>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>Backup Successful</source>
+ <translation>Резервное копирование уÑпешно завершено</translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>The wallet data was successfully saved to the new location.</source>
+ <translation>Данные бумажника уÑпешно Ñохранены в новое меÑто.</translation>
+ </message>
+</context>
+<context>
<name>bitcoin-core</name>
<message>
- <location filename="../bitcoinstrings.cpp" line="+88"/>
+ <location filename="../bitcoinstrings.cpp" line="+96"/>
<source>Bitcoin version</source>
<translation>ВерÑиÑ</translation>
</message>
<message>
- <location line="+82"/>
+ <location line="+98"/>
<source>Usage:</source>
<translation>ИÑпользование:</translation>
</message>
<message>
- <location line="-23"/>
+ <location line="-24"/>
<source>Send command to -server or bitcoind</source>
<translation>Отправить команду на -server или bitcoind</translation>
</message>
<message>
- <location line="-21"/>
+ <location line="-22"/>
<source>List commands</source>
<translation>СпиÑок команд
</translation>
</message>
<message>
- <location line="-11"/>
+ <location line="-10"/>
<source>Get help for a command</source>
<translation>Получить помощь по команде</translation>
</message>
@@ -2172,7 +2298,7 @@ Address: %4
<message>
<location line="+3"/>
<source>Specify pid file (default: bitcoind.pid)</source>
- <translation>Указать pid-файл (по умолчанию: bitcoin.pid)</translation>
+ <translation>Задать pid-файл (по умолчанию: bitcoin.pid)</translation>
</message>
<message>
<location line="-47"/>
@@ -2180,14 +2306,14 @@ Address: %4
<translation>Генерировать монеты</translation>
</message>
<message>
- <location line="-15"/>
+ <location line="-28"/>
<source>Don&apos;t generate coins</source>
<translation>Ðе генерировать монеты</translation>
</message>
<message>
- <location line="+61"/>
+ <location line="+74"/>
<source>Specify data directory</source>
- <translation>Укажите каталог данных</translation>
+ <translation>Задать каталог данных</translation>
</message>
<message>
<location line="-7"/>
@@ -2195,75 +2321,77 @@ Address: %4
<translation>УÑтановить размер кÑша базы данных в мегабайтах (по умолчанию: 25)</translation>
</message>
<message>
- <location line="-26"/>
+ <location line="-27"/>
<source>Listen for connections on &lt;port&gt; (default: 8333 or testnet: 18333)</source>
<translation>Принимать входÑщие Ð¿Ð¾Ð´ÐºÐ»ÑŽÑ‡ÐµÐ½Ð¸Ñ Ð½Ð° &lt;port&gt; (по умолчанию: 8333 или 18333 в теÑтовой Ñети)</translation>
</message>
<message>
- <location line="+4"/>
+ <location line="+5"/>
<source>Maintain at most &lt;n&gt; connections to peers (default: 125)</source>
<translation>Поддерживать не более &lt;n&gt; подключений к узлам (по умолчанию: 125)</translation>
</message>
<message>
- <location line="-34"/>
+ <location line="-49"/>
<source>Connect to a node to retrieve peer addresses, and disconnect</source>
<translation>ПодключитьÑÑ Ðº узлу, чтобы получить ÑпиÑок адреÑов других учаÑтников и отключитьÑÑ</translation>
</message>
<message>
- <location line="+65"/>
+ <location line="+80"/>
<source>Specify your own public address</source>
<translation>Укажите ваш ÑобÑтвенный публичный адреÑ</translation>
</message>
<message>
- <location line="+2"/>
+ <location line="+3"/>
<source>Threshold for disconnecting misbehaving peers (default: 100)</source>
<translation>Порог Ð´Ð»Ñ Ð¾Ñ‚ÐºÐ»ÑŽÑ‡ÐµÐ½Ð¸Ñ Ð½ÐµÐ¿Ñ€Ð°Ð²Ð¸Ð»ÑŒÐ½Ð¾ ведущих ÑÐµÐ±Ñ ÑƒÐ·Ð»Ð¾Ð² (по умолчанию: 100)</translation>
</message>
<message>
- <location line="-114"/>
+ <location line="-132"/>
<source>Number of seconds to keep misbehaving peers from reconnecting (default: 86400)</source>
<translation>ЧиÑло Ñекунд Ð±Ð»Ð¾ÐºÐ¸Ñ€Ð¾Ð²Ð°Ð½Ð¸Ñ Ð½ÐµÐ¿Ñ€Ð°Ð²Ð¸Ð»ÑŒÐ½Ð¾ ведущих ÑÐµÐ±Ñ ÑƒÐ·Ð»Ð¾Ð² (по умолчанию: 86400)</translation>
</message>
<message>
- <location line="-28"/>
+ <location line="-32"/>
<source>An error occurred while setting up the RPC port %u for listening on IPv4: %s</source>
<translation>Произошла ошибка при открытии RPC-порта %u Ð´Ð»Ñ Ð¿Ñ€Ð¾ÑÐ»ÑƒÑˆÐ¸Ð²Ð°Ð½Ð¸Ñ Ð½Ð° IPv4: %s</translation>
</message>
<message>
- <location line="+26"/>
+ <location line="+30"/>
<source>Listen for JSON-RPC connections on &lt;port&gt; (default: 8332 or testnet: 18332)</source>
<translation>ПроÑлушивать Ð¿Ð¾Ð´ÐºÐ»ÑŽÑ‡ÐµÐ½Ð¸Ñ JSON-RPC на &lt;порту&gt; (по умолчанию: 8332 или Ð´Ð»Ñ testnet: 18332)</translation>
</message>
<message>
- <location line="+34"/>
+ <location line="+36"/>
<source>Accept command line and JSON-RPC commands</source>
<translation>Принимать командную Ñтроку и команды JSON-RPC</translation>
</message>
<message>
- <location line="+62"/>
+ <location line="+77"/>
<source>Run in the background as a daemon and accept commands</source>
<translation>ЗапуÑкатьÑÑ Ð² фоне как демон и принимать команды</translation>
</message>
<message>
- <location line="+31"/>
+ <location line="+32"/>
<source>Use the test network</source>
<translation>ИÑпользовать теÑтовую Ñеть</translation>
</message>
<message>
- <location line="-92"/>
+ <location line="-108"/>
<source>Accept connections from outside (default: 1 if no -proxy or -connect)</source>
<translation>Принимать Ð¿Ð¾Ð´ÐºÐ»ÑŽÑ‡ÐµÐ½Ð¸Ñ Ð¸Ð·Ð²Ð½Ðµ (по умолчанию: 1, еÑли не иÑпользуетÑÑ -proxy или -connect)</translation>
</message>
<message>
- <location line="-74"/>
+ <location line="-82"/>
<source>%s, you must set a rpcpassword in the configuration file:
- %s
+%s
It is recommended you use the following random password:
rpcuser=bitcoinrpc
rpcpassword=%s
(you do not need to remember this password)
The username and password MUST NOT be the same.
If the file does not exist, create it with owner-readable-only file permissions.
+It is also recommended to set alertnotify so you are notified of problems;
+for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.com
</source>
<translation>%s, вы должны уÑтановить опцию rpcpassword в конфигурационном файле:
%s
@@ -2271,11 +2399,14 @@ If the file does not exist, create it with owner-readable-only file permissions.
rpcuser=bitcoinrpc
rpcpassword=%s
(вам не нужно запоминать Ñтот пароль)
-Ð˜Ð¼Ñ Ð¸ пароль ДОЛЖÐЫ отличатьÑÑ.
-ЕÑли файл не ÑущеÑтвует, Ñоздайте его и уÑтановите права доÑтупа только Ð´Ð»Ñ Ð²Ð»Ð°Ð´ÐµÐ»ÑŒÑ†Ð°, только Ð´Ð»Ñ Ñ‡Ñ‚ÐµÐ½Ð¸Ñ.</translation>
+Ð˜Ð¼Ñ Ð¸ пароль ДОЛЖÐЫ различатьÑÑ.
+ЕÑли файл не ÑущеÑтвует, Ñоздайте его и уÑтановите права доÑтупа только Ð´Ð»Ñ Ð²Ð»Ð°Ð´ÐµÐ»ÑŒÑ†Ð°, только Ð´Ð»Ñ Ñ‡Ñ‚ÐµÐ½Ð¸Ñ.
+Также рекомендуетÑÑ Ð²ÐºÐ»ÑŽÑ‡Ð¸Ñ‚ÑŒ alertnotify Ð´Ð»Ñ Ð¾Ð¿Ð¾Ð²ÐµÑ‰ÐµÐ½Ð¸Ñ Ð¾ проблемах;
+Ðапример: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.com
+</translation>
</message>
<message>
- <location line="+15"/>
+ <location line="+17"/>
<source>An error occurred while setting up the RPC port %u for listening on IPv6, falling back to IPv4: %s</source>
<translation>Произошла ошибка при открытии на проÑлушивание IPv6 RCP-порта %u, возвращаемÑÑ Ðº IPv4: %s</translation>
</message>
@@ -2291,11 +2422,6 @@ rpcpassword=%s
</message>
<message>
<location line="+3"/>
- <source>Corrupted block database detected. Please restart the client with -reindex.</source>
- <translation>Обнаружено повреждение базы данных блоков. ПожалуйÑта, перезапуÑтите клиент Ñ Ð¿Ð°Ñ€Ð°Ð¼ÐµÑ‚Ñ€Ð¾Ð¼ -reindex.</translation>
- </message>
- <message>
- <location line="+2"/>
<source>Error initializing database environment %s! To recover, BACKUP THAT DIRECTORY, then remove everything from it except for wallet.dat.</source>
<translation>Ошибка инициализации Ð¾ÐºÑ€ÑƒÐ¶ÐµÐ½Ð¸Ñ Ð±Ð°Ð·Ñ‹ данных %s! Чтобы воÑÑтановить работоÑпоÑобноÑÑ‚ÑŒ, СДЕЛÐЙТЕ РЕЗЕРВÐУЮ КОПИЮ ЭТОГО КÐТÐЛОГÐ, поÑле чего удалите из него вÑÑ‘, кроме wallet.dat.</translation>
</message>
@@ -2310,12 +2436,27 @@ rpcpassword=%s
<translation>Ошибка: Ñта Ñ‚Ñ€Ð°Ð½Ð·Ð°ÐºÑ†Ð¸Ñ Ñ‚Ñ€ÐµÐ±ÑƒÐµÑ‚ комиÑÑию как минимум %s из-за Ñуммы, ÑложноÑти или иÑÐ¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ð½Ð¸Ñ Ð½ÐµÐ´Ð°Ð²Ð½Ð¾ полученных ÑредÑтв!</translation>
</message>
<message>
+ <location line="+3"/>
+ <source>Execute command when a relevant alert is received (%s in cmd is replaced by message)</source>
+ <translation>Выполнить команду, когда приходит Ñообщение о тревоге (%s в команде заменÑетÑÑ Ð½Ð° Ñообщение)</translation>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Execute command when a wallet transaction changes (%s in cmd is replaced by TxID)</source>
+ <translation>Выполнить команду, когда менÑетÑÑ Ñ‚Ñ€Ð°Ð½Ð·Ð°ÐºÑ†Ð¸Ñ Ð² бумажнике (%s в команде заменÑетÑÑ Ð½Ð° TxID)</translation>
+ </message>
+ <message>
<location line="+11"/>
<source>Set maximum size of high-priority/low-fee transactions in bytes (default: 27000)</source>
<translation>МакÑимальный размер выÑокоприоритетных/низкокомиÑÑионных транзакций в байтах (по умолчанию: 27000)</translation>
</message>
<message>
<location line="+3"/>
+ <source>Set the number of script verification threads (1-16, 0=auto, default: 0)</source>
+ <translation>Задать чиÑло потоков проверки Ñкрипта (1-16, 0=авто, по умолчанию: 0)</translation>
+ </message>
+ <message>
+ <location line="+2"/>
<source>This is a pre-release test build - use at your own risk - do not use for mining or merchant applications</source>
<translation>Это пре-Ñ€ÐµÐ»Ð¸Ð·Ð½Ð°Ñ Ñ‚ÐµÑÑ‚Ð¾Ð²Ð°Ñ Ñборка - иÑпользуйте на Ñвой Ñтрах и риÑк - не иÑпользуйте Ð´Ð»Ñ Ð´Ð¾Ð±Ñ‹Ñ‡Ð¸ или торговых приложений</translation>
</message>
@@ -2347,7 +2488,7 @@ rpcpassword=%s
<message>
<location line="+14"/>
<source>Attempt to recover private keys from a corrupt wallet.dat</source>
- <translation>Попытка воÑÑÑ‚Ð°Ð½Ð¾Ð²Ð»ÐµÐ½Ð¸Ñ Ð¿Ñ€Ð¸Ð²Ð°Ñ‚Ð½Ñ‹Ñ… ключей из повреждённого wallet.dat</translation>
+ <translation>ПопытатьÑÑ Ð²Ð¾ÑÑтановить приватные ключи из повреждённого wallet.dat</translation>
</message>
<message>
<location line="+2"/>
@@ -2361,16 +2502,41 @@ rpcpassword=%s
</message>
<message>
<location line="+3"/>
+ <source>Corrupted block database detected</source>
+ <translation>БД блоков повреждена</translation>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Discover own IP address (default: 1 when listening and no -externalip)</source>
<translation>Определить Ñвой IP (по умолчанию: 1 при проÑлушивании и еÑли не иÑпользуетÑÑ -externalip)</translation>
</message>
<message>
+ <location line="+1"/>
+ <source>Do you want to rebuild the block database now?</source>
+ <translation>ПереÑобрать БД блоков прÑмо ÑейчаÑ?</translation>
+ </message>
+ <message>
<location line="+3"/>
+ <source>Error initializing block database</source>
+ <translation>Ошибка инициализации БД блоков</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Error initializing wallet database environment %s!</source>
+ <translation>Ошибка инициализации Ð¾ÐºÑ€ÑƒÐ¶ÐµÐ½Ð¸Ñ Ð‘Ð” бумажника %s!</translation>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Error loading block database</source>
<translation>Ошибка Ñ‡Ñ‚ÐµÐ½Ð¸Ñ Ð±Ð°Ð·Ñ‹ данных блоков</translation>
</message>
<message>
- <location line="+5"/>
+ <location line="+4"/>
+ <source>Error opening block database</source>
+ <translation>Ðе удалоÑÑŒ открыть БД блоков</translation>
+ </message>
+ <message>
+ <location line="+2"/>
<source>Error: Disk space is low!</source>
<translation>Ошибка: мало меÑта на диÑке!</translation>
</message>
@@ -2386,26 +2552,96 @@ rpcpassword=%s
</message>
<message>
<location line="+2"/>
+ <source>Error: system error: </source>
+ <translation>Ошибка: ÑиÑÑ‚ÐµÐ¼Ð½Ð°Ñ Ð¾ÑˆÐ¸Ð±ÐºÐ°:</translation>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Failed to listen on any port. Use -listen=0 if you want this.</source>
<translation>Ðе удалоÑÑŒ начать проÑлушивание на порту. ИÑпользуйте -listen=0 еÑли Ð²Ð°Ñ Ñто уÑтраивает.</translation>
</message>
<message>
+ <location line="+1"/>
+ <source>Failed to read block info</source>
+ <translation>Ðе удалоÑÑŒ прочитать информацию блока</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Failed to read block</source>
+ <translation>Ðе удалоÑÑŒ прочитать блок</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Failed to sync block index</source>
+ <translation>Ðе удалоÑÑŒ Ñинхронизировать Ð¸Ð½Ð´ÐµÐºÑ Ð±Ð»Ð¾ÐºÐ¾Ð²</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Failed to write block index</source>
+ <translation>Ðе удалоÑÑŒ запиÑать Ð¸Ð½Ð´ÐµÐºÑ Ð±Ð»Ð¾ÐºÐ¾Ð²</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Failed to write block info</source>
+ <translation>Ðе удалоÑÑŒ запиÑать информацию блока</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Failed to write block</source>
+ <translation>Ðе удалоÑÑŒ запиÑать блок</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Failed to write file info</source>
+ <translation>Ðе удалоÑÑŒ запиÑать информацию файла</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Failed to write to coin database</source>
+ <translation>Ðе удалоÑÑŒ запиÑать БД монет</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Failed to write transaction index</source>
+ <translation>Ðе удалоÑÑŒ запиÑать Ð¸Ð½Ð´ÐµÐºÑ Ñ‚Ñ€Ð°Ð½Ð·Ð°ÐºÑ†Ð¸Ð¹</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Failed to write undo data</source>
+ <translation>Ðе удалоÑÑŒ запиÑать данные Ð´Ð»Ñ Ð¾Ñ‚Ð¼ÐµÐ½Ñ‹</translation>
+ </message>
+ <message>
<location line="+2"/>
<source>Find peers using DNS lookup (default: 1 unless -connect)</source>
<translation>ИÑкать узлы Ñ Ð¿Ð¾Ð¼Ð¾Ñ‰ÑŒÑŽ DNS (по умолчанию: 1, еÑли не указан -connect)</translation>
</message>
<message>
- <location line="+5"/>
+ <location line="+3"/>
+ <source>How many blocks to check at startup (default: 288, 0 = all)</source>
+ <translation>Сколько блоков проверÑÑ‚ÑŒ при запуÑке (по умолчанию: 288, 0 = вÑе)</translation>
+ </message>
+ <message>
+ <location line="+1"/>
<source>How thorough the block verification is (0-4, default: 3)</source>
<translation>ÐаÑколько тщательно проверÑÑ‚ÑŒ блок (0-4, по умолчанию: 3)</translation>
</message>
<message>
- <location line="+1"/>
- <source>Importing blocks from block database...</source>
- <translation>ИмпортируютÑÑ Ð±Ð»Ð¾ÐºÐ¸ из базы данных блоков...</translation>
+ <location line="+24"/>
+ <source>Rebuild block chain index from current blk000??.dat files</source>
+ <translation>ПереÑтроить Ð¸Ð½Ð´ÐµÐºÑ Ñ†ÐµÐ¿Ð¸ блоков из текущих файлов blk000??.dat</translation>
+ </message>
+ <message>
+ <location line="+37"/>
+ <source>Verifying blocks...</source>
+ <translation>Проверка блоков...</translation>
</message>
<message>
<location line="+1"/>
+ <source>Verifying wallet...</source>
+ <translation>Проверка бумажника...</translation>
+ </message>
+ <message>
+ <location line="-61"/>
<source>Imports blocks from external blk000??.dat file</source>
<translation>Импортировать блоки из внешнего файла blk000??.dat</translation>
</message>
@@ -2420,7 +2656,12 @@ rpcpassword=%s
<translation>Ðеверный Ð°Ð´Ñ€ÐµÑ -tor: &apos;%s&apos;</translation>
</message>
<message>
- <location line="+9"/>
+ <location line="+8"/>
+ <source>Maintain a full transaction index (default: 0)</source>
+ <translation>Держать полный Ð¸Ð½Ð´ÐµÐºÑ Ñ‚Ñ€Ð°Ð½Ð·Ð°ÐºÑ†Ð¸Ð¹ (по умолчанию: 0)</translation>
+ </message>
+ <message>
+ <location line="+2"/>
<source>Maximum per-connection receive buffer, &lt;n&gt;*1000 bytes (default: 5000)</source>
<translation>МакÑимальный размер буфера приёма на Ñоединение, &lt;n&gt;*1000 байт (по умолчанию: 5000)</translation>
</message>
@@ -2455,12 +2696,7 @@ rpcpassword=%s
<translation>ДопиÑывать отметки времени к отладочному выводу</translation>
</message>
<message>
- <location line="+1"/>
- <source>Rebuild blockchain index from current blk000??.dat files</source>
- <translation>ПереÑтроить Ð¸Ð½Ð´ÐµÐºÑ Ñ†ÐµÐ¿Ð¸ блоков из текущих файлов blk000??.dat</translation>
- </message>
- <message>
- <location line="+4"/>
+ <location line="+5"/>
<source>SSL options: (see the Bitcoin Wiki for SSL setup instructions)</source>
<translation>
Параметры SSL: (Ñм. Bitcoin Wiki Ð´Ð»Ñ Ð¸Ð½Ñтрукций по наÑтройке SSL)</translation>
@@ -2468,7 +2704,7 @@ rpcpassword=%s
<message>
<location line="+1"/>
<source>Select the version of socks proxy to use (4-5, default: 5)</source>
- <translation>Выберите верÑию SOCKS-прокÑи (4-5, по умолчанию: 5)</translation>
+ <translation>Выбрать верÑию SOCKS-прокÑи (4-5, по умолчанию: 5)</translation>
</message>
<message>
<location line="+3"/>
@@ -2501,7 +2737,12 @@ rpcpassword=%s
<translation>Таймаут ÑÐ¾ÐµÐ´Ð¸Ð½ÐµÐ½Ð¸Ñ Ð² миллиÑекундах (по умолчанию: 5000)</translation>
</message>
<message>
- <location line="+13"/>
+ <location line="+4"/>
+ <source>System error: </source>
+ <translation>СиÑÑ‚ÐµÐ¼Ð½Ð°Ñ Ð¾ÑˆÐ¸Ð±ÐºÐ°:</translation>
+ </message>
+ <message>
+ <location line="+10"/>
<source>Use UPnP to map the listening port (default: 0)</source>
<translation>ИÑпользовать UPnP Ð´Ð»Ñ Ð¿Ñ€Ð¾Ð±Ñ€Ð¾Ñа порта (по умолчанию: 0)</translation>
</message>
@@ -2532,36 +2773,41 @@ rpcpassword=%s
</message>
<message>
<location line="+1"/>
+ <source>You need to rebuild the databases using -reindex to change -txindex</source>
+ <translation>Вам необходимо переÑобрать базы данных Ñ Ð¿Ð¾Ð¼Ð¾Ñ‰ÑŒÑŽ -reindex, чтобы изменить -txindex</translation>
+ </message>
+ <message>
+ <location line="+1"/>
<source>wallet.dat corrupt, salvage failed</source>
<translation>wallet.dat повреждён, ÑпаÑение данных не удалоÑÑŒ</translation>
</message>
<message>
- <location line="-43"/>
+ <location line="-45"/>
<source>Password for JSON-RPC connections</source>
<translation>Пароль Ð´Ð»Ñ Ð¿Ð¾Ð´ÐºÐ»ÑŽÑ‡ÐµÐ½Ð¸Ð¹ JSON-RPC</translation>
</message>
<message>
- <location line="-53"/>
+ <location line="-68"/>
<source>Allow JSON-RPC connections from specified IP address</source>
<translation>Разрешить Ð¿Ð¾Ð´ÐºÐ»ÑŽÑ‡ÐµÐ½Ð¸Ñ JSON-RPC Ñ ÑƒÐºÐ°Ð·Ð°Ð½Ð½Ð¾Ð³Ð¾ IP</translation>
</message>
<message>
- <location line="+62"/>
+ <location line="+77"/>
<source>Send commands to node running on &lt;ip&gt; (default: 127.0.0.1)</source>
<translation>ПоÑылать команды узлу, запущенному на &lt;ip&gt; (по умолчанию: 127.0.0.1)</translation>
</message>
<message>
- <location line="-103"/>
+ <location line="-120"/>
<source>Execute command when the best block changes (%s in cmd is replaced by block hash)</source>
<translation>Выполнить команду, когда поÑвлÑетÑÑ Ð½Ð¾Ð²Ñ‹Ð¹ блок (%s в команде заменÑетÑÑ Ð½Ð° Ñ…Ñш блока)</translation>
</message>
<message>
- <location line="+124"/>
+ <location line="+142"/>
<source>Upgrade wallet to latest format</source>
<translation>Обновить бумажник до поÑледнего формата</translation>
</message>
<message>
- <location line="-15"/>
+ <location line="-16"/>
<source>Set key pool size to &lt;n&gt; (default: 100)</source>
<translation>УÑтановить размер запаÑа ключей в &lt;n&gt; (по умолчанию: 100)</translation>
</message>
@@ -2571,17 +2817,12 @@ rpcpassword=%s
<translation>Перепроверить цепь блоков на предмет отÑутÑтвующих в бумажнике транзакций</translation>
</message>
<message>
- <location line="-26"/>
- <source>How many blocks to check at startup (default: 2500, 0 = all)</source>
- <translation>Сколько блоков проверÑÑ‚ÑŒ при запуÑке (по умолчанию: 2500, 0 = вÑе)</translation>
- </message>
- <message>
- <location line="+55"/>
+ <location line="+30"/>
<source>Use OpenSSL (https) for JSON-RPC connections</source>
<translation>ИÑпользовать OpenSSL (https) Ð´Ð»Ñ Ð¿Ð¾Ð´ÐºÐ»ÑŽÑ‡ÐµÐ½Ð¸Ð¹ JSON-RPC</translation>
</message>
<message>
- <location line="-20"/>
+ <location line="-21"/>
<source>Server certificate file (default: server.cert)</source>
<translation>Файл Ñерверного Ñертификата (по умолчанию: server.cert)</translation>
</message>
@@ -2591,12 +2832,12 @@ rpcpassword=%s
<translation>Приватный ключ Ñервера (по умолчанию: server.pem)</translation>
</message>
<message>
- <location line="-133"/>
+ <location line="-154"/>
<source>Acceptable ciphers (default: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH)</source>
<translation>Разрешённые алгоритмы (по умолчанию: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH)</translation>
</message>
<message>
- <location line="+144"/>
+ <location line="+166"/>
<source>This help message</source>
<translation>Эта Ñправка</translation>
</message>
@@ -2606,7 +2847,7 @@ rpcpassword=%s
<translation>Ðевозможно привÑзатьÑÑ Ðº %s на Ñтом компьютере (bind вернул ошибку %d, %s)</translation>
</message>
<message>
- <location line="-70"/>
+ <location line="-86"/>
<source>Connect through socks proxy</source>
<translation>ПодключатьÑÑ Ñ‡ÐµÑ€ÐµÐ· socks прокÑи</translation>
</message>
@@ -2616,12 +2857,12 @@ rpcpassword=%s
<translation>Разрешить поиÑк в DNS Ð´Ð»Ñ -addnode, -seednode и -connect</translation>
</message>
<message>
- <location line="+43"/>
+ <location line="+57"/>
<source>Loading addresses...</source>
<translation>Загрузка адреÑов...</translation>
</message>
<message>
- <location line="-25"/>
+ <location line="-35"/>
<source>Error loading wallet.dat: Wallet corrupted</source>
<translation>Ошибка загрузки wallet.dat: Бумажник поврежден</translation>
</message>
@@ -2631,32 +2872,22 @@ rpcpassword=%s
<translation>Ошибка загрузки wallet.dat: бумажник требует более новую верÑию Bitcoin</translation>
</message>
<message>
- <location line="+73"/>
- <source>Verifying block database integrity...</source>
- <translation>Проверка целоÑтноÑти базы данных блоков...</translation>
- </message>
- <message>
- <location line="+1"/>
- <source>Verifying wallet integrity...</source>
- <translation>Проверка целоÑтноÑти бумажника...</translation>
- </message>
- <message>
- <location line="+1"/>
+ <location line="+87"/>
<source>Wallet needed to be rewritten: restart Bitcoin to complete</source>
<translation>Ðеобходимо перезапиÑать бумажник, перезапуÑтите Bitcoin Ð´Ð»Ñ Ð·Ð°Ð²ÐµÑ€ÑˆÐµÐ½Ð¸Ñ Ð¾Ð¿ÐµÑ€Ð°Ñ†Ð¸Ð¸.</translation>
</message>
<message>
- <location line="-77"/>
+ <location line="-89"/>
<source>Error loading wallet.dat</source>
<translation>Ошибка при загрузке wallet.dat</translation>
</message>
<message>
- <location line="+20"/>
+ <location line="+30"/>
<source>Invalid -proxy address: &apos;%s&apos;</source>
<translation>Ðеверный Ð°Ð´Ñ€ÐµÑ -proxy: &apos;%s&apos;</translation>
</message>
<message>
- <location line="+46"/>
+ <location line="+48"/>
<source>Unknown network specified in -onlynet: &apos;%s&apos;</source>
<translation>Ð’ параметре -onlynet указана неизвеÑÑ‚Ð½Ð°Ñ Ñеть: &apos;%s&apos;</translation>
</message>
@@ -2666,7 +2897,7 @@ rpcpassword=%s
<translation>Ð’ параметре -socks запрошена неизвеÑÑ‚Ð½Ð°Ñ Ð²ÐµÑ€ÑиÑ: %i</translation>
</message>
<message>
- <location line="-75"/>
+ <location line="-91"/>
<source>Cannot resolve -bind address: &apos;%s&apos;</source>
<translation>Ðе удаётÑÑ Ñ€Ð°Ð·Ñ€ÐµÑˆÐ¸Ñ‚ÑŒ Ð°Ð´Ñ€ÐµÑ Ð² параметре -bind: &apos;%s&apos;</translation>
</message>
@@ -2676,17 +2907,17 @@ rpcpassword=%s
<translation>Ðе удаётÑÑ Ñ€Ð°Ð·Ñ€ÐµÑˆÐ¸Ñ‚ÑŒ Ð°Ð´Ñ€ÐµÑ Ð² параметре -externalip: &apos;%s&apos;</translation>
</message>
<message>
- <location line="+31"/>
+ <location line="+45"/>
<source>Invalid amount for -paytxfee=&lt;amount&gt;: &apos;%s&apos;</source>
<translation>Ðеверное количеÑтво в параметре -paytxfee=&lt;кол-во&gt;: &apos;%s&apos;</translation>
</message>
<message>
- <location line="-15"/>
+ <location line="-24"/>
<source>Error: could not start node</source>
<translation>Ошибка: не удалоÑÑŒ запуÑтить узел</translation>
</message>
<message>
- <location line="+16"/>
+ <location line="+25"/>
<source>Invalid amount</source>
<translation>Ðеверное количеÑтво</translation>
</message>
@@ -2701,7 +2932,7 @@ rpcpassword=%s
<translation>Загрузка индекÑа блоков...</translation>
</message>
<message>
- <location line="-45"/>
+ <location line="-59"/>
<source>Add a node to connect to and attempt to keep the connection open</source>
<translation>Добавить узел Ð´Ð»Ñ Ð¿Ð¾Ð´ÐºÐ»ÑŽÑ‡ÐµÐ½Ð¸Ñ Ð¸ пытатьÑÑ Ð¿Ð¾Ð´Ð´ÐµÑ€Ð¶Ð¸Ð²Ð°Ñ‚ÑŒ Ñоединение открытым</translation>
</message>
@@ -2711,22 +2942,17 @@ rpcpassword=%s
<translation>Ðевозможно привÑзатьÑÑ Ðº %s на Ñтом компьютере. Возможно, Bitcoin уже работает.</translation>
</message>
<message>
- <location line="+54"/>
- <source>Find peers using internet relay chat (default: 0)</source>
- <translation>Ðайти учаÑтников через IRC (по умолчанию: 0)</translation>
- </message>
- <message>
- <location line="-2"/>
+ <location line="+68"/>
<source>Fee per KB to add to transactions you send</source>
<translation>КомиÑÑÐ¸Ñ Ð½Ð° килобайт, добавлÑÐµÐ¼Ð°Ñ Ðº вашим транзакциÑм</translation>
</message>
<message>
- <location line="+19"/>
+ <location line="+17"/>
<source>Loading wallet...</source>
<translation>Загрузка бумажника...</translation>
</message>
<message>
- <location line="-40"/>
+ <location line="-54"/>
<source>Cannot downgrade wallet</source>
<translation>Ðе удаётÑÑ Ð¿Ð¾Ð½Ð¸Ð·Ð¸Ñ‚ÑŒ верÑию бумажника</translation>
</message>
@@ -2741,27 +2967,27 @@ rpcpassword=%s
<translation>Ðе удаётÑÑ Ð·Ð°Ð¿Ð¸Ñать Ð°Ð´Ñ€ÐµÑ Ð¿Ð¾ умолчанию</translation>
</message>
<message>
- <location line="+49"/>
+ <location line="+64"/>
<source>Rescanning...</source>
<translation>Сканирование...</translation>
</message>
<message>
- <location line="-43"/>
+ <location line="-56"/>
<source>Done loading</source>
<translation>Загрузка завершена</translation>
</message>
<message>
- <location line="+65"/>
+ <location line="+79"/>
<source>To use the %s option</source>
<translation>Чтобы иÑпользовать опцию %s</translation>
</message>
<message>
- <location line="-60"/>
+ <location line="-71"/>
<source>Error</source>
<translation>Ошибка</translation>
</message>
<message>
- <location line="-28"/>
+ <location line="-33"/>
<source>You must set rpcpassword=&lt;password&gt; in the configuration file:
%s
If the file does not exist, create it with owner-readable-only file permissions.</source>
diff --git a/src/qt/locale/bitcoin_sk.ts b/src/qt/locale/bitcoin_sk.ts
index 1343b53555..0c40844501 100644
--- a/src/qt/locale/bitcoin_sk.ts
+++ b/src/qt/locale/bitcoin_sk.ts
@@ -13,12 +13,7 @@
<translation>&lt;b&gt;Bitcoin&lt;/b&gt; verzia</translation>
</message>
<message>
- <location line="+41"/>
- <source>Copyright © 2009-2012 The Bitcoin developers</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+13"/>
+ <location line="+57"/>
<source>
This is experimental software.
@@ -27,6 +22,16 @@ Distributed under the MIT/X11 software license, see the accompanying file COPYIN
This product includes software developed by the OpenSSL Project for use in the OpenSSL Toolkit (http://www.openssl.org/) and cryptographic software written by Eric Young (eay@cryptsoft.com) and UPnP software written by Thomas Bernard.</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../aboutdialog.cpp" line="+17"/>
+ <source>Copyright</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>2009-%1 The Bitcoin developers</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>AddressBookPage</name>
@@ -101,17 +106,22 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation>&amp;Zmazať</translation>
</message>
<message>
- <location filename="../addressbookpage.cpp" line="+65"/>
+ <location filename="../addressbookpage.cpp" line="+66"/>
<source>Copy &amp;Label</source>
<translation>Kopírovať &amp;popis</translation>
</message>
<message>
- <location line="+2"/>
+ <location line="+1"/>
<source>&amp;Edit</source>
<translation>&amp;Upraviť</translation>
</message>
<message>
- <location line="+250"/>
+ <location line="+1"/>
+ <source>Send &amp;Coins</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+263"/>
<source>Export Address Book Data</source>
<translation>Exportovať dáta z adresára</translation>
</message>
@@ -134,7 +144,7 @@ This product includes software developed by the OpenSSL Project for use in the O
<context>
<name>AddressTableModel</name>
<message>
- <location filename="../addresstablemodel.cpp" line="+142"/>
+ <location filename="../addresstablemodel.cpp" line="+144"/>
<source>Label</source>
<translation>Popis</translation>
</message>
@@ -293,17 +303,17 @@ This product includes software developed by the OpenSSL Project for use in the O
<context>
<name>BitcoinGUI</name>
<message>
- <location filename="../bitcoingui.cpp" line="+267"/>
+ <location filename="../bitcoingui.cpp" line="+231"/>
<source>Sign &amp;message...</source>
<translation>Podpísať &amp;správu...</translation>
</message>
<message>
- <location line="+254"/>
+ <location line="+299"/>
<source>Synchronizing with network...</source>
<translation>Synchronizácia so sieťou...</translation>
</message>
<message>
- <location line="-322"/>
+ <location line="-367"/>
<source>&amp;Overview</source>
<translation>&amp;Prehľad</translation>
</message>
@@ -323,32 +333,17 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation>Prechádzať históriu transakcií</translation>
</message>
<message>
- <location line="+6"/>
- <source>&amp;Address Book</source>
- <translation>&amp;Adresár</translation>
- </message>
- <message>
- <location line="+1"/>
+ <location line="+7"/>
<source>Edit the list of stored addresses and labels</source>
<translation>Editovať zoznam uložených adries a popisov</translation>
</message>
<message>
- <location line="-15"/>
- <source>&amp;Receive coins</source>
- <translation>&amp;Prijať bitcoins</translation>
- </message>
- <message>
- <location line="+1"/>
+ <location line="-14"/>
<source>Show the list of addresses for receiving payments</source>
<translation>Zobraziť zoznam adries pre prijímanie platieb.</translation>
</message>
<message>
- <location line="-8"/>
- <source>&amp;Send coins</source>
- <translation>&amp;Poslať bitcoins</translation>
- </message>
- <message>
- <location line="+39"/>
+ <location line="+31"/>
<source>E&amp;xit</source>
<translation>U&amp;konÄiÅ¥</translation>
</message>
@@ -393,7 +388,7 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation>&amp;Zmena Hesla...</translation>
</message>
<message>
- <location line="+259"/>
+ <location line="+304"/>
<source>Importing blocks from disk...</source>
<translation type="unfinished"/>
</message>
@@ -402,13 +397,8 @@ This product includes software developed by the OpenSSL Project for use in the O
<source>Reindexing blocks on disk...</source>
<translation type="unfinished"/>
</message>
- <message numerus="yes">
- <location line="+10"/>
- <source>~%n block(s) remaining</source>
- <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
- </message>
<message>
- <location line="-265"/>
+ <location line="-300"/>
<source>&amp;Export...</source>
<translation>&amp;Export...</translation>
</message>
@@ -453,18 +443,33 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation type="unfinished"/>
</message>
<message>
- <location line="-196"/>
- <location line="+538"/>
+ <location line="-162"/>
+ <location line="+540"/>
<source>Bitcoin</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-538"/>
+ <location line="-540"/>
<source>Wallet</source>
<translation>Peňaženka</translation>
</message>
<message>
- <location line="+176"/>
+ <location line="+99"/>
+ <source>&amp;Send</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+7"/>
+ <source>&amp;Receive</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+14"/>
+ <source>&amp;Addresses</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+22"/>
<source>&amp;About Bitcoin</source>
<translation>&amp;O Bitcoin</translation>
</message>
@@ -525,97 +530,92 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation>[testovacia sieť]</translation>
</message>
<message>
- <location line="+63"/>
+ <location line="+47"/>
<source>Bitcoin client</source>
<translation type="unfinished"/>
</message>
<message numerus="yes">
- <location line="+79"/>
+ <location line="+140"/>
<source>%n active connection(s) to Bitcoin network</source>
<translation><numerusform>%n aktívne spojenie v Bitcoin sieti</numerusform><numerusform>%n aktívne spojenia v Bitcoin sieti</numerusform><numerusform>%n aktívnych spojení v Bitconi sieti</numerusform></translation>
</message>
<message>
- <location line="+45"/>
- <source>Processed %1 of %2 blocks of transaction history (%3% done).</source>
+ <location line="+39"/>
+ <source>Processed %1 of %2 (estimated) blocks of transaction history.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+7"/>
+ <location line="+4"/>
<source>Processed %1 blocks of transaction history.</source>
<translation type="unfinished"/>
</message>
+ <message numerus="yes">
+ <location line="+20"/>
+ <source>%n hour(s)</source>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
+ <message numerus="yes">
+ <location line="+4"/>
+ <source>%n day(s)</source>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
+ <message numerus="yes">
+ <location line="+4"/>
+ <source>%n week(s)</source>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
<message>
- <location line="+70"/>
- <source>Error</source>
+ <location line="+5"/>
+ <source>%1 behind</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+3"/>
- <source>Warning</source>
+ <location line="+14"/>
+ <source>Last received block was generated %1 ago.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+3"/>
- <source>Information</source>
+ <location line="+2"/>
+ <source>Transactions after this will not yet be visible.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+66"/>
- <source>This transaction is over the size limit. You can still send it for a fee of %1, which goes to the nodes that process your transaction and helps to support the network. Do you want to pay the fee?</source>
+ <location line="+21"/>
+ <source>Error</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+210"/>
- <source>Backup Successful</source>
+ <location line="+3"/>
+ <source>Warning</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+0"/>
- <source>The wallet data was successfully saved to the new location.</source>
+ <location line="+3"/>
+ <source>Information</source>
<translation type="unfinished"/>
</message>
- <message numerus="yes">
- <location line="-338"/>
- <source>%n second(s) ago</source>
- <translation><numerusform>pred %n sekundou</numerusform><numerusform>pred %n sekundami</numerusform><numerusform>pred %n sekundami</numerusform></translation>
- </message>
- <message numerus="yes">
- <location line="+4"/>
- <source>%n minute(s) ago</source>
- <translation><numerusform>pred %n minútou</numerusform><numerusform>pred %n minútami</numerusform><numerusform>pred %n minútami</numerusform></translation>
- </message>
- <message numerus="yes">
- <location line="+4"/>
- <source>%n hour(s) ago</source>
- <translation><numerusform>pred hodinou</numerusform><numerusform>pred %n hodinami</numerusform><numerusform>pred %n hodinami</numerusform></translation>
- </message>
- <message numerus="yes">
- <location line="+4"/>
- <source>%n day(s) ago</source>
- <translation><numerusform>vÄera</numerusform><numerusform>pred %n dňami</numerusform><numerusform>pred %n dňami</numerusform></translation>
+ <message>
+ <location line="+68"/>
+ <source>This transaction is over the size limit. You can still send it for a fee of %1, which goes to the nodes that process your transaction and helps to support the network. Do you want to pay the fee?</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location line="+6"/>
+ <location line="-138"/>
<source>Up to date</source>
<translation>Aktualizovaný</translation>
</message>
<message>
- <location line="+7"/>
+ <location line="+32"/>
<source>Catching up...</source>
<translation>SÅ¥ahujem...</translation>
</message>
<message>
- <location line="+10"/>
- <source>Last received block was generated %1.</source>
- <translation>Posledný prijatý blok bol generovaný %1.</translation>
- </message>
- <message>
- <location line="+97"/>
+ <location line="+110"/>
<source>Confirm transaction fee</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+23"/>
+ <location line="+8"/>
<source>Sent transaction</source>
<translation>Odoslané transakcie</translation>
</message>
@@ -637,14 +637,14 @@ Typ: %3
Adresa: %4</translation>
</message>
<message>
- <location line="+99"/>
- <location line="+28"/>
+ <location line="+33"/>
+ <location line="+23"/>
<source>URI handling</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-28"/>
- <location line="+28"/>
+ <location line="-23"/>
+ <location line="+23"/>
<source>URI can not be parsed! This can be caused by an invalid Bitcoin address or malformed URI parameters.</source>
<translation type="unfinished"/>
</message>
@@ -659,27 +659,7 @@ Adresa: %4</translation>
<translation>Peňaženka je &lt;b&gt;zašifrovaná&lt;/b&gt; a momentálne &lt;b&gt;zamknutá&lt;/b&gt;</translation>
</message>
<message>
- <location line="+23"/>
- <source>Backup Wallet</source>
- <translation>Zálohovať peňaženku</translation>
- </message>
- <message>
- <location line="+0"/>
- <source>Wallet Data (*.dat)</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+3"/>
- <source>Backup Failed</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+0"/>
- <source>There was an error trying to save the wallet data to the new location.</source>
- <translation>Nastala chyba pri pokuse uložiť peňaženku na nové miesto.</translation>
- </message>
- <message>
- <location filename="../bitcoin.cpp" line="+109"/>
+ <location filename="../bitcoin.cpp" line="+108"/>
<source>A fatal error occurred. Bitcoin can no longer continue safely and will quit.</source>
<translation type="unfinished"/>
</message>
@@ -687,7 +667,7 @@ Adresa: %4</translation>
<context>
<name>ClientModel</name>
<message>
- <location filename="../clientmodel.cpp" line="+86"/>
+ <location filename="../clientmodel.cpp" line="+96"/>
<source>Network Alert</source>
<translation type="unfinished"/>
</message>
@@ -720,7 +700,7 @@ Adresa: %4</translation>
<translation>Adresa spojená s týmto záznamom v adresári. Možno upravovať len pre odosielajúce adresy.</translation>
</message>
<message>
- <location filename="../editaddressdialog.cpp" line="+20"/>
+ <location filename="../editaddressdialog.cpp" line="+21"/>
<source>New receiving address</source>
<translation>Nová adresa pre prijímanie</translation>
</message>
@@ -740,17 +720,17 @@ Adresa: %4</translation>
<translation>Upraviť odosielaciu adresu</translation>
</message>
<message>
- <location line="+60"/>
+ <location line="+76"/>
<source>The entered address &quot;%1&quot; is already in the address book.</source>
<translation>Vložená adresa &quot;%1&quot; sa už nachádza v adresári.</translation>
</message>
<message>
- <location line="+5"/>
+ <location line="-5"/>
<source>The entered address &quot;%1&quot; is not a valid Bitcoin address.</source>
<translation>Vložená adresa &quot;%1&quot; nieje platnou adresou bitcoin.</translation>
</message>
<message>
- <location line="+5"/>
+ <location line="+10"/>
<source>Could not unlock wallet.</source>
<translation>Nepodarilo sa odomknúť peňaženku.</translation>
</message>
@@ -763,7 +743,7 @@ Adresa: %4</translation>
<context>
<name>GUIUtil::HelpMessageBox</name>
<message>
- <location filename="../guiutil.cpp" line="+419"/>
+ <location filename="../guiutil.cpp" line="+422"/>
<location line="+12"/>
<source>Bitcoin-Qt</source>
<translation type="unfinished"/>
@@ -977,7 +957,7 @@ Adresa: %4</translation>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../optionsdialog.cpp" line="+55"/>
+ <location filename="../optionsdialog.cpp" line="+53"/>
<source>default</source>
<translation type="unfinished"/>
</message>
@@ -1022,23 +1002,18 @@ Adresa: %4</translation>
<translation>Forma</translation>
</message>
<message>
- <location line="+51"/>
- <location line="+183"/>
+ <location line="+50"/>
+ <location line="+166"/>
<source>The displayed information may be out of date. Your wallet automatically synchronizes with the Bitcoin network after a connection is established, but this process has not completed yet.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-141"/>
+ <location line="-124"/>
<source>Balance:</source>
<translation>Zostatok:</translation>
</message>
<message>
- <location line="+58"/>
- <source>Number of transactions:</source>
- <translation>PoÄet transakcií:</translation>
- </message>
- <message>
- <location line="-29"/>
+ <location line="+29"/>
<source>Unconfirmed:</source>
<translation>Nepotvrdené:</translation>
</message>
@@ -1048,7 +1023,7 @@ Adresa: %4</translation>
<translation>Peňaženka</translation>
</message>
<message>
- <location line="+124"/>
+ <location line="+107"/>
<source>Immature:</source>
<translation type="unfinished"/>
</message>
@@ -1063,7 +1038,7 @@ Adresa: %4</translation>
<translation>&lt;b&gt;Nedávne transakcie&lt;/b&gt;</translation>
</message>
<message>
- <location line="-118"/>
+ <location line="-101"/>
<source>Your current balance</source>
<translation>Váš súÄasný zostatok</translation>
</message>
@@ -1073,11 +1048,6 @@ Adresa: %4</translation>
<translation>Suma transakcií ktoré eÅ¡te neboli potvrdené a nezapoÄítavaju sa do celkového zostatku.</translation>
</message>
<message>
- <location line="+20"/>
- <source>Total number of transactions in wallet</source>
- <translation>Celkový poÄet transakcií v peňaženke</translation>
- </message>
- <message>
<location filename="../overviewpage.cpp" line="+115"/>
<location line="+1"/>
<source>out of sync</source>
@@ -1085,6 +1055,14 @@ Adresa: %4</translation>
</message>
</context>
<context>
+ <name>PaymentServer</name>
+ <message>
+ <location filename="../paymentserver.cpp" line="+107"/>
+ <source>Cannot start bitcoin: click-to-pay handler</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>QRCodeDialog</name>
<message>
<location filename="../forms/qrcodedialog.ui" line="+14"/>
@@ -1423,7 +1401,7 @@ Adresa: %4</translation>
</message>
<message>
<location line="+60"/>
- <location filename="../sendcoinsentry.cpp" line="+25"/>
+ <location filename="../sendcoinsentry.cpp" line="+26"/>
<source>Enter a label for this address to add it to your address book</source>
<translation>Vložte popis pre túto adresu aby sa pridala do adresára</translation>
</message>
@@ -1659,7 +1637,7 @@ Adresa: %4</translation>
<context>
<name>TransactionDesc</name>
<message>
- <location filename="../transactiondesc.cpp" line="+19"/>
+ <location filename="../transactiondesc.cpp" line="+20"/>
<source>Open until %1</source>
<translation>Otvorené do %1</translation>
</message>
@@ -1846,7 +1824,7 @@ Adresa: %4</translation>
<context>
<name>TransactionTableModel</name>
<message>
- <location filename="../transactiontablemodel.cpp" line="+226"/>
+ <location filename="../transactiontablemodel.cpp" line="+225"/>
<source>Date</source>
<translation>Dátum</translation>
</message>
@@ -1964,7 +1942,7 @@ Adresa: %4</translation>
<context>
<name>TransactionView</name>
<message>
- <location filename="../transactionview.cpp" line="+55"/>
+ <location filename="../transactionview.cpp" line="+52"/>
<location line="+16"/>
<source>All</source>
<translation>VÅ¡etko</translation>
@@ -2051,6 +2029,11 @@ Adresa: %4</translation>
</message>
<message>
<location line="+1"/>
+ <source>Copy transaction ID</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Edit label</source>
<translation>Editovať popis</translation>
</message>
@@ -2060,7 +2043,7 @@ Adresa: %4</translation>
<translation type="unfinished"/>
</message>
<message>
- <location line="+142"/>
+ <location line="+139"/>
<source>Export Transaction Data</source>
<translation>ExportovaÅ¥ transakÄné dáta</translation>
</message>
@@ -2115,7 +2098,7 @@ Adresa: %4</translation>
<translation>Nedalo sa zapisovať do súboru %1.</translation>
</message>
<message>
- <location line="+95"/>
+ <location line="+100"/>
<source>Range:</source>
<translation>Rozsah:</translation>
</message>
@@ -2126,29 +2109,172 @@ Adresa: %4</translation>
</message>
</context>
<context>
+ <name>WalletView</name>
+ <message>
+ <location filename="../walletview.cpp" line="+95"/>
+ <source>&amp;Overview</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Show general overview of wallet</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>&amp;Send coins</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Send coins to a Bitcoin address</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>&amp;Receive coins</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Show the list of addresses for receiving payments</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>&amp;Transactions</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Browse transaction history</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>&amp;Address Book</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Edit the list of stored addresses and labels</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+12"/>
+ <source>&amp;Encrypt Wallet...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Encrypt the private keys that belong to your wallet</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>&amp;Backup Wallet...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Backup wallet to another location</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>&amp;Change Passphrase...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Change the passphrase used for wallet encryption</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Sign &amp;message...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Sign messages with your Bitcoin addresses to prove you own them</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>&amp;Verify message...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Verify messages to ensure they were signed with specified Bitcoin addresses</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>&amp;Export...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Export the data in the current tab to a file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+180"/>
+ <source>Backup Wallet</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>Wallet Data (*.dat)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Backup Failed</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>There was an error trying to save the wallet data to the new location.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>Backup Successful</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>The wallet data was successfully saved to the new location.</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>bitcoin-core</name>
<message>
- <location filename="../bitcoinstrings.cpp" line="+88"/>
+ <location filename="../bitcoinstrings.cpp" line="+96"/>
<source>Bitcoin version</source>
<translation>Bitcoin verzia</translation>
</message>
<message>
- <location line="+82"/>
+ <location line="+98"/>
<source>Usage:</source>
<translation>Použitie:</translation>
</message>
<message>
- <location line="-23"/>
+ <location line="-24"/>
<source>Send command to -server or bitcoind</source>
<translation>Odoslať príkaz -server alebo bitcoind</translation>
</message>
<message>
- <location line="-21"/>
+ <location line="-22"/>
<source>List commands</source>
<translation>Zoznam príkazov</translation>
</message>
<message>
- <location line="-11"/>
+ <location line="-10"/>
<source>Get help for a command</source>
<translation>Dostať pomoc pre príkaz</translation>
</message>
@@ -2173,12 +2299,12 @@ Adresa: %4</translation>
<translation>PoÄítaj bitcoins</translation>
</message>
<message>
- <location line="-15"/>
+ <location line="-28"/>
<source>Don&apos;t generate coins</source>
<translation>NepoÄítaj bitcoins</translation>
</message>
<message>
- <location line="+61"/>
+ <location line="+74"/>
<source>Specify data directory</source>
<translation>UrÄiÅ¥ prieÄinok s dátami</translation>
</message>
@@ -2188,80 +2314,82 @@ Adresa: %4</translation>
<translation type="unfinished"/>
</message>
<message>
- <location line="-26"/>
+ <location line="-27"/>
<source>Listen for connections on &lt;port&gt; (default: 8333 or testnet: 18333)</source>
<translation>NaÄúvaÅ¥ spojeniam na &lt;port&gt; (prednastavené: 8333 alebo testovacia sieÅ¥: 18333)</translation>
</message>
<message>
- <location line="+4"/>
+ <location line="+5"/>
<source>Maintain at most &lt;n&gt; connections to peers (default: 125)</source>
<translation>Udržiavať maximálne &lt;n&gt; spojení (predvolené: 125)</translation>
</message>
<message>
- <location line="-34"/>
+ <location line="-49"/>
<source>Connect to a node to retrieve peer addresses, and disconnect</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+65"/>
+ <location line="+80"/>
<source>Specify your own public address</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+2"/>
+ <location line="+3"/>
<source>Threshold for disconnecting misbehaving peers (default: 100)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-114"/>
+ <location line="-132"/>
<source>Number of seconds to keep misbehaving peers from reconnecting (default: 86400)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-28"/>
+ <location line="-32"/>
<source>An error occurred while setting up the RPC port %u for listening on IPv4: %s</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+26"/>
+ <location line="+30"/>
<source>Listen for JSON-RPC connections on &lt;port&gt; (default: 8332 or testnet: 18332)</source>
<translation>PoÄúvaÅ¥ JSON-RPC spojeniam na &lt;port&gt; (predvolené: 8332 or testnet: 18332)</translation>
</message>
<message>
- <location line="+34"/>
+ <location line="+36"/>
<source>Accept command line and JSON-RPC commands</source>
<translation>Prijímať príkazy z príkazového riadku a JSON-RPC</translation>
</message>
<message>
- <location line="+62"/>
+ <location line="+77"/>
<source>Run in the background as a daemon and accept commands</source>
<translation>Bežať na pozadí ako démon a prijímať príkazy</translation>
</message>
<message>
- <location line="+31"/>
+ <location line="+32"/>
<source>Use the test network</source>
<translation>Použiť testovaciu sieť</translation>
</message>
<message>
- <location line="-92"/>
+ <location line="-108"/>
<source>Accept connections from outside (default: 1 if no -proxy or -connect)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-74"/>
+ <location line="-82"/>
<source>%s, you must set a rpcpassword in the configuration file:
- %s
+%s
It is recommended you use the following random password:
rpcuser=bitcoinrpc
rpcpassword=%s
(you do not need to remember this password)
The username and password MUST NOT be the same.
If the file does not exist, create it with owner-readable-only file permissions.
+It is also recommended to set alertnotify so you are notified of problems;
+for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.com
</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+15"/>
+ <location line="+17"/>
<source>An error occurred while setting up the RPC port %u for listening on IPv6, falling back to IPv4: %s</source>
<translation type="unfinished"/>
</message>
@@ -2277,11 +2405,6 @@ If the file does not exist, create it with owner-readable-only file permissions.
</message>
<message>
<location line="+3"/>
- <source>Corrupted block database detected. Please restart the client with -reindex.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+2"/>
<source>Error initializing database environment %s! To recover, BACKUP THAT DIRECTORY, then remove everything from it except for wallet.dat.</source>
<translation type="unfinished"/>
</message>
@@ -2296,12 +2419,27 @@ If the file does not exist, create it with owner-readable-only file permissions.
<translation type="unfinished"/>
</message>
<message>
+ <location line="+3"/>
+ <source>Execute command when a relevant alert is received (%s in cmd is replaced by message)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Execute command when a wallet transaction changes (%s in cmd is replaced by TxID)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location line="+11"/>
<source>Set maximum size of high-priority/low-fee transactions in bytes (default: 27000)</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+3"/>
+ <source>Set the number of script verification threads (1-16, 0=auto, default: 0)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
<source>This is a pre-release test build - use at your own risk - do not use for mining or merchant applications</source>
<translation type="unfinished"/>
</message>
@@ -2347,16 +2485,41 @@ If the file does not exist, create it with owner-readable-only file permissions.
</message>
<message>
<location line="+3"/>
+ <source>Corrupted block database detected</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Discover own IP address (default: 1 when listening and no -externalip)</source>
<translation type="unfinished"/>
</message>
<message>
+ <location line="+1"/>
+ <source>Do you want to rebuild the block database now?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location line="+3"/>
+ <source>Error initializing block database</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Error initializing wallet database environment %s!</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Error loading block database</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+5"/>
+ <location line="+4"/>
+ <source>Error opening block database</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
<source>Error: Disk space is low!</source>
<translation type="unfinished"/>
</message>
@@ -2372,26 +2535,96 @@ If the file does not exist, create it with owner-readable-only file permissions.
</message>
<message>
<location line="+2"/>
+ <source>Error: system error: </source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Failed to listen on any port. Use -listen=0 if you want this.</source>
<translation type="unfinished"/>
</message>
<message>
+ <location line="+1"/>
+ <source>Failed to read block info</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Failed to read block</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Failed to sync block index</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Failed to write block index</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Failed to write block info</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Failed to write block</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Failed to write file info</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Failed to write to coin database</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Failed to write transaction index</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Failed to write undo data</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location line="+2"/>
<source>Find peers using DNS lookup (default: 1 unless -connect)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+5"/>
- <source>How thorough the block verification is (0-4, default: 3)</source>
+ <location line="+3"/>
+ <source>How many blocks to check at startup (default: 288, 0 = all)</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+1"/>
- <source>Importing blocks from block database...</source>
+ <source>How thorough the block verification is (0-4, default: 3)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+24"/>
+ <source>Rebuild block chain index from current blk000??.dat files</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+37"/>
+ <source>Verifying blocks...</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+1"/>
+ <source>Verifying wallet...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-61"/>
<source>Imports blocks from external blk000??.dat file</source>
<translation type="unfinished"/>
</message>
@@ -2406,7 +2639,12 @@ If the file does not exist, create it with owner-readable-only file permissions.
<translation>Neplatná adresa tor: &apos;%s&apos;</translation>
</message>
<message>
- <location line="+9"/>
+ <location line="+8"/>
+ <source>Maintain a full transaction index (default: 0)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
<source>Maximum per-connection receive buffer, &lt;n&gt;*1000 bytes (default: 5000)</source>
<translation type="unfinished"/>
</message>
@@ -2441,12 +2679,7 @@ If the file does not exist, create it with owner-readable-only file permissions.
<translation>PridaÅ¥ na zaÄiatok ladiaceho výstupu Äasový údaj</translation>
</message>
<message>
- <location line="+1"/>
- <source>Rebuild blockchain index from current blk000??.dat files</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+4"/>
+ <location line="+5"/>
<source>SSL options: (see the Bitcoin Wiki for SSL setup instructions)</source>
<translation>SSL možnosť: (pozrite Bitcoin Wiki pre návod na nastavenie SSL)</translation>
</message>
@@ -2486,7 +2719,12 @@ If the file does not exist, create it with owner-readable-only file permissions.
<translation>UrÄiÅ¥ aut spojenia v milisekundách (predvolené: 5000)</translation>
</message>
<message>
- <location line="+13"/>
+ <location line="+4"/>
+ <source>System error: </source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+10"/>
<source>Use UPnP to map the listening port (default: 0)</source>
<translation>SkúsiÅ¥ použiÅ¥ UPnP pre mapovanie poÄúvajúceho portu (default: 0)</translation>
</message>
@@ -2517,36 +2755,41 @@ If the file does not exist, create it with owner-readable-only file permissions.
</message>
<message>
<location line="+1"/>
+ <source>You need to rebuild the databases using -reindex to change -txindex</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>wallet.dat corrupt, salvage failed</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-43"/>
+ <location line="-45"/>
<source>Password for JSON-RPC connections</source>
<translation>Heslo pre JSON-rPC spojenia</translation>
</message>
<message>
- <location line="-53"/>
+ <location line="-68"/>
<source>Allow JSON-RPC connections from specified IP address</source>
<translation>PovoliÅ¥ JSON-RPC spojenia z urÄenej IP adresy.</translation>
</message>
<message>
- <location line="+62"/>
+ <location line="+77"/>
<source>Send commands to node running on &lt;ip&gt; (default: 127.0.0.1)</source>
<translation>Poslať príkaz nóde bežiacej na &lt;ip&gt; (predvolené: 127.0.0.1)</translation>
</message>
<message>
- <location line="-103"/>
+ <location line="-120"/>
<source>Execute command when the best block changes (%s in cmd is replaced by block hash)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+124"/>
+ <location line="+142"/>
<source>Upgrade wallet to latest format</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-15"/>
+ <location line="-16"/>
<source>Set key pool size to &lt;n&gt; (default: 100)</source>
<translation>Nastaviť zásobu adries na &lt;n&gt; (predvolené: 100)</translation>
</message>
@@ -2556,17 +2799,12 @@ If the file does not exist, create it with owner-readable-only file permissions.
<translation>Znovu skenovať reťaz blokov pre chýbajúce transakcie</translation>
</message>
<message>
- <location line="-26"/>
- <source>How many blocks to check at startup (default: 2500, 0 = all)</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+55"/>
+ <location line="+30"/>
<source>Use OpenSSL (https) for JSON-RPC connections</source>
<translation>Použiť OpenSSL (https) pre JSON-RPC spojenia</translation>
</message>
<message>
- <location line="-20"/>
+ <location line="-21"/>
<source>Server certificate file (default: server.cert)</source>
<translation>Súbor s certifikátom servra (predvolené: server.cert)</translation>
</message>
@@ -2576,12 +2814,12 @@ If the file does not exist, create it with owner-readable-only file permissions.
<translation>Súkromný kÄ¾ÃºÄ servra (predvolené: server.pem)</translation>
</message>
<message>
- <location line="-133"/>
+ <location line="-154"/>
<source>Acceptable ciphers (default: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH)</source>
<translation>Prijateľné šifry (predvolené: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH)</translation>
</message>
<message>
- <location line="+144"/>
+ <location line="+166"/>
<source>This help message</source>
<translation>Táto pomocná správa</translation>
</message>
@@ -2591,7 +2829,7 @@ If the file does not exist, create it with owner-readable-only file permissions.
<translation type="unfinished"/>
</message>
<message>
- <location line="-70"/>
+ <location line="-86"/>
<source>Connect through socks proxy</source>
<translation>Pripojenie cez socks proxy</translation>
</message>
@@ -2601,12 +2839,12 @@ If the file does not exist, create it with owner-readable-only file permissions.
<translation>Povoliť vyhľadávanie DNS pre pridanie nódy a spojenie</translation>
</message>
<message>
- <location line="+43"/>
+ <location line="+57"/>
<source>Loading addresses...</source>
<translation>NaÄítavanie adries...</translation>
</message>
<message>
- <location line="-25"/>
+ <location line="-35"/>
<source>Error loading wallet.dat: Wallet corrupted</source>
<translation>Chyba naÄítania wallet.dat: Peňaženka je poÅ¡kodená</translation>
</message>
@@ -2616,32 +2854,22 @@ If the file does not exist, create it with owner-readable-only file permissions.
<translation>Chyba naÄítania wallet.dat: Peňaženka vyžaduje novÅ¡iu verziu Bitcoin</translation>
</message>
<message>
- <location line="+73"/>
- <source>Verifying block database integrity...</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+1"/>
- <source>Verifying wallet integrity...</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+1"/>
+ <location line="+87"/>
<source>Wallet needed to be rewritten: restart Bitcoin to complete</source>
<translation>Bolo potrebné prepísaÅ¥ peňaženku: dokonÄite reÅ¡tartovaním Bitcoin</translation>
</message>
<message>
- <location line="-77"/>
+ <location line="-89"/>
<source>Error loading wallet.dat</source>
<translation>Chyba naÄítania wallet.dat</translation>
</message>
<message>
- <location line="+20"/>
+ <location line="+30"/>
<source>Invalid -proxy address: &apos;%s&apos;</source>
<translation>Neplatná adresa proxy: &apos;%s&apos;</translation>
</message>
<message>
- <location line="+46"/>
+ <location line="+48"/>
<source>Unknown network specified in -onlynet: &apos;%s&apos;</source>
<translation type="unfinished"/>
</message>
@@ -2651,7 +2879,7 @@ If the file does not exist, create it with owner-readable-only file permissions.
<translation type="unfinished"/>
</message>
<message>
- <location line="-75"/>
+ <location line="-91"/>
<source>Cannot resolve -bind address: &apos;%s&apos;</source>
<translation type="unfinished"/>
</message>
@@ -2661,17 +2889,17 @@ If the file does not exist, create it with owner-readable-only file permissions.
<translation type="unfinished"/>
</message>
<message>
- <location line="+31"/>
+ <location line="+45"/>
<source>Invalid amount for -paytxfee=&lt;amount&gt;: &apos;%s&apos;</source>
<translation>Neplatná suma pre -paytxfee=&lt;amount&gt;: &apos;%s&apos;</translation>
</message>
<message>
- <location line="-15"/>
+ <location line="-24"/>
<source>Error: could not start node</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+16"/>
+ <location line="+25"/>
<source>Invalid amount</source>
<translation>Neplatná suma</translation>
</message>
@@ -2686,7 +2914,7 @@ If the file does not exist, create it with owner-readable-only file permissions.
<translation>NaÄítavanie zoznamu blokov...</translation>
</message>
<message>
- <location line="-45"/>
+ <location line="-59"/>
<source>Add a node to connect to and attempt to keep the connection open</source>
<translation>Pridať nódu a pripojiť sa and attempt to keep the connection open</translation>
</message>
@@ -2696,22 +2924,17 @@ If the file does not exist, create it with owner-readable-only file permissions.
<translation type="unfinished"/>
</message>
<message>
- <location line="+54"/>
- <source>Find peers using internet relay chat (default: 0)</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="-2"/>
+ <location line="+68"/>
<source>Fee per KB to add to transactions you send</source>
<translation>Poplatok za kB ktorý treba pridať k odoslanej transakcii</translation>
</message>
<message>
- <location line="+19"/>
+ <location line="+17"/>
<source>Loading wallet...</source>
<translation>NaÄítavam peňaženku...</translation>
</message>
<message>
- <location line="-40"/>
+ <location line="-54"/>
<source>Cannot downgrade wallet</source>
<translation type="unfinished"/>
</message>
@@ -2726,27 +2949,27 @@ If the file does not exist, create it with owner-readable-only file permissions.
<translation type="unfinished"/>
</message>
<message>
- <location line="+49"/>
+ <location line="+64"/>
<source>Rescanning...</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-43"/>
+ <location line="-56"/>
<source>Done loading</source>
<translation>DokonÄené naÄítavanie</translation>
</message>
<message>
- <location line="+65"/>
+ <location line="+79"/>
<source>To use the %s option</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-60"/>
+ <location line="-71"/>
<source>Error</source>
<translation>Chyba</translation>
</message>
<message>
- <location line="-28"/>
+ <location line="-33"/>
<source>You must set rpcpassword=&lt;password&gt; in the configuration file:
%s
If the file does not exist, create it with owner-readable-only file permissions.</source>
diff --git a/src/qt/locale/bitcoin_sr.ts b/src/qt/locale/bitcoin_sr.ts
index f12e815627..336c1fc253 100644
--- a/src/qt/locale/bitcoin_sr.ts
+++ b/src/qt/locale/bitcoin_sr.ts
@@ -13,12 +13,7 @@
<translation>&lt;b&gt;Bitcoin&lt;/b&gt; верзија</translation>
</message>
<message>
- <location line="+41"/>
- <source>Copyright © 2009-2012 The Bitcoin developers</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+13"/>
+ <location line="+57"/>
<source>
This is experimental software.
@@ -27,6 +22,16 @@ Distributed under the MIT/X11 software license, see the accompanying file COPYIN
This product includes software developed by the OpenSSL Project for use in the OpenSSL Toolkit (http://www.openssl.org/) and cryptographic software written by Eric Young (eay@cryptsoft.com) and UPnP software written by Thomas Bernard.</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../aboutdialog.cpp" line="+17"/>
+ <source>Copyright</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>2009-%1 The Bitcoin developers</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>AddressBookPage</name>
@@ -68,7 +73,7 @@ This product includes software developed by the OpenSSL Project for use in the O
<message>
<location line="+11"/>
<source>Show &amp;QR Code</source>
- <translation type="unfinished"/>
+ <translation>Prikaži &amp;QR kod</translation>
</message>
<message>
<location line="+11"/>
@@ -101,17 +106,22 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation>&amp;Избриши</translation>
</message>
<message>
- <location filename="../addressbookpage.cpp" line="+65"/>
+ <location filename="../addressbookpage.cpp" line="+66"/>
<source>Copy &amp;Label</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+2"/>
+ <location line="+1"/>
<source>&amp;Edit</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+250"/>
+ <location line="+1"/>
+ <source>Send &amp;Coins</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+263"/>
<source>Export Address Book Data</source>
<translation>Извоз података из адреÑара</translation>
</message>
@@ -134,7 +144,7 @@ This product includes software developed by the OpenSSL Project for use in the O
<context>
<name>AddressTableModel</name>
<message>
- <location filename="../addresstablemodel.cpp" line="+142"/>
+ <location filename="../addresstablemodel.cpp" line="+144"/>
<source>Label</source>
<translation>Етикета</translation>
</message>
@@ -246,7 +256,7 @@ This product includes software developed by the OpenSSL Project for use in the O
<message>
<location line="-56"/>
<source>Bitcoin will close now to finish the encryption process. Remember that encrypting your wallet cannot fully protect your bitcoins from being stolen by malware infecting your computer.</source>
- <translation type="unfinished"/>
+ <translation>Bitcoin će se sad zatvoriti da bi zavrÅ¡io proces enkripcije. Zapamti da enkripcija tvog novÄanika ne može u potpunosti da zaÅ¡titi tvoje bitcoine da ne budu ukradeni od malawarea koji bi inficirao tvoj kompjuter.</translation>
</message>
<message>
<location line="+13"/>
@@ -293,17 +303,17 @@ This product includes software developed by the OpenSSL Project for use in the O
<context>
<name>BitcoinGUI</name>
<message>
- <location filename="../bitcoingui.cpp" line="+267"/>
+ <location filename="../bitcoingui.cpp" line="+231"/>
<source>Sign &amp;message...</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+254"/>
+ <location line="+299"/>
<source>Synchronizing with network...</source>
<translation>Синхронизација Ñа мрежом у току...</translation>
</message>
<message>
- <location line="-322"/>
+ <location line="-367"/>
<source>&amp;Overview</source>
<translation>&amp;Општи преглед</translation>
</message>
@@ -323,34 +333,19 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation>Претражите иÑторијат транÑакција</translation>
</message>
<message>
- <location line="+6"/>
- <source>&amp;Address Book</source>
- <translation>&amp;ÐдреÑар</translation>
- </message>
- <message>
- <location line="+1"/>
+ <location line="+7"/>
<source>Edit the list of stored addresses and labels</source>
<translation>Уредите запамћене адреÑе и њихове етикете</translation>
</message>
<message>
- <location line="-15"/>
- <source>&amp;Receive coins</source>
- <translation>П&amp;римање новца</translation>
- </message>
- <message>
- <location line="+1"/>
+ <location line="-14"/>
<source>Show the list of addresses for receiving payments</source>
<translation>Прегледајте лиÑту адреÑа на којима прихватате уплате</translation>
</message>
<message>
- <location line="-8"/>
- <source>&amp;Send coins</source>
- <translation>&amp;Слање новца</translation>
- </message>
- <message>
- <location line="+39"/>
+ <location line="+31"/>
<source>E&amp;xit</source>
- <translation type="unfinished"/>
+ <translation>I&amp;zlaz</translation>
</message>
<message>
<location line="+1"/>
@@ -393,7 +388,7 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation>Промени &amp;лозинку...</translation>
</message>
<message>
- <location line="+259"/>
+ <location line="+304"/>
<source>Importing blocks from disk...</source>
<translation type="unfinished"/>
</message>
@@ -402,13 +397,8 @@ This product includes software developed by the OpenSSL Project for use in the O
<source>Reindexing blocks on disk...</source>
<translation type="unfinished"/>
</message>
- <message numerus="yes">
- <location line="+10"/>
- <source>~%n block(s) remaining</source>
- <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
- </message>
<message>
- <location line="-265"/>
+ <location line="-300"/>
<source>&amp;Export...</source>
<translation>&amp;Извоз...</translation>
</message>
@@ -453,18 +443,33 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation type="unfinished"/>
</message>
<message>
- <location line="-196"/>
- <location line="+538"/>
+ <location line="-162"/>
+ <location line="+540"/>
<source>Bitcoin</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-538"/>
+ <location line="-540"/>
<source>Wallet</source>
<translation>новчаник</translation>
</message>
<message>
- <location line="+176"/>
+ <location line="+99"/>
+ <source>&amp;Send</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+7"/>
+ <source>&amp;Receive</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+14"/>
+ <source>&amp;Addresses</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+22"/>
<source>&amp;About Bitcoin</source>
<translation>&amp;О Bitcoin-у</translation>
</message>
@@ -525,97 +530,92 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation>[testnet]</translation>
</message>
<message>
- <location line="+63"/>
+ <location line="+47"/>
<source>Bitcoin client</source>
<translation type="unfinished"/>
</message>
<message numerus="yes">
- <location line="+79"/>
+ <location line="+140"/>
<source>%n active connection(s) to Bitcoin network</source>
<translation><numerusform>%n активна веза Ñа Bitcoin мрежом</numerusform><numerusform>%n активне везе Ñа Bitcoin мрежом</numerusform><numerusform>%n активних веза Ñа Bitcoin мрежом</numerusform></translation>
</message>
<message>
- <location line="+45"/>
- <source>Processed %1 of %2 blocks of transaction history (%3% done).</source>
+ <location line="+39"/>
+ <source>Processed %1 of %2 (estimated) blocks of transaction history.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+7"/>
+ <location line="+4"/>
<source>Processed %1 blocks of transaction history.</source>
<translation type="unfinished"/>
</message>
+ <message numerus="yes">
+ <location line="+20"/>
+ <source>%n hour(s)</source>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
+ <message numerus="yes">
+ <location line="+4"/>
+ <source>%n day(s)</source>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
+ <message numerus="yes">
+ <location line="+4"/>
+ <source>%n week(s)</source>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
<message>
- <location line="+70"/>
- <source>Error</source>
+ <location line="+5"/>
+ <source>%1 behind</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+3"/>
- <source>Warning</source>
+ <location line="+14"/>
+ <source>Last received block was generated %1 ago.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+3"/>
- <source>Information</source>
+ <location line="+2"/>
+ <source>Transactions after this will not yet be visible.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+66"/>
- <source>This transaction is over the size limit. You can still send it for a fee of %1, which goes to the nodes that process your transaction and helps to support the network. Do you want to pay the fee?</source>
+ <location line="+21"/>
+ <source>Error</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+210"/>
- <source>Backup Successful</source>
+ <location line="+3"/>
+ <source>Warning</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+0"/>
- <source>The wallet data was successfully saved to the new location.</source>
+ <location line="+3"/>
+ <source>Information</source>
<translation type="unfinished"/>
</message>
- <message numerus="yes">
- <location line="-338"/>
- <source>%n second(s) ago</source>
- <translation><numerusform>пре %n Ñекунд</numerusform><numerusform>пре %n Ñекунде</numerusform><numerusform>пре %n Ñекунди</numerusform></translation>
- </message>
- <message numerus="yes">
- <location line="+4"/>
- <source>%n minute(s) ago</source>
- <translation><numerusform>пре %n минут</numerusform><numerusform>пре %n минута</numerusform><numerusform>пре %n минута</numerusform></translation>
- </message>
- <message numerus="yes">
- <location line="+4"/>
- <source>%n hour(s) ago</source>
- <translation><numerusform>пре %n Ñат</numerusform><numerusform>пре %n Ñата</numerusform><numerusform>пре %n Ñати</numerusform></translation>
- </message>
- <message numerus="yes">
- <location line="+4"/>
- <source>%n day(s) ago</source>
- <translation><numerusform>пре %n дан</numerusform><numerusform>пре %n дана</numerusform><numerusform>пре %n дана</numerusform></translation>
+ <message>
+ <location line="+68"/>
+ <source>This transaction is over the size limit. You can still send it for a fee of %1, which goes to the nodes that process your transaction and helps to support the network. Do you want to pay the fee?</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location line="+6"/>
+ <location line="-138"/>
<source>Up to date</source>
<translation>Ðжурно</translation>
</message>
<message>
- <location line="+7"/>
+ <location line="+32"/>
<source>Catching up...</source>
<translation>Ðжурирање у току...</translation>
</message>
<message>
- <location line="+10"/>
- <source>Last received block was generated %1.</source>
- <translation>ПоÑледњи примљени блок је направљен %1.</translation>
- </message>
- <message>
- <location line="+97"/>
+ <location line="+110"/>
<source>Confirm transaction fee</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+23"/>
+ <location line="+8"/>
<source>Sent transaction</source>
<translation>ПоÑлана транÑакција</translation>
</message>
@@ -631,17 +631,17 @@ Amount: %2
Type: %3
Address: %4
</source>
- <translation type="unfinished"/>
+ <translation>Datum: %1⎠Iznos: %2⎠Tip: %3⎠Adresa: %4âŽ</translation>
</message>
<message>
- <location line="+99"/>
- <location line="+28"/>
+ <location line="+33"/>
+ <location line="+23"/>
<source>URI handling</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-28"/>
- <location line="+28"/>
+ <location line="-23"/>
+ <location line="+23"/>
<source>URI can not be parsed! This can be caused by an invalid Bitcoin address or malformed URI parameters.</source>
<translation type="unfinished"/>
</message>
@@ -656,27 +656,7 @@ Address: %4
<translation>Ðовчаник Ñ˜Ñ &lt;b&gt;шифрован&lt;/b&gt; и тренутно &lt;b&gt;закључан&lt;/b&gt;</translation>
</message>
<message>
- <location line="+23"/>
- <source>Backup Wallet</source>
- <translation>Backup новчаника</translation>
- </message>
- <message>
- <location line="+0"/>
- <source>Wallet Data (*.dat)</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+3"/>
- <source>Backup Failed</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+0"/>
- <source>There was an error trying to save the wallet data to the new location.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../bitcoin.cpp" line="+109"/>
+ <location filename="../bitcoin.cpp" line="+108"/>
<source>A fatal error occurred. Bitcoin can no longer continue safely and will quit.</source>
<translation type="unfinished"/>
</message>
@@ -684,7 +664,7 @@ Address: %4
<context>
<name>ClientModel</name>
<message>
- <location filename="../clientmodel.cpp" line="+86"/>
+ <location filename="../clientmodel.cpp" line="+96"/>
<source>Network Alert</source>
<translation type="unfinished"/>
</message>
@@ -694,7 +674,7 @@ Address: %4
<message>
<location filename="../forms/editaddressdialog.ui" line="+14"/>
<source>Edit Address</source>
- <translation type="unfinished"/>
+ <translation>Измени адреÑу</translation>
</message>
<message>
<location line="+11"/>
@@ -717,7 +697,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location filename="../editaddressdialog.cpp" line="+20"/>
+ <location filename="../editaddressdialog.cpp" line="+21"/>
<source>New receiving address</source>
<translation type="unfinished"/>
</message>
@@ -737,17 +717,17 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+60"/>
+ <location line="+76"/>
<source>The entered address &quot;%1&quot; is already in the address book.</source>
- <translation type="unfinished"/>
+ <translation>Унешена адреÑа &quot;%1&quot; Ñе већ налази у адреÑару.</translation>
</message>
<message>
- <location line="+5"/>
+ <location line="-5"/>
<source>The entered address &quot;%1&quot; is not a valid Bitcoin address.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+5"/>
+ <location line="+10"/>
<source>Could not unlock wallet.</source>
<translation>Ðемогуће откључати новчаник.</translation>
</message>
@@ -760,7 +740,7 @@ Address: %4
<context>
<name>GUIUtil::HelpMessageBox</name>
<message>
- <location filename="../guiutil.cpp" line="+419"/>
+ <location filename="../guiutil.cpp" line="+422"/>
<location line="+12"/>
<source>Bitcoin-Qt</source>
<translation type="unfinished"/>
@@ -773,7 +753,7 @@ Address: %4
<message>
<location line="+2"/>
<source>Usage:</source>
- <translation type="unfinished"/>
+ <translation>Korišćenje:</translation>
</message>
<message>
<location line="+1"/>
@@ -974,7 +954,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location filename="../optionsdialog.cpp" line="+55"/>
+ <location filename="../optionsdialog.cpp" line="+53"/>
<source>default</source>
<translation type="unfinished"/>
</message>
@@ -1016,28 +996,23 @@ Address: %4
<message>
<location filename="../forms/overviewpage.ui" line="+14"/>
<source>Form</source>
- <translation type="unfinished"/>
+ <translation>Форма</translation>
</message>
<message>
- <location line="+51"/>
- <location line="+183"/>
+ <location line="+50"/>
+ <location line="+166"/>
<source>The displayed information may be out of date. Your wallet automatically synchronizes with the Bitcoin network after a connection is established, but this process has not completed yet.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-141"/>
+ <location line="-124"/>
<source>Balance:</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+58"/>
- <source>Number of transactions:</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="-29"/>
+ <location line="+29"/>
<source>Unconfirmed:</source>
- <translation type="unfinished"/>
+ <translation>Ðепотврђено:</translation>
</message>
<message>
<location line="-78"/>
@@ -1045,7 +1020,7 @@ Address: %4
<translation>новчаник</translation>
</message>
<message>
- <location line="+124"/>
+ <location line="+107"/>
<source>Immature:</source>
<translation type="unfinished"/>
</message>
@@ -1057,10 +1032,10 @@ Address: %4
<message>
<location line="+46"/>
<source>&lt;b&gt;Recent transactions&lt;/b&gt;</source>
- <translation type="unfinished"/>
+ <translation>&lt;b&gt;Ðедавне транÑакције&lt;/b&gt;</translation>
</message>
<message>
- <location line="-118"/>
+ <location line="-101"/>
<source>Your current balance</source>
<translation type="unfinished"/>
</message>
@@ -1070,11 +1045,6 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+20"/>
- <source>Total number of transactions in wallet</source>
- <translation>Укупан број транÑакција у новчанику</translation>
- </message>
- <message>
<location filename="../overviewpage.cpp" line="+115"/>
<location line="+1"/>
<source>out of sync</source>
@@ -1082,6 +1052,14 @@ Address: %4
</message>
</context>
<context>
+ <name>PaymentServer</name>
+ <message>
+ <location filename="../paymentserver.cpp" line="+107"/>
+ <source>Cannot start bitcoin: click-to-pay handler</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>QRCodeDialog</name>
<message>
<location filename="../forms/qrcodedialog.ui" line="+14"/>
@@ -1091,12 +1069,12 @@ Address: %4
<message>
<location line="+59"/>
<source>Request Payment</source>
- <translation type="unfinished"/>
+ <translation>Zatraži isplatu</translation>
</message>
<message>
<location line="+56"/>
<source>Amount:</source>
- <translation type="unfinished"/>
+ <translation>Iznos:</translation>
</message>
<message>
<location line="-44"/>
@@ -1106,12 +1084,12 @@ Address: %4
<message>
<location line="+19"/>
<source>Message:</source>
- <translation type="unfinished"/>
+ <translation>Poruka:</translation>
</message>
<message>
<location line="+71"/>
<source>&amp;Save As...</source>
- <translation type="unfinished"/>
+ <translation>&amp;Snimi kao...</translation>
</message>
<message>
<location filename="../qrcodedialog.cpp" line="+62"/>
@@ -1313,7 +1291,7 @@ Address: %4
<message>
<location line="+20"/>
<source>Remove all transaction fields</source>
- <translation type="unfinished"/>
+ <translation>Ukloni sva polja sa transakcijama</translation>
</message>
<message>
<location line="+3"/>
@@ -1333,7 +1311,7 @@ Address: %4
<message>
<location line="+31"/>
<source>Confirm the send action</source>
- <translation type="unfinished"/>
+ <translation>Потврди акцију Ñлања</translation>
</message>
<message>
<location line="+3"/>
@@ -1358,7 +1336,7 @@ Address: %4
<message>
<location line="+0"/>
<source> and </source>
- <translation type="unfinished"/>
+ <translation>и</translation>
</message>
<message>
<location line="+23"/>
@@ -1401,7 +1379,7 @@ Address: %4
<message>
<location filename="../forms/sendcoinsentry.ui" line="+14"/>
<source>Form</source>
- <translation type="unfinished"/>
+ <translation>Форма</translation>
</message>
<message>
<location line="+15"/>
@@ -1420,7 +1398,7 @@ Address: %4
</message>
<message>
<location line="+60"/>
- <location filename="../sendcoinsentry.cpp" line="+25"/>
+ <location filename="../sendcoinsentry.cpp" line="+26"/>
<source>Enter a label for this address to add it to your address book</source>
<translation type="unfinished"/>
</message>
@@ -1432,7 +1410,7 @@ Address: %4
<message>
<location line="+28"/>
<source>Choose address from address book</source>
- <translation type="unfinished"/>
+ <translation>Izaberite adresu iz adresara</translation>
</message>
<message>
<location line="+10"/>
@@ -1457,7 +1435,7 @@ Address: %4
<message>
<location filename="../sendcoinsentry.cpp" line="+1"/>
<source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
- <translation type="unfinished"/>
+ <translation>Unesite Bitcoin adresu (n.pr. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation>
</message>
</context>
<context>
@@ -1574,7 +1552,7 @@ Address: %4
<location filename="../signverifymessagedialog.cpp" line="+27"/>
<location line="+3"/>
<source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
- <translation type="unfinished"/>
+ <translation>Unesite Bitcoin adresu (n.pr. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation>
</message>
<message>
<location line="-2"/>
@@ -1656,9 +1634,9 @@ Address: %4
<context>
<name>TransactionDesc</name>
<message>
- <location filename="../transactiondesc.cpp" line="+19"/>
+ <location filename="../transactiondesc.cpp" line="+20"/>
<source>Open until %1</source>
- <translation type="unfinished"/>
+ <translation>Otvorite do %1</translation>
</message>
<message>
<location line="+6"/>
@@ -1668,12 +1646,12 @@ Address: %4
<message>
<location line="+2"/>
<source>%1/unconfirmed</source>
- <translation type="unfinished"/>
+ <translation>%1/nepotvrdjeno</translation>
</message>
<message>
<location line="+2"/>
<source>%1 confirmations</source>
- <translation type="unfinished"/>
+ <translation>%1 potvrde</translation>
</message>
<message>
<location line="+18"/>
@@ -1688,7 +1666,7 @@ Address: %4
<message>
<location line="+4"/>
<source>Date</source>
- <translation type="unfinished"/>
+ <translation>datum</translation>
</message>
<message>
<location line="+7"/>
@@ -1799,7 +1777,7 @@ Address: %4
<message>
<location line="+23"/>
<source>Amount</source>
- <translation type="unfinished"/>
+ <translation>iznos</translation>
</message>
<message>
<location line="+1"/>
@@ -1814,7 +1792,7 @@ Address: %4
<message>
<location line="-209"/>
<source>, has not been successfully broadcast yet</source>
- <translation type="unfinished"/>
+ <translation>, nije još uvek uspešno emitovan</translation>
</message>
<message numerus="yes">
<location line="-35"/>
@@ -1824,7 +1802,7 @@ Address: %4
<message>
<location line="+70"/>
<source>unknown</source>
- <translation type="unfinished"/>
+ <translation>nepoznato</translation>
</message>
</context>
<context>
@@ -1832,25 +1810,25 @@ Address: %4
<message>
<location filename="../forms/transactiondescdialog.ui" line="+14"/>
<source>Transaction details</source>
- <translation type="unfinished"/>
+ <translation>detalji transakcije</translation>
</message>
<message>
<location line="+6"/>
<source>This pane shows a detailed description of the transaction</source>
- <translation type="unfinished"/>
+ <translation>Ovaj odeljak pokazuje detaljan opis transakcije</translation>
</message>
</context>
<context>
<name>TransactionTableModel</name>
<message>
- <location filename="../transactiontablemodel.cpp" line="+226"/>
+ <location filename="../transactiontablemodel.cpp" line="+225"/>
<source>Date</source>
- <translation type="unfinished"/>
+ <translation>datum</translation>
</message>
<message>
<location line="+0"/>
<source>Type</source>
- <translation type="unfinished"/>
+ <translation>tip</translation>
</message>
<message>
<location line="+0"/>
@@ -1860,7 +1838,7 @@ Address: %4
<message>
<location line="+0"/>
<source>Amount</source>
- <translation type="unfinished"/>
+ <translation>iznos</translation>
</message>
<message numerus="yes">
<location line="+57"/>
@@ -1870,22 +1848,22 @@ Address: %4
<message>
<location line="+3"/>
<source>Open until %1</source>
- <translation type="unfinished"/>
+ <translation>Otvoreno do %1</translation>
</message>
<message>
<location line="+3"/>
<source>Offline (%1 confirmations)</source>
- <translation type="unfinished"/>
+ <translation>Offline * van mreže (%1 potvrdjenih)</translation>
</message>
<message>
<location line="+3"/>
<source>Unconfirmed (%1 of %2 confirmations)</source>
- <translation type="unfinished"/>
+ <translation>Nepotvrdjeno (%1 of %2 potvrdjenih)</translation>
</message>
<message>
<location line="+3"/>
<source>Confirmed (%1 confirmations)</source>
- <translation type="unfinished"/>
+ <translation>Potvrdjena (%1 potvrdjenih)</translation>
</message>
<message numerus="yes">
<location line="+8"/>
@@ -1895,161 +1873,166 @@ Address: %4
<message>
<location line="+5"/>
<source>This block was not received by any other nodes and will probably not be accepted!</source>
- <translation type="unfinished"/>
+ <translation>Ovaj blok nije primljen od ostalih Ävorova (nodova) i verovatno neće biti prihvaćen!</translation>
</message>
<message>
<location line="+3"/>
<source>Generated but not accepted</source>
- <translation type="unfinished"/>
+ <translation>Generisan ali nije prihvaćen</translation>
</message>
<message>
<location line="+43"/>
<source>Received with</source>
- <translation type="unfinished"/>
+ <translation>Primljen sa</translation>
</message>
<message>
<location line="+2"/>
<source>Received from</source>
- <translation type="unfinished"/>
+ <translation>Primljeno od</translation>
</message>
<message>
<location line="+3"/>
<source>Sent to</source>
- <translation type="unfinished"/>
+ <translation>Poslat ka</translation>
</message>
<message>
<location line="+2"/>
<source>Payment to yourself</source>
- <translation type="unfinished"/>
+ <translation>Isplata samom sebi</translation>
</message>
<message>
<location line="+2"/>
<source>Mined</source>
- <translation type="unfinished"/>
+ <translation>Minirano</translation>
</message>
<message>
<location line="+38"/>
<source>(n/a)</source>
- <translation type="unfinished"/>
+ <translation>(n/a)</translation>
</message>
<message>
<location line="+199"/>
<source>Transaction status. Hover over this field to show number of confirmations.</source>
- <translation type="unfinished"/>
+ <translation>Status vaše transakcije. Predjite mišem preko ovog polja da bi ste videli broj konfirmacija</translation>
</message>
<message>
<location line="+2"/>
<source>Date and time that the transaction was received.</source>
- <translation type="unfinished"/>
+ <translation>Datum i vreme primljene transakcije.</translation>
</message>
<message>
<location line="+2"/>
<source>Type of transaction.</source>
- <translation type="unfinished"/>
+ <translation>Tip transakcije</translation>
</message>
<message>
<location line="+2"/>
<source>Destination address of transaction.</source>
- <translation type="unfinished"/>
+ <translation>Destinacija i adresa transakcije</translation>
</message>
<message>
<location line="+2"/>
<source>Amount removed from or added to balance.</source>
- <translation type="unfinished"/>
+ <translation>Iznos odbijen ili dodat balansu.</translation>
</message>
</context>
<context>
<name>TransactionView</name>
<message>
- <location filename="../transactionview.cpp" line="+55"/>
+ <location filename="../transactionview.cpp" line="+52"/>
<location line="+16"/>
<source>All</source>
- <translation type="unfinished"/>
+ <translation>Sve</translation>
</message>
<message>
<location line="-15"/>
<source>Today</source>
- <translation type="unfinished"/>
+ <translation>Danas</translation>
</message>
<message>
<location line="+1"/>
<source>This week</source>
- <translation type="unfinished"/>
+ <translation>ove nedelje</translation>
</message>
<message>
<location line="+1"/>
<source>This month</source>
- <translation type="unfinished"/>
+ <translation>Ovog meseca</translation>
</message>
<message>
<location line="+1"/>
<source>Last month</source>
- <translation type="unfinished"/>
+ <translation>Prošlog meseca</translation>
</message>
<message>
<location line="+1"/>
<source>This year</source>
- <translation type="unfinished"/>
+ <translation>Ove godine</translation>
</message>
<message>
<location line="+1"/>
<source>Range...</source>
- <translation type="unfinished"/>
+ <translation>Opseg...</translation>
</message>
<message>
<location line="+11"/>
<source>Received with</source>
- <translation type="unfinished"/>
+ <translation>Primljen sa</translation>
</message>
<message>
<location line="+2"/>
<source>Sent to</source>
- <translation type="unfinished"/>
+ <translation>Poslat ka</translation>
</message>
<message>
<location line="+2"/>
<source>To yourself</source>
- <translation type="unfinished"/>
+ <translation>Vama - samom sebi</translation>
</message>
<message>
<location line="+1"/>
<source>Mined</source>
- <translation type="unfinished"/>
+ <translation>Minirano</translation>
</message>
<message>
<location line="+1"/>
<source>Other</source>
- <translation type="unfinished"/>
+ <translation>Drugi</translation>
</message>
<message>
<location line="+7"/>
<source>Enter address or label to search</source>
- <translation type="unfinished"/>
+ <translation>Navedite adresu ili naziv koji bi ste potražili</translation>
</message>
<message>
<location line="+7"/>
<source>Min amount</source>
- <translation type="unfinished"/>
+ <translation>Min iznos</translation>
</message>
<message>
<location line="+34"/>
<source>Copy address</source>
- <translation type="unfinished"/>
+ <translation>kopiraj adresu</translation>
</message>
<message>
<location line="+1"/>
<source>Copy label</source>
- <translation type="unfinished"/>
+ <translation>kopiraj naziv</translation>
</message>
<message>
<location line="+1"/>
<source>Copy amount</source>
+ <translation>kopiraj iznos</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy transaction ID</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+1"/>
<source>Edit label</source>
- <translation type="unfinished"/>
+ <translation>promeni naziv</translation>
</message>
<message>
<location line="+1"/>
@@ -2057,9 +2040,9 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+142"/>
+ <location line="+139"/>
<source>Export Transaction Data</source>
- <translation type="unfinished"/>
+ <translation>Izvezi podatke o transakcijama</translation>
</message>
<message>
<location line="+1"/>
@@ -2069,17 +2052,17 @@ Address: %4
<message>
<location line="+8"/>
<source>Confirmed</source>
- <translation type="unfinished"/>
+ <translation>Potvrdjen</translation>
</message>
<message>
<location line="+1"/>
<source>Date</source>
- <translation type="unfinished"/>
+ <translation>datum</translation>
</message>
<message>
<location line="+1"/>
<source>Type</source>
- <translation type="unfinished"/>
+ <translation>tip</translation>
</message>
<message>
<location line="+1"/>
@@ -2094,7 +2077,7 @@ Address: %4
<message>
<location line="+1"/>
<source>Amount</source>
- <translation type="unfinished"/>
+ <translation>iznos</translation>
</message>
<message>
<location line="+1"/>
@@ -2112,72 +2095,216 @@ Address: %4
<translation>Ðије могуће пиÑати у фајл %1.</translation>
</message>
<message>
- <location line="+95"/>
+ <location line="+100"/>
<source>Range:</source>
- <translation type="unfinished"/>
+ <translation>Opseg:</translation>
</message>
<message>
<location line="+8"/>
<source>to</source>
+ <translation>do</translation>
+ </message>
+</context>
+<context>
+ <name>WalletView</name>
+ <message>
+ <location filename="../walletview.cpp" line="+95"/>
+ <source>&amp;Overview</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Show general overview of wallet</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>&amp;Send coins</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Send coins to a Bitcoin address</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>&amp;Receive coins</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Show the list of addresses for receiving payments</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>&amp;Transactions</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Browse transaction history</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>&amp;Address Book</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Edit the list of stored addresses and labels</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+12"/>
+ <source>&amp;Encrypt Wallet...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Encrypt the private keys that belong to your wallet</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>&amp;Backup Wallet...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Backup wallet to another location</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>&amp;Change Passphrase...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Change the passphrase used for wallet encryption</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Sign &amp;message...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Sign messages with your Bitcoin addresses to prove you own them</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>&amp;Verify message...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Verify messages to ensure they were signed with specified Bitcoin addresses</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>&amp;Export...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Export the data in the current tab to a file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+180"/>
+ <source>Backup Wallet</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>Wallet Data (*.dat)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Backup Failed</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>There was an error trying to save the wallet data to the new location.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>Backup Successful</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>The wallet data was successfully saved to the new location.</source>
<translation type="unfinished"/>
</message>
</context>
<context>
<name>bitcoin-core</name>
<message>
- <location filename="../bitcoinstrings.cpp" line="+88"/>
+ <location filename="../bitcoinstrings.cpp" line="+96"/>
<source>Bitcoin version</source>
<translation>Bitcoin верзија</translation>
</message>
<message>
- <location line="+82"/>
+ <location line="+98"/>
<source>Usage:</source>
- <translation type="unfinished"/>
+ <translation>Korišćenje:</translation>
</message>
<message>
- <location line="-23"/>
+ <location line="-24"/>
<source>Send command to -server or bitcoind</source>
- <translation type="unfinished"/>
+ <translation>Pošalji naredbu na -server ili bitcoinid
+</translation>
</message>
<message>
- <location line="-21"/>
+ <location line="-22"/>
<source>List commands</source>
- <translation type="unfinished"/>
+ <translation>Listaj komande</translation>
</message>
<message>
- <location line="-11"/>
+ <location line="-10"/>
<source>Get help for a command</source>
- <translation type="unfinished"/>
+ <translation>Zatraži pomoć za komande</translation>
</message>
<message>
<location line="+21"/>
<source>Options:</source>
- <translation>ПоÑтавке</translation>
+ <translation>Opcije</translation>
</message>
<message>
<location line="+22"/>
<source>Specify configuration file (default: bitcoin.conf)</source>
- <translation type="unfinished"/>
+ <translation>Potvrdi željeni konfiguracioni fajl (podrazumevani:bitcoin.conf)</translation>
</message>
<message>
<location line="+3"/>
<source>Specify pid file (default: bitcoind.pid)</source>
- <translation type="unfinished"/>
+ <translation>Konkretizuj pid fajl (podrazumevani: bitcoind.pid)</translation>
</message>
<message>
<location line="-47"/>
<source>Generate coins</source>
- <translation type="unfinished"/>
+ <translation>GeneriÅ¡i novÄiće</translation>
</message>
<message>
- <location line="-15"/>
+ <location line="-28"/>
<source>Don&apos;t generate coins</source>
- <translation type="unfinished"/>
+ <translation>Ne generiÅ¡i novÄiće</translation>
</message>
<message>
- <location line="+61"/>
+ <location line="+74"/>
<source>Specify data directory</source>
- <translation type="unfinished"/>
+ <translation>Gde je konkretni data direktorijum </translation>
</message>
<message>
<location line="-7"/>
@@ -2185,80 +2312,83 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="-26"/>
+ <location line="-27"/>
<source>Listen for connections on &lt;port&gt; (default: 8333 or testnet: 18333)</source>
- <translation type="unfinished"/>
+ <translation>Slušaj konekcije na &lt;port&gt; (default: 8333 or testnet: 18333)</translation>
</message>
<message>
- <location line="+4"/>
+ <location line="+5"/>
<source>Maintain at most &lt;n&gt; connections to peers (default: 125)</source>
- <translation type="unfinished"/>
+ <translation>Održavaj najviÅ¡e &lt;n&gt; konekcija po prikljuÄku (default: 125)
+</translation>
</message>
<message>
- <location line="-34"/>
+ <location line="-49"/>
<source>Connect to a node to retrieve peer addresses, and disconnect</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+65"/>
+ <location line="+80"/>
<source>Specify your own public address</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+2"/>
+ <location line="+3"/>
<source>Threshold for disconnecting misbehaving peers (default: 100)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-114"/>
+ <location line="-132"/>
<source>Number of seconds to keep misbehaving peers from reconnecting (default: 86400)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-28"/>
+ <location line="-32"/>
<source>An error occurred while setting up the RPC port %u for listening on IPv4: %s</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+26"/>
+ <location line="+30"/>
<source>Listen for JSON-RPC connections on &lt;port&gt; (default: 8332 or testnet: 18332)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+34"/>
+ <location line="+36"/>
<source>Accept command line and JSON-RPC commands</source>
- <translation type="unfinished"/>
+ <translation>Prihvati komandnu liniju i JSON-RPC komande</translation>
</message>
<message>
- <location line="+62"/>
+ <location line="+77"/>
<source>Run in the background as a daemon and accept commands</source>
- <translation type="unfinished"/>
+ <translation>Radi u pozadini kao daemon servis i prihvati komande</translation>
</message>
<message>
- <location line="+31"/>
+ <location line="+32"/>
<source>Use the test network</source>
- <translation type="unfinished"/>
+ <translation>Koristi testnu mrežu</translation>
</message>
<message>
- <location line="-92"/>
+ <location line="-108"/>
<source>Accept connections from outside (default: 1 if no -proxy or -connect)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-74"/>
+ <location line="-82"/>
<source>%s, you must set a rpcpassword in the configuration file:
- %s
+%s
It is recommended you use the following random password:
rpcuser=bitcoinrpc
rpcpassword=%s
(you do not need to remember this password)
The username and password MUST NOT be the same.
If the file does not exist, create it with owner-readable-only file permissions.
+It is also recommended to set alertnotify so you are notified of problems;
+for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.com
</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+15"/>
+ <location line="+17"/>
<source>An error occurred while setting up the RPC port %u for listening on IPv6, falling back to IPv4: %s</source>
<translation type="unfinished"/>
</message>
@@ -2274,11 +2404,6 @@ If the file does not exist, create it with owner-readable-only file permissions.
</message>
<message>
<location line="+3"/>
- <source>Corrupted block database detected. Please restart the client with -reindex.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+2"/>
<source>Error initializing database environment %s! To recover, BACKUP THAT DIRECTORY, then remove everything from it except for wallet.dat.</source>
<translation type="unfinished"/>
</message>
@@ -2293,12 +2418,27 @@ If the file does not exist, create it with owner-readable-only file permissions.
<translation type="unfinished"/>
</message>
<message>
+ <location line="+3"/>
+ <source>Execute command when a relevant alert is received (%s in cmd is replaced by message)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Execute command when a wallet transaction changes (%s in cmd is replaced by TxID)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location line="+11"/>
<source>Set maximum size of high-priority/low-fee transactions in bytes (default: 27000)</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+3"/>
+ <source>Set the number of script verification threads (1-16, 0=auto, default: 0)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
<source>This is a pre-release test build - use at your own risk - do not use for mining or merchant applications</source>
<translation type="unfinished"/>
</message>
@@ -2344,16 +2484,41 @@ If the file does not exist, create it with owner-readable-only file permissions.
</message>
<message>
<location line="+3"/>
+ <source>Corrupted block database detected</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Discover own IP address (default: 1 when listening and no -externalip)</source>
<translation type="unfinished"/>
</message>
<message>
+ <location line="+1"/>
+ <source>Do you want to rebuild the block database now?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location line="+3"/>
+ <source>Error initializing block database</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Error initializing wallet database environment %s!</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Error loading block database</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+5"/>
+ <location line="+4"/>
+ <source>Error opening block database</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
<source>Error: Disk space is low!</source>
<translation type="unfinished"/>
</message>
@@ -2369,26 +2534,96 @@ If the file does not exist, create it with owner-readable-only file permissions.
</message>
<message>
<location line="+2"/>
+ <source>Error: system error: </source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Failed to listen on any port. Use -listen=0 if you want this.</source>
<translation type="unfinished"/>
</message>
<message>
+ <location line="+1"/>
+ <source>Failed to read block info</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Failed to read block</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Failed to sync block index</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Failed to write block index</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Failed to write block info</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Failed to write block</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Failed to write file info</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Failed to write to coin database</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Failed to write transaction index</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Failed to write undo data</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location line="+2"/>
<source>Find peers using DNS lookup (default: 1 unless -connect)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+5"/>
- <source>How thorough the block verification is (0-4, default: 3)</source>
+ <location line="+3"/>
+ <source>How many blocks to check at startup (default: 288, 0 = all)</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+1"/>
- <source>Importing blocks from block database...</source>
+ <source>How thorough the block verification is (0-4, default: 3)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+24"/>
+ <source>Rebuild block chain index from current blk000??.dat files</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+37"/>
+ <source>Verifying blocks...</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+1"/>
+ <source>Verifying wallet...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-61"/>
<source>Imports blocks from external blk000??.dat file</source>
<translation type="unfinished"/>
</message>
@@ -2403,7 +2638,12 @@ If the file does not exist, create it with owner-readable-only file permissions.
<translation type="unfinished"/>
</message>
<message>
- <location line="+9"/>
+ <location line="+8"/>
+ <source>Maintain a full transaction index (default: 0)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
<source>Maximum per-connection receive buffer, &lt;n&gt;*1000 bytes (default: 5000)</source>
<translation type="unfinished"/>
</message>
@@ -2438,12 +2678,7 @@ If the file does not exist, create it with owner-readable-only file permissions.
<translation type="unfinished"/>
</message>
<message>
- <location line="+1"/>
- <source>Rebuild blockchain index from current blk000??.dat files</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+4"/>
+ <location line="+5"/>
<source>SSL options: (see the Bitcoin Wiki for SSL setup instructions)</source>
<translation type="unfinished"/>
</message>
@@ -2483,7 +2718,12 @@ If the file does not exist, create it with owner-readable-only file permissions.
<translation type="unfinished"/>
</message>
<message>
- <location line="+13"/>
+ <location line="+4"/>
+ <source>System error: </source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+10"/>
<source>Use UPnP to map the listening port (default: 0)</source>
<translation type="unfinished"/>
</message>
@@ -2500,7 +2740,7 @@ If the file does not exist, create it with owner-readable-only file permissions.
<message>
<location line="+2"/>
<source>Username for JSON-RPC connections</source>
- <translation type="unfinished"/>
+ <translation>KorisniÄko ime za JSON-RPC konekcije</translation>
</message>
<message>
<location line="+4"/>
@@ -2514,73 +2754,73 @@ If the file does not exist, create it with owner-readable-only file permissions.
</message>
<message>
<location line="+1"/>
+ <source>You need to rebuild the databases using -reindex to change -txindex</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>wallet.dat corrupt, salvage failed</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-43"/>
+ <location line="-45"/>
<source>Password for JSON-RPC connections</source>
- <translation type="unfinished"/>
+ <translation>Lozinka za JSON-RPC konekcije</translation>
</message>
<message>
- <location line="-53"/>
+ <location line="-68"/>
<source>Allow JSON-RPC connections from specified IP address</source>
- <translation type="unfinished"/>
+ <translation>Dozvoli JSON-RPC konekcije sa posebne IP adrese</translation>
</message>
<message>
- <location line="+62"/>
+ <location line="+77"/>
<source>Send commands to node running on &lt;ip&gt; (default: 127.0.0.1)</source>
- <translation type="unfinished"/>
+ <translation>Pošalji komande to nodu koji radi na &lt;ip&gt; (default: 127.0.0.1)</translation>
</message>
<message>
- <location line="-103"/>
+ <location line="-120"/>
<source>Execute command when the best block changes (%s in cmd is replaced by block hash)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+124"/>
+ <location line="+142"/>
<source>Upgrade wallet to latest format</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-15"/>
+ <location line="-16"/>
<source>Set key pool size to &lt;n&gt; (default: 100)</source>
- <translation type="unfinished"/>
+ <translation>Odredi veliÄinu zaÅ¡tićenih kljuÄeva na &lt;n&gt; (default: 100)</translation>
</message>
<message>
<location line="-12"/>
<source>Rescan the block chain for missing wallet transactions</source>
- <translation type="unfinished"/>
+ <translation>Ponovo skeniraj lanac blokova za nedostajuće transakcije iz novÄanika</translation>
</message>
<message>
- <location line="-26"/>
- <source>How many blocks to check at startup (default: 2500, 0 = all)</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+55"/>
+ <location line="+30"/>
<source>Use OpenSSL (https) for JSON-RPC connections</source>
- <translation type="unfinished"/>
+ <translation>Koristi OpenSSL (https) za JSON-RPC konekcije</translation>
</message>
<message>
- <location line="-20"/>
+ <location line="-21"/>
<source>Server certificate file (default: server.cert)</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+1"/>
<source>Server private key (default: server.pem)</source>
- <translation type="unfinished"/>
+ <translation>privatni kljuÄ za Server (podrazumevan: server.pem)</translation>
</message>
<message>
- <location line="-133"/>
+ <location line="-154"/>
<source>Acceptable ciphers (default: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH)</source>
- <translation type="unfinished"/>
+ <translation>Prihvatljive cifre (podrazumevano: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH)</translation>
</message>
<message>
- <location line="+144"/>
+ <location line="+166"/>
<source>This help message</source>
- <translation type="unfinished"/>
+ <translation>Ova poruka Pomoći</translation>
</message>
<message>
<location line="+3"/>
@@ -2588,7 +2828,7 @@ If the file does not exist, create it with owner-readable-only file permissions.
<translation type="unfinished"/>
</message>
<message>
- <location line="-70"/>
+ <location line="-86"/>
<source>Connect through socks proxy</source>
<translation type="unfinished"/>
</message>
@@ -2598,12 +2838,12 @@ If the file does not exist, create it with owner-readable-only file permissions.
<translation type="unfinished"/>
</message>
<message>
- <location line="+43"/>
+ <location line="+57"/>
<source>Loading addresses...</source>
- <translation type="unfinished"/>
+ <translation>uÄitavam adrese....</translation>
</message>
<message>
- <location line="-25"/>
+ <location line="-35"/>
<source>Error loading wallet.dat: Wallet corrupted</source>
<translation type="unfinished"/>
</message>
@@ -2613,32 +2853,22 @@ If the file does not exist, create it with owner-readable-only file permissions.
<translation type="unfinished"/>
</message>
<message>
- <location line="+73"/>
- <source>Verifying block database integrity...</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+1"/>
- <source>Verifying wallet integrity...</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+1"/>
+ <location line="+87"/>
<source>Wallet needed to be rewritten: restart Bitcoin to complete</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-77"/>
+ <location line="-89"/>
<source>Error loading wallet.dat</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+20"/>
+ <location line="+30"/>
<source>Invalid -proxy address: &apos;%s&apos;</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+46"/>
+ <location line="+48"/>
<source>Unknown network specified in -onlynet: &apos;%s&apos;</source>
<translation type="unfinished"/>
</message>
@@ -2648,7 +2878,7 @@ If the file does not exist, create it with owner-readable-only file permissions.
<translation type="unfinished"/>
</message>
<message>
- <location line="-75"/>
+ <location line="-91"/>
<source>Cannot resolve -bind address: &apos;%s&apos;</source>
<translation type="unfinished"/>
</message>
@@ -2658,17 +2888,17 @@ If the file does not exist, create it with owner-readable-only file permissions.
<translation type="unfinished"/>
</message>
<message>
- <location line="+31"/>
+ <location line="+45"/>
<source>Invalid amount for -paytxfee=&lt;amount&gt;: &apos;%s&apos;</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-15"/>
+ <location line="-24"/>
<source>Error: could not start node</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+16"/>
+ <location line="+25"/>
<source>Invalid amount</source>
<translation type="unfinished"/>
</message>
@@ -2680,10 +2910,10 @@ If the file does not exist, create it with owner-readable-only file permissions.
<message>
<location line="+8"/>
<source>Loading block index...</source>
- <translation type="unfinished"/>
+ <translation>UÄitavam blok indeksa...</translation>
</message>
<message>
- <location line="-45"/>
+ <location line="-59"/>
<source>Add a node to connect to and attempt to keep the connection open</source>
<translation type="unfinished"/>
</message>
@@ -2693,22 +2923,17 @@ If the file does not exist, create it with owner-readable-only file permissions.
<translation type="unfinished"/>
</message>
<message>
- <location line="+54"/>
- <source>Find peers using internet relay chat (default: 0)</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="-2"/>
+ <location line="+68"/>
<source>Fee per KB to add to transactions you send</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+19"/>
+ <location line="+17"/>
<source>Loading wallet...</source>
<translation>Ðовчаник Ñе учитава...</translation>
</message>
<message>
- <location line="-40"/>
+ <location line="-54"/>
<source>Cannot downgrade wallet</source>
<translation type="unfinished"/>
</message>
@@ -2723,27 +2948,27 @@ If the file does not exist, create it with owner-readable-only file permissions.
<translation type="unfinished"/>
</message>
<message>
- <location line="+49"/>
+ <location line="+64"/>
<source>Rescanning...</source>
- <translation type="unfinished"/>
+ <translation>Ponovo skeniram...</translation>
</message>
<message>
- <location line="-43"/>
+ <location line="-56"/>
<source>Done loading</source>
- <translation type="unfinished"/>
+ <translation>ZavrÅ¡eno uÄitavanje</translation>
</message>
<message>
- <location line="+65"/>
+ <location line="+79"/>
<source>To use the %s option</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-60"/>
+ <location line="-71"/>
<source>Error</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-28"/>
+ <location line="-33"/>
<source>You must set rpcpassword=&lt;password&gt; in the configuration file:
%s
If the file does not exist, create it with owner-readable-only file permissions.</source>
diff --git a/src/qt/locale/bitcoin_sv.ts b/src/qt/locale/bitcoin_sv.ts
index 88ad923c77..58a318423f 100644
--- a/src/qt/locale/bitcoin_sv.ts
+++ b/src/qt/locale/bitcoin_sv.ts
@@ -13,12 +13,7 @@
<translation>&lt;b&gt;Bitcoin&lt;/b&gt;-version</translation>
</message>
<message>
- <location line="+41"/>
- <source>Copyright © 2009-2012 The Bitcoin developers</source>
- <translation>Copyright © 2009-2012 Bitcoin-utvecklarna</translation>
- </message>
- <message>
- <location line="+13"/>
+ <location line="+57"/>
<source>
This is experimental software.
@@ -33,6 +28,16 @@ Distribuerad under mjukvarulicensen MIT/X11, se den medföljande filen COPYING e
Denna produkten innehåller mjukvara utvecklad av OpenSSL Project för användning i OpenSSL Toolkit (http://www.openssl.org/) och kryptografisk mjukvara utvecklad av Eric Young (eay@cryptsoft.com) samt UPnP-mjukvara skriven av Thomas Bernard.</translation>
</message>
+ <message>
+ <location filename="../aboutdialog.cpp" line="+17"/>
+ <source>Copyright</source>
+ <translation>Copyright</translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>2009-%1 The Bitcoin developers</source>
+ <translation>2009-%1 Bitcoin-utvecklarna</translation>
+ </message>
</context>
<context>
<name>AddressBookPage</name>
@@ -107,17 +112,22 @@ Denna produkten innehåller mjukvara utvecklad av OpenSSL Project för användni
<translation>&amp;Radera</translation>
</message>
<message>
- <location filename="../addressbookpage.cpp" line="+65"/>
+ <location filename="../addressbookpage.cpp" line="+66"/>
<source>Copy &amp;Label</source>
<translation>Kopiera &amp;etikett</translation>
</message>
<message>
- <location line="+2"/>
+ <location line="+1"/>
<source>&amp;Edit</source>
<translation>&amp;Editera</translation>
</message>
<message>
- <location line="+250"/>
+ <location line="+1"/>
+ <source>Send &amp;Coins</source>
+ <translation>Skicka &amp;Bitcoins</translation>
+ </message>
+ <message>
+ <location line="+263"/>
<source>Export Address Book Data</source>
<translation>Exportera Adressbok</translation>
</message>
@@ -140,7 +150,7 @@ Denna produkten innehåller mjukvara utvecklad av OpenSSL Project för användni
<context>
<name>AddressTableModel</name>
<message>
- <location filename="../addresstablemodel.cpp" line="+142"/>
+ <location filename="../addresstablemodel.cpp" line="+144"/>
<source>Label</source>
<translation>Etikett</translation>
</message>
@@ -299,17 +309,17 @@ Denna produkten innehåller mjukvara utvecklad av OpenSSL Project för användni
<context>
<name>BitcoinGUI</name>
<message>
- <location filename="../bitcoingui.cpp" line="+267"/>
+ <location filename="../bitcoingui.cpp" line="+231"/>
<source>Sign &amp;message...</source>
<translation>Signera &amp;meddelande...</translation>
</message>
<message>
- <location line="+254"/>
+ <location line="+299"/>
<source>Synchronizing with network...</source>
<translation>Synkroniserar med nätverk...</translation>
</message>
<message>
- <location line="-322"/>
+ <location line="-367"/>
<source>&amp;Overview</source>
<translation>&amp;Översikt</translation>
</message>
@@ -329,32 +339,17 @@ Denna produkten innehåller mjukvara utvecklad av OpenSSL Project för användni
<translation>Bläddra i transaktionshistorik</translation>
</message>
<message>
- <location line="+6"/>
- <source>&amp;Address Book</source>
- <translation>&amp;Adressbok</translation>
- </message>
- <message>
- <location line="+1"/>
+ <location line="+7"/>
<source>Edit the list of stored addresses and labels</source>
<translation>Redigera listan med lagrade adresser och etiketter</translation>
</message>
<message>
- <location line="-15"/>
- <source>&amp;Receive coins</source>
- <translation>&amp;Ta emot bitcoins</translation>
- </message>
- <message>
- <location line="+1"/>
+ <location line="-14"/>
<source>Show the list of addresses for receiving payments</source>
<translation>Visa listan med adresser för att ta emot betalningar</translation>
</message>
<message>
- <location line="-8"/>
- <source>&amp;Send coins</source>
- <translation>&amp;Skicka bitcoins</translation>
- </message>
- <message>
- <location line="+39"/>
+ <location line="+31"/>
<source>E&amp;xit</source>
<translation>&amp;Avsluta</translation>
</message>
@@ -399,7 +394,7 @@ Denna produkten innehåller mjukvara utvecklad av OpenSSL Project för användni
<translation>&amp;Byt Lösenord...</translation>
</message>
<message>
- <location line="+259"/>
+ <location line="+304"/>
<source>Importing blocks from disk...</source>
<translation>Importerar block från disk...</translation>
</message>
@@ -408,13 +403,8 @@ Denna produkten innehåller mjukvara utvecklad av OpenSSL Project för användni
<source>Reindexing blocks on disk...</source>
<translation>Återindexerar block på disken...</translation>
</message>
- <message numerus="yes">
- <location line="+10"/>
- <source>~%n block(s) remaining</source>
- <translation><numerusform>~%n block återstår</numerusform><numerusform>~%n block återstår</numerusform></translation>
- </message>
<message>
- <location line="-265"/>
+ <location line="-300"/>
<source>&amp;Export...</source>
<translation>&amp;Exportera...</translation>
</message>
@@ -459,18 +449,33 @@ Denna produkten innehåller mjukvara utvecklad av OpenSSL Project för användni
<translation>&amp;Verifiera meddelande...</translation>
</message>
<message>
- <location line="-196"/>
- <location line="+538"/>
+ <location line="-162"/>
+ <location line="+540"/>
<source>Bitcoin</source>
<translation>Bitcoin</translation>
</message>
<message>
- <location line="-538"/>
+ <location line="-540"/>
<source>Wallet</source>
<translation>Plånbok</translation>
</message>
<message>
- <location line="+176"/>
+ <location line="+99"/>
+ <source>&amp;Send</source>
+ <translation>&amp;Skicka</translation>
+ </message>
+ <message>
+ <location line="+7"/>
+ <source>&amp;Receive</source>
+ <translation>&amp;Ta emot</translation>
+ </message>
+ <message>
+ <location line="+14"/>
+ <source>&amp;Addresses</source>
+ <translation>&amp;Adresser</translation>
+ </message>
+ <message>
+ <location line="+22"/>
<source>&amp;About Bitcoin</source>
<translation>&amp;Om Bitcoin</translation>
</message>
@@ -531,27 +536,57 @@ Denna produkten innehåller mjukvara utvecklad av OpenSSL Project för användni
<translation>[testnet]</translation>
</message>
<message>
- <location line="+63"/>
+ <location line="+47"/>
<source>Bitcoin client</source>
<translation>Bitcoin-klient</translation>
</message>
<message numerus="yes">
- <location line="+79"/>
+ <location line="+140"/>
<source>%n active connection(s) to Bitcoin network</source>
<translation><numerusform>%n aktiv anslutning till Bitcoin-nätverket</numerusform><numerusform>%n aktiva anslutningar till Bitcoin-nätverket</numerusform></translation>
</message>
<message>
- <location line="+45"/>
- <source>Processed %1 of %2 blocks of transaction history (%3% done).</source>
- <translation>Bearbetat %1 av %2 block i transaktionshistoriken (%3% klart).</translation>
+ <location line="+39"/>
+ <source>Processed %1 of %2 (estimated) blocks of transaction history.</source>
+ <translation>Bearbetat %1 av %2 (uppskattade) block av transaktionshistorik.</translation>
</message>
<message>
- <location line="+7"/>
+ <location line="+4"/>
<source>Processed %1 blocks of transaction history.</source>
<translation>Bearbetat %1 block i transaktionshistoriken.</translation>
</message>
+ <message numerus="yes">
+ <location line="+20"/>
+ <source>%n hour(s)</source>
+ <translation><numerusform>%n timme</numerusform><numerusform>%n timmar</numerusform></translation>
+ </message>
+ <message numerus="yes">
+ <location line="+4"/>
+ <source>%n day(s)</source>
+ <translation><numerusform>%n dag</numerusform><numerusform>%n dagar</numerusform></translation>
+ </message>
+ <message numerus="yes">
+ <location line="+4"/>
+ <source>%n week(s)</source>
+ <translation><numerusform>%n vecka</numerusform><numerusform>%n veckor</numerusform></translation>
+ </message>
<message>
- <location line="+70"/>
+ <location line="+5"/>
+ <source>%1 behind</source>
+ <translation>%1 efter</translation>
+ </message>
+ <message>
+ <location line="+14"/>
+ <source>Last received block was generated %1 ago.</source>
+ <translation>Senast mottagna block genererades %1 sen.</translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Transactions after this will not yet be visible.</source>
+ <translation>Transaktioner efter denna kommer inte ännu vara synliga.</translation>
+ </message>
+ <message>
+ <location line="+21"/>
<source>Error</source>
<translation>Fel</translation>
</message>
@@ -566,62 +601,27 @@ Denna produkten innehåller mjukvara utvecklad av OpenSSL Project för användni
<translation>Information</translation>
</message>
<message>
- <location line="+66"/>
+ <location line="+68"/>
<source>This transaction is over the size limit. You can still send it for a fee of %1, which goes to the nodes that process your transaction and helps to support the network. Do you want to pay the fee?</source>
<translation>Transaktionen överskrider storleksgränsen. Du kan dock fortfarande skicka den mot en kostnad av %1, som går till noderna som behandlar din transaktion och bidrar till nätverket. Vill du betala denna avgift?</translation>
</message>
<message>
- <location line="+210"/>
- <source>Backup Successful</source>
- <translation>Säkerhetskopiering lyckades</translation>
- </message>
- <message>
- <location line="+0"/>
- <source>The wallet data was successfully saved to the new location.</source>
- <translation>Plånbokens data har sparats till den nya platsen.</translation>
- </message>
- <message numerus="yes">
- <location line="-338"/>
- <source>%n second(s) ago</source>
- <translation><numerusform>%n sekund sedan</numerusform><numerusform>%n sekunder sedan</numerusform></translation>
- </message>
- <message numerus="yes">
- <location line="+4"/>
- <source>%n minute(s) ago</source>
- <translation><numerusform>%n minut sedan</numerusform><numerusform>%n minuter sedan</numerusform></translation>
- </message>
- <message numerus="yes">
- <location line="+4"/>
- <source>%n hour(s) ago</source>
- <translation><numerusform>%n timme sedan</numerusform><numerusform>%n timmar sedan</numerusform></translation>
- </message>
- <message numerus="yes">
- <location line="+4"/>
- <source>%n day(s) ago</source>
- <translation><numerusform>%n dag sedan</numerusform><numerusform>%n dagar sedan</numerusform></translation>
- </message>
- <message>
- <location line="+6"/>
+ <location line="-138"/>
<source>Up to date</source>
<translation>Uppdaterad</translation>
</message>
<message>
- <location line="+7"/>
+ <location line="+32"/>
<source>Catching up...</source>
<translation>Hämtar senaste...</translation>
</message>
<message>
- <location line="+10"/>
- <source>Last received block was generated %1.</source>
- <translation>Senast mottagna block genererades %1.</translation>
- </message>
- <message>
- <location line="+97"/>
+ <location line="+110"/>
<source>Confirm transaction fee</source>
<translation>Bekräfta överföringsavgift</translation>
</message>
<message>
- <location line="+23"/>
+ <location line="+8"/>
<source>Sent transaction</source>
<translation>Transaktion skickad</translation>
</message>
@@ -644,14 +644,14 @@ Adress: %4
</translation>
</message>
<message>
- <location line="+99"/>
- <location line="+28"/>
+ <location line="+33"/>
+ <location line="+23"/>
<source>URI handling</source>
<translation>URI hantering</translation>
</message>
<message>
- <location line="-28"/>
- <location line="+28"/>
+ <location line="-23"/>
+ <location line="+23"/>
<source>URI can not be parsed! This can be caused by an invalid Bitcoin address or malformed URI parameters.</source>
<translation>URI går inte att tolkas! Detta kan orsakas av en ogiltig Bitcoin-adress eller felaktiga URI parametrar.</translation>
</message>
@@ -666,27 +666,7 @@ Adress: %4
<translation>Denna plånbok är &lt;b&gt;krypterad&lt;/b&gt; och för närvarande &lt;b&gt;låst&lt;/b&gt;</translation>
</message>
<message>
- <location line="+23"/>
- <source>Backup Wallet</source>
- <translation>Säkerhetskopiera Plånbok</translation>
- </message>
- <message>
- <location line="+0"/>
- <source>Wallet Data (*.dat)</source>
- <translation>Plånboks-data (*.dat)</translation>
- </message>
- <message>
- <location line="+3"/>
- <source>Backup Failed</source>
- <translation>Säkerhetskopiering misslyckades</translation>
- </message>
- <message>
- <location line="+0"/>
- <source>There was an error trying to save the wallet data to the new location.</source>
- <translation>Det inträffade ett fel när plånboken skulle sparas till den nya platsen.</translation>
- </message>
- <message>
- <location filename="../bitcoin.cpp" line="+109"/>
+ <location filename="../bitcoin.cpp" line="+108"/>
<source>A fatal error occurred. Bitcoin can no longer continue safely and will quit.</source>
<translation>Ett allvarligt fel har uppstått. Bitcoin kan inte längre köras säkert och kommer att avslutas.</translation>
</message>
@@ -694,7 +674,7 @@ Adress: %4
<context>
<name>ClientModel</name>
<message>
- <location filename="../clientmodel.cpp" line="+86"/>
+ <location filename="../clientmodel.cpp" line="+96"/>
<source>Network Alert</source>
<translation>Nätverkslarm</translation>
</message>
@@ -727,7 +707,7 @@ Adress: %4
<translation>Adressen som är associerad med detta adressboksinlägg. Detta kan enbart ändras för sändande adresser.</translation>
</message>
<message>
- <location filename="../editaddressdialog.cpp" line="+20"/>
+ <location filename="../editaddressdialog.cpp" line="+21"/>
<source>New receiving address</source>
<translation>Ny mottagaradress</translation>
</message>
@@ -747,17 +727,17 @@ Adress: %4
<translation>Redigera avsändaradress</translation>
</message>
<message>
- <location line="+60"/>
+ <location line="+76"/>
<source>The entered address &quot;%1&quot; is already in the address book.</source>
<translation>Den angivna adressen &quot;%1&quot; finns redan i adressboken.</translation>
</message>
<message>
- <location line="+5"/>
+ <location line="-5"/>
<source>The entered address &quot;%1&quot; is not a valid Bitcoin address.</source>
<translation>Den angivna adressen &quot;%1&quot; är inte en giltig Bitcoin-adress.</translation>
</message>
<message>
- <location line="+5"/>
+ <location line="+10"/>
<source>Could not unlock wallet.</source>
<translation>Plånboken kunde inte låsas upp.</translation>
</message>
@@ -770,7 +750,7 @@ Adress: %4
<context>
<name>GUIUtil::HelpMessageBox</name>
<message>
- <location filename="../guiutil.cpp" line="+419"/>
+ <location filename="../guiutil.cpp" line="+422"/>
<location line="+12"/>
<source>Bitcoin-Qt</source>
<translation>Bitcoin-Qt</translation>
@@ -984,7 +964,7 @@ Adress: %4
<translation>&amp;Verkställ</translation>
</message>
<message>
- <location filename="../optionsdialog.cpp" line="+55"/>
+ <location filename="../optionsdialog.cpp" line="+53"/>
<source>default</source>
<translation>standard</translation>
</message>
@@ -1029,23 +1009,18 @@ Adress: %4
<translation>Formulär</translation>
</message>
<message>
- <location line="+51"/>
- <location line="+183"/>
+ <location line="+50"/>
+ <location line="+166"/>
<source>The displayed information may be out of date. Your wallet automatically synchronizes with the Bitcoin network after a connection is established, but this process has not completed yet.</source>
<translation>Den visade informationen kan vara inaktuell. Plånboken synkroniseras automatiskt med Bitcoin-nätverket efter att anslutningen är upprättad, men denna process har inte slutförts ännu.</translation>
</message>
<message>
- <location line="-141"/>
+ <location line="-124"/>
<source>Balance:</source>
<translation>Saldo:</translation>
</message>
<message>
- <location line="+58"/>
- <source>Number of transactions:</source>
- <translation>Antal transaktioner:</translation>
- </message>
- <message>
- <location line="-29"/>
+ <location line="+29"/>
<source>Unconfirmed:</source>
<translation>Obekräftade:</translation>
</message>
@@ -1055,7 +1030,7 @@ Adress: %4
<translation>Plånbok</translation>
</message>
<message>
- <location line="+124"/>
+ <location line="+107"/>
<source>Immature:</source>
<translation>Omogen:</translation>
</message>
@@ -1070,7 +1045,7 @@ Adress: %4
<translation>&lt;b&gt;Nyligen genomförda transaktioner&lt;/b&gt;</translation>
</message>
<message>
- <location line="-118"/>
+ <location line="-101"/>
<source>Your current balance</source>
<translation>Ditt nuvarande saldo</translation>
</message>
@@ -1080,11 +1055,6 @@ Adress: %4
<translation>Totalt antal transaktioner som ännu inte bekräftats, och som ännu inte räknas med i aktuellt saldo</translation>
</message>
<message>
- <location line="+20"/>
- <source>Total number of transactions in wallet</source>
- <translation>Totalt antal transaktioner i plånboken</translation>
- </message>
- <message>
<location filename="../overviewpage.cpp" line="+115"/>
<location line="+1"/>
<source>out of sync</source>
@@ -1092,6 +1062,14 @@ Adress: %4
</message>
</context>
<context>
+ <name>PaymentServer</name>
+ <message>
+ <location filename="../paymentserver.cpp" line="+107"/>
+ <source>Cannot start bitcoin: click-to-pay handler</source>
+ <translation>Kan inte starta bitcin: klicka-och-betala handhavare</translation>
+ </message>
+</context>
+<context>
<name>QRCodeDialog</name>
<message>
<location filename="../forms/qrcodedialog.ui" line="+14"/>
@@ -1430,7 +1408,7 @@ Adress: %4
</message>
<message>
<location line="+60"/>
- <location filename="../sendcoinsentry.cpp" line="+25"/>
+ <location filename="../sendcoinsentry.cpp" line="+26"/>
<source>Enter a label for this address to add it to your address book</source>
<translation>Ange ett namn för den här adressen och lägg till den i din adressbok</translation>
</message>
@@ -1666,7 +1644,7 @@ Adress: %4
<context>
<name>TransactionDesc</name>
<message>
- <location filename="../transactiondesc.cpp" line="+19"/>
+ <location filename="../transactiondesc.cpp" line="+20"/>
<source>Open until %1</source>
<translation>Öppet till %1</translation>
</message>
@@ -1853,7 +1831,7 @@ Adress: %4
<context>
<name>TransactionTableModel</name>
<message>
- <location filename="../transactiontablemodel.cpp" line="+226"/>
+ <location filename="../transactiontablemodel.cpp" line="+225"/>
<source>Date</source>
<translation>Datum</translation>
</message>
@@ -1971,7 +1949,7 @@ Adress: %4
<context>
<name>TransactionView</name>
<message>
- <location filename="../transactionview.cpp" line="+55"/>
+ <location filename="../transactionview.cpp" line="+52"/>
<location line="+16"/>
<source>All</source>
<translation>Alla</translation>
@@ -2058,6 +2036,11 @@ Adress: %4
</message>
<message>
<location line="+1"/>
+ <source>Copy transaction ID</source>
+ <translation>Kopiera transaktions ID</translation>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Edit label</source>
<translation>Ändra etikett</translation>
</message>
@@ -2067,7 +2050,7 @@ Adress: %4
<translation>Visa transaktionsdetaljer</translation>
</message>
<message>
- <location line="+142"/>
+ <location line="+139"/>
<source>Export Transaction Data</source>
<translation>Exportera Transaktionsdata</translation>
</message>
@@ -2122,7 +2105,7 @@ Adress: %4
<translation>Kunde inte skriva till filen %1.</translation>
</message>
<message>
- <location line="+95"/>
+ <location line="+100"/>
<source>Range:</source>
<translation>Intervall:</translation>
</message>
@@ -2133,29 +2116,172 @@ Adress: %4
</message>
</context>
<context>
+ <name>WalletView</name>
+ <message>
+ <location filename="../walletview.cpp" line="+95"/>
+ <source>&amp;Overview</source>
+ <translation>&amp;Översikt</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Show general overview of wallet</source>
+ <translation>Visa generell översikt av plånboken</translation>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>&amp;Send coins</source>
+ <translation>&amp;Skicka bitcoins</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Send coins to a Bitcoin address</source>
+ <translation>Skicka bitcoins till en Bitcoin-adress</translation>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>&amp;Receive coins</source>
+ <translation>&amp;Ta emot bitcoins</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Show the list of addresses for receiving payments</source>
+ <translation>Visa listan med adresser för att ta emot betalningar</translation>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>&amp;Transactions</source>
+ <translation>&amp;Transaktioner</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Browse transaction history</source>
+ <translation>Bläddra i transaktionshistorik</translation>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>&amp;Address Book</source>
+ <translation>&amp;Adressbok</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Edit the list of stored addresses and labels</source>
+ <translation>Redigera listan med lagrade adresser och etiketter</translation>
+ </message>
+ <message>
+ <location line="+12"/>
+ <source>&amp;Encrypt Wallet...</source>
+ <translation>&amp;Kryptera plånbok...</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Encrypt the private keys that belong to your wallet</source>
+ <translation>Kryptera de privata nycklar som tillhör din plånbok</translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>&amp;Backup Wallet...</source>
+ <translation>&amp;Säkerhetskopiera plånbok...</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Backup wallet to another location</source>
+ <translation>Säkerhetskopiera plånboken till en annan plats</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>&amp;Change Passphrase...</source>
+ <translation>&amp;Byt Lösenord...</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Change the passphrase used for wallet encryption</source>
+ <translation>Byt lösenfras för kryptering av plånbok</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Sign &amp;message...</source>
+ <translation>Signera &amp;meddelande...</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Sign messages with your Bitcoin addresses to prove you own them</source>
+ <translation>Signera meddelanden med din Bitcoin-adress för att bevisa att du äger dem</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>&amp;Verify message...</source>
+ <translation>&amp;Verifiera meddelande...</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Verify messages to ensure they were signed with specified Bitcoin addresses</source>
+ <translation>Verifiera meddelanden för att vara säker på att de var signerade med specificerade Bitcoin-adresser</translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>&amp;Export...</source>
+ <translation>&amp;Exportera...</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Export the data in the current tab to a file</source>
+ <translation>Exportera informationen i den nuvarande fliken till en fil</translation>
+ </message>
+ <message>
+ <location line="+180"/>
+ <source>Backup Wallet</source>
+ <translation>Säkerhetskopiera Plånbok</translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>Wallet Data (*.dat)</source>
+ <translation>Plånboks-data (*.dat)</translation>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Backup Failed</source>
+ <translation>Säkerhetskopiering misslyckades</translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>There was an error trying to save the wallet data to the new location.</source>
+ <translation>Det inträffade ett fel när plånboken skulle sparas till den nya platsen.</translation>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>Backup Successful</source>
+ <translation>Säkerhetskopiering lyckades</translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>The wallet data was successfully saved to the new location.</source>
+ <translation>Plånbokens data har sparats till den nya platsen.</translation>
+ </message>
+</context>
+<context>
<name>bitcoin-core</name>
<message>
- <location filename="../bitcoinstrings.cpp" line="+88"/>
+ <location filename="../bitcoinstrings.cpp" line="+96"/>
<source>Bitcoin version</source>
<translation>Bitcoin version</translation>
</message>
<message>
- <location line="+82"/>
+ <location line="+98"/>
<source>Usage:</source>
<translation>Användning:</translation>
</message>
<message>
- <location line="-23"/>
+ <location line="-24"/>
<source>Send command to -server or bitcoind</source>
<translation>Skicka kommando till -server eller bitcoind</translation>
</message>
<message>
- <location line="-21"/>
+ <location line="-22"/>
<source>List commands</source>
<translation>Lista kommandon</translation>
</message>
<message>
- <location line="-11"/>
+ <location line="-10"/>
<source>Get help for a command</source>
<translation>Få hjälp med ett kommando</translation>
</message>
@@ -2180,12 +2306,12 @@ Adress: %4
<translation>Generera mynt</translation>
</message>
<message>
- <location line="-15"/>
+ <location line="-28"/>
<source>Don&apos;t generate coins</source>
<translation>Generera inte mynt</translation>
</message>
<message>
- <location line="+61"/>
+ <location line="+74"/>
<source>Specify data directory</source>
<translation>Ange katalog för data</translation>
</message>
@@ -2195,75 +2321,77 @@ Adress: %4
<translation>Sätt databas cache storleken i megabyte (förvalt: 25)</translation>
</message>
<message>
- <location line="-26"/>
+ <location line="-27"/>
<source>Listen for connections on &lt;port&gt; (default: 8333 or testnet: 18333)</source>
<translation>Lyssna efter anslutningar på &lt;port&gt; (förvalt: 8333 eller testnet: 18333)</translation>
</message>
<message>
- <location line="+4"/>
+ <location line="+5"/>
<source>Maintain at most &lt;n&gt; connections to peers (default: 125)</source>
<translation>Ha som mest &lt;n&gt; anslutningar till andra klienter (förvalt: 125)</translation>
</message>
<message>
- <location line="-34"/>
+ <location line="-49"/>
<source>Connect to a node to retrieve peer addresses, and disconnect</source>
<translation>Anslut till en nod för att hämta klientadresser, och koppla från</translation>
</message>
<message>
- <location line="+65"/>
+ <location line="+80"/>
<source>Specify your own public address</source>
<translation>Ange din egen publika adress</translation>
</message>
<message>
- <location line="+2"/>
+ <location line="+3"/>
<source>Threshold for disconnecting misbehaving peers (default: 100)</source>
<translation>Tröskelvärde för att koppla ifrån klienter som missköter sig (förvalt: 100)</translation>
</message>
<message>
- <location line="-114"/>
+ <location line="-132"/>
<source>Number of seconds to keep misbehaving peers from reconnecting (default: 86400)</source>
<translation>Antal sekunder att hindra klienter som missköter sig från att ansluta (förvalt: 86400)</translation>
</message>
<message>
- <location line="-28"/>
+ <location line="-32"/>
<source>An error occurred while setting up the RPC port %u for listening on IPv4: %s</source>
<translation>Ett fel uppstod vid upprättandet av RPC port %u för att lyssna på IPv4: %s</translation>
</message>
<message>
- <location line="+26"/>
+ <location line="+30"/>
<source>Listen for JSON-RPC connections on &lt;port&gt; (default: 8332 or testnet: 18332)</source>
<translation>Lyssna på JSON-RPC-anslutningar på &lt;port&gt; (förvalt: 8332 eller testnet: 18332)</translation>
</message>
<message>
- <location line="+34"/>
+ <location line="+36"/>
<source>Accept command line and JSON-RPC commands</source>
<translation>Tillåt kommandon från kommandotolken och JSON-RPC-kommandon</translation>
</message>
<message>
- <location line="+62"/>
+ <location line="+77"/>
<source>Run in the background as a daemon and accept commands</source>
<translation>Kör i bakgrunden som tjänst och acceptera kommandon</translation>
</message>
<message>
- <location line="+31"/>
+ <location line="+32"/>
<source>Use the test network</source>
<translation>Använd testnätverket</translation>
</message>
<message>
- <location line="-92"/>
+ <location line="-108"/>
<source>Accept connections from outside (default: 1 if no -proxy or -connect)</source>
<translation>Acceptera anslutningar utifrån (förvalt: 1 om ingen -proxy eller -connect)</translation>
</message>
<message>
- <location line="-74"/>
+ <location line="-82"/>
<source>%s, you must set a rpcpassword in the configuration file:
- %s
+%s
It is recommended you use the following random password:
rpcuser=bitcoinrpc
rpcpassword=%s
(you do not need to remember this password)
The username and password MUST NOT be the same.
If the file does not exist, create it with owner-readable-only file permissions.
+It is also recommended to set alertnotify so you are notified of problems;
+for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.com
</source>
<translation>%s, du behöver sätta ett rpclösensord i konfigurationsfilen:
%s
@@ -2271,11 +2399,14 @@ Det är rekommenderat att använda följande slumpade lösenord:
rpcuser=bitcoinrpc
rpcpassword=%s
(du behöver inte komma ihåg lösenordet)
-Användar namnet och lösenordet FÅR INTE bara detsamma.
-Om filen inte existerar, skapa den med enbart ägarläsbara filrättigheter.</translation>
+Användarnamnet och lösenordet FÅR INTE bara detsamma.
+Om filen inte existerar, skapa den med enbart ägarläsbara filrättigheter.
+Det är också rekommenderat att sätta alertnotify så du meddelas om problem;
+till exempel: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.com
+</translation>
</message>
<message>
- <location line="+15"/>
+ <location line="+17"/>
<source>An error occurred while setting up the RPC port %u for listening on IPv6, falling back to IPv4: %s</source>
<translation>Ett fel uppstod vid upprättandet av RPC port %u för att lyssna på IPv6, faller tillbaka till IPV4: %s</translation>
</message>
@@ -2291,11 +2422,6 @@ Om filen inte existerar, skapa den med enbart ägarläsbara filrättigheter.</tr
</message>
<message>
<location line="+3"/>
- <source>Corrupted block database detected. Please restart the client with -reindex.</source>
- <translation>Korrupt blockdatabas har upptäckts. Starta om klienten med -reindex.</translation>
- </message>
- <message>
- <location line="+2"/>
<source>Error initializing database environment %s! To recover, BACKUP THAT DIRECTORY, then remove everything from it except for wallet.dat.</source>
<translation>Fel vid initiering databasmiljön %s! För att återställa, SÄKERHETSKOPIERA KATALOGEN, därefter ta bort allt från det utom wallet.dat.</translation>
</message>
@@ -2310,12 +2436,27 @@ Om filen inte existerar, skapa den med enbart ägarläsbara filrättigheter.</tr
<translation>Fel: Denna transaktion kräver en transaktionsavgift på minst %s på grund av dess storlek, komplexitet, eller användning av senast mottagna bitcoins!</translation>
</message>
<message>
+ <location line="+3"/>
+ <source>Execute command when a relevant alert is received (%s in cmd is replaced by message)</source>
+ <translation>Exekvera kommando när ett relevant meddelande är mottagen (%s i cmd är utbytt med ett meddelande)</translation>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Execute command when a wallet transaction changes (%s in cmd is replaced by TxID)</source>
+ <translation>Exekvera kommando när en plånbokstransaktion ändras (%s i cmd är ersatt av TxID)</translation>
+ </message>
+ <message>
<location line="+11"/>
<source>Set maximum size of high-priority/low-fee transactions in bytes (default: 27000)</source>
<translation>Sätt den maximala storleken av hög-prioriterade/låg-avgifts transaktioner i byte (förvalt: 27000)</translation>
</message>
<message>
<location line="+3"/>
+ <source>Set the number of script verification threads (1-16, 0=auto, default: 0)</source>
+ <translation>Ange antalet skriptkontrolltrådar (1-16, 0 = auto, förval: 0)</translation>
+ </message>
+ <message>
+ <location line="+2"/>
<source>This is a pre-release test build - use at your own risk - do not use for mining or merchant applications</source>
<translation>Detta är ett förhands testbygge - använd på egen risk - använd inte för mining eller handels applikationer</translation>
</message>
@@ -2361,16 +2502,41 @@ Om filen inte existerar, skapa den med enbart ägarläsbara filrättigheter.</tr
</message>
<message>
<location line="+3"/>
+ <source>Corrupted block database detected</source>
+ <translation>Korrupt blockdatabas har upptäckts</translation>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Discover own IP address (default: 1 when listening and no -externalip)</source>
<translation>Hitta egen IP-adress (förvalt: 1 under lyssning och utan -externalip)</translation>
</message>
<message>
+ <location line="+1"/>
+ <source>Do you want to rebuild the block database now?</source>
+ <translation>Vill du bygga om blockdatabasen nu?</translation>
+ </message>
+ <message>
<location line="+3"/>
+ <source>Error initializing block database</source>
+ <translation>Fel vid initiering av blockdatabasen</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Error initializing wallet database environment %s!</source>
+ <translation>Fel vid initiering av plånbokens databasmiljö %s!</translation>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Error loading block database</source>
<translation>Fel vid inläsning av blockdatabasen</translation>
</message>
<message>
- <location line="+5"/>
+ <location line="+4"/>
+ <source>Error opening block database</source>
+ <translation>Fel vid öppning av blockdatabasen</translation>
+ </message>
+ <message>
+ <location line="+2"/>
<source>Error: Disk space is low!</source>
<translation>Fel: Hårddiskutrymme är lågt!</translation>
</message>
@@ -2386,26 +2552,96 @@ Om filen inte existerar, skapa den med enbart ägarläsbara filrättigheter.</tr
</message>
<message>
<location line="+2"/>
+ <source>Error: system error: </source>
+ <translation>Fel: systemfel:</translation>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Failed to listen on any port. Use -listen=0 if you want this.</source>
<translation>Misslyckades att lyssna på någon port. Använd -listen=0 om du vill detta.</translation>
</message>
<message>
+ <location line="+1"/>
+ <source>Failed to read block info</source>
+ <translation>Misslyckades att läsa blockinformation</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Failed to read block</source>
+ <translation>Misslyckades att läsa blocket</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Failed to sync block index</source>
+ <translation>Misslyckades att synkronisera blockindex</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Failed to write block index</source>
+ <translation>Misslyckades att skriva blockindex</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Failed to write block info</source>
+ <translation>Misslyckades att skriva blockinformation</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Failed to write block</source>
+ <translation>Misslyckades att skriva blocket</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Failed to write file info</source>
+ <translation>Misslyckades att skriva filinformation</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Failed to write to coin database</source>
+ <translation>Misslyckades att skriva till myntdatabas</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Failed to write transaction index</source>
+ <translation>Misslyckades att skriva transaktionsindex</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Failed to write undo data</source>
+ <translation>Misslyckades att skriva ångradata</translation>
+ </message>
+ <message>
<location line="+2"/>
<source>Find peers using DNS lookup (default: 1 unless -connect)</source>
<translation>Sök efter klienter med DNS sökningen (förvalt: 1 om inte -connect)</translation>
</message>
<message>
- <location line="+5"/>
+ <location line="+3"/>
+ <source>How many blocks to check at startup (default: 288, 0 = all)</source>
+ <translation>Hur många block att kontrollera vid uppstart (standardvärde: 288, 0 = alla)</translation>
+ </message>
+ <message>
+ <location line="+1"/>
<source>How thorough the block verification is (0-4, default: 3)</source>
<translation>Hur grundlig blockverifikationen är (0-4, förvalt: 3)</translation>
</message>
<message>
- <location line="+1"/>
- <source>Importing blocks from block database...</source>
- <translation>Importerar block från blockdatabasen...</translation>
+ <location line="+24"/>
+ <source>Rebuild block chain index from current blk000??.dat files</source>
+ <translation>Återskapa blockkedjans index från nuvarande blk000??.dat filer</translation>
+ </message>
+ <message>
+ <location line="+37"/>
+ <source>Verifying blocks...</source>
+ <translation>Verifierar block...</translation>
</message>
<message>
<location line="+1"/>
+ <source>Verifying wallet...</source>
+ <translation>Verifierar plånboken...</translation>
+ </message>
+ <message>
+ <location line="-61"/>
<source>Imports blocks from external blk000??.dat file</source>
<translation>Importerar block från extern blk000??.dat fil</translation>
</message>
@@ -2420,7 +2656,12 @@ Om filen inte existerar, skapa den med enbart ägarläsbara filrättigheter.</tr
<translation>Ogiltig -tor adress: &apos;%s&apos;</translation>
</message>
<message>
- <location line="+9"/>
+ <location line="+8"/>
+ <source>Maintain a full transaction index (default: 0)</source>
+ <translation>Upprätthåll ett fullständigt transaktionsindex (förval: 0)</translation>
+ </message>
+ <message>
+ <location line="+2"/>
<source>Maximum per-connection receive buffer, &lt;n&gt;*1000 bytes (default: 5000)</source>
<translation>Maximal buffert för mottagning per anslutning, &lt;n&gt;*1000 byte (förvalt: 5000)</translation>
</message>
@@ -2455,12 +2696,7 @@ Om filen inte existerar, skapa den med enbart ägarläsbara filrättigheter.</tr
<translation>Skriv ut tid i felsökningsinformationen</translation>
</message>
<message>
- <location line="+1"/>
- <source>Rebuild blockchain index from current blk000??.dat files</source>
- <translation>Återskapa blockkedjans index från nuvarande blk000??.dat filer</translation>
- </message>
- <message>
- <location line="+4"/>
+ <location line="+5"/>
<source>SSL options: (see the Bitcoin Wiki for SSL setup instructions)</source>
<translation>SSL-inställningar: (se Bitcoin-wikin för SSL-setup instruktioner)</translation>
</message>
@@ -2500,7 +2736,12 @@ Om filen inte existerar, skapa den med enbart ägarläsbara filrättigheter.</tr
<translation>Ange timeout för uppkoppling i millisekunder (förvalt: 5000)</translation>
</message>
<message>
- <location line="+13"/>
+ <location line="+4"/>
+ <source>System error: </source>
+ <translation>Systemfel:</translation>
+ </message>
+ <message>
+ <location line="+10"/>
<source>Use UPnP to map the listening port (default: 0)</source>
<translation>Använd UPnP för att mappa den lyssnande porten (förvalt: 0)</translation>
</message>
@@ -2531,36 +2772,41 @@ Om filen inte existerar, skapa den med enbart ägarläsbara filrättigheter.</tr
</message>
<message>
<location line="+1"/>
+ <source>You need to rebuild the databases using -reindex to change -txindex</source>
+ <translation>Du måste återskapa databaserna med -reindex för att ändra -txindex</translation>
+ </message>
+ <message>
+ <location line="+1"/>
<source>wallet.dat corrupt, salvage failed</source>
<translation>wallet.dat korrupt, räddning misslyckades</translation>
</message>
<message>
- <location line="-43"/>
+ <location line="-45"/>
<source>Password for JSON-RPC connections</source>
<translation>Lösenord för JSON-RPC-anslutningar</translation>
</message>
<message>
- <location line="-53"/>
+ <location line="-68"/>
<source>Allow JSON-RPC connections from specified IP address</source>
<translation>Tillåt JSON-RPC-anslutningar från specifika IP-adresser</translation>
</message>
<message>
- <location line="+62"/>
+ <location line="+77"/>
<source>Send commands to node running on &lt;ip&gt; (default: 127.0.0.1)</source>
<translation>Skicka kommandon till klient på &lt;ip&gt; (förvalt: 127.0.0.1)</translation>
</message>
<message>
- <location line="-103"/>
+ <location line="-120"/>
<source>Execute command when the best block changes (%s in cmd is replaced by block hash)</source>
<translation>Exekvera kommando när det bästa blocket ändras (%s i cmd är utbytt av blockhash)</translation>
</message>
<message>
- <location line="+124"/>
+ <location line="+142"/>
<source>Upgrade wallet to latest format</source>
<translation>Uppgradera plånboken till senaste formatet</translation>
</message>
<message>
- <location line="-15"/>
+ <location line="-16"/>
<source>Set key pool size to &lt;n&gt; (default: 100)</source>
<translation>Sätt storleken på nyckelpoolen till &lt;n&gt; (förvalt: 100)</translation>
</message>
@@ -2570,17 +2816,12 @@ Om filen inte existerar, skapa den med enbart ägarläsbara filrättigheter.</tr
<translation>Sök i blockkedjan efter saknade plånboks transaktioner</translation>
</message>
<message>
- <location line="-26"/>
- <source>How many blocks to check at startup (default: 2500, 0 = all)</source>
- <translation>Hur många block att kontrollera vid uppstart (förvalt: 2500, 0 = alla)</translation>
- </message>
- <message>
- <location line="+55"/>
+ <location line="+30"/>
<source>Use OpenSSL (https) for JSON-RPC connections</source>
<translation>Använd OpenSSL (https) för JSON-RPC-anslutningar</translation>
</message>
<message>
- <location line="-20"/>
+ <location line="-21"/>
<source>Server certificate file (default: server.cert)</source>
<translation>Serverns certifikatfil (förvalt: server.cert)</translation>
</message>
@@ -2590,12 +2831,12 @@ Om filen inte existerar, skapa den med enbart ägarläsbara filrättigheter.</tr
<translation>Serverns privata nyckel (förvalt: server.pem)</translation>
</message>
<message>
- <location line="-133"/>
+ <location line="-154"/>
<source>Acceptable ciphers (default: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH)</source>
<translation>Accepterade krypteringsalgoritmer (förvalt: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH)</translation>
</message>
<message>
- <location line="+144"/>
+ <location line="+166"/>
<source>This help message</source>
<translation>Det här hjälp medelandet</translation>
</message>
@@ -2605,7 +2846,7 @@ Om filen inte existerar, skapa den med enbart ägarläsbara filrättigheter.</tr
<translation>Det går inte att binda till %s på den här datorn (bind returnerade felmeddelande %d, %s)</translation>
</message>
<message>
- <location line="-70"/>
+ <location line="-86"/>
<source>Connect through socks proxy</source>
<translation>Anslut genom socks-proxy</translation>
</message>
@@ -2615,12 +2856,12 @@ Om filen inte existerar, skapa den med enbart ägarläsbara filrättigheter.</tr
<translation>Tillåt DNS-sökningar för -addnode, -seednode och -connect</translation>
</message>
<message>
- <location line="+43"/>
+ <location line="+57"/>
<source>Loading addresses...</source>
<translation>Laddar adresser...</translation>
</message>
<message>
- <location line="-25"/>
+ <location line="-35"/>
<source>Error loading wallet.dat: Wallet corrupted</source>
<translation>Fel vid inläsningen av wallet.dat: Plånboken är skadad</translation>
</message>
@@ -2630,32 +2871,22 @@ Om filen inte existerar, skapa den med enbart ägarläsbara filrättigheter.</tr
<translation>Fel vid inläsningen av wallet.dat: Plånboken kräver en senare version av Bitcoin</translation>
</message>
<message>
- <location line="+73"/>
- <source>Verifying block database integrity...</source>
- <translation>Verifierar blockdatabasens integritet...</translation>
- </message>
- <message>
- <location line="+1"/>
- <source>Verifying wallet integrity...</source>
- <translation>Verifierar plånbokens integritet...</translation>
- </message>
- <message>
- <location line="+1"/>
+ <location line="+87"/>
<source>Wallet needed to be rewritten: restart Bitcoin to complete</source>
<translation>Plånboken behöver skrivas om: Starta om Bitcoin för att färdigställa</translation>
</message>
<message>
- <location line="-77"/>
+ <location line="-89"/>
<source>Error loading wallet.dat</source>
<translation>Fel vid inläsning av plånboksfilen wallet.dat</translation>
</message>
<message>
- <location line="+20"/>
+ <location line="+30"/>
<source>Invalid -proxy address: &apos;%s&apos;</source>
<translation>Ogiltig -proxy adress: &apos;%s&apos;</translation>
</message>
<message>
- <location line="+46"/>
+ <location line="+48"/>
<source>Unknown network specified in -onlynet: &apos;%s&apos;</source>
<translation>Okänt nätverk som anges i -onlynet: &apos;%s&apos;</translation>
</message>
@@ -2665,7 +2896,7 @@ Om filen inte existerar, skapa den med enbart ägarläsbara filrättigheter.</tr
<translation>Okänd -socks proxy version begärd: %i</translation>
</message>
<message>
- <location line="-75"/>
+ <location line="-91"/>
<source>Cannot resolve -bind address: &apos;%s&apos;</source>
<translation>Kan inte matcha -bind adress: &apos;%s&apos;</translation>
</message>
@@ -2675,17 +2906,17 @@ Om filen inte existerar, skapa den med enbart ägarläsbara filrättigheter.</tr
<translation>Kan inte matcha -externalip adress: &apos;%s&apos;</translation>
</message>
<message>
- <location line="+31"/>
+ <location line="+45"/>
<source>Invalid amount for -paytxfee=&lt;amount&gt;: &apos;%s&apos;</source>
<translation>Ogiltigt belopp för -paytxfee=&lt;belopp&gt;:&apos;%s&apos;</translation>
</message>
<message>
- <location line="-15"/>
+ <location line="-24"/>
<source>Error: could not start node</source>
<translation>Fel: kunde inte starta nod</translation>
</message>
<message>
- <location line="+16"/>
+ <location line="+25"/>
<source>Invalid amount</source>
<translation>Ogiltig mängd</translation>
</message>
@@ -2700,7 +2931,7 @@ Om filen inte existerar, skapa den med enbart ägarläsbara filrättigheter.</tr
<translation>Laddar blockindex...</translation>
</message>
<message>
- <location line="-45"/>
+ <location line="-59"/>
<source>Add a node to connect to and attempt to keep the connection open</source>
<translation>Lägg till en nod att koppla upp mot och försök att hålla anslutningen öppen</translation>
</message>
@@ -2710,22 +2941,17 @@ Om filen inte existerar, skapa den med enbart ägarläsbara filrättigheter.</tr
<translation>Det går inte att binda till %s på den här datorn. Bitcoin är förmodligen redan igång.</translation>
</message>
<message>
- <location line="+54"/>
- <source>Find peers using internet relay chat (default: 0)</source>
- <translation>Sök efter klienter med internet relay chat (förvalt: 0)</translation>
- </message>
- <message>
- <location line="-2"/>
+ <location line="+68"/>
<source>Fee per KB to add to transactions you send</source>
<translation>Avgift per KB att lägga till på transaktioner du skickar</translation>
</message>
<message>
- <location line="+19"/>
+ <location line="+17"/>
<source>Loading wallet...</source>
<translation>Laddar plånbok...</translation>
</message>
<message>
- <location line="-40"/>
+ <location line="-54"/>
<source>Cannot downgrade wallet</source>
<translation>Kan inte nedgradera plånboken</translation>
</message>
@@ -2740,27 +2966,27 @@ Om filen inte existerar, skapa den med enbart ägarläsbara filrättigheter.</tr
<translation>Kan inte skriva standardadress</translation>
</message>
<message>
- <location line="+49"/>
+ <location line="+64"/>
<source>Rescanning...</source>
<translation>Söker igen...</translation>
</message>
<message>
- <location line="-43"/>
+ <location line="-56"/>
<source>Done loading</source>
<translation>Klar med laddning</translation>
</message>
<message>
- <location line="+65"/>
+ <location line="+79"/>
<source>To use the %s option</source>
<translation>Att använda %s alternativet</translation>
</message>
<message>
- <location line="-60"/>
+ <location line="-71"/>
<source>Error</source>
<translation>Fel</translation>
</message>
<message>
- <location line="-28"/>
+ <location line="-33"/>
<source>You must set rpcpassword=&lt;password&gt; in the configuration file:
%s
If the file does not exist, create it with owner-readable-only file permissions.</source>
diff --git a/src/qt/locale/bitcoin_th_TH.ts b/src/qt/locale/bitcoin_th_TH.ts
index a12eb56b43..df48b1ac9e 100644
--- a/src/qt/locale/bitcoin_th_TH.ts
+++ b/src/qt/locale/bitcoin_th_TH.ts
@@ -13,12 +13,7 @@
<translation type="unfinished"/>
</message>
<message>
- <location line="+41"/>
- <source>Copyright © 2009-2012 The Bitcoin developers</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+13"/>
+ <location line="+57"/>
<source>
This is experimental software.
@@ -27,6 +22,16 @@ Distributed under the MIT/X11 software license, see the accompanying file COPYIN
This product includes software developed by the OpenSSL Project for use in the OpenSSL Toolkit (http://www.openssl.org/) and cryptographic software written by Eric Young (eay@cryptsoft.com) and UPnP software written by Thomas Bernard.</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../aboutdialog.cpp" line="+17"/>
+ <source>Copyright</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>2009-%1 The Bitcoin developers</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>AddressBookPage</name>
@@ -101,17 +106,22 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation type="unfinished"/>
</message>
<message>
- <location filename="../addressbookpage.cpp" line="+65"/>
+ <location filename="../addressbookpage.cpp" line="+66"/>
<source>Copy &amp;Label</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+2"/>
+ <location line="+1"/>
<source>&amp;Edit</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+250"/>
+ <location line="+1"/>
+ <source>Send &amp;Coins</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+263"/>
<source>Export Address Book Data</source>
<translation type="unfinished"/>
</message>
@@ -134,7 +144,7 @@ This product includes software developed by the OpenSSL Project for use in the O
<context>
<name>AddressTableModel</name>
<message>
- <location filename="../addresstablemodel.cpp" line="+142"/>
+ <location filename="../addresstablemodel.cpp" line="+144"/>
<source>Label</source>
<translation type="unfinished"/>
</message>
@@ -293,17 +303,17 @@ This product includes software developed by the OpenSSL Project for use in the O
<context>
<name>BitcoinGUI</name>
<message>
- <location filename="../bitcoingui.cpp" line="+267"/>
+ <location filename="../bitcoingui.cpp" line="+231"/>
<source>Sign &amp;message...</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+254"/>
+ <location line="+299"/>
<source>Synchronizing with network...</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-322"/>
+ <location line="-367"/>
<source>&amp;Overview</source>
<translation type="unfinished"/>
</message>
@@ -323,32 +333,17 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation type="unfinished"/>
</message>
<message>
- <location line="+6"/>
- <source>&amp;Address Book</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+1"/>
+ <location line="+7"/>
<source>Edit the list of stored addresses and labels</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-15"/>
- <source>&amp;Receive coins</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+1"/>
+ <location line="-14"/>
<source>Show the list of addresses for receiving payments</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-8"/>
- <source>&amp;Send coins</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+39"/>
+ <location line="+31"/>
<source>E&amp;xit</source>
<translation type="unfinished"/>
</message>
@@ -393,7 +388,7 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation type="unfinished"/>
</message>
<message>
- <location line="+259"/>
+ <location line="+304"/>
<source>Importing blocks from disk...</source>
<translation type="unfinished"/>
</message>
@@ -402,13 +397,8 @@ This product includes software developed by the OpenSSL Project for use in the O
<source>Reindexing blocks on disk...</source>
<translation type="unfinished"/>
</message>
- <message numerus="yes">
- <location line="+10"/>
- <source>~%n block(s) remaining</source>
- <translation type="unfinished"><numerusform></numerusform></translation>
- </message>
<message>
- <location line="-265"/>
+ <location line="-300"/>
<source>&amp;Export...</source>
<translation type="unfinished"/>
</message>
@@ -453,18 +443,33 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation type="unfinished"/>
</message>
<message>
- <location line="-196"/>
- <location line="+538"/>
+ <location line="-162"/>
+ <location line="+540"/>
<source>Bitcoin</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-538"/>
+ <location line="-540"/>
<source>Wallet</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+176"/>
+ <location line="+99"/>
+ <source>&amp;Send</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+7"/>
+ <source>&amp;Receive</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+14"/>
+ <source>&amp;Addresses</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+22"/>
<source>&amp;About Bitcoin</source>
<translation type="unfinished"/>
</message>
@@ -525,97 +530,92 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation type="unfinished"/>
</message>
<message>
- <location line="+63"/>
+ <location line="+47"/>
<source>Bitcoin client</source>
<translation type="unfinished"/>
</message>
<message numerus="yes">
- <location line="+79"/>
+ <location line="+140"/>
<source>%n active connection(s) to Bitcoin network</source>
<translation type="unfinished"><numerusform></numerusform></translation>
</message>
<message>
- <location line="+45"/>
- <source>Processed %1 of %2 blocks of transaction history (%3% done).</source>
+ <location line="+39"/>
+ <source>Processed %1 of %2 (estimated) blocks of transaction history.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+7"/>
+ <location line="+4"/>
<source>Processed %1 blocks of transaction history.</source>
<translation type="unfinished"/>
</message>
+ <message numerus="yes">
+ <location line="+20"/>
+ <source>%n hour(s)</source>
+ <translation type="unfinished"><numerusform></numerusform></translation>
+ </message>
+ <message numerus="yes">
+ <location line="+4"/>
+ <source>%n day(s)</source>
+ <translation type="unfinished"><numerusform></numerusform></translation>
+ </message>
+ <message numerus="yes">
+ <location line="+4"/>
+ <source>%n week(s)</source>
+ <translation type="unfinished"><numerusform></numerusform></translation>
+ </message>
<message>
- <location line="+70"/>
- <source>Error</source>
+ <location line="+5"/>
+ <source>%1 behind</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+3"/>
- <source>Warning</source>
+ <location line="+14"/>
+ <source>Last received block was generated %1 ago.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+3"/>
- <source>Information</source>
+ <location line="+2"/>
+ <source>Transactions after this will not yet be visible.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+66"/>
- <source>This transaction is over the size limit. You can still send it for a fee of %1, which goes to the nodes that process your transaction and helps to support the network. Do you want to pay the fee?</source>
+ <location line="+21"/>
+ <source>Error</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+210"/>
- <source>Backup Successful</source>
+ <location line="+3"/>
+ <source>Warning</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+0"/>
- <source>The wallet data was successfully saved to the new location.</source>
+ <location line="+3"/>
+ <source>Information</source>
<translation type="unfinished"/>
</message>
- <message numerus="yes">
- <location line="-338"/>
- <source>%n second(s) ago</source>
- <translation type="unfinished"><numerusform></numerusform></translation>
- </message>
- <message numerus="yes">
- <location line="+4"/>
- <source>%n minute(s) ago</source>
- <translation type="unfinished"><numerusform></numerusform></translation>
- </message>
- <message numerus="yes">
- <location line="+4"/>
- <source>%n hour(s) ago</source>
- <translation type="unfinished"><numerusform></numerusform></translation>
- </message>
- <message numerus="yes">
- <location line="+4"/>
- <source>%n day(s) ago</source>
- <translation type="unfinished"><numerusform></numerusform></translation>
- </message>
<message>
- <location line="+6"/>
- <source>Up to date</source>
+ <location line="+68"/>
+ <source>This transaction is over the size limit. You can still send it for a fee of %1, which goes to the nodes that process your transaction and helps to support the network. Do you want to pay the fee?</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+7"/>
- <source>Catching up...</source>
+ <location line="-138"/>
+ <source>Up to date</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+10"/>
- <source>Last received block was generated %1.</source>
+ <location line="+32"/>
+ <source>Catching up...</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+97"/>
+ <location line="+110"/>
<source>Confirm transaction fee</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+23"/>
+ <location line="+8"/>
<source>Sent transaction</source>
<translation type="unfinished"/>
</message>
@@ -634,14 +634,14 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+99"/>
- <location line="+28"/>
+ <location line="+33"/>
+ <location line="+23"/>
<source>URI handling</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-28"/>
- <location line="+28"/>
+ <location line="-23"/>
+ <location line="+23"/>
<source>URI can not be parsed! This can be caused by an invalid Bitcoin address or malformed URI parameters.</source>
<translation type="unfinished"/>
</message>
@@ -656,27 +656,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+23"/>
- <source>Backup Wallet</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+0"/>
- <source>Wallet Data (*.dat)</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+3"/>
- <source>Backup Failed</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+0"/>
- <source>There was an error trying to save the wallet data to the new location.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../bitcoin.cpp" line="+109"/>
+ <location filename="../bitcoin.cpp" line="+108"/>
<source>A fatal error occurred. Bitcoin can no longer continue safely and will quit.</source>
<translation type="unfinished"/>
</message>
@@ -684,7 +664,7 @@ Address: %4
<context>
<name>ClientModel</name>
<message>
- <location filename="../clientmodel.cpp" line="+86"/>
+ <location filename="../clientmodel.cpp" line="+96"/>
<source>Network Alert</source>
<translation type="unfinished"/>
</message>
@@ -717,7 +697,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location filename="../editaddressdialog.cpp" line="+20"/>
+ <location filename="../editaddressdialog.cpp" line="+21"/>
<source>New receiving address</source>
<translation type="unfinished"/>
</message>
@@ -737,17 +717,17 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+60"/>
+ <location line="+76"/>
<source>The entered address &quot;%1&quot; is already in the address book.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+5"/>
+ <location line="-5"/>
<source>The entered address &quot;%1&quot; is not a valid Bitcoin address.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+5"/>
+ <location line="+10"/>
<source>Could not unlock wallet.</source>
<translation type="unfinished"/>
</message>
@@ -760,7 +740,7 @@ Address: %4
<context>
<name>GUIUtil::HelpMessageBox</name>
<message>
- <location filename="../guiutil.cpp" line="+419"/>
+ <location filename="../guiutil.cpp" line="+422"/>
<location line="+12"/>
<source>Bitcoin-Qt</source>
<translation type="unfinished"/>
@@ -974,7 +954,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location filename="../optionsdialog.cpp" line="+55"/>
+ <location filename="../optionsdialog.cpp" line="+53"/>
<source>default</source>
<translation type="unfinished"/>
</message>
@@ -1019,23 +999,18 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+51"/>
- <location line="+183"/>
+ <location line="+50"/>
+ <location line="+166"/>
<source>The displayed information may be out of date. Your wallet automatically synchronizes with the Bitcoin network after a connection is established, but this process has not completed yet.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-141"/>
+ <location line="-124"/>
<source>Balance:</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+58"/>
- <source>Number of transactions:</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="-29"/>
+ <location line="+29"/>
<source>Unconfirmed:</source>
<translation type="unfinished"/>
</message>
@@ -1045,7 +1020,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+124"/>
+ <location line="+107"/>
<source>Immature:</source>
<translation type="unfinished"/>
</message>
@@ -1060,7 +1035,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="-118"/>
+ <location line="-101"/>
<source>Your current balance</source>
<translation type="unfinished"/>
</message>
@@ -1070,11 +1045,6 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+20"/>
- <source>Total number of transactions in wallet</source>
- <translation type="unfinished"/>
- </message>
- <message>
<location filename="../overviewpage.cpp" line="+115"/>
<location line="+1"/>
<source>out of sync</source>
@@ -1082,6 +1052,14 @@ Address: %4
</message>
</context>
<context>
+ <name>PaymentServer</name>
+ <message>
+ <location filename="../paymentserver.cpp" line="+107"/>
+ <source>Cannot start bitcoin: click-to-pay handler</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>QRCodeDialog</name>
<message>
<location filename="../forms/qrcodedialog.ui" line="+14"/>
@@ -1420,7 +1398,7 @@ Address: %4
</message>
<message>
<location line="+60"/>
- <location filename="../sendcoinsentry.cpp" line="+25"/>
+ <location filename="../sendcoinsentry.cpp" line="+26"/>
<source>Enter a label for this address to add it to your address book</source>
<translation type="unfinished"/>
</message>
@@ -1656,7 +1634,7 @@ Address: %4
<context>
<name>TransactionDesc</name>
<message>
- <location filename="../transactiondesc.cpp" line="+19"/>
+ <location filename="../transactiondesc.cpp" line="+20"/>
<source>Open until %1</source>
<translation type="unfinished"/>
</message>
@@ -1843,7 +1821,7 @@ Address: %4
<context>
<name>TransactionTableModel</name>
<message>
- <location filename="../transactiontablemodel.cpp" line="+226"/>
+ <location filename="../transactiontablemodel.cpp" line="+225"/>
<source>Date</source>
<translation type="unfinished"/>
</message>
@@ -1961,7 +1939,7 @@ Address: %4
<context>
<name>TransactionView</name>
<message>
- <location filename="../transactionview.cpp" line="+55"/>
+ <location filename="../transactionview.cpp" line="+52"/>
<location line="+16"/>
<source>All</source>
<translation type="unfinished"/>
@@ -2048,6 +2026,11 @@ Address: %4
</message>
<message>
<location line="+1"/>
+ <source>Copy transaction ID</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Edit label</source>
<translation type="unfinished"/>
</message>
@@ -2057,7 +2040,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+142"/>
+ <location line="+139"/>
<source>Export Transaction Data</source>
<translation type="unfinished"/>
</message>
@@ -2112,7 +2095,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+95"/>
+ <location line="+100"/>
<source>Range:</source>
<translation type="unfinished"/>
</message>
@@ -2123,29 +2106,172 @@ Address: %4
</message>
</context>
<context>
+ <name>WalletView</name>
+ <message>
+ <location filename="../walletview.cpp" line="+95"/>
+ <source>&amp;Overview</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Show general overview of wallet</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>&amp;Send coins</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Send coins to a Bitcoin address</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>&amp;Receive coins</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Show the list of addresses for receiving payments</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>&amp;Transactions</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Browse transaction history</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>&amp;Address Book</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Edit the list of stored addresses and labels</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+12"/>
+ <source>&amp;Encrypt Wallet...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Encrypt the private keys that belong to your wallet</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>&amp;Backup Wallet...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Backup wallet to another location</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>&amp;Change Passphrase...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Change the passphrase used for wallet encryption</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Sign &amp;message...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Sign messages with your Bitcoin addresses to prove you own them</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>&amp;Verify message...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Verify messages to ensure they were signed with specified Bitcoin addresses</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>&amp;Export...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Export the data in the current tab to a file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+180"/>
+ <source>Backup Wallet</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>Wallet Data (*.dat)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Backup Failed</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>There was an error trying to save the wallet data to the new location.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>Backup Successful</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>The wallet data was successfully saved to the new location.</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>bitcoin-core</name>
<message>
- <location filename="../bitcoinstrings.cpp" line="+88"/>
+ <location filename="../bitcoinstrings.cpp" line="+96"/>
<source>Bitcoin version</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+82"/>
+ <location line="+98"/>
<source>Usage:</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-23"/>
+ <location line="-24"/>
<source>Send command to -server or bitcoind</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-21"/>
+ <location line="-22"/>
<source>List commands</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-11"/>
+ <location line="-10"/>
<source>Get help for a command</source>
<translation type="unfinished"/>
</message>
@@ -2170,12 +2296,12 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="-15"/>
+ <location line="-28"/>
<source>Don&apos;t generate coins</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+61"/>
+ <location line="+74"/>
<source>Specify data directory</source>
<translation type="unfinished"/>
</message>
@@ -2185,80 +2311,82 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="-26"/>
+ <location line="-27"/>
<source>Listen for connections on &lt;port&gt; (default: 8333 or testnet: 18333)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+4"/>
+ <location line="+5"/>
<source>Maintain at most &lt;n&gt; connections to peers (default: 125)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-34"/>
+ <location line="-49"/>
<source>Connect to a node to retrieve peer addresses, and disconnect</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+65"/>
+ <location line="+80"/>
<source>Specify your own public address</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+2"/>
+ <location line="+3"/>
<source>Threshold for disconnecting misbehaving peers (default: 100)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-114"/>
+ <location line="-132"/>
<source>Number of seconds to keep misbehaving peers from reconnecting (default: 86400)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-28"/>
+ <location line="-32"/>
<source>An error occurred while setting up the RPC port %u for listening on IPv4: %s</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+26"/>
+ <location line="+30"/>
<source>Listen for JSON-RPC connections on &lt;port&gt; (default: 8332 or testnet: 18332)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+34"/>
+ <location line="+36"/>
<source>Accept command line and JSON-RPC commands</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+62"/>
+ <location line="+77"/>
<source>Run in the background as a daemon and accept commands</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+31"/>
+ <location line="+32"/>
<source>Use the test network</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-92"/>
+ <location line="-108"/>
<source>Accept connections from outside (default: 1 if no -proxy or -connect)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-74"/>
+ <location line="-82"/>
<source>%s, you must set a rpcpassword in the configuration file:
- %s
+%s
It is recommended you use the following random password:
rpcuser=bitcoinrpc
rpcpassword=%s
(you do not need to remember this password)
The username and password MUST NOT be the same.
If the file does not exist, create it with owner-readable-only file permissions.
+It is also recommended to set alertnotify so you are notified of problems;
+for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.com
</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+15"/>
+ <location line="+17"/>
<source>An error occurred while setting up the RPC port %u for listening on IPv6, falling back to IPv4: %s</source>
<translation type="unfinished"/>
</message>
@@ -2274,11 +2402,6 @@ If the file does not exist, create it with owner-readable-only file permissions.
</message>
<message>
<location line="+3"/>
- <source>Corrupted block database detected. Please restart the client with -reindex.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+2"/>
<source>Error initializing database environment %s! To recover, BACKUP THAT DIRECTORY, then remove everything from it except for wallet.dat.</source>
<translation type="unfinished"/>
</message>
@@ -2293,12 +2416,27 @@ If the file does not exist, create it with owner-readable-only file permissions.
<translation type="unfinished"/>
</message>
<message>
+ <location line="+3"/>
+ <source>Execute command when a relevant alert is received (%s in cmd is replaced by message)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Execute command when a wallet transaction changes (%s in cmd is replaced by TxID)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location line="+11"/>
<source>Set maximum size of high-priority/low-fee transactions in bytes (default: 27000)</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+3"/>
+ <source>Set the number of script verification threads (1-16, 0=auto, default: 0)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
<source>This is a pre-release test build - use at your own risk - do not use for mining or merchant applications</source>
<translation type="unfinished"/>
</message>
@@ -2344,16 +2482,41 @@ If the file does not exist, create it with owner-readable-only file permissions.
</message>
<message>
<location line="+3"/>
+ <source>Corrupted block database detected</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Discover own IP address (default: 1 when listening and no -externalip)</source>
<translation type="unfinished"/>
</message>
<message>
+ <location line="+1"/>
+ <source>Do you want to rebuild the block database now?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location line="+3"/>
+ <source>Error initializing block database</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Error initializing wallet database environment %s!</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Error loading block database</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+5"/>
+ <location line="+4"/>
+ <source>Error opening block database</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
<source>Error: Disk space is low!</source>
<translation type="unfinished"/>
</message>
@@ -2369,26 +2532,96 @@ If the file does not exist, create it with owner-readable-only file permissions.
</message>
<message>
<location line="+2"/>
+ <source>Error: system error: </source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Failed to listen on any port. Use -listen=0 if you want this.</source>
<translation type="unfinished"/>
</message>
<message>
+ <location line="+1"/>
+ <source>Failed to read block info</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Failed to read block</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Failed to sync block index</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Failed to write block index</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Failed to write block info</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Failed to write block</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Failed to write file info</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Failed to write to coin database</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Failed to write transaction index</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Failed to write undo data</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location line="+2"/>
<source>Find peers using DNS lookup (default: 1 unless -connect)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+5"/>
- <source>How thorough the block verification is (0-4, default: 3)</source>
+ <location line="+3"/>
+ <source>How many blocks to check at startup (default: 288, 0 = all)</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+1"/>
- <source>Importing blocks from block database...</source>
+ <source>How thorough the block verification is (0-4, default: 3)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+24"/>
+ <source>Rebuild block chain index from current blk000??.dat files</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+37"/>
+ <source>Verifying blocks...</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+1"/>
+ <source>Verifying wallet...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-61"/>
<source>Imports blocks from external blk000??.dat file</source>
<translation type="unfinished"/>
</message>
@@ -2403,7 +2636,12 @@ If the file does not exist, create it with owner-readable-only file permissions.
<translation type="unfinished"/>
</message>
<message>
- <location line="+9"/>
+ <location line="+8"/>
+ <source>Maintain a full transaction index (default: 0)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
<source>Maximum per-connection receive buffer, &lt;n&gt;*1000 bytes (default: 5000)</source>
<translation type="unfinished"/>
</message>
@@ -2438,12 +2676,7 @@ If the file does not exist, create it with owner-readable-only file permissions.
<translation type="unfinished"/>
</message>
<message>
- <location line="+1"/>
- <source>Rebuild blockchain index from current blk000??.dat files</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+4"/>
+ <location line="+5"/>
<source>SSL options: (see the Bitcoin Wiki for SSL setup instructions)</source>
<translation type="unfinished"/>
</message>
@@ -2483,7 +2716,12 @@ If the file does not exist, create it with owner-readable-only file permissions.
<translation type="unfinished"/>
</message>
<message>
- <location line="+13"/>
+ <location line="+4"/>
+ <source>System error: </source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+10"/>
<source>Use UPnP to map the listening port (default: 0)</source>
<translation type="unfinished"/>
</message>
@@ -2514,36 +2752,41 @@ If the file does not exist, create it with owner-readable-only file permissions.
</message>
<message>
<location line="+1"/>
+ <source>You need to rebuild the databases using -reindex to change -txindex</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>wallet.dat corrupt, salvage failed</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-43"/>
+ <location line="-45"/>
<source>Password for JSON-RPC connections</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-53"/>
+ <location line="-68"/>
<source>Allow JSON-RPC connections from specified IP address</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+62"/>
+ <location line="+77"/>
<source>Send commands to node running on &lt;ip&gt; (default: 127.0.0.1)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-103"/>
+ <location line="-120"/>
<source>Execute command when the best block changes (%s in cmd is replaced by block hash)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+124"/>
+ <location line="+142"/>
<source>Upgrade wallet to latest format</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-15"/>
+ <location line="-16"/>
<source>Set key pool size to &lt;n&gt; (default: 100)</source>
<translation type="unfinished"/>
</message>
@@ -2553,17 +2796,12 @@ If the file does not exist, create it with owner-readable-only file permissions.
<translation type="unfinished"/>
</message>
<message>
- <location line="-26"/>
- <source>How many blocks to check at startup (default: 2500, 0 = all)</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+55"/>
+ <location line="+30"/>
<source>Use OpenSSL (https) for JSON-RPC connections</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-20"/>
+ <location line="-21"/>
<source>Server certificate file (default: server.cert)</source>
<translation type="unfinished"/>
</message>
@@ -2573,12 +2811,12 @@ If the file does not exist, create it with owner-readable-only file permissions.
<translation type="unfinished"/>
</message>
<message>
- <location line="-133"/>
+ <location line="-154"/>
<source>Acceptable ciphers (default: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+144"/>
+ <location line="+166"/>
<source>This help message</source>
<translation type="unfinished"/>
</message>
@@ -2588,7 +2826,7 @@ If the file does not exist, create it with owner-readable-only file permissions.
<translation type="unfinished"/>
</message>
<message>
- <location line="-70"/>
+ <location line="-86"/>
<source>Connect through socks proxy</source>
<translation type="unfinished"/>
</message>
@@ -2598,12 +2836,12 @@ If the file does not exist, create it with owner-readable-only file permissions.
<translation type="unfinished"/>
</message>
<message>
- <location line="+43"/>
+ <location line="+57"/>
<source>Loading addresses...</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-25"/>
+ <location line="-35"/>
<source>Error loading wallet.dat: Wallet corrupted</source>
<translation type="unfinished"/>
</message>
@@ -2613,32 +2851,22 @@ If the file does not exist, create it with owner-readable-only file permissions.
<translation type="unfinished"/>
</message>
<message>
- <location line="+73"/>
- <source>Verifying block database integrity...</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+1"/>
- <source>Verifying wallet integrity...</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+1"/>
+ <location line="+87"/>
<source>Wallet needed to be rewritten: restart Bitcoin to complete</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-77"/>
+ <location line="-89"/>
<source>Error loading wallet.dat</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+20"/>
+ <location line="+30"/>
<source>Invalid -proxy address: &apos;%s&apos;</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+46"/>
+ <location line="+48"/>
<source>Unknown network specified in -onlynet: &apos;%s&apos;</source>
<translation type="unfinished"/>
</message>
@@ -2648,7 +2876,7 @@ If the file does not exist, create it with owner-readable-only file permissions.
<translation type="unfinished"/>
</message>
<message>
- <location line="-75"/>
+ <location line="-91"/>
<source>Cannot resolve -bind address: &apos;%s&apos;</source>
<translation type="unfinished"/>
</message>
@@ -2658,17 +2886,17 @@ If the file does not exist, create it with owner-readable-only file permissions.
<translation type="unfinished"/>
</message>
<message>
- <location line="+31"/>
+ <location line="+45"/>
<source>Invalid amount for -paytxfee=&lt;amount&gt;: &apos;%s&apos;</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-15"/>
+ <location line="-24"/>
<source>Error: could not start node</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+16"/>
+ <location line="+25"/>
<source>Invalid amount</source>
<translation type="unfinished"/>
</message>
@@ -2683,7 +2911,7 @@ If the file does not exist, create it with owner-readable-only file permissions.
<translation type="unfinished"/>
</message>
<message>
- <location line="-45"/>
+ <location line="-59"/>
<source>Add a node to connect to and attempt to keep the connection open</source>
<translation type="unfinished"/>
</message>
@@ -2693,22 +2921,17 @@ If the file does not exist, create it with owner-readable-only file permissions.
<translation type="unfinished"/>
</message>
<message>
- <location line="+54"/>
- <source>Find peers using internet relay chat (default: 0)</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="-2"/>
+ <location line="+68"/>
<source>Fee per KB to add to transactions you send</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+19"/>
+ <location line="+17"/>
<source>Loading wallet...</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-40"/>
+ <location line="-54"/>
<source>Cannot downgrade wallet</source>
<translation type="unfinished"/>
</message>
@@ -2723,27 +2946,27 @@ If the file does not exist, create it with owner-readable-only file permissions.
<translation type="unfinished"/>
</message>
<message>
- <location line="+49"/>
+ <location line="+64"/>
<source>Rescanning...</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-43"/>
+ <location line="-56"/>
<source>Done loading</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+65"/>
+ <location line="+79"/>
<source>To use the %s option</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-60"/>
+ <location line="-71"/>
<source>Error</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-28"/>
+ <location line="-33"/>
<source>You must set rpcpassword=&lt;password&gt; in the configuration file:
%s
If the file does not exist, create it with owner-readable-only file permissions.</source>
diff --git a/src/qt/locale/bitcoin_tr.ts b/src/qt/locale/bitcoin_tr.ts
index 08e94bf713..f3736d8ac4 100644
--- a/src/qt/locale/bitcoin_tr.ts
+++ b/src/qt/locale/bitcoin_tr.ts
@@ -13,12 +13,7 @@
<translation>&lt;b&gt;Bitcoin&lt;/b&gt; sürüm</translation>
</message>
<message>
- <location line="+41"/>
- <source>Copyright © 2009-2012 The Bitcoin developers</source>
- <translation>Telif hakkı © 2009-2012 Bitcoin geliştiricileri</translation>
- </message>
- <message>
- <location line="+13"/>
+ <location line="+57"/>
<source>
This is experimental software.
@@ -32,6 +27,16 @@ This product includes software developed by the OpenSSL Project for use in the O
Bu ürün OpenSSL projesi tarafından OpenSSL araç takımı (http://www.openssl.org/) için geliştirilen yazılımlar, Eric Young (eay@cryptsoft.com) tarafından hazırlanmış şifreleme yazılımları ve Thomas Bernard tarafından programlanmış UPnP yazılımı içerir.</translation>
</message>
+ <message>
+ <location filename="../aboutdialog.cpp" line="+17"/>
+ <source>Copyright</source>
+ <translation>Telif hakkı</translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>2009-%1 The Bitcoin developers</source>
+ <translation>2009-%1 Bitcoin geliÅŸtiricileri</translation>
+ </message>
</context>
<context>
<name>AddressBookPage</name>
@@ -106,17 +111,22 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation>&amp;Sil</translation>
</message>
<message>
- <location filename="../addressbookpage.cpp" line="+65"/>
+ <location filename="../addressbookpage.cpp" line="+66"/>
<source>Copy &amp;Label</source>
<translation>&amp;Etiketi kopyala</translation>
</message>
<message>
- <location line="+2"/>
+ <location line="+1"/>
<source>&amp;Edit</source>
<translation>&amp;Düzenle</translation>
</message>
<message>
- <location line="+250"/>
+ <location line="+1"/>
+ <source>Send &amp;Coins</source>
+ <translation>Bit&amp;coin Gönder</translation>
+ </message>
+ <message>
+ <location line="+263"/>
<source>Export Address Book Data</source>
<translation>Adres defteri verilerini dışa aktar</translation>
</message>
@@ -139,7 +149,7 @@ This product includes software developed by the OpenSSL Project for use in the O
<context>
<name>AddressTableModel</name>
<message>
- <location filename="../addresstablemodel.cpp" line="+142"/>
+ <location filename="../addresstablemodel.cpp" line="+144"/>
<source>Label</source>
<translation>Etiket</translation>
</message>
@@ -298,17 +308,17 @@ This product includes software developed by the OpenSSL Project for use in the O
<context>
<name>BitcoinGUI</name>
<message>
- <location filename="../bitcoingui.cpp" line="+267"/>
+ <location filename="../bitcoingui.cpp" line="+231"/>
<source>Sign &amp;message...</source>
<translation>&amp;Mesaj imzala...</translation>
</message>
<message>
- <location line="+254"/>
+ <location line="+299"/>
<source>Synchronizing with network...</source>
<translation>Åžebeke ile senkronizasyon...</translation>
</message>
<message>
- <location line="-322"/>
+ <location line="-367"/>
<source>&amp;Overview</source>
<translation>&amp;Genel bakış</translation>
</message>
@@ -328,32 +338,17 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation>Muamele tarihçesini tara</translation>
</message>
<message>
- <location line="+6"/>
- <source>&amp;Address Book</source>
- <translation>&amp;Adres defteri</translation>
- </message>
- <message>
- <location line="+1"/>
+ <location line="+7"/>
<source>Edit the list of stored addresses and labels</source>
<translation>Saklanan adres ve etiket listesini düzenle</translation>
</message>
<message>
- <location line="-15"/>
- <source>&amp;Receive coins</source>
- <translation>Bitcoin &amp;al</translation>
- </message>
- <message>
- <location line="+1"/>
+ <location line="-14"/>
<source>Show the list of addresses for receiving payments</source>
<translation>Ödeme alma adreslerinin listesini göster</translation>
</message>
<message>
- <location line="-8"/>
- <source>&amp;Send coins</source>
- <translation>Bitcoin &amp;yolla</translation>
- </message>
- <message>
- <location line="+39"/>
+ <location line="+31"/>
<source>E&amp;xit</source>
<translation>&amp;Çık</translation>
</message>
@@ -398,7 +393,7 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation>Parolayı &amp;değiştir...</translation>
</message>
<message>
- <location line="+259"/>
+ <location line="+304"/>
<source>Importing blocks from disk...</source>
<translation>Bloklar diskten içe aktarılıyor...</translation>
</message>
@@ -407,13 +402,8 @@ This product includes software developed by the OpenSSL Project for use in the O
<source>Reindexing blocks on disk...</source>
<translation>Diskteki bloklar yeniden endeksleniyor...</translation>
</message>
- <message numerus="yes">
- <location line="+10"/>
- <source>~%n block(s) remaining</source>
- <translation><numerusform>~%n blok kaldı</numerusform></translation>
- </message>
<message>
- <location line="-265"/>
+ <location line="-300"/>
<source>&amp;Export...</source>
<translation>&amp;Dışa aktar...</translation>
</message>
@@ -458,18 +448,33 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation>Mesaj &amp;kontrol et...</translation>
</message>
<message>
- <location line="-196"/>
- <location line="+538"/>
+ <location line="-162"/>
+ <location line="+540"/>
<source>Bitcoin</source>
<translation>Bitcoin</translation>
</message>
<message>
- <location line="-538"/>
+ <location line="-540"/>
<source>Wallet</source>
<translation>Cüzdan</translation>
</message>
<message>
- <location line="+176"/>
+ <location line="+99"/>
+ <source>&amp;Send</source>
+ <translation>&amp;Gönder</translation>
+ </message>
+ <message>
+ <location line="+7"/>
+ <source>&amp;Receive</source>
+ <translation>&amp;Al</translation>
+ </message>
+ <message>
+ <location line="+14"/>
+ <source>&amp;Addresses</source>
+ <translation>&amp;Adresler</translation>
+ </message>
+ <message>
+ <location line="+22"/>
<source>&amp;About Bitcoin</source>
<translation>Bitcoin &amp;Hakkında</translation>
</message>
@@ -530,27 +535,57 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation>[testnet]</translation>
</message>
<message>
- <location line="+63"/>
+ <location line="+47"/>
<source>Bitcoin client</source>
<translation>Bitcoin istemcisi</translation>
</message>
<message numerus="yes">
- <location line="+79"/>
+ <location line="+140"/>
<source>%n active connection(s) to Bitcoin network</source>
- <translation><numerusform>Bitcoin şebekesine %n faal bağlantı</numerusform></translation>
+ <translation><numerusform>Bitcoin şebekesine %n faal bağlantı</numerusform><numerusform>Bitcoin şebekesine %n faal bağlantı</numerusform></translation>
</message>
<message>
- <location line="+45"/>
- <source>Processed %1 of %2 blocks of transaction history (%3% done).</source>
- <translation>Muamele tarihçesinde toplam %2 blok üzerinden %1 blok işlendi (%%3 tamamlandı).</translation>
+ <location line="+39"/>
+ <source>Processed %1 of %2 (estimated) blocks of transaction history.</source>
+ <translation>Muamele tarihçesinin toplam (tahmini) %2 blokundan %1 blok işlendi.</translation>
</message>
<message>
- <location line="+7"/>
+ <location line="+4"/>
<source>Processed %1 blocks of transaction history.</source>
<translation>Muamele tarihçesinde %1 blok işlendi.</translation>
</message>
+ <message numerus="yes">
+ <location line="+20"/>
+ <source>%n hour(s)</source>
+ <translation><numerusform>%n saat</numerusform><numerusform>%n saat</numerusform></translation>
+ </message>
+ <message numerus="yes">
+ <location line="+4"/>
+ <source>%n day(s)</source>
+ <translation><numerusform>%n gün</numerusform><numerusform>%n gün</numerusform></translation>
+ </message>
+ <message numerus="yes">
+ <location line="+4"/>
+ <source>%n week(s)</source>
+ <translation><numerusform>%n hafta</numerusform><numerusform>%n hafta</numerusform></translation>
+ </message>
<message>
- <location line="+70"/>
+ <location line="+5"/>
+ <source>%1 behind</source>
+ <translation>%1 geride</translation>
+ </message>
+ <message>
+ <location line="+14"/>
+ <source>Last received block was generated %1 ago.</source>
+ <translation>Son alınan blok %1 evvel oluşturulmuştu.</translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Transactions after this will not yet be visible.</source>
+ <translation>Bundan sonraki muameleler henüz görüntülenemez.</translation>
+ </message>
+ <message>
+ <location line="+21"/>
<source>Error</source>
<translation>Hata</translation>
</message>
@@ -565,62 +600,27 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation>Bilgi</translation>
</message>
<message>
- <location line="+66"/>
+ <location line="+68"/>
<source>This transaction is over the size limit. You can still send it for a fee of %1, which goes to the nodes that process your transaction and helps to support the network. Do you want to pay the fee?</source>
<translation>Bu muamele boyut sınırlarını aşmıştır. Gene de %1 ücret ödeyerek gönderebilirsiniz, ki bu ücret muamelenizi işleyen ve şebekeye yardım eden düğümlere ödenecektir. Ücreti ödemek istiyor musunuz?</translation>
</message>
<message>
- <location line="+210"/>
- <source>Backup Successful</source>
- <translation>Yedekleme başarılı</translation>
- </message>
- <message>
- <location line="+0"/>
- <source>The wallet data was successfully saved to the new location.</source>
- <translation>Cüzdan verileri başarılı bir şekilde yeni konuma kaydedildi.</translation>
- </message>
- <message numerus="yes">
- <location line="-338"/>
- <source>%n second(s) ago</source>
- <translation><numerusform>%n saniye önce</numerusform></translation>
- </message>
- <message numerus="yes">
- <location line="+4"/>
- <source>%n minute(s) ago</source>
- <translation><numerusform>%n dakika önce</numerusform></translation>
- </message>
- <message numerus="yes">
- <location line="+4"/>
- <source>%n hour(s) ago</source>
- <translation><numerusform>%n saat önce</numerusform></translation>
- </message>
- <message numerus="yes">
- <location line="+4"/>
- <source>%n day(s) ago</source>
- <translation><numerusform>%n gün önce</numerusform></translation>
- </message>
- <message>
- <location line="+6"/>
+ <location line="-138"/>
<source>Up to date</source>
<translation>Güncel</translation>
</message>
<message>
- <location line="+7"/>
+ <location line="+32"/>
<source>Catching up...</source>
<translation>Aralık kapatılıyor...</translation>
</message>
<message>
- <location line="+10"/>
- <source>Last received block was generated %1.</source>
- <translation>Son alınan blok şu vakit oluşturulmuştu: %1.</translation>
- </message>
- <message>
- <location line="+97"/>
+ <location line="+110"/>
<source>Confirm transaction fee</source>
<translation>Muamele ücretini teyit et</translation>
</message>
<message>
- <location line="+23"/>
+ <location line="+8"/>
<source>Sent transaction</source>
<translation>Muamele yollandı</translation>
</message>
@@ -643,14 +643,14 @@ Adres: %4
</translation>
</message>
<message>
- <location line="+99"/>
- <location line="+28"/>
+ <location line="+33"/>
+ <location line="+23"/>
<source>URI handling</source>
<translation>URI yönetimi</translation>
</message>
<message>
- <location line="-28"/>
- <location line="+28"/>
+ <location line="-23"/>
+ <location line="+23"/>
<source>URI can not be parsed! This can be caused by an invalid Bitcoin address or malformed URI parameters.</source>
<translation>URI okunamadı! Sebebi geçersiz bir Bitcoin adresi veya hatalı URI parametreleri olabilir.</translation>
</message>
@@ -665,27 +665,7 @@ Adres: %4
<translation>Cüzdan &lt;b&gt;şifrelenmiştir&lt;/b&gt; ve şu anda &lt;b&gt;kilitlidir&lt;/b&gt;</translation>
</message>
<message>
- <location line="+23"/>
- <source>Backup Wallet</source>
- <translation>Cüzdanı yedekle</translation>
- </message>
- <message>
- <location line="+0"/>
- <source>Wallet Data (*.dat)</source>
- <translation>Cüzdan verileri (*.dat)</translation>
- </message>
- <message>
- <location line="+3"/>
- <source>Backup Failed</source>
- <translation>Yedekleme başarısız oldu</translation>
- </message>
- <message>
- <location line="+0"/>
- <source>There was an error trying to save the wallet data to the new location.</source>
- <translation>Cüzdan verilerinin başka bir konumda kaydedilmesi sırasında bir hata meydana geldi.</translation>
- </message>
- <message>
- <location filename="../bitcoin.cpp" line="+109"/>
+ <location filename="../bitcoin.cpp" line="+108"/>
<source>A fatal error occurred. Bitcoin can no longer continue safely and will quit.</source>
<translation>Ciddi bir hata oluştu. Bitcoin artık güvenli bir şekilde işlemeye devam edemez ve kapanacaktır.</translation>
</message>
@@ -693,7 +673,7 @@ Adres: %4
<context>
<name>ClientModel</name>
<message>
- <location filename="../clientmodel.cpp" line="+86"/>
+ <location filename="../clientmodel.cpp" line="+96"/>
<source>Network Alert</source>
<translation>Şebeke hakkında uyarı</translation>
</message>
@@ -726,7 +706,7 @@ Adres: %4
<translation>Bu adres defteri unsuru ile ilişkili adres. Bu, sadece gönderi adresi için değiştirilebilir.</translation>
</message>
<message>
- <location filename="../editaddressdialog.cpp" line="+20"/>
+ <location filename="../editaddressdialog.cpp" line="+21"/>
<source>New receiving address</source>
<translation>Yeni alım adresi</translation>
</message>
@@ -746,17 +726,17 @@ Adres: %4
<translation>Gönderi adresini düzenle</translation>
</message>
<message>
- <location line="+60"/>
+ <location line="+76"/>
<source>The entered address &quot;%1&quot; is already in the address book.</source>
<translation>Girilen &quot;%1&quot; adresi hâlihazırda adres defterinde mevcuttur.</translation>
</message>
<message>
- <location line="+5"/>
+ <location line="-5"/>
<source>The entered address &quot;%1&quot; is not a valid Bitcoin address.</source>
<translation>Girilen &quot;%1&quot; adresi geçerli bir Bitcoin adresi değildir.</translation>
</message>
<message>
- <location line="+5"/>
+ <location line="+10"/>
<source>Could not unlock wallet.</source>
<translation>Cüzdan kilidi açılamadı.</translation>
</message>
@@ -769,7 +749,7 @@ Adres: %4
<context>
<name>GUIUtil::HelpMessageBox</name>
<message>
- <location filename="../guiutil.cpp" line="+419"/>
+ <location filename="../guiutil.cpp" line="+422"/>
<location line="+12"/>
<source>Bitcoin-Qt</source>
<translation>Bitcoin-Qt</translation>
@@ -983,7 +963,7 @@ Adres: %4
<translation>&amp;Uygula</translation>
</message>
<message>
- <location filename="../optionsdialog.cpp" line="+55"/>
+ <location filename="../optionsdialog.cpp" line="+53"/>
<source>default</source>
<translation>varsayılan</translation>
</message>
@@ -1028,23 +1008,18 @@ Adres: %4
<translation>Form</translation>
</message>
<message>
- <location line="+51"/>
- <location line="+183"/>
+ <location line="+50"/>
+ <location line="+166"/>
<source>The displayed information may be out of date. Your wallet automatically synchronizes with the Bitcoin network after a connection is established, but this process has not completed yet.</source>
<translation>Görüntülenen veriler zaman aşımına uğramış olabilir. Bağlantı kurulduğunda cüzdanınız otomatik olarak şebeke ile eşleşir ancak bu işlem henüz tamamlanmamıştır.</translation>
</message>
<message>
- <location line="-141"/>
+ <location line="-124"/>
<source>Balance:</source>
<translation>Bakiye:</translation>
</message>
<message>
- <location line="+58"/>
- <source>Number of transactions:</source>
- <translation>Muamele sayısı:</translation>
- </message>
- <message>
- <location line="-29"/>
+ <location line="+29"/>
<source>Unconfirmed:</source>
<translation>Doğrulanmamış:</translation>
</message>
@@ -1054,7 +1029,7 @@ Adres: %4
<translation>Cüzdan</translation>
</message>
<message>
- <location line="+124"/>
+ <location line="+107"/>
<source>Immature:</source>
<translation>Olgunlaşmamış:</translation>
</message>
@@ -1069,7 +1044,7 @@ Adres: %4
<translation>&lt;b&gt;Son muameleler&lt;/b&gt;</translation>
</message>
<message>
- <location line="-118"/>
+ <location line="-101"/>
<source>Your current balance</source>
<translation>Güncel bakiyeniz</translation>
</message>
@@ -1079,11 +1054,6 @@ Adres: %4
<translation>Doğrulanması beklenen ve henüz güncel bakiyeye ilâve edilmemiş muamelelerin toplamı</translation>
</message>
<message>
- <location line="+20"/>
- <source>Total number of transactions in wallet</source>
- <translation>Cüzdandaki muamelelerin toplam sayısı</translation>
- </message>
- <message>
<location filename="../overviewpage.cpp" line="+115"/>
<location line="+1"/>
<source>out of sync</source>
@@ -1091,6 +1061,14 @@ Adres: %4
</message>
</context>
<context>
+ <name>PaymentServer</name>
+ <message>
+ <location filename="../paymentserver.cpp" line="+107"/>
+ <source>Cannot start bitcoin: click-to-pay handler</source>
+ <translation>Bitcoin başlatılamadı: tıkla-ve-öde yöneticisi</translation>
+ </message>
+</context>
+<context>
<name>QRCodeDialog</name>
<message>
<location filename="../forms/qrcodedialog.ui" line="+14"/>
@@ -1429,7 +1407,7 @@ Adres: %4
</message>
<message>
<location line="+60"/>
- <location filename="../sendcoinsentry.cpp" line="+25"/>
+ <location filename="../sendcoinsentry.cpp" line="+26"/>
<source>Enter a label for this address to add it to your address book</source>
<translation>Adres defterinize eklemek için bu adrese ilişik bir etiket giriniz</translation>
</message>
@@ -1536,7 +1514,7 @@ Adres: %4
<message>
<location line="+3"/>
<source>Sign &amp;Message</source>
- <translation>&amp;Mesaj imzala</translation>
+ <translation>&amp;Mesajı imzala</translation>
</message>
<message>
<location line="+14"/>
@@ -1552,7 +1530,7 @@ Adres: %4
<message>
<location line="-87"/>
<source>&amp;Verify Message</source>
- <translation>Mesajı &amp;kontrol et</translation>
+ <translation>Mesaj &amp;kontrol et</translation>
</message>
<message>
<location line="+6"/>
@@ -1665,7 +1643,7 @@ Adres: %4
<context>
<name>TransactionDesc</name>
<message>
- <location filename="../transactiondesc.cpp" line="+19"/>
+ <location filename="../transactiondesc.cpp" line="+20"/>
<source>Open until %1</source>
<translation>%1 değerine dek açık</translation>
</message>
@@ -1692,7 +1670,7 @@ Adres: %4
<message numerus="yes">
<location line="+7"/>
<source>, broadcast through %n node(s)</source>
- <translation><numerusform>, %n düğüm vasıtasıyla yayınlandı</numerusform></translation>
+ <translation><numerusform>, %n düğüm vasıtasıyla yayınlandı</numerusform><numerusform>, %n düğüm vasıtasıyla yayınlandı</numerusform></translation>
</message>
<message>
<location line="+4"/>
@@ -1745,7 +1723,7 @@ Adres: %4
<message numerus="yes">
<location line="-102"/>
<source>matures in %n more block(s)</source>
- <translation><numerusform>%n ek blok sonrasında olgunlaşacak</numerusform></translation>
+ <translation><numerusform>%n ek blok sonrasında olgunlaşacak</numerusform><numerusform>%n ek blok sonrasında olgunlaşacak</numerusform></translation>
</message>
<message>
<location line="+2"/>
@@ -1828,7 +1806,7 @@ Adres: %4
<message numerus="yes">
<location line="-35"/>
<source>Open for %n more block(s)</source>
- <translation><numerusform>%n ilâve blok için açık</numerusform></translation>
+ <translation><numerusform>%n ilâve blok için açık</numerusform><numerusform>%n ilâve blok için açık</numerusform></translation>
</message>
<message>
<location line="+70"/>
@@ -1852,7 +1830,7 @@ Adres: %4
<context>
<name>TransactionTableModel</name>
<message>
- <location filename="../transactiontablemodel.cpp" line="+226"/>
+ <location filename="../transactiontablemodel.cpp" line="+225"/>
<source>Date</source>
<translation>Tarih</translation>
</message>
@@ -1874,7 +1852,7 @@ Adres: %4
<message numerus="yes">
<location line="+57"/>
<source>Open for %n more block(s)</source>
- <translation><numerusform>%n ilâve blok için açık</numerusform></translation>
+ <translation><numerusform>%n ilâve blok için açık</numerusform><numerusform>%n ilâve blok için açık</numerusform></translation>
</message>
<message>
<location line="+3"/>
@@ -1899,7 +1877,7 @@ Adres: %4
<message numerus="yes">
<location line="+8"/>
<source>Mined balance will be available when it matures in %n more block(s)</source>
- <translation><numerusform>Madenden çıkarılan bakiye %n ek blok sonrasında olgunlaştığında kullanılabilecektir</numerusform></translation>
+ <translation><numerusform>Madenden çıkarılan bakiye %n ek blok sonrasında olgunlaştığında kullanılabilecektir</numerusform><numerusform>Madenden çıkarılan bakiye %n ek blok sonrasında olgunlaştığında kullanılabilecektir</numerusform></translation>
</message>
<message>
<location line="+5"/>
@@ -1970,7 +1948,7 @@ Adres: %4
<context>
<name>TransactionView</name>
<message>
- <location filename="../transactionview.cpp" line="+55"/>
+ <location filename="../transactionview.cpp" line="+52"/>
<location line="+16"/>
<source>All</source>
<translation>Hepsi</translation>
@@ -2057,6 +2035,11 @@ Adres: %4
</message>
<message>
<location line="+1"/>
+ <source>Copy transaction ID</source>
+ <translation>Muamele kimliÄŸini kopyala</translation>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Edit label</source>
<translation>Etiketi düzenle</translation>
</message>
@@ -2066,7 +2049,7 @@ Adres: %4
<translation>Muamele detaylarını göster</translation>
</message>
<message>
- <location line="+142"/>
+ <location line="+139"/>
<source>Export Transaction Data</source>
<translation>Muamele verilerini dışa aktar</translation>
</message>
@@ -2121,7 +2104,7 @@ Adres: %4
<translation>%1 dosyasına yazılamadı.</translation>
</message>
<message>
- <location line="+95"/>
+ <location line="+100"/>
<source>Range:</source>
<translation>Aralık:</translation>
</message>
@@ -2132,29 +2115,172 @@ Adres: %4
</message>
</context>
<context>
+ <name>WalletView</name>
+ <message>
+ <location filename="../walletview.cpp" line="+95"/>
+ <source>&amp;Overview</source>
+ <translation>&amp;Genel bakış</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Show general overview of wallet</source>
+ <translation>Cüzdana genel bakışı göster</translation>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>&amp;Send coins</source>
+ <translation>Bitcoin &amp;gönder</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Send coins to a Bitcoin address</source>
+ <translation>Bir Bitcoin adresine Bitcoin yolla</translation>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>&amp;Receive coins</source>
+ <translation>Bitcoin &amp;al</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Show the list of addresses for receiving payments</source>
+ <translation>Ödeme almak için kullanılan adreslerin listesini göster</translation>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>&amp;Transactions</source>
+ <translation>&amp;Muameleler</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Browse transaction history</source>
+ <translation>Muamele tarihçesine göz at</translation>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>&amp;Address Book</source>
+ <translation>&amp;Adres defteri</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Edit the list of stored addresses and labels</source>
+ <translation>Saklanan adreslerin ve etiketlerin listesini düzenle</translation>
+ </message>
+ <message>
+ <location line="+12"/>
+ <source>&amp;Encrypt Wallet...</source>
+ <translation>Cüzdanı şifrele...</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Encrypt the private keys that belong to your wallet</source>
+ <translation>Cüzdanınıza ait özel anahtarları şifrele</translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>&amp;Backup Wallet...</source>
+ <translation>Cüzdanı &amp;yedekle</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Backup wallet to another location</source>
+ <translation>Cüzdanı başka bir konuma yedekle</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>&amp;Change Passphrase...</source>
+ <translation>Parolayı &amp;değiştir...</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Change the passphrase used for wallet encryption</source>
+ <translation>Cüzdanı şifrelemek için kullanılan parolayı değiştir</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Sign &amp;message...</source>
+ <translation>&amp;Mesaj imzala...</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Sign messages with your Bitcoin addresses to prove you own them</source>
+ <translation>Size ait olduklarını ispat etmek için Bitcoin adreslerinizle mesaj imzalayın</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>&amp;Verify message...</source>
+ <translation>Mesaj &amp;kontrol et...</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Verify messages to ensure they were signed with specified Bitcoin addresses</source>
+ <translation>Belirtilen Bitcoin adresleri ile imzalandıklarını teyit etmek için mesaj kontrol et</translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>&amp;Export...</source>
+ <translation>&amp;Dışa aktar...</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Export the data in the current tab to a file</source>
+ <translation>Güncel sekmedeki verileri bir dosyaya aktar</translation>
+ </message>
+ <message>
+ <location line="+180"/>
+ <source>Backup Wallet</source>
+ <translation>Cüzdanı yedekle</translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>Wallet Data (*.dat)</source>
+ <translation>Cüzdan verileri (*.dat)</translation>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Backup Failed</source>
+ <translation>Yedekleme başarısız oldu</translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>There was an error trying to save the wallet data to the new location.</source>
+ <translation>Cüzdanı değişik bir konuma kaydetmek denenirken bir hata meydana geldi.</translation>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>Backup Successful</source>
+ <translation>Yedekleme başarılı</translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>The wallet data was successfully saved to the new location.</source>
+ <translation>Cüzdan verileri başarılı bir şekilde yeni konuma kaydedildi.</translation>
+ </message>
+</context>
+<context>
<name>bitcoin-core</name>
<message>
- <location filename="../bitcoinstrings.cpp" line="+88"/>
+ <location filename="../bitcoinstrings.cpp" line="+96"/>
<source>Bitcoin version</source>
<translation>Bitcoin sürümü</translation>
</message>
<message>
- <location line="+82"/>
+ <location line="+98"/>
<source>Usage:</source>
<translation>Kullanım:</translation>
</message>
<message>
- <location line="-23"/>
+ <location line="-24"/>
<source>Send command to -server or bitcoind</source>
<translation>-server ya da bitcoind&apos;ye komut gönder</translation>
</message>
<message>
- <location line="-21"/>
+ <location line="-22"/>
<source>List commands</source>
<translation>Komutları listele</translation>
</message>
<message>
- <location line="-11"/>
+ <location line="-10"/>
<source>Get help for a command</source>
<translation>Bir komut için yardım al</translation>
</message>
@@ -2179,12 +2305,12 @@ Adres: %4
<translation>Madenî para (Bitcoin) oluştur</translation>
</message>
<message>
- <location line="-15"/>
+ <location line="-28"/>
<source>Don&apos;t generate coins</source>
<translation>Bitcoin oluşturmasını devre dışı bırak</translation>
</message>
<message>
- <location line="+61"/>
+ <location line="+74"/>
<source>Specify data directory</source>
<translation>Veri dizinini belirt</translation>
</message>
@@ -2194,87 +2320,92 @@ Adres: %4
<translation>Veritabanı önbellek boyutunu megabayt olarak belirt (varsayılan: 25)</translation>
</message>
<message>
- <location line="-26"/>
+ <location line="-27"/>
<source>Listen for connections on &lt;port&gt; (default: 8333 or testnet: 18333)</source>
<translation>Bağlantılar için dinlenecek &lt;port&gt; (varsayılan: 8333 ya da testnet: 18333)</translation>
</message>
<message>
- <location line="+4"/>
+ <location line="+5"/>
<source>Maintain at most &lt;n&gt; connections to peers (default: 125)</source>
<translation>Eşler ile en çok &lt;n&gt; adet bağlantı kur (varsayılan: 125)</translation>
</message>
<message>
- <location line="-34"/>
+ <location line="-49"/>
<source>Connect to a node to retrieve peer addresses, and disconnect</source>
<translation>Eş adresleri elde etmek için bir düğüme bağlan ve ardından bağlantıyı kes</translation>
</message>
<message>
- <location line="+65"/>
+ <location line="+80"/>
<source>Specify your own public address</source>
<translation>Kendi genel adresinizi tanımlayın</translation>
</message>
<message>
- <location line="+2"/>
+ <location line="+3"/>
<source>Threshold for disconnecting misbehaving peers (default: 100)</source>
<translation>Aksaklık gösteren eşlerle bağlantıyı kesme sınırı (varsayılan: 100)</translation>
</message>
<message>
- <location line="-114"/>
+ <location line="-132"/>
<source>Number of seconds to keep misbehaving peers from reconnecting (default: 86400)</source>
<translation>Aksaklık gösteren eşlerle yeni bağlantıları engelleme süresi, saniye olarak (varsayılan: 86400)</translation>
</message>
<message>
- <location line="-28"/>
+ <location line="-32"/>
<source>An error occurred while setting up the RPC port %u for listening on IPv4: %s</source>
<translation>IPv4 üzerinde dinlemek için %u numaralı RPC portunun kurulumu sırasında hata meydana geldi: %s</translation>
</message>
<message>
- <location line="+26"/>
+ <location line="+30"/>
<source>Listen for JSON-RPC connections on &lt;port&gt; (default: 8332 or testnet: 18332)</source>
<translation>JSON-RPC bağlantılarını &lt;port&gt; üzerinde dinle (varsayılan: 8332 veya tesnet: 18332)</translation>
</message>
<message>
- <location line="+34"/>
+ <location line="+36"/>
<source>Accept command line and JSON-RPC commands</source>
<translation>Konut satırı ve JSON-RPC komutlarını kabul et</translation>
</message>
<message>
- <location line="+62"/>
+ <location line="+77"/>
<source>Run in the background as a daemon and accept commands</source>
<translation>Arka planda daemon (servis) olarak çalış ve komutları kabul et</translation>
</message>
<message>
- <location line="+31"/>
+ <location line="+32"/>
<source>Use the test network</source>
<translation>Deneme ÅŸebekesini kullan</translation>
</message>
<message>
- <location line="-92"/>
+ <location line="-108"/>
<source>Accept connections from outside (default: 1 if no -proxy or -connect)</source>
<translation>Dışarıdan gelen bağlantıları kabul et (varsayılan: -proxy veya -connect yoksa 1)</translation>
</message>
<message>
- <location line="-74"/>
+ <location line="-82"/>
<source>%s, you must set a rpcpassword in the configuration file:
- %s
+%s
It is recommended you use the following random password:
rpcuser=bitcoinrpc
rpcpassword=%s
(you do not need to remember this password)
The username and password MUST NOT be the same.
If the file does not exist, create it with owner-readable-only file permissions.
+It is also recommended to set alertnotify so you are notified of problems;
+for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.com
</source>
<translation>%s, şu yapılandırma dosyasında rpc parolası belirtmeniz gerekir:
- %s
+%s
Aşağıdaki rastgele oluşturulan parolayı kullanmanız tavsiye edilir:
rpcuser=bitcoinrpc
rpcpassword=%s
(bu parolayı hatırlamanız gerekli değildir)
Kullanıcı ismi ile parolanın FARKLI olmaları gerekir.
-Dosya mevcut değilse, sadece sahibi için okumayla sınırlı izin ile oluşturunuz.</translation>
+Dosya mevcut değilse, sadece sahibi için okumayla sınırlı izin ile oluşturunuz.
+Sorunlar hakkında bildiri almak için alertnotify unsurunu ayarlamanız tavsiye edilir;
+mesela: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.com
+</translation>
</message>
<message>
- <location line="+15"/>
+ <location line="+17"/>
<source>An error occurred while setting up the RPC port %u for listening on IPv6, falling back to IPv4: %s</source>
<translation>IPv6 üzerinde dinlemek için %u numaralı RPC portu kurulurken bir hata meydana geldi, IPv4&apos;e dönülüyor: %s</translation>
</message>
@@ -2290,11 +2421,6 @@ Dosya mevcut değilse, sadece sahibi için okumayla sınırlı izin ile oluştur
</message>
<message>
<location line="+3"/>
- <source>Corrupted block database detected. Please restart the client with -reindex.</source>
- <translation>Bozuk blok veritabanı tespit edildi. Lütfen istemciyi -reindex ile tekrar başlatınız.</translation>
- </message>
- <message>
- <location line="+2"/>
<source>Error initializing database environment %s! To recover, BACKUP THAT DIRECTORY, then remove everything from it except for wallet.dat.</source>
<translation>%s veritabanı ortamının başlatılması sırasında bir hata meydana geldi! Düzeltmek için BU KLASÖRÜ YEDEKLEYİN, ardından klasörden wallet.dat dışında tüm dosyaları silin.</translation>
</message>
@@ -2309,12 +2435,27 @@ Dosya mevcut değilse, sadece sahibi için okumayla sınırlı izin ile oluştur
<translation>Hata: Muamelenin miktarı, karmaşıklığı ya da yakın geçmişte alınan fonların kullanılması nedeniyle bu muamele en az %s tutarında ücret gerektirmektedir!</translation>
</message>
<message>
+ <location line="+3"/>
+ <source>Execute command when a relevant alert is received (%s in cmd is replaced by message)</source>
+ <translation>İlgili bir uyarı alındığında komut çalıştır (komuttaki %s mesaj ile değiştirilecektir)</translation>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Execute command when a wallet transaction changes (%s in cmd is replaced by TxID)</source>
+ <translation>Bir cüzdan muamelesi değiştiğinde komutu çalıştır (komuttaki %s TxID ile değiştirilecektir)</translation>
+ </message>
+ <message>
<location line="+11"/>
<source>Set maximum size of high-priority/low-fee transactions in bytes (default: 27000)</source>
<translation>Yüksek öncelikli/düşük ücretli muamelelerin boyutunu bayt olarak tanımla (varsayılan: 27000)</translation>
</message>
<message>
<location line="+3"/>
+ <source>Set the number of script verification threads (1-16, 0=auto, default: 0)</source>
+ <translation>Betik kontrolü iş parçacığı sayısını belirt (1 ilâ 6, 0=otomatik, varsayılan: 0)</translation>
+ </message>
+ <message>
+ <location line="+2"/>
<source>This is a pre-release test build - use at your own risk - do not use for mining or merchant applications</source>
<translation>Bu yayın öncesi bir deneme sürümüdür - tüm riski siz üstlenmiş olursunuz - bitcoin oluşturmak ya da ticari uygulamalar için kullanmayınız</translation>
</message>
@@ -2360,16 +2501,41 @@ Dosya mevcut değilse, sadece sahibi için okumayla sınırlı izin ile oluştur
</message>
<message>
<location line="+3"/>
+ <source>Corrupted block database detected</source>
+ <translation>Bozuk blok veritabanı tespit edildi</translation>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Discover own IP address (default: 1 when listening and no -externalip)</source>
<translation>Kendi IP adresini keşfet (varsayılan: dinlenildiğinde ve -externalip yoksa 1)</translation>
</message>
<message>
+ <location line="+1"/>
+ <source>Do you want to rebuild the block database now?</source>
+ <translation>Blok veritabanını şimdi yeniden inşa etmek istiyor musunuz?</translation>
+ </message>
+ <message>
<location line="+3"/>
+ <source>Error initializing block database</source>
+ <translation>Blok veritabanını başlatılırken bir hata meydana geldi</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Error initializing wallet database environment %s!</source>
+ <translation>%s cüzdan veritabanı ortamının başlatılmasında hata meydana geldi!</translation>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Error loading block database</source>
<translation>Blok veritabanının yüklenmesinde hata</translation>
</message>
<message>
- <location line="+5"/>
+ <location line="+4"/>
+ <source>Error opening block database</source>
+ <translation>Blok veritabanının açılışı sırasında hata</translation>
+ </message>
+ <message>
+ <location line="+2"/>
<source>Error: Disk space is low!</source>
<translation>Hata: Disk alanı düşük!</translation>
</message>
@@ -2385,26 +2551,96 @@ Dosya mevcut değilse, sadece sahibi için okumayla sınırlı izin ile oluştur
</message>
<message>
<location line="+2"/>
+ <source>Error: system error: </source>
+ <translation>Hata: sistem hatası:</translation>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Failed to listen on any port. Use -listen=0 if you want this.</source>
<translation>Herhangi bir portun dinlenmesi başarısız oldu. Bunu istiyorsanız -listen=0 seçeneğini kullanınız.</translation>
</message>
<message>
+ <location line="+1"/>
+ <source>Failed to read block info</source>
+ <translation>Blok verileri okunamadı</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Failed to read block</source>
+ <translation>Blok okunamadı</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Failed to sync block index</source>
+ <translation>Blok indeksi eÅŸleÅŸtirilemedi</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Failed to write block index</source>
+ <translation>Blok indeksi yazılamadı</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Failed to write block info</source>
+ <translation>Blok verileri yazılamadı</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Failed to write block</source>
+ <translation>Blok yazılamadı</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Failed to write file info</source>
+ <translation>Dosya verileri yazılamadı</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Failed to write to coin database</source>
+ <translation>Madenî para veritabanına yazılamadı</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Failed to write transaction index</source>
+ <translation>Muamele indeksi yazılamadı</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Failed to write undo data</source>
+ <translation>Geri alma verilerinin yazılamadı</translation>
+ </message>
+ <message>
<location line="+2"/>
<source>Find peers using DNS lookup (default: 1 unless -connect)</source>
<translation>Eşleri DNS araması vasıtasıyla bul (varsayılan: 1, eğer -connect kullanılmadıysa)</translation>
</message>
<message>
- <location line="+5"/>
+ <location line="+3"/>
+ <source>How many blocks to check at startup (default: 288, 0 = all)</source>
+ <translation>Başlangıçta kontrol edilecek blok sayısı (varsayılan: 288, 0 = hepsi)</translation>
+ </message>
+ <message>
+ <location line="+1"/>
<source>How thorough the block verification is (0-4, default: 3)</source>
<translation>Blok kontrolünün ne kadar derin olacağı (0 ilâ 4, varsayılan: 3)</translation>
</message>
<message>
- <location line="+1"/>
- <source>Importing blocks from block database...</source>
- <translation>Bloklar veritabanından içe aktarılıyor...</translation>
+ <location line="+24"/>
+ <source>Rebuild block chain index from current blk000??.dat files</source>
+ <translation>Blok zinciri indeksini güncel blk000??.dat dosyalarından tekrar inşa et</translation>
+ </message>
+ <message>
+ <location line="+37"/>
+ <source>Verifying blocks...</source>
+ <translation>Bloklar kontrol ediliyor...</translation>
</message>
<message>
<location line="+1"/>
+ <source>Verifying wallet...</source>
+ <translation>Cüzdan kontrol ediliyor...</translation>
+ </message>
+ <message>
+ <location line="-61"/>
<source>Imports blocks from external blk000??.dat file</source>
<translation>Harici blk000??.dat dosyasından blokları içe aktarır</translation>
</message>
@@ -2419,7 +2655,12 @@ Dosya mevcut değilse, sadece sahibi için okumayla sınırlı izin ile oluştur
<translation>Geçersiz -tor adresi: &apos;%s&apos;</translation>
</message>
<message>
- <location line="+9"/>
+ <location line="+8"/>
+ <source>Maintain a full transaction index (default: 0)</source>
+ <translation>Muamelelerin tamamının indeksini tut (varsayılan: 0)</translation>
+ </message>
+ <message>
+ <location line="+2"/>
<source>Maximum per-connection receive buffer, &lt;n&gt;*1000 bytes (default: 5000)</source>
<translation>Bağlantı başına azami alım tamponu, &lt;n&gt;*1000 bayt (varsayılan: 5000)</translation>
</message>
@@ -2454,12 +2695,7 @@ Dosya mevcut değilse, sadece sahibi için okumayla sınırlı izin ile oluştur
<translation>Hata ayıklama çıktısına tarih ön ekleri ilâve et</translation>
</message>
<message>
- <location line="+1"/>
- <source>Rebuild blockchain index from current blk000??.dat files</source>
- <translation>Blok zinciri endeksini güncel blk000??.dat dosyalarından yeniden derle</translation>
- </message>
- <message>
- <location line="+4"/>
+ <location line="+5"/>
<source>SSL options: (see the Bitcoin Wiki for SSL setup instructions)</source>
<translation> SSL seçenekleri: (SSL kurulum bilgisi için Bitcoin vikisine bakınız)</translation>
</message>
@@ -2499,7 +2735,12 @@ Dosya mevcut değilse, sadece sahibi için okumayla sınırlı izin ile oluştur
<translation>Bağlantı zaman aşım süresini milisaniye olarak belirt (varsayılan: 5000)</translation>
</message>
<message>
- <location line="+13"/>
+ <location line="+4"/>
+ <source>System error: </source>
+ <translation>Sistem hatası:</translation>
+ </message>
+ <message>
+ <location line="+10"/>
<source>Use UPnP to map the listening port (default: 0)</source>
<translation>Dinlenecek portu haritalamak için UPnP kullan (varsayılan: 0)</translation>
</message>
@@ -2530,36 +2771,41 @@ Dosya mevcut değilse, sadece sahibi için okumayla sınırlı izin ile oluştur
</message>
<message>
<location line="+1"/>
+ <source>You need to rebuild the databases using -reindex to change -txindex</source>
+ <translation>-txindex&apos;i değiştirmek için veritabanlarını -reindex kullanarak yeniden inşa etmeniz gerekir.</translation>
+ </message>
+ <message>
+ <location line="+1"/>
<source>wallet.dat corrupt, salvage failed</source>
<translation>wallet.dat bozuk, geri kazanım başarısız oldu</translation>
</message>
<message>
- <location line="-43"/>
+ <location line="-45"/>
<source>Password for JSON-RPC connections</source>
<translation>JSON-RPC bağlantıları için parola</translation>
</message>
<message>
- <location line="-53"/>
+ <location line="-68"/>
<source>Allow JSON-RPC connections from specified IP address</source>
<translation>Belirtilen İP adresinden JSON-RPC bağlantılarını kabul et</translation>
</message>
<message>
- <location line="+62"/>
+ <location line="+77"/>
<source>Send commands to node running on &lt;ip&gt; (default: 127.0.0.1)</source>
<translation>Şu &lt;ip&gt; adresinde (varsayılan: 127.0.0.1) çalışan düğüme komut yolla</translation>
</message>
<message>
- <location line="-103"/>
+ <location line="-120"/>
<source>Execute command when the best block changes (%s in cmd is replaced by block hash)</source>
<translation>En iyi blok değiştiğinde komutu çalıştır (komut için %s parametresi blok hash değeri ile değiştirilecektir)</translation>
</message>
<message>
- <location line="+124"/>
+ <location line="+142"/>
<source>Upgrade wallet to latest format</source>
<translation>Cüzdanı en yeni biçime güncelle</translation>
</message>
<message>
- <location line="-15"/>
+ <location line="-16"/>
<source>Set key pool size to &lt;n&gt; (default: 100)</source>
<translation>Anahtar alan boyutunu &lt;n&gt; değerine ayarla (varsayılan: 100)</translation>
</message>
@@ -2569,17 +2815,12 @@ Dosya mevcut değilse, sadece sahibi için okumayla sınırlı izin ile oluştur
<translation>Blok zincirini eksik cüzdan muameleleri için tekrar tara</translation>
</message>
<message>
- <location line="-26"/>
- <source>How many blocks to check at startup (default: 2500, 0 = all)</source>
- <translation>Başlangıçta ne kadar blokun denetleneceği (varsayılan: 2500, 0 = tümü)</translation>
- </message>
- <message>
- <location line="+55"/>
+ <location line="+30"/>
<source>Use OpenSSL (https) for JSON-RPC connections</source>
<translation>JSON-RPC bağlantıları için OpenSSL (https) kullan</translation>
</message>
<message>
- <location line="-20"/>
+ <location line="-21"/>
<source>Server certificate file (default: server.cert)</source>
<translation>Sunucu sertifika dosyası (varsayılan: server.cert)</translation>
</message>
@@ -2589,12 +2830,12 @@ Dosya mevcut değilse, sadece sahibi için okumayla sınırlı izin ile oluştur
<translation>Sunucu özel anahtarı (varsayılan: server.pem)</translation>
</message>
<message>
- <location line="-133"/>
+ <location line="-154"/>
<source>Acceptable ciphers (default: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH)</source>
<translation>Kabul edilebilir şifreler (varsayılan: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH)</translation>
</message>
<message>
- <location line="+144"/>
+ <location line="+166"/>
<source>This help message</source>
<translation>Bu yardım mesajı</translation>
</message>
@@ -2604,7 +2845,7 @@ Dosya mevcut değilse, sadece sahibi için okumayla sınırlı izin ile oluştur
<translation>Bu bilgisayarda %s unsuruna bağlanılamadı. (bind şu hatayı iletti: %d, %s)</translation>
</message>
<message>
- <location line="-70"/>
+ <location line="-86"/>
<source>Connect through socks proxy</source>
<translation>Socks vekil sunucusu vasıtasıyla bağlan</translation>
</message>
@@ -2614,12 +2855,12 @@ Dosya mevcut değilse, sadece sahibi için okumayla sınırlı izin ile oluştur
<translation>-addnode, -seednode ve -connect için DNS aramalarına izin ver</translation>
</message>
<message>
- <location line="+43"/>
+ <location line="+57"/>
<source>Loading addresses...</source>
<translation>Adresler yükleniyor...</translation>
</message>
<message>
- <location line="-25"/>
+ <location line="-35"/>
<source>Error loading wallet.dat: Wallet corrupted</source>
<translation>wallet.dat dosyasının yüklenmesinde hata oluştu: bozuk cüzdan</translation>
</message>
@@ -2629,32 +2870,22 @@ Dosya mevcut değilse, sadece sahibi için okumayla sınırlı izin ile oluştur
<translation>wallet.dat dosyasının yüklenmesinde hata oluştu: cüzdanın daha yeni bir Bitcoin sürümüne ihtiyacı var</translation>
</message>
<message>
- <location line="+73"/>
- <source>Verifying block database integrity...</source>
- <translation>Blok veritabanının bütünlüğü kontrol ediliyor...</translation>
- </message>
- <message>
- <location line="+1"/>
- <source>Verifying wallet integrity...</source>
- <translation>Cüzdanın bütünlüğü kontrol ediliyor...</translation>
- </message>
- <message>
- <location line="+1"/>
+ <location line="+87"/>
<source>Wallet needed to be rewritten: restart Bitcoin to complete</source>
<translation>Cüzdanın tekrar yazılması gerekiyordu: işlemi tamamlamak için Bitcoin&apos;i yeniden başlatınız</translation>
</message>
<message>
- <location line="-77"/>
+ <location line="-89"/>
<source>Error loading wallet.dat</source>
<translation>wallet.dat dosyasının yüklenmesinde hata oluştu</translation>
</message>
<message>
- <location line="+20"/>
+ <location line="+30"/>
<source>Invalid -proxy address: &apos;%s&apos;</source>
<translation>Geçersiz -proxy adresi: &apos;%s&apos;</translation>
</message>
<message>
- <location line="+46"/>
+ <location line="+48"/>
<source>Unknown network specified in -onlynet: &apos;%s&apos;</source>
<translation>-onlynet için bilinmeyen bir şebeke belirtildi: &apos;%s&apos;</translation>
</message>
@@ -2664,7 +2895,7 @@ Dosya mevcut değilse, sadece sahibi için okumayla sınırlı izin ile oluştur
<translation>Bilinmeyen bir -socks vekil sürümü talep edildi: %i</translation>
</message>
<message>
- <location line="-75"/>
+ <location line="-91"/>
<source>Cannot resolve -bind address: &apos;%s&apos;</source>
<translation>-bind adresi çözümlenemedi: &apos;%s&apos;</translation>
</message>
@@ -2674,17 +2905,17 @@ Dosya mevcut değilse, sadece sahibi için okumayla sınırlı izin ile oluştur
<translation>-externalip adresi çözümlenemedi: &apos;%s&apos;</translation>
</message>
<message>
- <location line="+31"/>
+ <location line="+45"/>
<source>Invalid amount for -paytxfee=&lt;amount&gt;: &apos;%s&apos;</source>
<translation>-paytxfee=&lt;miktar&gt; için geçersiz miktar: &apos;%s&apos;</translation>
</message>
<message>
- <location line="-15"/>
+ <location line="-24"/>
<source>Error: could not start node</source>
<translation>Hata: düğüm başlatılamadı</translation>
</message>
<message>
- <location line="+16"/>
+ <location line="+25"/>
<source>Invalid amount</source>
<translation>Geçersiz miktar</translation>
</message>
@@ -2699,7 +2930,7 @@ Dosya mevcut değilse, sadece sahibi için okumayla sınırlı izin ile oluştur
<translation>Blok indeksi yükleniyor...</translation>
</message>
<message>
- <location line="-45"/>
+ <location line="-59"/>
<source>Add a node to connect to and attempt to keep the connection open</source>
<translation>Bağlanılacak düğüm ekle ve bağlantıyı zinde tutmaya çalış</translation>
</message>
@@ -2709,22 +2940,17 @@ Dosya mevcut değilse, sadece sahibi için okumayla sınırlı izin ile oluştur
<translation>Bu bilgisayarda %s unsuruna bağlanılamadı. Bitcoin muhtemelen hâlihazırda çalışmaktadır.</translation>
</message>
<message>
- <location line="+54"/>
- <source>Find peers using internet relay chat (default: 0)</source>
- <translation>Eşleri Internet Relay Chat vasıtasıyla bul (varsayılan: 0)</translation>
- </message>
- <message>
- <location line="-2"/>
+ <location line="+68"/>
<source>Fee per KB to add to transactions you send</source>
<translation>Yolladığınız muameleler için eklenecek KB başı ücret</translation>
</message>
<message>
- <location line="+19"/>
+ <location line="+17"/>
<source>Loading wallet...</source>
<translation>Cüzdan yükleniyor...</translation>
</message>
<message>
- <location line="-40"/>
+ <location line="-54"/>
<source>Cannot downgrade wallet</source>
<translation>Cüzdan eski biçime geri alınamaz</translation>
</message>
@@ -2739,27 +2965,27 @@ Dosya mevcut değilse, sadece sahibi için okumayla sınırlı izin ile oluştur
<translation>Varsayılan adres yazılamadı</translation>
</message>
<message>
- <location line="+49"/>
+ <location line="+64"/>
<source>Rescanning...</source>
<translation>Yeniden tarama...</translation>
</message>
<message>
- <location line="-43"/>
+ <location line="-56"/>
<source>Done loading</source>
<translation>Yükleme tamamlandı</translation>
</message>
<message>
- <location line="+65"/>
+ <location line="+79"/>
<source>To use the %s option</source>
<translation>%s seçeneğini kullanmak için</translation>
</message>
<message>
- <location line="-60"/>
+ <location line="-71"/>
<source>Error</source>
<translation>Hata</translation>
</message>
<message>
- <location line="-28"/>
+ <location line="-33"/>
<source>You must set rpcpassword=&lt;password&gt; in the configuration file:
%s
If the file does not exist, create it with owner-readable-only file permissions.</source>
diff --git a/src/qt/locale/bitcoin_uk.ts b/src/qt/locale/bitcoin_uk.ts
index 02b5d2e17c..b56c56edda 100644
--- a/src/qt/locale/bitcoin_uk.ts
+++ b/src/qt/locale/bitcoin_uk.ts
@@ -13,12 +13,7 @@
<translation>ВерÑÑ–Ñ &lt;b&gt;Bitcoin&apos;a&lt;b&gt;</translation>
</message>
<message>
- <location line="+41"/>
- <source>Copyright © 2009-2012 The Bitcoin developers</source>
- <translation>ÐвторÑьке право © 2009-2012 Розробники Bitcoin</translation>
- </message>
- <message>
- <location line="+13"/>
+ <location line="+57"/>
<source>
This is experimental software.
@@ -32,6 +27,16 @@ This product includes software developed by the OpenSSL Project for use in the O
Цей продукт включає в Ñебе програмне забезпеченнÑ, розроблене в рамках проекту OpenSSL (http://www.openssl.org/), криптографічне програмне забезпеченнÑ, напиÑане Еріком Янгом (eay@cryptsoft.com), та функції Ð´Ð»Ñ Ñ€Ð¾Ð±Ð¾Ñ‚Ð¸ з UPnP, напиÑані ТомаÑом Бернардом.</translation>
</message>
+ <message>
+ <location filename="../aboutdialog.cpp" line="+17"/>
+ <source>Copyright</source>
+ <translation>ÐвторÑьке право</translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>2009-%1 The Bitcoin developers</source>
+ <translation>2009-%1 Розробники Bitcoin</translation>
+ </message>
</context>
<context>
<name>AddressBookPage</name>
@@ -63,7 +68,7 @@ This product includes software developed by the OpenSSL Project for use in the O
<message>
<location line="-46"/>
<source>These are your Bitcoin addresses for receiving payments. You may want to give a different one to each sender so you can keep track of who is paying you.</source>
- <translation>Це ваші адреÑи Ð´Ð»Ñ Ð¾Ñ‚Ñ€Ð¸Ð¼Ð°Ð½Ð½Ñ Ð¿Ð»Ð°Ñ‚ÐµÐ¶Ñ–Ð². Ви можете давати різні адреÑи різним людÑм, таким чином маючи можливіÑÑ‚ÑŒ відÑлідкувати хто конкретно Ñ– Ñкільки вам заплатив. </translation>
+ <translation>Це ваші адреÑи Ð´Ð»Ñ Ð¾Ñ‚Ñ€Ð¸Ð¼Ð°Ð½Ð½Ñ Ð¿Ð»Ð°Ñ‚ÐµÐ¶Ñ–Ð². Ви можете давати різні адреÑи різним людÑм, таким чином маючи можливіÑÑ‚ÑŒ відÑлідкувати хто конкретно Ñ– Ñкільки вам заплатив.</translation>
</message>
<message>
<location line="+60"/>
@@ -88,17 +93,17 @@ This product includes software developed by the OpenSSL Project for use in the O
<message>
<location line="+25"/>
<source>Delete the currently selected address from the list</source>
- <translation type="unfinished"/>
+ <translation>Вилучити вибрані адреÑи з переліку</translation>
</message>
<message>
<location line="-14"/>
<source>Verify a message to ensure it was signed with a specified Bitcoin address</source>
- <translation type="unfinished"/>
+ <translation>Перевірте Ð¿Ð¾Ð²Ñ–Ð´Ð¾Ð¼Ð»ÐµÐ½Ð½Ñ Ð´Ð»Ñ Ð²Ð¿ÐµÐ²Ð½ÐµÐ½Ð¾ÑÑ‚Ñ–, що воно підпиÑано вказаною Bitcoin-адреÑою</translation>
</message>
<message>
<location line="+3"/>
<source>&amp;Verify Message</source>
- <translation type="unfinished"/>
+ <translation>Перевірити повідомленнÑ</translation>
</message>
<message>
<location line="+14"/>
@@ -106,17 +111,22 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation>&amp;Видалити</translation>
</message>
<message>
- <location filename="../addressbookpage.cpp" line="+65"/>
+ <location filename="../addressbookpage.cpp" line="+66"/>
<source>Copy &amp;Label</source>
<translation>Скопіювати &amp;мітку</translation>
</message>
<message>
- <location line="+2"/>
+ <location line="+1"/>
<source>&amp;Edit</source>
<translation>&amp;Редагувати</translation>
</message>
<message>
- <location line="+250"/>
+ <location line="+1"/>
+ <source>Send &amp;Coins</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+263"/>
<source>Export Address Book Data</source>
<translation>ЕкÑпортувати адреÑну книгу</translation>
</message>
@@ -139,7 +149,7 @@ This product includes software developed by the OpenSSL Project for use in the O
<context>
<name>AddressTableModel</name>
<message>
- <location filename="../addresstablemodel.cpp" line="+142"/>
+ <location filename="../addresstablemodel.cpp" line="+144"/>
<source>Label</source>
<translation>Ðазва</translation>
</message>
@@ -159,7 +169,7 @@ This product includes software developed by the OpenSSL Project for use in the O
<message>
<location filename="../forms/askpassphrasedialog.ui" line="+26"/>
<source>Passphrase Dialog</source>
- <translation type="unfinished"/>
+ <translation>Діалог Ð²Ð²ÐµÐ´ÐµÐ½Ð½Ñ Ð¿Ð°Ñ€Ð¾Ð»ÑŽ</translation>
</message>
<message>
<location line="+21"/>
@@ -179,7 +189,7 @@ This product includes software developed by the OpenSSL Project for use in the O
<message>
<location filename="../askpassphrasedialog.cpp" line="+33"/>
<source>Enter the new passphrase to the wallet.&lt;br/&gt;Please use a passphrase of &lt;b&gt;10 or more random characters&lt;/b&gt;, or &lt;b&gt;eight or more words&lt;/b&gt;.</source>
- <translation>Введіть новий пароль Ð´Ð»Ñ Ð³Ð°Ð¼Ð°Ð½Ñ†Ñ.&lt;br/&gt;Будь лаÑка, викориÑтовуйте паролі що міÑÑ‚ÑÑ‚ÑŒ &lt;b&gt; Ñк мінімум 10 випадкових Ñимволів &lt;/b&gt; або &lt;b&gt; Ñк мінімум 8 Ñлів&lt;/b&gt;.</translation>
+ <translation>Введіть новий пароль Ð´Ð»Ñ Ð³Ð°Ð¼Ð°Ð½Ñ†Ñ.&lt;br/&gt;Будь лаÑка, викориÑтовуйте паролі що міÑÑ‚ÑÑ‚ÑŒ &lt;b&gt;Ñк мінімум 10 випадкових Ñимволів&lt;/b&gt;, або &lt;b&gt;Ñк мінімум 8 Ñлів&lt;/b&gt;.</translation>
</message>
<message>
<location line="+1"/>
@@ -240,7 +250,7 @@ This product includes software developed by the OpenSSL Project for use in the O
<location line="+100"/>
<location line="+24"/>
<source>Warning: The Caps Lock key is on!</source>
- <translation>Увага: Ввімкнено Caps Lock</translation>
+ <translation>Увага: Ввімкнено Caps Lock!</translation>
</message>
<message>
<location line="-130"/>
@@ -251,7 +261,7 @@ This product includes software developed by the OpenSSL Project for use in the O
<message>
<location line="-56"/>
<source>Bitcoin will close now to finish the encryption process. Remember that encrypting your wallet cannot fully protect your bitcoins from being stolen by malware infecting your computer.</source>
- <translation>Біткоін-клієнт буде закрито Ð´Ð»Ñ Ð·Ð°Ð²ÐµÑ€ÑˆÐµÐ½Ð½Ñ Ð¿Ñ€Ð¾Ñ†ÐµÑу шифруваннÑ. Пам’Ñтайте, що ÑˆÐ¸Ñ„Ñ€ÑƒÐ²Ð°Ð½Ð½Ñ Ð³Ð°Ð¼Ð°Ð½Ñ†Ñ Ð½Ðµ може повніÑÑ‚ÑŽ захиÑтити ваші біткоіни від кражі, у випадку Ñкщо ваш комп’ютер буде інфіковано шкідливими програмами.</translation>
+ <translation>Біткоін-клієнт буде закрито Ð´Ð»Ñ Ð·Ð°Ð²ÐµÑ€ÑˆÐµÐ½Ð½Ñ Ð¿Ñ€Ð¾Ñ†ÐµÑу шифруваннÑ. Пам&apos;Ñтайте, що ÑˆÐ¸Ñ„Ñ€ÑƒÐ²Ð°Ð½Ð½Ñ Ð³Ð°Ð¼Ð°Ð½Ñ†Ñ Ð½Ðµ може повніÑÑ‚ÑŽ захиÑтити ваші біткоіни від крадіжки, у випадку Ñкщо ваш комп&apos;ютер буде інфіковано шкідливими програмами.</translation>
</message>
<message>
<location line="+13"/>
@@ -298,17 +308,17 @@ This product includes software developed by the OpenSSL Project for use in the O
<context>
<name>BitcoinGUI</name>
<message>
- <location filename="../bitcoingui.cpp" line="+267"/>
+ <location filename="../bitcoingui.cpp" line="+231"/>
<source>Sign &amp;message...</source>
<translation>&amp;ПідпиÑати повідомленнÑ...</translation>
</message>
<message>
- <location line="+254"/>
+ <location line="+299"/>
<source>Synchronizing with network...</source>
<translation>Ð¡Ð¸Ð½Ñ…Ñ€Ð¾Ð½Ñ–Ð·Ð°Ñ†Ñ–Ñ Ð· мережею...</translation>
</message>
<message>
- <location line="-322"/>
+ <location line="-367"/>
<source>&amp;Overview</source>
<translation>&amp;ОглÑд</translation>
</message>
@@ -320,40 +330,25 @@ This product includes software developed by the OpenSSL Project for use in the O
<message>
<location line="+20"/>
<source>&amp;Transactions</source>
- <translation>Пе&amp;реклади</translation>
+ <translation>Транзакції</translation>
</message>
<message>
<location line="+1"/>
<source>Browse transaction history</source>
- <translation>ПереглÑнути Ñ–Ñторію переказів</translation>
+ <translation>ПереглÑнути Ñ–Ñторію транзакцій</translation>
</message>
<message>
- <location line="+6"/>
- <source>&amp;Address Book</source>
- <translation>&amp;ÐдреÑна книга</translation>
- </message>
- <message>
- <location line="+1"/>
+ <location line="+7"/>
<source>Edit the list of stored addresses and labels</source>
<translation>Редагувати ÑпиÑок збережених Ð°Ð´Ñ€ÐµÑ Ñ‚Ð° міток</translation>
</message>
<message>
- <location line="-15"/>
- <source>&amp;Receive coins</source>
- <translation>О&amp;тримати</translation>
- </message>
- <message>
- <location line="+1"/>
+ <location line="-14"/>
<source>Show the list of addresses for receiving payments</source>
<translation>Показати ÑпиÑок Ð°Ð´Ñ€ÐµÑ Ð´Ð»Ñ Ð¾Ñ‚Ñ€Ð¸Ð¼Ð°Ð½Ð½Ñ Ð¿Ð»Ð°Ñ‚ÐµÐ¶Ñ–Ð²</translation>
</message>
<message>
- <location line="-8"/>
- <source>&amp;Send coins</source>
- <translation>В&amp;ідправити</translation>
- </message>
- <message>
- <location line="+39"/>
+ <location line="+31"/>
<source>E&amp;xit</source>
<translation>&amp;Вихід</translation>
</message>
@@ -398,22 +393,17 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation>Змінити парол&amp;ь...</translation>
</message>
<message>
- <location line="+259"/>
+ <location line="+304"/>
<source>Importing blocks from disk...</source>
- <translation type="unfinished"/>
+ <translation>Імпорт блоків з диÑку...</translation>
</message>
<message>
<location line="+3"/>
<source>Reindexing blocks on disk...</source>
<translation type="unfinished"/>
</message>
- <message numerus="yes">
- <location line="+10"/>
- <source>~%n block(s) remaining</source>
- <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
- </message>
<message>
- <location line="-265"/>
+ <location line="-300"/>
<source>&amp;Export...</source>
<translation>&amp;ЕкÑпорт...</translation>
</message>
@@ -445,43 +435,58 @@ This product includes software developed by the OpenSSL Project for use in the O
<message>
<location line="+9"/>
<source>&amp;Debug window</source>
- <translation type="unfinished"/>
+ <translation>Вікно зневадженнÑ</translation>
</message>
<message>
<location line="+1"/>
<source>Open debugging and diagnostic console</source>
- <translation type="unfinished"/>
+ <translation>Відкрити конÑоль Ð·Ð½ÐµÐ²Ð°Ð´Ð¶ÐµÐ½Ð½Ñ Ñ– діагноÑтики</translation>
</message>
<message>
<location line="-7"/>
<source>&amp;Verify message...</source>
- <translation type="unfinished"/>
+ <translation>Перевірити повідомленнÑ...</translation>
</message>
<message>
- <location line="-196"/>
- <location line="+538"/>
+ <location line="-162"/>
+ <location line="+540"/>
<source>Bitcoin</source>
<translation>Bitcoin</translation>
</message>
<message>
- <location line="-538"/>
+ <location line="-540"/>
<source>Wallet</source>
<translation>Гаманець</translation>
</message>
<message>
- <location line="+176"/>
+ <location line="+99"/>
+ <source>&amp;Send</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+7"/>
+ <source>&amp;Receive</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+14"/>
+ <source>&amp;Addresses</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+22"/>
<source>&amp;About Bitcoin</source>
<translation>&amp;Про Bitcoin</translation>
</message>
<message>
<location line="+9"/>
<source>&amp;Show / Hide</source>
- <translation type="unfinished"/>
+ <translation>Показати / Приховати</translation>
</message>
<message>
<location line="+1"/>
<source>Show or hide the main Window</source>
- <translation type="unfinished"/>
+ <translation>Показує або приховує головне вікно</translation>
</message>
<message>
<location line="+2"/>
@@ -491,12 +496,12 @@ This product includes software developed by the OpenSSL Project for use in the O
<message>
<location line="+7"/>
<source>Sign messages with your Bitcoin addresses to prove you own them</source>
- <translation type="unfinished"/>
+ <translation>Підтвердіть, що Ви Ñ” влаÑником Ð¿Ð¾Ð²Ñ–Ð´Ð¾Ð¼Ð»ÐµÐ½Ð½Ñ Ð¿Ñ–Ð´Ð¿Ð¸Ñавши його Вашою Bitcoin-адреÑою </translation>
</message>
<message>
<location line="+2"/>
<source>Verify messages to ensure they were signed with specified Bitcoin addresses</source>
- <translation type="unfinished"/>
+ <translation>Перевірте Ð¿Ð¾Ð²Ñ–Ð´Ð¾Ð¼Ð»ÐµÐ½Ð½Ñ Ð´Ð»Ñ Ð²Ð¿ÐµÐ²Ð½ÐµÐ½Ð¾ÑÑ‚Ñ–, що воно підпиÑано вказаною Bitcoin-адреÑою</translation>
</message>
<message>
<location line="+31"/>
@@ -530,99 +535,94 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation>[теÑтова мережа]</translation>
</message>
<message>
- <location line="+63"/>
+ <location line="+47"/>
<source>Bitcoin client</source>
- <translation type="unfinished"/>
+ <translation>Bitcoin-клієнт</translation>
</message>
<message numerus="yes">
- <location line="+79"/>
+ <location line="+140"/>
<source>%n active connection(s) to Bitcoin network</source>
- <translation><numerusform>%n активне Ð·â€™Ñ”Ð´Ð½Ð°Ð½Ð½Ñ Ð· мережею</numerusform><numerusform>%n активні Ð·â€™Ñ”Ð´Ð½Ð°Ð½Ð½Ñ Ð· мережею</numerusform><numerusform>%n активних з’єднань з мережею</numerusform></translation>
+ <translation><numerusform>%n активне з&apos;Ñ”Ð´Ð½Ð°Ð½Ð½Ñ Ð· мережею</numerusform><numerusform>%n активні з&apos;Ñ”Ð´Ð½Ð°Ð½Ð½Ñ Ð· мережею</numerusform><numerusform>%n активних з&apos;єднань з мережею</numerusform></translation>
</message>
<message>
- <location line="+45"/>
- <source>Processed %1 of %2 blocks of transaction history (%3% done).</source>
+ <location line="+39"/>
+ <source>Processed %1 of %2 (estimated) blocks of transaction history.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+7"/>
+ <location line="+4"/>
<source>Processed %1 blocks of transaction history.</source>
- <translation type="unfinished"/>
+ <translation>Оброблено %1 блоків Ñ–Ñторії транзакцій.</translation>
</message>
- <message>
- <location line="+70"/>
- <source>Error</source>
- <translation type="unfinished"/>
+ <message numerus="yes">
+ <location line="+20"/>
+ <source>%n hour(s)</source>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
</message>
- <message>
- <location line="+3"/>
- <source>Warning</source>
- <translation type="unfinished"/>
+ <message numerus="yes">
+ <location line="+4"/>
+ <source>%n day(s)</source>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
</message>
- <message>
- <location line="+3"/>
- <source>Information</source>
- <translation type="unfinished"/>
+ <message numerus="yes">
+ <location line="+4"/>
+ <source>%n week(s)</source>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message>
- <location line="+66"/>
- <source>This transaction is over the size limit. You can still send it for a fee of %1, which goes to the nodes that process your transaction and helps to support the network. Do you want to pay the fee?</source>
+ <location line="+5"/>
+ <source>%1 behind</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+210"/>
- <source>Backup Successful</source>
+ <location line="+14"/>
+ <source>Last received block was generated %1 ago.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+0"/>
- <source>The wallet data was successfully saved to the new location.</source>
+ <location line="+2"/>
+ <source>Transactions after this will not yet be visible.</source>
<translation type="unfinished"/>
</message>
- <message numerus="yes">
- <location line="-338"/>
- <source>%n second(s) ago</source>
- <translation><numerusform>%n Ñекунду тому</numerusform><numerusform>%n Ñекунди тому</numerusform><numerusform>%n Ñекунд тому</numerusform></translation>
+ <message>
+ <location line="+21"/>
+ <source>Error</source>
+ <translation>Помилка</translation>
</message>
- <message numerus="yes">
- <location line="+4"/>
- <source>%n minute(s) ago</source>
- <translation><numerusform>%n хвилину тому</numerusform><numerusform>%n хвилини тому</numerusform><numerusform>%n хвилин тому</numerusform></translation>
+ <message>
+ <location line="+3"/>
+ <source>Warning</source>
+ <translation>Увага</translation>
</message>
- <message numerus="yes">
- <location line="+4"/>
- <source>%n hour(s) ago</source>
- <translation><numerusform>%n годину тому</numerusform><numerusform>%n години тому</numerusform><numerusform>%n годин тому</numerusform></translation>
+ <message>
+ <location line="+3"/>
+ <source>Information</source>
+ <translation>ІнформаціÑ</translation>
</message>
- <message numerus="yes">
- <location line="+4"/>
- <source>%n day(s) ago</source>
- <translation><numerusform>%n день тому</numerusform><numerusform>%n Ð´Ð½Ñ Ñ‚Ð¾Ð¼Ñƒ</numerusform><numerusform>%n днів тому</numerusform></translation>
+ <message>
+ <location line="+68"/>
+ <source>This transaction is over the size limit. You can still send it for a fee of %1, which goes to the nodes that process your transaction and helps to support the network. Do you want to pay the fee?</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location line="+6"/>
+ <location line="-138"/>
<source>Up to date</source>
<translation>Синхронізовано</translation>
</message>
<message>
- <location line="+7"/>
+ <location line="+32"/>
<source>Catching up...</source>
<translation>СинхронізуєтьÑÑ...</translation>
</message>
<message>
- <location line="+10"/>
- <source>Last received block was generated %1.</source>
- <translation>ОÑтанній отриманий блок було згенеровано %1.</translation>
- </message>
- <message>
- <location line="+97"/>
+ <location line="+110"/>
<source>Confirm transaction fee</source>
- <translation type="unfinished"/>
+ <translation>Підтвердити коміÑÑ–ÑŽ</translation>
</message>
<message>
- <location line="+23"/>
+ <location line="+8"/>
<source>Sent transaction</source>
- <translation>ÐадіÑлані перекази</translation>
+ <translation>ÐадіÑлані транзакції</translation>
</message>
<message>
<location line="+0"/>
@@ -643,16 +643,16 @@ Address: %4
</translation>
</message>
<message>
- <location line="+99"/>
- <location line="+28"/>
+ <location line="+33"/>
+ <location line="+23"/>
<source>URI handling</source>
- <translation type="unfinished"/>
+ <translation>Обробка URI</translation>
</message>
<message>
- <location line="-28"/>
- <location line="+28"/>
+ <location line="-23"/>
+ <location line="+23"/>
<source>URI can not be parsed! This can be caused by an invalid Bitcoin address or malformed URI parameters.</source>
- <translation type="unfinished"/>
+ <translation>Ðеможливо обробити URI! Це може бути викликано неправильною Bitcoin-адреÑою, чи невірними параметрами URI.</translation>
</message>
<message>
<location line="+17"/>
@@ -665,27 +665,7 @@ Address: %4
<translation>&lt;b&gt;Зашифрований&lt;/b&gt; гаманець &lt;b&gt;заблоковано&lt;/b&gt;</translation>
</message>
<message>
- <location line="+23"/>
- <source>Backup Wallet</source>
- <translation>Резервне ÐºÐ¾Ð¿Ñ–ÑŽÐ²Ð°Ð½Ð½Ñ Ð³Ð°Ð¼Ð°Ð½Ñ†Ñ</translation>
- </message>
- <message>
- <location line="+0"/>
- <source>Wallet Data (*.dat)</source>
- <translation>Дані Ð³Ð°Ð¼Ð°Ð½Ñ†Ñ (*.dat)</translation>
- </message>
- <message>
- <location line="+3"/>
- <source>Backup Failed</source>
- <translation>Резервне ÐºÐ¾Ð¿Ñ–ÑŽÐ²Ð°Ð½Ð½Ñ Ð½Ðµ вдалоÑÑ</translation>
- </message>
- <message>
- <location line="+0"/>
- <source>There was an error trying to save the wallet data to the new location.</source>
- <translation>Виникла помилка при Ñпробі зберегти гаманець в новому міÑці</translation>
- </message>
- <message>
- <location filename="../bitcoin.cpp" line="+109"/>
+ <location filename="../bitcoin.cpp" line="+108"/>
<source>A fatal error occurred. Bitcoin can no longer continue safely and will quit.</source>
<translation type="unfinished"/>
</message>
@@ -693,9 +673,9 @@ Address: %4
<context>
<name>ClientModel</name>
<message>
- <location filename="../clientmodel.cpp" line="+86"/>
+ <location filename="../clientmodel.cpp" line="+96"/>
<source>Network Alert</source>
- <translation type="unfinished"/>
+ <translation>Ð¡Ð¿Ð¾Ð²Ñ–Ñ‰ÐµÐ½Ð½Ñ Ð¼ÐµÑ€ÐµÐ¶Ñ–</translation>
</message>
</context>
<context>
@@ -713,7 +693,7 @@ Address: %4
<message>
<location line="+10"/>
<source>The label associated with this address book entry</source>
- <translation>Мітка, пов’Ñзана з цим запиÑом адреÑної книги</translation>
+ <translation>Мітка, пов&apos;Ñзана з цим запиÑом адреÑної книги</translation>
</message>
<message>
<location line="+7"/>
@@ -723,10 +703,10 @@ Address: %4
<message>
<location line="+10"/>
<source>The address associated with this address book entry. This can only be modified for sending addresses.</source>
- <translation>ÐдреÑа, пов’Ñзана з цим запиÑом адреÑної книги.</translation>
+ <translation>ÐдреÑа, пов&apos;Ñзана з цим запиÑом адреÑної книги. Може бути змінено тільки Ð´Ð»Ñ Ð°Ð´Ñ€ÐµÑи відправника.</translation>
</message>
<message>
- <location filename="../editaddressdialog.cpp" line="+20"/>
+ <location filename="../editaddressdialog.cpp" line="+21"/>
<source>New receiving address</source>
<translation>Ðова адреÑа Ð´Ð»Ñ Ð¾Ñ‚Ñ€Ð¸Ð¼Ð°Ð½Ð½Ñ</translation>
</message>
@@ -746,17 +726,17 @@ Address: %4
<translation>Редагувати адреÑу Ð´Ð»Ñ Ð²Ñ–Ð´Ð¿Ñ€Ð°Ð²Ð»ÐµÐ½Ð½Ñ</translation>
</message>
<message>
- <location line="+60"/>
+ <location line="+76"/>
<source>The entered address &quot;%1&quot; is already in the address book.</source>
<translation>Введена адреÑа «%1» вже приÑÑƒÑ‚Ð½Ñ Ð² адреÑній книзі.</translation>
</message>
<message>
- <location line="+5"/>
+ <location line="-5"/>
<source>The entered address &quot;%1&quot; is not a valid Bitcoin address.</source>
<translation>Введена адреÑа «%1» не Ñ” коректною адреÑою в мережі Bitcoin.</translation>
</message>
<message>
- <location line="+5"/>
+ <location line="+10"/>
<source>Could not unlock wallet.</source>
<translation>Ðеможливо розблокувати гаманець.</translation>
</message>
@@ -769,46 +749,45 @@ Address: %4
<context>
<name>GUIUtil::HelpMessageBox</name>
<message>
- <location filename="../guiutil.cpp" line="+419"/>
+ <location filename="../guiutil.cpp" line="+422"/>
<location line="+12"/>
<source>Bitcoin-Qt</source>
- <translation type="unfinished"/>
+ <translation>Bitcoin-Qt</translation>
</message>
<message>
<location line="-12"/>
<source>version</source>
- <translation type="unfinished"/>
+ <translation>верÑÑ–Ñ</translation>
</message>
<message>
<location line="+2"/>
<source>Usage:</source>
- <translation>ВкориÑтаннÑ:</translation>
+ <translation>ВикориÑтаннÑ:</translation>
</message>
<message>
<location line="+1"/>
<source>command-line options</source>
- <translation type="unfinished"/>
+ <translation>параметри командного Ñ€Ñдка</translation>
</message>
<message>
<location line="+4"/>
<source>UI options</source>
- <translation type="unfinished"/>
+ <translation>Параметри інтерфейÑу</translation>
</message>
<message>
<location line="+1"/>
<source>Set language, for example &quot;de_DE&quot; (default: system locale)</source>
- <translation type="unfinished"/>
+ <translation>Ð’ÑÑ‚Ð°Ð½Ð¾Ð²Ð»ÐµÐ½Ð½Ñ Ð¼Ð¾Ð²Ð¸, наприклад &quot;de_DE&quot; (типово: ÑиÑтемна)</translation>
</message>
<message>
<location line="+1"/>
<source>Start minimized</source>
- <translation>ЗапуÑкати згорнутим
-</translation>
+ <translation>ЗапуÑкати згорнутим</translation>
</message>
<message>
<location line="+1"/>
<source>Show splash screen on startup (default: 1)</source>
- <translation type="unfinished"/>
+ <translation>Показувати заÑтавку під Ñ‡Ð°Ñ Ð·Ð°Ð¿ÑƒÑку (типово: 1)</translation>
</message>
</context>
<context>
@@ -826,7 +805,7 @@ Address: %4
<message>
<location line="+6"/>
<source>Optional transaction fee per kB that helps make sure your transactions are processed quickly. Most transactions are 1 kB. Fee 0.01 recommended.</source>
- <translation>Добровільна коміÑÑ–Ñ Ð·Ð° кожен Кб переказу, Ñка дозволÑÑ” бути впевненим у тому, що ваш переказ буде оброблено швидко. Розмір більшоÑÑ‚Ñ– переказів рівен 1 Кб. Рекомендована коміÑÑ–Ñ: 0,01.</translation>
+ <translation>Добровільна коміÑÑ–Ñ Ð·Ð° кожен КБ транзакції, Ñка дозволÑÑ” бути впевненим у тому, що ваш вона буде оброблено швидко. Розмір більшоÑÑ‚Ñ– транзакцій Ñ” 1 КБ. Рекомендована коміÑÑ–Ñ: 0,01.</translation>
</message>
<message>
<location line="+15"/>
@@ -836,7 +815,7 @@ Address: %4
<message>
<location line="+31"/>
<source>Automatically start Bitcoin after logging in to the system.</source>
- <translation>Ðвтоматично запуÑкати гаманець при вмиканні комп’ютера</translation>
+ <translation>Ðвтоматично запуÑкати гаманець при вході до ÑиÑтеми.</translation>
</message>
<message>
<location line="+3"/>
@@ -846,17 +825,17 @@ Address: %4
<message>
<location line="+35"/>
<source>Reset all client options to default.</source>
- <translation type="unfinished"/>
+ <translation>Скинути вÑÑ– параметри клієнта на типові.</translation>
</message>
<message>
<location line="+3"/>
<source>&amp;Reset Options</source>
- <translation type="unfinished"/>
+ <translation>Скинути параметри</translation>
</message>
<message>
<location line="+13"/>
<source>&amp;Network</source>
- <translation type="unfinished"/>
+ <translation>&amp;Мережа</translation>
</message>
<message>
<location line="+6"/>
@@ -871,7 +850,7 @@ Address: %4
<message>
<location line="+7"/>
<source>Connect to the Bitcoin network through a SOCKS proxy (e.g. when connecting through Tor).</source>
- <translation>ПідключатиÑÑŒ до мережі Bitcoin через SOCKS-прокÑÑ– (наприклад при викориÑтанні Tor)</translation>
+ <translation>ПідключатиÑÑŒ до мережі Bitcoin через SOCKS-прокÑÑ– (наприклад при викориÑтанні Tor).</translation>
</message>
<message>
<location line="+3"/>
@@ -901,22 +880,22 @@ Address: %4
<message>
<location line="+7"/>
<source>SOCKS &amp;Version:</source>
- <translation type="unfinished"/>
+ <translation>SOCKS верÑÑ–Ñ—:</translation>
</message>
<message>
<location line="+13"/>
<source>SOCKS version of the proxy (e.g. 5)</source>
- <translation type="unfinished"/>
+ <translation>ВерÑÑ–Ñ SOCKS-прокÑÑ– (наприклад 5)</translation>
</message>
<message>
<location line="+36"/>
<source>&amp;Window</source>
- <translation type="unfinished"/>
+ <translation>&amp;Вікно</translation>
</message>
<message>
<location line="+6"/>
<source>Show only a tray icon after minimizing the window.</source>
- <translation>Показувати лише іконку в треї піÑÐ»Ñ Ð·Ð³Ð¾Ñ€Ñ‚Ð°Ð½Ð½Ñ Ð²Ñ–ÐºÐ½Ð°</translation>
+ <translation>Показувати лише іконку в треї піÑÐ»Ñ Ð·Ð³Ð¾Ñ€Ñ‚Ð°Ð½Ð½Ñ Ð²Ñ–ÐºÐ½Ð°.</translation>
</message>
<message>
<location line="+3"/>
@@ -941,12 +920,12 @@ Address: %4
<message>
<location line="+8"/>
<source>User Interface &amp;language:</source>
- <translation type="unfinished"/>
+ <translation>Мова інтерфейÑу кориÑтувача:</translation>
</message>
<message>
<location line="+13"/>
<source>The user interface language can be set here. This setting will take effect after restarting Bitcoin.</source>
- <translation type="unfinished"/>
+ <translation>Ð’Ñтановлює мову інтерфейÑу. Зміни набудуть чинноÑÑ‚Ñ– піÑÐ»Ñ Ð¿ÐµÑ€ÐµÐ·Ð°Ð¿ÑƒÑку Bitcoin.</translation>
</message>
<message>
<location line="+11"/>
@@ -966,42 +945,42 @@ Address: %4
<message>
<location line="+3"/>
<source>&amp;Display addresses in transaction list</source>
- <translation>&amp;Відображати адреÑу в ÑпиÑку переказів</translation>
+ <translation>&amp;Відображати адреÑу в ÑпиÑку транзакцій</translation>
</message>
<message>
<location line="+71"/>
<source>&amp;OK</source>
- <translation type="unfinished"/>
+ <translation>&amp;Гаразд</translation>
</message>
<message>
<location line="+7"/>
<source>&amp;Cancel</source>
- <translation type="unfinished"/>
+ <translation>&amp;СкаÑувати</translation>
</message>
<message>
<location line="+10"/>
<source>&amp;Apply</source>
- <translation type="unfinished"/>
+ <translation>&amp;ЗаÑтоÑувати</translation>
</message>
<message>
- <location filename="../optionsdialog.cpp" line="+55"/>
+ <location filename="../optionsdialog.cpp" line="+53"/>
<source>default</source>
- <translation type="unfinished"/>
+ <translation>типово</translation>
</message>
<message>
<location line="+130"/>
<source>Confirm options reset</source>
- <translation type="unfinished"/>
+ <translation>ÐŸÑ–Ð´Ñ‚Ð²ÐµÑ€Ð´Ð¶ÐµÐ½Ð½Ñ ÑÐºÐ¸Ð´Ð°Ð½Ð½Ñ Ð¿Ð°Ñ€Ð°Ð¼ÐµÑ‚Ñ€Ñ–Ð²</translation>
</message>
<message>
<location line="+1"/>
<source>Some settings may require a client restart to take effect.</source>
- <translation type="unfinished"/>
+ <translation>ДеÑкі параметри потребують перезапуÑк клієнта Ð´Ð»Ñ Ð½Ð°Ð±ÑƒÑ‚Ñ‚Ñ Ñ‡Ð¸Ð½Ð½Ð¾ÑÑ‚Ñ–.</translation>
</message>
<message>
<location line="+0"/>
<source>Do you want to proceed?</source>
- <translation type="unfinished"/>
+ <translation>Продовжувати?</translation>
</message>
<message>
<location line="+42"/>
@@ -1013,12 +992,12 @@ Address: %4
<location line="-9"/>
<location line="+9"/>
<source>This setting will take effect after restarting Bitcoin.</source>
- <translation type="unfinished"/>
+ <translation>Цей параметр набуде чинноÑÑ‚Ñ– піÑÐ»Ñ Ð¿ÐµÑ€ÐµÐ·Ð°Ð¿ÑƒÑку Bitcoin.</translation>
</message>
<message>
<location line="+29"/>
<source>The supplied proxy address is invalid.</source>
- <translation type="unfinished"/>
+ <translation>Ðевірно вказано адреÑу прокÑÑ–.</translation>
</message>
</context>
<context>
@@ -1029,23 +1008,18 @@ Address: %4
<translation>Форма</translation>
</message>
<message>
- <location line="+51"/>
- <location line="+183"/>
+ <location line="+50"/>
+ <location line="+166"/>
<source>The displayed information may be out of date. Your wallet automatically synchronizes with the Bitcoin network after a connection is established, but this process has not completed yet.</source>
- <translation type="unfinished"/>
+ <translation>Показана Ñ–Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ñ–Ñ Ð²Ð¶Ðµ може бути заÑтарілою. Ваш гаманець буде автоматично Ñинхронізовано з мережею Bitcoin піÑÐ»Ñ Ð²ÑÑ‚Ð°Ð½Ð¾Ð²Ð»ÐµÐ½Ð½Ñ Ð¿Ñ–Ð´ÐºÐ»ÑŽÑ‡ÐµÐ½Ð½Ñ, але цей Ð¿Ñ€Ð¾Ñ†ÐµÑ Ñ‰Ðµ не завершено.</translation>
</message>
<message>
- <location line="-141"/>
+ <location line="-124"/>
<source>Balance:</source>
<translation>БаланÑ:</translation>
</message>
<message>
- <location line="+58"/>
- <source>Number of transactions:</source>
- <translation>КількіÑÑ‚ÑŒ переказів:</translation>
- </message>
- <message>
- <location line="-29"/>
+ <location line="+29"/>
<source>Unconfirmed:</source>
<translation>Ðепідтверджені:</translation>
</message>
@@ -1055,7 +1029,7 @@ Address: %4
<translation>Гаманець</translation>
</message>
<message>
- <location line="+124"/>
+ <location line="+107"/>
<source>Immature:</source>
<translation type="unfinished"/>
</message>
@@ -1067,27 +1041,30 @@ Address: %4
<message>
<location line="+46"/>
<source>&lt;b&gt;Recent transactions&lt;/b&gt;</source>
- <translation>&lt;b&gt;Ðедавні перекази&lt;/b&gt;</translation>
+ <translation>&lt;b&gt;Ðедавні транзакції&lt;/b&gt;</translation>
</message>
<message>
- <location line="-118"/>
+ <location line="-101"/>
<source>Your current balance</source>
<translation>Ваш поточний баланÑ</translation>
</message>
<message>
<location line="+29"/>
<source>Total of transactions that have yet to be confirmed, and do not yet count toward the current balance</source>
- <translation>Загальна Ñума вÑÑ–Ñ… переказів, Ñкі ще не підтверджені, та до Ñих пір не враховуютьÑÑ Ð² загальному баланÑÑ–</translation>
- </message>
- <message>
- <location line="+20"/>
- <source>Total number of transactions in wallet</source>
- <translation>Загальна кількіÑÑ‚ÑŒ переказів в гаманці</translation>
+ <translation>Загальна Ñума вÑÑ–Ñ… транзакцій, Ñкі ще не підтверджені, та до цих пір не враховуютьÑÑ Ð² загальному баланÑÑ–</translation>
</message>
<message>
<location filename="../overviewpage.cpp" line="+115"/>
<location line="+1"/>
<source>out of sync</source>
+ <translation>не Ñинхронізовано</translation>
+ </message>
+</context>
+<context>
+ <name>PaymentServer</name>
+ <message>
+ <location filename="../paymentserver.cpp" line="+107"/>
+ <source>Cannot start bitcoin: click-to-pay handler</source>
<translation type="unfinished"/>
</message>
</context>
@@ -1096,7 +1073,7 @@ Address: %4
<message>
<location filename="../forms/qrcodedialog.ui" line="+14"/>
<source>QR Code Dialog</source>
- <translation type="unfinished"/>
+ <translation>Діалог QR-коду</translation>
</message>
<message>
<location line="+59"/>
@@ -1126,22 +1103,22 @@ Address: %4
<message>
<location filename="../qrcodedialog.cpp" line="+62"/>
<source>Error encoding URI into QR Code.</source>
- <translation type="unfinished"/>
+ <translation>Помилка при кодуванні URI в QR-код.</translation>
</message>
<message>
<location line="+40"/>
<source>The entered amount is invalid, please check.</source>
- <translation type="unfinished"/>
+ <translation>Ðевірно введено кількіÑÑ‚ÑŒ, будь лаÑка, перевірте.</translation>
</message>
<message>
<location line="+23"/>
<source>Resulting URI too long, try to reduce the text for label / message.</source>
- <translation type="unfinished"/>
+ <translation>Кінцевий URI занадто довгий, Ñпробуйте зменшити текÑÑ‚ Ð´Ð»Ñ Ð¼Ñ–Ñ‚ÐºÐ¸ / повідомленнÑ.</translation>
</message>
<message>
<location line="+25"/>
<source>Save QR Code</source>
- <translation type="unfinished"/>
+ <translation>Зберегти QR-код</translation>
</message>
<message>
<location line="+0"/>
@@ -1154,7 +1131,7 @@ Address: %4
<message>
<location filename="../forms/rpcconsole.ui" line="+46"/>
<source>Client name</source>
- <translation type="unfinished"/>
+ <translation>Ðазва клієнту</translation>
</message>
<message>
<location line="+10"/>
@@ -1168,22 +1145,22 @@ Address: %4
<location line="+23"/>
<location filename="../rpcconsole.cpp" line="+344"/>
<source>N/A</source>
- <translation type="unfinished"/>
+ <translation>Ð/Д</translation>
</message>
<message>
<location line="-217"/>
<source>Client version</source>
- <translation type="unfinished"/>
+ <translation>ВерÑÑ–Ñ ÐºÐ»Ñ–Ñ”Ð½Ñ‚Ñƒ</translation>
</message>
<message>
<location line="-45"/>
<source>&amp;Information</source>
- <translation type="unfinished"/>
+ <translation>&amp;ІнформаціÑ</translation>
</message>
<message>
<location line="+68"/>
<source>Using OpenSSL version</source>
- <translation type="unfinished"/>
+ <translation>ВикориÑтовуєтьÑÑ OpenSSL верÑÑ–Ñ—</translation>
</message>
<message>
<location line="+49"/>
@@ -1193,17 +1170,17 @@ Address: %4
<message>
<location line="+29"/>
<source>Network</source>
- <translation type="unfinished"/>
+ <translation>Мережа</translation>
</message>
<message>
<location line="+7"/>
<source>Number of connections</source>
- <translation type="unfinished"/>
+ <translation>КількіÑÑ‚ÑŒ підключень</translation>
</message>
<message>
<location line="+23"/>
<source>On testnet</source>
- <translation type="unfinished"/>
+ <translation>Ð’ теÑтовій мережі</translation>
</message>
<message>
<location line="+23"/>
@@ -1213,7 +1190,7 @@ Address: %4
<message>
<location line="+7"/>
<source>Current number of blocks</source>
- <translation type="unfinished"/>
+ <translation>Поточне чиÑло блоків</translation>
</message>
<message>
<location line="+23"/>
@@ -1228,37 +1205,37 @@ Address: %4
<message>
<location line="+52"/>
<source>&amp;Open</source>
- <translation type="unfinished"/>
+ <translation>Відкрити</translation>
</message>
<message>
<location line="+16"/>
<source>Command-line options</source>
- <translation type="unfinished"/>
+ <translation>Параметри командного Ñ€Ñдка</translation>
</message>
<message>
<location line="+7"/>
<source>Show the Bitcoin-Qt help message to get a list with possible Bitcoin command-line options.</source>
- <translation type="unfinished"/>
+ <translation>Показати довідку Bitcoin-Qt Ð´Ð»Ñ Ð¾Ñ‚Ñ€Ð¸Ð¼Ð°Ð½Ð½Ñ Ð¿ÐµÑ€ÐµÐ»Ñ–ÐºÑƒ можливих параметрів командного Ñ€Ñдка.</translation>
</message>
<message>
<location line="+3"/>
<source>&amp;Show</source>
- <translation type="unfinished"/>
+ <translation>Показати</translation>
</message>
<message>
<location line="+24"/>
<source>&amp;Console</source>
- <translation type="unfinished"/>
+ <translation>КонÑоль</translation>
</message>
<message>
<location line="-260"/>
<source>Build date</source>
- <translation type="unfinished"/>
+ <translation>Дата збираннÑ</translation>
</message>
<message>
<location line="-104"/>
<source>Bitcoin - Debug window</source>
- <translation type="unfinished"/>
+ <translation>Bitcoin - Вікно зневадженнÑ</translation>
</message>
<message>
<location line="+25"/>
@@ -1268,7 +1245,7 @@ Address: %4
<message>
<location line="+279"/>
<source>Debug log file</source>
- <translation type="unfinished"/>
+ <translation>Файл звіту зневадженнÑ</translation>
</message>
<message>
<location line="+7"/>
@@ -1278,22 +1255,22 @@ Address: %4
<message>
<location line="+102"/>
<source>Clear console</source>
- <translation type="unfinished"/>
+ <translation>ОчиÑтити конÑоль</translation>
</message>
<message>
<location filename="../rpcconsole.cpp" line="-30"/>
<source>Welcome to the Bitcoin RPC console.</source>
- <translation type="unfinished"/>
+ <translation>Вітаємо у конÑолі Bitcoin RPC.</translation>
</message>
<message>
<location line="+1"/>
<source>Use up and down arrows to navigate history, and &lt;b&gt;Ctrl-L&lt;/b&gt; to clear screen.</source>
- <translation type="unfinished"/>
+ <translation>ВикориÑтовуйте Ñтрілки вгору вниз Ð´Ð»Ñ Ð½Ð°Ð²Ñ–Ð³Ð°Ñ†Ñ–Ñ— по Ñ–Ñторії, Ñ– &lt;b&gt;Ctrl-L&lt;/b&gt; Ð´Ð»Ñ Ð¾Ñ‡Ð¸Ñ‰ÐµÐ½Ð½Ñ ÐµÐºÑ€Ð°Ð½Ð°.</translation>
</message>
<message>
<location line="+1"/>
<source>Type &lt;b&gt;help&lt;/b&gt; for an overview of available commands.</source>
- <translation type="unfinished"/>
+ <translation>Ðаберіть &lt;b&gt;help&lt;/b&gt; Ð´Ð»Ñ Ð¿ÐµÑ€ÐµÐ³Ð»Ñду доÑтупних команд.</translation>
</message>
</context>
<context>
@@ -1363,7 +1340,7 @@ Address: %4
<message>
<location line="+1"/>
<source>Are you sure you want to send %1?</source>
- <translation>Ви впевнені що хочете відправити %1</translation>
+ <translation>Ви впевнені що хочете відправити %1?</translation>
</message>
<message>
<location line="+0"/>
@@ -1373,7 +1350,7 @@ Address: %4
<message>
<location line="+23"/>
<source>The recipient address is not valid, please recheck.</source>
- <translation>ÐдреÑа отримувача невірна, будьлаÑка перепровірте.</translation>
+ <translation>ÐдреÑа отримувача невірна, будь лаÑка перепровірте.</translation>
</message>
<message>
<location line="+5"/>
@@ -1388,7 +1365,7 @@ Address: %4
<message>
<location line="+5"/>
<source>The total exceeds your balance when the %1 transaction fee is included.</source>
- <translation>Сума перевищить ваш баланÑ, Ñкщо коміÑÑ–Ñ %1 буде додана до вашого переказу.</translation>
+ <translation>Сума перевищить ваш баланÑ, Ñкщо коміÑÑ–Ñ %1 буде додана до вашої транзакції.</translation>
</message>
<message>
<location line="+6"/>
@@ -1398,12 +1375,12 @@ Address: %4
<message>
<location line="+5"/>
<source>Error: Transaction creation failed!</source>
- <translation type="unfinished"/>
+ <translation>Помилка: Ðе вдалоÑÑ Ñтворити транзакцію!</translation>
</message>
<message>
<location line="+5"/>
<source>Error: The transaction was rejected. This might happen if some of the coins in your wallet were already spent, such as if you used a copy of wallet.dat and coins were spent in the copy but not marked as spent here.</source>
- <translation>Помилка: переказ було відхилено. Це може ÑтатиÑÑŒ, Ñкщо декілька монет з вашого Ð³Ð°Ð¼Ð°Ð½Ñ†Ñ Ð²Ð¶Ðµ викориÑтані, наприклад, Ñкщо ви викориÑтовуєте одну копію Ð³Ð°Ð¼Ð°Ð½Ñ†Ñ (wallet.dat), а монети були викориÑтані з іншої копії, але не позначені Ñк викориÑтані в цій.</translation>
+ <translation>Помилка: транзакцію було відхилено. Це може ÑтатиÑÑŒ, Ñкщо декілька монет з вашого Ð³Ð°Ð¼Ð°Ð½Ñ†Ñ Ð²Ð¶Ðµ викориÑтані, наприклад, Ñкщо ви викориÑтовуєте одну копію Ð³Ð°Ð¼Ð°Ð½Ñ†Ñ (wallet.dat), а монети були викориÑтані з іншої копії, але не позначені Ñк викориÑтані в цій.</translation>
</message>
</context>
<context>
@@ -1430,7 +1407,7 @@ Address: %4
</message>
<message>
<location line="+60"/>
- <location filename="../sendcoinsentry.cpp" line="+25"/>
+ <location filename="../sendcoinsentry.cpp" line="+26"/>
<source>Enter a label for this address to add it to your address book</source>
<translation>Введіть мітку Ð´Ð»Ñ Ñ†Ñ–Ñ”Ñ— адреÑи Ð´Ð»Ñ Ð´Ð¾Ð´Ð°Ð²Ð°Ð½Ð½Ñ Ñ—Ñ— в адреÑну книгу</translation>
</message>
@@ -1475,7 +1452,7 @@ Address: %4
<message>
<location filename="../forms/signverifymessagedialog.ui" line="+14"/>
<source>Signatures - Sign / Verify a Message</source>
- <translation type="unfinished"/>
+ <translation>ПідпиÑи - ÐŸÑ–Ð´Ð¿Ð¸Ñ / Перевірка повідомленнÑ</translation>
</message>
<message>
<location line="+13"/>
@@ -1522,12 +1499,12 @@ Address: %4
<message>
<location line="+7"/>
<source>Signature</source>
- <translation type="unfinished"/>
+ <translation>ПідпиÑ</translation>
</message>
<message>
<location line="+27"/>
<source>Copy the current signature to the system clipboard</source>
- <translation type="unfinished"/>
+ <translation>Копіювати поточну Ñигнатуру до ÑиÑтемного буферу обміну</translation>
</message>
<message>
<location line="+21"/>
@@ -1537,12 +1514,12 @@ Address: %4
<message>
<location line="+3"/>
<source>Sign &amp;Message</source>
- <translation type="unfinished"/>
+ <translation>&amp;ПідпиÑати повідомленнÑ</translation>
</message>
<message>
<location line="+14"/>
<source>Reset all sign message fields</source>
- <translation type="unfinished"/>
+ <translation>Скинути вÑÑ– Ð¿Ð¾Ð»Ñ Ð¿Ñ–Ð´Ð¿Ð¸Ñу повідомленнÑ</translation>
</message>
<message>
<location line="+3"/>
@@ -1553,7 +1530,7 @@ Address: %4
<message>
<location line="-87"/>
<source>&amp;Verify Message</source>
- <translation type="unfinished"/>
+ <translation>Перевірити повідомленнÑ</translation>
</message>
<message>
<location line="+6"/>
@@ -1568,17 +1545,17 @@ Address: %4
<message>
<location line="+40"/>
<source>Verify the message to ensure it was signed with the specified Bitcoin address</source>
- <translation type="unfinished"/>
+ <translation>Перевірте Ð¿Ð¾Ð²Ñ–Ð´Ð¾Ð¼Ð»ÐµÐ½Ð½Ñ Ð´Ð»Ñ Ð²Ð¿ÐµÐ²Ð½ÐµÐ½Ð¾ÑÑ‚Ñ–, що воно підпиÑано вказаною Bitcoin-адреÑою</translation>
</message>
<message>
<location line="+3"/>
<source>Verify &amp;Message</source>
- <translation type="unfinished"/>
+ <translation>Перевірити повідомленнÑ</translation>
</message>
<message>
<location line="+14"/>
<source>Reset all verify message fields</source>
- <translation type="unfinished"/>
+ <translation>Скинути вÑÑ– Ð¿Ð¾Ð»Ñ Ð¿ÐµÑ€ÐµÐ²Ñ–Ñ€ÐºÐ¸ повідомленнÑ</translation>
</message>
<message>
<location filename="../signverifymessagedialog.cpp" line="+27"/>
@@ -1589,18 +1566,18 @@ Address: %4
<message>
<location line="-2"/>
<source>Click &quot;Sign Message&quot; to generate signature</source>
- <translation>ÐатиÑніть кнопку &quot;ПідпиÑати повідомленнÑ&quot;, Ð´Ð»Ñ Ð¾Ñ‚Ñ€Ð¸Ð¼Ð°Ð½Ñ Ð¿Ñ–Ð´Ð¿Ð¸Ñу</translation>
+ <translation>ÐатиÑніть кнопку «ПідпиÑати повідомленнÑ», Ð´Ð»Ñ Ð¾Ñ‚Ñ€Ð¸Ð¼Ð°Ð½Ð½Ñ Ð¿Ñ–Ð´Ð¿Ð¸Ñу</translation>
</message>
<message>
<location line="+3"/>
<source>Enter Bitcoin signature</source>
- <translation type="unfinished"/>
+ <translation>Введіть Ñигнатуру Bitcoin</translation>
</message>
<message>
<location line="+82"/>
<location line="+81"/>
<source>The entered address is invalid.</source>
- <translation type="unfinished"/>
+ <translation>Введена нечинна адреÑа.</translation>
</message>
<message>
<location line="-81"/>
@@ -1608,7 +1585,7 @@ Address: %4
<location line="+73"/>
<location line="+8"/>
<source>Please check the address and try again.</source>
- <translation type="unfinished"/>
+ <translation>Будь лаÑка, перевірте адреÑу та Ñпробуйте ще.</translation>
</message>
<message>
<location line="-81"/>
@@ -1629,23 +1606,23 @@ Address: %4
<message>
<location line="+12"/>
<source>Message signing failed.</source>
- <translation type="unfinished"/>
+ <translation>Ðе вдалоÑÑ Ð¿Ñ–Ð´Ð¿Ð¸Ñати повідомленнÑ.</translation>
</message>
<message>
<location line="+5"/>
<source>Message signed.</source>
- <translation type="unfinished"/>
+ <translation>ÐŸÐ¾Ð²Ñ–Ð´Ð¾Ð¼Ð»ÐµÐ½Ð½Ñ Ð¿Ñ–Ð´Ð¿Ð¸Ñано.</translation>
</message>
<message>
<location line="+59"/>
<source>The signature could not be decoded.</source>
- <translation type="unfinished"/>
+ <translation>ÐŸÑ–Ð´Ð¿Ð¸Ñ Ð½Ðµ можливо декодувати.</translation>
</message>
<message>
<location line="+0"/>
<location line="+13"/>
<source>Please check the signature and try again.</source>
- <translation type="unfinished"/>
+ <translation>Будь лаÑка, перевірте Ð¿Ñ–Ð´Ð¿Ð¸Ñ Ñ‚Ð° Ñпробуйте ще.</translation>
</message>
<message>
<location line="+0"/>
@@ -1655,18 +1632,18 @@ Address: %4
<message>
<location line="+7"/>
<source>Message verification failed.</source>
- <translation type="unfinished"/>
+ <translation>Ðе вдалоÑÑ Ð¿ÐµÑ€ÐµÐ²Ñ–Ñ€Ð¸Ñ‚Ð¸ повідомленнÑ.</translation>
</message>
<message>
<location line="+5"/>
<source>Message verified.</source>
- <translation type="unfinished"/>
+ <translation>ÐŸÐ¾Ð²Ñ–Ð´Ð¾Ð¼Ð»ÐµÐ½Ð½Ñ Ð¿ÐµÑ€ÐµÐ²Ñ–Ñ€ÐµÐ½Ð¾.</translation>
</message>
</context>
<context>
<name>TransactionDesc</name>
<message>
- <location filename="../transactiondesc.cpp" line="+19"/>
+ <location filename="../transactiondesc.cpp" line="+20"/>
<source>Open until %1</source>
<translation>Відкрити до %1</translation>
</message>
@@ -1721,7 +1698,7 @@ Address: %4
<location line="+22"/>
<location line="+58"/>
<source>To</source>
- <translation type="unfinished"/>
+ <translation>Отримувач</translation>
</message>
<message>
<location line="-77"/>
@@ -1764,7 +1741,7 @@ Address: %4
<message>
<location line="-39"/>
<source>Transaction fee</source>
- <translation>КоміÑÑ–Ñ Ð·Ð° переказ</translation>
+ <translation>КоміÑÑ–Ñ Ð·Ð° транзакцію</translation>
</message>
<message>
<location line="+16"/>
@@ -1789,7 +1766,7 @@ Address: %4
<message>
<location line="+3"/>
<source>Generated coins must mature 120 blocks before they can be spent. When you generated this block, it was broadcast to the network to be added to the block chain. If it fails to get into the chain, its state will change to &quot;not accepted&quot; and it won&apos;t be spendable. This may occasionally happen if another node generates a block within a few seconds of yours.</source>
- <translation>ПіÑÐ»Ñ Ð³ÐµÐ½ÐµÑ€Ð°Ñ†Ñ–Ñ— монет, потрібно зачекати 120 блоків, перш ніж Ñ—Ñ… можна буде викориÑтати. Коли ви згенерували цей блок, його було відправлено в мережу Ð´Ð»Ñ Ñ‚Ð¾Ð³Ð¾, щоб він був доданий до ланцюжка блоків. Якщо Ñ†Ñ Ð¿Ñ€Ð¾Ñ†ÐµÐ´ÑƒÑ€Ð° не вдаÑÑ‚ÑŒÑÑ, ÑÑ‚Ð°Ñ‚ÑƒÑ Ð±ÑƒÐ´Ðµ змінено на «не підтверджено» Ñ– ви не зможете потратити згенеровані монету. Таке може ÑтатиÑÑŒ, Ñкщо хтоÑÑŒ інший згенерував блок на декілька Ñекунд раніше.</translation>
+ <translation>ПіÑÐ»Ñ Ð³ÐµÐ½ÐµÑ€Ð°Ñ†Ñ–Ñ— монет, потрібно зачекати 120 блоків, перш ніж Ñ—Ñ… можна буде викориÑтати. Коли ви згенерували цей блок, його було відправлено в мережу Ð´Ð»Ñ Ñ‚Ð¾Ð³Ð¾, щоб він був доданий до ланцюжка блоків. Якщо Ñ†Ñ Ð¿Ñ€Ð¾Ñ†ÐµÐ´ÑƒÑ€Ð° не вдаÑÑ‚ÑŒÑÑ, ÑÑ‚Ð°Ñ‚ÑƒÑ Ð±ÑƒÐ´Ðµ змінено на «не підтверджено» Ñ– ви не зможете потратити згенеровані монету. Таке може ÑтатиÑÑŒ, Ñкщо хтоÑÑŒ інший згенерував блок на декілька Ñекунд раніше.</translation>
</message>
<message>
<location line="+7"/>
@@ -1799,7 +1776,7 @@ Address: %4
<message>
<location line="+8"/>
<source>Transaction</source>
- <translation type="unfinished"/>
+ <translation>ТранзакціÑ</translation>
</message>
<message>
<location line="+3"/>
@@ -1814,12 +1791,12 @@ Address: %4
<message>
<location line="+1"/>
<source>true</source>
- <translation type="unfinished"/>
+ <translation>true</translation>
</message>
<message>
<location line="+0"/>
<source>false</source>
- <translation type="unfinished"/>
+ <translation>false</translation>
</message>
<message>
<location line="-209"/>
@@ -1842,18 +1819,18 @@ Address: %4
<message>
<location filename="../forms/transactiondescdialog.ui" line="+14"/>
<source>Transaction details</source>
- <translation>Деталі переказів</translation>
+ <translation>Деталі транзакції</translation>
</message>
<message>
<location line="+6"/>
<source>This pane shows a detailed description of the transaction</source>
- <translation>Даний діалог показує детальну ÑтатиÑтику по вибраному переказу</translation>
+ <translation>Даний діалог показує детальну ÑтатиÑтику по вибраній транзакції</translation>
</message>
</context>
<context>
<name>TransactionTableModel</name>
<message>
- <location filename="../transactiontablemodel.cpp" line="+226"/>
+ <location filename="../transactiontablemodel.cpp" line="+225"/>
<source>Date</source>
<translation>Дата</translation>
</message>
@@ -1945,22 +1922,22 @@ Address: %4
<message>
<location line="+199"/>
<source>Transaction status. Hover over this field to show number of confirmations.</source>
- <translation>Ð¡Ñ‚Ð°Ñ‚ÑƒÑ Ð¿ÐµÑ€ÐµÐºÐ°Ð·Ñƒ. Ðаведіть вказівник на це поле, щоб показати кількіÑÑ‚ÑŒ підтверджень.</translation>
+ <translation>Ð¡Ñ‚Ð°Ñ‚ÑƒÑ Ñ‚Ñ€Ð°Ð½Ð·Ð°ÐºÑ†Ñ–Ñ—. Ðаведіть вказівник на це поле, щоб показати кількіÑÑ‚ÑŒ підтверджень.</translation>
</message>
<message>
<location line="+2"/>
<source>Date and time that the transaction was received.</source>
- <translation>Дата Ñ– чаÑ, коли переказ було отримано.</translation>
+ <translation>Дата Ñ– чаÑ, коли транзакцію було отримано.</translation>
</message>
<message>
<location line="+2"/>
<source>Type of transaction.</source>
- <translation>Тип переказу.</translation>
+ <translation>Тип транзакції.</translation>
</message>
<message>
<location line="+2"/>
<source>Destination address of transaction.</source>
- <translation>ÐдреÑа отримувача</translation>
+ <translation>ÐдреÑа отримувача транзакції.</translation>
</message>
<message>
<location line="+2"/>
@@ -1971,7 +1948,7 @@ Address: %4
<context>
<name>TransactionView</name>
<message>
- <location filename="../transactionview.cpp" line="+55"/>
+ <location filename="../transactionview.cpp" line="+52"/>
<location line="+16"/>
<source>All</source>
<translation>Ð’ÑÑ–</translation>
@@ -2004,7 +1981,7 @@ Address: %4
<message>
<location line="+1"/>
<source>Range...</source>
- <translation>Проміжок</translation>
+ <translation>Проміжок...</translation>
</message>
<message>
<location line="+11"/>
@@ -2058,18 +2035,23 @@ Address: %4
</message>
<message>
<location line="+1"/>
+ <source>Copy transaction ID</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Edit label</source>
<translation>Редагувати мітку</translation>
</message>
<message>
<location line="+1"/>
<source>Show transaction details</source>
- <translation type="unfinished"/>
+ <translation>Показати деталі транзакції</translation>
</message>
<message>
- <location line="+142"/>
+ <location line="+139"/>
<source>Export Transaction Data</source>
- <translation>ЕкÑпортувати дані переказів</translation>
+ <translation>ЕкÑпортувати дані транзакцій</translation>
</message>
<message>
<location line="+1"/>
@@ -2119,10 +2101,10 @@ Address: %4
<message>
<location line="+0"/>
<source>Could not write to file %1.</source>
- <translation>Ðеможливо запиÑати у файл %1</translation>
+ <translation>Ðеможливо запиÑати у файл %1.</translation>
</message>
<message>
- <location line="+95"/>
+ <location line="+100"/>
<source>Range:</source>
<translation>Діапазон від:</translation>
</message>
@@ -2133,155 +2115,287 @@ Address: %4
</message>
</context>
<context>
+ <name>WalletView</name>
+ <message>
+ <location filename="../walletview.cpp" line="+95"/>
+ <source>&amp;Overview</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Show general overview of wallet</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>&amp;Send coins</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Send coins to a Bitcoin address</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>&amp;Receive coins</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Show the list of addresses for receiving payments</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>&amp;Transactions</source>
+ <translation>Транзакції</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Browse transaction history</source>
+ <translation>ПереглÑнути Ñ–Ñторію транзакцій</translation>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>&amp;Address Book</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Edit the list of stored addresses and labels</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+12"/>
+ <source>&amp;Encrypt Wallet...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Encrypt the private keys that belong to your wallet</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>&amp;Backup Wallet...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Backup wallet to another location</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>&amp;Change Passphrase...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Change the passphrase used for wallet encryption</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Sign &amp;message...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Sign messages with your Bitcoin addresses to prove you own them</source>
+ <translation>Підтвердіть, що Ви Ñ” влаÑником Ð¿Ð¾Ð²Ñ–Ð´Ð¾Ð¼Ð»ÐµÐ½Ð½Ñ Ð¿Ñ–Ð´Ð¿Ð¸Ñавши його Вашою Bitcoin-адреÑою </translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>&amp;Verify message...</source>
+ <translation>Перевірити повідомленнÑ...</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Verify messages to ensure they were signed with specified Bitcoin addresses</source>
+ <translation>Перевірте Ð¿Ð¾Ð²Ñ–Ð´Ð¾Ð¼Ð»ÐµÐ½Ð½Ñ Ð´Ð»Ñ Ð²Ð¿ÐµÐ²Ð½ÐµÐ½Ð¾ÑÑ‚Ñ–, що воно підпиÑано вказаною Bitcoin-адреÑою</translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>&amp;Export...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Export the data in the current tab to a file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+180"/>
+ <source>Backup Wallet</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>Wallet Data (*.dat)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Backup Failed</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>There was an error trying to save the wallet data to the new location.</source>
+ <translation>Виникла помилка при Ñпробі зберегти гаманець в новому міÑці.</translation>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>Backup Successful</source>
+ <translation>УÑпішне ÑÑ‚Ð²Ð¾Ñ€ÐµÐ½Ð½Ñ Ñ€ÐµÐ·ÐµÑ€Ð²Ð½Ð¾Ñ— копії</translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>The wallet data was successfully saved to the new location.</source>
+ <translation>Данні Ð³Ð°Ð¼Ð°Ð½Ñ†Ñ ÑƒÑпішно збережено в новому міÑці призначеннÑ.</translation>
+ </message>
+</context>
+<context>
<name>bitcoin-core</name>
<message>
- <location filename="../bitcoinstrings.cpp" line="+88"/>
+ <location filename="../bitcoinstrings.cpp" line="+96"/>
<source>Bitcoin version</source>
<translation>ВерÑÑ–Ñ</translation>
</message>
<message>
- <location line="+82"/>
+ <location line="+98"/>
<source>Usage:</source>
- <translation>ВкориÑтаннÑ:</translation>
+ <translation>ВикориÑтаннÑ:</translation>
</message>
<message>
- <location line="-23"/>
+ <location line="-24"/>
<source>Send command to -server or bitcoind</source>
- <translation>Відправити команду Ñерверу -server чи демону
-</translation>
+ <translation>Відправити команду Ñерверу -server чи демону</translation>
</message>
<message>
- <location line="-21"/>
+ <location line="-22"/>
<source>List commands</source>
- <translation>СпиÑок команд
-</translation>
+ <translation>СпиÑок команд</translation>
</message>
<message>
- <location line="-11"/>
+ <location line="-10"/>
<source>Get help for a command</source>
- <translation>Отримати довідку по команді
-</translation>
+ <translation>Отримати довідку по команді</translation>
</message>
<message>
<location line="+21"/>
<source>Options:</source>
- <translation>Параметри:
-</translation>
+ <translation>Параметри:</translation>
</message>
<message>
<location line="+22"/>
<source>Specify configuration file (default: bitcoin.conf)</source>
- <translation>Вкажіть файл конфігурації (за промовчуваннÑм: bitcoin.conf)
-</translation>
+ <translation>Вкажіть файл конфігурації (типово: bitcoin.conf)</translation>
</message>
<message>
<location line="+3"/>
<source>Specify pid file (default: bitcoind.pid)</source>
- <translation>Вкажіть pid-файл (за промовчуваннÑм: bitcoind.pid)
-</translation>
+ <translation>Вкажіть pid-файл (типово: bitcoind.pid)</translation>
</message>
<message>
<location line="-47"/>
<source>Generate coins</source>
- <translation>Генерувати монети
-</translation>
+ <translation>Генерувати монети</translation>
</message>
<message>
- <location line="-15"/>
+ <location line="-28"/>
<source>Don&apos;t generate coins</source>
- <translation>Ðе генерувати монети
-</translation>
+ <translation>Ðе генерувати монети</translation>
</message>
<message>
- <location line="+61"/>
+ <location line="+74"/>
<source>Specify data directory</source>
- <translation>Вкажіть робочий каталог
-</translation>
+ <translation>Вкажіть робочий каталог</translation>
</message>
<message>
<location line="-7"/>
<source>Set database cache size in megabytes (default: 25)</source>
- <translation type="unfinished"/>
+ <translation>Ð’Ñтановити розмір кешу бази даних в мегабайтах (типово: 25)</translation>
</message>
<message>
- <location line="-26"/>
+ <location line="-27"/>
<source>Listen for connections on &lt;port&gt; (default: 8333 or testnet: 18333)</source>
- <translation>Чекати на з&apos;Ñ”Ð´Ð½Ð°Ð½Ð½Ñ Ð½Ð° порту (по замовченню 8333 або теÑтова мережа 18333)</translation>
+ <translation>Чекати на з&apos;Ñ”Ð´Ð½Ð°Ð½Ð½Ñ Ð½Ð° &lt;port&gt; (типово: 8333 або теÑтова мережа: 18333)</translation>
</message>
<message>
- <location line="+4"/>
+ <location line="+5"/>
<source>Maintain at most &lt;n&gt; connections to peers (default: 125)</source>
- <translation>Підтримувати не більше &lt;n&gt; зв&apos;Ñзків з колегами (за замовчуваннÑм: 125)</translation>
+ <translation>Підтримувати не більше &lt;n&gt; зв&apos;Ñзків з колегами (типово: 125)</translation>
</message>
<message>
- <location line="-34"/>
+ <location line="-49"/>
<source>Connect to a node to retrieve peer addresses, and disconnect</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+65"/>
+ <location line="+80"/>
<source>Specify your own public address</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+2"/>
+ <location line="+3"/>
<source>Threshold for disconnecting misbehaving peers (default: 100)</source>
- <translation>Поріг Ð²Ñ–Ð´ÐºÐ»ÑŽÑ‡ÐµÐ½Ð½Ñ Ð½ÐµÐ¿Ñ€Ð°Ð²Ð¸Ð»ÑŒÐ½Ð¾ підєднаних пірів (за замовчуваннÑм: 100)</translation>
+ <translation>Поріг Ð²Ñ–Ð´ÐºÐ»ÑŽÑ‡ÐµÐ½Ð½Ñ Ð½ÐµÐ¿Ñ€Ð°Ð²Ð¸Ð»ÑŒÐ½Ð¾ під&apos;єднаних пірів (типово: 100)</translation>
</message>
<message>
- <location line="-114"/>
+ <location line="-132"/>
<source>Number of seconds to keep misbehaving peers from reconnecting (default: 86400)</source>
- <translation>МакÑимальній розмір вхідного буферу на одне з&apos;Ñ”Ð´Ð½Ð°Ð½Ð½Ñ (за замовчуваннÑм 86400)</translation>
+ <translation>МакÑимальній розмір вхідного буферу на одне з&apos;Ñ”Ð´Ð½Ð°Ð½Ð½Ñ (типово: 86400)</translation>
</message>
<message>
- <location line="-28"/>
+ <location line="-32"/>
<source>An error occurred while setting up the RPC port %u for listening on IPv4: %s</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+26"/>
+ <location line="+30"/>
<source>Listen for JSON-RPC connections on &lt;port&gt; (default: 8332 or testnet: 18332)</source>
- <translation>ПроÑлуховувати &lt;port&gt; Ð´Ð»Ñ JSON-RPC-з’єднань (за промовчуваннÑм: 8332)
-</translation>
+ <translation>ПроÑлуховувати &lt;port&gt; Ð´Ð»Ñ JSON-RPC-з&apos;єднань (типово: 8332 або теÑтова мережа: 18332)</translation>
</message>
<message>
- <location line="+34"/>
+ <location line="+36"/>
<source>Accept command line and JSON-RPC commands</source>
- <translation>Приймати команди із командного Ñ€Ñдка та команди JSON-RPC
-</translation>
+ <translation>Приймати команди із командного Ñ€Ñдка та команди JSON-RPC</translation>
</message>
<message>
- <location line="+62"/>
+ <location line="+77"/>
<source>Run in the background as a daemon and accept commands</source>
- <translation>ЗапуÑтити в фоновому режимі (Ñк демон) та приймати команди
-</translation>
+ <translation>ЗапуÑтити в фоновому режимі (Ñк демон) та приймати команди</translation>
</message>
<message>
- <location line="+31"/>
+ <location line="+32"/>
<source>Use the test network</source>
- <translation>ВикориÑтовувати теÑтову мережу
-</translation>
+ <translation>ВикориÑтовувати теÑтову мережу</translation>
</message>
<message>
- <location line="-92"/>
+ <location line="-108"/>
<source>Accept connections from outside (default: 1 if no -proxy or -connect)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-74"/>
+ <location line="-82"/>
<source>%s, you must set a rpcpassword in the configuration file:
- %s
+%s
It is recommended you use the following random password:
rpcuser=bitcoinrpc
rpcpassword=%s
(you do not need to remember this password)
The username and password MUST NOT be the same.
If the file does not exist, create it with owner-readable-only file permissions.
+It is also recommended to set alertnotify so you are notified of problems;
+for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.com
</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+15"/>
+ <location line="+17"/>
<source>An error occurred while setting up the RPC port %u for listening on IPv6, falling back to IPv4: %s</source>
<translation type="unfinished"/>
</message>
@@ -2297,18 +2411,13 @@ If the file does not exist, create it with owner-readable-only file permissions.
</message>
<message>
<location line="+3"/>
- <source>Corrupted block database detected. Please restart the client with -reindex.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+2"/>
<source>Error initializing database environment %s! To recover, BACKUP THAT DIRECTORY, then remove everything from it except for wallet.dat.</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+3"/>
<source>Error: The transaction was rejected! This might happen if some of the coins in your wallet were already spent, such as if you used a copy of wallet.dat and coins were spent in the copy but not marked as spent here.</source>
- <translation type="unfinished"/>
+ <translation>Помилка: транзакцію було відхилено. Це може ÑтатиÑÑŒ, Ñкщо декілька монет з вашого Ð³Ð°Ð¼Ð°Ð½Ñ†Ñ Ð²Ð¶Ðµ викориÑтані, наприклад, Ñкщо ви викориÑтовуєте одну копію Ð³Ð°Ð¼Ð°Ð½Ñ†Ñ (wallet.dat), а монети були викориÑтані з іншої копії, але не позначені Ñк викориÑтані в цій.</translation>
</message>
<message>
<location line="+4"/>
@@ -2316,19 +2425,34 @@ If the file does not exist, create it with owner-readable-only file permissions.
<translation type="unfinished"/>
</message>
<message>
+ <location line="+3"/>
+ <source>Execute command when a relevant alert is received (%s in cmd is replaced by message)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Execute command when a wallet transaction changes (%s in cmd is replaced by TxID)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location line="+11"/>
<source>Set maximum size of high-priority/low-fee transactions in bytes (default: 27000)</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+3"/>
+ <source>Set the number of script verification threads (1-16, 0=auto, default: 0)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
<source>This is a pre-release test build - use at your own risk - do not use for mining or merchant applications</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+5"/>
<source>Warning: -paytxfee is set very high! This is the transaction fee you will pay if you send a transaction.</source>
- <translation>Увага: вÑтановлено занадто велику коміÑÑ–ÑŽ (-paytxfee). КоміÑÑ–Ñ Ð·Ð½Ñ–Ð¼Ð°Ñ‚Ð¸Ð¼ÐµÑ‚ÑŒÑÑ ÐºÐ¾Ð¶ÐµÐ½ раз коли ви проводитимете перекази.</translation>
+ <translation>Увага: вÑтановлено занадто велику коміÑÑ–ÑŽ (-paytxfee). КоміÑÑ–Ñ Ð·Ð½Ñ–Ð¼Ð°Ñ‚Ð¸Ð¼ÐµÑ‚ÑŒÑÑ ÐºÐ¾Ð¶ÐµÐ½ раз коли ви проводитимете транзакції.</translation>
</message>
<message>
<location line="+3"/>
@@ -2338,22 +2462,22 @@ If the file does not exist, create it with owner-readable-only file permissions.
<message>
<location line="+3"/>
<source>Warning: Please check that your computer&apos;s date and time are correct! If your clock is wrong Bitcoin will not work properly.</source>
- <translation>Увага: будь лаÑка, перевірте дату Ñ– Ñ‡Ð°Ñ Ð½Ð° Ñвому комп’ютері. Якщо ваш годинник йде неправильно, Bitcoin може працювати некоректно.</translation>
+ <translation>Увага: будь лаÑка, перевірте дату Ñ– Ñ‡Ð°Ñ Ð½Ð° Ñвоєму комп&apos;ютері. Якщо ваш годинник йде неправильно, Bitcoin може працювати некоректно.</translation>
</message>
<message>
<location line="+3"/>
<source>Warning: error reading wallet.dat! All keys read correctly, but transaction data or address book entries might be missing or incorrect.</source>
- <translation type="unfinished"/>
+ <translation>Увага: помилка Ñ‡Ð¸Ñ‚Ð°Ð½Ð½Ñ wallet.dat! Ð’ÑÑ– ключі прочитано коректно, але дані транзакцій чи запиÑи адреÑної книги можуть бути пропущені, або пошкоджені.</translation>
</message>
<message>
<location line="+3"/>
<source>Warning: wallet.dat corrupt, data salvaged! Original wallet.dat saved as wallet.{timestamp}.bak in %s; if your balance or transactions are incorrect you should restore from a backup.</source>
- <translation type="unfinished"/>
+ <translation>Увага: файл wallet.dat пошкоджено, дані врÑтовано! Оригінальний wallet.dat збережено Ñк wallet.{timestamp}.bak до %s; Ñкщо Ваш Ð±Ð°Ð»Ð°Ð½Ñ Ñ‡Ð¸ транзакції неправильні, Ви можете відновити Ñ—Ñ… з резервної копії. </translation>
</message>
<message>
<location line="+14"/>
<source>Attempt to recover private keys from a corrupt wallet.dat</source>
- <translation type="unfinished"/>
+ <translation>Спроба відновити закриті ключі з пошкодженого wallet.dat</translation>
</message>
<message>
<location line="+2"/>
@@ -2367,73 +2491,173 @@ If the file does not exist, create it with owner-readable-only file permissions.
</message>
<message>
<location line="+3"/>
+ <source>Corrupted block database detected</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Discover own IP address (default: 1 when listening and no -externalip)</source>
<translation type="unfinished"/>
</message>
<message>
+ <location line="+1"/>
+ <source>Do you want to rebuild the block database now?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location line="+3"/>
+ <source>Error initializing block database</source>
+ <translation>Помилка ініціалізації бази даних блоків</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Error initializing wallet database environment %s!</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Error loading block database</source>
+ <translation>Помилка Ð·Ð°Ð²Ð°Ð½Ñ‚Ð°Ð¶ÐµÐ½Ð½Ñ Ð±Ð°Ð·Ð¸ даних блоків</translation>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>Error opening block database</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+5"/>
+ <location line="+2"/>
<source>Error: Disk space is low!</source>
- <translation type="unfinished"/>
+ <translation>Помилка: Мало вільного міÑÑ†Ñ Ð½Ð° диÑку!</translation>
</message>
<message>
<location line="+1"/>
<source>Error: Transaction creation failed!</source>
- <translation type="unfinished"/>
+ <translation>Помилка: Ðе вдалоÑÑ Ñтворити транзакцію!</translation>
</message>
<message>
<location line="+1"/>
<source>Error: Wallet locked, unable to create transaction!</source>
- <translation type="unfinished"/>
+ <translation>Помилка: Гаманець заблокований, неможливо Ñтворити транзакцію!</translation>
</message>
<message>
<location line="+2"/>
+ <source>Error: system error: </source>
+ <translation>Помилка: ÑиÑтемна помилка: </translation>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Failed to listen on any port. Use -listen=0 if you want this.</source>
<translation type="unfinished"/>
</message>
<message>
+ <location line="+1"/>
+ <source>Failed to read block info</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Failed to read block</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Failed to sync block index</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Failed to write block index</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Failed to write block info</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Failed to write block</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Failed to write file info</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Failed to write to coin database</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Failed to write transaction index</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Failed to write undo data</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location line="+2"/>
<source>Find peers using DNS lookup (default: 1 unless -connect)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+5"/>
+ <location line="+3"/>
+ <source>How many blocks to check at startup (default: 288, 0 = all)</source>
+ <translation>Скільки блоків перевірÑти під Ñ‡Ð°Ñ Ð·Ð°Ð¿ÑƒÑку (типово: 288, 0 = вÑÑ–)</translation>
+ </message>
+ <message>
+ <location line="+1"/>
<source>How thorough the block verification is (0-4, default: 3)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+1"/>
- <source>Importing blocks from block database...</source>
+ <location line="+24"/>
+ <source>Rebuild block chain index from current blk000??.dat files</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+37"/>
+ <source>Verifying blocks...</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+1"/>
- <source>Imports blocks from external blk000??.dat file</source>
+ <source>Verifying wallet...</source>
<translation type="unfinished"/>
</message>
<message>
+ <location line="-61"/>
+ <source>Imports blocks from external blk000??.dat file</source>
+ <translation>Імпорт блоків з зовнішнього файлу blk000??.dat</translation>
+ </message>
+ <message>
<location line="+1"/>
<source>Information</source>
- <translation type="unfinished"/>
+ <translation>ІнформаціÑ</translation>
</message>
<message>
<location line="+3"/>
<source>Invalid -tor address: &apos;%s&apos;</source>
+ <translation>Помилка в адреÑÑ– -tor: «%s»</translation>
+ </message>
+ <message>
+ <location line="+8"/>
+ <source>Maintain a full transaction index (default: 0)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+9"/>
+ <location line="+2"/>
<source>Maximum per-connection receive buffer, &lt;n&gt;*1000 bytes (default: 5000)</source>
- <translation>МакÑимальоий буфер , &lt;n&gt; * 1000 байт (за умовчаннÑм: 5000)</translation>
+ <translation>МакÑимальний буфер, &lt;n&gt;*1000 байт (типово: 5000)</translation>
</message>
<message>
<location line="+1"/>
<source>Maximum per-connection send buffer, &lt;n&gt;*1000 bytes (default: 1000)</source>
- <translation>МакÑимальній розмір виіхідного буферу на одне з&apos;Ñ”Ð´Ð½Ð°Ð½Ð½Ñ (за замовчуваннÑм 1000)</translation>
+ <translation>МакÑимальній розмір вихідного буферу на одне з&apos;єднаннÑ, &lt;n&gt;*1000 байт (типово: 1000)</translation>
</message>
<message>
<location line="+1"/>
@@ -2448,7 +2672,7 @@ If the file does not exist, create it with owner-readable-only file permissions.
<message>
<location line="+2"/>
<source>Output extra debugging information. Implies all other -debug* options</source>
- <translation>Виводити більше налагоджувальної інформації. Implies all other -debug* options</translation>
+ <translation>Виводити більше налагоджувальної інформації. МаєтьÑÑ Ð½Ð° увазі вÑÑ– шнші -debug* параметри</translation>
</message>
<message>
<location line="+1"/>
@@ -2461,59 +2685,59 @@ If the file does not exist, create it with owner-readable-only file permissions.
<translation>Доповнювати налагоджувальний вивід відміткою чаÑу</translation>
</message>
<message>
- <location line="+1"/>
- <source>Rebuild blockchain index from current blk000??.dat files</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+4"/>
+ <location line="+5"/>
<source>SSL options: (see the Bitcoin Wiki for SSL setup instructions)</source>
- <translation>Параметри SSL: (див. Bitcoin Wiki)</translation>
+ <translation>Параметри SSL: (див. Bitcoin Wiki Ð´Ð»Ñ Ð½Ð°Ð»Ð°ÑˆÑ‚ÑƒÐ²Ð°Ð½Ð½Ñ SSL)</translation>
</message>
<message>
<location line="+1"/>
<source>Select the version of socks proxy to use (4-5, default: 5)</source>
- <translation type="unfinished"/>
+ <translation>Вибір верÑÑ–Ñ— socks-прокÑÑ– Ð´Ð»Ñ Ð²Ð¸ÐºÐ¾Ñ€Ð¸ÑÑ‚Ð°Ð½Ð½Ñ (4-5, типово: 5)</translation>
</message>
<message>
<location line="+3"/>
<source>Send trace/debug info to console instead of debug.log file</source>
- <translation>ВідÑилаті налагоджувальну інформацію на конÑоль, а не у файл debug.log</translation>
+ <translation>ВідÑилати налагоджувальну інформацію на конÑоль, а не у файл debug.log</translation>
</message>
<message>
<location line="+1"/>
<source>Send trace/debug info to debugger</source>
- <translation>ВідÑилаті налагоджувальну інформацію до налагоджувача</translation>
+ <translation>ВідÑилати налагоджувальну інформацію до налагоджувача</translation>
</message>
<message>
<location line="+5"/>
<source>Set maximum block size in bytes (default: 250000)</source>
- <translation type="unfinished"/>
+ <translation>Ð’Ñтановити макÑимальний розмір блоку у байтах (типово: 250000)</translation>
</message>
<message>
<location line="+1"/>
<source>Set minimum block size in bytes (default: 0)</source>
- <translation type="unfinished"/>
+ <translation>Ð’Ñтановити мінімальний розмір блоку у байтах (типово: 0)</translation>
</message>
<message>
<location line="+1"/>
<source>Shrink debug.log file on client startup (default: 1 when no -debug)</source>
- <translation type="unfinished"/>
+ <translation>СтиÑкати файл debug.log під Ñ‡Ð°Ñ Ñтарту клієнта (типово: 1 коли відÑутутній параметр -debug)</translation>
</message>
<message>
<location line="+2"/>
<source>Specify connection timeout in milliseconds (default: 5000)</source>
- <translation>Odredi vremenski prozor za spajanje na mrežu u milisekundama (ugrađeni izbor: 5000)</translation>
+ <translation>Вказати тайм-аут Ð¿Ñ–Ð´ÐºÐ»ÑŽÑ‡ÐµÐ½Ð½Ñ Ñƒ міліÑекундах (типово: 5000)</translation>
</message>
<message>
- <location line="+13"/>
+ <location line="+4"/>
+ <source>System error: </source>
+ <translation>СиÑтемна помилка: </translation>
+ </message>
+ <message>
+ <location line="+10"/>
<source>Use UPnP to map the listening port (default: 0)</source>
- <translation>ÐамагатиÑÑŒ викориÑтовувати UPnP Ð´Ð»Ñ Ð²Ñ–Ð´Ð¾Ð±Ñ€Ð°Ð¶ÐµÐ½Ð½Ñ Ð¿Ð¾Ñ€Ñ‚Ñƒ що проÑлуховуєтьÑÑ Ð½Ð° роутері (default: 0)</translation>
+ <translation>ÐамагатиÑÑŒ викориÑтовувати UPnP Ð´Ð»Ñ Ð²Ñ–Ð´Ð¾Ð±Ñ€Ð°Ð¶ÐµÐ½Ð½Ñ Ð¿Ð¾Ñ€Ñ‚Ñƒ, що проÑлуховуєтьÑÑ Ð½Ð° роутері (default: 0)</translation>
</message>
<message>
<location line="+1"/>
<source>Use UPnP to map the listening port (default: 1 when listening)</source>
- <translation>ÐамагатиÑÑŒ викориÑтовувати UPnP Ð´Ð»Ñ Ð²Ñ–Ð´Ð¾Ð±Ñ€Ð°Ð¶ÐµÐ½Ð½Ñ Ð¿Ð¾Ñ€Ñ‚Ñƒ що проÑлуховуєтьÑÑ Ð½Ð° роутері (default: 1 when listening)</translation>
+ <translation>ÐамагатиÑÑŒ викориÑтовувати UPnP Ð´Ð»Ñ Ð²Ñ–Ð´Ð¾Ð±Ñ€Ð°Ð¶ÐµÐ½Ð½Ñ Ð¿Ð¾Ñ€Ñ‚Ñƒ, що проÑлуховуєтьÑÑ Ð½Ð° роутері (default: 1 when listening)</translation>
</message>
<message>
<location line="+1"/>
@@ -2523,124 +2747,112 @@ If the file does not exist, create it with owner-readable-only file permissions.
<message>
<location line="+2"/>
<source>Username for JSON-RPC connections</source>
- <translation>Ð†Ð¼â€™Ñ ÐºÐ¾Ñ€Ð¸Ñтувача Ð´Ð»Ñ JSON-RPC-з’єднань
-</translation>
+ <translation>Ім&apos;Ñ ÐºÐ¾Ñ€Ð¸Ñтувача Ð´Ð»Ñ JSON-RPC-з&apos;єднань</translation>
</message>
<message>
<location line="+4"/>
<source>Warning</source>
- <translation type="unfinished"/>
+ <translation>ПопередженнÑ</translation>
</message>
<message>
<location line="+1"/>
<source>Warning: This version is obsolete, upgrade required!</source>
+ <translation>Увага: Поточна верÑÑ–Ñ Ð·Ð°Ñтаріла, необхідне оновленнÑ!</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>You need to rebuild the databases using -reindex to change -txindex</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+1"/>
<source>wallet.dat corrupt, salvage failed</source>
- <translation type="unfinished"/>
+ <translation>wallet.dat пошкоджено, Ð²Ñ–Ð´Ð½Ð¾Ð²Ð»ÐµÐ½Ð½Ñ Ð½Ðµ вдалоÑÑ</translation>
</message>
<message>
- <location line="-43"/>
+ <location line="-45"/>
<source>Password for JSON-RPC connections</source>
- <translation>Пароль Ð´Ð»Ñ JSON-RPC-з’єднань
-</translation>
+ <translation>Пароль Ð´Ð»Ñ JSON-RPC-з&apos;єднань</translation>
</message>
<message>
- <location line="-53"/>
+ <location line="-68"/>
<source>Allow JSON-RPC connections from specified IP address</source>
- <translation>Дозволити JSON-RPC-Ð·â€™Ñ”Ð´Ð½Ð°Ð½Ð½Ñ Ð· вказаної IP-адреÑи
-</translation>
+ <translation>Дозволити JSON-RPC-з&apos;Ñ”Ð´Ð½Ð°Ð½Ð½Ñ Ð· вказаної IP-адреÑи</translation>
</message>
<message>
- <location line="+62"/>
+ <location line="+77"/>
<source>Send commands to node running on &lt;ip&gt; (default: 127.0.0.1)</source>
- <translation>ВідправлÑти команди на вузол, запущений на &lt;ip&gt; (за промовчуваннÑм: 127.0.0.1)
-</translation>
+ <translation>ВідправлÑти команди на вузол, запущений на &lt;ip&gt; (типово: 127.0.0.1)</translation>
</message>
<message>
- <location line="-103"/>
+ <location line="-120"/>
<source>Execute command when the best block changes (%s in cmd is replaced by block hash)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+124"/>
+ <location line="+142"/>
<source>Upgrade wallet to latest format</source>
- <translation type="unfinished"/>
+ <translation>Модернізувати гаманець до оÑтаннього формату</translation>
</message>
<message>
- <location line="-15"/>
+ <location line="-16"/>
<source>Set key pool size to &lt;n&gt; (default: 100)</source>
- <translation>Ð’Ñтановити розмір пулу ключів &lt;n&gt; (за промовчуваннÑм: 100)
-</translation>
+ <translation>Ð’Ñтановити розмір пулу ключів &lt;n&gt; (типово: 100)</translation>
</message>
<message>
<location line="-12"/>
<source>Rescan the block chain for missing wallet transactions</source>
- <translation>ПереÑканувати ланцюжок блоків, в пошуку втрачених переказів
-</translation>
+ <translation>ПереÑканувати ланцюжок блоків, в пошуку втрачених транзакцій</translation>
</message>
<message>
- <location line="-26"/>
- <source>How many blocks to check at startup (default: 2500, 0 = all)</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+55"/>
+ <location line="+30"/>
<source>Use OpenSSL (https) for JSON-RPC connections</source>
- <translation>ВикориÑтовувати OpenSSL (https) Ð´Ð»Ñ JSON-RPC-з’єднань
-</translation>
+ <translation>ВикориÑтовувати OpenSSL (https) Ð´Ð»Ñ JSON-RPC-з&apos;єднань</translation>
</message>
<message>
- <location line="-20"/>
+ <location line="-21"/>
<source>Server certificate file (default: server.cert)</source>
- <translation>Сертифікату Ñервера (за промовчуваннÑм: server.cert)
-</translation>
+ <translation>Файл Ñертифіката Ñервера (типово: server.cert)</translation>
</message>
<message>
<location line="+1"/>
<source>Server private key (default: server.pem)</source>
- <translation>Закритий ключ Ñервера (за промовчуваннÑм: server.pem)
-</translation>
+ <translation>Закритий ключ Ñервера (типово: server.pem)</translation>
</message>
<message>
- <location line="-133"/>
+ <location line="-154"/>
<source>Acceptable ciphers (default: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH)</source>
- <translation>ДопуÑтимі шифри (за промовчуваннÑм: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH)
-</translation>
+ <translation>ДопуÑтимі шифри (типово: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH)</translation>
</message>
<message>
- <location line="+144"/>
+ <location line="+166"/>
<source>This help message</source>
- <translation>Дана довідка
-</translation>
+ <translation>Дана довідка</translation>
</message>
<message>
<location line="+3"/>
<source>Unable to bind to %s on this computer (bind returned error %d, %s)</source>
- <translation>Ðеможливо прив’Ñзати до порту %s на цьому комп’ютері (bind returned error %d, %s)</translation>
+ <translation>Ðеможливо прив&apos;Ñзати до порту %s на цьому комп&apos;ютері (bind returned error %d, %s)</translation>
</message>
<message>
- <location line="-70"/>
+ <location line="-86"/>
<source>Connect through socks proxy</source>
<translation>ПідключитиÑÑŒ через SOCKS-прокÑÑ–</translation>
</message>
<message>
<location line="-11"/>
<source>Allow DNS lookups for -addnode, -seednode and -connect</source>
- <translation>Дозволити пошук в DNS Ð´Ð»Ñ ÐºÐ¾Ð¼Ð°Ð½Ð´ «addnode» Ñ– «connect»
-</translation>
+ <translation>Дозволити пошук в DNS Ð´Ð»Ñ ÐºÐ¾Ð¼Ð°Ð½Ð´ -addnode, -seednode та -connect</translation>
</message>
<message>
- <location line="+43"/>
+ <location line="+57"/>
<source>Loading addresses...</source>
<translation>Ð—Ð°Ð²Ð°Ð½Ñ‚Ð°Ð¶ÐµÐ½Ð½Ñ Ð°Ð´Ñ€ÐµÑ...</translation>
</message>
<message>
- <location line="-25"/>
+ <location line="-35"/>
<source>Error loading wallet.dat: Wallet corrupted</source>
- <translation>Помилка при завантаженні wallet.dat: Гаманець пошкоджено </translation>
+ <translation>Помилка при завантаженні wallet.dat: Гаманець пошкоджено</translation>
</message>
<message>
<location line="+1"/>
@@ -2648,34 +2860,24 @@ If the file does not exist, create it with owner-readable-only file permissions.
<translation>Помилка при завантаженні wallet.dat: Гаманець потребує новішої верÑÑ–Ñ— Біткоін-клієнта</translation>
</message>
<message>
- <location line="+73"/>
- <source>Verifying block database integrity...</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+1"/>
- <source>Verifying wallet integrity...</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+1"/>
+ <location line="+87"/>
<source>Wallet needed to be rewritten: restart Bitcoin to complete</source>
<translation>Потрібно перезапиÑати гаманець: перезапуÑÑ‚Ñ–Ñ‚ÑŒ Біткоін-клієнт Ð´Ð»Ñ Ð·Ð°Ð²ÐµÑ€ÑˆÐµÐ½Ð½Ñ</translation>
</message>
<message>
- <location line="-77"/>
+ <location line="-89"/>
<source>Error loading wallet.dat</source>
<translation>Помилка при завантаженні wallet.dat</translation>
</message>
<message>
- <location line="+20"/>
+ <location line="+30"/>
<source>Invalid -proxy address: &apos;%s&apos;</source>
- <translation>Помилка в адреÑÑ– прокÑÑ–-Ñервера: &apos;%s&apos;</translation>
+ <translation>Помилка в адреÑÑ– прокÑÑ–-Ñервера: «%s»</translation>
</message>
<message>
- <location line="+46"/>
+ <location line="+48"/>
<source>Unknown network specified in -onlynet: &apos;%s&apos;</source>
- <translation type="unfinished"/>
+ <translation>Ðевідома мережа вказана в -onlynet: «%s»</translation>
</message>
<message>
<location line="-1"/>
@@ -2683,7 +2885,7 @@ If the file does not exist, create it with owner-readable-only file permissions.
<translation type="unfinished"/>
</message>
<message>
- <location line="-75"/>
+ <location line="-91"/>
<source>Cannot resolve -bind address: &apos;%s&apos;</source>
<translation type="unfinished"/>
</message>
@@ -2693,19 +2895,19 @@ If the file does not exist, create it with owner-readable-only file permissions.
<translation type="unfinished"/>
</message>
<message>
- <location line="+31"/>
+ <location line="+45"/>
<source>Invalid amount for -paytxfee=&lt;amount&gt;: &apos;%s&apos;</source>
- <translation>Помилка у величині коміÑÑ–Ñ—: &apos;%s&apos;</translation>
+ <translation>Помилка у величині коміÑÑ–Ñ— -paytxfee=&lt;amount&gt;: «%s»</translation>
</message>
<message>
- <location line="-15"/>
+ <location line="-24"/>
<source>Error: could not start node</source>
- <translation type="unfinished"/>
+ <translation>Помилка: неможливо запуÑтити вузол</translation>
</message>
<message>
- <location line="+16"/>
+ <location line="+25"/>
<source>Invalid amount</source>
- <translation type="unfinished"/>
+ <translation>Ðекоректна кількіÑÑ‚ÑŒ</translation>
</message>
<message>
<location line="-4"/>
@@ -2718,33 +2920,27 @@ If the file does not exist, create it with owner-readable-only file permissions.
<translation>Ð—Ð°Ð²Ð°Ð½Ñ‚Ð°Ð¶ÐµÐ½Ð½Ñ Ñ–Ð½Ð´ÐµÐºÑу блоків...</translation>
</message>
<message>
- <location line="-45"/>
+ <location line="-59"/>
<source>Add a node to connect to and attempt to keep the connection open</source>
- <translation>Додати вузол Ð´Ð»Ñ Ð¿Ñ–Ð´ÐºÐ»ÑŽÑ‡ÐµÐ½Ð½Ñ and attempt to keep the connection open</translation>
+ <translation>Додати вузол до Ð¿Ñ–Ð´ÐºÐ»ÑŽÑ‡ÐµÐ½Ð½Ñ Ñ– лишити його відкритим</translation>
</message>
<message>
<location line="-25"/>
<source>Unable to bind to %s on this computer. Bitcoin is probably already running.</source>
- <translation>Ðеможливо прив’Ñзати до порту %s на цьому комп’ютері. Молживо гаманець вже запущено.</translation>
- </message>
- <message>
- <location line="+54"/>
- <source>Find peers using internet relay chat (default: 0)</source>
- <translation type="unfinished"/>
+ <translation>Ðеможливо прив&apos;Ñзати до порту %s на цьому комп&apos;ютері. Можливо гаманець вже запущено.</translation>
</message>
<message>
- <location line="-2"/>
+ <location line="+68"/>
<source>Fee per KB to add to transactions you send</source>
- <translation>КоміÑÑ–Ñ Ð·Ð° Кб
-</translation>
+ <translation>КоміÑÑ–Ñ Ð·Ð° КБ</translation>
</message>
<message>
- <location line="+19"/>
+ <location line="+17"/>
<source>Loading wallet...</source>
<translation>Ð—Ð°Ð²Ð°Ð½Ñ‚Ð°Ð¶ÐµÐ½Ð½Ñ Ð³Ð°Ð¼Ð°Ð½Ñ†Ñ...</translation>
</message>
<message>
- <location line="-40"/>
+ <location line="-54"/>
<source>Cannot downgrade wallet</source>
<translation type="unfinished"/>
</message>
@@ -2756,34 +2952,36 @@ If the file does not exist, create it with owner-readable-only file permissions.
<message>
<location line="+3"/>
<source>Cannot write default address</source>
- <translation type="unfinished"/>
+ <translation>Ðеможливо запиÑати типову адреÑу</translation>
</message>
<message>
- <location line="+49"/>
+ <location line="+64"/>
<source>Rescanning...</source>
<translation>СкануваннÑ...</translation>
</message>
<message>
- <location line="-43"/>
+ <location line="-56"/>
<source>Done loading</source>
<translation>Ð—Ð°Ð²Ð°Ð½Ñ‚Ð°Ð¶ÐµÐ½Ð½Ñ Ð·Ð°Ð²ÐµÑ€ÑˆÐµÐ½Ðµ</translation>
</message>
<message>
- <location line="+65"/>
+ <location line="+79"/>
<source>To use the %s option</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-60"/>
+ <location line="-71"/>
<source>Error</source>
- <translation type="unfinished"/>
+ <translation>Помилка</translation>
</message>
<message>
- <location line="-28"/>
+ <location line="-33"/>
<source>You must set rpcpassword=&lt;password&gt; in the configuration file:
%s
If the file does not exist, create it with owner-readable-only file permissions.</source>
- <translation type="unfinished"/>
+ <translation>Ви муÑите вÑтановити rpcpassword=&lt;password&gt; в файлі конфігурації:
+%s
+Якщо файл не Ñ–Ñнує, Ñтворіть його із правами тільки Ð´Ð»Ñ Ñ‡Ð¸Ñ‚Ð°Ð½Ð½Ñ Ð²Ð»Ð°Ñником (owner-readable-only).</translation>
</message>
</context>
</TS> \ No newline at end of file
diff --git a/src/qt/locale/bitcoin_zh_CN.ts b/src/qt/locale/bitcoin_zh_CN.ts
index 640f3534fe..c451fc5365 100644
--- a/src/qt/locale/bitcoin_zh_CN.ts
+++ b/src/qt/locale/bitcoin_zh_CN.ts
@@ -13,12 +13,7 @@
<translation>&lt;b&gt;比特å¸&lt;/b&gt;版本</translation>
</message>
<message>
- <location line="+41"/>
- <source>Copyright © 2009-2012 The Bitcoin developers</source>
- <translation>版æƒæ‰€æœ‰ © 2009-2012 比特å¸å¼€å‘团队</translation>
- </message>
- <message>
- <location line="+13"/>
+ <location line="+57"/>
<source>
This is experimental software.
@@ -32,13 +27,23 @@ Distributed under the MIT/X11 software license, see the accompanying file COPYIN
This product includes software developed by the OpenSSL Project for use in the OpenSSL Toolkit (http://www.openssl.org/) and cryptographic software written by Eric Young (eay@cryptsoft.com) and UPnP software written by Thomas Bernard.</translation>
</message>
+ <message>
+ <location filename="../aboutdialog.cpp" line="+17"/>
+ <source>Copyright</source>
+ <translation>版æƒ</translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>2009-%1 The Bitcoin developers</source>
+ <translation>2009-%1 The Bitcoin developers</translation>
+ </message>
</context>
<context>
<name>AddressBookPage</name>
<message>
<location filename="../forms/addressbookpage.ui" line="+14"/>
<source>Address Book</source>
- <translation>地å€ç°¿</translation>
+ <translation>通讯录</translation>
</message>
<message>
<location line="+22"/>
@@ -106,19 +111,24 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation>&amp;删除</translation>
</message>
<message>
- <location filename="../addressbookpage.cpp" line="+65"/>
+ <location filename="../addressbookpage.cpp" line="+66"/>
<source>Copy &amp;Label</source>
<translation>å¤åˆ¶ &amp;标签</translation>
</message>
<message>
- <location line="+2"/>
+ <location line="+1"/>
<source>&amp;Edit</source>
<translation>&amp;编辑</translation>
</message>
<message>
- <location line="+250"/>
+ <location line="+1"/>
+ <source>Send &amp;Coins</source>
+ <translation>付款</translation>
+ </message>
+ <message>
+ <location line="+263"/>
<source>Export Address Book Data</source>
- <translation>导出地å€ç°¿æ•°æ®</translation>
+ <translation>导出通讯录数æ®</translation>
</message>
<message>
<location line="+1"/>
@@ -139,7 +149,7 @@ This product includes software developed by the OpenSSL Project for use in the O
<context>
<name>AddressTableModel</name>
<message>
- <location filename="../addresstablemodel.cpp" line="+142"/>
+ <location filename="../addresstablemodel.cpp" line="+144"/>
<source>Label</source>
<translation>标签</translation>
</message>
@@ -164,22 +174,22 @@ This product includes software developed by the OpenSSL Project for use in the O
<message>
<location line="+21"/>
<source>Enter passphrase</source>
- <translation>输入å£ä»¤</translation>
+ <translation>输入密ç </translation>
</message>
<message>
<location line="+14"/>
<source>New passphrase</source>
- <translation>æ–°å£ä»¤</translation>
+ <translation>新密ç </translation>
</message>
<message>
<location line="+14"/>
<source>Repeat new passphrase</source>
- <translation>é‡å¤æ–°å£ä»¤</translation>
+ <translation>é‡å¤æ–°å¯†ç </translation>
</message>
<message>
<location filename="../askpassphrasedialog.cpp" line="+33"/>
<source>Enter the new passphrase to the wallet.&lt;br/&gt;Please use a passphrase of &lt;b&gt;10 or more random characters&lt;/b&gt;, or &lt;b&gt;eight or more words&lt;/b&gt;.</source>
- <translation>输入钱包的新å£ä»¤ã€‚&lt;br/&gt;使用的å£ä»¤è¯·è‡³å°‘包å«&lt;b&gt;10个以上éšæœºå­—符&lt;/&gt;,或者是&lt;b&gt;8个以上的å•è¯&lt;/b&gt;。</translation>
+ <translation>输入钱包的新密ç ã€‚&lt;br/&gt;使用的密ç è¯·è‡³å°‘包å«&lt;b&gt;10个以上éšæœºå­—符&lt;/&gt;,或者是&lt;b&gt;8个以上的å•è¯&lt;/b&gt;。</translation>
</message>
<message>
<location line="+1"/>
@@ -189,7 +199,7 @@ This product includes software developed by the OpenSSL Project for use in the O
<message>
<location line="+3"/>
<source>This operation needs your wallet passphrase to unlock the wallet.</source>
- <translation>该æ“作需è¦æ‚¨é¦–先使用å£ä»¤è§£é”钱包。</translation>
+ <translation>该æ“作需è¦æ‚¨é¦–先使用密ç è§£é”钱包。</translation>
</message>
<message>
<location line="+5"/>
@@ -199,7 +209,7 @@ This product includes software developed by the OpenSSL Project for use in the O
<message>
<location line="+3"/>
<source>This operation needs your wallet passphrase to decrypt the wallet.</source>
- <translation>该æ“作需è¦æ‚¨é¦–先使用å£ä»¤è§£å¯†é’±åŒ…。</translation>
+ <translation>该æ“作需è¦æ‚¨é¦–先使用密ç è§£å¯†é’±åŒ…。</translation>
</message>
<message>
<location line="+5"/>
@@ -209,12 +219,12 @@ This product includes software developed by the OpenSSL Project for use in the O
<message>
<location line="+3"/>
<source>Change passphrase</source>
- <translation>修改å£ä»¤</translation>
+ <translation>修改密ç </translation>
</message>
<message>
<location line="+1"/>
<source>Enter the old and new passphrase to the wallet.</source>
- <translation>请输入钱包的旧å£ä»¤ä¸Žæ–°å£ä»¤ã€‚</translation>
+ <translation>请输入钱包的旧密ç ä¸Žæ–°å¯†ç ã€‚</translation>
</message>
<message>
<location line="+46"/>
@@ -270,7 +280,7 @@ This product includes software developed by the OpenSSL Project for use in the O
<location line="+7"/>
<location line="+48"/>
<source>The supplied passphrases do not match.</source>
- <translation>å£ä»¤ä¸åŒ¹é…。</translation>
+ <translation>密ç ä¸åŒ¹é…。</translation>
</message>
<message>
<location line="-37"/>
@@ -282,7 +292,7 @@ This product includes software developed by the OpenSSL Project for use in the O
<location line="+11"/>
<location line="+19"/>
<source>The passphrase entered for the wallet decryption was incorrect.</source>
- <translation>用于解密钱包的å£ä»¤ä¸æ­£ç¡®ã€‚</translation>
+ <translation>用于解密钱包的密ç ä¸æ­£ç¡®ã€‚</translation>
</message>
<message>
<location line="-20"/>
@@ -298,17 +308,17 @@ This product includes software developed by the OpenSSL Project for use in the O
<context>
<name>BitcoinGUI</name>
<message>
- <location filename="../bitcoingui.cpp" line="+267"/>
+ <location filename="../bitcoingui.cpp" line="+231"/>
<source>Sign &amp;message...</source>
<translation>对&amp;消æ¯ç­¾å...</translation>
</message>
<message>
- <location line="+254"/>
+ <location line="+299"/>
<source>Synchronizing with network...</source>
<translation>正在与网络åŒæ­¥...</translation>
</message>
<message>
- <location line="-322"/>
+ <location line="-367"/>
<source>&amp;Overview</source>
<translation>&amp;概况</translation>
</message>
@@ -328,32 +338,17 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation>查看交易历å²</translation>
</message>
<message>
- <location line="+6"/>
- <source>&amp;Address Book</source>
- <translation>&amp;地å€ç°¿</translation>
- </message>
- <message>
- <location line="+1"/>
+ <location line="+7"/>
<source>Edit the list of stored addresses and labels</source>
<translation>修改存储的地å€å’Œæ ‡ç­¾åˆ—表</translation>
</message>
<message>
- <location line="-15"/>
- <source>&amp;Receive coins</source>
- <translation>&amp;收款地å€</translation>
- </message>
- <message>
- <location line="+1"/>
+ <location line="-14"/>
<source>Show the list of addresses for receiving payments</source>
<translation>显示接收支付的地å€åˆ—表</translation>
</message>
<message>
- <location line="-8"/>
- <source>&amp;Send coins</source>
- <translation>&amp;å‘é€è´§å¸</translation>
- </message>
- <message>
- <location line="+39"/>
+ <location line="+31"/>
<source>E&amp;xit</source>
<translation>退出</translation>
</message>
@@ -398,7 +393,7 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation>&amp;修改密ç ...</translation>
</message>
<message>
- <location line="+259"/>
+ <location line="+304"/>
<source>Importing blocks from disk...</source>
<translation>正在从ç£ç›˜å¯¼å…¥æ•°æ®å—...</translation>
</message>
@@ -407,13 +402,8 @@ This product includes software developed by the OpenSSL Project for use in the O
<source>Reindexing blocks on disk...</source>
<translation>正在为数æ®å—建立索引...</translation>
</message>
- <message numerus="yes">
- <location line="+10"/>
- <source>~%n block(s) remaining</source>
- <translation><numerusform>~还剩 %n 个数æ®å—</numerusform></translation>
- </message>
<message>
- <location line="-265"/>
+ <location line="-300"/>
<source>&amp;Export...</source>
<translation>&amp;导出...</translation>
</message>
@@ -458,18 +448,33 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation>&amp;验è¯æ¶ˆæ¯...</translation>
</message>
<message>
- <location line="-196"/>
- <location line="+538"/>
+ <location line="-162"/>
+ <location line="+540"/>
<source>Bitcoin</source>
<translation>比特å¸</translation>
</message>
<message>
- <location line="-538"/>
+ <location line="-540"/>
<source>Wallet</source>
<translation>钱包</translation>
</message>
<message>
- <location line="+176"/>
+ <location line="+99"/>
+ <source>&amp;Send</source>
+ <translation>&amp;å‘é€</translation>
+ </message>
+ <message>
+ <location line="+7"/>
+ <source>&amp;Receive</source>
+ <translation>&amp;接收</translation>
+ </message>
+ <message>
+ <location line="+14"/>
+ <source>&amp;Addresses</source>
+ <translation>&amp;地å€</translation>
+ </message>
+ <message>
+ <location line="+22"/>
<source>&amp;About Bitcoin</source>
<translation>&amp;关于比特å¸</translation>
</message>
@@ -530,27 +535,57 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation>[testnet]</translation>
</message>
<message>
- <location line="+63"/>
+ <location line="+47"/>
<source>Bitcoin client</source>
<translation>比特å¸å®¢æˆ·ç«¯</translation>
</message>
<message numerus="yes">
- <location line="+79"/>
+ <location line="+140"/>
<source>%n active connection(s) to Bitcoin network</source>
<translation><numerusform>到比特å¸ç½‘络的连接共有%næ¡</numerusform></translation>
</message>
<message>
- <location line="+45"/>
- <source>Processed %1 of %2 blocks of transaction history (%3% done).</source>
- <translation>å·²å¤„ç† %2个交易历å²æ•°æ®å—中的%1个(完æˆçŽ‡ %3%)。</translation>
+ <location line="+39"/>
+ <source>Processed %1 of %2 (estimated) blocks of transaction history.</source>
+ <translation>%1 / %2 个交易历å²çš„区å—已下载</translation>
</message>
<message>
- <location line="+7"/>
+ <location line="+4"/>
<source>Processed %1 blocks of transaction history.</source>
<translation>å·²å¤„ç† %1 个交易历å²æ•°æ®å—。</translation>
</message>
+ <message numerus="yes">
+ <location line="+20"/>
+ <source>%n hour(s)</source>
+ <translation><numerusform>%n å°æ—¶å‰</numerusform></translation>
+ </message>
+ <message numerus="yes">
+ <location line="+4"/>
+ <source>%n day(s)</source>
+ <translation><numerusform>%n 天å‰</numerusform></translation>
+ </message>
+ <message numerus="yes">
+ <location line="+4"/>
+ <source>%n week(s)</source>
+ <translation><numerusform>%n 周å‰</numerusform></translation>
+ </message>
<message>
- <location line="+70"/>
+ <location line="+5"/>
+ <source>%1 behind</source>
+ <translation>è½åŽ %1 </translation>
+ </message>
+ <message>
+ <location line="+14"/>
+ <source>Last received block was generated %1 ago.</source>
+ <translation>最新收到的区å—产生于 %1。</translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Transactions after this will not yet be visible.</source>
+ <translation>在此之åŽçš„交易尚未å¯è§</translation>
+ </message>
+ <message>
+ <location line="+21"/>
<source>Error</source>
<translation>错误</translation>
</message>
@@ -565,62 +600,27 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation>ä¿¡æ¯</translation>
</message>
<message>
- <location line="+66"/>
+ <location line="+68"/>
<source>This transaction is over the size limit. You can still send it for a fee of %1, which goes to the nodes that process your transaction and helps to support the network. Do you want to pay the fee?</source>
<translation>该交易的字节数超标。您å¯ä»¥é€‰æ‹©æ”¯ä»˜%1的交易费给处ç†æ‚¨çš„交易的网络节点,有助于比特å¸ç½‘络的è¿è¡Œã€‚您愿æ„支付这笔交易费用å—?</translation>
</message>
<message>
- <location line="+210"/>
- <source>Backup Successful</source>
- <translation>备份æˆåŠŸ</translation>
- </message>
- <message>
- <location line="+0"/>
- <source>The wallet data was successfully saved to the new location.</source>
- <translation>钱包数æ®æˆåŠŸå­˜å‚¨åˆ°æ–°ä½ç½®</translation>
- </message>
- <message numerus="yes">
- <location line="-338"/>
- <source>%n second(s) ago</source>
- <translation><numerusform>%n 秒å‰</numerusform></translation>
- </message>
- <message numerus="yes">
- <location line="+4"/>
- <source>%n minute(s) ago</source>
- <translation><numerusform>%n 分ç§å‰</numerusform></translation>
- </message>
- <message numerus="yes">
- <location line="+4"/>
- <source>%n hour(s) ago</source>
- <translation><numerusform>%n å°æ—¶å‰</numerusform></translation>
- </message>
- <message numerus="yes">
- <location line="+4"/>
- <source>%n day(s) ago</source>
- <translation><numerusform>%n 天å‰</numerusform></translation>
- </message>
- <message>
- <location line="+6"/>
+ <location line="-138"/>
<source>Up to date</source>
<translation>最新状æ€</translation>
</message>
<message>
- <location line="+7"/>
+ <location line="+32"/>
<source>Catching up...</source>
<translation>更新中...</translation>
</message>
<message>
- <location line="+10"/>
- <source>Last received block was generated %1.</source>
- <translation>最新收到的数æ®å—产生于 %1。</translation>
- </message>
- <message>
- <location line="+97"/>
+ <location line="+110"/>
<source>Confirm transaction fee</source>
<translation>确认交易费</translation>
</message>
<message>
- <location line="+23"/>
+ <location line="+8"/>
<source>Sent transaction</source>
<translation>å·²å‘é€äº¤æ˜“</translation>
</message>
@@ -643,14 +643,14 @@ Address: %4
</translation>
</message>
<message>
- <location line="+99"/>
- <location line="+28"/>
+ <location line="+33"/>
+ <location line="+23"/>
<source>URI handling</source>
<translation>URI 处ç†</translation>
</message>
<message>
- <location line="-28"/>
- <location line="+28"/>
+ <location line="-23"/>
+ <location line="+23"/>
<source>URI can not be parsed! This can be caused by an invalid Bitcoin address or malformed URI parameters.</source>
<translation>URI无法解æžï¼åŽŸå› å¯èƒ½æ˜¯æ¯”特å¸åœ°å€ä¸æ­£ç¡®ï¼Œæˆ–者URIå‚数错误。</translation>
</message>
@@ -665,27 +665,7 @@ Address: %4
<translation>钱包已被&lt;b&gt;加密&lt;/b&gt;,当å‰ä¸º&lt;b&gt;é”定&lt;/b&gt;状æ€</translation>
</message>
<message>
- <location line="+23"/>
- <source>Backup Wallet</source>
- <translation>备份钱包</translation>
- </message>
- <message>
- <location line="+0"/>
- <source>Wallet Data (*.dat)</source>
- <translation>钱包文件(*.dat)</translation>
- </message>
- <message>
- <location line="+3"/>
- <source>Backup Failed</source>
- <translation>备份失败</translation>
- </message>
- <message>
- <location line="+0"/>
- <source>There was an error trying to save the wallet data to the new location.</source>
- <translation>备份钱包到其它文件夹失败.</translation>
- </message>
- <message>
- <location filename="../bitcoin.cpp" line="+109"/>
+ <location filename="../bitcoin.cpp" line="+108"/>
<source>A fatal error occurred. Bitcoin can no longer continue safely and will quit.</source>
<translation>å‘生严é‡é”™è¯¯ã€‚</translation>
</message>
@@ -693,7 +673,7 @@ Address: %4
<context>
<name>ClientModel</name>
<message>
- <location filename="../clientmodel.cpp" line="+86"/>
+ <location filename="../clientmodel.cpp" line="+96"/>
<source>Network Alert</source>
<translation>网络警报</translation>
</message>
@@ -726,7 +706,7 @@ Address: %4
<translation>该地å€ä¸Žåœ°å€ç°¿ä¸­çš„æ¡ç›®å·²å…³è”,无法作为å‘é€åœ°å€ç¼–辑。</translation>
</message>
<message>
- <location filename="../editaddressdialog.cpp" line="+20"/>
+ <location filename="../editaddressdialog.cpp" line="+21"/>
<source>New receiving address</source>
<translation>新接收地å€</translation>
</message>
@@ -746,17 +726,17 @@ Address: %4
<translation>编辑å‘é€åœ°å€</translation>
</message>
<message>
- <location line="+60"/>
+ <location line="+76"/>
<source>The entered address &quot;%1&quot; is already in the address book.</source>
<translation>è¾“å…¥çš„åœ°å€ &quot;%1&quot; å·²ç»å­˜åœ¨äºŽåœ°å€ç°¿ã€‚</translation>
</message>
<message>
- <location line="+5"/>
+ <location line="-5"/>
<source>The entered address &quot;%1&quot; is not a valid Bitcoin address.</source>
<translation>您输入的 &quot;%1&quot; ä¸æ˜¯åˆæ³•çš„比特å¸åœ°å€.</translation>
</message>
<message>
- <location line="+5"/>
+ <location line="+10"/>
<source>Could not unlock wallet.</source>
<translation>无法解é”钱包</translation>
</message>
@@ -769,7 +749,7 @@ Address: %4
<context>
<name>GUIUtil::HelpMessageBox</name>
<message>
- <location filename="../guiutil.cpp" line="+419"/>
+ <location filename="../guiutil.cpp" line="+422"/>
<location line="+12"/>
<source>Bitcoin-Qt</source>
<translation>Bitcoin-Qt</translation>
@@ -846,12 +826,12 @@ Address: %4
<message>
<location line="+35"/>
<source>Reset all client options to default.</source>
- <translation type="unfinished"/>
+ <translation>æ¢å¤å®¢æˆ·ç«¯çš„缺çœè®¾ç½®</translation>
</message>
<message>
<location line="+3"/>
<source>&amp;Reset Options</source>
- <translation type="unfinished"/>
+ <translation>æ¢å¤ç¼ºçœè®¾ç½®</translation>
</message>
<message>
<location line="+13"/>
@@ -984,24 +964,24 @@ Address: %4
<translation>&amp;应用</translation>
</message>
<message>
- <location filename="../optionsdialog.cpp" line="+55"/>
+ <location filename="../optionsdialog.cpp" line="+53"/>
<source>default</source>
<translation>缺çœ</translation>
</message>
<message>
<location line="+130"/>
<source>Confirm options reset</source>
- <translation type="unfinished"/>
+ <translation>确认æ¢å¤ç¼ºçœè®¾ç½®</translation>
</message>
<message>
<location line="+1"/>
<source>Some settings may require a client restart to take effect.</source>
- <translation type="unfinished"/>
+ <translation>æŸäº›è®¾ç½®é€‰é¡¹éœ€è¦é‡å¯å®¢æˆ·ç«¯æ‰èƒ½ç”Ÿæ•ˆ</translation>
</message>
<message>
<location line="+0"/>
<source>Do you want to proceed?</source>
- <translation type="unfinished"/>
+ <translation>您希望继续å—?</translation>
</message>
<message>
<location line="+42"/>
@@ -1029,23 +1009,18 @@ Address: %4
<translation>表å•</translation>
</message>
<message>
- <location line="+51"/>
- <location line="+183"/>
+ <location line="+50"/>
+ <location line="+166"/>
<source>The displayed information may be out of date. Your wallet automatically synchronizes with the Bitcoin network after a connection is established, but this process has not completed yet.</source>
<translation>现在显示的消æ¯å¯èƒ½æ˜¯è¿‡æœŸçš„. 在连接上比特å¸ç½‘络节点åŽï¼Œæ‚¨çš„钱包将自动与网络åŒæ­¥ï¼Œä½†æ˜¯è¿™ä¸ªè¿‡ç¨‹è¿˜æ²¡æœ‰å®Œæˆ.</translation>
</message>
<message>
- <location line="-141"/>
+ <location line="-124"/>
<source>Balance:</source>
<translation>ä½™é¢ï¼š</translation>
</message>
<message>
- <location line="+58"/>
- <source>Number of transactions:</source>
- <translation>交易笔数:</translation>
- </message>
- <message>
- <location line="-29"/>
+ <location line="+29"/>
<source>Unconfirmed:</source>
<translation>未确认:</translation>
</message>
@@ -1055,7 +1030,7 @@ Address: %4
<translation>钱包</translation>
</message>
<message>
- <location line="+124"/>
+ <location line="+107"/>
<source>Immature:</source>
<translation>未æˆç†Ÿçš„:</translation>
</message>
@@ -1070,7 +1045,7 @@ Address: %4
<translation>&lt;b&gt;最近交易记录&lt;/b&gt;</translation>
</message>
<message>
- <location line="-118"/>
+ <location line="-101"/>
<source>Your current balance</source>
<translation>您的当å‰ä½™é¢</translation>
</message>
@@ -1080,11 +1055,6 @@ Address: %4
<translation>尚未确认的交易总é¢, 未计入当å‰ä½™é¢</translation>
</message>
<message>
- <location line="+20"/>
- <source>Total number of transactions in wallet</source>
- <translation>钱包总交易数é‡</translation>
- </message>
- <message>
<location filename="../overviewpage.cpp" line="+115"/>
<location line="+1"/>
<source>out of sync</source>
@@ -1092,6 +1062,14 @@ Address: %4
</message>
</context>
<context>
+ <name>PaymentServer</name>
+ <message>
+ <location filename="../paymentserver.cpp" line="+107"/>
+ <source>Cannot start bitcoin: click-to-pay handler</source>
+ <translation>暂时无法å¯åŠ¨æ¯”特å¸ï¼šç‚¹å‡»æ”¯ä»˜åŠŸèƒ½</translation>
+ </message>
+</context>
+<context>
<name>QRCodeDialog</name>
<message>
<location filename="../forms/qrcodedialog.ui" line="+14"/>
@@ -1430,7 +1408,7 @@ Address: %4
</message>
<message>
<location line="+60"/>
- <location filename="../sendcoinsentry.cpp" line="+25"/>
+ <location filename="../sendcoinsentry.cpp" line="+26"/>
<source>Enter a label for this address to add it to your address book</source>
<translation>为这个地å€è¾“入一个标签,以便将它添加到您的地å€ç°¿</translation>
</message>
@@ -1522,7 +1500,7 @@ Address: %4
<message>
<location line="+7"/>
<source>Signature</source>
- <translation type="unfinished"/>
+ <translation>ç­¾å</translation>
</message>
<message>
<location line="+27"/>
@@ -1666,7 +1644,7 @@ Address: %4
<context>
<name>TransactionDesc</name>
<message>
- <location filename="../transactiondesc.cpp" line="+19"/>
+ <location filename="../transactiondesc.cpp" line="+20"/>
<source>Open until %1</source>
<translation>至 %1 个数æ®å—时开å¯</translation>
</message>
@@ -1829,7 +1807,7 @@ Address: %4
<message numerus="yes">
<location line="-35"/>
<source>Open for %n more block(s)</source>
- <translation type="unfinished"><numerusform></numerusform></translation>
+ <translation><numerusform>Open for %n more block</numerusform></translation>
</message>
<message>
<location line="+70"/>
@@ -1853,7 +1831,7 @@ Address: %4
<context>
<name>TransactionTableModel</name>
<message>
- <location filename="../transactiontablemodel.cpp" line="+226"/>
+ <location filename="../transactiontablemodel.cpp" line="+225"/>
<source>Date</source>
<translation>日期</translation>
</message>
@@ -1875,7 +1853,7 @@ Address: %4
<message numerus="yes">
<location line="+57"/>
<source>Open for %n more block(s)</source>
- <translation type="unfinished"><numerusform></numerusform></translation>
+ <translation><numerusform>Open for %n more block</numerusform></translation>
</message>
<message>
<location line="+3"/>
@@ -1971,7 +1949,7 @@ Address: %4
<context>
<name>TransactionView</name>
<message>
- <location filename="../transactionview.cpp" line="+55"/>
+ <location filename="../transactionview.cpp" line="+52"/>
<location line="+16"/>
<source>All</source>
<translation>全部</translation>
@@ -2058,6 +2036,11 @@ Address: %4
</message>
<message>
<location line="+1"/>
+ <source>Copy transaction ID</source>
+ <translation>å¤åˆ¶äº¤æ˜“ç¼–å·</translation>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Edit label</source>
<translation>编辑标签</translation>
</message>
@@ -2067,7 +2050,7 @@ Address: %4
<translation>显示交易详情</translation>
</message>
<message>
- <location line="+142"/>
+ <location line="+139"/>
<source>Export Transaction Data</source>
<translation>导出交易数æ®</translation>
</message>
@@ -2122,7 +2105,7 @@ Address: %4
<translation>无法写入文件 %1。</translation>
</message>
<message>
- <location line="+95"/>
+ <location line="+100"/>
<source>Range:</source>
<translation>范围:</translation>
</message>
@@ -2133,31 +2116,174 @@ Address: %4
</message>
</context>
<context>
+ <name>WalletView</name>
+ <message>
+ <location filename="../walletview.cpp" line="+95"/>
+ <source>&amp;Overview</source>
+ <translation>&amp;概况</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Show general overview of wallet</source>
+ <translation>显示钱包概况</translation>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>&amp;Send coins</source>
+ <translation>&amp;å‘é€</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Send coins to a Bitcoin address</source>
+ <translation>å‘一个比特å¸åœ°å€å‘é€æ¯”特å¸</translation>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>&amp;Receive coins</source>
+ <translation>&amp;接å—比特å¸</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Show the list of addresses for receiving payments</source>
+ <translation>显示接收支付的地å€åˆ—表</translation>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>&amp;Transactions</source>
+ <translation>&amp;交易</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Browse transaction history</source>
+ <translation>查看交易历å²</translation>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>&amp;Address Book</source>
+ <translation>&amp;地å€è–„</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Edit the list of stored addresses and labels</source>
+ <translation>修改存储的地å€å’Œæ ‡ç­¾åˆ—表</translation>
+ </message>
+ <message>
+ <location line="+12"/>
+ <source>&amp;Encrypt Wallet...</source>
+ <translation>&amp;加密钱包...</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Encrypt the private keys that belong to your wallet</source>
+ <translation>对钱包中的ç§é’¥åŠ å¯†</translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>&amp;Backup Wallet...</source>
+ <translation>&amp;备份钱包...</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Backup wallet to another location</source>
+ <translation>备份钱包到其它文件夹</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>&amp;Change Passphrase...</source>
+ <translation>&amp;修改密ç ...</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Change the passphrase used for wallet encryption</source>
+ <translation>修改钱包的加密密ç </translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Sign &amp;message...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Sign messages with your Bitcoin addresses to prove you own them</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>&amp;Verify message...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Verify messages to ensure they were signed with specified Bitcoin addresses</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>&amp;Export...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Export the data in the current tab to a file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+180"/>
+ <source>Backup Wallet</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>Wallet Data (*.dat)</source>
+ <translation>钱包文件(*.dat)</translation>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Backup Failed</source>
+ <translation>备份失败</translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>There was an error trying to save the wallet data to the new location.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>Backup Successful</source>
+ <translation>备份æˆåŠŸ</translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>The wallet data was successfully saved to the new location.</source>
+ <translation>钱包数æ®æˆåŠŸå­˜å‚¨åˆ°æ–°ä½ç½®</translation>
+ </message>
+</context>
+<context>
<name>bitcoin-core</name>
<message>
- <location filename="../bitcoinstrings.cpp" line="+88"/>
+ <location filename="../bitcoinstrings.cpp" line="+96"/>
<source>Bitcoin version</source>
<translation>比特å¸ç‰ˆæœ¬</translation>
</message>
<message>
- <location line="+82"/>
+ <location line="+98"/>
<source>Usage:</source>
<translation>使用:</translation>
</message>
<message>
- <location line="-23"/>
+ <location line="-24"/>
<source>Send command to -server or bitcoind</source>
<translation>å‘é€å‘½ä»¤åˆ°æœåŠ¡å™¨æˆ–者 bitcoind
</translation>
</message>
<message>
- <location line="-21"/>
+ <location line="-22"/>
<source>List commands</source>
<translation>列出命令
</translation>
</message>
<message>
- <location line="-11"/>
+ <location line="-10"/>
<source>Get help for a command</source>
<translation>获得æŸæ¡å‘½ä»¤çš„帮助
</translation>
@@ -2187,13 +2313,13 @@ Address: %4
</translation>
</message>
<message>
- <location line="-15"/>
+ <location line="-28"/>
<source>Don&apos;t generate coins</source>
<translation>ä¸è¦ç”Ÿæˆè´§å¸
</translation>
</message>
<message>
- <location line="+61"/>
+ <location line="+74"/>
<source>Specify data directory</source>
<translation>指定数æ®ç›®å½•
</translation>
@@ -2204,91 +2330,86 @@ Address: %4
<translation>设置数æ®åº“ç¼“å†²åŒºå¤§å° (缺çœ: 25MB)</translation>
</message>
<message>
- <location line="-26"/>
+ <location line="-27"/>
<source>Listen for connections on &lt;port&gt; (default: 8333 or testnet: 18333)</source>
<translation>监å¬ç«¯å£è¿žæŽ¥ &lt;port&gt; (缺çœ: 8333 or testnet: 18333)</translation>
</message>
<message>
- <location line="+4"/>
+ <location line="+5"/>
<source>Maintain at most &lt;n&gt; connections to peers (default: 125)</source>
<translation>最大连接数 &lt;n&gt; (缺çœ: 125)</translation>
</message>
<message>
- <location line="-34"/>
+ <location line="-49"/>
<source>Connect to a node to retrieve peer addresses, and disconnect</source>
<translation>连接一个节点并获å–对端地å€, 然åŽæ–­å¼€è¿žæŽ¥</translation>
</message>
<message>
- <location line="+65"/>
+ <location line="+80"/>
<source>Specify your own public address</source>
<translation>指定您的公共地å€</translation>
</message>
<message>
- <location line="+2"/>
+ <location line="+3"/>
<source>Threshold for disconnecting misbehaving peers (default: 100)</source>
<translation>Threshold for disconnecting misbehaving peers (缺çœ: 100)</translation>
</message>
<message>
- <location line="-114"/>
+ <location line="-132"/>
<source>Number of seconds to keep misbehaving peers from reconnecting (default: 86400)</source>
<translation>Number of seconds to keep misbehaving peers from reconnecting (缺çœ: 86400)</translation>
</message>
<message>
- <location line="-28"/>
+ <location line="-32"/>
<source>An error occurred while setting up the RPC port %u for listening on IPv4: %s</source>
<translation>设置RPC监å¬ç«¯å£%uæ—¶å‘生错误, IPv4:%s</translation>
</message>
<message>
- <location line="+26"/>
+ <location line="+30"/>
<source>Listen for JSON-RPC connections on &lt;port&gt; (default: 8332 or testnet: 18332)</source>
<translation>JSON-RPC连接监å¬ç«¯å£&lt;port&gt; (缺çœï¼š8332 testnet:18332)</translation>
</message>
<message>
- <location line="+34"/>
+ <location line="+36"/>
<source>Accept command line and JSON-RPC commands</source>
<translation>接å—命令行和 JSON-RPC 命令
</translation>
</message>
<message>
- <location line="+62"/>
+ <location line="+77"/>
<source>Run in the background as a daemon and accept commands</source>
<translation>在åŽå°è¿è¡Œå¹¶æŽ¥å—命令
</translation>
</message>
<message>
- <location line="+31"/>
+ <location line="+32"/>
<source>Use the test network</source>
<translation>使用测试网络
</translation>
</message>
<message>
- <location line="-92"/>
+ <location line="-108"/>
<source>Accept connections from outside (default: 1 if no -proxy or -connect)</source>
<translation>接å—æ¥è‡ªå¤–部的连接 (缺çœ: 如果ä¸å¸¦ -proxy or -connect å‚数设置为1)</translation>
</message>
<message>
- <location line="-74"/>
+ <location line="-82"/>
<source>%s, you must set a rpcpassword in the configuration file:
- %s
+%s
It is recommended you use the following random password:
rpcuser=bitcoinrpc
rpcpassword=%s
(you do not need to remember this password)
The username and password MUST NOT be the same.
If the file does not exist, create it with owner-readable-only file permissions.
+It is also recommended to set alertnotify so you are notified of problems;
+for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.com
</source>
- <translation>%s, 您必须在é…置文件设置rpcpassword:
- %s
-建议您使用下é¢çš„éšæœºå¯†ç :
-rpcuser=bitcoinrpc
-rpcpassword=%s
-(您无需记ä½æ­¤å¯†ç )
-用户åå’Œå¯†ç  å¿…! é¡»! ä¸ä¸€æ ·ã€‚
-如果é…置文件ä¸å­˜åœ¨ï¼Œè¯·è‡ªè¡Œå»ºç«‹ä¸€ä¸ªåªæœ‰æ‰€æœ‰è€…拥有åªè¯»æƒé™çš„文件。</translation>
+ <translation type="unfinished"/>
</message>
<message>
- <location line="+15"/>
+ <location line="+17"/>
<source>An error occurred while setting up the RPC port %u for listening on IPv6, falling back to IPv4: %s</source>
<translation>在IPv6模å¼ä¸‹è®¾ç½®RPC监å¬ç«¯å£ %u 失败,返回到IPv4模å¼: %s</translation>
</message>
@@ -2304,11 +2425,6 @@ rpcpassword=%s
</message>
<message>
<location line="+3"/>
- <source>Corrupted block database detected. Please restart the client with -reindex.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+2"/>
<source>Error initializing database environment %s! To recover, BACKUP THAT DIRECTORY, then remove everything from it except for wallet.dat.</source>
<translation>æ•°æ®åº“环境%såˆå§‹åŒ–失败ï¼æ¢å¤æ–¹æ³•ï¼šå¤‡ä»½è¯¥ç›®å½•ï¼Œç„¶åŽåˆ æŽ‰é™¤wallet.dat之外的所有文件。</translation>
</message>
@@ -2320,7 +2436,17 @@ rpcpassword=%s
<message>
<location line="+4"/>
<source>Error: This transaction requires a transaction fee of at least %s because of its amount, complexity, or use of recently received funds!</source>
- <translation>错误:因为该交易的数é‡ã€å¤æ‚度或者动用了刚收到ä¸ä¹…的新钱等原因,您需è¦æ”¯ä»˜ä¸å°‘于%s的交易费用。</translation>
+ <translation>错误:因为该交易的数é‡ã€å¤æ‚度或者动用了刚收到ä¸ä¹…的资金,您需è¦æ”¯ä»˜ä¸å°‘于%s的交易费用。</translation>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Execute command when a relevant alert is received (%s in cmd is replaced by message)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Execute command when a wallet transaction changes (%s in cmd is replaced by TxID)</source>
+ <translation>当最佳区å—å˜åŒ–时执行命令 (命令行中的 %s 会被替æ¢æˆåŒºå—哈希值)</translation>
</message>
<message>
<location line="+11"/>
@@ -2329,6 +2455,11 @@ rpcpassword=%s
</message>
<message>
<location line="+3"/>
+ <source>Set the number of script verification threads (1-16, 0=auto, default: 0)</source>
+ <translation>设置Script验è¯è¿›ç¨‹æ•°(1-16,0=自动,缺çœï¼š0)</translation>
+ </message>
+ <message>
+ <location line="+2"/>
<source>This is a pre-release test build - use at your own risk - do not use for mining or merchant applications</source>
<translation>这是测试用的预å‘布版本 - 请谨慎使用 - ä¸è¦ç”¨æ¥æŒ–矿,或者在正å¼å•†ç”¨çŽ¯å¢ƒä¸‹ä½¿ç”¨</translation>
</message>
@@ -2374,18 +2505,43 @@ rpcpassword=%s
</message>
<message>
<location line="+3"/>
+ <source>Corrupted block database detected</source>
+ <translation>检测å‘现数æ®å—æ•°æ®åº“æŸå。请使用 -reindexå‚æ•°é‡å¯å®¢æˆ·ç«¯ã€‚</translation>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Discover own IP address (default: 1 when listening and no -externalip)</source>
<translation>å‘现自己的IP地å€(缺çœ:ä¸å¸¦ -externalip å‚数监å¬æ—¶è®¾ç½®ä¸º1)</translation>
</message>
<message>
+ <location line="+1"/>
+ <source>Do you want to rebuild the block database now?</source>
+ <translation>你想现在就é‡å»ºå—æ•°æ®åº“å—?</translation>
+ </message>
+ <message>
<location line="+3"/>
+ <source>Error initializing block database</source>
+ <translation>åˆå§‹åŒ–æ•°æ®å—æ•°æ®åº“出错</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Error initializing wallet database environment %s!</source>
+ <translation>Error initializing wallet database environment %s!</translation>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Error loading block database</source>
- <translation type="unfinished"/>
+ <translation>导入数æ®å—æ•°æ®åº“出错</translation>
</message>
<message>
- <location line="+5"/>
+ <location line="+4"/>
+ <source>Error opening block database</source>
+ <translation>导入数æ®å—æ•°æ®åº“出错</translation>
+ </message>
+ <message>
+ <location line="+2"/>
<source>Error: Disk space is low!</source>
- <translation>错误:ç£ç›˜ç©ºé—´ä¸å¤šäº†!</translation>
+ <translation>错误:ç£ç›˜å‰©ä½™ç©ºé—´ä½Ž!</translation>
</message>
<message>
<location line="+1"/>
@@ -2395,30 +2551,100 @@ rpcpassword=%s
<message>
<location line="+1"/>
<source>Error: Wallet locked, unable to create transaction!</source>
- <translation>错误:钱包处于上é”状æ€ï¼Œæ— æ³•åˆ›å»ºäº¤æ˜“ï¼</translation>
+ <translation>错误:钱包被é”定,无法创建交易ï¼</translation>
</message>
<message>
<location line="+2"/>
+ <source>Error: system error: </source>
+ <translation>错误:系统出错。</translation>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Failed to listen on any port. Use -listen=0 if you want this.</source>
<translation>监å¬ç«¯å£å¤±è´¥ã€‚请使用 -listen=0 å‚数。</translation>
</message>
<message>
+ <location line="+1"/>
+ <source>Failed to read block info</source>
+ <translation>无法读å–æ•°æ®å—ä¿¡æ¯</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Failed to read block</source>
+ <translation>读å–æ•°æ®å—失败</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Failed to sync block index</source>
+ <translation>无法åŒæ­¥æ•°æ®å—索引</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Failed to write block index</source>
+ <translation>无法写入数æ®å—索引</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Failed to write block info</source>
+ <translation>无法写入数æ®å—ä¿¡æ¯</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Failed to write block</source>
+ <translation>无法写数æ®å—</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Failed to write file info</source>
+ <translation>无法写入文件信æ¯</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Failed to write to coin database</source>
+ <translation>无法写入coinæ•°æ®åº“</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Failed to write transaction index</source>
+ <translation>无法写入交易索引</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Failed to write undo data</source>
+ <translation>无法写入回滚信æ¯</translation>
+ </message>
+ <message>
<location line="+2"/>
<source>Find peers using DNS lookup (default: 1 unless -connect)</source>
<translation>通过DNS查找节点(缺çœï¼š1 除éžä½¿ç”¨ -connect 选项)</translation>
</message>
<message>
- <location line="+5"/>
+ <location line="+3"/>
+ <source>How many blocks to check at startup (default: 288, 0 = all)</source>
+ <translation>å¯åŠ¨æ—¶æ£€æµ‹å¤šå°‘个数æ®å—(缺çœï¼š288,0=所有)</translation>
+ </message>
+ <message>
+ <location line="+1"/>
<source>How thorough the block verification is (0-4, default: 3)</source>
+ <translation>How thorough the block verification is (0-4, default: 3)</translation>
+ </message>
+ <message>
+ <location line="+24"/>
+ <source>Rebuild block chain index from current blk000??.dat files</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+1"/>
- <source>Importing blocks from block database...</source>
- <translation>正在从数æ®å—文件中导入数æ®å—...</translation>
+ <location line="+37"/>
+ <source>Verifying blocks...</source>
+ <translation>正在验è¯æ•°æ®åº“的完整性...</translation>
</message>
<message>
<location line="+1"/>
+ <source>Verifying wallet...</source>
+ <translation>正在检测钱包的完整性...</translation>
+ </message>
+ <message>
+ <location line="-61"/>
<source>Imports blocks from external blk000??.dat file</source>
<translation>从blk000??.dat文件导入数æ®å—</translation>
</message>
@@ -2433,7 +2659,12 @@ rpcpassword=%s
<translation>éžæ³•çš„ -tor 地å€ï¼š&apos;%s&apos; </translation>
</message>
<message>
- <location line="+9"/>
+ <location line="+8"/>
+ <source>Maintain a full transaction index (default: 0)</source>
+ <translation>维护一份完整的交易索引(缺çœï¼š0)</translation>
+ </message>
+ <message>
+ <location line="+2"/>
<source>Maximum per-connection receive buffer, &lt;n&gt;*1000 bytes (default: 5000)</source>
<translation>æ¯ä¸ªè¿žæŽ¥çš„最大接收缓存,&lt;n&gt;*1000 字节(缺çœï¼š5000)</translation>
</message>
@@ -2468,12 +2699,7 @@ rpcpassword=%s
<translation>为调试输出信æ¯æ·»åŠ æ—¶é—´æˆ³</translation>
</message>
<message>
- <location line="+1"/>
- <source>Rebuild blockchain index from current blk000??.dat files</source>
- <translation>é‡æ–°ä¸ºå½“å‰çš„blk000??.dat文件建立索引</translation>
- </message>
- <message>
- <location line="+4"/>
+ <location line="+5"/>
<source>SSL options: (see the Bitcoin Wiki for SSL setup instructions)</source>
<translation>SSL选项:(å‚è§Bitcoin Wiki关于SSL设置æ ç›®)</translation>
</message>
@@ -2513,7 +2739,12 @@ rpcpassword=%s
<translation>设置连接超时时间(缺çœï¼š5000毫秒)</translation>
</message>
<message>
- <location line="+13"/>
+ <location line="+4"/>
+ <source>System error: </source>
+ <translation>系统错误:</translation>
+ </message>
+ <message>
+ <location line="+10"/>
<source>Use UPnP to map the listening port (default: 0)</source>
<translation>使用UPnp映射监å¬ç«¯å£(缺çœ: 0)</translation>
</message>
@@ -2545,39 +2776,44 @@ rpcpassword=%s
</message>
<message>
<location line="+1"/>
+ <source>You need to rebuild the databases using -reindex to change -txindex</source>
+ <translation>You need to rebuild the databases using -reindex to change -txindex</translation>
+ </message>
+ <message>
+ <location line="+1"/>
<source>wallet.dat corrupt, salvage failed</source>
<translation>钱包文件wallet.datæŸå,抢救备份失败</translation>
</message>
<message>
- <location line="-43"/>
+ <location line="-45"/>
<source>Password for JSON-RPC connections</source>
<translation>JSON-RPC连接密ç 
</translation>
</message>
<message>
- <location line="-53"/>
+ <location line="-68"/>
<source>Allow JSON-RPC connections from specified IP address</source>
<translation>å…许从指定IP接å—到的JSON-RPC连接
</translation>
</message>
<message>
- <location line="+62"/>
+ <location line="+77"/>
<source>Send commands to node running on &lt;ip&gt; (default: 127.0.0.1)</source>
<translation>å‘IP地å€ä¸º &lt;ip&gt; 的节点å‘é€æŒ‡ä»¤ (缺çœ: 127.0.0.1)
</translation>
</message>
<message>
- <location line="-103"/>
+ <location line="-120"/>
<source>Execute command when the best block changes (%s in cmd is replaced by block hash)</source>
<translation>当最佳数æ®å—å˜åŒ–时执行命令 (命令行中的 %s 会被替æ¢æˆæ•°æ®å—哈希值)</translation>
</message>
<message>
- <location line="+124"/>
+ <location line="+142"/>
<source>Upgrade wallet to latest format</source>
<translation>将钱包å‡çº§åˆ°æœ€æ–°çš„æ ¼å¼</translation>
</message>
<message>
- <location line="-15"/>
+ <location line="-16"/>
<source>Set key pool size to &lt;n&gt; (default: 100)</source>
<translation>设置密钥池大å°ä¸º &lt;n&gt; (缺çœ: 100)
</translation>
@@ -2589,17 +2825,12 @@ rpcpassword=%s
</translation>
</message>
<message>
- <location line="-26"/>
- <source>How many blocks to check at startup (default: 2500, 0 = all)</source>
- <translation>å¯åŠ¨æ—¶éœ€æ£€æŸ¥çš„æ•°æ®å—æ•°é‡ (缺çœ: 2500, 设置0为检查所有数æ®å—)</translation>
- </message>
- <message>
- <location line="+55"/>
+ <location line="+30"/>
<source>Use OpenSSL (https) for JSON-RPC connections</source>
<translation>为 JSON-RPC 连接使用 OpenSSL (https)连接</translation>
</message>
<message>
- <location line="-20"/>
+ <location line="-21"/>
<source>Server certificate file (default: server.cert)</source>
<translation>æœåŠ¡å™¨è¯ä¹¦ (默认为 server.cert)
</translation>
@@ -2611,13 +2842,13 @@ rpcpassword=%s
</translation>
</message>
<message>
- <location line="-133"/>
+ <location line="-154"/>
<source>Acceptable ciphers (default: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH)</source>
<translation>å¯æŽ¥å—的加密器 (默认为 TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH)
</translation>
</message>
<message>
- <location line="+144"/>
+ <location line="+166"/>
<source>This help message</source>
<translation>该帮助信æ¯
</translation>
@@ -2628,7 +2859,7 @@ rpcpassword=%s
<translation>æ— æ³•ç»‘å®šæœ¬æœºç«¯å£ %s (è¿”å›žé”™è¯¯æ¶ˆæ¯ %d, %s)</translation>
</message>
<message>
- <location line="-70"/>
+ <location line="-86"/>
<source>Connect through socks proxy</source>
<translation>通过 socks 代ç†è¿žæŽ¥</translation>
</message>
@@ -2638,12 +2869,12 @@ rpcpassword=%s
<translation>使用 -addnode, -seednode å’Œ -connect选项时å…许DNS查找</translation>
</message>
<message>
- <location line="+43"/>
+ <location line="+57"/>
<source>Loading addresses...</source>
<translation>正在加载地å€...</translation>
</message>
<message>
- <location line="-25"/>
+ <location line="-35"/>
<source>Error loading wallet.dat: Wallet corrupted</source>
<translation>wallet.dat钱包文件加载错误:钱包æŸå</translation>
</message>
@@ -2653,32 +2884,22 @@ rpcpassword=%s
<translation>wallet.dat钱包文件加载错误:请å‡çº§åˆ°æœ€æ–°Bitcoin客户端</translation>
</message>
<message>
- <location line="+73"/>
- <source>Verifying block database integrity...</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+1"/>
- <source>Verifying wallet integrity...</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+1"/>
+ <location line="+87"/>
<source>Wallet needed to be rewritten: restart Bitcoin to complete</source>
<translation>钱包文件需è¦é‡å†™ï¼šè¯·é€€å‡ºå¹¶é‡æ–°å¯åŠ¨Bitcoin客户端</translation>
</message>
<message>
- <location line="-77"/>
+ <location line="-89"/>
<source>Error loading wallet.dat</source>
<translation>wallet.dat钱包文件加载错误</translation>
</message>
<message>
- <location line="+20"/>
+ <location line="+30"/>
<source>Invalid -proxy address: &apos;%s&apos;</source>
<translation>éžæ³•çš„代ç†åœ°å€: &apos;%s&apos;</translation>
</message>
<message>
- <location line="+46"/>
+ <location line="+48"/>
<source>Unknown network specified in -onlynet: &apos;%s&apos;</source>
<translation>被指定的是未知网络 -onlynet: &apos;%s&apos;</translation>
</message>
@@ -2688,7 +2909,7 @@ rpcpassword=%s
<translation>被指定的是未知socks代ç†ç‰ˆæœ¬: %i</translation>
</message>
<message>
- <location line="-75"/>
+ <location line="-91"/>
<source>Cannot resolve -bind address: &apos;%s&apos;</source>
<translation>æ— æ³•è§£æž -bind 端å£åœ°å€: &apos;%s&apos;</translation>
</message>
@@ -2698,17 +2919,17 @@ rpcpassword=%s
<translation>æ— æ³•è§£æž -externalip 地å€: &apos;%s&apos;</translation>
</message>
<message>
- <location line="+31"/>
+ <location line="+45"/>
<source>Invalid amount for -paytxfee=&lt;amount&gt;: &apos;%s&apos;</source>
<translation>éžæ³•é‡‘é¢ -paytxfee=&lt;amount&gt;: &apos;%s&apos;</translation>
</message>
<message>
- <location line="-15"/>
+ <location line="-24"/>
<source>Error: could not start node</source>
<translation>错误: 无法å¯åŠ¨èŠ‚点</translation>
</message>
<message>
- <location line="+16"/>
+ <location line="+25"/>
<source>Invalid amount</source>
<translation>金é¢ä¸å¯¹</translation>
</message>
@@ -2723,7 +2944,7 @@ rpcpassword=%s
<translation>加载数æ®å—索引...</translation>
</message>
<message>
- <location line="-45"/>
+ <location line="-59"/>
<source>Add a node to connect to and attempt to keep the connection open</source>
<translation>添加节点并与其ä¿æŒè¿žæŽ¥</translation>
</message>
@@ -2733,22 +2954,17 @@ rpcpassword=%s
<translation>无法在本机绑定 %s ç«¯å£ . 比特å¸å®¢æˆ·ç«¯è½¯ä»¶å¯èƒ½å·²ç»åœ¨è¿è¡Œ.</translation>
</message>
<message>
- <location line="+54"/>
- <source>Find peers using internet relay chat (default: 0)</source>
- <translation>通过IRCèŠå¤©å®¤æŸ¥æ‰¾ç½‘络上的比特å¸èŠ‚点 (缺çœ: 0)</translation>
- </message>
- <message>
- <location line="-2"/>
+ <location line="+68"/>
<source>Fee per KB to add to transactions you send</source>
<translation>æ¯å‘é€1KB交易所需的费用</translation>
</message>
<message>
- <location line="+19"/>
+ <location line="+17"/>
<source>Loading wallet...</source>
<translation>正在加载钱包...</translation>
</message>
<message>
- <location line="-40"/>
+ <location line="-54"/>
<source>Cannot downgrade wallet</source>
<translation>无法é™çº§é’±åŒ…æ ¼å¼</translation>
</message>
@@ -2763,27 +2979,27 @@ rpcpassword=%s
<translation>无法写入缺çœåœ°å€</translation>
</message>
<message>
- <location line="+49"/>
+ <location line="+64"/>
<source>Rescanning...</source>
<translation>正在é‡æ–°æ‰«æ...</translation>
</message>
<message>
- <location line="-43"/>
+ <location line="-56"/>
<source>Done loading</source>
<translation>加载完æˆ</translation>
</message>
<message>
- <location line="+65"/>
+ <location line="+79"/>
<source>To use the %s option</source>
<translation>使用 %s 选项</translation>
</message>
<message>
- <location line="-60"/>
+ <location line="-71"/>
<source>Error</source>
<translation>错误</translation>
</message>
<message>
- <location line="-28"/>
+ <location line="-33"/>
<source>You must set rpcpassword=&lt;password&gt; in the configuration file:
%s
If the file does not exist, create it with owner-readable-only file permissions.</source>
diff --git a/src/qt/locale/bitcoin_zh_TW.ts b/src/qt/locale/bitcoin_zh_TW.ts
index 2aa6d7c65f..afd0554093 100644
--- a/src/qt/locale/bitcoin_zh_TW.ts
+++ b/src/qt/locale/bitcoin_zh_TW.ts
@@ -13,12 +13,7 @@
<translation>&lt;b&gt;ä½å…ƒå¹£&lt;/b&gt;版本</translation>
</message>
<message>
- <location line="+41"/>
- <source>Copyright © 2009-2012 The Bitcoin developers</source>
- <translation>版權為 Bitcoin 開發人員自西元 2009 至 2012 年起所有</translation>
- </message>
- <message>
- <location line="+13"/>
+ <location line="+57"/>
<source>
This is experimental software.
@@ -32,6 +27,16 @@ This product includes software developed by the OpenSSL Project for use in the O
此產å“也包å«äº†ç”± OpenSSL Project 所開發的 OpenSSL Toolkit (http://www.openssl.org/) 軟體, ç”± Eric Young (eay@cryptsoft.com) 撰寫的加解密軟體, 以åŠç”± Thomas Bernard 所撰寫的 UPnP 軟體.</translation>
</message>
+ <message>
+ <location filename="../aboutdialog.cpp" line="+17"/>
+ <source>Copyright</source>
+ <translation>版權</translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>2009-%1 The Bitcoin developers</source>
+ <translation>Bitcoin 開發人員自西元 2009 至 %1 年起所有</translation>
+ </message>
</context>
<context>
<name>AddressBookPage</name>
@@ -83,7 +88,7 @@ This product includes software developed by the OpenSSL Project for use in the O
<message>
<location line="+3"/>
<source>Sign &amp;Message</source>
- <translation>簽署訊æ¯</translation>
+ <translation>訊æ¯ç°½ç½²</translation>
</message>
<message>
<location line="+25"/>
@@ -98,7 +103,7 @@ This product includes software developed by the OpenSSL Project for use in the O
<message>
<location line="+3"/>
<source>&amp;Verify Message</source>
- <translation>驗證訊æ¯</translation>
+ <translation>訊æ¯é©—è­‰</translation>
</message>
<message>
<location line="+14"/>
@@ -106,17 +111,22 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation>刪除</translation>
</message>
<message>
- <location filename="../addressbookpage.cpp" line="+65"/>
+ <location filename="../addressbookpage.cpp" line="+66"/>
<source>Copy &amp;Label</source>
<translation>複製標記</translation>
</message>
<message>
- <location line="+2"/>
+ <location line="+1"/>
<source>&amp;Edit</source>
<translation>編輯</translation>
</message>
<message>
- <location line="+250"/>
+ <location line="+1"/>
+ <source>Send &amp;Coins</source>
+ <translation>付錢</translation>
+ </message>
+ <message>
+ <location line="+263"/>
<source>Export Address Book Data</source>
<translation>匯出ä½å€ç°¿è³‡æ–™</translation>
</message>
@@ -128,7 +138,7 @@ This product includes software developed by the OpenSSL Project for use in the O
<message>
<location line="+13"/>
<source>Error exporting</source>
- <translation>資料匯出有誤</translation>
+ <translation>匯出失敗</translation>
</message>
<message>
<location line="+0"/>
@@ -139,7 +149,7 @@ This product includes software developed by the OpenSSL Project for use in the O
<context>
<name>AddressTableModel</name>
<message>
- <location filename="../addresstablemodel.cpp" line="+142"/>
+ <location filename="../addresstablemodel.cpp" line="+144"/>
<source>Label</source>
<translation>標記</translation>
</message>
@@ -264,7 +274,7 @@ This product includes software developed by the OpenSSL Project for use in the O
<message>
<location line="-54"/>
<source>Wallet encryption failed due to an internal error. Your wallet was not encrypted.</source>
- <translation>錢包加密因程å¼å…§éƒ¨æœ‰èª¤è€Œå¤±æ•—. 你的錢包還是沒有加密.</translation>
+ <translation>錢包加密因程å¼å…§éƒ¨éŒ¯èª¤è€Œå¤±æ•—. 你的錢包還是沒有加密.</translation>
</message>
<message>
<location line="+7"/>
@@ -298,17 +308,17 @@ This product includes software developed by the OpenSSL Project for use in the O
<context>
<name>BitcoinGUI</name>
<message>
- <location filename="../bitcoingui.cpp" line="+267"/>
+ <location filename="../bitcoingui.cpp" line="+231"/>
<source>Sign &amp;message...</source>
<translation>訊æ¯ç°½ç½²...</translation>
</message>
<message>
- <location line="+254"/>
+ <location line="+299"/>
<source>Synchronizing with network...</source>
<translation>網路åŒæ­¥ä¸­...</translation>
</message>
<message>
- <location line="-322"/>
+ <location line="-367"/>
<source>&amp;Overview</source>
<translation>總覽</translation>
</message>
@@ -328,32 +338,17 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation>ç€è¦½äº¤æ˜“紀錄</translation>
</message>
<message>
- <location line="+6"/>
- <source>&amp;Address Book</source>
- <translation>ä½å€ç°¿</translation>
- </message>
- <message>
- <location line="+1"/>
+ <location line="+7"/>
<source>Edit the list of stored addresses and labels</source>
<translation>編輯ä½å€èˆ‡æ¨™è¨˜çš„儲存列表</translation>
</message>
<message>
- <location line="-15"/>
- <source>&amp;Receive coins</source>
- <translation>收錢</translation>
- </message>
- <message>
- <location line="+1"/>
+ <location line="-14"/>
<source>Show the list of addresses for receiving payments</source>
<translation>顯示收款ä½å€çš„列表</translation>
</message>
<message>
- <location line="-8"/>
- <source>&amp;Send coins</source>
- <translation>付錢</translation>
- </message>
- <message>
- <location line="+39"/>
+ <location line="+31"/>
<source>E&amp;xit</source>
<translation>çµæŸ</translation>
</message>
@@ -398,7 +393,7 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation>密碼變更...</translation>
</message>
<message>
- <location line="+259"/>
+ <location line="+304"/>
<source>Importing blocks from disk...</source>
<translation>從ç£ç¢ŸåŒ¯å…¥å€å¡Šä¸­...</translation>
</message>
@@ -407,13 +402,8 @@ This product includes software developed by the OpenSSL Project for use in the O
<source>Reindexing blocks on disk...</source>
<translation>é‡å»ºç£ç¢Ÿå€å¡Šç´¢å¼•ä¸­...</translation>
</message>
- <message numerus="yes">
- <location line="+10"/>
- <source>~%n block(s) remaining</source>
- <translation><numerusform>剩下 ~%n 個å€å¡Š</numerusform></translation>
- </message>
<message>
- <location line="-265"/>
+ <location line="-300"/>
<source>&amp;Export...</source>
<translation>匯出...</translation>
</message>
@@ -455,21 +445,36 @@ This product includes software developed by the OpenSSL Project for use in the O
<message>
<location line="-7"/>
<source>&amp;Verify message...</source>
- <translation>訊æ¯é©—è­‰...</translation>
+ <translation>驗證訊æ¯...</translation>
</message>
<message>
- <location line="-196"/>
- <location line="+538"/>
+ <location line="-162"/>
+ <location line="+540"/>
<source>Bitcoin</source>
<translation>ä½å…ƒå¹£</translation>
</message>
<message>
- <location line="-538"/>
+ <location line="-540"/>
<source>Wallet</source>
<translation>錢包</translation>
</message>
<message>
- <location line="+176"/>
+ <location line="+99"/>
+ <source>&amp;Send</source>
+ <translation>付出</translation>
+ </message>
+ <message>
+ <location line="+7"/>
+ <source>&amp;Receive</source>
+ <translation>收å—</translation>
+ </message>
+ <message>
+ <location line="+14"/>
+ <source>&amp;Addresses</source>
+ <translation>ä½å€</translation>
+ </message>
+ <message>
+ <location line="+22"/>
<source>&amp;About Bitcoin</source>
<translation>關於ä½å…ƒå¹£</translation>
</message>
@@ -530,27 +535,57 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation>[testnet]</translation>
</message>
<message>
- <location line="+63"/>
+ <location line="+47"/>
<source>Bitcoin client</source>
<translation>ä½å…ƒå¹£å®¢æˆ¶ç«¯è»Ÿé«”</translation>
</message>
<message numerus="yes">
- <location line="+79"/>
+ <location line="+140"/>
<source>%n active connection(s) to Bitcoin network</source>
<translation><numerusform>與ä½å…ƒå¹£ç¶²è·¯æœ‰ %n 個連線在使用中</numerusform></translation>
</message>
<message>
- <location line="+45"/>
- <source>Processed %1 of %2 blocks of transaction history (%3% done).</source>
- <translation>已處ç†äº†å…¨éƒ¨ %2 個中的 %1 個å€å¡Šçš„交易紀錄 (完æˆåº¦ %3%).</translation>
+ <location line="+39"/>
+ <source>Processed %1 of %2 (estimated) blocks of transaction history.</source>
+ <translation>已處ç†äº†ä¼°è¨ˆå…¨éƒ¨ %2 個中的 %1 個å€å¡Šçš„交易紀錄.</translation>
</message>
<message>
- <location line="+7"/>
+ <location line="+4"/>
<source>Processed %1 blocks of transaction history.</source>
<translation>已處ç†äº† %1 個å€å¡Šçš„交易紀錄.</translation>
</message>
+ <message numerus="yes">
+ <location line="+20"/>
+ <source>%n hour(s)</source>
+ <translation><numerusform>%n 個å°æ™‚</numerusform></translation>
+ </message>
+ <message numerus="yes">
+ <location line="+4"/>
+ <source>%n day(s)</source>
+ <translation><numerusform>%n 天</numerusform></translation>
+ </message>
+ <message numerus="yes">
+ <location line="+4"/>
+ <source>%n week(s)</source>
+ <translation><numerusform>%n 個星期</numerusform></translation>
+ </message>
<message>
- <location line="+70"/>
+ <location line="+5"/>
+ <source>%1 behind</source>
+ <translation>è½å¾Œ %1</translation>
+ </message>
+ <message>
+ <location line="+14"/>
+ <source>Last received block was generated %1 ago.</source>
+ <translation>最近收到的å€å¡Šæ˜¯åœ¨ %1 之å‰ç”Ÿç”¢å‡ºä¾†.</translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Transactions after this will not yet be visible.</source>
+ <translation>會看ä¸è¦‹åœ¨é€™ä¹‹å¾Œçš„交易.</translation>
+ </message>
+ <message>
+ <location line="+21"/>
<source>Error</source>
<translation>錯誤</translation>
</message>
@@ -565,62 +600,27 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation>資訊</translation>
</message>
<message>
- <location line="+66"/>
+ <location line="+68"/>
<source>This transaction is over the size limit. You can still send it for a fee of %1, which goes to the nodes that process your transaction and helps to support the network. Do you want to pay the fee?</source>
<translation>這筆交易的資料大å°è¶…éŽé™åˆ¶äº†. 你還是å¯ä»¥ä»˜å‡º %1 的費用來傳é€, 這筆費用會付給處ç†ä½ çš„交易的節點, 並幫助維æŒæ•´å€‹ç¶²è·¯. 你願æ„支付這項費用嗎?</translation>
</message>
<message>
- <location line="+210"/>
- <source>Backup Successful</source>
- <translation>備份æˆåŠŸ</translation>
- </message>
- <message>
- <location line="+0"/>
- <source>The wallet data was successfully saved to the new location.</source>
- <translation>錢包的資料已經æˆåŠŸå„²å­˜åˆ°æ–°çš„地方了.</translation>
- </message>
- <message numerus="yes">
- <location line="-338"/>
- <source>%n second(s) ago</source>
- <translation><numerusform>%n 秒é˜å‰</numerusform></translation>
- </message>
- <message numerus="yes">
- <location line="+4"/>
- <source>%n minute(s) ago</source>
- <translation><numerusform>%n 分é˜å‰</numerusform></translation>
- </message>
- <message numerus="yes">
- <location line="+4"/>
- <source>%n hour(s) ago</source>
- <translation><numerusform>%n å°æ™‚å‰</numerusform></translation>
- </message>
- <message numerus="yes">
- <location line="+4"/>
- <source>%n day(s) ago</source>
- <translation><numerusform>%n 天å‰</numerusform></translation>
- </message>
- <message>
- <location line="+6"/>
+ <location line="-138"/>
<source>Up to date</source>
<translation>最新狀態</translation>
</message>
<message>
- <location line="+7"/>
+ <location line="+32"/>
<source>Catching up...</source>
<translation>進度追趕中...</translation>
</message>
<message>
- <location line="+10"/>
- <source>Last received block was generated %1.</source>
- <translation>最近收到的å€å¡Šç”¢ç”Ÿæ–¼ %1.</translation>
- </message>
- <message>
- <location line="+97"/>
+ <location line="+110"/>
<source>Confirm transaction fee</source>
<translation>確èªäº¤æ˜“手續費</translation>
</message>
<message>
- <location line="+23"/>
+ <location line="+8"/>
<source>Sent transaction</source>
<translation>付款交易</translation>
</message>
@@ -642,14 +642,14 @@ Address: %4
ä½å€: %4</translation>
</message>
<message>
- <location line="+99"/>
- <location line="+28"/>
+ <location line="+33"/>
+ <location line="+23"/>
<source>URI handling</source>
<translation>URI 處ç†</translation>
</message>
<message>
- <location line="-28"/>
- <location line="+28"/>
+ <location line="-23"/>
+ <location line="+23"/>
<source>URI can not be parsed! This can be caused by an invalid Bitcoin address or malformed URI parameters.</source>
<translation>ç„¡æ³•è§£æž URI! 也許ä½å…ƒå¹£ä½å€ç„¡æ•ˆæˆ– URI åƒæ•¸æœ‰èª¤.</translation>
</message>
@@ -664,27 +664,7 @@ Address: %4
<translation>錢包&lt;b&gt;已加密&lt;/b&gt;並且正&lt;b&gt;上鎖中&lt;/b&gt;</translation>
</message>
<message>
- <location line="+23"/>
- <source>Backup Wallet</source>
- <translation>錢包備份</translation>
- </message>
- <message>
- <location line="+0"/>
- <source>Wallet Data (*.dat)</source>
- <translation>錢包資料檔 (*.dat)</translation>
- </message>
- <message>
- <location line="+3"/>
- <source>Backup Failed</source>
- <translation>備份失敗</translation>
- </message>
- <message>
- <location line="+0"/>
- <source>There was an error trying to save the wallet data to the new location.</source>
- <translation>儲存錢包資料到新的地方時發生錯誤</translation>
- </message>
- <message>
- <location filename="../bitcoin.cpp" line="+109"/>
+ <location filename="../bitcoin.cpp" line="+108"/>
<source>A fatal error occurred. Bitcoin can no longer continue safely and will quit.</source>
<translation>發生了致命的錯誤. ä½å…ƒå¹£ç¨‹å¼ç„¡æ³•å†ç¹¼çºŒå®‰å…¨åŸ·è¡Œ, åªå¥½çµæŸ.</translation>
</message>
@@ -692,7 +672,7 @@ Address: %4
<context>
<name>ClientModel</name>
<message>
- <location filename="../clientmodel.cpp" line="+86"/>
+ <location filename="../clientmodel.cpp" line="+96"/>
<source>Network Alert</source>
<translation>網路警報</translation>
</message>
@@ -725,7 +705,7 @@ Address: %4
<translation>與這個ä½å€ç°¿é …目關è¯çš„ä½å€. åªèƒ½ä¿®æ”¹ä»˜æ¬¾ä½å€.</translation>
</message>
<message>
- <location filename="../editaddressdialog.cpp" line="+20"/>
+ <location filename="../editaddressdialog.cpp" line="+21"/>
<source>New receiving address</source>
<translation>新收款ä½å€</translation>
</message>
@@ -745,17 +725,17 @@ Address: %4
<translation>編輯付款ä½å€</translation>
</message>
<message>
- <location line="+60"/>
+ <location line="+76"/>
<source>The entered address &quot;%1&quot; is already in the address book.</source>
<translation>輸入的ä½å€&quot;%1&quot;已存在於ä½å€ç°¿ä¸­.</translation>
</message>
<message>
- <location line="+5"/>
+ <location line="-5"/>
<source>The entered address &quot;%1&quot; is not a valid Bitcoin address.</source>
<translation>輸入的ä½å€ &quot;%1&quot; 並ä¸æ˜¯æœ‰æ•ˆçš„ä½å…ƒå¹£ä½å€.</translation>
</message>
<message>
- <location line="+5"/>
+ <location line="+10"/>
<source>Could not unlock wallet.</source>
<translation>無法將錢包解鎖.</translation>
</message>
@@ -768,7 +748,7 @@ Address: %4
<context>
<name>GUIUtil::HelpMessageBox</name>
<message>
- <location filename="../guiutil.cpp" line="+419"/>
+ <location filename="../guiutil.cpp" line="+422"/>
<location line="+12"/>
<source>Bitcoin-Qt</source>
<translation>ä½å…ƒå¹£-Qt</translation>
@@ -983,7 +963,7 @@ Address: %4
<translation>套用</translation>
</message>
<message>
- <location filename="../optionsdialog.cpp" line="+55"/>
+ <location filename="../optionsdialog.cpp" line="+53"/>
<source>default</source>
<translation>é è¨­</translation>
</message>
@@ -1028,23 +1008,18 @@ Address: %4
<translation>表單</translation>
</message>
<message>
- <location line="+51"/>
- <location line="+183"/>
+ <location line="+50"/>
+ <location line="+166"/>
<source>The displayed information may be out of date. Your wallet automatically synchronizes with the Bitcoin network after a connection is established, but this process has not completed yet.</source>
<translation>顯示的資訊å¯èƒ½æ˜¯éŽæœŸçš„. 與ä½å…ƒå¹£ç¶²è·¯çš„連線建立後, 你的錢包會自動和網路åŒæ­¥, 但這個步驟還沒完æˆ.</translation>
</message>
<message>
- <location line="-141"/>
+ <location line="-124"/>
<source>Balance:</source>
<translation>餘é¡:</translation>
</message>
<message>
- <location line="+58"/>
- <source>Number of transactions:</source>
- <translation>交易次數:</translation>
- </message>
- <message>
- <location line="-29"/>
+ <location line="+29"/>
<source>Unconfirmed:</source>
<translation>未確èªé¡:</translation>
</message>
@@ -1054,7 +1029,7 @@ Address: %4
<translation>錢包</translation>
</message>
<message>
- <location line="+124"/>
+ <location line="+107"/>
<source>Immature:</source>
<translation>未熟æˆ</translation>
</message>
@@ -1069,7 +1044,7 @@ Address: %4
<translation>&lt;b&gt;最近交易&lt;/b&gt;</translation>
</message>
<message>
- <location line="-118"/>
+ <location line="-101"/>
<source>Your current balance</source>
<translation>ç›®å‰é¤˜é¡</translation>
</message>
@@ -1079,11 +1054,6 @@ Address: %4
<translation>尚未確èªä¹‹äº¤æ˜“的總é¡, ä¸åŒ…å«åœ¨ç›®å‰é¤˜é¡ä¸­</translation>
</message>
<message>
- <location line="+20"/>
- <source>Total number of transactions in wallet</source>
- <translation>錢包中紀錄的總交易次數</translation>
- </message>
- <message>
<location filename="../overviewpage.cpp" line="+115"/>
<location line="+1"/>
<source>out of sync</source>
@@ -1091,6 +1061,14 @@ Address: %4
</message>
</context>
<context>
+ <name>PaymentServer</name>
+ <message>
+ <location filename="../paymentserver.cpp" line="+107"/>
+ <source>Cannot start bitcoin: click-to-pay handler</source>
+ <translation>無法啟動 bitcoin 隨按隨付處ç†å™¨</translation>
+ </message>
+</context>
+<context>
<name>QRCodeDialog</name>
<message>
<location filename="../forms/qrcodedialog.ui" line="+14"/>
@@ -1125,7 +1103,7 @@ Address: %4
<message>
<location filename="../qrcodedialog.cpp" line="+62"/>
<source>Error encoding URI into QR Code.</source>
- <translation>å°‡ URI ç·¨ç¢¼æˆ QR æ¢ç¢¼æ™‚發生錯誤</translation>
+ <translation>å°‡ URI ç·¨ç¢¼æˆ QR æ¢ç¢¼å¤±æ•—</translation>
</message>
<message>
<location line="+40"/>
@@ -1357,7 +1335,7 @@ Address: %4
<message>
<location line="+5"/>
<source>Confirm send coins</source>
- <translation>確èªä»˜å‡ºé‡‘é¡</translation>
+ <translation>確èªè¦ä»˜éŒ¢</translation>
</message>
<message>
<location line="+1"/>
@@ -1429,7 +1407,7 @@ Address: %4
</message>
<message>
<location line="+60"/>
- <location filename="../sendcoinsentry.cpp" line="+25"/>
+ <location filename="../sendcoinsentry.cpp" line="+26"/>
<source>Enter a label for this address to add it to your address book</source>
<translation>輸入一個標記給這個ä½å€, 並加到ä½å€ç°¿ä¸­</translation>
</message>
@@ -1479,7 +1457,7 @@ Address: %4
<message>
<location line="+13"/>
<source>&amp;Sign Message</source>
- <translation>簽署訊æ¯</translation>
+ <translation>訊æ¯ç°½ç½²</translation>
</message>
<message>
<location line="+6"/>
@@ -1552,7 +1530,7 @@ Address: %4
<message>
<location line="-87"/>
<source>&amp;Verify Message</source>
- <translation>驗證訊æ¯</translation>
+ <translation>訊æ¯é©—è­‰</translation>
</message>
<message>
<location line="+6"/>
@@ -1588,7 +1566,7 @@ Address: %4
<message>
<location line="-2"/>
<source>Click &quot;Sign Message&quot; to generate signature</source>
- <translation>按&quot;簽署訊æ¯&quot;來產生簽章</translation>
+ <translation>按&quot;訊æ¯ç°½ç½²&quot;來產生簽章</translation>
</message>
<message>
<location line="+3"/>
@@ -1665,7 +1643,7 @@ Address: %4
<context>
<name>TransactionDesc</name>
<message>
- <location filename="../transactiondesc.cpp" line="+19"/>
+ <location filename="../transactiondesc.cpp" line="+20"/>
<source>Open until %1</source>
<translation>在 %1 å‰æœªå®š</translation>
</message>
@@ -1852,7 +1830,7 @@ Address: %4
<context>
<name>TransactionTableModel</name>
<message>
- <location filename="../transactiontablemodel.cpp" line="+226"/>
+ <location filename="../transactiontablemodel.cpp" line="+225"/>
<source>Date</source>
<translation>日期</translation>
</message>
@@ -1970,7 +1948,7 @@ Address: %4
<context>
<name>TransactionView</name>
<message>
- <location filename="../transactionview.cpp" line="+55"/>
+ <location filename="../transactionview.cpp" line="+52"/>
<location line="+16"/>
<source>All</source>
<translation>全部</translation>
@@ -2057,6 +2035,11 @@ Address: %4
</message>
<message>
<location line="+1"/>
+ <source>Copy transaction ID</source>
+ <translation>複製交易識別碼</translation>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Edit label</source>
<translation>編輯標記</translation>
</message>
@@ -2066,7 +2049,7 @@ Address: %4
<translation>顯示交易明細</translation>
</message>
<message>
- <location line="+142"/>
+ <location line="+139"/>
<source>Export Transaction Data</source>
<translation>匯出交易資料</translation>
</message>
@@ -2113,7 +2096,7 @@ Address: %4
<message>
<location line="+4"/>
<source>Error exporting</source>
- <translation>匯出錯誤</translation>
+ <translation>匯出失敗</translation>
</message>
<message>
<location line="+0"/>
@@ -2121,7 +2104,7 @@ Address: %4
<translation>無法寫入至 %1 檔案.</translation>
</message>
<message>
- <location line="+95"/>
+ <location line="+100"/>
<source>Range:</source>
<translation>範åœ:</translation>
</message>
@@ -2132,31 +2115,174 @@ Address: %4
</message>
</context>
<context>
+ <name>WalletView</name>
+ <message>
+ <location filename="../walletview.cpp" line="+95"/>
+ <source>&amp;Overview</source>
+ <translation>總覽</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Show general overview of wallet</source>
+ <translation>顯示錢包一般總覽</translation>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>&amp;Send coins</source>
+ <translation>付錢</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Send coins to a Bitcoin address</source>
+ <translation>付錢到一個ä½å…ƒå¹£ä½å€</translation>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>&amp;Receive coins</source>
+ <translation>收錢</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Show the list of addresses for receiving payments</source>
+ <translation>顯示收款ä½å€çš„列表</translation>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>&amp;Transactions</source>
+ <translation>交易紀錄</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Browse transaction history</source>
+ <translation>ç€è¦½äº¤æ˜“紀錄</translation>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>&amp;Address Book</source>
+ <translation>ä½å€ç°¿</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Edit the list of stored addresses and labels</source>
+ <translation>編輯ä½å€èˆ‡æ¨™è¨˜çš„儲存列表</translation>
+ </message>
+ <message>
+ <location line="+12"/>
+ <source>&amp;Encrypt Wallet...</source>
+ <translation>錢包加密...</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Encrypt the private keys that belong to your wallet</source>
+ <translation>將屬於你的錢包的密鑰加密</translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>&amp;Backup Wallet...</source>
+ <translation>錢包備份...</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Backup wallet to another location</source>
+ <translation>將錢包備份到其它地方</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>&amp;Change Passphrase...</source>
+ <translation>密碼變更...</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Change the passphrase used for wallet encryption</source>
+ <translation>變更加密錢包用的密碼</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Sign &amp;message...</source>
+ <translation>簽署訊æ¯...</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Sign messages with your Bitcoin addresses to prove you own them</source>
+ <translation>用ä½å…ƒå¹£ä½å€ç°½ç½²è¨Šæ¯ä¾†è­‰æ˜Žä½å€æ˜¯ä½ çš„</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>&amp;Verify message...</source>
+ <translation>驗證訊æ¯...</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Verify messages to ensure they were signed with specified Bitcoin addresses</source>
+ <translation>驗證訊æ¯ä¾†ç¢ºèªæ˜¯ç”¨æŒ‡å®šçš„ä½å…ƒå¹£ä½å€ç°½ç½²çš„</translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>&amp;Export...</source>
+ <translation>匯出...</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Export the data in the current tab to a file</source>
+ <translation>將目å‰åˆ†é çš„資料匯出存æˆæª”案</translation>
+ </message>
+ <message>
+ <location line="+180"/>
+ <source>Backup Wallet</source>
+ <translation>錢包備份</translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>Wallet Data (*.dat)</source>
+ <translation>錢包資料檔 (*.dat)</translation>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Backup Failed</source>
+ <translation>備份失敗</translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>There was an error trying to save the wallet data to the new location.</source>
+ <translation>儲存錢包資料到新的地方失敗</translation>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>Backup Successful</source>
+ <translation>備份æˆåŠŸ</translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>The wallet data was successfully saved to the new location.</source>
+ <translation>錢包的資料已經æˆåŠŸå„²å­˜åˆ°æ–°çš„地方了.</translation>
+ </message>
+</context>
+<context>
<name>bitcoin-core</name>
<message>
- <location filename="../bitcoinstrings.cpp" line="+88"/>
+ <location filename="../bitcoinstrings.cpp" line="+96"/>
<source>Bitcoin version</source>
<translation>ä½å…ƒå¹£ç‰ˆæœ¬</translation>
</message>
<message>
- <location line="+82"/>
+ <location line="+98"/>
<source>Usage:</source>
<translation>用法:</translation>
</message>
<message>
- <location line="-23"/>
+ <location line="-24"/>
<source>Send command to -server or bitcoind</source>
<translation>é€æŒ‡ä»¤è‡³ -server 或 bitcoind
</translation>
</message>
<message>
- <location line="-21"/>
+ <location line="-22"/>
<source>List commands</source>
<translation>列出指令
</translation>
</message>
<message>
- <location line="-11"/>
+ <location line="-10"/>
<source>Get help for a command</source>
<translation>å–得指令說明
</translation>
@@ -2186,13 +2312,13 @@ Address: %4
</translation>
</message>
<message>
- <location line="-15"/>
+ <location line="-28"/>
<source>Don&apos;t generate coins</source>
<translation>ä¸ç”Ÿç”¢ä½å…ƒå¹£
</translation>
</message>
<message>
- <location line="+61"/>
+ <location line="+74"/>
<source>Specify data directory</source>
<translation>指定資料目錄
</translation>
@@ -2203,77 +2329,79 @@ Address: %4
<translation>設定資料庫快å–大å°ç‚ºå¤šå°‘百è¬ä½å…ƒçµ„(MB, é è¨­: 25)</translation>
</message>
<message>
- <location line="-26"/>
+ <location line="-27"/>
<source>Listen for connections on &lt;port&gt; (default: 8333 or testnet: 18333)</source>
<translation>在通訊埠 &lt;port&gt; è½å€™é€£ç·š (é è¨­: 8333, 或若為測試網路: 18333)</translation>
</message>
<message>
- <location line="+4"/>
+ <location line="+5"/>
<source>Maintain at most &lt;n&gt; connections to peers (default: 125)</source>
<translation>維æŒèˆ‡ç¯€é»žé€£ç·šæ•¸çš„上é™ç‚º &lt;n&gt; 個 (é è¨­: 125)</translation>
</message>
<message>
- <location line="-34"/>
+ <location line="-49"/>
<source>Connect to a node to retrieve peer addresses, and disconnect</source>
<translation>連線到æŸå€‹ç¯€é»žä»¥å–得其它節點的ä½å€, 然後斷線</translation>
</message>
<message>
- <location line="+65"/>
+ <location line="+80"/>
<source>Specify your own public address</source>
<translation>指定自己公開的ä½å€</translation>
</message>
<message>
- <location line="+2"/>
+ <location line="+3"/>
<source>Threshold for disconnecting misbehaving peers (default: 100)</source>
<translation>與亂æžçš„節點斷線的臨界值 (é è¨­: 100)</translation>
</message>
<message>
- <location line="-114"/>
+ <location line="-132"/>
<source>Number of seconds to keep misbehaving peers from reconnecting (default: 86400)</source>
<translation>é¿å…與亂æžçš„節點連線的秒數 (é è¨­: 86400)</translation>
</message>
<message>
- <location line="-28"/>
+ <location line="-32"/>
<source>An error occurred while setting up the RPC port %u for listening on IPv4: %s</source>
<translation>在 IPv4 網路上以通訊埠 %u è½å– RPC 連線時發生錯誤: %s</translation>
</message>
<message>
- <location line="+26"/>
+ <location line="+30"/>
<source>Listen for JSON-RPC connections on &lt;port&gt; (default: 8332 or testnet: 18332)</source>
<translation>在通訊埠 &lt;port&gt; è½å€™ JSON-RPC 連線 (é è¨­: 8332, 或若為測試網路: 18332)</translation>
</message>
<message>
- <location line="+34"/>
+ <location line="+36"/>
<source>Accept command line and JSON-RPC commands</source>
<translation>接å—命令列與 JSON-RPC 指令
</translation>
</message>
<message>
- <location line="+62"/>
+ <location line="+77"/>
<source>Run in the background as a daemon and accept commands</source>
<translation>以背景程å¼åŸ·è¡Œä¸¦æŽ¥å—指令</translation>
</message>
<message>
- <location line="+31"/>
+ <location line="+32"/>
<source>Use the test network</source>
<translation>使用測試網路
</translation>
</message>
<message>
- <location line="-92"/>
+ <location line="-108"/>
<source>Accept connections from outside (default: 1 if no -proxy or -connect)</source>
<translation>是å¦æŽ¥å—外來連線 (é è¨­: 當沒有 -proxy 或 -connect 時é è¨­ç‚º 1)</translation>
</message>
<message>
- <location line="-74"/>
+ <location line="-82"/>
<source>%s, you must set a rpcpassword in the configuration file:
- %s
+%s
It is recommended you use the following random password:
rpcuser=bitcoinrpc
rpcpassword=%s
(you do not need to remember this password)
The username and password MUST NOT be the same.
If the file does not exist, create it with owner-readable-only file permissions.
+It is also recommended to set alertnotify so you are notified of problems;
+for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.com
</source>
<translation>%s, ä½ å¿…é ˆè¦åœ¨ä»¥ä¸‹è¨­å®šæª”中設定 RPC 密碼(rpcpassword):
%s
@@ -2282,10 +2410,14 @@ rpcuser=bitcoinrpc
rpcpassword=%s
(ä½ ä¸ç”¨è¨˜ä½é€™å€‹å¯†ç¢¼)
使用者å稱(rpcuser)和密碼(rpcpassword)ä¸å¯ä»¥ç›¸åŒ!
-如果這個檔案還ä¸å­˜åœ¨, 請在新增時, 設定檔案權é™ç‚º&quot;åªæœ‰ä¸»äººæ‰èƒ½è®€å–&quot;.</translation>
+如果設定檔還ä¸å­˜åœ¨, 請在新增時, 設定檔案權é™ç‚º&quot;åªæœ‰ä¸»äººæ‰èƒ½è®€å–&quot;.
+也建議你設定警示通知, 發生å•é¡Œæ™‚ä½ æ‰æœƒè¢«é€šçŸ¥åˆ°;
+比如說設定為:
+alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.com
+</translation>
</message>
<message>
- <location line="+15"/>
+ <location line="+17"/>
<source>An error occurred while setting up the RPC port %u for listening on IPv6, falling back to IPv4: %s</source>
<translation>設定在 IPv6 網路的通訊埠 %u 上è½å€™ RPC 連線失敗, 退而改用 IPv4 網路: %s</translation>
</message>
@@ -2301,11 +2433,6 @@ rpcpassword=%s
</message>
<message>
<location line="+3"/>
- <source>Corrupted block database detected. Please restart the client with -reindex.</source>
- <translation>發ç¾å€å¡Šè³‡æ–™åº«å£žæŽ‰äº†. 請加上 -reindex åƒæ•¸ä¾†é‡æ–°å•“動客戶端軟體.</translation>
- </message>
- <message>
- <location line="+2"/>
<source>Error initializing database environment %s! To recover, BACKUP THAT DIRECTORY, then remove everything from it except for wallet.dat.</source>
<translation>資料庫環境 %s åˆå§‹åŒ–失敗了! è¦å¾©åŽŸè³‡æ–™, è«‹*務必先備份該資料夾*, 然後將其中除了錢包檔 wallet.dat 外的æ±è¥¿éƒ½åˆªé™¤æŽ‰.</translation>
</message>
@@ -2320,12 +2447,27 @@ rpcpassword=%s
<translation>錯誤: 這筆交易需è¦è‡³å°‘ %s 的手續費! 因為它的金é¡å¤ªå¤§, 或複雜度太高, 或是使用了最近æ‰å‰›æ”¶åˆ°çš„款項.</translation>
</message>
<message>
+ <location line="+3"/>
+ <source>Execute command when a relevant alert is received (%s in cmd is replaced by message)</source>
+ <translation>當收到相關警示時所è¦åŸ·è¡Œçš„指令 (指令中的 %s 會被å–代為警示訊æ¯)</translation>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Execute command when a wallet transaction changes (%s in cmd is replaced by TxID)</source>
+ <translation>當錢包有交易改變時所è¦åŸ·è¡Œçš„指令 (指令中的 %s 會被å–代為交易識別碼)</translation>
+ </message>
+ <message>
<location line="+11"/>
<source>Set maximum size of high-priority/low-fee transactions in bytes (default: 27000)</source>
<translation>設定高優先權或低手續費的交易資料大å°ä¸Šé™ç‚ºå¤šå°‘ä½å…ƒçµ„ (é è¨­: 27000)</translation>
</message>
<message>
<location line="+3"/>
+ <source>Set the number of script verification threads (1-16, 0=auto, default: 0)</source>
+ <translation>設定指令碼驗證的執行緒數目 (1 至 16, 0 表示程å¼è‡ªå‹•æ±ºå®š, é è¨­ç‚º 0)</translation>
+ </message>
+ <message>
+ <location line="+2"/>
<source>This is a pre-release test build - use at your own risk - do not use for mining or merchant applications</source>
<translation>這是尚未發表的測試版本 - 使用請自負風險 - è«‹ä¸è¦ç”¨æ–¼é–‹æŽ¡æˆ–商業應用</translation>
</message>
@@ -2371,16 +2513,41 @@ rpcpassword=%s
</message>
<message>
<location line="+3"/>
+ <source>Corrupted block database detected</source>
+ <translation>發ç¾å€å¡Šè³‡æ–™åº«å£žæŽ‰äº†</translation>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Discover own IP address (default: 1 when listening and no -externalip)</source>
<translation>找出自己的網際網路ä½å€ (é è¨­: 當有è½å€™é€£ç·šä¸”沒有 -externalip 時為 1)</translation>
</message>
<message>
+ <location line="+1"/>
+ <source>Do you want to rebuild the block database now?</source>
+ <translation>ä½ è¦ç¾åœ¨é‡å»ºå€å¡Šè³‡æ–™åº«å—Ž?</translation>
+ </message>
+ <message>
<location line="+3"/>
+ <source>Error initializing block database</source>
+ <translation>åˆå§‹åŒ–å€å¡Šè³‡æ–™åº«å¤±æ•—</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Error initializing wallet database environment %s!</source>
+ <translation>錢包資料庫環境 %s åˆå§‹åŒ–錯誤!</translation>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Error loading block database</source>
<translation>載入å€å¡Šè³‡æ–™åº«å¤±æ•—</translation>
</message>
<message>
- <location line="+5"/>
+ <location line="+4"/>
+ <source>Error opening block database</source>
+ <translation>打開å€å¡Šè³‡æ–™åº«æª”案失敗</translation>
+ </message>
+ <message>
+ <location line="+2"/>
<source>Error: Disk space is low!</source>
<translation>錯誤: ç£ç¢Ÿç©ºé–“很少!</translation>
</message>
@@ -2396,26 +2563,96 @@ rpcpassword=%s
</message>
<message>
<location line="+2"/>
+ <source>Error: system error: </source>
+ <translation>錯誤: 系統錯誤:</translation>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Failed to listen on any port. Use -listen=0 if you want this.</source>
<translation>在任æ„的通訊埠è½å€™å¤±æ•—. 如果你想的話å¯ä»¥ç”¨ -listen=0.</translation>
</message>
<message>
+ <location line="+1"/>
+ <source>Failed to read block info</source>
+ <translation>讀å–å€å¡Šè³‡è¨Šå¤±æ•—</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Failed to read block</source>
+ <translation>讀å–å€å¡Šå¤±æ•—</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Failed to sync block index</source>
+ <translation>åŒæ­¥å€å¡Šç´¢å¼•å¤±æ•—</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Failed to write block index</source>
+ <translation>寫入å€å¡Šç´¢å¼•å¤±æ•—</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Failed to write block info</source>
+ <translation>寫入å€å¡Šè³‡è¨Šå¤±æ•—</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Failed to write block</source>
+ <translation>寫入å€å¡Šå¤±æ•—</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Failed to write file info</source>
+ <translation>寫入檔案資訊失敗</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Failed to write to coin database</source>
+ <translation>寫入ä½å…ƒå¹£è³‡æ–™åº«å¤±æ•—</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Failed to write transaction index</source>
+ <translation>寫入交易索引失敗</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Failed to write undo data</source>
+ <translation>寫入回復資料失敗</translation>
+ </message>
+ <message>
<location line="+2"/>
<source>Find peers using DNS lookup (default: 1 unless -connect)</source>
<translation>是å¦å…許在找節點時使用域å查詢 (é è¨­: 當沒用 -connect 時為 1)</translation>
</message>
<message>
- <location line="+5"/>
+ <location line="+3"/>
+ <source>How many blocks to check at startup (default: 288, 0 = all)</source>
+ <translation>啓動時檢查的å€å¡Šæ•¸ (é è¨­: 288, 指定 0 表示全部)</translation>
+ </message>
+ <message>
+ <location line="+1"/>
<source>How thorough the block verification is (0-4, default: 3)</source>
<translation>å€å¡Šæª¢æŸ¥çš„仔細程度 (0 至 4, é è¨­: 3)</translation>
</message>
<message>
- <location line="+1"/>
- <source>Importing blocks from block database...</source>
- <translation>從å€å¡Šè³‡æ–™åº«åŒ¯å…¥å€å¡Šä¸­...</translation>
+ <location line="+24"/>
+ <source>Rebuild block chain index from current blk000??.dat files</source>
+ <translation>從目å‰çš„å€å¡Šæª” blk000??.dat é‡å»ºéŽ–éˆç´¢å¼•</translation>
+ </message>
+ <message>
+ <location line="+37"/>
+ <source>Verifying blocks...</source>
+ <translation>é©—è­‰å€å¡Šè³‡æ–™ä¸­...</translation>
</message>
<message>
<location line="+1"/>
+ <source>Verifying wallet...</source>
+ <translation>驗證錢包資料中...</translation>
+ </message>
+ <message>
+ <location line="-61"/>
<source>Imports blocks from external blk000??.dat file</source>
<translation>從其它來æºçš„ blk000??.dat 檔匯入å€å¡Š</translation>
</message>
@@ -2430,7 +2667,12 @@ rpcpassword=%s
<translation>無效的 -tor ä½å€: &apos;%s&apos;</translation>
</message>
<message>
- <location line="+9"/>
+ <location line="+8"/>
+ <source>Maintain a full transaction index (default: 0)</source>
+ <translation>維護全部交易的索引 (é è¨­ç‚º 0)</translation>
+ </message>
+ <message>
+ <location line="+2"/>
<source>Maximum per-connection receive buffer, &lt;n&gt;*1000 bytes (default: 5000)</source>
<translation>æ¯å€‹é€£ç·šçš„接收緩è¡å€å¤§å°ä¸Šé™ç‚º &lt;n&gt;*1000 個ä½å…ƒçµ„ (é è¨­: 5000)</translation>
</message>
@@ -2465,12 +2707,7 @@ rpcpassword=%s
<translation>在除錯輸出內容å‰é™„加時間</translation>
</message>
<message>
- <location line="+1"/>
- <source>Rebuild blockchain index from current blk000??.dat files</source>
- <translation>從目å‰çš„å€å¡Šæª” blk000??.dat é‡å»ºç´¢å¼•</translation>
- </message>
- <message>
- <location line="+4"/>
+ <location line="+5"/>
<source>SSL options: (see the Bitcoin Wiki for SSL setup instructions)</source>
<translation>SSL é¸é …: (SSL 設定程åºè«‹è¦‹ Bitcoin Wiki)</translation>
</message>
@@ -2510,7 +2747,12 @@ rpcpassword=%s
<translation>指定連線在幾毫秒後逾時 (é è¨­: 5000)</translation>
</message>
<message>
- <location line="+13"/>
+ <location line="+4"/>
+ <source>System error: </source>
+ <translation>系統錯誤:</translation>
+ </message>
+ <message>
+ <location line="+10"/>
<source>Use UPnP to map the listening port (default: 0)</source>
<translation>是å¦ä½¿ç”¨é€šç”¨å³æ’å³ç”¨(UPnP)å”定來設定è½å€™é€£ç·šçš„通訊埠 (é è¨­: 0)</translation>
</message>
@@ -2541,37 +2783,42 @@ rpcpassword=%s
</message>
<message>
<location line="+1"/>
+ <source>You need to rebuild the databases using -reindex to change -txindex</source>
+ <translation>改變 -txindex åƒæ•¸å¾Œ, å¿…é ˆè¦ç”¨ -reindex åƒæ•¸ä¾†é‡å»ºè³‡æ–™åº«</translation>
+ </message>
+ <message>
+ <location line="+1"/>
<source>wallet.dat corrupt, salvage failed</source>
<translation>錢包檔 weallet.dat 壞掉了, 拯救失敗</translation>
</message>
<message>
- <location line="-43"/>
+ <location line="-45"/>
<source>Password for JSON-RPC connections</source>
<translation>JSON-RPC 連線密碼</translation>
</message>
<message>
- <location line="-53"/>
+ <location line="-68"/>
<source>Allow JSON-RPC connections from specified IP address</source>
<translation>åªå…許從指定網路ä½å€ä¾†çš„ JSON-RPC 連線</translation>
</message>
<message>
- <location line="+62"/>
+ <location line="+77"/>
<source>Send commands to node running on &lt;ip&gt; (default: 127.0.0.1)</source>
<translation>é€æŒ‡ä»¤çµ¦åœ¨ &lt;ip&gt; 的節點 (é è¨­: 127.0.0.1)
</translation>
</message>
<message>
- <location line="-103"/>
+ <location line="-120"/>
<source>Execute command when the best block changes (%s in cmd is replaced by block hash)</source>
<translation>當最新å€å¡Šæ”¹è®Šæ™‚所è¦åŸ·è¡Œçš„指令 (指令中的 %s 會被å–代為å€å¡Šçš„雜湊值)</translation>
</message>
<message>
- <location line="+124"/>
+ <location line="+142"/>
<source>Upgrade wallet to latest format</source>
<translation>將錢包å‡ç´šæˆæœ€æ–°çš„æ ¼å¼</translation>
</message>
<message>
- <location line="-15"/>
+ <location line="-16"/>
<source>Set key pool size to &lt;n&gt; (default: 100)</source>
<translation>設定密鑰池大å°ç‚º &lt;n&gt; (é è¨­: 100)
</translation>
@@ -2582,18 +2829,13 @@ rpcpassword=%s
<translation>é‡æ–°æŽƒæå€å¡ŠéŽ–éˆ, 以尋找錢包所éºæ¼çš„交易.</translation>
</message>
<message>
- <location line="-26"/>
- <source>How many blocks to check at startup (default: 2500, 0 = all)</source>
- <translation>啓動時檢查多少å€å¡Š (é è¨­: 2500, 0 表示全部)</translation>
- </message>
- <message>
- <location line="+55"/>
+ <location line="+30"/>
<source>Use OpenSSL (https) for JSON-RPC connections</source>
<translation>於 JSON-RPC 連線使用 OpenSSL (https)
</translation>
</message>
<message>
- <location line="-20"/>
+ <location line="-21"/>
<source>Server certificate file (default: server.cert)</source>
<translation>伺æœå™¨æ†‘證檔 (é è¨­: server.cert)
</translation>
@@ -2605,13 +2847,13 @@ rpcpassword=%s
</translation>
</message>
<message>
- <location line="-133"/>
+ <location line="-154"/>
<source>Acceptable ciphers (default: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH)</source>
<translation>å¯ä»¥æŽ¥å—的加密法 (é è¨­: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH)
</translation>
</message>
<message>
- <location line="+144"/>
+ <location line="+166"/>
<source>This help message</source>
<translation>æ­¤å”助訊æ¯
</translation>
@@ -2622,7 +2864,7 @@ rpcpassword=%s
<translation>無法和這å°é›»è…¦ä¸Šçš„ %s ç¹«çµ (繫çµå›žå‚³éŒ¯èª¤ %d, %s)</translation>
</message>
<message>
- <location line="-70"/>
+ <location line="-86"/>
<source>Connect through socks proxy</source>
<translation>é€éŽ SOCKS 代ç†ä¼ºæœå™¨é€£ç·š</translation>
</message>
@@ -2632,12 +2874,12 @@ rpcpassword=%s
<translation>å…è¨±å° -addnode, -seednode, -connect çš„åƒæ•¸ä½¿ç”¨åŸŸå查詢 </translation>
</message>
<message>
- <location line="+43"/>
+ <location line="+57"/>
<source>Loading addresses...</source>
<translation>載入ä½å€ä¸­...</translation>
</message>
<message>
- <location line="-25"/>
+ <location line="-35"/>
<source>Error loading wallet.dat: Wallet corrupted</source>
<translation>載入檔案 wallet.dat 失敗: 錢包壞掉了</translation>
</message>
@@ -2647,32 +2889,22 @@ rpcpassword=%s
<translation>載入檔案 wallet.dat 失敗: 此錢包需è¦æ–°ç‰ˆçš„ Bitcoin</translation>
</message>
<message>
- <location line="+73"/>
- <source>Verifying block database integrity...</source>
- <translation>é©—è­‰å€å¡Šè³‡æ–™åº«æ˜¯å¦å®Œæ•´ä¸­...</translation>
- </message>
- <message>
- <location line="+1"/>
- <source>Verifying wallet integrity...</source>
- <translation>驗證錢包資料是å¦å®Œæ•´ä¸­...</translation>
- </message>
- <message>
- <location line="+1"/>
+ <location line="+87"/>
<source>Wallet needed to be rewritten: restart Bitcoin to complete</source>
<translation>錢包需è¦é‡å¯«: è«‹é‡å•Ÿä½å…ƒå¹£ä¾†å®Œæˆ</translation>
</message>
<message>
- <location line="-77"/>
+ <location line="-89"/>
<source>Error loading wallet.dat</source>
<translation>載入檔案 wallet.dat 失敗</translation>
</message>
<message>
- <location line="+20"/>
+ <location line="+30"/>
<source>Invalid -proxy address: &apos;%s&apos;</source>
<translation>無效的 -proxy ä½å€: &apos;%s&apos;</translation>
</message>
<message>
- <location line="+46"/>
+ <location line="+48"/>
<source>Unknown network specified in -onlynet: &apos;%s&apos;</source>
<translation>在 -onlynet 指定了ä¸æ˜Žçš„網路別: &apos;%s&apos;</translation>
</message>
@@ -2682,7 +2914,7 @@ rpcpassword=%s
<translation>在 -socks 指定了ä¸æ˜Žçš„代ç†å”定版本: %i</translation>
</message>
<message>
- <location line="-75"/>
+ <location line="-91"/>
<source>Cannot resolve -bind address: &apos;%s&apos;</source>
<translation>ç„¡æ³•è§£æž -bind ä½å€: &apos;%s&apos;</translation>
</message>
@@ -2692,17 +2924,17 @@ rpcpassword=%s
<translation>ç„¡æ³•è§£æž -externalip ä½å€: &apos;%s&apos;</translation>
</message>
<message>
- <location line="+31"/>
+ <location line="+45"/>
<source>Invalid amount for -paytxfee=&lt;amount&gt;: &apos;%s&apos;</source>
<translation>設定 -paytxfee=&lt;金é¡&gt; 的金é¡ç„¡æ•ˆ: &apos;%s&apos;</translation>
</message>
<message>
- <location line="-15"/>
+ <location line="-24"/>
<source>Error: could not start node</source>
<translation>錯誤: 無法啓動節點</translation>
</message>
<message>
- <location line="+16"/>
+ <location line="+25"/>
<source>Invalid amount</source>
<translation>無效的金é¡</translation>
</message>
@@ -2717,7 +2949,7 @@ rpcpassword=%s
<translation>載入å€å¡Šç´¢å¼•ä¸­...</translation>
</message>
<message>
- <location line="-45"/>
+ <location line="-59"/>
<source>Add a node to connect to and attempt to keep the connection open</source>
<translation>加入一個è¦é€£ç·šçš„節線, 並試著ä¿æŒå°å®ƒçš„連線暢通</translation>
</message>
@@ -2727,22 +2959,17 @@ rpcpassword=%s
<translation>無法和這å°é›»è…¦ä¸Šçš„ %s 繫çµ. 也許ä½å…ƒå¹£å·²ç¶“在執行了.</translation>
</message>
<message>
- <location line="+54"/>
- <source>Find peers using internet relay chat (default: 0)</source>
- <translation>是å¦ä½¿ç”¨ç¶²éš›ç¶²è·¯ä¸­ç¹¼èŠå¤©(IRC)來找節點 (é è¨­: 0)</translation>
- </message>
- <message>
- <location line="-2"/>
+ <location line="+68"/>
<source>Fee per KB to add to transactions you send</source>
<translation>äº¤æ˜“ä»˜æ¬¾æ™‚æ¯ KB 的交易手續費</translation>
</message>
<message>
- <location line="+19"/>
+ <location line="+17"/>
<source>Loading wallet...</source>
<translation>載入錢包中...</translation>
</message>
<message>
- <location line="-40"/>
+ <location line="-54"/>
<source>Cannot downgrade wallet</source>
<translation>無法將錢包格å¼é™ç´š</translation>
</message>
@@ -2757,27 +2984,27 @@ rpcpassword=%s
<translation>無法寫入é è¨­ä½å€</translation>
</message>
<message>
- <location line="+49"/>
+ <location line="+64"/>
<source>Rescanning...</source>
<translation>é‡æ–°æŽƒæ中...</translation>
</message>
<message>
- <location line="-43"/>
+ <location line="-56"/>
<source>Done loading</source>
<translation>載入完æˆ</translation>
</message>
<message>
- <location line="+65"/>
+ <location line="+79"/>
<source>To use the %s option</source>
<translation>為了è¦ä½¿ç”¨ %s é¸é …</translation>
</message>
<message>
- <location line="-60"/>
+ <location line="-71"/>
<source>Error</source>
<translation>錯誤</translation>
</message>
<message>
- <location line="-28"/>
+ <location line="-33"/>
<source>You must set rpcpassword=&lt;password&gt; in the configuration file:
%s
If the file does not exist, create it with owner-readable-only file permissions.</source>
diff --git a/src/qt/macdockiconhandler.h b/src/qt/macdockiconhandler.h
index dd85e0c33d..5018456aa1 100644
--- a/src/qt/macdockiconhandler.h
+++ b/src/qt/macdockiconhandler.h
@@ -3,9 +3,11 @@
#include <QObject>
+QT_BEGIN_NAMESPACE
class QMenu;
class QIcon;
class QWidget;
+QT_END_NAMESPACE
#ifdef __OBJC__
@class DockIconClickEventHandler;
@@ -18,6 +20,7 @@ class DockIconClickEventHandler;
class MacDockIconHandler : public QObject
{
Q_OBJECT
+
public:
~MacDockIconHandler();
@@ -31,8 +34,6 @@ public:
signals:
void dockIconClicked();
-public slots:
-
private:
MacDockIconHandler();
diff --git a/src/qt/macdockiconhandler.mm b/src/qt/macdockiconhandler.mm
index 75684403eb..ea868401c0 100644
--- a/src/qt/macdockiconhandler.mm
+++ b/src/qt/macdockiconhandler.mm
@@ -1,4 +1,3 @@
-
#include "macdockiconhandler.h"
#include <QMenu>
diff --git a/src/qt/monitoreddatamapper.cpp b/src/qt/monitoreddatamapper.cpp
index 88948d07bf..4c201834cb 100644
--- a/src/qt/monitoreddatamapper.cpp
+++ b/src/qt/monitoreddatamapper.cpp
@@ -9,7 +9,6 @@ MonitoredDataMapper::MonitoredDataMapper(QObject *parent) :
{
}
-
void MonitoredDataMapper::addMapping(QWidget *widget, int section)
{
QDataWidgetMapper::addMapping(widget, section);
diff --git a/src/qt/monitoreddatamapper.h b/src/qt/monitoreddatamapper.h
index 33a874e73a..de55c86fcd 100644
--- a/src/qt/monitoreddatamapper.h
+++ b/src/qt/monitoreddatamapper.h
@@ -13,19 +13,18 @@ QT_END_NAMESPACE
class MonitoredDataMapper : public QDataWidgetMapper
{
Q_OBJECT
+
public:
explicit MonitoredDataMapper(QObject *parent=0);
void addMapping(QWidget *widget, int section);
void addMapping(QWidget *widget, int section, const QByteArray &propertyName);
+
private:
void addChangeMonitor(QWidget *widget);
signals:
void viewModified();
-
};
-
-
#endif // MONITOREDDATAMAPPER_H
diff --git a/src/qt/notificator.cpp b/src/qt/notificator.cpp
index 628dca1591..397e7aa4a0 100644
--- a/src/qt/notificator.cpp
+++ b/src/qt/notificator.cpp
@@ -12,7 +12,7 @@
#include <QImageWriter>
#ifdef USE_DBUS
-#include <QtDBus/QtDBus>
+#include <QtDBus>
#include <stdint.h>
#endif
diff --git a/src/qt/notificator.h b/src/qt/notificator.h
index 833b52cb15..d20673abb6 100644
--- a/src/qt/notificator.h
+++ b/src/qt/notificator.h
@@ -15,6 +15,7 @@ QT_END_NAMESPACE
class Notificator: public QObject
{
Q_OBJECT
+
public:
/** Create a new notificator.
@note Ownership of trayIcon is not transferred to this object.
@@ -25,13 +26,12 @@ public:
// Message class
enum Class
{
- Information, /**< Informational message */
- Warning, /**< Notify user of potential problem */
- Critical /**< An error occurred */
+ Information, /**< Informational message */
+ Warning, /**< Notify user of potential problem */
+ Critical /**< An error occurred */
};
public slots:
-
/** Show notification message.
@param[in] cls general message class
@param[in] title title shown with message
diff --git a/src/qt/optionsdialog.cpp b/src/qt/optionsdialog.cpp
index 6b98ab1929..4fa1f60922 100644
--- a/src/qt/optionsdialog.cpp
+++ b/src/qt/optionsdialog.cpp
@@ -10,8 +10,6 @@
#include <QIntValidator>
#include <QLocale>
#include <QMessageBox>
-#include <QRegExp>
-#include <QRegExpValidator>
OptionsDialog::OptionsDialog(QWidget *parent) :
QDialog(parent),
diff --git a/src/qt/optionsmodel.cpp b/src/qt/optionsmodel.cpp
index 2457e38742..6b1b4e3d8e 100644
--- a/src/qt/optionsmodel.cpp
+++ b/src/qt/optionsmodel.cpp
@@ -1,11 +1,12 @@
#include "optionsmodel.h"
-#include "bitcoinunits.h"
-#include <QSettings>
+#include "bitcoinunits.h"
#include "init.h"
#include "walletdb.h"
#include "guiutil.h"
+#include <QSettings>
+
OptionsModel::OptionsModel(QObject *parent) :
QAbstractListModel(parent)
{
@@ -218,9 +219,8 @@ bool OptionsModel::setData(const QModelIndex & index, const QVariant & value, in
settings.setValue("fMinimizeToTray", fMinimizeToTray);
break;
case MapPortUPnP:
- fUseUPnP = value.toBool();
- settings.setValue("fUseUPnP", fUseUPnP);
- MapPort();
+ settings.setValue("fUseUPnP", value.toBool());
+ MapPort(value.toBool());
break;
case MinimizeOnClose:
fMinimizeOnClose = value.toBool();
diff --git a/src/qt/overviewpage.cpp b/src/qt/overviewpage.cpp
index 8f1ff5325e..528c93bdc1 100644
--- a/src/qt/overviewpage.cpp
+++ b/src/qt/overviewpage.cpp
@@ -147,11 +147,6 @@ void OverviewPage::setBalance(qint64 balance, qint64 unconfirmedBalance, qint64
ui->labelImmatureText->setVisible(showImmature);
}
-void OverviewPage::setNumTransactions(int count)
-{
- ui->labelNumTransactions->setText(QLocale::system().toString(count));
-}
-
void OverviewPage::setClientModel(ClientModel *model)
{
this->clientModel = model;
@@ -183,9 +178,6 @@ void OverviewPage::setWalletModel(WalletModel *model)
setBalance(model->getBalance(), model->getUnconfirmedBalance(), model->getImmatureBalance());
connect(model, SIGNAL(balanceChanged(qint64, qint64, qint64)), this, SLOT(setBalance(qint64, qint64, qint64)));
- setNumTransactions(model->getNumTransactions());
- connect(model, SIGNAL(numTransactionsChanged(int)), this, SLOT(setNumTransactions(int)));
-
connect(model->getOptionsModel(), SIGNAL(displayUnitChanged(int)), this, SLOT(updateDisplayUnit()));
}
diff --git a/src/qt/overviewpage.h b/src/qt/overviewpage.h
index bb32a0c33f..59ba3c66bb 100644
--- a/src/qt/overviewpage.h
+++ b/src/qt/overviewpage.h
@@ -3,10 +3,6 @@
#include <QWidget>
-QT_BEGIN_NAMESPACE
-class QModelIndex;
-QT_END_NAMESPACE
-
namespace Ui {
class OverviewPage;
}
@@ -15,6 +11,10 @@ class WalletModel;
class TxViewDelegate;
class TransactionFilterProxy;
+QT_BEGIN_NAMESPACE
+class QModelIndex;
+QT_END_NAMESPACE
+
/** Overview ("home") page widget */
class OverviewPage : public QWidget
{
@@ -30,7 +30,6 @@ public:
public slots:
void setBalance(qint64 balance, qint64 unconfirmedBalance, qint64 immatureBalance);
- void setNumTransactions(int count);
signals:
void transactionClicked(const QModelIndex &index);
diff --git a/src/qt/paymentserver.cpp b/src/qt/paymentserver.cpp
new file mode 100644
index 0000000000..a92e6fc329
--- /dev/null
+++ b/src/qt/paymentserver.cpp
@@ -0,0 +1,160 @@
+// Copyright (c) 2009-2012 The Bitcoin developers
+// Distributed under the MIT/X11 software license, see the accompanying
+// file COPYING or http://www.opensource.org/licenses/mit-license.php.
+
+#include <QApplication>
+
+#include "paymentserver.h"
+
+#include "guiconstants.h"
+#include "ui_interface.h"
+#include "util.h"
+
+#include <QByteArray>
+#include <QDataStream>
+#include <QDebug>
+#include <QFileOpenEvent>
+#include <QHash>
+#include <QLocalServer>
+#include <QLocalSocket>
+#include <QStringList>
+#include <QUrl>
+
+using namespace boost;
+
+const int BITCOIN_IPC_CONNECT_TIMEOUT = 1000; // milliseconds
+const QString BITCOIN_IPC_PREFIX("bitcoin:");
+
+//
+// Create a name that is unique for:
+// testnet / non-testnet
+// data directory
+//
+static QString ipcServerName()
+{
+ QString name("BitcoinQt");
+
+ // Append a simple hash of the datadir
+ // Note that GetDataDir(true) returns a different path
+ // for -testnet versus main net
+ QString ddir(GetDataDir(true).string().c_str());
+ name.append(QString::number(qHash(ddir)));
+
+ return name;
+}
+
+//
+// This stores payment requests received before
+// the main GUI window is up and ready to ask the user
+// to send payment.
+//
+static QStringList savedPaymentRequests;
+
+//
+// Sending to the server is done synchronously, at startup.
+// If the server isn't already running, startup continues,
+// and the items in savedPaymentRequest will be handled
+// when uiReady() is called.
+//
+bool PaymentServer::ipcSendCommandLine()
+{
+ bool fResult = false;
+
+ const QStringList& args = qApp->arguments();
+ for (int i = 1; i < args.size(); i++)
+ {
+ if (!args[i].startsWith(BITCOIN_IPC_PREFIX, Qt::CaseInsensitive))
+ continue;
+ savedPaymentRequests.append(args[i]);
+ }
+
+ foreach (const QString& arg, savedPaymentRequests)
+ {
+ QLocalSocket* socket = new QLocalSocket();
+ socket->connectToServer(ipcServerName(), QIODevice::WriteOnly);
+ if (!socket->waitForConnected(BITCOIN_IPC_CONNECT_TIMEOUT))
+ return false;
+
+ QByteArray block;
+ QDataStream out(&block, QIODevice::WriteOnly);
+ out.setVersion(QDataStream::Qt_4_0);
+ out << arg;
+ out.device()->seek(0);
+ socket->write(block);
+ socket->flush();
+
+ socket->waitForBytesWritten(BITCOIN_IPC_CONNECT_TIMEOUT);
+ socket->disconnectFromServer();
+ delete socket;
+ fResult = true;
+ }
+ return fResult;
+}
+
+PaymentServer::PaymentServer(QApplication* parent) : QObject(parent), saveURIs(true)
+{
+ // Install global event filter to catch QFileOpenEvents on the mac (sent when you click bitcoin: links)
+ parent->installEventFilter(this);
+
+ QString name = ipcServerName();
+
+ // Clean up old socket leftover from a crash:
+ QLocalServer::removeServer(name);
+
+ uriServer = new QLocalServer(this);
+
+ if (!uriServer->listen(name))
+ qDebug() << tr("Cannot start bitcoin: click-to-pay handler");
+ else
+ connect(uriServer, SIGNAL(newConnection()), this, SLOT(handleURIConnection()));
+}
+
+bool PaymentServer::eventFilter(QObject *object, QEvent *event)
+{
+ // clicking on bitcoin: URLs creates FileOpen events on the Mac:
+ if (event->type() == QEvent::FileOpen)
+ {
+ QFileOpenEvent* fileEvent = static_cast<QFileOpenEvent*>(event);
+ if (!fileEvent->url().isEmpty())
+ {
+ if (saveURIs) // Before main window is ready:
+ savedPaymentRequests.append(fileEvent->url().toString());
+ else
+ emit receivedURI(fileEvent->url().toString());
+ return true;
+ }
+ }
+ return false;
+}
+
+void PaymentServer::uiReady()
+{
+ saveURIs = false;
+ foreach (const QString& s, savedPaymentRequests)
+ emit receivedURI(s);
+ savedPaymentRequests.clear();
+}
+
+void PaymentServer::handleURIConnection()
+{
+ QLocalSocket *clientConnection = uriServer->nextPendingConnection();
+
+ while (clientConnection->bytesAvailable() < (int)sizeof(quint32))
+ clientConnection->waitForReadyRead();
+
+ connect(clientConnection, SIGNAL(disconnected()),
+ clientConnection, SLOT(deleteLater()));
+
+ QDataStream in(clientConnection);
+ in.setVersion(QDataStream::Qt_4_0);
+ if (clientConnection->bytesAvailable() < (int)sizeof(quint16)) {
+ return;
+ }
+ QString message;
+ in >> message;
+
+ if (saveURIs)
+ savedPaymentRequests.append(message);
+ else
+ emit receivedURI(message);
+}
diff --git a/src/qt/paymentserver.h b/src/qt/paymentserver.h
new file mode 100644
index 0000000000..1f2fdd4664
--- /dev/null
+++ b/src/qt/paymentserver.h
@@ -0,0 +1,67 @@
+#ifndef PAYMENTSERVER_H
+#define PAYMENTSERVER_H
+
+//
+// This class handles payment requests from clicking on
+// bitcoin: URIs
+//
+// This is somewhat tricky, because we have to deal with
+// the situation where the user clicks on a link during
+// startup/initialization, when the splash-screen is up
+// but the main window (and the Send Coins tab) is not.
+//
+// So, the strategy is:
+//
+// Create the server, and register the event handler,
+// when the application is created. Save any URIs
+// received at or during startup in a list.
+//
+// When startup is finished and the main window is
+// show, a signal is sent to slot uiReady(), which
+// emits a receivedURL() signal for any payment
+// requests that happened during startup.
+//
+// After startup, receivedURL() happens as usual.
+//
+// This class has one more feature: a static
+// method that finds URIs passed in the command line
+// and, if a server is running in another process,
+// sends them to the server.
+//
+#include <QObject>
+#include <QString>
+
+class QApplication;
+class QLocalServer;
+
+class PaymentServer : public QObject
+{
+ Q_OBJECT
+
+private:
+ bool saveURIs;
+ QLocalServer* uriServer;
+
+public:
+ // Returns true if there were URIs on the command line
+ // which were successfully sent to an already-running
+ // process.
+ static bool ipcSendCommandLine();
+
+ PaymentServer(QApplication* parent);
+
+ bool eventFilter(QObject *object, QEvent *event);
+
+signals:
+ void receivedURI(QString);
+
+public slots:
+ // Signal this when the main window's UI is ready
+ // to display payment requests to the user
+ void uiReady();
+
+private slots:
+ void handleURIConnection();
+};
+
+#endif // PAYMENTSERVER_H
diff --git a/src/qt/qtipcserver.cpp b/src/qt/qtipcserver.cpp
deleted file mode 100644
index 2777fab852..0000000000
--- a/src/qt/qtipcserver.cpp
+++ /dev/null
@@ -1,165 +0,0 @@
-// Copyright (c) 2009-2012 The Bitcoin developers
-// Distributed under the MIT/X11 software license, see the accompanying
-// file COPYING or http://www.opensource.org/licenses/mit-license.php.
-
-#include <boost/version.hpp>
-#if defined(WIN32) && BOOST_VERSION == 104900
-#define BOOST_INTERPROCESS_HAS_WINDOWS_KERNEL_BOOTTIME
-#define BOOST_INTERPROCESS_HAS_KERNEL_BOOTTIME
-#endif
-
-#include "qtipcserver.h"
-#include "guiconstants.h"
-#include "ui_interface.h"
-#include "util.h"
-
-#include <boost/algorithm/string/predicate.hpp>
-#include <boost/date_time/posix_time/posix_time.hpp>
-#include <boost/interprocess/ipc/message_queue.hpp>
-#include <boost/version.hpp>
-
-#if defined(WIN32) && (!defined(BOOST_INTERPROCESS_HAS_WINDOWS_KERNEL_BOOTTIME) || !defined(BOOST_INTERPROCESS_HAS_KERNEL_BOOTTIME) || BOOST_VERSION < 104900)
-#warning Compiling without BOOST_INTERPROCESS_HAS_WINDOWS_KERNEL_BOOTTIME and BOOST_INTERPROCESS_HAS_KERNEL_BOOTTIME uncommented in boost/interprocess/detail/tmp_dir_helpers.hpp or using a boost version before 1.49 may have unintended results see svn.boost.org/trac/boost/ticket/5392
-#endif
-
-using namespace boost;
-using namespace boost::interprocess;
-using namespace boost::posix_time;
-
-// holds Bitcoin-Qt message queue name (initialized in bitcoin.cpp)
-std::string strBitcoinURIQueueName;
-
-#if defined MAC_OSX || defined __FreeBSD__
-// URI handling not implemented on OSX yet
-
-void ipcScanRelay(int argc, char *argv[]) { }
-void ipcInit(int argc, char *argv[]) { }
-
-#else
-
-static void ipcThread2(void* pArg);
-
-static bool ipcScanCmd(int argc, char *argv[], bool fRelay)
-{
- // Check for URI in argv
- bool fSent = false;
- for (int i = 1; i < argc; i++)
- {
- if (boost::algorithm::istarts_with(argv[i], "bitcoin:"))
- {
- const char *strURI = argv[i];
- try {
- boost::interprocess::message_queue mq(boost::interprocess::open_only, strBitcoinURIQueueName.c_str());
- if (mq.try_send(strURI, strlen(strURI), 0))
- fSent = true;
- else if (fRelay)
- break;
- }
- catch (boost::interprocess::interprocess_exception &ex) {
- // don't log the "file not found" exception, because that's normal for
- // the first start of the first instance
- if (ex.get_error_code() != boost::interprocess::not_found_error || !fRelay)
- {
- printf("main() - boost interprocess exception #%d: %s\n", ex.get_error_code(), ex.what());
- break;
- }
- }
- }
- }
- return fSent;
-}
-
-void ipcScanRelay(int argc, char *argv[])
-{
- if (ipcScanCmd(argc, argv, true))
- exit(0);
-}
-
-static void ipcThread(void* pArg)
-{
- // Make this thread recognisable as the GUI-IPC thread
- RenameThread("bitcoin-gui-ipc");
-
- try
- {
- ipcThread2(pArg);
- }
- catch (std::exception& e) {
- PrintExceptionContinue(&e, "ipcThread()");
- } catch (...) {
- PrintExceptionContinue(NULL, "ipcThread()");
- }
- printf("ipcThread exited\n");
-}
-
-static void ipcThread2(void* pArg)
-{
- printf("ipcThread started\n");
-
- message_queue* mq = (message_queue*)pArg;
- char buffer[MAX_URI_LENGTH + 1] = "";
- size_t nSize = 0;
- unsigned int nPriority = 0;
-
- loop
- {
- ptime d = boost::posix_time::microsec_clock::universal_time() + millisec(100);
- if (mq->timed_receive(&buffer, sizeof(buffer), nSize, nPriority, d))
- {
- uiInterface.ThreadSafeHandleURI(std::string(buffer, nSize));
- Sleep(1000);
- }
-
- if (fShutdown)
- break;
- }
-
- // Remove message queue
- message_queue::remove(strBitcoinURIQueueName.c_str());
- // Cleanup allocated memory
- delete mq;
-}
-
-void ipcInit(int argc, char *argv[])
-{
- message_queue* mq = NULL;
- char buffer[MAX_URI_LENGTH + 1] = "";
- size_t nSize = 0;
- unsigned int nPriority = 0;
-
- try {
- mq = new message_queue(open_or_create, strBitcoinURIQueueName.c_str(), 2, MAX_URI_LENGTH);
-
- // Make sure we don't lose any bitcoin: URIs
- for (int i = 0; i < 2; i++)
- {
- ptime d = boost::posix_time::microsec_clock::universal_time() + millisec(1);
- if (mq->timed_receive(&buffer, sizeof(buffer), nSize, nPriority, d))
- {
- uiInterface.ThreadSafeHandleURI(std::string(buffer, nSize));
- }
- else
- break;
- }
-
- // Make sure only one bitcoin instance is listening
- message_queue::remove(strBitcoinURIQueueName.c_str());
- delete mq;
-
- mq = new message_queue(open_or_create, strBitcoinURIQueueName.c_str(), 2, MAX_URI_LENGTH);
- }
- catch (interprocess_exception &ex) {
- printf("ipcInit() - boost interprocess exception #%d: %s\n", ex.get_error_code(), ex.what());
- return;
- }
-
- if (!NewThread(ipcThread, mq))
- {
- delete mq;
- return;
- }
-
- ipcScanCmd(argc, argv, false);
-}
-
-#endif
diff --git a/src/qt/qtipcserver.h b/src/qt/qtipcserver.h
deleted file mode 100644
index f775f272c2..0000000000
--- a/src/qt/qtipcserver.h
+++ /dev/null
@@ -1,16 +0,0 @@
-#ifndef QTIPCSERVER_H
-#define QTIPCSERVER_H
-
-#include <string>
-
-// Define Bitcoin-Qt message queue name for mainnet
-#define BITCOINURI_QUEUE_NAME_MAINNET "BitcoinURI"
-// Define Bitcoin-Qt message queue name for testnet
-#define BITCOINURI_QUEUE_NAME_TESTNET "BitcoinURI-testnet"
-
-extern std::string strBitcoinURIQueueName;
-
-void ipcScanRelay(int argc, char *argv[]);
-void ipcInit(int argc, char *argv[]);
-
-#endif // QTIPCSERVER_H
diff --git a/src/qt/qvalidatedlineedit.h b/src/qt/qvalidatedlineedit.h
index 66e26be9a3..ec74633c02 100644
--- a/src/qt/qvalidatedlineedit.h
+++ b/src/qt/qvalidatedlineedit.h
@@ -9,6 +9,7 @@
class QValidatedLineEdit : public QLineEdit
{
Q_OBJECT
+
public:
explicit QValidatedLineEdit(QWidget *parent = 0);
void clear();
diff --git a/src/qt/qvaluecombobox.h b/src/qt/qvaluecombobox.h
index 1a47bb6565..64a7da9df5 100644
--- a/src/qt/qvaluecombobox.h
+++ b/src/qt/qvaluecombobox.h
@@ -8,7 +8,9 @@
class QValueComboBox : public QComboBox
{
Q_OBJECT
+
Q_PROPERTY(QVariant value READ value WRITE setValue NOTIFY valueChanged USER true)
+
public:
explicit QValueComboBox(QWidget *parent = 0);
@@ -21,8 +23,6 @@ public:
signals:
void valueChanged();
-public slots:
-
private:
int role;
diff --git a/src/qt/res/bitcoin-qt.rc b/src/qt/res/bitcoin-qt.rc
index 834001c0c6..5449ff8359 100644
--- a/src/qt/res/bitcoin-qt.rc
+++ b/src/qt/res/bitcoin-qt.rc
@@ -22,7 +22,7 @@ BEGIN
VALUE "FileDescription", "Bitcoin-Qt (OSS GUI client for Bitcoin)"
VALUE "FileVersion", VER_FILEVERSION_STR
VALUE "InternalName", "bitcoin-qt"
- VALUE "LegalCopyright", "2009-2012 The Bitcoin developers"
+ VALUE "LegalCopyright", "2009-2013 The Bitcoin developers"
VALUE "LegalTrademarks1", "Distributed under the MIT/X11 software license, see the accompanying file COPYING or http://www.opensource.org/licenses/mit-license.php."
VALUE "OriginalFilename", "bitcoin-qt.exe"
VALUE "ProductName", "Bitcoin-Qt"
diff --git a/src/qt/res/icons/bitcoin.icns b/src/qt/res/icons/bitcoin.icns
index 3c757080aa..54d02d34dd 100644
--- a/src/qt/res/icons/bitcoin.icns
+++ b/src/qt/res/icons/bitcoin.icns
Binary files differ
diff --git a/src/qt/res/icons/bitcoin.ico b/src/qt/res/icons/bitcoin.ico
index 01afd3c6da..ad74552e90 100644..100755
--- a/src/qt/res/icons/bitcoin.ico
+++ b/src/qt/res/icons/bitcoin.ico
Binary files differ
diff --git a/src/qt/res/icons/bitcoin.png b/src/qt/res/icons/bitcoin.png
index bf43144e5e..c90471bd07 100644
--- a/src/qt/res/icons/bitcoin.png
+++ b/src/qt/res/icons/bitcoin.png
Binary files differ
diff --git a/src/qt/res/icons/bitcoin_testnet.png b/src/qt/res/icons/bitcoin_testnet.png
index ee2dc40563..43b3d7b0eb 100644
--- a/src/qt/res/icons/bitcoin_testnet.png
+++ b/src/qt/res/icons/bitcoin_testnet.png
Binary files differ
diff --git a/src/qt/res/src/bitcoin.svg b/src/qt/res/src/bitcoin.svg
index 96f10178a2..14cf0c5e11 100644
--- a/src/qt/res/src/bitcoin.svg
+++ b/src/qt/res/src/bitcoin.svg
@@ -1,115 +1,58 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
- xmlns:dc="http://purl.org/dc/elements/1.1/"
- xmlns:cc="http://creativecommons.org/ns#"
- xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
- xmlns:svg="http://www.w3.org/2000/svg"
- xmlns="http://www.w3.org/2000/svg"
- xmlns:xlink="http://www.w3.org/1999/xlink"
- xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
- xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
- id="svg2"
- version="1.1"
- inkscape:version="0.48.0 r9654"
- width="256"
- height="256"
- sodipodi:docname="bitcoin.svg"
- inkscape:export-filename="/store/orion/projects/bitcoin/BC_Logo_icon32.png"
- inkscape:export-xdpi="11.25"
- inkscape:export-ydpi="11.25"
- style="display:inline">
- <metadata
- id="metadata8">
- <rdf:RDF>
- <cc:Work
- rdf:about="">
- <dc:format>image/svg+xml</dc:format>
- <dc:type
- rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
- <dc:title></dc:title>
- </cc:Work>
- </rdf:RDF>
- </metadata>
- <defs
- id="defs6">
- <linearGradient
- id="linearGradient3800">
- <stop
- style="stop-color:#fbba6c;stop-opacity:1;"
- offset="0"
- id="stop3802" />
- <stop
- style="stop-color:#f89825;stop-opacity:1;"
- offset="1"
- id="stop3804" />
- </linearGradient>
- <filter
- inkscape:collect="always"
- id="filter3788">
- <feGaussianBlur
- inkscape:collect="always"
- stdDeviation="7.7328864"
- id="feGaussianBlur3790" />
- </filter>
- <radialGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3800"
- id="radialGradient3806"
- cx="137.01819"
- cy="136.81316"
- fx="137.01819"
- fy="136.81316"
- r="120.22619"
- gradientTransform="matrix(1,0,0,0.99768745,0,0.29784356)"
- gradientUnits="userSpaceOnUse" />
- </defs>
- <sodipodi:namedview
- pagecolor="#ffffff"
- bordercolor="#666666"
- borderopacity="1"
- objecttolerance="10"
- gridtolerance="10"
- guidetolerance="10"
- inkscape:pageopacity="0"
- inkscape:pageshadow="2"
- inkscape:window-width="1204"
- inkscape:window-height="972"
- id="namedview4"
- showgrid="false"
- inkscape:zoom="1"
- inkscape:cx="-54.927212"
- inkscape:cy="128"
- inkscape:window-x="238"
- inkscape:window-y="143"
- inkscape:window-maximized="0"
- inkscape:current-layer="layer1" />
- <g
- inkscape:groupmode="layer"
- id="layer2"
- inkscape:label="Shadow"
- style="display:inline"
- sodipodi:insensitive="true">
- <path
- sodipodi:nodetypes="sssssssssssscssssscsssscscssssssssssscscsssssssscscssssscssscssssssscsssssssss"
- inkscape:connector-curvature="0"
- id="path2986"
- d="M 111.77934,251.6677 C 67.147549,243.82973 30.788461,211.94464 17.111244,168.64858 7.1011053,136.9609 11.409199,100.0445 28.433065,71.630835 45.23974,43.579693 71.151762,24.409692 103.78036,15.888094 c 12.1652,-3.177178 33.00458,-3.99623 46.6577,-1.833789 45.59908,7.22219 82.56109,39.080427 96.48709,83.164011 10.01013,31.687684 5.70204,68.604084 -11.32183,97.017744 -16.8025,28.04418 -42.64131,47.16473 -75.34729,55.75648 -7.52834,1.97768 -11.60054,2.41566 -24.95273,2.68377 -10.90952,0.21906 -18.34974,-0.0999 -23.52396,-1.00861 z m 20.17619,-31.35425 c 0.63075,-2.39846 2.14458,-8.28561 3.36407,-13.08254 1.56481,-6.15521 2.69488,-8.60563 3.84031,-8.32722 0.89267,0.21696 7.39067,0.68131 14.43998,1.03189 16.31195,0.81124 23.9944,-1.14509 31.43693,-8.00537 7.63877,-7.04117 11.30337,-15.63267 11.82635,-27.72636 0.37592,-8.69327 0.10152,-10.44523 -2.27687,-14.53617 -1.48738,-2.55836 -5.17935,-6.48313 -8.20438,-8.7217 l -5.50006,-4.07013 4.37131,-1.87838 c 9.83682,-4.22697 14.47489,-11.84516 15.1401,-24.86816 0.41587,-8.14174 0.12573,-9.95645 -2.32406,-14.536178 -3.41249,-6.379435 -11.7129,-12.875301 -21.81801,-17.074696 -4.15735,-1.727672 -7.66196,-3.187464 -7.78803,-3.243983 -0.12607,-0.05651 1.28534,-6.088871 3.13645,-13.405229 1.85112,-7.316357 3.26253,-13.372021 3.13645,-13.457031 -0.12607,-0.08501 -2.84573,-0.778731 -6.04368,-1.541604 -3.19796,-0.762872 -6.6666,-1.640092 -7.70811,-1.949379 -1.54868,-0.459905 -2.47321,1.773902 -5.07541,12.262964 -2.215,8.928331 -3.69157,12.825303 -4.85951,12.825303 -2.30435,0 -12.01076,-2.489633 -12.01076,-3.080685 0,-0.263336 1.37739,-5.975631 3.06085,-12.693987 1.68345,-6.718356 2.78086,-12.49516 2.43868,-12.837341 -1.06646,-1.066455 -13.66473,-4.07084 -14.61292,-3.484827 -0.49474,0.305758 -2.13899,5.806491 -3.65393,12.223852 -1.51493,6.417361 -3.0693,12.177423 -3.45416,12.800138 -0.42537,0.68826 -6.84309,-0.416984 -16.36715,-2.818708 -8.617084,-2.173005 -15.989649,-3.583696 -16.383486,-3.13487 -0.393848,0.448826 -1.334199,3.432558 -2.089673,6.630515 -0.755474,3.197957 -1.623352,6.656241 -1.928612,7.685075 -0.438573,1.478093 0.970946,2.194444 6.717302,3.413902 7.407149,1.571906 12.549199,5.114005 12.549199,8.644526 0,3.559986 -18.770806,76.736553 -20.092504,78.329103 -1.007682,1.21419 -2.807318,1.40957 -7.196833,0.78135 -11.551776,-1.65329 -10.897277,-1.95681 -14.648875,6.7937 -1.878049,4.38054 -3.41465,8.32832 -3.41465,8.77286 0,0.44453 6.14881,2.29784 13.664008,4.11848 7.515199,1.82065 14.792647,3.72851 16.172114,4.23971 l 2.508106,0.92945 -3.31877,13.11716 c -1.825323,7.21442 -3.215633,13.21726 -3.089563,13.33965 0.549874,0.53382 15.058297,4.01313 15.382497,3.68892 0.19792,-0.19791 1.74688,-5.83164 3.44215,-12.51942 1.69526,-6.68778 3.30839,-12.52544 3.58472,-12.97256 0.443,-0.71676 11.73522,1.68597 12.76544,2.7162 0.21981,0.21981 -1.08467,6.26629 -2.89884,13.43664 l -3.29849,13.03696 4.8136,1.23571 c 2.6475,0.67965 5.33693,1.42786 5.97652,1.66271 3.63321,1.33406 5.19855,0.40079 6.2902,-3.75024 z m 0.68716,-43.88623 c -0.63959,-0.21166 -5.21848,-1.29512 -10.17531,-2.40768 -4.95684,-1.11255 -9.01243,-2.23295 -9.01243,-2.48975 0,-0.65492 8.11353,-33.1852 8.69895,-34.87745 0.34957,-1.01046 3.32218,-0.62569 10.96233,1.41895 12.84914,3.43866 18.00073,5.54314 23.11146,9.44128 8.35514,6.37277 10.49752,14.36232 5.75489,21.46161 -3.94917,5.91153 -9.15813,8.03413 -19.45529,7.92788 -4.79693,-0.0496 -9.245,-0.26317 -9.8846,-0.47484 z m 2.50991,-54.7082 c -3.73627,-0.93479 -7.21128,-1.958 -7.72221,-2.27376 -0.72057,-0.44534 6.3168,-31.740173 7.3756,-32.798964 0.64276,-0.642776 19.09068,4.708848 22.8588,6.631196 2.34875,1.19824 5.92162,4.059214 7.93975,6.357724 2.94919,3.358944 3.66929,5.201504 3.66929,9.388734 0,4.31035 -0.68714,5.95944 -3.98073,9.55341 -3.93586,4.2948 -4.08991,4.34657 -13.664,4.59252 -5.49512,0.14117 -12.62142,-0.48635 -16.4765,-1.45086 z"
- style="opacity:0.8176923;fill:#000000;fill-opacity:1;filter:url(#filter3788)" />
- </g>
- <g
- inkscape:groupmode="layer"
- id="layer1"
- inkscape:label="Front"
- style="display:inline">
- <path
- style="fill:url(#radialGradient3806);fill-opacity:1;display:inline"
- d="M 107.77934,247.6677 C 63.147549,239.82973 26.788461,207.94464 13.111244,164.64858 3.1011053,132.9609 7.4091993,96.044496 24.433065,67.630835 41.23974,39.579693 67.151762,20.409692 99.780356,11.888094 111.94556,8.7109163 132.78494,7.8918643 146.43806,10.054305 c 45.59908,7.22219 82.56109,39.080427 96.48709,83.164011 10.01013,31.687684 5.70204,68.604084 -11.32183,97.017744 -16.8025,28.04418 -42.64131,47.16473 -75.34729,55.75648 -7.52834,1.97768 -11.60054,2.41566 -24.95273,2.68377 -10.90952,0.21906 -18.34974,-0.0999 -23.52396,-1.00861 z m 20.17619,-31.35425 c 0.63075,-2.39846 2.14458,-8.28561 3.36407,-13.08254 1.56481,-6.15521 2.69488,-8.60563 3.84031,-8.32722 0.89267,0.21696 7.39067,0.68131 14.43998,1.03189 16.31195,0.81124 23.9944,-1.14509 31.43693,-8.00537 7.63877,-7.04117 11.30337,-15.63267 11.82635,-27.72636 0.37592,-8.69327 0.10152,-10.44523 -2.27687,-14.53617 -1.48738,-2.55836 -5.17935,-6.48313 -8.20438,-8.7217 l -5.50006,-4.07013 4.37131,-1.87838 c 9.83682,-4.22697 14.47489,-11.84516 15.1401,-24.86816 0.41587,-8.141744 0.12573,-9.956454 -2.32406,-14.536178 -3.41249,-6.379435 -11.7129,-12.875301 -21.81801,-17.074696 -4.15735,-1.727672 -7.66196,-3.187464 -7.78803,-3.243983 -0.12607,-0.05651 1.28534,-6.088871 3.13645,-13.405229 1.85112,-7.316357 3.26253,-13.372021 3.13645,-13.457031 -0.12607,-0.08501 -2.84573,-0.778731 -6.04368,-1.541604 -3.19796,-0.762872 -6.6666,-1.640092 -7.70811,-1.949379 -1.54868,-0.459905 -2.47321,1.773902 -5.07541,12.262964 -2.215,8.928331 -3.69157,12.825303 -4.85951,12.825303 -2.30435,0 -12.01076,-2.489633 -12.01076,-3.080685 0,-0.263336 1.37739,-5.975631 3.06085,-12.693987 1.68345,-6.718356 2.78086,-12.49516 2.43868,-12.837341 -1.06646,-1.066455 -13.66473,-4.07084 -14.61292,-3.484827 -0.49474,0.305758 -2.13899,5.806491 -3.65393,12.223852 -1.51493,6.417361 -3.0693,12.177423 -3.45416,12.800138 -0.42537,0.68826 -6.84309,-0.416984 -16.36715,-2.818708 -8.617084,-2.173005 -15.989649,-3.583696 -16.383486,-3.13487 -0.393848,0.448826 -1.334199,3.432558 -2.089673,6.630515 -0.755474,3.197957 -1.623352,6.656241 -1.928612,7.685075 -0.438573,1.478093 0.970946,2.194444 6.717302,3.413902 7.407145,1.571906 12.549199,5.114005 12.549199,8.644526 0,3.559986 -18.770806,76.736553 -20.092504,78.329103 -1.007682,1.21419 -2.807318,1.40957 -7.196833,0.78135 -11.551776,-1.65329 -10.897277,-1.95681 -14.648875,6.7937 -1.878049,4.38054 -3.41465,8.32832 -3.41465,8.77286 0,0.44453 6.14881,2.29784 13.664008,4.11848 7.515199,1.82065 14.792647,3.72851 16.172114,4.23971 l 2.508106,0.92945 -3.31877,13.11716 c -1.825323,7.21442 -3.215633,13.21726 -3.089563,13.33965 0.549874,0.53382 15.058293,4.01313 15.382493,3.68892 0.19792,-0.19791 1.74688,-5.83164 3.442154,-12.51942 1.69526,-6.68778 3.30839,-12.52544 3.58472,-12.97256 0.443,-0.71676 11.73522,1.68597 12.76544,2.7162 0.21981,0.21981 -1.08467,6.26629 -2.89884,13.43664 l -3.29849,13.03696 4.8136,1.23571 c 2.6475,0.67965 5.33693,1.42786 5.97652,1.66271 3.63321,1.33406 5.19855,0.40079 6.2902,-3.75024 z m 0.68716,-43.88623 c -0.63959,-0.21166 -5.21848,-1.29512 -10.17531,-2.40768 -4.95684,-1.11255 -9.01243,-2.23295 -9.01243,-2.48975 0,-0.65492 8.11353,-33.1852 8.69895,-34.87745 0.34957,-1.01046 3.32218,-0.62569 10.96233,1.41895 12.84914,3.43866 18.00073,5.54314 23.11146,9.44128 8.35514,6.37277 10.49752,14.36232 5.75489,21.46161 -3.94917,5.91153 -9.15813,8.03413 -19.45529,7.92788 -4.79693,-0.0496 -9.245,-0.26317 -9.8846,-0.47484 z m 2.50991,-54.7082 c -3.73627,-0.93479 -7.21128,-1.958 -7.72221,-2.27376 -0.72057,-0.44534 6.3168,-31.740173 7.3756,-32.798964 0.64276,-0.642776 19.09068,4.708848 22.8588,6.631196 2.34875,1.19824 5.92162,4.059214 7.93975,6.357724 2.94919,3.35894 3.66929,5.201504 3.66929,9.388734 0,4.31035 -0.68714,5.95944 -3.98073,9.55341 -3.93586,4.2948 -4.08991,4.34657 -13.664,4.59252 -5.49512,0.14117 -12.62142,-0.48635 -16.4765,-1.45086 z"
- id="path2987"
- inkscape:connector-curvature="0"
- sodipodi:nodetypes="sssssssssssscssssscsssscscssssssssssscscsssssssscscssssscssscssssssscsssssssss"
- inkscape:export-xdpi="11.98"
- inkscape:export-ydpi="11.98" />
- </g>
-</svg>
+<?xml version="1.0" encoding="utf-8"?>
+
+<!-- Designer: Jonas Schnelli
+ License: MIT
+-->
+
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1"
+ id="svg2" sodipodi:docname="bitcoin-logo-noshadow.svg" inkscape:version="0.48.2 r9819" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:cc="http://creativecommons.org/ns#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:svg="http://www.w3.org/2000/svg" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+ xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="1024px" height="1024px"
+ viewBox="-34 -34 580 580" enable-background="new 0 0 1024 1024" xml:space="preserve">
+
+ <!-- nice shadow with alpha 0.35 -->
+ <filter id="dropShadowAlpha">
+ <feColorMatrix result="matrixOut" in="SourceAlpha" type="saturate"
+ values="0.1" />
+ <feGaussianBlur in="matrixOut" result="blur-out" stdDeviation="6" />
+ <feColorMatrix in="blur-out" result="color-out" type="matrix"
+ values="0 0 0 0 0
+ 0 0 0 0 0
+ 0 0 0 0 0
+ 0 0 0 0.35 0"/>
+ <feBlend in="SourceGraphic" in2="color-out" mode="normal" />
+ </filter>
+
+ <g>
+ <!-- white background circle for making B not transparent but still keep inner shadows -->
+ <circle cx="255" cy="255" r="200" stroke-width="2" fill="white"/>
+
+ <radialGradient id="innerBtop" cx="277.4905" cy="196.4412" r="34.3969" gradientUnits="userSpaceOnUse">
+ <stop offset="0" style="stop-color:#F9AA4B"/>
+ <stop offset="1" style="stop-color:#F7931A"/>
+ </radialGradient>
+ <path fill="url(#innerBtop)" filter="url(#dropShadowAlpha)" d="M254.647,174.6l-13.983,56.08c15.855,3.951,64.735,20.071,72.656-11.656
+ C321.568,185.928,270.503,178.552,254.647,174.6z"/>
+
+ <radialGradient id="innerBbottom" cx="261.9153" cy="284.5671" r="39.8381" gradientUnits="userSpaceOnUse">
+ <stop offset="0" style="stop-color:#F9AA4B"/>
+ <stop offset="1" style="stop-color:#F7931A"/>
+ </radialGradient>
+ <path fill="url(#innerBbottom)" filter="url(#dropShadowAlpha)" d="M233.608,258.984l-15.425,61.832c19.04,4.729,77.769,23.584,86.448-11.296
+ C313.703,273.144,252.647,263.736,233.608,258.984z"/>
+
+ <radialGradient id="coinShape" cx="256.0276" cy="256.0027" r="255.9878" gradientUnits="userSpaceOnUse">
+ <stop offset="0" style="stop-color:#F9AA4B"/>
+ <stop offset="1" style="stop-color:#F7931A"/>
+ </radialGradient>
+ <path fill="url(#coinShape)" filter="url(#dropShadowAlpha)" d="M317.871,7.656c-137.12-34.192-276.024,49.28-310.2,186.44
+ c-34.208,137.136,49.256,276.048,186.36,310.24c137.16,34.199,276.063-49.265,310.256-186.408
+ C538.479,180.776,455.023,41.848,317.871,7.656z M368.807,219.528c-3.688,24.936-17.512,37.008-35.864,41.24
+ c25.2,13.12,38.024,33.239,25.809,68.12c-15.16,43.319-51.176,46.976-99.072,37.912l-11.624,46.584l-28.088-7l11.472-45.96
+ c-7.279-1.809-14.72-3.729-22.384-5.809l-11.512,46.177l-28.056-7l11.624-46.673c-6.561-1.68-13.225-3.464-20.024-5.168
+ l-36.552-9.111l13.943-32.152c0,0,20.696,5.504,20.416,5.096c7.952,1.969,11.48-3.216,12.872-6.672l18.368-73.64l0.048-0.2
+ l13.104-52.568c0.344-5.968-1.712-13.496-13.088-16.336c0.439-0.296-20.4-5.072-20.4-5.072l7.472-30l38.736,9.673l-0.032,0.144
+ c5.824,1.448,11.824,2.824,17.937,4.216L245.423,89.2l28.072,7l-11.28,45.224c7.536,1.721,15.12,3.456,22.504,5.297l11.2-44.929
+ l28.088,7l-11.504,46.145C347.967,167.152,373.904,185.464,368.807,219.528z"/>
+ </g>
+</svg>
diff --git a/src/qt/rpcconsole.cpp b/src/qt/rpcconsole.cpp
index 7cf2d41962..50f22b877a 100644
--- a/src/qt/rpcconsole.cpp
+++ b/src/qt/rpcconsole.cpp
@@ -6,9 +6,7 @@
#include "guiutil.h"
#include <QTime>
-#include <QTimer>
#include <QThread>
-#include <QTextEdit>
#include <QKeyEvent>
#include <QUrl>
#include <QScrollBar>
@@ -35,23 +33,19 @@ const struct {
/* Object for executing console RPC commands in a separate thread.
*/
-class RPCExecutor: public QObject
+class RPCExecutor : public QObject
{
Q_OBJECT
+
public slots:
- void start();
void request(const QString &command);
+
signals:
void reply(int category, const QString &command);
};
#include "rpcconsole.moc"
-void RPCExecutor::start()
-{
- // Nothing to do
-}
-
/**
* Split shell command line into a list of arguments. Aims to emulate \c bash and friends.
*
@@ -187,6 +181,7 @@ void RPCExecutor::request(const QString &command)
RPCConsole::RPCConsole(QWidget *parent) :
QDialog(parent),
ui(new Ui::RPCConsole),
+ clientModel(0),
historyPtr(0)
{
ui->setupUi(this);
@@ -384,16 +379,15 @@ void RPCConsole::browseHistory(int offset)
void RPCConsole::startExecutor()
{
- QThread* thread = new QThread;
+ QThread *thread = new QThread;
RPCExecutor *executor = new RPCExecutor();
executor->moveToThread(thread);
- // Notify executor when thread started (in executor thread)
- connect(thread, SIGNAL(started()), executor, SLOT(start()));
// Replies from executor object must go to this object
connect(executor, SIGNAL(reply(int,QString)), this, SLOT(message(int,QString)));
// Requests from this object must go to executor
connect(this, SIGNAL(cmdRequest(QString)), executor, SLOT(request(QString)));
+
// On stopExecutor signal
// - queue executor for deletion (in execution thread)
// - quit the Qt event loop in the execution thread
diff --git a/src/qt/sendcoinsdialog.cpp b/src/qt/sendcoinsdialog.cpp
index 0c1547bd8e..eb3ce48a6e 100644
--- a/src/qt/sendcoinsdialog.cpp
+++ b/src/qt/sendcoinsdialog.cpp
@@ -1,5 +1,6 @@
#include "sendcoinsdialog.h"
#include "ui_sendcoinsdialog.h"
+
#include "walletmodel.h"
#include "bitcoinunits.h"
#include "addressbookpage.h"
@@ -10,7 +11,6 @@
#include "base58.h"
#include <QMessageBox>
-#include <QLocale>
#include <QTextDocument>
#include <QScrollBar>
@@ -202,7 +202,7 @@ SendCoinsEntry *SendCoinsDialog::addEntry()
entry->clear();
entry->setFocus();
ui->scrollAreaWidgetContents->resize(ui->scrollAreaWidgetContents->sizeHint());
- QCoreApplication::instance()->processEvents();
+ qApp->processEvents();
QScrollBar* bar = ui->scrollArea->verticalScrollBar();
if(bar)
bar->setSliderPosition(bar->maximum());
@@ -245,6 +245,26 @@ QWidget *SendCoinsDialog::setupTabChain(QWidget *prev)
return ui->sendButton;
}
+void SendCoinsDialog::setAddress(const QString &address)
+{
+ SendCoinsEntry *entry = 0;
+ // Replace the first entry if it is still unused
+ if(ui->entries->count() == 1)
+ {
+ SendCoinsEntry *first = qobject_cast<SendCoinsEntry*>(ui->entries->itemAt(0)->widget());
+ if(first->isClear())
+ {
+ entry = first;
+ }
+ }
+ if(!entry)
+ {
+ entry = addEntry();
+ }
+
+ entry->setAddress(address);
+}
+
void SendCoinsDialog::pasteEntry(const SendCoinsRecipient &rv)
{
if(!fNewRecipientAllowed)
diff --git a/src/qt/sendcoinsdialog.h b/src/qt/sendcoinsdialog.h
index 8a6e050c11..043dfdcb40 100644
--- a/src/qt/sendcoinsdialog.h
+++ b/src/qt/sendcoinsdialog.h
@@ -29,6 +29,7 @@ public:
*/
QWidget *setupTabChain(QWidget *prev);
+ void setAddress(const QString &address);
void pasteEntry(const SendCoinsRecipient &rv);
bool handleURI(const QString &uri);
diff --git a/src/qt/sendcoinsentry.cpp b/src/qt/sendcoinsentry.cpp
index c4d84c388c..876b7f808b 100644
--- a/src/qt/sendcoinsentry.cpp
+++ b/src/qt/sendcoinsentry.cpp
@@ -1,5 +1,6 @@
#include "sendcoinsentry.h"
#include "ui_sendcoinsentry.h"
+
#include "guiutil.h"
#include "bitcoinunits.h"
#include "addressbookpage.h"
@@ -152,6 +153,12 @@ void SendCoinsEntry::setValue(const SendCoinsRecipient &value)
ui->payAmount->setValue(value.amount);
}
+void SendCoinsEntry::setAddress(const QString &address)
+{
+ ui->payTo->setText(address);
+ ui->payAmount->setFocus();
+}
+
bool SendCoinsEntry::isClear()
{
return ui->payTo->text().isEmpty();
diff --git a/src/qt/sendcoinsentry.h b/src/qt/sendcoinsentry.h
index 0ac14c1472..ec5f3410c1 100644
--- a/src/qt/sendcoinsentry.h
+++ b/src/qt/sendcoinsentry.h
@@ -26,6 +26,7 @@ public:
bool isClear();
void setValue(const SendCoinsRecipient &value);
+ void setAddress(const QString &address);
/** Set up the tab chain manually, as Qt messes up the tab chain by default in some cases (issue https://bugreports.qt-project.org/browse/QTBUG-10907).
*/
diff --git a/src/qt/signverifymessagedialog.cpp b/src/qt/signverifymessagedialog.cpp
index 371b5ba535..7c43e5839e 100644
--- a/src/qt/signverifymessagedialog.cpp
+++ b/src/qt/signverifymessagedialog.cpp
@@ -10,11 +10,11 @@
#include "walletmodel.h"
#include "wallet.h"
+#include <QClipboard>
+
#include <string>
#include <vector>
-#include <QClipboard>
-
SignVerifyMessageDialog::SignVerifyMessageDialog(QWidget *parent) :
QDialog(parent),
ui(new Ui::SignVerifyMessageDialog),
diff --git a/src/qt/signverifymessagedialog.h b/src/qt/signverifymessagedialog.h
index 2c2677cc0c..558f24e232 100644
--- a/src/qt/signverifymessagedialog.h
+++ b/src/qt/signverifymessagedialog.h
@@ -8,9 +8,6 @@ namespace Ui {
}
class WalletModel;
-QT_BEGIN_NAMESPACE
-QT_END_NAMESPACE
-
class SignVerifyMessageDialog : public QDialog
{
Q_OBJECT
diff --git a/src/qt/test/uritests.cpp b/src/qt/test/uritests.cpp
index 4662f5ed31..802d74719e 100644
--- a/src/qt/test/uritests.cpp
+++ b/src/qt/test/uritests.cpp
@@ -4,15 +4,6 @@
#include <QUrl>
-/*
-struct SendCoinsRecipient
-{
- QString address;
- QString label;
- qint64 amount;
-};
-*/
-
void URITests::uriTests()
{
SendCoinsRecipient rv;
diff --git a/src/qt/transactiondesc.cpp b/src/qt/transactiondesc.cpp
index d5b08448dd..e4dbf9c0d9 100644
--- a/src/qt/transactiondesc.cpp
+++ b/src/qt/transactiondesc.cpp
@@ -2,13 +2,14 @@
#include "guiutil.h"
#include "bitcoinunits.h"
-
#include "main.h"
#include "wallet.h"
#include "db.h"
#include "ui_interface.h"
#include "base58.h"
+#include <string>
+
QString TransactionDesc::FormatTxStatus(const CWalletTx& wtx)
{
if (!wtx.IsFinal())
diff --git a/src/qt/transactiondesc.h b/src/qt/transactiondesc.h
index 2523f9aa69..cb0dda5b58 100644
--- a/src/qt/transactiondesc.h
+++ b/src/qt/transactiondesc.h
@@ -3,7 +3,6 @@
#include <QString>
#include <QObject>
-#include <string>
class CWallet;
class CWalletTx;
@@ -13,8 +12,10 @@ class CWalletTx;
class TransactionDesc: public QObject
{
Q_OBJECT
+
public:
static QString toHTML(CWallet *wallet, CWalletTx &wtx);
+
private:
TransactionDesc() {}
diff --git a/src/qt/transactiondescdialog.h b/src/qt/transactiondescdialog.h
index e86fb58a64..f7ceacb63d 100644
--- a/src/qt/transactiondescdialog.h
+++ b/src/qt/transactiondescdialog.h
@@ -6,6 +6,7 @@
namespace Ui {
class TransactionDescDialog;
}
+
QT_BEGIN_NAMESPACE
class QModelIndex;
QT_END_NAMESPACE
diff --git a/src/qt/transactionfilterproxy.cpp b/src/qt/transactionfilterproxy.cpp
index 16fb4dab92..068e5550d2 100644
--- a/src/qt/transactionfilterproxy.cpp
+++ b/src/qt/transactionfilterproxy.cpp
@@ -1,4 +1,5 @@
#include "transactionfilterproxy.h"
+
#include "transactiontablemodel.h"
#include <QDateTime>
diff --git a/src/qt/transactionfilterproxy.h b/src/qt/transactionfilterproxy.h
index 30b98588f0..1aea85a005 100644
--- a/src/qt/transactionfilterproxy.h
+++ b/src/qt/transactionfilterproxy.h
@@ -8,6 +8,7 @@
class TransactionFilterProxy : public QSortFilterProxyModel
{
Q_OBJECT
+
public:
explicit TransactionFilterProxy(QObject *parent = 0);
@@ -32,6 +33,7 @@ public:
void setLimit(int limit);
int rowCount(const QModelIndex &parent = QModelIndex()) const;
+
protected:
bool filterAcceptsRow(int source_row, const QModelIndex & source_parent) const;
@@ -42,11 +44,6 @@ private:
quint32 typeFilter;
qint64 minAmount;
int limitRows;
-
-signals:
-
-public slots:
-
};
#endif // TRANSACTIONFILTERPROXY_H
diff --git a/src/qt/transactionrecord.h b/src/qt/transactionrecord.h
index f6570803de..d760d47c89 100644
--- a/src/qt/transactionrecord.h
+++ b/src/qt/transactionrecord.h
@@ -14,8 +14,8 @@ class TransactionStatus
{
public:
TransactionStatus():
- confirmed(false), sortKey(""), maturity(Mature),
- matures_in(0), status(Offline), depth(0), open_for(0), cur_num_blocks(-1)
+ confirmed(false), sortKey(""), maturity(Mature),
+ matures_in(0), status(Offline), depth(0), open_for(0), cur_num_blocks(-1)
{ }
enum Maturity
diff --git a/src/qt/transactiontablemodel.cpp b/src/qt/transactiontablemodel.cpp
index aef0e409bd..baf1e16483 100644
--- a/src/qt/transactiontablemodel.cpp
+++ b/src/qt/transactiontablemodel.cpp
@@ -1,4 +1,5 @@
#include "transactiontablemodel.h"
+
#include "guiutil.h"
#include "transactionrecord.h"
#include "guiconstants.h"
@@ -11,13 +12,11 @@
#include "wallet.h"
#include "ui_interface.h"
-#include <QLocale>
#include <QList>
#include <QColor>
#include <QTimer>
#include <QIcon>
#include <QDateTime>
-#include <QtAlgorithms>
// Amount column is right-aligned it contains numbers
static int column_alignments[] = {
diff --git a/src/qt/transactiontablemodel.h b/src/qt/transactiontablemodel.h
index b0687d5399..6b2961c285 100644
--- a/src/qt/transactiontablemodel.h
+++ b/src/qt/transactiontablemodel.h
@@ -14,6 +14,7 @@ class WalletModel;
class TransactionTableModel : public QAbstractTableModel
{
Q_OBJECT
+
public:
explicit TransactionTableModel(CWallet* wallet, WalletModel *parent = 0);
~TransactionTableModel();
@@ -55,6 +56,7 @@ public:
QVariant data(const QModelIndex &index, int role) const;
QVariant headerData(int section, Qt::Orientation orientation, int role) const;
QModelIndex index(int row, int column, const QModelIndex & parent = QModelIndex()) const;
+
private:
CWallet* wallet;
WalletModel *walletModel;
diff --git a/src/qt/transactionview.cpp b/src/qt/transactionview.cpp
index 7acf5deaa3..9240b71c71 100644
--- a/src/qt/transactionview.cpp
+++ b/src/qt/transactionview.cpp
@@ -20,12 +20,9 @@
#include <QLineEdit>
#include <QTableView>
#include <QHeaderView>
-#include <QPushButton>
#include <QMessageBox>
#include <QPoint>
#include <QMenu>
-#include <QApplication>
-#include <QClipboard>
#include <QLabel>
#include <QDateTimeEdit>
@@ -126,6 +123,7 @@ TransactionView::TransactionView(QWidget *parent) :
QAction *copyAddressAction = new QAction(tr("Copy address"), this);
QAction *copyLabelAction = new QAction(tr("Copy label"), this);
QAction *copyAmountAction = new QAction(tr("Copy amount"), this);
+ QAction *copyTxIDAction = new QAction(tr("Copy transaction ID"), this);
QAction *editLabelAction = new QAction(tr("Edit label"), this);
QAction *showDetailsAction = new QAction(tr("Show transaction details"), this);
@@ -133,6 +131,7 @@ TransactionView::TransactionView(QWidget *parent) :
contextMenu->addAction(copyAddressAction);
contextMenu->addAction(copyLabelAction);
contextMenu->addAction(copyAmountAction);
+ contextMenu->addAction(copyTxIDAction);
contextMenu->addAction(editLabelAction);
contextMenu->addAction(showDetailsAction);
@@ -148,6 +147,7 @@ TransactionView::TransactionView(QWidget *parent) :
connect(copyAddressAction, SIGNAL(triggered()), this, SLOT(copyAddress()));
connect(copyLabelAction, SIGNAL(triggered()), this, SLOT(copyLabel()));
connect(copyAmountAction, SIGNAL(triggered()), this, SLOT(copyAmount()));
+ connect(copyTxIDAction, SIGNAL(triggered()), this, SLOT(copyTxID()));
connect(editLabelAction, SIGNAL(triggered()), this, SLOT(editLabel()));
connect(showDetailsAction, SIGNAL(triggered()), this, SLOT(showDetails()));
}
@@ -173,16 +173,11 @@ void TransactionView::setModel(WalletModel *model)
transactionView->sortByColumn(TransactionTableModel::Status, Qt::DescendingOrder);
transactionView->verticalHeader()->hide();
- transactionView->horizontalHeader()->resizeSection(
- TransactionTableModel::Status, 23);
- transactionView->horizontalHeader()->resizeSection(
- TransactionTableModel::Date, 120);
- transactionView->horizontalHeader()->resizeSection(
- TransactionTableModel::Type, 120);
- transactionView->horizontalHeader()->setResizeMode(
- TransactionTableModel::ToAddress, QHeaderView::Stretch);
- transactionView->horizontalHeader()->resizeSection(
- TransactionTableModel::Amount, 100);
+ transactionView->horizontalHeader()->resizeSection(TransactionTableModel::Status, 23);
+ transactionView->horizontalHeader()->resizeSection(TransactionTableModel::Date, 120);
+ transactionView->horizontalHeader()->resizeSection(TransactionTableModel::Type, 120);
+ transactionView->horizontalHeader()->setResizeMode(TransactionTableModel::ToAddress, QHeaderView::Stretch);
+ transactionView->horizontalHeader()->resizeSection(TransactionTableModel::Amount, 100);
}
}
@@ -317,6 +312,11 @@ void TransactionView::copyAmount()
GUIUtil::copyEntryData(transactionView, 0, TransactionTableModel::FormattedAmountRole);
}
+void TransactionView::copyTxID()
+{
+ GUIUtil::copyEntryData(transactionView, 0, TransactionTableModel::TxIDRole);
+}
+
void TransactionView::editLabel()
{
if(!transactionView->selectionModel() ||!model)
diff --git a/src/qt/transactionview.h b/src/qt/transactionview.h
index 4ade3ecd5f..bb41a83e32 100644
--- a/src/qt/transactionview.h
+++ b/src/qt/transactionview.h
@@ -22,6 +22,7 @@ QT_END_NAMESPACE
class TransactionView : public QWidget
{
Q_OBJECT
+
public:
explicit TransactionView(QWidget *parent = 0);
@@ -65,6 +66,7 @@ private slots:
void editLabel();
void copyLabel();
void copyAmount();
+ void copyTxID();
signals:
void doubleClicked(const QModelIndex&);
diff --git a/src/qt/walletframe.cpp b/src/qt/walletframe.cpp
new file mode 100644
index 0000000000..b5947caf3a
--- /dev/null
+++ b/src/qt/walletframe.cpp
@@ -0,0 +1,129 @@
+/*
+ * Qt4 bitcoin GUI.
+ *
+ * W.J. van der Laan 2011-2012
+ * The Bitcoin Developers 2011-2013
+ */
+#include "walletframe.h"
+#include "bitcoingui.h"
+#include "walletstack.h"
+
+#include <QVBoxLayout>
+#include <QMessageBox>
+
+#include <stdio.h>
+
+WalletFrame::WalletFrame(BitcoinGUI *_gui) :
+ QFrame(_gui),
+ gui(_gui),
+ clientModel(0)
+{
+ // Leave HBox hook for adding a list view later
+ QHBoxLayout *walletFrameLayout = new QHBoxLayout(this);
+ walletStack = new WalletStack(this);
+ walletStack->setBitcoinGUI(gui);
+ walletFrameLayout->addWidget(walletStack);
+}
+
+WalletFrame::~WalletFrame()
+{
+}
+
+void WalletFrame::setClientModel(ClientModel *clientModel)
+{
+ this->clientModel = clientModel;
+ walletStack->setClientModel(clientModel);
+}
+
+bool WalletFrame::addWallet(const QString& name, WalletModel *walletModel)
+{
+ return walletStack->addWallet(name, walletModel);
+}
+
+bool WalletFrame::setCurrentWallet(const QString& name)
+{
+ // TODO: Check if valid name
+ walletStack->setCurrentWallet(name);
+ return true;
+}
+
+void WalletFrame::removeAllWallets()
+{
+ walletStack->removeAllWallets();
+}
+
+bool WalletFrame::handleURI(const QString &uri)
+{
+ return walletStack->handleURI(uri);
+}
+
+void WalletFrame::showOutOfSyncWarning(bool fShow)
+{
+ if (!walletStack) {
+ QMessageBox box;
+ box.setText("walletStack is null");
+ box.exec();
+ return;
+ }
+ walletStack->showOutOfSyncWarning(fShow);
+}
+
+void WalletFrame::gotoOverviewPage()
+{
+ walletStack->gotoOverviewPage();
+}
+
+void WalletFrame::gotoHistoryPage()
+{
+ walletStack->gotoHistoryPage();
+}
+
+void WalletFrame::gotoAddressBookPage()
+{
+ walletStack->gotoAddressBookPage();
+}
+
+void WalletFrame::gotoReceiveCoinsPage()
+{
+ walletStack->gotoReceiveCoinsPage();
+}
+
+void WalletFrame::gotoSendCoinsPage(QString addr)
+{
+ walletStack->gotoSendCoinsPage(addr);
+}
+
+void WalletFrame::gotoSignMessageTab(QString addr)
+{
+ walletStack->gotoSignMessageTab(addr);
+}
+
+void WalletFrame::gotoVerifyMessageTab(QString addr)
+{
+ walletStack->gotoSignMessageTab(addr);
+}
+
+void WalletFrame::encryptWallet(bool status)
+{
+ walletStack->encryptWallet(status);
+}
+
+void WalletFrame::backupWallet()
+{
+ walletStack->backupWallet();
+}
+
+void WalletFrame::changePassphrase()
+{
+ walletStack->changePassphrase();
+}
+
+void WalletFrame::unlockWallet()
+{
+ walletStack->unlockWallet();
+}
+
+void WalletFrame::setEncryptionStatus()
+{
+ walletStack->setEncryptionStatus();
+}
diff --git a/src/qt/walletframe.h b/src/qt/walletframe.h
new file mode 100644
index 0000000000..3649185e8a
--- /dev/null
+++ b/src/qt/walletframe.h
@@ -0,0 +1,73 @@
+/*
+ * Qt4 bitcoin GUI.
+ *
+ * W.J. van der Laan 2011-2012
+ * The Bitcoin Developers 2011-2013
+ */
+#ifndef WALLETFRAME_H
+#define WALLETFRAME_H
+
+#include <QFrame>
+
+class BitcoinGUI;
+class ClientModel;
+class WalletModel;
+class WalletStack;
+
+class WalletFrame : public QFrame
+{
+ Q_OBJECT
+public:
+ explicit WalletFrame(BitcoinGUI *_gui);
+ ~WalletFrame();
+
+ void setClientModel(ClientModel *clientModel);
+
+ bool addWallet(const QString& name, WalletModel *walletModel);
+ bool setCurrentWallet(const QString& name);
+
+ void removeAllWallets();
+
+ bool handleURI(const QString &uri);
+
+ void showOutOfSyncWarning(bool fShow);
+
+private:
+ BitcoinGUI *gui;
+ ClientModel *clientModel;
+ WalletStack *walletStack;
+
+public slots:
+ /** Switch to overview (home) page */
+ void gotoOverviewPage();
+ /** Switch to history (transactions) page */
+ void gotoHistoryPage();
+ /** Switch to address book page */
+ void gotoAddressBookPage();
+ /** Switch to receive coins page */
+ void gotoReceiveCoinsPage();
+ /** Switch to send coins page */
+ void gotoSendCoinsPage(QString addr = "");
+
+ /** Show Sign/Verify Message dialog and switch to sign message tab */
+ void gotoSignMessageTab(QString addr = "");
+ /** Show Sign/Verify Message dialog and switch to verify message tab */
+ void gotoVerifyMessageTab(QString addr = "");
+
+ /** Encrypt the wallet */
+ void encryptWallet(bool status);
+ /** Backup the wallet */
+ void backupWallet();
+ /** Change encrypted wallet passphrase */
+ void changePassphrase();
+ /** Ask for passphrase to unlock wallet temporarily */
+ void unlockWallet();
+
+ /** Set the encryption status as shown in the UI.
+ @param[in] status current encryption status
+ @see WalletModel::EncryptionStatus
+ */
+ void setEncryptionStatus();
+};
+
+#endif // WALLETFRAME_H \ No newline at end of file
diff --git a/src/qt/walletmodel.cpp b/src/qt/walletmodel.cpp
index 9d5a2c04ff..20535a451d 100644
--- a/src/qt/walletmodel.cpp
+++ b/src/qt/walletmodel.cpp
@@ -56,6 +56,8 @@ int WalletModel::getNumTransactions() const
int numTransactions = 0;
{
LOCK(wallet->cs_wallet);
+ // the size of mapWallet contains the number of unique transaction IDs
+ // (e.g. payments to yourself generate 2 transactions, but both share the same transaction ID)
numTransactions = wallet->mapWallet.size();
}
return numTransactions;
diff --git a/src/qt/walletmodel.h b/src/qt/walletmodel.h
index fd5c8c4d4f..f14b09effe 100644
--- a/src/qt/walletmodel.h
+++ b/src/qt/walletmodel.h
@@ -26,6 +26,7 @@ public:
class WalletModel : public QObject
{
Q_OBJECT
+
public:
explicit WalletModel(CWallet *wallet, OptionsModel *optionsModel, QObject *parent = 0);
~WalletModel();
@@ -161,5 +162,4 @@ public slots:
void pollBalanceChanged();
};
-
#endif // WALLETMODEL_H
diff --git a/src/qt/walletstack.cpp b/src/qt/walletstack.cpp
new file mode 100644
index 0000000000..42d86956be
--- /dev/null
+++ b/src/qt/walletstack.cpp
@@ -0,0 +1,155 @@
+/*
+ * Qt4 bitcoin GUI.
+ *
+ * W.J. van der Laan 2011-2012
+ * The Bitcoin Developers 2011-2013
+ */
+#include "walletstack.h"
+#include "walletview.h"
+#include "bitcoingui.h"
+
+#include <QMap>
+#include <QMessageBox>
+
+WalletStack::WalletStack(QWidget *parent) :
+ QStackedWidget(parent),
+ clientModel(0),
+ bOutOfSync(true)
+{
+}
+
+WalletStack::~WalletStack()
+{
+}
+
+bool WalletStack::addWallet(const QString& name, WalletModel *walletModel)
+{
+ if (!gui || !clientModel || mapWalletViews.count(name) > 0)
+ return false;
+
+ WalletView *walletView = new WalletView(this, gui);
+ walletView->setBitcoinGUI(gui);
+ walletView->setClientModel(clientModel);
+ walletView->setWalletModel(walletModel);
+ walletView->showOutOfSyncWarning(bOutOfSync);
+ addWidget(walletView);
+ mapWalletViews[name] = walletView;
+ return true;
+}
+
+bool WalletStack::removeWallet(const QString& name)
+{
+ if (mapWalletViews.count(name) == 0) return false;
+ WalletView *walletView = mapWalletViews.take(name);
+ removeWidget(walletView);
+ return true;
+}
+
+void WalletStack::removeAllWallets()
+{
+ QMap<QString, WalletView*>::const_iterator i;
+ for (i = mapWalletViews.constBegin(); i != mapWalletViews.constEnd(); ++i)
+ removeWidget(i.value());
+ mapWalletViews.clear();
+}
+
+bool WalletStack::handleURI(const QString &uri)
+{
+ WalletView *walletView = (WalletView*)currentWidget();
+ if (!walletView) return false;
+
+ return walletView->handleURI(uri);
+}
+
+void WalletStack::showOutOfSyncWarning(bool fShow)
+{
+ bOutOfSync = fShow;
+ QMap<QString, WalletView*>::const_iterator i;
+ for (i = mapWalletViews.constBegin(); i != mapWalletViews.constEnd(); ++i)
+ i.value()->showOutOfSyncWarning(fShow);
+}
+
+void WalletStack::gotoOverviewPage()
+{
+ QMap<QString, WalletView*>::const_iterator i;
+ for (i = mapWalletViews.constBegin(); i != mapWalletViews.constEnd(); ++i)
+ i.value()->gotoOverviewPage();
+}
+
+void WalletStack::gotoHistoryPage()
+{
+ QMap<QString, WalletView*>::const_iterator i;
+ for (i = mapWalletViews.constBegin(); i != mapWalletViews.constEnd(); ++i)
+ i.value()->gotoHistoryPage();
+}
+
+void WalletStack::gotoAddressBookPage()
+{
+ QMap<QString, WalletView*>::const_iterator i;
+ for (i = mapWalletViews.constBegin(); i != mapWalletViews.constEnd(); ++i)
+ i.value()->gotoAddressBookPage();
+}
+
+void WalletStack::gotoReceiveCoinsPage()
+{
+ QMap<QString, WalletView*>::const_iterator i;
+ for (i = mapWalletViews.constBegin(); i != mapWalletViews.constEnd(); ++i)
+ i.value()->gotoReceiveCoinsPage();
+}
+
+void WalletStack::gotoSendCoinsPage(QString addr)
+{
+ QMap<QString, WalletView*>::const_iterator i;
+ for (i = mapWalletViews.constBegin(); i != mapWalletViews.constEnd(); ++i)
+ i.value()->gotoSendCoinsPage(addr);
+}
+
+void WalletStack::gotoSignMessageTab(QString addr)
+{
+ WalletView *walletView = (WalletView*)currentWidget();
+ if (walletView) walletView->gotoSignMessageTab(addr);
+}
+
+void WalletStack::gotoVerifyMessageTab(QString addr)
+{
+ WalletView *walletView = (WalletView*)currentWidget();
+ if (walletView) walletView->gotoVerifyMessageTab(addr);
+}
+
+void WalletStack::encryptWallet(bool status)
+{
+ WalletView *walletView = (WalletView*)currentWidget();
+ if (walletView) walletView->encryptWallet(status);
+}
+
+void WalletStack::backupWallet()
+{
+ WalletView *walletView = (WalletView*)currentWidget();
+ if (walletView) walletView->backupWallet();
+}
+
+void WalletStack::changePassphrase()
+{
+ WalletView *walletView = (WalletView*)currentWidget();
+ if (walletView) walletView->changePassphrase();
+}
+
+void WalletStack::unlockWallet()
+{
+ WalletView *walletView = (WalletView*)currentWidget();
+ if (walletView) walletView->unlockWallet();
+}
+
+void WalletStack::setEncryptionStatus()
+{
+ WalletView *walletView = (WalletView*)currentWidget();
+ if (walletView) walletView->setEncryptionStatus();
+}
+
+void WalletStack::setCurrentWallet(const QString& name)
+{
+ if (mapWalletViews.count(name) == 0) return;
+ WalletView *walletView = mapWalletViews.value(name);
+ setCurrentWidget(walletView);
+ walletView->setEncryptionStatus();
+}
diff --git a/src/qt/walletstack.h b/src/qt/walletstack.h
new file mode 100644
index 0000000000..ea4cc121d1
--- /dev/null
+++ b/src/qt/walletstack.h
@@ -0,0 +1,102 @@
+/*
+ * Qt4 bitcoin GUI.
+ *
+ * W.J. van der Laan 2011-2012
+ * The Bitcoin Developers 2011-2013
+ */
+#ifndef WALLETSTACK_H
+#define WALLETSTACK_H
+
+#include <QStackedWidget>
+#include <QMap>
+#include <boost/shared_ptr.hpp>
+
+class BitcoinGUI;
+class TransactionTableModel;
+class ClientModel;
+class WalletModel;
+class WalletView;
+class TransactionView;
+class OverviewPage;
+class AddressBookPage;
+class SendCoinsDialog;
+class SignVerifyMessageDialog;
+class Notificator;
+class RPCConsole;
+
+class CWalletManager;
+
+QT_BEGIN_NAMESPACE
+class QLabel;
+class QModelIndex;
+QT_END_NAMESPACE
+
+/*
+ WalletStack class. This class is a container for WalletView instances. It takes the place of centralWidget.
+ It was added to support multiple wallet functionality. It communicates with both the client and the
+ wallet models to give the user an up-to-date view of the current core state. It manages all the wallet views
+ it contains and updates them accordingly.
+ */
+class WalletStack : public QStackedWidget
+{
+ Q_OBJECT
+public:
+ explicit WalletStack(QWidget *parent = 0);
+ ~WalletStack();
+
+ void setBitcoinGUI(BitcoinGUI *gui) { this->gui = gui; }
+
+ void setClientModel(ClientModel *clientModel) { this->clientModel = clientModel; }
+
+ bool addWallet(const QString& name, WalletModel *walletModel);
+ bool removeWallet(const QString& name);
+
+ void removeAllWallets();
+
+ bool handleURI(const QString &uri);
+
+ void showOutOfSyncWarning(bool fShow);
+
+private:
+ BitcoinGUI *gui;
+ ClientModel *clientModel;
+ QMap<QString, WalletView*> mapWalletViews;
+
+ bool bOutOfSync;
+
+public slots:
+ void setCurrentWallet(const QString& name);
+
+ /** Switch to overview (home) page */
+ void gotoOverviewPage();
+ /** Switch to history (transactions) page */
+ void gotoHistoryPage();
+ /** Switch to address book page */
+ void gotoAddressBookPage();
+ /** Switch to receive coins page */
+ void gotoReceiveCoinsPage();
+ /** Switch to send coins page */
+ void gotoSendCoinsPage(QString addr = "");
+
+ /** Show Sign/Verify Message dialog and switch to sign message tab */
+ void gotoSignMessageTab(QString addr = "");
+ /** Show Sign/Verify Message dialog and switch to verify message tab */
+ void gotoVerifyMessageTab(QString addr = "");
+
+ /** Encrypt the wallet */
+ void encryptWallet(bool status);
+ /** Backup the wallet */
+ void backupWallet();
+ /** Change encrypted wallet passphrase */
+ void changePassphrase();
+ /** Ask for passphrase to unlock wallet temporarily */
+ void unlockWallet();
+
+ /** Set the encryption status as shown in the UI.
+ @param[in] status current encryption status
+ @see WalletModel::EncryptionStatus
+ */
+ void setEncryptionStatus();
+};
+
+#endif // WALLETSTACK_H
diff --git a/src/qt/walletview.cpp b/src/qt/walletview.cpp
new file mode 100644
index 0000000000..1d02b81fb6
--- /dev/null
+++ b/src/qt/walletview.cpp
@@ -0,0 +1,277 @@
+/*
+ * Qt4 bitcoin GUI.
+ *
+ * W.J. van der Laan 2011-2012
+ * The Bitcoin Developers 2011-2013
+ */
+#include "walletview.h"
+#include "bitcoingui.h"
+#include "transactiontablemodel.h"
+#include "addressbookpage.h"
+#include "sendcoinsdialog.h"
+#include "signverifymessagedialog.h"
+#include "clientmodel.h"
+#include "walletmodel.h"
+#include "optionsmodel.h"
+#include "transactionview.h"
+#include "overviewpage.h"
+#include "askpassphrasedialog.h"
+#include "ui_interface.h"
+
+#include <QVBoxLayout>
+#include <QActionGroup>
+#include <QAction>
+#include <QDesktopServices>
+#include <QFileDialog>
+
+WalletView::WalletView(QWidget *parent, BitcoinGUI *_gui):
+ QStackedWidget(parent),
+ gui(_gui),
+ clientModel(0),
+ walletModel(0)
+{
+ // Create tabs
+ overviewPage = new OverviewPage();
+
+ transactionsPage = new QWidget(this);
+ QVBoxLayout *vbox = new QVBoxLayout();
+ transactionView = new TransactionView(this);
+ vbox->addWidget(transactionView);
+ transactionsPage->setLayout(vbox);
+
+ addressBookPage = new AddressBookPage(AddressBookPage::ForEditing, AddressBookPage::SendingTab);
+
+ receiveCoinsPage = new AddressBookPage(AddressBookPage::ForEditing, AddressBookPage::ReceivingTab);
+
+ sendCoinsPage = new SendCoinsDialog(gui);
+
+ signVerifyMessageDialog = new SignVerifyMessageDialog(gui);
+
+ addWidget(overviewPage);
+ addWidget(transactionsPage);
+ addWidget(addressBookPage);
+ addWidget(receiveCoinsPage);
+ addWidget(sendCoinsPage);
+
+ // Clicking on a transaction on the overview page simply sends you to transaction history page
+ connect(overviewPage, SIGNAL(transactionClicked(QModelIndex)), this, SLOT(gotoHistoryPage()));
+ connect(overviewPage, SIGNAL(transactionClicked(QModelIndex)), transactionView, SLOT(focusTransaction(QModelIndex)));
+
+ // Double-clicking on a transaction on the transaction history page shows details
+ connect(transactionView, SIGNAL(doubleClicked(QModelIndex)), transactionView, SLOT(showDetails()));
+
+ // Clicking on "Send Coins" in the address book sends you to the send coins tab
+ connect(addressBookPage, SIGNAL(sendCoins(QString)), this, SLOT(gotoSendCoinsPage(QString)));
+ // Clicking on "Verify Message" in the address book opens the verify message tab in the Sign/Verify Message dialog
+ connect(addressBookPage, SIGNAL(verifyMessage(QString)), this, SLOT(gotoVerifyMessageTab(QString)));
+ // Clicking on "Sign Message" in the receive coins page opens the sign message tab in the Sign/Verify Message dialog
+ connect(receiveCoinsPage, SIGNAL(signMessage(QString)), this, SLOT(gotoSignMessageTab(QString)));
+
+ gotoOverviewPage();
+}
+
+WalletView::~WalletView()
+{
+}
+
+void WalletView::setBitcoinGUI(BitcoinGUI *gui)
+{
+ this->gui = gui;
+}
+
+void WalletView::setClientModel(ClientModel *clientModel)
+{
+ this->clientModel = clientModel;
+ if (clientModel)
+ {
+ overviewPage->setClientModel(clientModel);
+ addressBookPage->setOptionsModel(clientModel->getOptionsModel());
+ receiveCoinsPage->setOptionsModel(clientModel->getOptionsModel());
+ }
+}
+
+void WalletView::setWalletModel(WalletModel *walletModel)
+{
+ this->walletModel = walletModel;
+ if (walletModel)
+ {
+ // Receive and report messages from wallet thread
+ connect(walletModel, SIGNAL(message(QString,QString,unsigned int)), gui, SLOT(message(QString,QString,unsigned int)));
+
+ // Put transaction list in tabs
+ transactionView->setModel(walletModel);
+ overviewPage->setWalletModel(walletModel);
+ addressBookPage->setModel(walletModel->getAddressTableModel());
+ receiveCoinsPage->setModel(walletModel->getAddressTableModel());
+ sendCoinsPage->setModel(walletModel);
+ signVerifyMessageDialog->setModel(walletModel);
+
+ setEncryptionStatus();
+ connect(walletModel, SIGNAL(encryptionStatusChanged(int)), gui, SLOT(setEncryptionStatus(int)));
+
+ // Balloon pop-up for new transaction
+ connect(walletModel->getTransactionTableModel(), SIGNAL(rowsInserted(QModelIndex,int,int)),
+ this, SLOT(incomingTransaction(QModelIndex,int,int)));
+
+ // Ask for passphrase if needed
+ connect(walletModel, SIGNAL(requireUnlock()), this, SLOT(unlockWallet()));
+ }
+}
+
+void WalletView::incomingTransaction(const QModelIndex& parent, int start, int /*end*/)
+{
+ // Prevent balloon-spam when initial block download is in progress
+ if(!walletModel || !clientModel || clientModel->inInitialBlockDownload())
+ return;
+
+ TransactionTableModel *ttm = walletModel->getTransactionTableModel();
+
+ QString date = ttm->index(start, TransactionTableModel::Date, parent)
+ .data().toString();
+ qint64 amount = ttm->index(start, TransactionTableModel::Amount, parent)
+ .data(Qt::EditRole).toULongLong();
+ QString type = ttm->index(start, TransactionTableModel::Type, parent)
+ .data().toString();
+ QString address = ttm->index(start, TransactionTableModel::ToAddress, parent)
+ .data().toString();
+
+ gui->incomingTransaction(date, walletModel->getOptionsModel()->getDisplayUnit(), amount, type, address);
+}
+
+void WalletView::gotoOverviewPage()
+{
+ gui->getOverviewAction()->setChecked(true);
+ setCurrentWidget(overviewPage);
+
+ gui->getExportAction()->setEnabled(false);
+ disconnect(gui->getExportAction(), SIGNAL(triggered()), 0, 0);
+}
+
+void WalletView::gotoHistoryPage()
+{
+ gui->getHistoryAction()->setChecked(true);
+ setCurrentWidget(transactionsPage);
+
+ gui->getExportAction()->setEnabled(true);
+ disconnect(gui->getExportAction(), SIGNAL(triggered()), 0, 0);
+ connect(gui->getExportAction(), SIGNAL(triggered()), transactionView, SLOT(exportClicked()));
+}
+
+void WalletView::gotoAddressBookPage()
+{
+ gui->getAddressBookAction()->setChecked(true);
+ setCurrentWidget(addressBookPage);
+
+ gui->getExportAction()->setEnabled(true);
+ disconnect(gui->getExportAction(), SIGNAL(triggered()), 0, 0);
+ connect(gui->getExportAction(), SIGNAL(triggered()), addressBookPage, SLOT(exportClicked()));
+}
+
+void WalletView::gotoReceiveCoinsPage()
+{
+ gui->getReceiveCoinsAction()->setChecked(true);
+ setCurrentWidget(receiveCoinsPage);
+
+ gui->getExportAction()->setEnabled(true);
+ disconnect(gui->getExportAction(), SIGNAL(triggered()), 0, 0);
+ connect(gui->getExportAction(), SIGNAL(triggered()), receiveCoinsPage, SLOT(exportClicked()));
+}
+
+void WalletView::gotoSendCoinsPage(QString addr)
+{
+ gui->getSendCoinsAction()->setChecked(true);
+ setCurrentWidget(sendCoinsPage);
+
+ gui->getExportAction()->setEnabled(false);
+ disconnect(gui->getExportAction(), SIGNAL(triggered()), 0, 0);
+
+ if (!addr.isEmpty())
+ sendCoinsPage->setAddress(addr);
+}
+
+void WalletView::gotoSignMessageTab(QString addr)
+{
+ // call show() in showTab_SM()
+ signVerifyMessageDialog->showTab_SM(true);
+
+ if (!addr.isEmpty())
+ signVerifyMessageDialog->setAddress_SM(addr);
+}
+
+void WalletView::gotoVerifyMessageTab(QString addr)
+{
+ // call show() in showTab_VM()
+ signVerifyMessageDialog->showTab_VM(true);
+
+ if (!addr.isEmpty())
+ signVerifyMessageDialog->setAddress_VM(addr);
+}
+
+bool WalletView::handleURI(const QString& strURI)
+{
+ // URI has to be valid
+ if (sendCoinsPage->handleURI(strURI))
+ {
+ gotoSendCoinsPage();
+ return true;
+ }
+ else
+ return false;
+}
+
+void WalletView::showOutOfSyncWarning(bool fShow)
+{
+ overviewPage->showOutOfSyncWarning(fShow);
+}
+
+void WalletView::setEncryptionStatus()
+{
+ gui->setEncryptionStatus(walletModel->getEncryptionStatus());
+}
+
+void WalletView::encryptWallet(bool status)
+{
+ if(!walletModel)
+ return;
+ AskPassphraseDialog dlg(status ? AskPassphraseDialog::Encrypt:
+ AskPassphraseDialog::Decrypt, this);
+ dlg.setModel(walletModel);
+ dlg.exec();
+
+ setEncryptionStatus();
+}
+
+void WalletView::backupWallet()
+{
+ QString saveDir = QDesktopServices::storageLocation(QDesktopServices::DocumentsLocation);
+ QString filename = QFileDialog::getSaveFileName(this, tr("Backup Wallet"), saveDir, tr("Wallet Data (*.dat)"));
+ if (!filename.isEmpty()) {
+ if (!walletModel->backupWallet(filename)) {
+ gui->message(tr("Backup Failed"), tr("There was an error trying to save the wallet data to the new location."),
+ CClientUIInterface::MSG_ERROR);
+ }
+ else
+ gui->message(tr("Backup Successful"), tr("The wallet data was successfully saved to the new location."),
+ CClientUIInterface::MSG_INFORMATION);
+ }
+}
+
+void WalletView::changePassphrase()
+{
+ AskPassphraseDialog dlg(AskPassphraseDialog::ChangePass, this);
+ dlg.setModel(walletModel);
+ dlg.exec();
+}
+
+void WalletView::unlockWallet()
+{
+ if(!walletModel)
+ return;
+ // Unlock wallet when requested by wallet model
+ if (walletModel->getEncryptionStatus() == WalletModel::Locked)
+ {
+ AskPassphraseDialog dlg(AskPassphraseDialog::Unlock, this);
+ dlg.setModel(walletModel);
+ dlg.exec();
+ }
+}
diff --git a/src/qt/walletview.h b/src/qt/walletview.h
new file mode 100644
index 0000000000..6bcd70baf9
--- /dev/null
+++ b/src/qt/walletview.h
@@ -0,0 +1,104 @@
+/*
+ * Qt4 bitcoin GUI.
+ *
+ * W.J. van der Laan 2011-2012
+ * The Bitcoin Developers 2011-2013
+ */
+#ifndef WALLETVIEW_H
+#define WALLETVIEW_H
+
+#include <QStackedWidget>
+
+class BitcoinGUI;
+class ClientModel;
+class WalletModel;
+class TransactionView;
+class OverviewPage;
+class AddressBookPage;
+class SendCoinsDialog;
+class SignVerifyMessageDialog;
+class RPCConsole;
+
+QT_BEGIN_NAMESPACE
+class QLabel;
+class QModelIndex;
+QT_END_NAMESPACE
+
+/*
+ WalletView class. This class represents the view to a single wallet.
+ It was added to support multiple wallet functionality. Each wallet gets its own WalletView instance.
+ It communicates with both the client and the wallet models to give the user an up-to-date view of the
+ current core state.
+*/
+class WalletView : public QStackedWidget
+{
+ Q_OBJECT
+
+public:
+ explicit WalletView(QWidget *parent, BitcoinGUI *_gui);
+ ~WalletView();
+
+ void setBitcoinGUI(BitcoinGUI *gui);
+ /** Set the client model.
+ The client model represents the part of the core that communicates with the P2P network, and is wallet-agnostic.
+ */
+ void setClientModel(ClientModel *clientModel);
+ /** Set the wallet model.
+ The wallet model represents a bitcoin wallet, and offers access to the list of transactions, address book and sending
+ functionality.
+ */
+ void setWalletModel(WalletModel *walletModel);
+
+ bool handleURI(const QString &uri);
+
+ void showOutOfSyncWarning(bool fShow);
+
+private:
+ BitcoinGUI *gui;
+ ClientModel *clientModel;
+ WalletModel *walletModel;
+
+ OverviewPage *overviewPage;
+ QWidget *transactionsPage;
+ AddressBookPage *addressBookPage;
+ AddressBookPage *receiveCoinsPage;
+ SendCoinsDialog *sendCoinsPage;
+ SignVerifyMessageDialog *signVerifyMessageDialog;
+
+ TransactionView *transactionView;
+
+public slots:
+ /** Switch to overview (home) page */
+ void gotoOverviewPage();
+ /** Switch to history (transactions) page */
+ void gotoHistoryPage();
+ /** Switch to address book page */
+ void gotoAddressBookPage();
+ /** Switch to receive coins page */
+ void gotoReceiveCoinsPage();
+ /** Switch to send coins page */
+ void gotoSendCoinsPage(QString addr = "");
+
+ /** Show Sign/Verify Message dialog and switch to sign message tab */
+ void gotoSignMessageTab(QString addr = "");
+ /** Show Sign/Verify Message dialog and switch to verify message tab */
+ void gotoVerifyMessageTab(QString addr = "");
+
+ /** Show incoming transaction notification for new transactions.
+
+ The new items are those between start and end inclusive, under the given parent item.
+ */
+ void incomingTransaction(const QModelIndex& parent, int start, int /*end*/);
+ /** Encrypt the wallet */
+ void encryptWallet(bool status);
+ /** Backup the wallet */
+ void backupWallet();
+ /** Change encrypted wallet passphrase */
+ void changePassphrase();
+ /** Ask for passphrase to unlock wallet temporarily */
+ void unlockWallet();
+
+ void setEncryptionStatus();
+};
+
+#endif // WALLETVIEW_H
diff --git a/src/rpcnet.cpp b/src/rpcnet.cpp
index 4db3be9319..e37b3009dd 100644
--- a/src/rpcnet.cpp
+++ b/src/rpcnet.cpp
@@ -55,7 +55,6 @@ Value getpeerinfo(const Array& params, bool fHelp)
obj.push_back(Pair("version", stats.nVersion));
obj.push_back(Pair("subver", stats.strSubVer));
obj.push_back(Pair("inbound", stats.fInbound));
- obj.push_back(Pair("releasetime", (boost::int64_t)stats.nReleaseTime));
obj.push_back(Pair("startingheight", stats.nStartingHeight));
obj.push_back(Pair("banscore", stats.nMisbehavior));
diff --git a/src/rpcrawtransaction.cpp b/src/rpcrawtransaction.cpp
index bbaf40c735..fb9811b921 100644
--- a/src/rpcrawtransaction.cpp
+++ b/src/rpcrawtransaction.cpp
@@ -225,6 +225,13 @@ Value listunspent(const Array& params, bool fHelp)
Object entry;
entry.push_back(Pair("txid", out.tx->GetHash().GetHex()));
entry.push_back(Pair("vout", out.i));
+ CTxDestination address;
+ if (ExtractDestination(out.tx->vout[out.i].scriptPubKey, address))
+ {
+ entry.push_back(Pair("address", CBitcoinAddress(address).ToString()));
+ if (pwalletMain->mapAddressBook.count(address))
+ entry.push_back(Pair("account", pwalletMain->mapAddressBook[address]));
+ }
entry.push_back(Pair("scriptPubKey", HexStr(pk.begin(), pk.end())));
if (pk.IsPayToScriptHash())
{
diff --git a/src/rpcwallet.cpp b/src/rpcwallet.cpp
index 90a68f560a..9a899f9238 100644
--- a/src/rpcwallet.cpp
+++ b/src/rpcwallet.cpp
@@ -75,6 +75,7 @@ Value getinfo(const Array& params, bool fHelp)
obj.push_back(Pair("walletversion", pwalletMain->GetVersion()));
obj.push_back(Pair("balance", ValueFromAmount(pwalletMain->GetBalance())));
obj.push_back(Pair("blocks", (int)nBestHeight));
+ obj.push_back(Pair("timeoffset", (boost::int64_t)GetTimeOffset()));
obj.push_back(Pair("connections", (int)vNodes.size()));
obj.push_back(Pair("proxy", (proxy.first.IsValid() ? proxy.first.ToStringIPPort() : string())));
obj.push_back(Pair("difficulty", (double)GetDifficulty()));
@@ -519,12 +520,12 @@ Value getbalance(const Array& params, bool fHelp)
if (params[0].get_str() == "*") {
// Calculate total balance a different way from GetBalance()
// (GetBalance() sums up all unspent TxOuts)
- // getbalance and getbalance '*' should always return the same number.
+ // getbalance and getbalance '*' 0 should return the same number
int64 nBalance = 0;
for (map<uint256, CWalletTx>::iterator it = pwalletMain->mapWallet.begin(); it != pwalletMain->mapWallet.end(); ++it)
{
const CWalletTx& wtx = (*it).second;
- if (!wtx.IsFinal())
+ if (!wtx.IsConfirmed())
continue;
int64 allFee;
@@ -1288,7 +1289,7 @@ void ThreadCleanWalletPassphrase(void* parg)
break;
LEAVE_CRITICAL_SECTION(cs_nWalletUnlockTime);
- Sleep(nToSleep);
+ MilliSleep(nToSleep);
ENTER_CRITICAL_SECTION(cs_nWalletUnlockTime);
} while(1);
diff --git a/src/serialize.h b/src/serialize.h
index f2626281c1..e3d9939bcc 100644
--- a/src/serialize.h
+++ b/src/serialize.h
@@ -789,6 +789,7 @@ struct ser_streamplaceholder
+typedef std::vector<char, zero_after_free_allocator<char> > CSerializeData;
/** Double ended buffer combining vector and stream-like interfaces.
*
@@ -798,7 +799,7 @@ struct ser_streamplaceholder
class CDataStream
{
protected:
- typedef std::vector<char, zero_after_free_allocator<char> > vector_type;
+ typedef CSerializeData vector_type;
vector_type vch;
unsigned int nReadPos;
short state;
@@ -1095,6 +1096,11 @@ public:
::Unserialize(*this, obj, nType, nVersion);
return (*this);
}
+
+ void GetAndClear(CSerializeData &data) {
+ vch.swap(data);
+ CSerializeData().swap(vch);
+ }
};
diff --git a/src/test/alert_tests.cpp b/src/test/alert_tests.cpp
new file mode 100644
index 0000000000..f7a11376d3
--- /dev/null
+++ b/src/test/alert_tests.cpp
@@ -0,0 +1,185 @@
+//
+// Unit tests for alert system
+//
+
+#include <boost/foreach.hpp>
+#include <boost/test/unit_test.hpp>
+#include <fstream>
+
+#include "alert.h"
+#include "serialize.h"
+#include "util.h"
+
+#if 0
+//
+// alertTests contains 7 alerts, generated with this code:
+// (SignAndSave code not shown, alert signing key is secret)
+//
+{
+ CAlert alert;
+ alert.nRelayUntil = 60;
+ alert.nExpiration = 24 * 60 * 60;
+ alert.nID = 1;
+ alert.nCancel = 0; // cancels previous messages up to this ID number
+ alert.nMinVer = 0; // These versions are protocol versions
+ alert.nMaxVer = 70001;
+ alert.nPriority = 1;
+ alert.strComment = "Alert comment";
+ alert.strStatusBar = "Alert 1";
+
+ SignAndSave(alert, "test/alertTests");
+
+ alert.setSubVer.insert(std::string("/Satoshi:0.1.0/"));
+ alert.strStatusBar = "Alert 1 for Satoshi 0.1.0";
+ SignAndSave(alert, "test/alertTests");
+
+ alert.setSubVer.insert(std::string("/Satoshi:0.2.0/"));
+ alert.strStatusBar = "Alert 1 for Satoshi 0.1.0, 0.2.0";
+ SignAndSave(alert, "test/alertTests");
+
+ alert.setSubVer.clear();
+ ++alert.nID;
+ alert.nCancel = 1;
+ alert.nPriority = 100;
+ alert.strStatusBar = "Alert 2, cancels 1";
+ SignAndSave(alert, "test/alertTests");
+
+ alert.nExpiration += 60;
+ ++alert.nID;
+ SignAndSave(alert, "test/alertTests");
+
+ ++alert.nID;
+ alert.nMinVer = 11;
+ alert.nMaxVer = 22;
+ SignAndSave(alert, "test/alertTests");
+
+ ++alert.nID;
+ alert.strStatusBar = "Alert 2 for Satoshi 0.1.0";
+ alert.setSubVer.insert(std::string("/Satoshi:0.1.0/"));
+ SignAndSave(alert, "test/alertTests");
+
+ ++alert.nID;
+ alert.nMinVer = 0;
+ alert.nMaxVer = 999999;
+ alert.strStatusBar = "Evil Alert'; /bin/ls; echo '";
+ alert.setSubVer.clear();
+ SignAndSave(alert, "test/alertTests");
+}
+#endif
+
+struct ReadAlerts
+{
+ ReadAlerts()
+ {
+ std::string filename("alertTests");
+ namespace fs = boost::filesystem;
+ fs::path testFile = fs::current_path() / "test" / "data" / filename;
+#ifdef TEST_DATA_DIR
+ if (!fs::exists(testFile))
+ {
+ testFile = fs::path(BOOST_PP_STRINGIZE(TEST_DATA_DIR)) / filename;
+ }
+#endif
+ FILE* fp = fopen(testFile.string().c_str(), "rb");
+ if (!fp) return;
+
+
+ CAutoFile filein = CAutoFile(fp, SER_DISK, CLIENT_VERSION);
+ if (!filein) return;
+
+ try {
+ while (!feof(filein))
+ {
+ CAlert alert;
+ filein >> alert;
+ alerts.push_back(alert);
+ }
+ }
+ catch (std::exception) { }
+ }
+ ~ReadAlerts() { }
+
+ static std::vector<std::string> read_lines(boost::filesystem::path filepath)
+ {
+ std::vector<std::string> result;
+
+ std::ifstream f(filepath.string().c_str());
+ std::string line;
+ while (std::getline(f,line))
+ result.push_back(line);
+
+ return result;
+ }
+
+ std::vector<CAlert> alerts;
+};
+
+BOOST_FIXTURE_TEST_SUITE(Alert_tests, ReadAlerts)
+
+
+BOOST_AUTO_TEST_CASE(AlertApplies)
+{
+ SetMockTime(11);
+
+ BOOST_FOREACH(const CAlert& alert, alerts)
+ {
+ BOOST_CHECK(alert.CheckSignature());
+ }
+ // Matches:
+ BOOST_CHECK(alerts[0].AppliesTo(1, ""));
+ BOOST_CHECK(alerts[0].AppliesTo(70001, ""));
+ BOOST_CHECK(alerts[0].AppliesTo(1, "/Satoshi:11.11.11/"));
+
+ BOOST_CHECK(alerts[1].AppliesTo(1, "/Satoshi:0.1.0/"));
+ BOOST_CHECK(alerts[1].AppliesTo(70001, "/Satoshi:0.1.0/"));
+
+ BOOST_CHECK(alerts[2].AppliesTo(1, "/Satoshi:0.1.0/"));
+ BOOST_CHECK(alerts[2].AppliesTo(1, "/Satoshi:0.2.0/"));
+
+ // Don't match:
+ BOOST_CHECK(!alerts[0].AppliesTo(-1, ""));
+ BOOST_CHECK(!alerts[0].AppliesTo(70002, ""));
+
+ BOOST_CHECK(!alerts[1].AppliesTo(1, ""));
+ BOOST_CHECK(!alerts[1].AppliesTo(1, "Satoshi:0.1.0"));
+ BOOST_CHECK(!alerts[1].AppliesTo(1, "/Satoshi:0.1.0"));
+ BOOST_CHECK(!alerts[1].AppliesTo(1, "Satoshi:0.1.0/"));
+ BOOST_CHECK(!alerts[1].AppliesTo(-1, "/Satoshi:0.1.0/"));
+ BOOST_CHECK(!alerts[1].AppliesTo(70002, "/Satoshi:0.1.0/"));
+ BOOST_CHECK(!alerts[1].AppliesTo(1, "/Satoshi:0.2.0/"));
+
+ BOOST_CHECK(!alerts[2].AppliesTo(1, "/Satoshi:0.3.0/"));
+
+ SetMockTime(0);
+}
+
+
+// This uses sh 'echo' to test the -alertnotify function, writing to a
+// /tmp file. So skip it on Windows:
+#ifndef WIN32
+BOOST_AUTO_TEST_CASE(AlertNotify)
+{
+ SetMockTime(11);
+
+ boost::filesystem::path temp = GetTempPath() / "alertnotify.txt";
+ boost::filesystem::remove(temp);
+
+ mapArgs["-alertnotify"] = std::string("echo %s >> ") + temp.string();
+
+ BOOST_FOREACH(CAlert alert, alerts)
+ alert.ProcessAlert(false);
+
+ std::vector<std::string> r = read_lines(temp);
+ BOOST_CHECK_EQUAL(r.size(), 4u);
+ BOOST_CHECK_EQUAL(r[0], "Alert 1");
+ BOOST_CHECK_EQUAL(r[1], "Alert 2, cancels 1");
+ BOOST_CHECK_EQUAL(r[2], "Alert 2, cancels 1");
+ BOOST_CHECK_EQUAL(r[3], "Evil Alert; /bin/ls; echo "); // single-quotes should be removed
+
+ boost::filesystem::remove(temp);
+
+ SetMockTime(0);
+}
+#endif
+
+BOOST_AUTO_TEST_SUITE_END()
diff --git a/src/test/bignum_tests.cpp b/src/test/bignum_tests.cpp
index 5b898d1499..196b7274f4 100644
--- a/src/test/bignum_tests.cpp
+++ b/src/test/bignum_tests.cpp
@@ -128,51 +128,51 @@ BOOST_AUTO_TEST_CASE(bignum_SetCompact)
CBigNum num;
num.SetCompact(0);
BOOST_CHECK_EQUAL(num.GetHex(), "0");
- BOOST_CHECK_EQUAL(num.GetCompact(), 0);
+ BOOST_CHECK_EQUAL(num.GetCompact(), 0U);
num.SetCompact(0x00123456);
BOOST_CHECK_EQUAL(num.GetHex(), "0");
- BOOST_CHECK_EQUAL(num.GetCompact(), 0);
+ BOOST_CHECK_EQUAL(num.GetCompact(), 0U);
num.SetCompact(0x01123456);
BOOST_CHECK_EQUAL(num.GetHex(), "12");
- BOOST_CHECK_EQUAL(num.GetCompact(), 0x01120000);
+ BOOST_CHECK_EQUAL(num.GetCompact(), 0x01120000U);
// Make sure that we don't generate compacts with the 0x00800000 bit set
num = 0x80;
- BOOST_CHECK_EQUAL(num.GetCompact(), 0x02008000);
+ BOOST_CHECK_EQUAL(num.GetCompact(), 0x02008000U);
num.SetCompact(0x01fedcba);
BOOST_CHECK_EQUAL(num.GetHex(), "-7e");
- BOOST_CHECK_EQUAL(num.GetCompact(), 0x01fe0000);
+ BOOST_CHECK_EQUAL(num.GetCompact(), 0x01fe0000U);
num.SetCompact(0x02123456);
BOOST_CHECK_EQUAL(num.GetHex(), "1234");
- BOOST_CHECK_EQUAL(num.GetCompact(), 0x02123400);
+ BOOST_CHECK_EQUAL(num.GetCompact(), 0x02123400U);
num.SetCompact(0x03123456);
BOOST_CHECK_EQUAL(num.GetHex(), "123456");
- BOOST_CHECK_EQUAL(num.GetCompact(), 0x03123456);
+ BOOST_CHECK_EQUAL(num.GetCompact(), 0x03123456U);
num.SetCompact(0x04123456);
BOOST_CHECK_EQUAL(num.GetHex(), "12345600");
- BOOST_CHECK_EQUAL(num.GetCompact(), 0x04123456);
+ BOOST_CHECK_EQUAL(num.GetCompact(), 0x04123456U);
num.SetCompact(0x04923456);
BOOST_CHECK_EQUAL(num.GetHex(), "-12345600");
- BOOST_CHECK_EQUAL(num.GetCompact(), 0x04923456);
+ BOOST_CHECK_EQUAL(num.GetCompact(), 0x04923456U);
num.SetCompact(0x05009234);
BOOST_CHECK_EQUAL(num.GetHex(), "92340000");
- BOOST_CHECK_EQUAL(num.GetCompact(), 0x05009234);
+ BOOST_CHECK_EQUAL(num.GetCompact(), 0x05009234U);
num.SetCompact(0x20123456);
BOOST_CHECK_EQUAL(num.GetHex(), "1234560000000000000000000000000000000000000000000000000000000000");
- BOOST_CHECK_EQUAL(num.GetCompact(), 0x20123456);
+ BOOST_CHECK_EQUAL(num.GetCompact(), 0x20123456U);
num.SetCompact(0xff123456);
BOOST_CHECK_EQUAL(num.GetHex(), "123456000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000");
- BOOST_CHECK_EQUAL(num.GetCompact(), 0xff123456);
+ BOOST_CHECK_EQUAL(num.GetCompact(), 0xff123456U);
}
BOOST_AUTO_TEST_SUITE_END()
diff --git a/src/test/checkblock_tests.cpp b/src/test/checkblock_tests.cpp
new file mode 100644
index 0000000000..3cfb6dbfa4
--- /dev/null
+++ b/src/test/checkblock_tests.cpp
@@ -0,0 +1,66 @@
+//
+// Unit tests for block.CheckBlock()
+//
+#include <algorithm>
+
+#include <boost/assign/list_of.hpp> // for 'map_list_of()'
+#include <boost/date_time/posix_time/posix_time_types.hpp>
+#include <boost/test/unit_test.hpp>
+#include <boost/foreach.hpp>
+
+#include "main.h"
+#include "wallet.h"
+#include "net.h"
+#include "util.h"
+
+BOOST_AUTO_TEST_SUITE(CheckBlock_tests)
+
+bool
+read_block(const std::string& filename, CBlock& block)
+{
+ namespace fs = boost::filesystem;
+ fs::path testFile = fs::current_path() / "test" / "data" / filename;
+#ifdef TEST_DATA_DIR
+ if (!fs::exists(testFile))
+ {
+ testFile = fs::path(BOOST_PP_STRINGIZE(TEST_DATA_DIR)) / filename;
+ }
+#endif
+ FILE* fp = fopen(testFile.string().c_str(), "rb");
+ if (!fp) return false;
+
+ fseek(fp, 8, SEEK_SET); // skip msgheader/size
+
+ CAutoFile filein = CAutoFile(fp, SER_DISK, CLIENT_VERSION);
+ if (!filein) return false;
+
+ filein >> block;
+
+ return true;
+}
+
+BOOST_AUTO_TEST_CASE(May15)
+{
+ // Putting a 1MB binary file in the git repository is not a great
+ // idea, so this test is only run if you manually download
+ // test/data/Mar12Fork.dat from
+ // http://sourceforge.net/projects/bitcoin/files/Bitcoin/blockchain/Mar12Fork.dat/download
+ unsigned int tMay15 = 1368576000;
+ SetMockTime(tMay15); // Test as if it was right at May 15
+
+ CBlock forkingBlock;
+ if (read_block("Mar12Fork.dat", forkingBlock))
+ {
+ CValidationState state;
+ forkingBlock.nTime = tMay15-1; // Invalidates PoW
+ BOOST_CHECK(!forkingBlock.CheckBlock(state, false, false));
+
+ // After May 15'th, big blocks are OK:
+ forkingBlock.nTime = tMay15; // Invalidates PoW
+ BOOST_CHECK(forkingBlock.CheckBlock(state, false, false));
+ }
+
+ SetMockTime(0);
+}
+
+BOOST_AUTO_TEST_SUITE_END()
diff --git a/src/test/data/alertTests b/src/test/data/alertTests
new file mode 100644
index 0000000000..7fc4528961
--- /dev/null
+++ b/src/test/data/alertTests
Binary files differ
diff --git a/src/test/data/script_invalid.json b/src/test/data/script_invalid.json
index d413eaee8d..95664226c5 100644
--- a/src/test/data/script_invalid.json
+++ b/src/test/data/script_invalid.json
@@ -39,6 +39,9 @@
["1", "RETURN"],
["1", "DUP IF RETURN ENDIF"],
+["1", "RETURN 'data'", "canonical prunable txout format"],
+["0 IF", "RETURN ENDIF 1", "still prunable because IF/ENDIF can't span scriptSig/scriptPubKey"],
+
["0", "VERIFY 1"],
["1", "VERIFY"],
["1", "VERIFY 0"],
@@ -128,13 +131,79 @@
["'NOP_1_to_10' NOP1 NOP2 NOP3 NOP4 NOP5 NOP6 NOP7 NOP8 NOP9 NOP10","'NOP_1_to_11' EQUAL"],
["0x50","1", "opcode 0x50 is reserved"],
-["1", "IF 0xba ELSE 1 ENDIF", "opcodes above NOP10 invalid"],
+["1", "IF 0xba ELSE 1 ENDIF", "opcodes above NOP10 invalid if executed"],
+["1", "IF 0xbb ELSE 1 ENDIF"],
+["1", "IF 0xbc ELSE 1 ENDIF"],
+["1", "IF 0xbd ELSE 1 ENDIF"],
+["1", "IF 0xbe ELSE 1 ENDIF"],
+["1", "IF 0xbf ELSE 1 ENDIF"],
["1", "IF 0xc0 ELSE 1 ENDIF"],
+["1", "IF 0xc1 ELSE 1 ENDIF"],
+["1", "IF 0xc2 ELSE 1 ENDIF"],
+["1", "IF 0xc3 ELSE 1 ENDIF"],
+["1", "IF 0xc4 ELSE 1 ENDIF"],
+["1", "IF 0xc5 ELSE 1 ENDIF"],
+["1", "IF 0xc6 ELSE 1 ENDIF"],
+["1", "IF 0xc7 ELSE 1 ENDIF"],
+["1", "IF 0xc8 ELSE 1 ENDIF"],
+["1", "IF 0xc9 ELSE 1 ENDIF"],
+["1", "IF 0xca ELSE 1 ENDIF"],
+["1", "IF 0xcb ELSE 1 ENDIF"],
+["1", "IF 0xcc ELSE 1 ENDIF"],
+["1", "IF 0xcd ELSE 1 ENDIF"],
+["1", "IF 0xce ELSE 1 ENDIF"],
+["1", "IF 0xcf ELSE 1 ENDIF"],
+["1", "IF 0xd0 ELSE 1 ENDIF"],
["1", "IF 0xd1 ELSE 1 ENDIF"],
+["1", "IF 0xd2 ELSE 1 ENDIF"],
+["1", "IF 0xd3 ELSE 1 ENDIF"],
+["1", "IF 0xd4 ELSE 1 ENDIF"],
+["1", "IF 0xd5 ELSE 1 ENDIF"],
+["1", "IF 0xd6 ELSE 1 ENDIF"],
+["1", "IF 0xd7 ELSE 1 ENDIF"],
+["1", "IF 0xd8 ELSE 1 ENDIF"],
+["1", "IF 0xd9 ELSE 1 ENDIF"],
+["1", "IF 0xda ELSE 1 ENDIF"],
+["1", "IF 0xdb ELSE 1 ENDIF"],
+["1", "IF 0xdc ELSE 1 ENDIF"],
+["1", "IF 0xdd ELSE 1 ENDIF"],
+["1", "IF 0xde ELSE 1 ENDIF"],
+["1", "IF 0xdf ELSE 1 ENDIF"],
+["1", "IF 0xe0 ELSE 1 ENDIF"],
+["1", "IF 0xe1 ELSE 1 ENDIF"],
+["1", "IF 0xe2 ELSE 1 ENDIF"],
+["1", "IF 0xe3 ELSE 1 ENDIF"],
+["1", "IF 0xe4 ELSE 1 ENDIF"],
+["1", "IF 0xe5 ELSE 1 ENDIF"],
+["1", "IF 0xe6 ELSE 1 ENDIF"],
+["1", "IF 0xe7 ELSE 1 ENDIF"],
+["1", "IF 0xe8 ELSE 1 ENDIF"],
+["1", "IF 0xe9 ELSE 1 ENDIF"],
+["1", "IF 0xea ELSE 1 ENDIF"],
+["1", "IF 0xeb ELSE 1 ENDIF"],
+["1", "IF 0xec ELSE 1 ENDIF"],
+["1", "IF 0xed ELSE 1 ENDIF"],
["1", "IF 0xee ELSE 1 ENDIF"],
+["1", "IF 0xef ELSE 1 ENDIF"],
+["1", "IF 0xf0 ELSE 1 ENDIF"],
+["1", "IF 0xf1 ELSE 1 ENDIF"],
+["1", "IF 0xf2 ELSE 1 ENDIF"],
+["1", "IF 0xf3 ELSE 1 ENDIF"],
+["1", "IF 0xf4 ELSE 1 ENDIF"],
+["1", "IF 0xf5 ELSE 1 ENDIF"],
+["1", "IF 0xf6 ELSE 1 ENDIF"],
+["1", "IF 0xf7 ELSE 1 ENDIF"],
+["1", "IF 0xf8 ELSE 1 ENDIF"],
+["1", "IF 0xf9 ELSE 1 ENDIF"],
+["1", "IF 0xfa ELSE 1 ENDIF"],
+["1", "IF 0xfb ELSE 1 ENDIF"],
+["1", "IF 0xfc ELSE 1 ENDIF"],
["1", "IF 0xfd ELSE 1 ENDIF"],
+["1", "IF 0xfe ELSE 1 ENDIF"],
["1", "IF 0xff ELSE 1 ENDIF"],
+["1 IF 1 ELSE", "0xff ENDIF", "invalid because scriptSig and scriptPubKey are processed separately"],
+
["NOP", "RIPEMD160"],
["NOP", "SHA1"],
["NOP", "SHA256"],
diff --git a/src/test/data/script_valid.json b/src/test/data/script_valid.json
index c33a3c7c66..58682d3875 100644
--- a/src/test/data/script_valid.json
+++ b/src/test/data/script_valid.json
@@ -34,6 +34,8 @@
["1 0", "NOTIF IF 1 ELSE 0 ENDIF ELSE IF 0 ELSE 1 ENDIF ENDIF"],
["0 1", "NOTIF IF 1 ELSE 0 ENDIF ELSE IF 0 ELSE 1 ENDIF ENDIF"],
+["0", "IF RETURN ENDIF 1", "RETURN only works if executed"],
+
["1 1", "VERIFY"],
["10 0 11 TOALTSTACK DROP FROMALTSTACK", "ADD 21 EQUAL"],
@@ -188,10 +190,74 @@
["'NOP_1_to_10' NOP1 NOP2 NOP3 NOP4 NOP5 NOP6 NOP7 NOP8 NOP9 NOP10","'NOP_1_to_10' EQUAL"],
["0", "IF 0xba ELSE 1 ENDIF", "opcodes above NOP10 invalid if executed"],
+["0", "IF 0xbb ELSE 1 ENDIF"],
+["0", "IF 0xbc ELSE 1 ENDIF"],
+["0", "IF 0xbd ELSE 1 ENDIF"],
+["0", "IF 0xbe ELSE 1 ENDIF"],
+["0", "IF 0xbf ELSE 1 ENDIF"],
["0", "IF 0xc0 ELSE 1 ENDIF"],
+["0", "IF 0xc1 ELSE 1 ENDIF"],
+["0", "IF 0xc2 ELSE 1 ENDIF"],
+["0", "IF 0xc3 ELSE 1 ENDIF"],
+["0", "IF 0xc4 ELSE 1 ENDIF"],
+["0", "IF 0xc5 ELSE 1 ENDIF"],
+["0", "IF 0xc6 ELSE 1 ENDIF"],
+["0", "IF 0xc7 ELSE 1 ENDIF"],
+["0", "IF 0xc8 ELSE 1 ENDIF"],
+["0", "IF 0xc9 ELSE 1 ENDIF"],
+["0", "IF 0xca ELSE 1 ENDIF"],
+["0", "IF 0xcb ELSE 1 ENDIF"],
+["0", "IF 0xcc ELSE 1 ENDIF"],
+["0", "IF 0xcd ELSE 1 ENDIF"],
+["0", "IF 0xce ELSE 1 ENDIF"],
+["0", "IF 0xcf ELSE 1 ENDIF"],
+["0", "IF 0xd0 ELSE 1 ENDIF"],
["0", "IF 0xd1 ELSE 1 ENDIF"],
+["0", "IF 0xd2 ELSE 1 ENDIF"],
+["0", "IF 0xd3 ELSE 1 ENDIF"],
+["0", "IF 0xd4 ELSE 1 ENDIF"],
+["0", "IF 0xd5 ELSE 1 ENDIF"],
+["0", "IF 0xd6 ELSE 1 ENDIF"],
+["0", "IF 0xd7 ELSE 1 ENDIF"],
+["0", "IF 0xd8 ELSE 1 ENDIF"],
+["0", "IF 0xd9 ELSE 1 ENDIF"],
+["0", "IF 0xda ELSE 1 ENDIF"],
+["0", "IF 0xdb ELSE 1 ENDIF"],
+["0", "IF 0xdc ELSE 1 ENDIF"],
+["0", "IF 0xdd ELSE 1 ENDIF"],
+["0", "IF 0xde ELSE 1 ENDIF"],
+["0", "IF 0xdf ELSE 1 ENDIF"],
+["0", "IF 0xe0 ELSE 1 ENDIF"],
+["0", "IF 0xe1 ELSE 1 ENDIF"],
+["0", "IF 0xe2 ELSE 1 ENDIF"],
+["0", "IF 0xe3 ELSE 1 ENDIF"],
+["0", "IF 0xe4 ELSE 1 ENDIF"],
+["0", "IF 0xe5 ELSE 1 ENDIF"],
+["0", "IF 0xe6 ELSE 1 ENDIF"],
+["0", "IF 0xe7 ELSE 1 ENDIF"],
+["0", "IF 0xe8 ELSE 1 ENDIF"],
+["0", "IF 0xe9 ELSE 1 ENDIF"],
+["0", "IF 0xea ELSE 1 ENDIF"],
+["0", "IF 0xeb ELSE 1 ENDIF"],
+["0", "IF 0xec ELSE 1 ENDIF"],
+["0", "IF 0xed ELSE 1 ENDIF"],
["0", "IF 0xee ELSE 1 ENDIF"],
+["0", "IF 0xef ELSE 1 ENDIF"],
+["0", "IF 0xf0 ELSE 1 ENDIF"],
+["0", "IF 0xf1 ELSE 1 ENDIF"],
+["0", "IF 0xf2 ELSE 1 ENDIF"],
+["0", "IF 0xf3 ELSE 1 ENDIF"],
+["0", "IF 0xf4 ELSE 1 ENDIF"],
+["0", "IF 0xf5 ELSE 1 ENDIF"],
+["0", "IF 0xf6 ELSE 1 ENDIF"],
+["0", "IF 0xf7 ELSE 1 ENDIF"],
+["0", "IF 0xf8 ELSE 1 ENDIF"],
+["0", "IF 0xf9 ELSE 1 ENDIF"],
+["0", "IF 0xfa ELSE 1 ENDIF"],
+["0", "IF 0xfb ELSE 1 ENDIF"],
+["0", "IF 0xfc ELSE 1 ENDIF"],
["0", "IF 0xfd ELSE 1 ENDIF"],
+["0", "IF 0xfe ELSE 1 ENDIF"],
["0", "IF 0xff ELSE 1 ENDIF"],
["NOP",
diff --git a/src/test/multisig_tests.cpp b/src/test/multisig_tests.cpp
index 7297bb9a75..d6f836d367 100644
--- a/src/test/multisig_tests.cpp
+++ b/src/test/multisig_tests.cpp
@@ -216,7 +216,7 @@ BOOST_AUTO_TEST_CASE(multisig_Solver1)
CScript s;
s << OP_2 << key[0].GetPubKey() << key[1].GetPubKey() << OP_2 << OP_CHECKMULTISIG;
BOOST_CHECK(Solver(s, whichType, solutions));
- BOOST_CHECK_EQUAL(solutions.size(), 4);
+ BOOST_CHECK_EQUAL(solutions.size(), 4U);
CTxDestination addr;
BOOST_CHECK(!ExtractDestination(s, addr));
BOOST_CHECK(IsMine(keystore, s));
@@ -229,7 +229,7 @@ BOOST_AUTO_TEST_CASE(multisig_Solver1)
CScript s;
s << OP_1 << key[0].GetPubKey() << key[1].GetPubKey() << OP_2 << OP_CHECKMULTISIG;
BOOST_CHECK(Solver(s, whichType, solutions));
- BOOST_CHECK_EQUAL(solutions.size(), 4);
+ BOOST_CHECK_EQUAL(solutions.size(), 4U);
vector<CTxDestination> addrs;
int nRequired;
BOOST_CHECK(ExtractDestinations(s, whichType, addrs, nRequired));
diff --git a/src/test/script_P2SH_tests.cpp b/src/test/script_P2SH_tests.cpp
index b5107193fd..3444726ca0 100644
--- a/src/test/script_P2SH_tests.cpp
+++ b/src/test/script_P2SH_tests.cpp
@@ -303,7 +303,7 @@ BOOST_AUTO_TEST_CASE(AreInputsStandard)
BOOST_CHECK(SignSignature(keystore, txFrom, txTo, 2));
BOOST_CHECK(txTo.AreInputsStandard(coins));
- BOOST_CHECK_EQUAL(txTo.GetP2SHSigOpCount(coins), 1);
+ BOOST_CHECK_EQUAL(txTo.GetP2SHSigOpCount(coins), 1U);
// Make sure adding crap to the scriptSigs makes them non-standard:
for (int i = 0; i < 3; i++)
@@ -327,7 +327,7 @@ BOOST_AUTO_TEST_CASE(AreInputsStandard)
txToNonStd.vin[1].scriptSig << OP_0 << Serialize(oneOfEleven);
BOOST_CHECK(!txToNonStd.AreInputsStandard(coins));
- BOOST_CHECK_EQUAL(txToNonStd.GetP2SHSigOpCount(coins), 11);
+ BOOST_CHECK_EQUAL(txToNonStd.GetP2SHSigOpCount(coins), 11U);
txToNonStd.vin[0].scriptSig.clear();
BOOST_CHECK(!txToNonStd.AreInputsStandard(coins));
diff --git a/src/test/serialize_tests.cpp b/src/test/serialize_tests.cpp
index 90ac89f8c5..19ffdcab66 100644
--- a/src/test/serialize_tests.cpp
+++ b/src/test/serialize_tests.cpp
@@ -29,13 +29,13 @@ BOOST_AUTO_TEST_CASE(varints)
// decode
for (int i = 0; i < 100000; i++) {
- int j;
+ int j = -1;
ss >> VARINT(j);
BOOST_CHECK_MESSAGE(i == j, "decoded:" << j << " expected:" << i);
}
for (uint64 i = 0; i < 100000000000ULL; i += 999999937) {
- uint64 j;
+ uint64 j = -1;
ss >> VARINT(j);
BOOST_CHECK_MESSAGE(i == j, "decoded:" << j << " expected:" << i);
}
diff --git a/src/test/sigopcount_tests.cpp b/src/test/sigopcount_tests.cpp
index 59673f9b3d..1762680adf 100644
--- a/src/test/sigopcount_tests.cpp
+++ b/src/test/sigopcount_tests.cpp
@@ -21,21 +21,21 @@ BOOST_AUTO_TEST_CASE(GetSigOpCount)
{
// Test CScript::GetSigOpCount()
CScript s1;
- BOOST_CHECK_EQUAL(s1.GetSigOpCount(false), 0);
- BOOST_CHECK_EQUAL(s1.GetSigOpCount(true), 0);
+ BOOST_CHECK_EQUAL(s1.GetSigOpCount(false), 0U);
+ BOOST_CHECK_EQUAL(s1.GetSigOpCount(true), 0U);
uint160 dummy;
s1 << OP_1 << dummy << dummy << OP_2 << OP_CHECKMULTISIG;
- BOOST_CHECK_EQUAL(s1.GetSigOpCount(true), 2);
+ BOOST_CHECK_EQUAL(s1.GetSigOpCount(true), 2U);
s1 << OP_IF << OP_CHECKSIG << OP_ENDIF;
- BOOST_CHECK_EQUAL(s1.GetSigOpCount(true), 3);
- BOOST_CHECK_EQUAL(s1.GetSigOpCount(false), 21);
+ BOOST_CHECK_EQUAL(s1.GetSigOpCount(true), 3U);
+ BOOST_CHECK_EQUAL(s1.GetSigOpCount(false), 21U);
CScript p2sh;
p2sh.SetDestination(s1.GetID());
CScript scriptSig;
scriptSig << OP_0 << Serialize(s1);
- BOOST_CHECK_EQUAL(p2sh.GetSigOpCount(scriptSig), 3);
+ BOOST_CHECK_EQUAL(p2sh.GetSigOpCount(scriptSig), 3U);
std::vector<CKey> keys;
for (int i = 0; i < 3; i++)
@@ -46,15 +46,15 @@ BOOST_AUTO_TEST_CASE(GetSigOpCount)
}
CScript s2;
s2.SetMultisig(1, keys);
- BOOST_CHECK_EQUAL(s2.GetSigOpCount(true), 3);
- BOOST_CHECK_EQUAL(s2.GetSigOpCount(false), 20);
+ BOOST_CHECK_EQUAL(s2.GetSigOpCount(true), 3U);
+ BOOST_CHECK_EQUAL(s2.GetSigOpCount(false), 20U);
p2sh.SetDestination(s2.GetID());
- BOOST_CHECK_EQUAL(p2sh.GetSigOpCount(true), 0);
- BOOST_CHECK_EQUAL(p2sh.GetSigOpCount(false), 0);
+ BOOST_CHECK_EQUAL(p2sh.GetSigOpCount(true), 0U);
+ BOOST_CHECK_EQUAL(p2sh.GetSigOpCount(false), 0U);
CScript scriptSig2;
scriptSig2 << OP_1 << dummy << dummy << Serialize(s2);
- BOOST_CHECK_EQUAL(p2sh.GetSigOpCount(scriptSig2), 3);
+ BOOST_CHECK_EQUAL(p2sh.GetSigOpCount(scriptSig2), 3U);
}
BOOST_AUTO_TEST_SUITE_END()
diff --git a/src/test/test_bitcoin.cpp b/src/test/test_bitcoin.cpp
index 1116507a34..1bf9a28acc 100644
--- a/src/test/test_bitcoin.cpp
+++ b/src/test/test_bitcoin.cpp
@@ -17,6 +17,7 @@ extern void noui_connect();
struct TestingSetup {
CCoinsViewDB *pcoinsdbview;
boost::filesystem::path pathTemp;
+ boost::thread_group threadGroup;
TestingSetup() {
fPrintToDebugger = true; // don't want to write to debug.log file
@@ -35,11 +36,12 @@ struct TestingSetup {
RegisterWallet(pwalletMain);
nScriptCheckThreads = 3;
for (int i=0; i < nScriptCheckThreads-1; i++)
- NewThread(ThreadScriptCheck, NULL);
+ threadGroup.create_thread(&ThreadScriptCheck);
}
~TestingSetup()
{
- ThreadScriptCheckQuit();
+ threadGroup.interrupt_all();
+ threadGroup.join_all();
delete pwalletMain;
pwalletMain = NULL;
delete pcoinsTip;
diff --git a/src/test/util_tests.cpp b/src/test/util_tests.cpp
index f56969cba6..2d05794cc7 100644
--- a/src/test/util_tests.cpp
+++ b/src/test/util_tests.cpp
@@ -261,4 +261,124 @@ BOOST_AUTO_TEST_CASE(util_IsHex)
BOOST_CHECK(!IsHex("0x0000"));
}
+BOOST_AUTO_TEST_CASE(util_seed_insecure_rand)
+{
+ // Expected results for the determinstic seed.
+ const uint32_t exp_vals[11] = { 91632771U,1889679809U,3842137544U,3256031132U,
+ 1761911779U, 489223532U,2692793790U,2737472863U,
+ 2796262275U,1309899767U,840571781U};
+ // Expected 0s in rand()%(idx+2) for the determinstic seed.
+ const int exp_count[9] = {5013,3346,2415,1972,1644,1386,1176,1096,1009};
+ int i;
+ int count=0;
+
+ seed_insecure_rand();
+
+ //Does the non-determistic rand give us results that look too like the determinstic one?
+ for (i=0;i<10;i++)
+ {
+ int match = 0;
+ uint32_t rval = insecure_rand();
+ for (int j=0;j<11;j++)match |= rval==exp_vals[j];
+ count += match;
+ }
+ // sum(binomial(10,i)*(11/(2^32))^i*(1-(11/(2^32)))^(10-i),i,0,4) ~= 1-1/2^134.73
+ // So _very_ unlikely to throw a false failure here.
+ BOOST_CHECK(count<=4);
+
+ for (int mod=2;mod<11;mod++)
+ {
+ int mask = 1;
+ // Really rough binomal confidence approximation.
+ int err = 30*10000./mod*sqrt((1./mod*(1-1./mod))/10000.);
+ //mask is 2^ceil(log2(mod))-1
+ while(mask<mod-1)mask=(mask<<1)+1;
+
+ count = 0;
+ //How often does it get a zero from the uniform range [0,mod)?
+ for (i=0;i<10000;i++)
+ {
+ uint32_t rval;
+ do{
+ rval=insecure_rand()&mask;
+ }while(rval>=(uint32_t)mod);
+ count += rval==0;
+ }
+ BOOST_CHECK(count<=10000/mod+err);
+ BOOST_CHECK(count>=10000/mod-err);
+ }
+
+ seed_insecure_rand(true);
+
+ for (i=0;i<11;i++)
+ {
+ BOOST_CHECK_EQUAL(insecure_rand(),exp_vals[i]);
+ }
+
+ for (int mod=2;mod<11;mod++)
+ {
+ count = 0;
+ for (i=0;i<10000;i++) count += insecure_rand()%mod==0;
+ BOOST_CHECK_EQUAL(count,exp_count[mod-2]);
+ }
+}
+
+static int nCounter = 0;
+
+static void Count()
+{
+ ++nCounter;
+ MilliSleep(10);
+}
+
+static void CountWithArg(int arg)
+{
+ nCounter += arg;
+ MilliSleep(10);
+}
+
+BOOST_AUTO_TEST_CASE(util_loop_forever1)
+{
+ boost::thread_group threadGroup;
+
+ threadGroup.create_thread(boost::bind(&LoopForever<void (*)()>, "count", &Count, 1));
+ MilliSleep(1);
+ threadGroup.interrupt_all();
+ BOOST_CHECK_EQUAL(nCounter, 1);
+ nCounter = 0;
+}
+
+BOOST_AUTO_TEST_CASE(util_loop_forever2)
+{
+ boost::thread_group threadGroup;
+
+ boost::function<void()> f = boost::bind(&CountWithArg, 11);
+ threadGroup.create_thread(boost::bind(&LoopForever<boost::function<void()> >, "count11", f, 11));
+ MilliSleep(1);
+ threadGroup.interrupt_all();
+ BOOST_CHECK_EQUAL(nCounter, 11);
+ nCounter = 0;
+}
+
+BOOST_AUTO_TEST_CASE(util_threadtrace1)
+{
+ boost::thread_group threadGroup;
+
+ threadGroup.create_thread(boost::bind(&TraceThread<void (*)()>, "count11", &Count));
+ threadGroup.join_all();
+ BOOST_CHECK_EQUAL(nCounter, 1);
+ nCounter = 0;
+}
+
+BOOST_AUTO_TEST_CASE(util_threadtrace2)
+{
+ boost::thread_group threadGroup;
+
+ boost::function<void()> f = boost::bind(&CountWithArg, 11);
+ threadGroup.create_thread(boost::bind(&TraceThread<boost::function<void()> >, "count11", f));
+ threadGroup.join_all();
+ BOOST_CHECK_EQUAL(nCounter, 11);
+ nCounter = 0;
+}
+
BOOST_AUTO_TEST_SUITE_END()
diff --git a/src/test/wallet_tests.cpp b/src/test/wallet_tests.cpp
index b0b3c47967..a4cbfaee41 100644
--- a/src/test/wallet_tests.cpp
+++ b/src/test/wallet_tests.cpp
@@ -104,22 +104,22 @@ BOOST_AUTO_TEST_CASE(coin_selection_tests)
// try making 34 cents from 1,2,5,10,20 - we can't do it exactly
BOOST_CHECK( wallet.SelectCoinsMinConf(34 * CENT, 1, 1, vCoins, setCoinsRet, nValueRet));
BOOST_CHECK_GT(nValueRet, 34 * CENT); // but should get more than 34 cents
- BOOST_CHECK_EQUAL(setCoinsRet.size(), 3); // the best should be 20+10+5. it's incredibly unlikely the 1 or 2 got included (but possible)
+ BOOST_CHECK_EQUAL(setCoinsRet.size(), 3U); // the best should be 20+10+5. it's incredibly unlikely the 1 or 2 got included (but possible)
// when we try making 7 cents, the smaller coins (1,2,5) are enough. We should see just 2+5
BOOST_CHECK( wallet.SelectCoinsMinConf( 7 * CENT, 1, 1, vCoins, setCoinsRet, nValueRet));
BOOST_CHECK_EQUAL(nValueRet, 7 * CENT);
- BOOST_CHECK_EQUAL(setCoinsRet.size(), 2);
+ BOOST_CHECK_EQUAL(setCoinsRet.size(), 2U);
// when we try making 8 cents, the smaller coins (1,2,5) are exactly enough.
BOOST_CHECK( wallet.SelectCoinsMinConf( 8 * CENT, 1, 1, vCoins, setCoinsRet, nValueRet));
BOOST_CHECK(nValueRet == 8 * CENT);
- BOOST_CHECK_EQUAL(setCoinsRet.size(), 3);
+ BOOST_CHECK_EQUAL(setCoinsRet.size(), 3U);
// when we try making 9 cents, no subset of smaller coins is enough, and we get the next bigger coin (10)
BOOST_CHECK( wallet.SelectCoinsMinConf( 9 * CENT, 1, 1, vCoins, setCoinsRet, nValueRet));
BOOST_CHECK_EQUAL(nValueRet, 10 * CENT);
- BOOST_CHECK_EQUAL(setCoinsRet.size(), 1);
+ BOOST_CHECK_EQUAL(setCoinsRet.size(), 1U);
// now clear out the wallet and start again to test choosing between subsets of smaller coins and the next biggest coin
empty_wallet();
@@ -137,26 +137,26 @@ BOOST_AUTO_TEST_CASE(coin_selection_tests)
// now try making 16 cents. the best smaller coins can do is 6+7+8 = 21; not as good at the next biggest coin, 20
BOOST_CHECK( wallet.SelectCoinsMinConf(16 * CENT, 1, 1, vCoins, setCoinsRet, nValueRet));
BOOST_CHECK_EQUAL(nValueRet, 20 * CENT); // we should get 20 in one coin
- BOOST_CHECK_EQUAL(setCoinsRet.size(), 1);
+ BOOST_CHECK_EQUAL(setCoinsRet.size(), 1U);
add_coin( 5*CENT); // now we have 5+6+7+8+20+30 = 75 cents total
// now if we try making 16 cents again, the smaller coins can make 5+6+7 = 18 cents, better than the next biggest coin, 20
BOOST_CHECK( wallet.SelectCoinsMinConf(16 * CENT, 1, 1, vCoins, setCoinsRet, nValueRet));
BOOST_CHECK_EQUAL(nValueRet, 18 * CENT); // we should get 18 in 3 coins
- BOOST_CHECK_EQUAL(setCoinsRet.size(), 3);
+ BOOST_CHECK_EQUAL(setCoinsRet.size(), 3U);
add_coin( 18*CENT); // now we have 5+6+7+8+18+20+30
// and now if we try making 16 cents again, the smaller coins can make 5+6+7 = 18 cents, the same as the next biggest coin, 18
BOOST_CHECK( wallet.SelectCoinsMinConf(16 * CENT, 1, 1, vCoins, setCoinsRet, nValueRet));
BOOST_CHECK_EQUAL(nValueRet, 18 * CENT); // we should get 18 in 1 coin
- BOOST_CHECK_EQUAL(setCoinsRet.size(), 1); // because in the event of a tie, the biggest coin wins
+ BOOST_CHECK_EQUAL(setCoinsRet.size(), 1U); // because in the event of a tie, the biggest coin wins
// now try making 11 cents. we should get 5+6
BOOST_CHECK( wallet.SelectCoinsMinConf(11 * CENT, 1, 1, vCoins, setCoinsRet, nValueRet));
BOOST_CHECK_EQUAL(nValueRet, 11 * CENT);
- BOOST_CHECK_EQUAL(setCoinsRet.size(), 2);
+ BOOST_CHECK_EQUAL(setCoinsRet.size(), 2U);
// check that the smallest bigger coin is used
add_coin( 1*COIN);
@@ -165,11 +165,11 @@ BOOST_AUTO_TEST_CASE(coin_selection_tests)
add_coin( 4*COIN); // now we have 5+6+7+8+18+20+30+100+200+300+400 = 1094 cents
BOOST_CHECK( wallet.SelectCoinsMinConf(95 * CENT, 1, 1, vCoins, setCoinsRet, nValueRet));
BOOST_CHECK_EQUAL(nValueRet, 1 * COIN); // we should get 1 BTC in 1 coin
- BOOST_CHECK_EQUAL(setCoinsRet.size(), 1);
+ BOOST_CHECK_EQUAL(setCoinsRet.size(), 1U);
BOOST_CHECK( wallet.SelectCoinsMinConf(195 * CENT, 1, 1, vCoins, setCoinsRet, nValueRet));
BOOST_CHECK_EQUAL(nValueRet, 2 * COIN); // we should get 2 BTC in 1 coin
- BOOST_CHECK_EQUAL(setCoinsRet.size(), 1);
+ BOOST_CHECK_EQUAL(setCoinsRet.size(), 1U);
// empty the wallet and start again, now with fractions of a cent, to test sub-cent change avoidance
empty_wallet();
@@ -207,7 +207,7 @@ BOOST_AUTO_TEST_CASE(coin_selection_tests)
BOOST_CHECK( wallet.SelectCoinsMinConf(500000 * COIN, 1, 1, vCoins, setCoinsRet, nValueRet));
BOOST_CHECK_EQUAL(nValueRet, 500000 * COIN); // we should get the exact amount
- BOOST_CHECK_EQUAL(setCoinsRet.size(), 10); // in ten coins
+ BOOST_CHECK_EQUAL(setCoinsRet.size(), 10U); // in ten coins
// if there's not enough in the smaller coins to make at least 1 cent change (0.5+0.6+0.7 < 1.0+1.0),
// we need to try finding an exact subset anyway
@@ -220,7 +220,7 @@ BOOST_AUTO_TEST_CASE(coin_selection_tests)
add_coin(1111 * CENT);
BOOST_CHECK( wallet.SelectCoinsMinConf(1 * CENT, 1, 1, vCoins, setCoinsRet, nValueRet));
BOOST_CHECK_EQUAL(nValueRet, 1111 * CENT); // we get the bigger coin
- BOOST_CHECK_EQUAL(setCoinsRet.size(), 1);
+ BOOST_CHECK_EQUAL(setCoinsRet.size(), 1U);
// but sometimes it's possible, and we use an exact subset (0.4 + 0.6 = 1.0)
empty_wallet();
@@ -230,7 +230,7 @@ BOOST_AUTO_TEST_CASE(coin_selection_tests)
add_coin(1111 * CENT);
BOOST_CHECK( wallet.SelectCoinsMinConf(1 * CENT, 1, 1, vCoins, setCoinsRet, nValueRet));
BOOST_CHECK_EQUAL(nValueRet, 1 * CENT); // we should get the exact amount
- BOOST_CHECK_EQUAL(setCoinsRet.size(), 2); // in two coins 0.4+0.6
+ BOOST_CHECK_EQUAL(setCoinsRet.size(), 2U); // in two coins 0.4+0.6
// test avoiding sub-cent change
empty_wallet();
@@ -241,12 +241,12 @@ BOOST_AUTO_TEST_CASE(coin_selection_tests)
// trying to make 1.0001 from these three coins
BOOST_CHECK( wallet.SelectCoinsMinConf(1.0001 * COIN, 1, 1, vCoins, setCoinsRet, nValueRet));
BOOST_CHECK_EQUAL(nValueRet, 1.0105 * COIN); // we should get all coins
- BOOST_CHECK_EQUAL(setCoinsRet.size(), 3);
+ BOOST_CHECK_EQUAL(setCoinsRet.size(), 3U);
// but if we try to make 0.999, we should take the bigger of the two small coins to avoid sub-cent change
BOOST_CHECK( wallet.SelectCoinsMinConf(0.999 * COIN, 1, 1, vCoins, setCoinsRet, nValueRet));
BOOST_CHECK_EQUAL(nValueRet, 1.01 * COIN); // we should get 1 + 0.01
- BOOST_CHECK_EQUAL(setCoinsRet.size(), 2);
+ BOOST_CHECK_EQUAL(setCoinsRet.size(), 2U);
// test randomness
{
diff --git a/src/txdb.cpp b/src/txdb.cpp
index 8c01158254..5b0527c76c 100644
--- a/src/txdb.cpp
+++ b/src/txdb.cpp
@@ -22,17 +22,17 @@ void static BatchWriteHashBestChain(CLevelDBBatch &batch, const uint256 &hash) {
CCoinsViewDB::CCoinsViewDB(size_t nCacheSize, bool fMemory, bool fWipe) : db(GetDataDir() / "chainstate", nCacheSize, fMemory, fWipe) {
}
-bool CCoinsViewDB::GetCoins(uint256 txid, CCoins &coins) {
+bool CCoinsViewDB::GetCoins(const uint256 &txid, CCoins &coins) {
return db.Read(make_pair('c', txid), coins);
}
-bool CCoinsViewDB::SetCoins(uint256 txid, const CCoins &coins) {
+bool CCoinsViewDB::SetCoins(const uint256 &txid, const CCoins &coins) {
CLevelDBBatch batch;
BatchWriteCoins(batch, txid, coins);
return db.WriteBatch(batch);
}
-bool CCoinsViewDB::HaveCoins(uint256 txid) {
+bool CCoinsViewDB::HaveCoins(const uint256 &txid) {
return db.Exists(make_pair('c', txid));
}
@@ -115,12 +115,13 @@ bool CCoinsViewDB::GetStats(CCoinsStats &stats) {
pcursor->SeekToFirst();
while (pcursor->Valid()) {
+ boost::this_thread::interruption_point();
try {
leveldb::Slice slKey = pcursor->key();
CDataStream ssKey(slKey.data(), slKey.data()+slKey.size(), SER_DISK, CLIENT_VERSION);
char chType;
ssKey >> chType;
- if (chType == 'c' && !fRequestShutdown) {
+ if (chType == 'c') {
leveldb::Slice slValue = pcursor->value();
CDataStream ssValue(slValue.data(), slValue.data()+slValue.size(), SER_DISK, CLIENT_VERSION);
CCoins coins;
@@ -178,12 +179,13 @@ bool CBlockTreeDB::LoadBlockIndexGuts()
// Load mapBlockIndex
while (pcursor->Valid()) {
+ boost::this_thread::interruption_point();
try {
leveldb::Slice slKey = pcursor->key();
CDataStream ssKey(slKey.data(), slKey.data()+slKey.size(), SER_DISK, CLIENT_VERSION);
char chType;
ssKey >> chType;
- if (chType == 'b' && !fRequestShutdown) {
+ if (chType == 'b') {
leveldb::Slice slValue = pcursor->value();
CDataStream ssValue(slValue.data(), slValue.data()+slValue.size(), SER_DISK, CLIENT_VERSION);
CDiskBlockIndex diskindex;
diff --git a/src/txdb.h b/src/txdb.h
index eb8f574e46..f59fc5da86 100644
--- a/src/txdb.h
+++ b/src/txdb.h
@@ -16,9 +16,9 @@ protected:
public:
CCoinsViewDB(size_t nCacheSize, bool fMemory = false, bool fWipe = false);
- bool GetCoins(uint256 txid, CCoins &coins);
- bool SetCoins(uint256 txid, const CCoins &coins);
- bool HaveCoins(uint256 txid);
+ bool GetCoins(const uint256 &txid, CCoins &coins);
+ bool SetCoins(const uint256 &txid, const CCoins &coins);
+ bool HaveCoins(const uint256 &txid);
CBlockIndex *GetBestBlock();
bool SetBestBlock(CBlockIndex *pindex);
bool BatchWrite(const std::map<uint256, CCoins> &mapCoins, CBlockIndex *pindex);
diff --git a/src/ui_interface.h b/src/ui_interface.h
index f7dbe20894..5b0555c10d 100644
--- a/src/ui_interface.h
+++ b/src/ui_interface.h
@@ -79,9 +79,6 @@ public:
/** Progress message during initialization. */
boost::signals2::signal<void (const std::string &message)> InitMessage;
- /** Initiate client shutdown. */
- boost::signals2::signal<void ()> QueueShutdown;
-
/** Translate a message to the native language of the user. */
boost::signals2::signal<std::string (const char* psz)> Translate;
diff --git a/src/util.cpp b/src/util.cpp
index d8f05cb9fd..64f8e12983 100644
--- a/src/util.cpp
+++ b/src/util.cpp
@@ -3,6 +3,15 @@
// Distributed under the MIT/X11 software license, see the accompanying
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
+#ifndef WIN32
+// for posix_fallocate
+#ifdef __linux__
+#define _POSIX_C_SOURCE 200112L
+#endif
+#include <fcntl.h>
+#include <sys/stat.h>
+#endif
+
#include "util.h"
#include "sync.h"
#include "version.h"
@@ -64,8 +73,6 @@ bool fDebug = false;
bool fDebugNet = false;
bool fPrintToConsole = false;
bool fPrintToDebugger = false;
-volatile bool fRequestShutdown = false;
-bool fShutdown = false;
bool fDaemon = false;
bool fServer = false;
bool fCommandLine = false;
@@ -1065,7 +1072,7 @@ const boost::filesystem::path &GetDataDir(bool fNetSpecific)
fs::create_directory(path);
- cachedPath[fNetSpecific]=true;
+ cachedPath[fNetSpecific] = true;
return path;
}
@@ -1152,9 +1159,46 @@ int GetFilesize(FILE* file)
return nFilesize;
}
+bool TruncateFile(FILE *file, unsigned int length) {
+#if defined(WIN32)
+ return _chsize(_fileno(file), length) == 0;
+#else
+ return ftruncate(fileno(file), length) == 0;
+#endif
+}
+
// this function tries to make a particular range of a file allocated (corresponding to disk space)
// it is advisory, and the range specified in the arguments will never contain live data
void AllocateFileRange(FILE *file, unsigned int offset, unsigned int length) {
+#if defined(WIN32)
+ // Windows-specific version
+ HANDLE hFile = (HANDLE)_get_osfhandle(_fileno(file));
+ LARGE_INTEGER nFileSize;
+ int64 nEndPos = (int64)offset + length;
+ nFileSize.u.LowPart = nEndPos & 0xFFFFFFFF;
+ nFileSize.u.HighPart = nEndPos >> 32;
+ SetFilePointerEx(hFile, nFileSize, 0, FILE_BEGIN);
+ SetEndOfFile(hFile);
+#elif defined(MAC_OSX)
+ // OSX specific version
+ fstore_t fst;
+ fst.fst_flags = F_ALLOCATECONTIG;
+ fst.fst_posmode = F_PEOFPOSMODE;
+ fst.fst_offset = 0;
+ fst.fst_length = (off_t)offset + length;
+ fst.fst_bytesalloc = 0;
+ if (fcntl(fileno(file), F_PREALLOCATE, &fst) == -1) {
+ fst.fst_flags = F_ALLOCATEALL;
+ fcntl(fileno(file), F_PREALLOCATE, &fst);
+ }
+ ftruncate(fileno(file), fst.fst_length);
+#elif defined(__linux__)
+ // Version using posix_fallocate
+ off_t nEndPos = (off_t)offset + length;
+ posix_fallocate(fileno(file), 0, nEndPos);
+#else
+ // Fallback version
+ // TODO: just write one byte per block
static const char buf[65536] = {};
fseek(file, offset, SEEK_SET);
while (length > 0) {
@@ -1164,6 +1208,7 @@ void AllocateFileRange(FILE *file, unsigned int offset, unsigned int length) {
fwrite(buf, 1, now, file); // allowed to fail; this function is advisory anyway
length -= now;
}
+#endif
}
void ShrinkDebugFile()
@@ -1218,9 +1263,14 @@ void SetMockTime(int64 nMockTimeIn)
static int64 nTimeOffset = 0;
+int64 GetTimeOffset()
+{
+ return nTimeOffset;
+}
+
int64 GetAdjustedTime()
{
- return GetTime() + nTimeOffset;
+ return GetTime() + GetTimeOffset();
}
void AddTimeData(const CNetAddr& ip, int64 nTime)
@@ -1276,12 +1326,26 @@ void AddTimeData(const CNetAddr& ip, int64 nTime)
}
}
-
-
-
-
-
-
+uint32_t insecure_rand_Rz = 11;
+uint32_t insecure_rand_Rw = 11;
+void seed_insecure_rand(bool fDeterministic)
+{
+ //The seed values have some unlikely fixed points which we avoid.
+ if(fDeterministic)
+ {
+ insecure_rand_Rz = insecure_rand_Rw = 11;
+ } else {
+ uint32_t tmp;
+ do {
+ RAND_bytes((unsigned char*)&tmp, 4);
+ } while(tmp == 0 || tmp == 0x9068ffffU);
+ insecure_rand_Rz = tmp;
+ do {
+ RAND_bytes((unsigned char*)&tmp, 4);
+ } while(tmp == 0 || tmp == 0x464fffffU);
+ insecure_rand_Rw = tmp;
+ }
+}
string FormatVersion(int nVersion)
{
@@ -1365,9 +1429,12 @@ void RenameThread(const char* name)
// removed.
pthread_set_name_np(pthread_self(), name);
-// This is XCode 10.6-and-later; bring back if we drop 10.5 support:
-// #elif defined(MAC_OSX)
-// pthread_setname_np(name);
+#elif defined(MAC_OSX) && defined(__MAC_OS_X_VERSION_MAX_ALLOWED)
+
+// pthread_setname_np is XCode 10.6-and-later
+#if __MAC_OS_X_VERSION_MAX_ALLOWED >= 1060
+ pthread_setname_np(name);
+#endif
#else
// Prevent warnings for unused parameters...
diff --git a/src/util.h b/src/util.h
index 97911d7493..0641c4be7c 100644
--- a/src/util.h
+++ b/src/util.h
@@ -15,6 +15,8 @@
typedef int pid_t; /* define for Windows compatibility */
#endif
#include <map>
+#include <list>
+#include <utility>
#include <vector>
#include <string>
@@ -98,13 +100,16 @@ T* alignup(T* p)
#endif
#else
#define MAX_PATH 1024
-inline void Sleep(int64 n)
+#endif
+
+inline void MilliSleep(int64 n)
{
- /*Boost has a year 2038 problem— if the request sleep time is past epoch+2^31 seconds the sleep returns instantly.
- So we clamp our sleeps here to 10 years and hope that boost is fixed by 2028.*/
- boost::thread::sleep(boost::get_system_time() + boost::posix_time::milliseconds(n>315576000000LL?315576000000LL:n));
-}
+#if BOOST_VERSION >= 105000
+ boost::this_thread::sleep_for(boost::chrono::milliseconds(n));
+#else
+ boost::this_thread::sleep(boost::posix_time::milliseconds(n));
#endif
+}
/* This GNU C extension enables the compiler to check the format string against the parameters provided.
* X is the number of the "format string" parameter, and Y is the number of the first variadic parameter.
@@ -129,8 +134,6 @@ extern bool fDebug;
extern bool fDebugNet;
extern bool fPrintToConsole;
extern bool fPrintToDebugger;
-extern volatile bool fRequestShutdown;
-extern bool fShutdown;
extern bool fDaemon;
extern bool fServer;
extern bool fCommandLine;
@@ -193,6 +196,7 @@ bool WildcardMatch(const char* psz, const char* mask);
bool WildcardMatch(const std::string& str, const std::string& mask);
void FileCommit(FILE *fileout);
int GetFilesize(FILE* file);
+bool TruncateFile(FILE *file, unsigned int length);
void AllocateFileRange(FILE *file, unsigned int offset, unsigned int length);
bool RenameOver(boost::filesystem::path src, boost::filesystem::path dest);
boost::filesystem::path GetDefaultDataDir();
@@ -212,6 +216,7 @@ uint256 GetRandHash();
int64 GetTime();
void SetMockTime(int64 nMockTimeIn);
int64 GetAdjustedTime();
+int64 GetTimeOffset();
std::string FormatFullVersion();
std::string FormatSubVersion(const std::string& name, int nClientVersion, const std::vector<std::string>& comments);
void AddTimeData(const CNetAddr& ip, int64 nTime);
@@ -403,13 +408,27 @@ bool SoftSetArg(const std::string& strArg, const std::string& strValue);
*/
bool SoftSetBoolArg(const std::string& strArg, bool fValue);
+/**
+ * MWC RNG of George Marsaglia
+ * This is intended to be fast. It has a period of 2^59.3, though the
+ * least significant 16 bits only have a period of about 2^30.1.
+ *
+ * @return random value
+ */
+extern uint32_t insecure_rand_Rz;
+extern uint32_t insecure_rand_Rw;
+static inline uint32_t insecure_rand(void)
+{
+ insecure_rand_Rz = 36969 * (insecure_rand_Rz & 65535) + (insecure_rand_Rz >> 16);
+ insecure_rand_Rw = 18000 * (insecure_rand_Rw & 65535) + (insecure_rand_Rw >> 16);
+ return (insecure_rand_Rw << 16) + insecure_rand_Rz;
+}
-
-
-
-
-
-
+/**
+ * Seed insecure_rand using the random pool.
+ * @param Deterministic Use a determinstic seed
+ */
+void seed_insecure_rand(bool fDeterministic=false);
/** Median filter over a stream of values.
* Returns the median of the last N numbers
@@ -506,5 +525,60 @@ inline uint32_t ByteReverse(uint32_t value)
return (value<<16) | (value>>16);
}
-#endif
+// Standard wrapper for do-something-forever thread functions.
+// "Forever" really means until the thread is interrupted.
+// Use it like:
+// new boost::thread(boost::bind(&LoopForever<void (*)()>, "dumpaddr", &DumpAddresses, 10000));
+// or maybe:
+// boost::function<void()> f = boost::bind(&FunctionWithArg, argument);
+// threadGroup.create_thread(boost::bind(&LoopForever<boost::function<void()> >, "nothing", f, milliseconds));
+template <typename Callable> void LoopForever(const char* name, Callable func, int64 msecs)
+{
+ std::string s = strprintf("bitcoin-%s", name);
+ RenameThread(s.c_str());
+ printf("%s thread start\n", name);
+ try
+ {
+ while (1)
+ {
+ func();
+ MilliSleep(msecs);
+ }
+ }
+ catch (boost::thread_interrupted)
+ {
+ printf("%s thread stop\n", name);
+ throw;
+ }
+ catch (std::exception& e) {
+ PrintException(&e, name);
+ }
+ catch (...) {
+ PrintException(NULL, name);
+ }
+}
+// .. and a wrapper that just calls func once
+template <typename Callable> void TraceThread(const char* name, Callable func)
+{
+ std::string s = strprintf("bitcoin-%s", name);
+ RenameThread(s.c_str());
+ try
+ {
+ printf("%s thread start\n", name);
+ func();
+ printf("%s thread exit\n", name);
+ }
+ catch (boost::thread_interrupted)
+ {
+ printf("%s thread interrupt\n", name);
+ throw;
+ }
+ catch (std::exception& e) {
+ PrintException(&e, name);
+ }
+ catch (...) {
+ PrintException(NULL, name);
+ }
+}
+#endif
diff --git a/src/wallet.cpp b/src/wallet.cpp
index 2317ac31ac..2cc2e60f80 100644
--- a/src/wallet.cpp
+++ b/src/wallet.cpp
@@ -8,6 +8,7 @@
#include "crypter.h"
#include "ui_interface.h"
#include "base58.h"
+#include <boost/algorithm/string/replace.hpp>
using namespace std;
@@ -476,6 +477,16 @@ bool CWallet::AddToWallet(const CWalletTx& wtxIn)
// Notify UI of new or updated transaction
NotifyTransactionChanged(this, hash, fInsertedNew ? CT_NEW : CT_UPDATED);
+
+ // notify an external script when a wallet transaction comes in or is updated
+ std::string strCmd = GetArg("-walletnotify", "");
+
+ if ( !strCmd.empty())
+ {
+ boost::replace_all(strCmd, "%s", wtxIn.GetHash().GetHex());
+ boost::thread t(runCommand, strCmd); // thread runs free
+ }
+
}
return true;
}
@@ -899,7 +910,7 @@ int64 CWallet::GetBalance() const
for (map<uint256, CWalletTx>::const_iterator it = mapWallet.begin(); it != mapWallet.end(); ++it)
{
const CWalletTx* pcoin = &(*it).second;
- if (pcoin->IsFinal() && pcoin->IsConfirmed())
+ if (pcoin->IsConfirmed())
nTotal += pcoin->GetAvailableCredit();
}
}
@@ -973,6 +984,8 @@ static void ApproximateBestSubset(vector<pair<int64, pair<const CWalletTx*,unsig
vfBest.assign(vValue.size(), true);
nBest = nTotalLower;
+ seed_insecure_rand();
+
for (int nRep = 0; nRep < iterations && nBest != nTargetValue; nRep++)
{
vfIncluded.assign(vValue.size(), false);
@@ -982,7 +995,13 @@ static void ApproximateBestSubset(vector<pair<int64, pair<const CWalletTx*,unsig
{
for (unsigned int i = 0; i < vValue.size(); i++)
{
- if (nPass == 0 ? rand() % 2 : !vfIncluded[i])
+ //The solver here uses a randomized algorithm,
+ //the randomness serves no real security purpose but is just
+ //needed to prevent degenerate behavior and it is important
+ //that the rng fast. We do not use a constant random sequence,
+ //because there may be some privacy improvement by making
+ //the selection random.
+ if (nPass == 0 ? insecure_rand()&1 : !vfIncluded[i])
{
nTotal += vValue[i].first;
vfIncluded[i] = true;
@@ -1364,7 +1383,6 @@ DBErrors CWallet::LoadWallet(bool& fFirstRunRet)
return nLoadWalletRet;
fFirstRunRet = !vchDefaultKey.IsValid();
- NewThread(ThreadFlushWalletDB, &strWalletFile);
return DB_LOAD_OK;
}
diff --git a/src/wallet.h b/src/wallet.h
index ecfdafe2eb..e750bfd89e 100644
--- a/src/wallet.h
+++ b/src/wallet.h
@@ -327,8 +327,7 @@ public:
~CReserveKey()
{
- if (!fShutdown)
- ReturnKey();
+ ReturnKey();
}
void ReturnKey();
diff --git a/src/walletdb.cpp b/src/walletdb.cpp
index fe9bce21e8..841553ea6a 100644
--- a/src/walletdb.cpp
+++ b/src/walletdb.cpp
@@ -451,8 +451,10 @@ DBErrors CWalletDB::LoadWallet(CWallet* pwallet)
}
pcursor->close();
}
- catch (...)
- {
+ catch (boost::thread_interrupted) {
+ throw;
+ }
+ catch (...) {
result = DB_CORRUPT;
}
@@ -482,12 +484,11 @@ DBErrors CWalletDB::LoadWallet(CWallet* pwallet)
return result;
}
-void ThreadFlushWalletDB(void* parg)
+void ThreadFlushWalletDB(const string& strFile)
{
// Make this thread recognisable as the wallet flushing thread
RenameThread("bitcoin-wallet");
- const string& strFile = ((const string*)parg)[0];
static bool fOneThread;
if (fOneThread)
return;
@@ -498,9 +499,9 @@ void ThreadFlushWalletDB(void* parg)
unsigned int nLastSeen = nWalletDBUpdated;
unsigned int nLastFlushed = nWalletDBUpdated;
int64 nLastWalletUpdate = GetTime();
- while (!fShutdown)
+ while (true)
{
- Sleep(500);
+ MilliSleep(500);
if (nLastSeen != nWalletDBUpdated)
{
@@ -522,8 +523,9 @@ void ThreadFlushWalletDB(void* parg)
mi++;
}
- if (nRefCount == 0 && !fShutdown)
+ if (nRefCount == 0)
{
+ boost::this_thread::interruption_point();
map<string, int>::iterator mi = bitdb.mapFileUseCount.find(strFile);
if (mi != bitdb.mapFileUseCount.end())
{
@@ -548,7 +550,7 @@ bool BackupWallet(const CWallet& wallet, const string& strDest)
{
if (!wallet.fFileBacked)
return false;
- while (!fShutdown)
+ while (true)
{
{
LOCK(bitdb.cs_db);
@@ -579,7 +581,7 @@ bool BackupWallet(const CWallet& wallet, const string& strDest)
}
}
}
- Sleep(100);
+ MilliSleep(100);
}
return false;
}
@@ -620,11 +622,11 @@ bool CWalletDB::Recover(CDBEnv& dbenv, std::string filename, bool fOnlyKeys)
bool fSuccess = allOK;
Db* pdbCopy = new Db(&dbenv.dbenv, 0);
- int ret = pdbCopy->open(NULL, // Txn pointer
+ int ret = pdbCopy->open(NULL, // Txn pointer
filename.c_str(), // Filename
- "main", // Logical db name
- DB_BTREE, // Database type
- DB_CREATE, // Flags
+ "main", // Logical db name
+ DB_BTREE, // Database type
+ DB_CREATE, // Flags
0);
if (ret > 0)
{